From 80aa27a14eb917cdccb1c7a4b3f42e7528c90d7b Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Tue, 25 Jul 2023 14:18:38 +0800
Subject: [PATCH 1/8] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=8E=A5=E5=85=A5=E7=BD=91=E5=85=B3Modbus=E3=80=81opc?=
 =?UTF-8?q?ua=E4=B8=BA=E6=95=B0=E9=87=87=E8=AE=BE=E5=A4=87=E6=8E=A5?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   2 +-
 src/utils/consts.ts                           |   1 +
 .../Channel/Save/GateWayDeviceModal.vue       | 190 ++++++++++++++++++
 .../Channel/Save/GateWayFormItem.vue          |  71 +++++++
 src/views/DataCollect/Channel/Save/index.vue  |  26 ++-
 src/views/DataCollect/Channel/data.ts         |   2 +
 src/views/DataCollect/Channel/type.d.ts       |   5 +-
 .../DataCollect/Collector/Point/index.vue     |   2 +-
 .../DataCollect/Collector/Tree/Save/index.vue | 153 ++++++++++----
 .../device/Instance/Detail/GateWay/index.vue  |   7 +
 .../Detail/components/EditTable/index.vue     |  26 +--
 src/views/device/Instance/Detail/index.vue    |  17 +-
 src/views/link/AccessConfig/Detail/index.vue  |  36 ++--
 .../AccessConfig/components/Edge/geteway.vue  | 145 +++++++++++++
 .../AccessConfig/components/Media/GB28181.vue |  29 ++-
 src/views/link/AccessConfig/data.ts           |   1 +
 yarn.lock                                     |  17 +-
 17 files changed, 635 insertions(+), 95 deletions(-)
 create mode 100644 src/views/DataCollect/Channel/Save/GateWayDeviceModal.vue
 create mode 100644 src/views/DataCollect/Channel/Save/GateWayFormItem.vue
 create mode 100644 src/views/device/Instance/Detail/GateWay/index.vue
 create mode 100644 src/views/link/AccessConfig/components/Edge/geteway.vue

diff --git a/package.json b/package.json
index 971fdf85..36392bc2 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "event-source-polyfill": "^1.0.31",
     "global": "^4.4.0",
     "jetlinks-store": "^0.0.3",
-    "jetlinks-ui-components": "^1.0.26",
+    "jetlinks-ui-components": "^1.0.27",
     "js-cookie": "^3.0.1",
     "jsencrypt": "^3.3.2",
     "less": "^4.1.3",
diff --git a/src/utils/consts.ts b/src/utils/consts.ts
index 0ea4e3de..d4404334 100644
--- a/src/utils/consts.ts
+++ b/src/utils/consts.ts
@@ -55,4 +55,5 @@ export const USER_CENTER_MENU_BUTTON_CODE = 'user-center-passwd-update'
 export const protocolList = [
     { label: 'OPC-UA', value: 'OPC_UA', alias: 'opc-ua' },
     { label: 'Modbus/TCP', value: 'MODBUS_TCP', alias: 'modbus-tcp' },
+    { label: 'GATEWAY', value: 'GATEWAY', alias: 'collector-gateway' },
 ]
