Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_vue

2、服务指令：增加列表页指令标签的显示

src/views/config/serviceDirective/ConfigServiceDirective.data.ts

@@ -41,6 +41,20 @@ export const columns: BasicColumn[] = [
     align: 'center',
     dataIndex: 'directiveName',
   },
+  {
+    title: '指令标签',
+    align: 'center',
+    dataIndex: 'tagList',
+    width:150,
+    ellipsis: false,
+    format(text, record, index) {
+      if(!!text){
+        return text.map(item => item.tagName).join('，');
+      }else{
+        return '暂未设置'
+      }
+    },
+  },
   // {
   //   title: '收费价格',
   //   align: 'center',

src/views/iot/tplink/project/ProjectInfo.data.ts

@@ -1,56 +1,70 @@
-import {BasicColumn} from '/@/components/Table';
-import {FormSchema} from '/@/components/Table';
+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
 
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '机构序号',
-    align: "center",
-    dataIndex: 'projectId'
+    title: '项目序号',
+    align: 'center',
+    dataIndex: 'projectId',
+  },
+  {
+    title: '项目名称',
+    align: 'center',
+    dataIndex: 'projectName',
   },
   {
     title: '机构名称',
-    align: "center",
-    dataIndex: 'projectName'
+    align: 'center',
+    dataIndex: 'institutionalId_dictText',
   },
   {
     title: '创建时间',
-    align: "center",
-    dataIndex: 'createTimeStr'
+    align: 'center',
+    dataIndex: 'createTimeStr',
   },
   {
     title: '设备数量',
-    align: "center",
-    dataIndex: 'deviceNum'
+    align: 'center',
+    dataIndex: 'deviceNum',
   },
   {
     title: '离线设备数',
-    align: "center",
-    dataIndex: 'offlineNum'
+    align: 'center',
+    dataIndex: 'offlineNum',
   },
   {
     title: '异常设备数',
-    align: "center",
-    dataIndex: 'abnormalNum'
+    align: 'center',
+    dataIndex: 'abnormalNum',
   },
   {
     title: '运行天数',
-    align: "center",
-    dataIndex: 'runningTimeStr'
+    align: 'center',
+    dataIndex: 'runningTimeStr',
   },
   {
     title: '状态',
-    align: "center",
+    align: 'center',
     dataIndex: 'status',
-    customRender:({record})=>{
-      return record.status?(record.status=='1'?'正常':'冻结'):'';
+    customRender: ({ record }) => {
+      return record.status ? (record.status == '1' ? '正常' : '冻结') : '';
     },
-  }
+  },
 ];
 
 export const searchFormSchema: FormSchema[] = [
   {
-    label: '名称',
+    label: '机构',
+    field: 'institutionalId',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: 'sys_depart,depart_name,id,org_category = 1 order by depart_name asc',
+      placeholder: '请选择机构',
+    },
+  },
+  {
+    label: '项目名称',
     field: 'projectName',
     component: 'Input',
     //colProps: { span: 6 },
@@ -67,7 +81,7 @@ export const searchFormSchema: FormSchema[] = [
       ],
     },
     //colProps: { span: 6 },
-  }
+  },
 ];
 
 export const formSchema: FormSchema[] = [
@@ -78,45 +92,54 @@ export const formSchema: FormSchema[] = [
     show: false,
   },
   {
-    label: '机构序号',
+    label: '项目序号',
     field: 'projectId',
     component: 'Input',
-    dynamicDisabled: true
+    dynamicDisabled: true,
+  },
+  {
+    label: '项目名称',
+    field: 'projectName',
+    component: 'Input',
   },
   {
     label: '机构名称',
-    field: 'projectName',
-    component: 'Input',
+    field: 'institutionalId',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: 'sys_depart,depart_name,id,org_category = 1 order by depart_name asc',
+      placeholder: '请选择机构',
+    },
   },
   {
     label: '创建时间',
     field: 'createTimeStr',
     component: 'Input',
-    dynamicDisabled: true
+    dynamicDisabled: true,
   },
   {
     label: '设备数量',
     field: 'deviceNum',
     component: 'Input',
-    dynamicDisabled: true
+    dynamicDisabled: true,
   },
   {
     label: '离线设备数',
     field: 'offlineNum',
     component: 'Input',
-    dynamicDisabled: true
+    dynamicDisabled: true,
   },
   {
     label: '异常设备数',
     field: 'abnormalNum',
     component: 'Input',
-    dynamicDisabled: true
+    dynamicDisabled: true,
   },
   {
     label: '运行天数',
     field: 'runningTimeStr',
     component: 'Input',
-    dynamicDisabled: true
+    dynamicDisabled: true,
   },
   {
     label: '状态',
@@ -128,10 +151,9 @@ export const formSchema: FormSchema[] = [
         options: [
           { label: '正常', value: 1, key: '1' },
           { label: '冻结', value: 2, key: '2' },
-        ]
+        ],
       };
     },
-    dynamicDisabled: true
+    dynamicDisabled: true,
   },
 ];
-