物联设备优化

src/views/biz/nuBaseInfo/iotDevices/IotDevices.data.ts

@@ -20,25 +20,42 @@ export const columns: BasicColumn[] = [
     align: "center",
     dataIndex: 'sn'
   },
-  {
+  // {
-    title: '设备型号',
+  //   title: '设备型号',
-    align: "center",
+  //   align: "center",
-    dataIndex: 'deviceModel'
+  //   dataIndex: 'deviceModel'
-  },
+  // },
   {
     title: '设备维度',
     align: "center",
-    dataIndex: 'dimension'
+    dataIndex: 'dimension',
+    width: 100
   },
   {
     title: '设备类型',
     align: "center",
-    dataIndex: 'deviceType_dictText'
+    dataIndex: 'deviceType_dictText',
+    width: 100
   },
   {
-    title: '在线状态',
+    title: '设备状态',
     align: "center",
-    dataIndex: 'deviceStatus_dictText'
+    dataIndex: 'deviceStatus',
+    width: 100
+  },
+  {
+    title: '报修状态',
+    align: "center",
+    dataIndex: 'maintainStatus',
+    customRender:({record})=>{
+      if(record.maintainStatus=='0'){
+        return "正常";
+      }
+      if(record.maintainStatus=='1'){
+        return "损坏";
+      }
+    },
+    width: 100
   },
 ];
 export const columnsTy: BasicColumn[] = [
@@ -47,11 +64,11 @@ export const columnsTy: BasicColumn[] = [
     align: "center",
     dataIndex: 'deviceIndex'
   },
-  {
+  // {
-    title: '设备型号',
+  //   title: '设备型号',
-    align: "center",
+  //   align: "center",
-    dataIndex: 'deviceModel'
+  //   dataIndex: 'deviceModel'
-  },
+  // },
   {
     title: '设备维度',
     align: "center",
@@ -63,9 +80,9 @@ export const columnsTy: BasicColumn[] = [
     dataIndex: 'deviceType_dictText'
   },
   {
-    title: '在线状态',
+    title: '设备状态',
     align: "center",
-    dataIndex: 'deviceStatus_dictText'
+    dataIndex: 'deviceStatus'
   },
 ];
 // 高级查询数据

src/views/biz/nuBaseInfo/iotDevices/IotDevicesList.vue

@@ -24,8 +24,15 @@
           </a-col>
           <a-col :lg="6">
             <a-form-item name="deviceStatus">
-              <template #label><span title="在线状态">在线状态</span></template>
+              <template #label><span title="设备状态">设备状态</span></template>
-              <j-dict-select-tag v-model:value="queryParam.deviceStatus" :showLabel="false" dictCode="tplink_status" placeholder="请选择在线状态"  />
+              <a-select v-model:value="queryParam.deviceStatus" placeholder="请选择设备状态" allow-clear>
+                <a-select-option value="在线">在线</a-select-option>
+                <a-select-option value="离线">离线</a-select-option>
+                <a-select-option value="合闸">合闸</a-select-option>
+                <a-select-option value="拉闸">拉闸</a-select-option>
+                <a-select-option value="开阀">开阀</a-select-option>
+                <a-select-option value="关阀">关阀</a-select-option>
+              </a-select>
             </a-form-item>
           </a-col>
           <a-col  :lg="9" :md="9" :sm="24">
@@ -85,7 +92,7 @@ import CameraPreviewModal from '/@/views/iot/tplink/camera/components/CameraPrev
       showIndexColumn: true,
       immediate: false,
       actionColumn: {
-        width: 120,
+        width: 80,
         fixed: 'right',
       },
       beforeFetch: async (params) => {