diff --git a/src/views/DataCollect/Channel/Save/GateWayDeviceModal.vue b/src/views/DataCollect/Channel/Save/GateWayDeviceModal.vue
new file mode 100644
index 00000000..68b956c9
--- /dev/null
+++ b/src/views/DataCollect/Channel/Save/GateWayDeviceModal.vue
@@ -0,0 +1,190 @@
+<template>
+  <j-modal
+    :maskClosable="false"
+    :width='820'
+    title="选择网关设备"
+    visible
+    @cancel="cancel"
+    @ok="confirm"
+  >
+    <div>
+      <j-advanced-search
+          :columns="columns"
+          class="scene-search"
+          target="scene-triggrt-device-device"
+          type='simple'
+          @search="handleSearch"
+      />
+      <j-divider style='margin: 0' />
+      <j-pro-table
+          ref='actionRef'
+          :bodyStyle='{
+            paddingRight: 0,
+            paddingLeft: 0
+          }'
+          :columns='columns'
+          :defaultParams="{
+            sorts: [{ name: 'createTime', order: 'desc' }],
+            terms: [{value: 'gateway', termType: 'eq', column: 'deviceType'}]
+          }"
+          :gridColumn='2'
+          :params='params'
+          :request='query'
+          :scroll="{y: 350}"
+          model='CARD'
+      >
+        <template #card="slotProps">
+          <CardBox
+              :active="selectKey.id === slotProps.id"
+              :status="slotProps.state?.value"
+              :statusNames="{
+                        online: 'processing',
+                        offline: 'error',
+                        notActive: 'warning',
+                    }"
+              :statusText="slotProps.state?.text"
+              :value='slotProps'
+              @click="handleClick"
+          >
+            <template #img>
+              <slot name="img">
+                <img :src="slotProps.photoUrl || getImage('/device/instance/device-card.png')" height='80' width='80' />
+              </slot>
+            </template>
+            <template #content>
+              <Ellipsis style='width: calc(100% - 100px)'>
+              <span style="font-size: 16px;font-weight: 600" >
+                {{ slotProps.name }}
+              </span>
+              </Ellipsis>
+              <j-row>
+                <j-col :span="12">
+                  <div class="card-item-content-text">
+                    设备类型
+                  </div>
+                  <div>{{ slotProps.deviceType?.text }}</div>
+                </j-col>
+                <j-col :span="12">
+                  <div class="card-item-content-text">
+                    产品名称
+                  </div>
+                  <div>{{ slotProps.productName }}</div>
+                </j-col>
+              </j-row>
+            </template>
+          </CardBox>
+        </template>
+      </j-pro-table>
+    </div>
+
+  </j-modal>
+</template>
+
+<script name="GateWayDevice" setup>
+import { getImage } from '@/utils/comm'
+import {query} from "@/api/device/instance";
+
+const props = defineProps({
+    value: {
+      type: String,
+      default: undefined
+    },
+    name: {
+      type: String,
+      default: undefined
+    }
+})
+const emit = defineEmits(['cancel', 'confirm'])
+
+const selectKey = reactive({
+  id: props.value,
+  name: props.name
+})
+const params = ref()
+
+
+const columns = [
+  {
+    title: 'ID',
+    dataIndex: 'id',
+    width: 300,
+    ellipsis: true,
+    fixed: 'left',
+    search: {
+      type: 'string'
+    }
+  },
+  {
+    title: '设备名称',
+    dataIndex: 'name',
+    width: 200,
+    ellipsis: true,
+    search: {
+      type: 'string',
+      first: true
+    }
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    width: 200,
+    search: {
+      type: 'date'
+    }
+  },
+  {
+    title: '状态',
+    dataIndex: 'state',
+    width: 90,
+    search: {
+      type: 'select',
+      options: [
+        { label: '禁用', value: 'notActive' },
+        { label: '离线', value: 'offline' },
+        { label: '在线', value: 'online' },
+      ]
+    }
+  },
+]
+
+// const deviceQuery = (p) => {
+//   const sorts = [];
+//
+//   if (props.rowKeys) {
+//     props.rowKeys.forEach(rowKey => {
+//       sorts.push({
+//         name: 'id',
+//         value: rowKey,
+//       });
+//     })
+//   }
+//   sorts.push({ name: 'createTime', order: 'desc' });
+//   const terms = [
+//     ...p.terms,
+//     { terms: [{ column: "productId", value: props.productId }]}
+//   ]
+//   return query({ ...p, terms, sorts })
+// }
+
+const handleClick = (detail) => {
+  console.log(detail)
+  selectKey.id = detail.id
+  selectKey.name = detail.name
+}
+
+const handleSearch = (p) => {
+  params.value = p
+}
+const cancel = () => {
+  emit('cancel')
+}
+
+const confirm = () => {
+  emit('confirm', selectKey)
+}
+
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/DataCollect/Channel/Save/GateWayFormItem.vue b/src/views/DataCollect/Channel/Save/GateWayFormItem.vue
new file mode 100644
index 00000000..5427a373
--- /dev/null
+++ b/src/views/DataCollect/Channel/Save/GateWayFormItem.vue
@@ -0,0 +1,71 @@
+<template>
+  <j-button
+      v-if="!value"
+      style="width: 100%"
+      @click="showModal"
+  >
+    选择网关设备
+  </j-button>
+  <div v-else class="gateway-form-item">
+    <span>
+      <j-ellipsis>
+        {{ name }}
+      </j-ellipsis>
+    </span>
+    <j-button type="link" @click="showModal">
+      重新选择
+    </j-button>
+  </div>
+  <DeviceModal
+      v-if="visible"
+      :name="name"
+      :value="value"
+      @cancel="cancel"
+      @confirm="confirm"
+  />
+</template>
+
+<script name="GateWayFormItem" setup>
+import DeviceModal from './GateWayDeviceModal.vue'
+
+const props = defineProps({
+  value: {
+    type: String,
+    default: undefined
+  },
+  name: {
+    type: String,
+    default: undefined
+  }
+})
+
+const emit = defineEmits(['update:value', 'update:name'])
+
+const visible = ref(false)
+
+const showModal = () =>{
+  visible.value = true
+}
+
+const cancel = () => {
+  visible.value = false
+}
+
+const confirm = (select) => {
+  console.log(select)
+  emit('update:value', select.id)
+  emit('update:name', select.name)
+  cancel()
+}
+
+</script>
+
+<style lang="less" scoped>
+.gateway-form-item {
+  display: flex;
+  >span {
+    line-height: 32px;
+    max-width: calc(100% - 88px);
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/DataCollect/Channel/Save/index.vue b/src/views/DataCollect/Channel/Save/index.vue
index c416f5f3..545281c8 100644
--- a/src/views/DataCollect/Channel/Save/index.vue
+++ b/src/views/DataCollect/Channel/Save/index.vue
@@ -92,6 +92,17 @@
                     :filter-option="filterOption"
                 />
             </j-form-item>
+            <j-form-item
+                v-if="formData.provider === 'GATEWAY'"
+                :name="['configuration','deviceId']"
+                :rules="[{ required: true, message: '请选择网关设备'}]"
+                label="选择网关设备"
+            >
+              <GateWayFormItem
+                  v-model:name="formData.configuration.deviceName"
+                  v-model:value="formData.configuration.deviceId"
+              />
+            </j-form-item>
             <j-form-item
                 v-if="formData.provider === 'OPC_UA'"
                 label="安全模式"
@@ -198,6 +209,7 @@ import type { FormInstance } from 'ant-design-vue';
 import type { FormDataType } from '../type.d';
 import { cloneDeep, isArray } from 'lodash-es';
 import { protocolList } from '@/utils/consts';
+import GateWayFormItem from "@/views/DataCollect/Channel/Save/GateWayFormItem.vue";
 
 const props = defineProps({
     data: {
@@ -222,7 +234,13 @@ const Options = ref({
 const formData = ref<FormDataType>(cloneDeep(FormState));
 
 const handleOk = async () => {
-    const params = await formRef.value?.validate();
+    const params: any = await formRef.value?.validate();
+    if (params?.provider === 'GATEWAY') {
+      params.configuration.deviceName = formData.value.configuration.deviceName
+    }
+
+
+
     loading.value = true;
     const response = !id
         ? await save(params).catch(() => {})
@@ -284,7 +302,7 @@ const getProvidersList = async () => {
     if (resp.status === 200) {
         const arr = resp.result
             .filter(
-                (item: any) => item.id === 'modbus-tcp' || item.id === 'opc-ua',
+                (item: any) =>  ['collector-gateway', 'modbus-tcp', 'opc-ua'].includes(item.id),
             )
             .map((it: any) => it.id);
         const providers: any = protocolList.filter((item: any) =>
@@ -302,7 +320,9 @@ getCertificateList();
 watch(
     () => props.data,
     (value) => {
-        if (value.id) formData.value = value as FormDataType;
+        if (value.id) {
+          formData.value = value as FormDataType;
+        }
     },
     { immediate: true, deep: true },
 );
diff --git a/src/views/DataCollect/Channel/data.ts b/src/views/DataCollect/Channel/data.ts
index c95583fa..68a8fe0c 100644
--- a/src/views/DataCollect/Channel/data.ts
+++ b/src/views/DataCollect/Channel/data.ts
@@ -15,6 +15,8 @@ export const FormState: FormDataType = {
         authType: 'anonymous',
         username: '',
         password: '',
+        deviceId: undefined,
+        deviceName: undefined,
     },
     description: '',
 };
diff --git a/src/views/DataCollect/Channel/type.d.ts b/src/views/DataCollect/Channel/type.d.ts
index 9a2c7b34..7d683f08 100644
--- a/src/views/DataCollect/Channel/type.d.ts
+++ b/src/views/DataCollect/Channel/type.d.ts
@@ -1,6 +1,6 @@
 export interface ConfigurationType {
     port: string | undefined;
-    host: string | undefined;;
+    host: string | undefined;
     username: string;
     password: string;
     endpoint: string,
@@ -8,7 +8,8 @@ export interface ConfigurationType {
     securityMode: string | undefined,
     certId: string | undefined,
     authType: string | undefined,
-
+    deviceId: string | undefined,
+    deviceName: string | undefined,
 }
 
 export interface FormDataType {
diff --git a/src/views/DataCollect/Collector/Point/index.vue b/src/views/DataCollect/Collector/Point/index.vue
index d207af99..e05c3d0a 100644
--- a/src/views/DataCollect/Collector/Point/index.vue
+++ b/src/views/DataCollect/Collector/Point/index.vue
@@ -20,7 +20,7 @@
                     <template #headerTitle>
                         <j-space>
                             <PermissionButton
-                                v-if="data?.provider == 'MODBUS_TCP'"
+                                v-if="['MODBUS_TCP', 'GATEWAY'].includes(data?.provider)"
                                 type="primary"
                                 @click="handlAdd"
                                 hasPermission="DataCollect/Collector:add"
diff --git a/src/views/DataCollect/Collector/Tree/Save/index.vue b/src/views/DataCollect/Collector/Tree/Save/index.vue
index e5319ff0..c4c9f1a6 100644
--- a/src/views/DataCollect/Collector/Tree/Save/index.vue
+++ b/src/views/DataCollect/Collector/Tree/Save/index.vue
@@ -27,6 +27,7 @@
                     show-search
                     :filter-option="filterOption"
                     :disabled="!!id"
+                    @select="channelSelect"
                 />
             </j-form-item>
             <j-form-item
@@ -39,12 +40,32 @@
                     v-model:value="formData.name"
                 />
             </j-form-item>
-            <j-form-item
-                label="从机地址"
-                :name="['configuration', 'unitId']"
-                v-if="visibleUnitId"
-                :rules="LeftTreeRules.unitId"
+
+            <template v-if="provider === 'GATEWAY'">
+              <j-form-item
+                label="通讯协议"
+                :name="['configuration', 'collectorProvider']"
+                :rules="[{ required: true, message: '请选择通讯协议' }]"
             >
+                <j-select
+                    style="width: 100%"
+                    v-model:value="formData.configuration.collectorProvider"
+                    :options="providerListItems"
+                    placeholder="请选择通讯协议"
+                    allowClear
+                    show-search
+                    :filter-option="filterOption"
+                    :disabled="!!id"
+                />
+            </j-form-item>
+            </template>
+            <template v-else>
+              <j-form-item
+                  v-if="visibleUnitId"
+                  :name="['configuration', 'unitId']"
+                  :rules="LeftTreeRules.unitId"
+                  label="从机地址"
+              >
                 <j-input-number
                     style="width: 100%"
                     placeholder="请输入从机地址"
@@ -52,12 +73,12 @@
                     :min="0"
                     :max="255"
                 />
-            </j-form-item>
-            <j-form-item
-                :name="['configuration', 'inheritBreakerSpec', 'type']"
-                :rules="LeftTreeRules.type"
-                label="点位熔断处理"
-            >
+              </j-form-item>
+              <j-form-item
+                  :name="['configuration', 'inheritBreakerSpec', 'type']"
+                  :rules="LeftTreeRules.type"
+                  label="点位熔断处理"
+              >
                 <j-card-select
                     :showImage="false"
                     v-model:value="formData.configuration.inheritBreakerSpec.type"
@@ -68,16 +89,16 @@
                     ]"
                     @change="changeCardSelectType"
                 />
-            </j-form-item>
-            <p style="color: #616161">
+              </j-form-item>
+              <p style="color: #616161">
                 {{ getTypeTooltip(formData.configuration.inheritBreakerSpec.type) }}
-            </p>
-            <j-form-item
-                label="双字高低位切换"
-                :name="['configuration', 'endian']"
-                v-if="visibleEndian"
-                :rules="LeftTreeRules.endian"
-            >
+              </p>
+              <j-form-item
+                  v-if="visibleEndian"
+                  :name="['configuration', 'endian']"
+                  :rules="LeftTreeRules.endian"
+                  label="双字高低位切换"
+              >
                 <j-card-select
                     :showImage="false"
                     v-model:value="formData.configuration.endian"
@@ -88,13 +109,13 @@
                     @change="changeCardSelectEndian"
                     :column="2"
                 />
-            </j-form-item>
-            <j-form-item
-                label="单字高低位切换"
-                :name="['configuration', 'endianIn']"
-                v-if="visibleEndian"
-                :rules="LeftTreeRules.endianIn"
-            >
+              </j-form-item>
+              <j-form-item
+                  v-if="visibleEndian"
+                  :name="['configuration', 'endianIn']"
+                  :rules="LeftTreeRules.endianIn"
+                  label="单字高低位切换"
+              >
                 <j-card-select
                     :showImage="false"
                     v-model:value="formData.configuration.endianIn"
@@ -105,18 +126,18 @@
                     @change="changeCardSelectEndianIn"
                     :column="2"
                 />
-            </j-form-item>
-            <div style="color: #616161" v-if="visibleEndian">
+              </j-form-item>
+              <div v-if="visibleEndian" style="color: #616161">
                 <p>当前内存布局: {{ endianData }}</p>
                 <p>
-                    只有4字节数据类型(int32、ieee754 float)
-                    具有4种内存布局，其它只有ABCD、DCBA两种内存布局(以双字配置为准)
+                  只有4字节数据类型(int32、ieee754 float)
+                  具有4种内存布局，其它只有ABCD、DCBA两种内存布局(以双字配置为准)
                 </p>
-            </div>
-            <j-form-item
-                label="请求超时时间配置"
-                :name="['configuration', 'requsetTimeout']"
-            >
+              </div>
+              <j-form-item
+                  :name="['configuration', 'requsetTimeout']"
+                  label="请求超时时间配置"
+              >
                 <j-input-number
                     style="width: 100%"
                     placeholder="请输入请求超时时间配置"
@@ -125,8 +146,8 @@
                     :max="2147483648"
                     :min="1"
                 />
-            </j-form-item>
-
+              </j-form-item>
+            </template>
             <j-form-item label="说明" name="description">
                 <j-textarea
                     placeholder="请输入说明"
@@ -154,11 +175,13 @@
         </template>
     </j-modal>
 </template>
-<script lang="ts" setup>
+<script lang="ts" name="CollectorTreeSave" setup>
 import { save, update } from '@/api/data-collect/collector';
 import { LeftTreeRules } from '../../data';
 import type { FormInstance } from 'ant-design-vue';
 import {cloneDeep} from "lodash-es";
+import {getProviders} from "@/api/data-collect/channel";
+import {protocolList} from "@/utils/consts";
 
 const loading = ref(false);
 const visibleEndian = ref(false);
@@ -179,17 +202,40 @@ const emit = defineEmits(['change']);
 
 const id = props.data.id;
 const formRef = ref<FormInstance>();
+const provider = ref()
+const providerListItems = ref()
+
+const geyProviderList = async () => {
+  const resp: any = await getProviders();
+  if (resp.success) {
+    const arr = resp.result.filter(
+        (item: any) =>  ['collector-gateway', 'modbus-tcp', 'opc-ua'].includes(item.id),
+    ).map((it: any) => it.id);
+    console.log(arr, protocolList)
+    providerListItems.value = protocolList.filter((item: any) =>
+        arr.includes(item.alias),
+    );
+  } else {
+    providerListItems.value = []
+  }
+}
 
 const _channelListAll = computed(() => {
     return props.channelListAll || [];
 })
+
 const channelList = computed(() => {
    return _channelListAll.value.map((item: any) => ({
+        provider: item.provider,
         value: item.id,
         label: item.name,
     }));
 })
 
+const channelSelect = (key: string, detail: any) => {
+  console.log(detail)
+  provider.value = detail.provider
+}
 
 const endianData = computed(() => {
     const { endian, endianIn } = formData.value.configuration;
@@ -214,6 +260,7 @@ const formData = ref({
         type: 'LowerFrequency',
         endian: 'BIG',
         endianIn: 'BIG',
+        collectorProvider: undefined,
         requsetTimeout: 2000,
         inheritBreakerSpec: {
           type: 'LowerFrequency',
@@ -229,13 +276,23 @@ const formData = ref({
 const handleOk = async () => {
     const data = await formRef.value?.validate();
 
-    const { provider, name } = _channelListAll.value.find(
+
+
+    const { name } = _channelListAll.value.find(
         (item: any) => item.id === formData.value.channelId,
     );
+
+    if (['GATEWAY'].includes(data?.provider)) {
+      data.configuration.inheritBreakerSpec.type = 'Ignore'
+    }
+
     const params = {
         ...data,
-        provider,
+        provider: provider.value,
         channelName: name,
+        circuitBreaker: {
+          type: 'Ignore'
+        }
     };
 
     loading.value = true;
@@ -294,16 +351,28 @@ watch(
             copyValue.configuration = {
               ...copyValue.configuration,
               inheritBreakerSpec: {
-                type: value.circuitBreaker.type
+                type: value.circuitBreaker?.type
               }
             }
             copyValue.circuitBreaker.type = 'Ignore'
           }
           formData.value = copyValue
+
+          const item = props.channelListAll.find(
+              (item: any) => item.id === formData.value.channelId,
+          );
+          provider.value = item?.provider
         };
     },
     { immediate: true, deep: true },
 );
+
+watchEffect(() => {
+  if (provider.value === 'GATEWAY') {
+    geyProviderList()
+  }
+})
+
 </script>
 
 <style lang="less" scoped>
diff --git a/src/views/device/Instance/Detail/GateWay/index.vue b/src/views/device/Instance/Detail/GateWay/index.vue
new file mode 100644
index 00000000..8f200652
--- /dev/null
+++ b/src/views/device/Instance/Detail/GateWay/index.vue
@@ -0,0 +1,7 @@
+<template>
+    <EditTable provider="collector-gateway"  />
+</template>
+
+<script lang="ts" setup>
+import EditTable from '../components/EditTable/index.vue'
+</script>
\ No newline at end of file
diff --git a/src/views/device/Instance/Detail/components/EditTable/index.vue b/src/views/device/Instance/Detail/components/EditTable/index.vue
index b4de8f5d..713ddb89 100644
--- a/src/views/device/Instance/Detail/components/EditTable/index.vue
+++ b/src/views/device/Instance/Detail/components/EditTable/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <j-spin :spinning="loading" v-if="metadata.properties.length">
+    <j-spin v-if="metadata.properties?.length" :spinning="loading">
         <j-card :bordered="false" borderStyle="padding: 0">
             <template #extra>
                 <j-space>
@@ -188,16 +188,16 @@ const visible = ref<boolean>(false);
 const getChannel = async () => {
     const resp: any = await queryChannelNoPaging({
         paging: false,
-        terms: [
-            {
-                terms: [
-                    {
-                        column: 'provider',
-                        value: props.provider,
-                    },
-                ],
-            },
-        ],
+        // terms: [
+        //     {
+        //         terms: [
+        //             {
+        //                 column: 'provider',
+        //                 value: props.provider,
+        //             },
+        //         ],
+        //     },
+        // ],
     });
     if (resp.status === 200) {
         channelList.value = resp.result?.map((item: any) => ({
@@ -211,12 +211,12 @@ const getChannel = async () => {
 const handleSearch = async () => {
     loading.value = true;
     getChannel();
-    const _metadata = metadata.properties.map((item: any) => ({
+    const _metadata = metadata.properties?.map?.((item: any) => ({
         metadataId: item.id,
         metadataName: `${item.name}(${item.id})`,
         metadataType: 'property',
         name: item.name,
-    }));
+    })) || [];
     if (_metadata && _metadata.length) {
         const resp: any = await queryMapping(
             'device',
diff --git a/src/views/device/Instance/Detail/index.vue b/src/views/device/Instance/Detail/index.vue
index 6946132d..090d1d72 100644
--- a/src/views/device/Instance/Detail/index.vue
+++ b/src/views/device/Instance/Detail/index.vue
@@ -122,6 +122,7 @@ import Modbus from './Modbus/index.vue';
 import OPCUA from './OPCUA/index.vue';
 import EdgeMap from './EdgeMap/index.vue';
 import Parsing from './Parsing/index.vue';
+import GateWay from './GateWay/index.vue'
 import Log from './Log/index.vue';
 import { _deploy, _disconnect } from '@/api/device/instance';
 import { getImage, onlyMessage } from '@/utils/comm';
@@ -181,7 +182,8 @@ const tabs = {
     EdgeMap,
     Parsing,
     Log,
-    MetadataMap
+    MetadataMap,
+  GateWay
 };
 
 const getStatus = (id: string) => {
@@ -225,7 +227,7 @@ const getDetail = () => {
     ) {
         list.value.push({
             key: 'Modbus',
-            tab: 'Modbus TCP',
+            tab: '数采映射',
         });
     }
     if (
@@ -234,9 +236,18 @@ const getDetail = () => {
     ) {
         list.value.push({
             key: 'OPCUA',
-            tab: 'OPC UA',
+            tab: '数采映射',
         });
     }
+    if (
+        instanceStore.current?.protocol === 'collector-gateway' &&
+        !keys.includes('GateWay')
+    ) {
+      list.value.push({
+        key: 'GateWay',
+        tab: '数采映射',
+      });
+    }
     if (
         instanceStore.current?.deviceType?.value === 'gateway' &&
         !keys.includes('ChildDevice')
diff --git a/src/views/link/AccessConfig/Detail/index.vue b/src/views/link/AccessConfig/Detail/index.vue
index 06b9e5c5..aa1f7625 100644
--- a/src/views/link/AccessConfig/Detail/index.vue
+++ b/src/views/link/AccessConfig/Detail/index.vue
@@ -14,40 +14,47 @@
                             <a @click="goBack">返回</a>
                         </div>
                       <template v-if="showType === 'network'">
-                        <Network
-                          v-if="provider.id !== 'plugin_gateway'"
-                          :bindProduct='bindProduct'
-                          :provider="provider"
-                          :data="data"
-                        />
                         <Plugin
-                          v-else
-                          :bindProduct='bindProduct'
-                          :provider="provider"
-                          :data="data"
+                            v-if="provider.id === 'plugin_gateway'"
+                            :bindProduct='bindProduct'
+                            :data="data"
+                            :provider="provider"
+                        />
+                        <GateWay
+                            v-else-if="provider.id === 'collector-gateway'"
+                            :bindProduct='bindProduct'
+                            :data="data"
+                            :provider="provider"
+                        />
+
+                        <Network
+                            v-else
+                            :bindProduct='bindProduct'
+                            :data="data"
+                            :provider="provider"
                         />
                       </template>
 
                         <Media
-                            v-if="showType === 'media'"
+                            v-else-if="showType === 'media'"
                             :bindProduct='bindProduct'
                             :provider="provider"
                             :data="data"
                         />
                         <Channel
-                            v-if="showType === 'channel'"
+                            v-else-if="showType === 'channel'"
                             :bindProduct='bindProduct'
                             :provider="provider"
                             :data="data"
                         />
                         <Edge
-                            v-if="showType === 'edge'"
+                            v-else-if="showType === 'edge'"
                             :bindProduct='bindProduct'
                             :provider="provider"
                             :data="data"
                         />
                         <Cloud
-                            v-if="showType === 'cloud'"
+                            v-else-if="showType === 'cloud'"
                             :bindProduct='bindProduct'
                             :provider="provider"
                             :data="data"
@@ -65,6 +72,7 @@ import Provider from '../components/Provider/index.vue';
 import Media from '../components/Media/index.vue';
 import Channel from '../components/Channel/index.vue';
 import Edge from '../components/Edge/index.vue';
+import GateWay from '../components/Edge/geteway.vue';
 import Cloud from '../components/Cloud/index.vue';
 import Plugin from '../components/Plugin/index.vue'
 import { getProviders, detail } from '@/api/link/accessConfig';
diff --git a/src/views/link/AccessConfig/components/Edge/geteway.vue b/src/views/link/AccessConfig/components/Edge/geteway.vue
new file mode 100644
index 00000000..de748b91
--- /dev/null
+++ b/src/views/link/AccessConfig/components/Edge/geteway.vue
@@ -0,0 +1,145 @@
+<template>
+  <div class="card-last">
+    <j-row :gutter="[24, 24]">
+      <j-col :span="12">
+        <title-component data="基本信息" />
+        <div>
+          <j-form
+              :model="formState"
+              autocomplete="off"
+              layout="vertical"
+              name="basic"
+              @finish="onFinish"
+          >
+            <j-form-item
+                :rules="[
+                                {
+                                    required: true,
+                                    message: '请输入名称',
+                                    trigger: 'blur',
+                                },
+                                {
+                                    max: 64,
+                                    message: '最多可输入64个字符',
+                                    trigger: 'blur',
+                                },
+                            ]"
+                label="名称"
+                name="name"
+            >
+              <j-input
+                  v-model:value="formState.name"
+                  placeholder="请输入名称"
+              />
+            </j-form-item>
+            <j-form-item label="说明" name="description">
+              <j-textarea
+                  v-model:value="formState.description"
+                  :maxlength="200"
+                  :rows="4"
+                  placeholder="请输入说明"
+                  show-count
+              />
+            </j-form-item>
+            <j-form-item>
+              <PermissionButton
+                  v-if="view === 'false'"
+                  :hasPermission="`link/AccessConfig:${
+                                    id === ':id' ? 'add' : 'update'
+                                }`"
+                  html-type="submit"
+                  type="primary"
+              >
+                保存
+              </PermissionButton>
+            </j-form-item>
+          </j-form>
+        </div>
+      </j-col>
+      <j-col :span="12">
+        <div class="doc" style="height: 600px">
+          <TitleComponent data="配置概览" />
+          <p>接入方式：{{ provider.name }}</p>
+          <p>
+            {{ provider.description }}
+          </p>
+          <p>设备接入指引</p>
+          <TitleComponent data="设备接入指引" />
+          <p>1、数据采集菜单中配置数采通道、点位</p>
+          <p>2、创建数采设备接入网关</p>
+          <p>3、创建产品，并选中接入方式为数采设备接入</p>
+          <p>4、添加设备，单独为每一个设备进行数据点绑定</p>
+        </div>
+      </j-col>
+    </j-row>
+  </div>
+</template>
+
+<script lang="ts" name="GateWay" setup>
+import { onlyMessage } from '@/utils/comm';
+import { update, save } from '@/api/link/accessConfig';
+import { ProtocolMapping } from '../../data';
+
+interface FormState {
+  name: string;
+  description: string;
+}
+const route = useRoute();
+const view = route.query.view as string;
+const id = route.params.id as string;
+
+const props = defineProps({
+  provider: {
+    type: Object,
+    default: () => {},
+  },
+  data: {
+    type: Object,
+    default: () => {},
+  },
+});
+
+const type = ref(props.provider.type || props.data.type);
+
+const formState = ref<FormState>({
+  name: '',
+  description: '',
+});
+const onFinish = async (values: any) => {
+  const providerId = props.provider.id;
+  const params = {
+    ...values,
+    provider: providerId,
+    protocol: providerId,
+    transport: ProtocolMapping.get(providerId),
+    channel: props.provider.channel,
+  };
+  const resp =
+      id === ':id' ? await save(params) : await update({ ...params, id });
+  if (resp.status === 200) {
+    onlyMessage('操作成功', 'success');
+    history.back();
+    if ((window as any).onTabSaveSuccess) {
+      (window as any).onTabSaveSuccess(resp);
+      setTimeout(() => window.close(), 300);
+    }
+  }
+};
+
+onMounted(() => {
+  if (id !== ':id') {
+    formState.value = {
+      name: props.data.name,
+      description: props.data?.description || '',
+    };
+  }
+});
+</script>
+
+<style lang="less" scoped>
+.card-last {
+  padding-right: 5px;
+  overflow-y: auto;
+  overflow-x: hidden;
+}
+</style>
diff --git a/src/views/link/AccessConfig/components/Media/GB28181.vue b/src/views/link/AccessConfig/components/Media/GB28181.vue
index bbf277c2..f7c2730b 100644
--- a/src/views/link/AccessConfig/components/Media/GB28181.vue
+++ b/src/views/link/AccessConfig/components/Media/GB28181.vue
@@ -151,17 +151,11 @@
                                                 /^([0-9]|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.([0-9]|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.([0-9]|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.([0-9]|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])$/,
                                             message: '请输入正确的IP地址',
                                         },
-                                        {
-                                          max: 65535,
-                                          message: '请输入1~65535之间的正整数'
-                                        },
-                                        {
-                                          min: 1,
-                                          message: '请输入1~65535之间的正整数'
-                                        },
+
                                     ]"
+                                    :validateFirst="true"
                                 >
-                                    <j-input-number
+                                    <j-input
                                         style="width: 105%"
                                         v-model:value="
                                             formState.hostPort.publicHost
@@ -176,12 +170,8 @@
                             <j-col :span="6">
                                 <j-form-item
                                     :name="['hostPort', 'publicPort']"
-                                    :rules="[
-                                        {
-                                            required: true,
-                                            message: '输入端口',
-                                        },
-                                    ]"
+                                    :rules="rules.publicPort"
+                                    :validateFirst="true"
                                 >
                                     <div class="form-label"></div>
 
@@ -598,6 +588,15 @@ const dynamicValidateForm = reactive<{ cluster: Form2[] }>({
     cluster: [],
 });
 
+const rules = {
+  publicPort: [
+    {
+      required: true,
+      message: '输入端口',
+    }
+  ]
+}
+
 const removeCluster = (item: Form2) => {
     let index = dynamicValidateForm.cluster.indexOf(item);
     if (index !== -1) {
diff --git a/src/views/link/AccessConfig/data.ts b/src/views/link/AccessConfig/data.ts
index 9753405e..ba4f72fa 100644
--- a/src/views/link/AccessConfig/data.ts
+++ b/src/views/link/AccessConfig/data.ts
@@ -14,6 +14,7 @@ ProtocolMapping.set('Ctwing', 'HTTP');
 ProtocolMapping.set('modbus-tcp', 'MODBUS_TCP');
 ProtocolMapping.set('opc-ua', 'OPC_UA');
 ProtocolMapping.set('edge-child-device', 'EdgeGateway');
+ProtocolMapping.set('collector-gateway', 'collector-gateway');
 ProtocolMapping.set('official-edge-gateway', 'MQTT');
 
 const NetworkTypeMapping = new Map();
diff --git a/yarn.lock b/yarn.lock
index 5a0e275e..43fe36d7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3738,7 +3738,7 @@ jetlinks-store@^0.0.3:
   resolved "https://registry.npmjs.org/jetlinks-store/-/jetlinks-store-0.0.3.tgz"
   integrity sha512-AZf/soh1hmmwjBZ00fr1emuMEydeReaI6IBTGByQYhTmK1Zd5pQAxC7WLek2snRAn/HHDgJfVz2hjditKThl6Q==
 
-jetlinks-ui-components@^1.0.23, jetlinks-ui-components@^1.0.26:
+jetlinks-ui-components@^1.0.23:
   version "1.0.26"
   resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.26.tgz#26896c578396b09d49649ac87c3943491af3a9ae"
   integrity sha512-HkLk52C6pDKe/Ca9O4w34h1/PrC7GdBUheiicPOX2V/Lc49N+WzI9wmrCd82XBm8MocPM4gAOJxNaTxY20EO9w==
@@ -3753,6 +3753,21 @@ jetlinks-ui-components@^1.0.23, jetlinks-ui-components@^1.0.26:
     sortablejs "^1.15.0"
     vuedraggable "^4.1.0"
 
+jetlinks-ui-components@^1.0.27:
+  version "1.0.27"
+  resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.27.tgz#97f04cb18906ad603de2bcbc62fa4b6673a7a3d0"
+  integrity sha512-R9dPrRMwV5imqV0JTkHeTMT8LeCnv7+Vb1IqKNIqc9I7joFZ9hLtEAE0EXO5GxTthPUiMZlQ+BDsd9ehCArO3Q==
+  dependencies:
+    "@vueuse/core" "^9.12.0"
+    "@vueuse/router" "^9.13.0"
+    ant-design-vue "^3.2.15"
+    colorpicker-v3 "^2.10.2"
+    jetlinks-ui-components "^1.0.23"
+    lodash-es "^4.17.21"
+    monaco-editor "^0.40.0"
+    sortablejs "^1.15.0"
+    vuedraggable "^4.1.0"
+
 js-cookie@^3.0.1:
   version "3.0.1"
   resolved "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.1.tgz"

From ccbdef9f3cffa8ad4047744d0ba788fff578ff42 Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Tue, 25 Jul 2023 14:27:47 +0800
Subject: [PATCH 2/8] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E9=A2=9D=E5=A4=96=E8=B7=AF=E7=94=B1=E6=97=A0=E6=B3=95=E8=AE=BF?=
 =?UTF-8?q?=E9=97=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/menu.ts | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/utils/menu.ts b/src/utils/menu.ts
index 2f7de939..c973554d 100644
--- a/src/utils/menu.ts
+++ b/src/utils/menu.ts
@@ -384,7 +384,8 @@ const hasExtraChildren = (item: MenuItem, extraMenus: any ) => {
   if (extraItem) {
     return extraItem.children.map(e => ({
       ...e,
-      url: `${item.url}${e.url}`,
+      code: `${item.code}/${e.code}`,
+      url: `${item.url}/${e.code}`,
       isShow: false
     }))
   }
@@ -416,6 +417,21 @@ const findDetailRouteItem = (item: any, components: any) => {
   return []
 }
 
+const findSaveRouteItem = (item: any, components: any) => {
+  const { code, url } = item
+  const Component = components[`${item.code}/Save`]
+  if (Component) {
+    return [{
+      url: `${url}/detail/:id`,
+      code: `${code}/Save`,
+      component: Component,
+      name: '详情信息',
+      isShow: false
+    }]
+  }
+  return []
+}
+
 export const handleMenus = (menuData: any[], components: any, level: number = 1) => {
   if (menuData && menuData.length) {
     return menuData.map(item => {
@@ -433,8 +449,8 @@ export const handleMenus = (menuData: any[], components: any, level: number = 1)
       const extraRoute = hasExtraChildren(item, extraRouteObj)
       const detail_components = findDetailRouteItem(item, components)
 
-
       if (extraRoute && !isApp) { // 包含额外的子路由
+        console.log(extraRoute)
         route.children = route.children ? [...route.children, ...extraRoute] : extraRoute
       }
 

From 992e9a0aabbd4621501d8b03bc5fa603a40973f6 Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Tue, 25 Jul 2023 19:50:58 +0800
Subject: [PATCH 3/8] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96gateway=E7=9A=84?=
 =?UTF-8?q?=E9=87=87=E9=9B=86=E5=99=A8=E6=96=B0=E5=A2=9E=EF=BC=8C=E7=82=B9?=
 =?UTF-8?q?=E4=BD=8D=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/data-collect/collector.ts             |   1 +
 .../Collector/Point/Save/SaveModBus.vue       |  49 ++-
 .../DataCollect/Collector/Tree/Save/index.vue | 291 +++++++++---------
 .../Detail/components/EditTable/index.vue     |  10 +-
 src/views/link/AccessConfig/Detail/index.vue  |   2 +-
 src/views/link/AccessConfig/data.ts           |   1 +
 vite.config.ts                                |   2 +-
 7 files changed, 192 insertions(+), 164 deletions(-)

diff --git a/src/api/data-collect/collector.ts b/src/api/data-collect/collector.ts
index 53304ef6..ce1c8e5f 100644
--- a/src/api/data-collect/collector.ts
+++ b/src/api/data-collect/collector.ts
@@ -61,3 +61,4 @@ export const scanOpcUAList = (data: any) =>
 
 export const queryTypeList = () => server.get(`/data-collect/opc/data-types`);
 
+export const getProviders = () => server.get('/data-collect/channel/gateway/codec/providers')
\ No newline at end of file
diff --git a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
index 5ddbdfd5..9d40ba15 100644
--- a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
+++ b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
@@ -271,7 +271,7 @@ import {
 import { ModBusRules, checkProviderData } from '../../data.ts';
 import type { FormInstance } from 'ant-design-vue';
 import type { Rule } from 'ant-design-vue/lib/form';
-import { cloneDeep } from 'lodash-es';
+import {cloneDeep, omit} from 'lodash-es';
 
 const props = defineProps({
     data: {
@@ -343,10 +343,18 @@ const handleOk = async () => {
 
     // address是多余字段，但是react版本上使用到了这个字段
     params.configuration.parameter = {
-        ...params.configuration.parameter,
-        address: data?.pointKey,
+      ...params.configuration.parameter,
+      address: data?.pointKey,
     };
 
+    if (props.data.provider === 'GATEWAY') {
+      const configuration = cloneDeep(params.configuration)
+      params.configuration = {
+        configuration: configuration,
+        interval: params.interval
+      }
+    }
+
     loading.value = true;
     const response = !id
         ? await savePointBatch(params).catch(() => {})
@@ -439,22 +447,31 @@ watch(
 watch(
     () => props.data,
     (value) => {
-        if (value.id && value.provider === 'MODBUS_TCP') {
+        if (value.id && ['MODBUS_TCP', 'GATEWAY'].includes(value.provider)) {
             const _value: any = cloneDeep(value);
             const { writeByteCount, byteCount } =
-                _value.configuration.parameter;
+            props.data.provider === 'GATEWAY' ? _value.configuration.configuration.parameter: _value.configuration.parameter;
+
+          if (props.data.provider === 'GATEWAY') {
+            formData.value = {
+              ...omit(_value, ['configuration']),
+              ..._value.configuration,
+            }
+          } else {
             formData.value = _value;
-            if (!!_value.accessModes[0]?.value) {
-                formData.value.accessModes = value.accessModes.map(
-                    (i: any) => i.value,
-                );
-            }
-            if (!!_value.features[0]?.value) {
-                formData.value.features = value.features.map(
-                    (i: any) => i.value,
-                );
-            }
-            formData.value.nspwc = !!writeByteCount || !!byteCount;
+          }
+
+          if (!!_value.accessModes[0]?.value) {
+            formData.value.accessModes = value.accessModes.map(
+                (i: any) => i.value,
+            );
+          }
+          if (!!_value.features[0]?.value) {
+            formData.value.features = value.features.map(
+                (i: any) => i.value,
+            );
+          }
+          formData.value.nspwc = !!writeByteCount || !!byteCount;
         }
     },
     { immediate: true, deep: true },
diff --git a/src/views/DataCollect/Collector/Tree/Save/index.vue b/src/views/DataCollect/Collector/Tree/Save/index.vue
index c4c9f1a6..f869e77f 100644
--- a/src/views/DataCollect/Collector/Tree/Save/index.vue
+++ b/src/views/DataCollect/Collector/Tree/Save/index.vue
@@ -40,114 +40,111 @@
                     v-model:value="formData.name"
                 />
             </j-form-item>
-
-            <template v-if="provider === 'GATEWAY'">
-              <j-form-item
+            <j-form-item
+                v-if="provider === 'GATEWAY'"
                 label="通讯协议"
-                :name="['configuration', 'collectorProvider']"
+                :name="['collectorProvider']"
                 :rules="[{ required: true, message: '请选择通讯协议' }]"
             >
-                <j-select
-                    style="width: 100%"
-                    v-model:value="formData.configuration.collectorProvider"
-                    :options="providerListItems"
-                    placeholder="请选择通讯协议"
-                    allowClear
-                    show-search
-                    :filter-option="filterOption"
-                    :disabled="!!id"
-                />
+              <j-select
+                  style="width: 100%"
+                  v-model:value="formData.collectorProvider"
+                  :options="providerListItems"
+                  placeholder="请选择通讯协议"
+                  allowClear
+                  show-search
+                  :filter-option="filterOption"
+                  :disabled="!!id"
+              />
+            </j-form-item>
+            <j-form-item
+                v-if="visibleUnitId"
+                :name="['configuration', 'unitId']"
+                :rules="LeftTreeRules.unitId"
+                label="从机地址"
+            >
+              <j-input-number
+                  style="width: 100%"
+                  placeholder="请输入从机地址"
+                  v-model:value="formData.configuration.unitId"
+                  :min="0"
+                  :max="255"
+              />
+            </j-form-item>
+            <j-form-item
+                v-if="provider !== 'GATEWAY'"
+                :name="['configuration', 'inheritBreakerSpec', 'type']"
+                :rules="LeftTreeRules.type"
+                label="点位熔断处理"
+            >
+              <j-card-select
+                  :showImage="false"
+                  v-model:value="formData.configuration.inheritBreakerSpec.type"
+                  :options="[
+                                      { label: '降频', value: 'LowerFrequency' },
+                                      { label: '断开', value: 'Break' },
+                                      { label: '忽略', value: 'Ignore' },
+                                  ]"
+                  @change="changeCardSelectType"
+              />
+            </j-form-item>
+            <p style="color: #616161" v-if="provider !== 'GATEWAY'">
+              {{ getTypeTooltip(formData.configuration.inheritBreakerSpec.type) }}
+            </p>
+            <j-form-item
+                v-if="visibleEndian"
+                :name="['configuration', 'endian']"
+                :rules="LeftTreeRules.endian"
+                label="双字高低位切换"
+            >
+            <j-card-select
+                :showImage="false"
+                v-model:value="formData.configuration.endian"
+                :options="[
+                                    { label: 'AB', value: 'BIG' },
+                                    { label: 'BA', value: 'LITTLE' },
+                                ]"
+                @change="changeCardSelectEndian"
+                :column="2"
+            />
+            </j-form-item>
+            <j-form-item
+                v-if="visibleEndian"
+                :name="['configuration', 'endianIn']"
+                :rules="LeftTreeRules.endianIn"
+                label="单字高低位切换"
+            >
+            <j-card-select
+                :showImage="false"
+                v-model:value="formData.configuration.endianIn"
+                :options="[
+                                    { label: 'AB', value: 'BIG' },
+                                    { label: 'BA', value: 'LITTLE' },
+                                ]"
+                @change="changeCardSelectEndianIn"
+                :column="2"
+            />
+            </j-form-item>
+            <div v-if="visibleEndian" style="color: #616161">
+            <p>当前内存布局: {{ endianData }}</p>
+            <p>
+              只有4字节数据类型(int32、ieee754 float)
+              具有4种内存布局，其它只有ABCD、DCBA两种内存布局(以双字配置为准)
+            </p>
+            </div>
+            <j-form-item
+                :name="['configuration', 'requsetTimeout']"
+                label="请求超时时间配置"
+            >
+            <j-input-number
+                style="width: 100%"
+                placeholder="请输入请求超时时间配置"
+                v-model:value="formData.configuration.requsetTimeout"
+                addon-after="ms"
+                :max="2147483648"
+                :min="1"
+            />
             </j-form-item>
-            </template>
-            <template v-else>
-              <j-form-item
-                  v-if="visibleUnitId"
-                  :name="['configuration', 'unitId']"
-                  :rules="LeftTreeRules.unitId"
-                  label="从机地址"
-              >
-                <j-input-number
-                    style="width: 100%"
-                    placeholder="请输入从机地址"
-                    v-model:value="formData.configuration.unitId"
-                    :min="0"
-                    :max="255"
-                />
-              </j-form-item>
-              <j-form-item
-                  :name="['configuration', 'inheritBreakerSpec', 'type']"
-                  :rules="LeftTreeRules.type"
-                  label="点位熔断处理"
-              >
-                <j-card-select
-                    :showImage="false"
-                    v-model:value="formData.configuration.inheritBreakerSpec.type"
-                    :options="[
-                        { label: '降频', value: 'LowerFrequency' },
-                        { label: '断开', value: 'Break' },
-                        { label: '忽略', value: 'Ignore' },
-                    ]"
-                    @change="changeCardSelectType"
-                />
-              </j-form-item>
-              <p style="color: #616161">
-                {{ getTypeTooltip(formData.configuration.inheritBreakerSpec.type) }}
-              </p>
-              <j-form-item
-                  v-if="visibleEndian"
-                  :name="['configuration', 'endian']"
-                  :rules="LeftTreeRules.endian"
-                  label="双字高低位切换"
-              >
-                <j-card-select
-                    :showImage="false"
-                    v-model:value="formData.configuration.endian"
-                    :options="[
-                        { label: 'AB', value: 'BIG' },
-                        { label: 'BA', value: 'LITTLE' },
-                    ]"
-                    @change="changeCardSelectEndian"
-                    :column="2"
-                />
-              </j-form-item>
-              <j-form-item
-                  v-if="visibleEndian"
-                  :name="['configuration', 'endianIn']"
-                  :rules="LeftTreeRules.endianIn"
-                  label="单字高低位切换"
-              >
-                <j-card-select
-                    :showImage="false"
-                    v-model:value="formData.configuration.endianIn"
-                    :options="[
-                        { label: 'AB', value: 'BIG' },
-                        { label: 'BA', value: 'LITTLE' },
-                    ]"
-                    @change="changeCardSelectEndianIn"
-                    :column="2"
-                />
-              </j-form-item>
-              <div v-if="visibleEndian" style="color: #616161">
-                <p>当前内存布局: {{ endianData }}</p>
-                <p>
-                  只有4字节数据类型(int32、ieee754 float)
-                  具有4种内存布局，其它只有ABCD、DCBA两种内存布局(以双字配置为准)
-                </p>
-              </div>
-              <j-form-item
-                  :name="['configuration', 'requsetTimeout']"
-                  label="请求超时时间配置"
-              >
-                <j-input-number
-                    style="width: 100%"
-                    placeholder="请输入请求超时时间配置"
-                    v-model:value="formData.configuration.requsetTimeout"
-                    addon-after="ms"
-                    :max="2147483648"
-                    :min="1"
-                />
-              </j-form-item>
-            </template>
             <j-form-item label="说明" name="description">
                 <j-textarea
                     placeholder="请输入说明"
@@ -176,11 +173,10 @@
     </j-modal>
 </template>
 <script lang="ts" name="CollectorTreeSave" setup>
-import { save, update } from '@/api/data-collect/collector';
+import { save, update, getProviders } from '@/api/data-collect/collector';
 import { LeftTreeRules } from '../../data';
 import type { FormInstance } from 'ant-design-vue';
-import {cloneDeep} from "lodash-es";
-import {getProviders} from "@/api/data-collect/channel";
+import {cloneDeep, omit} from "lodash-es";
 import {protocolList} from "@/utils/consts";
 
 const loading = ref(false);
@@ -208,13 +204,7 @@ const providerListItems = ref()
 const geyProviderList = async () => {
   const resp: any = await getProviders();
   if (resp.success) {
-    const arr = resp.result.filter(
-        (item: any) =>  ['collector-gateway', 'modbus-tcp', 'opc-ua'].includes(item.id),
-    ).map((it: any) => it.id);
-    console.log(arr, protocolList)
-    providerListItems.value = protocolList.filter((item: any) =>
-        arr.includes(item.alias),
-    );
+    providerListItems.value = resp.result.map((item: any) => ({ label: item.name, value: item.id }))
   } else {
     providerListItems.value = []
   }
@@ -255,12 +245,12 @@ const endianData = computed(() => {
 const formData = ref({
     channelId: undefined,
     name: '',
+    collectorProvider: undefined,
     configuration: {
         unitId: '',
         type: 'LowerFrequency',
         endian: 'BIG',
         endianIn: 'BIG',
-        collectorProvider: undefined,
         requsetTimeout: 2000,
         inheritBreakerSpec: {
           type: 'LowerFrequency',
@@ -274,34 +264,52 @@ const formData = ref({
 });
 
 const handleOk = async () => {
-    const data = await formRef.value?.validate();
+    const _data: any = await formRef.value?.validate();
 
+    if (_data) {
+      const { name } = _channelListAll.value.find(
+          (item: any) => item.id === formData.value.channelId,
+      );
 
+      let _copyData = _data
 
-    const { name } = _channelListAll.value.find(
-        (item: any) => item.id === formData.value.channelId,
-    );
+      if (['GATEWAY'].includes(provider.value)) {
+        const copyData = cloneDeep(_data)
+        _copyData = omit(copyData, ['configuration', 'collectorProvider'])
 
-    if (['GATEWAY'].includes(data?.provider)) {
-      data.configuration.inheritBreakerSpec.type = 'Ignore'
-    }
+        _copyData.configuration = {
+          configuration: {
+            ..._data.configuration,
+            inheritBreakerSpec: {
+              type: 'Ignore'
+            }
+          },
+          collectorProvider: _data.collectorProvider
+        }
+      }
 
-    const params = {
-        ...data,
+      const params = {
+        ..._copyData,
         provider: provider.value,
         channelName: name,
         circuitBreaker: {
           type: 'Ignore'
         }
-    };
+      };
 
-    loading.value = true;
-    const response = !id
-        ? await save(params).catch(() => { success: false })
-        : await update(id, { ...props.data, ...params }).catch(() => { success: false });
-    loading.value = false;
-    if (response.success) {
-        emit('change', true);
+      loading.value = true;
+
+      try {
+        const response = !id
+            ? await save(params)
+            : await update(id, { ...props.data, ...params })
+        loading.value = false;
+        if (response.success) {
+          emit('change', true);
+        }
+      } catch (e) {
+        loading.value = false;
+      }
     }
 };
 
@@ -337,7 +345,7 @@ watch(
     (value) => {
         const dt = _channelListAll.value.find((item) => item.id === value);
         visibleUnitId.value = visibleEndian.value =
-            dt?.provider && dt?.provider === 'MODBUS_TCP';
+            dt?.provider && ['MODBUS_TCP', 'GATEWAY'].includes(dt?.provider);
     },
     { deep: true },
 );
@@ -347,7 +355,7 @@ watch(
     (value) => {
         if (value.id) {
           let copyValue = cloneDeep(value)
-          if (!copyValue?.configuration?.inheritBreakerSpec) {
+          if (!copyValue?.configuration?.inheritBreakerSpec && copyValue.provider !== 'GATEWAY') {
             copyValue.configuration = {
               ...copyValue.configuration,
               inheritBreakerSpec: {
@@ -356,12 +364,17 @@ watch(
             }
             copyValue.circuitBreaker.type = 'Ignore'
           }
-          formData.value = copyValue
 
-          const item = props.channelListAll.find(
-              (item: any) => item.id === formData.value.channelId,
-          );
-          provider.value = item?.provider
+          if (copyValue.provider === 'GATEWAY') {
+            formData.value = {
+              ...omit(copyValue, ['configuration']),
+              ...copyValue.configuration,
+            }
+          } else {
+            formData.value = copyValue
+          }
+
+          provider.value = copyValue?.provider
         };
     },
     { immediate: true, deep: true },
diff --git a/src/views/device/Instance/Detail/components/EditTable/index.vue b/src/views/device/Instance/Detail/components/EditTable/index.vue
index 713ddb89..54f4f9f9 100644
--- a/src/views/device/Instance/Detail/components/EditTable/index.vue
+++ b/src/views/device/Instance/Detail/components/EditTable/index.vue
@@ -28,14 +28,9 @@
                                     placeholder="请选择"
                                     allowClear
                                     :filter-option="filterOption"
+                                    :options="channelList"
+                                    @select="(_, option) => { record.provider = option.provider }"
                                 >
-                                    <j-select-option
-                                        v-for="item in channelList"
-                                        :key="item.value"
-                                        :value="item.value"
-                                        :label="item.label"
-                                        >{{ item.label }}</j-select-option
-                                    >
                                 </j-select>
                             </j-form-item>
                         </template>
@@ -269,6 +264,7 @@ const onSave = () => {
                 (i: any) => i.channelId,
             );
             if (arr && arr.length !== 0) {
+                console.log(arr)
                 const resp = await saveMapping(
                     instanceStore.current.id,
                     props.provider,
diff --git a/src/views/link/AccessConfig/Detail/index.vue b/src/views/link/AccessConfig/Detail/index.vue
index aa1f7625..9661b8c0 100644
--- a/src/views/link/AccessConfig/Detail/index.vue
+++ b/src/views/link/AccessConfig/Detail/index.vue
@@ -139,7 +139,7 @@ const getTypeList = (result: Record<string, any>) => {
         } else if (item.id === 'OneNet' || item.id === 'Ctwing') {
             item.type = 'cloud';
             cloud.push(item);
-        } else if (item.id === 'modbus-tcp' || item.id === 'opc-ua') {
+        } else if (item.id === 'modbus-tcp' || item.id === 'opc-ua' || item.id === 'collector-gateway') {
             item.type = 'channel';
             channel.push(item);
         } else if (
diff --git a/src/views/link/AccessConfig/data.ts b/src/views/link/AccessConfig/data.ts
index ba4f72fa..891b18dc 100644
--- a/src/views/link/AccessConfig/data.ts
+++ b/src/views/link/AccessConfig/data.ts
@@ -45,6 +45,7 @@ BackMap.set('gb28181-2016', getImage('/access/gb28181.png'));
 BackMap.set('mqtt-client-gateway', getImage('/access/mqtt-broke.png'));
 BackMap.set('edge-child-device', getImage('/access/child-device.png'));
 BackMap.set('official-edge-gateway', getImage('/access/edge.png'));
+BackMap.set('collector-gateway', getImage('/access/collector-gateway.png'));
 
 const descriptionList = {
     'udp-device-gateway':
diff --git a/vite.config.ts b/vite.config.ts
index f5403f0c..36d90794 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -94,7 +94,7 @@ export default defineConfig(({ mode}) => {
               [env.VITE_APP_BASE_API]: {
                   // target: 'http://192.168.32.226:8844',
                   // target: 'http://192.168.32.244:8881',
-                //   target: 'http://192.168.32.163:8844', //张季本地
+                  // target: 'http://192.168.32.163:8844', //张季本地
                 //   target: 'http://120.77.179.54:8844', // 120测试
                   target: 'http://192.168.33.46:8844', // 本地开发环境
                   ws: 'ws://192.168.33.46:8844',

From 5205755817b8d76a8de34eebb323e2bd46f6efa6 Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Tue, 25 Jul 2023 20:02:45 +0800
Subject: [PATCH 4/8] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=8E=A5=E5=85=A5=E6=96=B0=E5=A2=9E=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/images/access/collector-gateway.png   | Bin 0 -> 2802 bytes
 src/views/link/AccessConfig/Detail/index.vue |   4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 public/images/access/collector-gateway.png

diff --git a/public/images/access/collector-gateway.png b/public/images/access/collector-gateway.png
new file mode 100644
index 0000000000000000000000000000000000000000..1dd93186d6ebcc877e63fd270d002d64a1772d1a
GIT binary patch
literal 2802
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
Ef(PLvIRF3v

literal 0
HcmV?d00001

diff --git a/src/views/link/AccessConfig/Detail/index.vue b/src/views/link/AccessConfig/Detail/index.vue
index 9661b8c0..4571a3f2 100644
--- a/src/views/link/AccessConfig/Detail/index.vue
+++ b/src/views/link/AccessConfig/Detail/index.vue
@@ -141,7 +141,9 @@ const getTypeList = (result: Record<string, any>) => {
             cloud.push(item);
         } else if (item.id === 'modbus-tcp' || item.id === 'opc-ua' || item.id === 'collector-gateway') {
             item.type = 'channel';
-            channel.push(item);
+            if (item.id === 'collector-gateway') {
+              channel.push(item);
+            }
         } else if (
             item.id === 'official-edge-gateway' ||
             item.id === 'edge-child-device'

From 94a2a2c5ec0ba8d6c55dca96af1818ea6c5c2e83 Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Thu, 27 Jul 2023 14:49:15 +0800
Subject: [PATCH 5/8] =?UTF-8?q?fix:=20bug#16782;=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=95=B0=E9=87=87=E5=80=BC=E4=B8=BACOLLECTOR=5FGATEWAY;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/consts.ts                              |  2 +-
 src/views/DataCollect/Channel/Save/index.vue     |  4 ++--
 .../Collector/Point/Save/SaveModBus.vue          |  8 ++++----
 src/views/DataCollect/Collector/Point/index.vue  |  2 +-
 .../DataCollect/Collector/Tree/Save/index.vue    | 16 ++++++++--------
 .../Detail/components/EditTable/PatchMapping.vue | 12 ++++++------
 vite.config.ts                                   |  4 ++--
 7 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/utils/consts.ts b/src/utils/consts.ts
index d4404334..555c55ef 100644
--- a/src/utils/consts.ts
+++ b/src/utils/consts.ts
@@ -55,5 +55,5 @@ export const USER_CENTER_MENU_BUTTON_CODE = 'user-center-passwd-update'
 export const protocolList = [
     { label: 'OPC-UA', value: 'OPC_UA', alias: 'opc-ua' },
     { label: 'Modbus/TCP', value: 'MODBUS_TCP', alias: 'modbus-tcp' },
-    { label: 'GATEWAY', value: 'GATEWAY', alias: 'collector-gateway' },
+    { label: 'GATEWAY', value: 'COLLECTOR_GATEWAY', alias: 'collector-gateway' },
 ]
diff --git a/src/views/DataCollect/Channel/Save/index.vue b/src/views/DataCollect/Channel/Save/index.vue
index 545281c8..cfccd740 100644
--- a/src/views/DataCollect/Channel/Save/index.vue
+++ b/src/views/DataCollect/Channel/Save/index.vue
@@ -93,7 +93,7 @@
                 />
             </j-form-item>
             <j-form-item
-                v-if="formData.provider === 'GATEWAY'"
+                v-if="formData.provider === 'COLLECTOR_GATEWAY'"
                 :name="['configuration','deviceId']"
                 :rules="[{ required: true, message: '请选择网关设备'}]"
                 label="选择网关设备"
@@ -235,7 +235,7 @@ const formData = ref<FormDataType>(cloneDeep(FormState));
 
 const handleOk = async () => {
     const params: any = await formRef.value?.validate();
-    if (params?.provider === 'GATEWAY') {
+    if (params?.provider === 'COLLECTOR_GATEWAY') {
       params.configuration.deviceName = formData.value.configuration.deviceName
     }
 
diff --git a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
index 9d40ba15..20beddc7 100644
--- a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
+++ b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
@@ -347,7 +347,7 @@ const handleOk = async () => {
       address: data?.pointKey,
     };
 
-    if (props.data.provider === 'GATEWAY') {
+    if (props.data.provider === 'COLLECTOR_GATEWAY') {
       const configuration = cloneDeep(params.configuration)
       params.configuration = {
         configuration: configuration,
@@ -447,12 +447,12 @@ watch(
 watch(
     () => props.data,
     (value) => {
-        if (value.id && ['MODBUS_TCP', 'GATEWAY'].includes(value.provider)) {
+        if (value.id && ['MODBUS_TCP', 'COLLECTOR_GATEWAY'].includes(value.provider)) {
             const _value: any = cloneDeep(value);
             const { writeByteCount, byteCount } =
-            props.data.provider === 'GATEWAY' ? _value.configuration.configuration.parameter: _value.configuration.parameter;
+            props.data.provider === 'COLLECTOR_GATEWAY' ? _value.configuration.configuration.parameter: _value.configuration.parameter;
 
-          if (props.data.provider === 'GATEWAY') {
+          if (props.data.provider === 'COLLECTOR_GATEWAY') {
             formData.value = {
               ...omit(_value, ['configuration']),
               ..._value.configuration,
diff --git a/src/views/DataCollect/Collector/Point/index.vue b/src/views/DataCollect/Collector/Point/index.vue
index e05c3d0a..28a3b1c6 100644
--- a/src/views/DataCollect/Collector/Point/index.vue
+++ b/src/views/DataCollect/Collector/Point/index.vue
@@ -20,7 +20,7 @@
                     <template #headerTitle>
                         <j-space>
                             <PermissionButton
-                                v-if="['MODBUS_TCP', 'GATEWAY'].includes(data?.provider)"
+                                v-if="['MODBUS_TCP', 'COLLECTOR_GATEWAY'].includes(data?.provider)"
                                 type="primary"
                                 @click="handlAdd"
                                 hasPermission="DataCollect/Collector:add"
diff --git a/src/views/DataCollect/Collector/Tree/Save/index.vue b/src/views/DataCollect/Collector/Tree/Save/index.vue
index f869e77f..0f1da77f 100644
--- a/src/views/DataCollect/Collector/Tree/Save/index.vue
+++ b/src/views/DataCollect/Collector/Tree/Save/index.vue
@@ -41,7 +41,7 @@
                 />
             </j-form-item>
             <j-form-item
-                v-if="provider === 'GATEWAY'"
+                v-if="provider === 'COLLECTOR_GATEWAY'"
                 label="通讯协议"
                 :name="['collectorProvider']"
                 :rules="[{ required: true, message: '请选择通讯协议' }]"
@@ -72,7 +72,7 @@
               />
             </j-form-item>
             <j-form-item
-                v-if="provider !== 'GATEWAY'"
+                v-if="provider !== 'COLLECTOR_GATEWAY'"
                 :name="['configuration', 'inheritBreakerSpec', 'type']"
                 :rules="LeftTreeRules.type"
                 label="点位熔断处理"
@@ -88,7 +88,7 @@
                   @change="changeCardSelectType"
               />
             </j-form-item>
-            <p style="color: #616161" v-if="provider !== 'GATEWAY'">
+            <p style="color: #616161" v-if="provider !== 'COLLECTOR_GATEWAY'">
               {{ getTypeTooltip(formData.configuration.inheritBreakerSpec.type) }}
             </p>
             <j-form-item
@@ -273,7 +273,7 @@ const handleOk = async () => {
 
       let _copyData = _data
 
-      if (['GATEWAY'].includes(provider.value)) {
+      if (['COLLECTOR_GATEWAY'].includes(provider.value)) {
         const copyData = cloneDeep(_data)
         _copyData = omit(copyData, ['configuration', 'collectorProvider'])
 
@@ -345,7 +345,7 @@ watch(
     (value) => {
         const dt = _channelListAll.value.find((item) => item.id === value);
         visibleUnitId.value = visibleEndian.value =
-            dt?.provider && ['MODBUS_TCP', 'GATEWAY'].includes(dt?.provider);
+            dt?.provider && ['MODBUS_TCP', 'COLLECTOR_GATEWAY'].includes(dt?.provider);
     },
     { deep: true },
 );
@@ -355,7 +355,7 @@ watch(
     (value) => {
         if (value.id) {
           let copyValue = cloneDeep(value)
-          if (!copyValue?.configuration?.inheritBreakerSpec && copyValue.provider !== 'GATEWAY') {
+          if (!copyValue?.configuration?.inheritBreakerSpec && copyValue.provider !== 'COLLECTOR_GATEWAY') {
             copyValue.configuration = {
               ...copyValue.configuration,
               inheritBreakerSpec: {
@@ -365,7 +365,7 @@ watch(
             copyValue.circuitBreaker.type = 'Ignore'
           }
 
-          if (copyValue.provider === 'GATEWAY') {
+          if (copyValue.provider === 'COLLECTOR_GATEWAY') {
             formData.value = {
               ...omit(copyValue, ['configuration']),
               ...copyValue.configuration,
@@ -381,7 +381,7 @@ watch(
 );
 
 watchEffect(() => {
-  if (provider.value === 'GATEWAY') {
+  if (provider.value === 'COLLECTOR_GATEWAY') {
     geyProviderList()
   }
 })
diff --git a/src/views/device/Instance/Detail/components/EditTable/PatchMapping.vue b/src/views/device/Instance/Detail/components/EditTable/PatchMapping.vue
index d488608d..c1133a31 100644
--- a/src/views/device/Instance/Detail/components/EditTable/PatchMapping.vue
+++ b/src/views/device/Instance/Detail/components/EditTable/PatchMapping.vue
@@ -104,12 +104,12 @@ const handleData = (data: any[], type: string) => {
 const handleSearch = async () => {
     loading.value = true;
     const resp = await treeMapping({
-        terms: [
-            {
-                column: 'provider',
-                value: _props.type,
-            },
-        ],
+        // terms: [
+        //     {
+        //         column: 'provider',
+        //         value: _props.type,
+        //     },
+        // ],
     });
     loading.value = false;
     if (resp.status === 200) {
diff --git a/vite.config.ts b/vite.config.ts
index 36d90794..ffa11a2c 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -94,9 +94,9 @@ export default defineConfig(({ mode}) => {
               [env.VITE_APP_BASE_API]: {
                   // target: 'http://192.168.32.226:8844',
                   // target: 'http://192.168.32.244:8881',
-                  // target: 'http://192.168.32.163:8844', //张季本地
+                  target: 'http://192.168.32.163:8844', //张季本地
                 //   target: 'http://120.77.179.54:8844', // 120测试
-                  target: 'http://192.168.33.46:8844', // 本地开发环境
+                //   target: 'http://192.168.33.46:8844', // 本地开发环境
                   ws: 'ws://192.168.33.46:8844',
                   changeOrigin: true,
                   rewrite: (path) => path.replace(/^\/api/, '')

From ade84016383f75987b83c35e3b838fc60b7cfb90 Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Thu, 27 Jul 2023 15:35:14 +0800
Subject: [PATCH 6/8] =?UTF-8?q?fix:=20=E6=96=B0=E5=A2=9E=E9=80=9A=E9=81=93?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0circuitBreaker=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/DataCollect/Channel/Save/index.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/DataCollect/Channel/Save/index.vue b/src/views/DataCollect/Channel/Save/index.vue
index cfccd740..037873eb 100644
--- a/src/views/DataCollect/Channel/Save/index.vue
+++ b/src/views/DataCollect/Channel/Save/index.vue
@@ -239,7 +239,9 @@ const handleOk = async () => {
       params.configuration.deviceName = formData.value.configuration.deviceName
     }
 
-
+    params.circuitBreaker = {
+      type: 'Ignore'
+    }
 
     loading.value = true;
     const response = !id

From 334928559085dbfb5d56337cda93415ff092d525 Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Thu, 27 Jul 2023 16:12:10 +0800
Subject: [PATCH 7/8] fix: 16802

---
 src/views/DataCollect/Collector/Tree/Save/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/DataCollect/Collector/Tree/Save/index.vue b/src/views/DataCollect/Collector/Tree/Save/index.vue
index 0f1da77f..86d34285 100644
--- a/src/views/DataCollect/Collector/Tree/Save/index.vue
+++ b/src/views/DataCollect/Collector/Tree/Save/index.vue
@@ -318,7 +318,8 @@ const getTypeTooltip = (value: string) => {
     case 'LowerFrequency': return '连续20次采集异常后，降低采集频率至设定频率的1/10，故障处理后，采集频率将恢复至设定频率。';
     // case 'Break': return '连续10分钟异常，停止采集数据进入断开状态，设备重新启用后恢复采集状态。'
     case 'Break': return '连续20次采集异常后，降低采集频率至设定频率的1/10，10分钟内未排除故障，将停止采集。'
-    default: return '忽略异常，保持设定采集频率。';
+    case 'Ignore': return '忽略异常，保持设定采集频率。';
+    default: return '';
   }
 }
 

From 2c30751eee8c2504f969f1d5d1edd87b481d68c0 Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Fri, 28 Jul 2023 12:26:15 +0800
Subject: [PATCH 8/8] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=80=9A=E9=81=93?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataCollect/Collector/Tree/index.vue      | 37 +++++++++++++------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/views/DataCollect/Collector/Tree/index.vue b/src/views/DataCollect/Collector/Tree/index.vue
index 74d17139..14866062 100644
--- a/src/views/DataCollect/Collector/Tree/index.vue
+++ b/src/views/DataCollect/Collector/Tree/index.vue
@@ -36,25 +36,38 @@
                     <Ellipsis class="tree-left-title">
                         {{ name }}
                     </Ellipsis>
+<!--                    <j-tag-->
+<!--                        class="tree-left-tag"-->
+<!--                        v-if="data.id !== '*'"-->
+<!--                        :color="-->
+<!--                          data?.uniformState?.value === 'normal' || data?.state?.value === 'disabled' ?-->
+<!--                          colorMap.get(data?.runningState?.value) :-->
+<!--                          colorMap.get(data?.uniformState?.value)-->
+<!--                        "-->
+<!--                        >{{-->
+<!--                        data?.uniformState?.value === 'normal' || data?.state?.value === 'disabled' ?-->
+<!--                            data?.runningState?.text :-->
+<!--                            data?.uniformState?.text-->
+<!--                      }}</j-tag-->
+<!--                    >-->
                     <j-tag
                         class="tree-left-tag"
                         v-if="data.id !== '*'"
-                        :color="
-                          data?.uniformState?.value === 'normal' || data?.state?.value === 'disabled' ?
-                          colorMap.get(data?.runningState?.value) :
-                          colorMap.get(data?.uniformState?.value)
-                        "
-                        >{{
-                        data?.uniformState?.value === 'normal' || data?.state?.value === 'disabled' ?
-                            data?.runningState?.text :
-                            data?.uniformState?.text
-                      }}</j-tag
+                        :color="colorMap.get(data?.uniformState?.value)"
+                    >{{ data?.uniformState?.text }}</j-tag
                     >
                     <j-tag
                         class="tree-left-tag2"
                         v-if="data.id !== '*'"
-                        :color="colorMap.get(data?.state?.value)"
-                        >{{ data?.state?.text }}</j-tag
+                        :color="
+                          data?.state?.value === 'disabled' ? colorMap.get(data?.runningState?.value) :
+                          colorMap.get(data?.state?.value)
+                        "
+                        >
+                      {{
+                        data?.state?.text
+                      }}
+                    </j-tag
                     >
                     <span
                         v-if="data.id !== '*'"