Merge branch 'jzl'

zh-baseversion-web/public/index.html

@@ -7,7 +7,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <!-- <title><%= webpackConfig.name %></title> -->
-    <title>.</title>
+    <title>...</title>
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
     <script>
         window._AMapSecurityConfig = {

zh-baseversion-web/src/utils/mapClass/mapLoca.js

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2024-07-30 15:09:53
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2024-07-31 17:28:44
+ * @LastEditTime: 2024-08-02 14:08:42
  * @FilePath: /zh-baseversion-web/src/utils/mapClass/mapLoca.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -69,7 +69,7 @@ export class LocalLine {
       // console.log('this.loca.add', this.layer)
 
       this.loca.add(layer);
-      this.star();
+      this.start();
     });
   }
   show() {
@@ -98,7 +98,7 @@ export class LocalLine {
     this.loca.animate.stop();
 
   }
-  star() {
+  start() {
     this.loca.animate.start();
   }
 }

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

 <!--
  * @Author: your name
  * @Date: 2022-01-11 13:44:17
- * @LastEditTime: 2024-08-02 09:45:26
+ * @LastEditTime: 2024-08-02 14:09:08
  * @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
@@ -53,7 +53,7 @@
         alt=""
       />
       <img v-else src="../../assets/images/20230805152711.png" alt="" /> -->
-      {{$store.state.user.systemSetting.large_screen_header_city_name}}
+      {{ $store.state.user.systemSetting.large_screen_header_city_name }}
     </div>
 
     <!-- 左边 -->
@@ -65,7 +65,11 @@
     <!-- 右边 -->
     <div class="rightbar" :style="changeRightBarStyle">
       <div class="goSystem" @click="$router.push('/index')">进入管理系统</div>
-      <PipeColor :b="true" @showAnimate="showAnimate" />
+      <PipeColor
+        v-if="lineData.length > 0"
+        :b="true"
+        @showAnimate="showAnimate"
+      />
 
       <rightBar ref="mychild"></rightBar>
     </div>
@@ -278,6 +282,8 @@ export default {
       // 报警轮询timer
       alarmTimer: null,
       geoJsonArr: [],
+      // 管道数据
+      lineData: [],
     };
   },
 
@@ -544,8 +550,10 @@ export default {
       let num = 1;
       if (!bool) {
         num = 1;
+        this.LocalLine.stop();
       } else {
         num = 0.1;
+        this.LocalLine.start();
       }
       this.map.piprOpacityChange(num);
     },
@@ -589,6 +597,7 @@ export default {
       return httpFunc().then((res) => {
         // 给用户加icontype
         console.log("管道", res.data);
+        this.lineData = res.data;
         // if (res.data && !res.data[0].iconType) {
         res.data.forEach((item) => {
           item.iconType = 1;

zh-baseversion-web/src/views/login.vue

@@ -132,6 +132,8 @@ export default {
         this.loginForm.uuid = res.uuid;
         this.cityName = res.cityName;
         document.title = this.cityName;
+
+
       });
     },
     getCookie() {