Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base

src/views/vent/deviceManager/equipManager/equip.data.ts

@@ -16,7 +16,7 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '所属系统',
-    dataIndex: 'description',
+    dataIndex: 'description_dictText',
     width: 100,
   },
  

src/views/vent/deviceManager/substationTabel/index.vue

@@ -22,7 +22,7 @@
       
       </template>
       <template #action="{ record }">
-        <a v-if="record['strtype'] == 'http'" class="table-action-link" @click="addDevices(record)">同步设备</a>
+        <a v-if="record['strtype'] == 'http'|| record['strtype'] == 'kafka'" class="table-action-link" @click="addDevices(record)">同步设备</a>
       </template>
     </NormalTable>
   </div>

src/views/vent/deviceManager/substationTabel/substation.data.ts

@@ -99,30 +99,6 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     required: true,
   },
-  {
-    label: '监测类型',
-    field: 'monitorparam',
-    component: 'MTreeSelect',
-    componentProps: {
-      isSearch: false
-    },
-  },
-  {
-    label: '分站站号',
-    field: 'code   ',
-    component: 'Input',
-  },
-  {
-    label: '分站IP地址',
-    field: 'strip',
-    component: 'Input',
-    required: true,
-  },
-  {
-    label: '分站端口',
-    field: 'nport',
-    component: 'InputNumber',
-  },
 
   {
     label: '读取数据方式',
@@ -147,10 +123,10 @@ export const formSchema: FormSchema[] = [
             });
             if (e == 'http') {
               updateSchema({
-                label: 'reqHeader请求头',
+                label: '请求参数或读取文件名',
                 field: 'reqparam',
                 component: 'Input',
-                required: true,
+                required: false,
                 show: true,
               });
             }
@@ -160,6 +136,25 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
+    label: '监测类型',
+    field: 'monitorparam',
+    component: 'MTreeSelect',
+    componentProps: {
+      isSearch: false
+    },
+  },
+  {
+    label: '分站IP或请求地址',
+    field: 'strip',
+    component: 'Input',
+    required: true,
+  },
+  {
+    label: '分站端口',
+    field: 'nport',
+    component: 'InputNumber',
+  },
+  {
     label: 'PLC类型',
     field: 'plcType',
     component: 'JDictSelectTag',
@@ -170,6 +165,11 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
+    label: '分站站号',
+    field: 'code   ',
+    component: 'Input',
+  },
+  {
     label: '系统缓存点表下标',
     field: 'plcTable',
     component: 'Input',
@@ -190,12 +190,12 @@ export const formSchema: FormSchema[] = [
     show: false,
   },
   {
-    label: '请求参数',
+    label: '请求参数或读取文件名',
     field: 'reqparam',
     component: 'Input',
   },
   {
-    label: '数据属性字段',
+    label: '数据属性字段(json中数据列表的字段-)',
     field: 'dataproperty',
     component: 'Input',
   },
@@ -210,6 +210,16 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
   },
   {
+    label: '连接用户名',
+    field: 'remoteUser',
+    component: 'Input',
+  },
+  {
+    label: '连接密码',
+    field: 'remotePass',
+    component: 'Input',
+  },
+  {
     label: '数据格式化',
     field: 'dataformat',
     component: 'Input',
@@ -220,18 +230,37 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
   },
   {
-    label: '连接用户名',
-    field: 'remoteUser',
+    label: '控制请求地址',
+    field: 'control_strip',
     component: 'Input',
   },
   {
-    label: '连接密码',
-    field: 'remotePass',
+    label: '控制请求类型',
+    field: 'control_reqtype',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: 'reqtype',
+      placeholder: '请选择控制请求方式',
+    },
+  },
+  {
+    label: '控制请求Header',
+    field: 'control_header',
+    component: 'Input',
+  },
+  {
+    label: '控制请求参数',
+    field: 'control_reqparam',
+    component: 'Input',
+  },
+  {
+    label: '登录地址',
+    field: 'login_url',
     component: 'Input',
   },
   {
-    label: '图层ID',
-    field: 'nlayerid',
+    label: '登录结果解析(返回的token读取字段)',
+    field: 'loginResult',
     component: 'Input',
   },
   {