jiawuxian 1 rok pred
rodič
commit
546e7f18f5

+ 5 - 1
src/components/orgTree/index.vue

@@ -61,13 +61,17 @@ export default  {
     showChecked:{
       type:Boolean,
       default:false
+    },
+    defaultChecked:{
+      type:Boolean,
+      default:false
     }
   },
   data() {
     return {
       treeData: [],
       selected: null,
-      checked:false,
+      checked:this.defaultChecked,
     }
   },
   // mounted(){

+ 1 - 1
src/views/menu/iot/dvrRecorder/components/item.vue

@@ -118,7 +118,7 @@ export default {
       let rate = this.diskProgress(disk)
       if (rate > 90) {
         return 'rgb(245,108,108)'
-      } else if (rate > 80) {
+      } else if (rate > 70) {
         return 'rgb(230,162,60)'
       } else {
         return 'rgb(103,194,58)'

+ 2 - 2
src/views/menu/iot/dvrRecorder/index.vue

@@ -3,7 +3,7 @@
     <nav-bar></nav-bar>
     <van-row>
       <van-col span="24">
-        <org-tree v-model="search.orgId" @changeItem="changeTree" @checked="orgCheckChanged" showChecked></org-tree>
+        <org-tree v-model="search.orgId" @changeItem="changeTree" @checked="orgCheckChanged" showChecked defaultChecked></org-tree>
       </van-col>
       <van-col span="24" class="search-state">
         <span @click="onStatusChanged(1)" :class="`${search.state === 1 ? 'alarm_state_selected' : ''}`">异常</span>
@@ -36,7 +36,7 @@ export default {
       options: [],
       search: {
         orgId: this.orgId,
-        checkSub: false,
+        checkSub: true,
         state: null,
         pageNum: 1,
         pageSize: 10

+ 1 - 1
src/views/menu/iot/subsystem/components/item.vue

@@ -100,7 +100,7 @@ export default {
       })
     },
     itemClick() {
-      this.$router.push('/protection/detail?id=' + this.data.id)
+      this.$router.push('/iot/subsystem/detail?id=' + this.data.id)
     }
   },
   async created() {},

+ 34 - 23
src/views/menu/iot/videoDiagnosis/detail.vue

@@ -10,27 +10,34 @@
           title="视频质量"
           :value="info.quality ? getDictLabel(info.quality.quality, 'video_diagnosis_state', '未上报') : '未上报'"
         />
-        <van-cell title="诊断截图" :value="info.orgName" v-if="info.quality != null && info.quality.quality != null">
-          <div>
-            <van-tag type="danger" v-if="info.quality.signalLost == 1">信号丢失</van-tag>
-            <van-tag type="danger" v-if="info.quality.occlude == 1">遮挡</van-tag>
-            <van-tag type="danger" v-if="info.quality.brightness == 1">亮度</van-tag>
-            <van-tag type="danger" v-if="info.quality.colorCast == 1">偏色</van-tag>
-            <van-tag type="danger" v-if="info.quality.snowflake == 1">雪花</van-tag>
-            <van-tag type="danger" v-if="info.quality.stripe == 1">条纹</van-tag>
-            <van-tag type="danger" v-if="info.quality.contrast == 1">对比度</van-tag>
-            <van-tag type="danger" v-if="info.quality.blurry == 1">模糊</van-tag>
-          </div>
-          <van-image
-            height="20vh"
-            :src="info.quality.image"
-            @click="
-              () => {
-                showImage = true
-              }
-            "
-          ></van-image>
-          <van-image-preview v-model="showImage" :images="[info.quality.image]"></van-image-preview>
+        <van-cell
+          v-if="info.quality != null && info.quality.quality != null"
+          value-class="cell-quality-value"
+          title-style="display:none"
+        >
+          <template #default>
+            <div>诊断截图</div>
+            <div>
+              <van-tag type="danger" v-if="info.quality.signalLost == 1">信号丢失</van-tag>
+              <van-tag type="danger" v-if="info.quality.occlude == 1">遮挡</van-tag>
+              <van-tag type="danger" v-if="info.quality.brightness == 1">亮度</van-tag>
+              <van-tag type="danger" v-if="info.quality.colorCast == 1">偏色</van-tag>
+              <van-tag type="danger" v-if="info.quality.snowflake == 1">雪花</van-tag>
+              <van-tag type="danger" v-if="info.quality.stripe == 1">条纹</van-tag>
+              <van-tag type="danger" v-if="info.quality.contrast == 1">对比度</van-tag>
+              <van-tag type="danger" v-if="info.quality.blurry == 1">模糊</van-tag>
+            </div>
+            <van-image
+              height="20vh"
+              :src="info.quality.image"
+              @click="
+                () => {
+                  showImage = true
+                }
+              "
+            ></van-image>
+            <van-image-preview v-model="showImage" :images="[info.quality.image]"></van-image-preview
+          ></template>
         </van-cell>
       </van-cell-group>
     </card>
@@ -58,9 +65,9 @@
             ></calendar>
           </template>
         </van-cell>
-        <van-cell title="丢失时长" >
+        <van-cell title="丢失时长">
           <template #default>
-            {{integrity? lostDurationText(integrity.loseDuration):'未知' }}
+            {{ integrity ? lostDurationText(integrity.loseDuration) : '未知' }}
           </template>
         </van-cell>
       </van-cell-group>
@@ -80,6 +87,7 @@ export default {
   data() {
     return {
       info: {},
+      showImage:false,
       hostCode: this.$route.query.hostCode,
       channelCode: this.$route.query.channelCode,
       integrity: {},
@@ -126,6 +134,9 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.cell-quality-value {
+  width: 100%;
+}
 .cell-calender-value {
   width: 100%;
 }

+ 2 - 2
src/views/menu/iot/videoDiagnosis/index.vue

@@ -3,7 +3,7 @@
     <nav-bar></nav-bar>
     <van-row>
       <van-col span="24">
-        <org-tree v-model="search.orgId" @changeItem="changeTree" @checked="orgCheckChanged" showChecked></org-tree>
+        <org-tree v-model="search.orgId" @changeItem="changeTree" @checked="orgCheckChanged" showChecked defaultChecked></org-tree>
       </van-col>
       <van-col span="24" class="search-state">
         <span @click="onStatusChanged(1)" :class="`${search.state === 1 ? 'alarm_state_selected' : ''}`">异常</span>
@@ -36,7 +36,7 @@ export default {
       options: [],
       search: {
         orgId: this.orgId,
-        checkSub: false,
+        checkSub: true,
         state: null,
 
         pageNum: 1,