Merge branch 'develop_jzl'

gassafetyprogress-web/src/views/bigWindow/index.vue

 <!--
  * @Author: your name
  * @Date: 2022-01-11 13:44:17
- * @LastEditTime: 2022-03-08 16:21:04
+ * @LastEditTime: 2022-03-08 17:27:26
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /test/hello-world/src/views/Home.vue
 -->
 <template>
   <div class="home bigwindow">
-   
-
     <div class="goSystem" @click="$router.push('/index')">进入管理系统</div>
     <div id="map"></div>
     <!-- <Center :show="show" :centerData="centerData" /> -->
@@ -166,7 +164,7 @@ import {
   getUser,
   getEnterprise,
   userAlarm,
-  getTcqDevice
+  getTcqDevice,
 } from "@/api/bigWindow/getDevice";
 import Line from "@/components/bigWindow/Line.vue";
 import VideoView from "@/components/bigWindow/VideoView.vue";
@@ -194,7 +192,6 @@ export default {
   },
   data() {
     return {
-
       map: null,
       show: false,
       // centerData: null,
@@ -267,7 +264,7 @@ export default {
 
       // 其他设备的center数据
       // 除了这个值，用来显示隐藏，其他值与user共用
-      otherCenterShow:false,
+      otherCenterShow: false,
 
       // 报警轮询timer
       alarmTimer: null,
@@ -343,7 +340,6 @@ export default {
           // console.log("查询报警");
         }, alarmtime);
       });
-
     }
     this.currentTime();
     this.$refs.mychild.choice(this.selarr);
@@ -390,7 +386,7 @@ export default {
         } else {
           config = { data: res.data };
         }
-        console.log("reresresresresresresresresress",config)
+        console.log("reresresresresresresresresress", config);
 
         addFunc(config, component);
         return config.iconType;
@@ -467,7 +463,7 @@ export default {
       this.map.allfilter(this.selarr, this.selarr1);
     },
     //用户的设备center
-    getDetectorInfoList(httpFunc,queryParams, title) {
+    getDetectorInfoList(httpFunc, queryParams, title) {
       console.log(queryParams);
       return httpFunc(queryParams).then((res) => {
         // console.log("queryParams", res);
@@ -477,6 +473,7 @@ export default {
           // 总数据
           this.centerTotal = res.total;
           // this.$refs.userCenter.fade = "fade";
+          this.otherCenterShow = false;
           this.userCenterShow = true;
           this.centerTitle = title;
           // 传递回去
@@ -489,18 +486,19 @@ export default {
       console.log(queryParams);
       return getTcqDevice(queryParams).then((res) => {
         // console.log("queryParams", res);
-        console.log("resresresresreszzzzzzzzzzzzzzz",res)
+        console.log("resresresresreszzzzzzzzzzzzzzz", res);
 
         this.detcetorList = res;
         this.centerUserId = queryParams.devId;
         // 总数据
         this.centerTotal = res.length;
         // this.$refs.userCenter.fade = "fade";
+        this.userCenterShow = false;
+
         this.otherCenterShow = true;
         this.centerTitle = title;
         // 传递回去
         return res.code;
-
       });
     },
     currentTime() {