Merge branch 'jzl'

zh-baseversion-web/src/components/bigWindow/rightBar.vue

@@ -1345,13 +1345,14 @@ export default {
 .usernum {
   width: 100%;
   text-align: center;
+  margin-top:10px;
 }
 .usernumin {
   font-size: 15px;
   display: flex;
   flex-direction: row;
   justify-content: flex-start;
-  margin-bottom: 5px;
+  margin-bottom: 15px;
 }
 .titletu {
   margin-left: 40px;

zh-baseversion-web/src/views/bigWindow/index.vue

 <!--
  * @Author: your name
  * @Date: 2022-01-11 13:44:17
- * @LastEditTime: 2024-08-01 10:15:59
+ * @LastEditTime: 2024-08-01 16:03:35
  * @LastEditors: 纪泽龙 jizelong@qq.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /test/hello-world/src/views/Home.vue
@@ -189,7 +189,7 @@ export default {
       map: null,
       show: false,
       // centerData: null,
-      selarr: [1, 2, 3],
+      selarr: [1,2,3],
       weather: "",
       lower: "",
       higher: "",
@@ -261,7 +261,7 @@ export default {
           name: "餐饮单位液化气用户",
         },
       ],
-      selarr1: [],
+      selarr1: [1],
       // 用户的center数据
       detcetorList: [],
       centerUserId: null,
@@ -540,14 +540,14 @@ export default {
     // 管道;动效
 
     showAnimate(bool) {
-      console.log(bool)
+      console.log(bool);
       let num = 1;
       if (!bool) {
         num = 1;
       } else {
         num = 0.1;
       }
-      this.map.piprOpacityChange(num)
+      this.map.piprOpacityChange(num);
     },
     // 设备上图
     addDevice(data, component, show) {
@@ -710,7 +710,7 @@ export default {
     // },
     // 更改下方列表
     listChange(arr) {
-      console.log(arr);
+      console.log("listChange",arr,this.selarr1);
       // return;
       this.selarr = [...arr];
       this.map.allfilter(this.selarr, this.selarr1);