From f395c5afd09fb4ce923d6b9c643dbc82fc357906 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 31 Dec 2021 10:28:36 +0800
Subject: [PATCH] BUG 26119

---
 src/apps/AppSpecialPeople/AppSpecialPeople.vue  | 17 ++++++++++++-----
 .../AppVideoSurveillance.vue                    | 14 ++++----------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/apps/AppSpecialPeople/AppSpecialPeople.vue b/src/apps/AppSpecialPeople/AppSpecialPeople.vue
index c94e687e..f2c6f66f 100644
--- a/src/apps/AppSpecialPeople/AppSpecialPeople.vue
+++ b/src/apps/AppSpecialPeople/AppSpecialPeople.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="AppSpecialPeople">
     <component
+        v-if="refresh"
         :is="component"
         @change="onChange"
         :params="params">
@@ -19,11 +20,12 @@ export default {
   data() {
     return {
       component: 'Detail',
-      params: {}
+      params: {},
+      refresh: true
     }
   },
 
-  components: { Detail, Add },
+  components: {Detail, Add},
 
   methods: {
     onChange(e) {
@@ -32,16 +34,21 @@ export default {
     },
     onShow() {
       document.title = "特殊人群"
+      this.refresh = false
+      this.$nextTick(() => {
+        this.refresh = true
+      })
     }
   },
 }
 </script>
 
 <style lang="scss" scoped>
-uni-page-body{
+uni-page-body {
   height: 100%;
 }
-.AppSpecialPeople{
+
+.AppSpecialPeople {
   height: 100%;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/apps/AppVideoSurveillance/AppVideoSurveillance.vue b/src/apps/AppVideoSurveillance/AppVideoSurveillance.vue
index b1c708a6..8ab858da 100644
--- a/src/apps/AppVideoSurveillance/AppVideoSurveillance.vue
+++ b/src/apps/AppVideoSurveillance/AppVideoSurveillance.vue
@@ -8,7 +8,7 @@
         </div>
       </div> -->
       <div class="area-content">
-        <AiAreaPicker :areaId="user.areaId" v-model="areaId" @select="areaSelect" :name.sync="areaName">
+        <AiAreaPicker :areaId="user.areaId" v-model="areaId" @select="areaSelect" :name.sync="areaName" all>
           <img src="./img/local-icon.png" alt="">
           <span class="label" v-if="areaName">{{ areaName }}</span>
           <span v-else>请选择</span>
@@ -99,7 +99,6 @@ export default {
       this.nodes.push(row)
       this.getMonitors(row.nodeId, row.hasChild == 1 ? 0 : 1)
     },
-
     isCurrent(index) {
       return index == Math.max(this.nodes?.length - 1, 0)
     },
@@ -107,10 +106,9 @@ export default {
       this.nodes.splice(index + 1)
       this.getMonitors(node.nodeId)
     },
-
     getList() {
       this.$http.post(`/app/appzyvideoequipment/getAreaEquipment?areaId=${this.areaId}`).then(res => {
-        if (res.code == 0) {
+        if (res?.data) {
           this.list = res.data.list
           this.count = res.data.count
           this.onlineRate = (this.count.online / this.count.sum).toFixed(2)
@@ -171,15 +169,11 @@ export default {
       option && this.Echart.setOption(option)
     },
   },
-  created() {
-
+  onShow() {
+    document.title = '视频监控'
     this.areaId = this.user.areaId
     this.areaName = this.user.areaName
     this.getList()
-    // this.getMonitors()
-  },
-  onShow() {
-    document.title = '视频监控'
   },
   mounted() {
     this.Echart = echarts.init(document.getElementById('echarts'))