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

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

@@ -15,10 +15,11 @@ export const columns: BasicColumn[] = [
     width: 100,
   },
   {
-    title: '描述',
+    title: '所属系统',
     dataIndex: 'description',
     width: 100,
   },
+ 
   {
     title: '排序',
     dataIndex: 'sortOrder',
@@ -49,10 +50,20 @@ export const formSchema: FormSchema[] = [
     field: 'itemValue',
     component: 'Input',
   },
+  // {
+  //   label: '描述',
+  //   field: 'description',
+  //   component: 'Input',
+  // },
   {
-    label: '描述',
+    label: '所属系统',
     field: 'description',
-    component: 'Input',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: 'kindtype ',  
+      placeholder: '请选择所属系统',
+    },
+    // colProps: { span: 6 },
   },
   {
     label: '排序值',