物联设备BUG处理

src/views/device/config/DeviceConfigList.vue

@@ -4,7 +4,7 @@
     <BasicTable @register="registerTable">
       <!--插槽:table标题-->
       <template #tableTitle>
-        <a-button type="primary" preIcon="ant-design:plus-outlined" @click="handleAdd"> 添加</a-button>
+        <a-button type="primary" preIcon="ant-design:plus-outlined" @click="handleAdd"> 新增</a-button>
       </template>
       <template #bodyCell="{ column, record, index, text }">
       </template>

src/views/device/config/components/DeviceConfigForm.vue

@@ -6,7 +6,7 @@
           <a-row >
             <a-col :span="24">
               <a-form-item label="设备名称" v-bind="validateInfos.deviceName" id="DeviceConfigForm-deviceModel" name="deviceName">
-                <a-input v-model:value="formData.deviceName"></a-input>
+                <a-input v-model:value="formData.deviceName" placeholder="请填写设备名称"></a-input>
               </a-form-item>
             </a-col>
           </a-row>
@@ -20,14 +20,14 @@
           <a-row >
             <a-col :span="24">
               <a-form-item label="规格型号" v-bind="validateInfos.deviceModel" id="DeviceConfigForm-deviceModel" name="deviceModel">
-                <a-input v-model:value="formData.deviceModel"></a-input>
+                <a-input v-model:value="formData.deviceModel" placeholder="请填写规格型号"></a-input>
               </a-form-item>
             </a-col>
           </a-row>
           <a-row >
             <a-col :span="24">
               <a-form-item label="生产厂家" v-bind="validateInfos.factory" id="DeviceConfigForm-factory" name="factory">
-                <a-input v-model:value="formData.factory"></a-input>
+                <a-input v-model:value="formData.factory" placeholder="请填写生产厂家"></a-input>
               </a-form-item>
             </a-col>
           </a-row>
@@ -71,7 +71,7 @@ const formData = reactive<Record<string, any>>({
   deviceType: '',
   deviceModel: '',
   factory: '',
-  dimension: ''
+  dimension: '机构维度'
 });
 const { createMessage } = useMessage();
 const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });

src/views/device/manager/components/batch/DeviceBatchList.vue

@@ -181,12 +181,12 @@ function getTableAction(record) {
     {
       label: '推送清单',
       onClick: handleSend.bind(null, record),
-      ifShow: record.izPush == 'N' && record.childrenCn > 0 && izShow.value
+      ifShow: record.izPush == 'N' && record.childrenCn > 0
     },
     {
       label: '编辑',
       onClick: handleEdit.bind(null, record),
-      ifShow: record.izPush == 'N' && izShow.value
+      ifShow: record.izPush == 'N'
     },
     {
       label: '删除',
@@ -194,7 +194,7 @@ function getTableAction(record) {
         title: '是否确定删除？',
         confirm: handleDelete.bind(null, record),
       },
-      ifShow: record.izPush == 'N' && izShow.value
+      ifShow: record.izPush == 'N'
     },
   ];
 }

src/views/device/manager/components/integration/CameraList.vue

@@ -134,12 +134,12 @@ function getTableAction(record) {
     {
       label: '拉取设备',
       onClick: handlePull.bind(null, record),
-      ifShow: record.sn != null && record.deviceStatus =='待集成'
+      ifShow: record.sn != null && record.deviceStatus =='待集成' && record.maintainStatus !='损坏'
     },
     {
       label: '预览',
       onClick: handlePreview.bind(null, record),
-      ifShow: record.deviceType == 'SURVEILLANCECAMERA' && record.deviceStatus !='待集成'
+      ifShow: record.deviceType == 'SURVEILLANCECAMERA' && record.deviceStatus !='待集成' && record.maintainStatus !='损坏'
     },
   ];
 }

src/views/device/manager/components/integration/ElectricityList.vue

@@ -120,7 +120,7 @@ function getTableAction(record) {
     {
       label: '拉取设备',
       onClick: handlePull.bind(null, record),
-      ifShow: record.sn != null && record.deviceStatus =='待集成'
+      ifShow: record.sn != null && record.deviceStatus =='待集成' && record.maintainStatus !='损坏'
     },
   ];
 }

src/views/device/manager/components/integration/HumidList.vue

@@ -131,12 +131,12 @@ function getTableAction(record) {
     {
       label: '拉取设备',
       onClick: handlePull.bind(null, record),
-      ifShow: record.sn != null && record.deviceStatus =='待集成'
+      ifShow: record.sn != null && record.deviceStatus =='待集成' && record.maintainStatus !='损坏'
     },
     {
       label: '配置',
       onClick: handleConfig.bind(null, record),
-      ifShow: record.deviceStatus !='待集成'
+      ifShow: record.deviceStatus !='待集成' && record.maintainStatus !='损坏'
     },
   ];
 }

src/views/device/manager/components/integration/NetworkList.vue

@@ -119,7 +119,7 @@ function getTableAction(record) {
     {
       label: '拉取设备',
       onClick: handlePull.bind(null, record),
-      ifShow: record.sn != null && record.deviceStatus =='待集成'
+      ifShow: record.sn != null && record.deviceStatus =='待集成' && record.maintainStatus !='损坏'
     },
   ];
 }

src/views/device/manager/components/integration/WaterList.vue

@@ -119,7 +119,7 @@ function getTableAction(record) {
     {
       label: '拉取设备',
       onClick: handlePull.bind(null, record),
-      ifShow: record.sn != null && record.deviceStatus =='待集成'
+      ifShow: record.sn != null && record.deviceStatus =='待集成' && record.maintainStatus !='损坏'
     },
   ];
 }

src/views/device/manager/components/log/log.data.ts

@@ -73,6 +73,12 @@ export const columns: BasicColumn[] = [
     dataIndex: 'optType',
     width: 100
   },
+  {
+    title: '备注',
+    align: "center",
+    dataIndex: 'remarks',
+    width: 200
+  },
 ];
 
 export const searchFormSchema: FormSchema[] = [];