完善物联功能

src/views/iot/subSystem/dialog.history.vue

@@ -69,8 +69,8 @@
               </template></el-table-column
             >
             <el-table-column
-              prop="updateTime"
-              label="布撤防登记时间"
+              prop="statusChangeTime"
+              label="布撤防时间"
               align="center"
             >
             </el-table-column>
@@ -78,7 +78,17 @@
               align="center"
               prop="statusUpdatorName"
               label="登记人"
-            ></el-table-column>
+            >
+            <template slot-scope="r">
+                <span>
+                  {{
+                    r.row.statusUpdatorName
+                      ? r.row.statusUpdatorName
+                      : "自动获取"
+                  }}
+                </span>
+              </template>
+          </el-table-column>
           </el-table>
           </div>
         

src/views/iot/videoDiagnosis/detail.vue

@@ -45,7 +45,7 @@
       <div v-else>
         <el-descriptions
           title="录像质量"
-          :column="2"
+          :column="3"
           border
           :label-style="labelStyle"
           :contentStyle="content_style"
@@ -53,6 +53,9 @@
           <el-descriptions-item label="检测结果">{{
             getLabel(videoDiagnosisState, data.quality.quality)
           }}</el-descriptions-item>
+          <el-descriptions-item label="检测日期">{{
+            dayjs().format("YYYY年M月D日")
+          }}</el-descriptions-item>
           <el-descriptions-item label="更新时间">{{
             dayjs(data.quality.updateTime).format("YYYY年M月D日H时m分")
           }}</el-descriptions-item>
@@ -165,9 +168,7 @@
             dayjs(integrity.recordDate).format("YYYY年M月D日")
           }}</el-descriptions-item>
           <el-descriptions-item label="丢失时长">{{
-            integrity.loseDuration == 0
-              ? "未丢失"
-              : integrity.loseDuration + "分钟"
+            lostDurationText(integrity.loseDuration)
           }}</el-descriptions-item>
           <el-descriptions-item label="更新时间">{{
             dayjs(integrity.updateTime).format("YYYY年M月D日H时m分")
@@ -358,7 +359,7 @@ export default {
     },
     getIntegrity(hostCode, channelCode, date) {
       integrity(hostCode, channelCode, dayjs(date).format("YYYY-MM-DD")).then((r) => {
-        
+
         this.handleInterity(r.data);
       });
     },
@@ -392,6 +393,21 @@ export default {
     onSelectDate(date) {
       this.getIntegrity(this.data.hostCode,this. data.channelCode, date);
     },
+    lostDurationText(duration) {
+      if (!duration) {
+        return '未丢失'
+      }
+
+      let str = ''
+      let hour = Math.floor(duration / 60)
+      if (hour > 0) {
+        str += `${hour}小时`
+      }
+
+      let minute = duration % 60
+      str += `${minute}分`
+      return str
+    }  
   },
 };
 </script>

src/views/iot/videoRecorder/detail.dialog.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="edu-training-edit">
-    <DialogCom title="查看监控主机详情" :visible.sync="isShow" width="60%">
+    <DialogCom title="硬盘录像机详情" :visible.sync="isShow" width="60%">
       <div class="page-body">
         <div class="titleDiv">
           <div class="line"></div>
@@ -38,11 +38,12 @@
           >
             <div>
               <span class="progressName"
-                >{{ disk.diskName }}
-                <span v-if="i == 4" style="color: brown"
-                  >({{ disk.state === 1 ? "异常" : "正常" }})</span
-                ></span
-              ><span class="progressMain"
+                >{{ disk.diskName }}                
+                <el-tag  v-if ="disk.state == 0" type="success">状态：正常</el-tag>
+                <el-tag  v-else-if ="disk.state == 1" type="danger">状态：异常</el-tag>
+                <el-tag  v-else type="info">状态：未知</el-tag>
+              </span>
+                <span class="progressMain"
                 >{{
                   ((disk.total - disk.available) / 1024).toFixed(1)
                 }}G已用(共{{ (disk.total / 1024).toFixed(1) }}G)</span

src/views/iot/videoRecorder/index.vue

@@ -30,7 +30,20 @@
                   maxlength="50"
                 />
               </el-form-item>
-
+              <el-form-item label="网络状态" prop="netState">
+                <el-select
+                  v-model="queryParams.netState"
+                  placeholder="请选择网络状态"
+                  clearable
+                >
+                  <el-option
+                    v-for="dict in dict.type.iot_device_net_status"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
               <!-- <el-form-item label="任务时间" prop="planStartTime">
                 <DataRangePicker
                   type="daterange"
@@ -104,7 +117,7 @@
               label="序号"
               type="index"
               align="center"
-              width="100"
+              width="80"
             >
               <template slot-scope="scope">
                 <span>{{
@@ -132,7 +145,7 @@
               label="品牌"
               align="center"
               prop="brand"
-              width="220"
+              width="150"
             />
             <el-table-column
               label="IP地址"
@@ -151,7 +164,12 @@
                 }}
               </template>
             </el-table-column>
-            <el-table-column label="硬盘总数" align="center" prop="diskCount">
+            <el-table-column
+              label="硬盘总数"
+              align="center"
+              prop="diskCount"
+              width="120"
+            >
               <!-- <template slot-scope="scope">
                 {{ scope.row.planStartTime }}~{{ scope.row.planEndTime }}
               </template> -->
@@ -163,12 +181,7 @@
               prop="diskExceptionCount"
               width="150"
             />
-            <el-table-column
-              label="已用空间/总空间"
-              align="center"
-              prop="sykj"
-              width="160"
-            >
+            <el-table-column label="已用空间/总空间" align="center">
               <template slot-scope="r">
                 {{ renderStroageInfo(r.row) }}
               </template>
@@ -193,7 +206,8 @@
               </template>
             </el-table-column>
           </el-table>
-          <detail-dialog :netStatusOptions="dict.type.iot_device_net_status"
+          <detail-dialog
+            :netStatusOptions="dict.type.iot_device_net_status"
             ref="infoDialog"
           ></detail-dialog>
           <pagination
@@ -239,6 +253,7 @@ export default {
         hostName: null,
         checkSub: true,
         orgId: null,
+        netState: null,
         // range:[],
       },
       selectedOrgName: "",
@@ -246,12 +261,12 @@ export default {
       form: {},
       // 表单校验
       rules: {},
-      defaultOrgName:null,
+      defaultOrgName: null,
     };
   },
   created() {},
   computed: {
-    ...mapGetters(["orgId", "userId","orgName"]),
+    ...mapGetters(["orgId", "userId", "orgName"]),
   },
   methods: {
     getLabel,
@@ -287,12 +302,12 @@ export default {
         .then((r) => (this.dvrdiskStatistic = r.data));
     },
 
-    showDetail(row){
-      this.$refs.infoDialog.show(row)
+    showDetail(row) {
+      this.$refs.infoDialog.show(row);
     },
 
     getDefaultOrg(org) {
-      this.defaultOrgName=org.shortName
+      this.defaultOrgName = org.shortName;
       this.selectedOrgName = org.shortName;
     },