Merge remote-tracking branch 'origin/V0.0.6_iot' into V0.0.6_iot

src/api/iot/videoDiagnosis.js

@@ -24,3 +24,11 @@ export function integrity(hostCode, channelCode,date) {
     method: "get",
   });
 }
+
+// 获取某天的录像完整性
+export function image(path) {
+  return request({
+    url: `/iot/VideoDiagnosis/img?path=${encodeURIComponent(path)}`,
+    method: "get",
+  });
+}

src/views/core/message/index.vue

@@ -29,6 +29,7 @@
                 <el-input
                   v-model="queryParams.title"
                   placeholder="请输入标题"
+                  clearable
                 />
               </el-form-item>
               <el-form-item label="发布时间" prop="planStartTime">

src/views/iot/videoDiagnosis/detail.vue

@@ -255,8 +255,8 @@
                     "
                   >
                     <el-image
-                      :src="data.quality.image"
-                      :preview-src-list="[data.quality.image]"
+                      :src="imgUrl(data.quality.image)"
+                      :preview-src-list="[imgUrl(data.quality.image)]"
                     >
                       <div slot="error" class="image-slot">
                         <i class="el-icon-picture-outline"></i>
@@ -386,7 +386,7 @@ export default {
       this.getIntegrity(this.data.hostCode, this.data.channelCode, date);
     },
     lostDurationText(duration) {
-      if (!duration || duration=='0') {
+      if (!duration || duration == "0") {
         return "未丢失";
       }
 
@@ -403,6 +403,15 @@ export default {
 
       return str;
     },
+    imgUrl(img) { 
+          // let path="http://localhost:8080/iot/VideoDiagnosis/img?path=";
+      let path = process.env.NODE_ENV === "development"
+          ? "/dev-api/iot/VideoDiagnosis/img?path="
+          : "/iot/VideoDiagnosis/img?path="
+      
+      if (img) path += `${encodeURIComponent(img)}`;
+      return path;
+    },
   },
 };
 </script>

src/views/system/device/index.vue

@@ -16,7 +16,7 @@
           <div class="main-search-box">
               <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
                 <el-form-item label="设备名称" prop="deviceName">
-                  <el-input v-model="queryParams.deviceName" placeholder="请输入关键字" maxlength="50"
+                  <el-input clearable v-model="queryParams.deviceName" placeholder="请输入关键字" maxlength="50"
                             @keyup.enter.native="handleQuery" />
                 </el-form-item>
                 <el-form-item label="设备类别" prop="assetType" label-width="80">

src/views/warn/index.vue

@@ -62,7 +62,7 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="告警时间" prop="time">
+              <el-form-item label="告警时间" prop="alarmTime">
                 <DataRangePicker
                   type="daterange"
                   value-format="yyyy-MM-dd HH:mm:ss"
@@ -74,7 +74,7 @@
                 >
                 </DataRangePicker>
               </el-form-item>
-              <el-form-item label="恢复时间" prop="planStartTime">
+              <el-form-item label="恢复时间" prop="alarmEndTime">
                 <DataRangePicker
                   type="daterange"
                   value-format="yyyy-MM-dd HH:mm:ss"
@@ -368,6 +368,8 @@ export default {
         taskName: null,
         cycle: null,
         dateRange: [],
+        alarmTime:null,
+        alarmEndTime:null,
         planStartTime: null,
         status: null,
         roleId: null,