Merge branch 'master' of http://111.61.77.35:9999/gengdidi/huaxin-rq

huaxin-web/src/utils/mapClass/newMap.js

 /*
  * @Author: your name
  * @Date: 2022-01-11 13:45:12
- * @LastEditTime: 2026-09-23 10:12:29
+ * @LastEditTime: 2026-10-10 14:23:44
  * @LastEditors: 纪泽龙 jizelong@qq.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /test/hello-world/src/utils/mapClass.js
@@ -184,6 +184,8 @@ export class EditorMap {
     });
     this.loca.add(layer);
     this.loca.animate.start();
+    this.locaLayer = layer;
+
   }
   frbj() {
     townsData.forEach((item) => {

huaxin-web/src/views/bigWindow/Ind3/Ind.vue

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2025-12-20 09:20:39
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2026-09-23 10:01:11
+ * @LastEditTime: 2026-10-10 14:36:07
  * @FilePath: /test-ranqi/src/views/Index.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -162,7 +162,7 @@ export default {
       this.getList();
       this.getpipe();
       this.getPointList();
-      this.gaoMap.addLocalPipe(this.pipeFeatures);
+      // this.gaoMap.addLocalPipe(this.pipeFeatures);
 
       setInterval(() => {
         this.gaoMap.pipeArrold = this.gaoMap.pipeArr2;
@@ -360,6 +360,9 @@ export default {
         this.gaoMap.pipefilter(ind, val);
       }
       if (ind >= 0) {
+        if (val == 0) {
+          this.gaoMap.locaLayer.hide();
+        }
         if (val == 3) {
           this.gaoMap.tyxlabelsLayer.hide();
         } else if (val == 4) {
@@ -372,6 +375,9 @@ export default {
           this.hideMarker(6);
         }
       } else {
+        if (val == 0) {
+          this.gaoMap.locaLayer.show();
+        }
         if (val == 3) {
           this.gaoMap.tyxlabelsLayer.show();
         } else if (val == 4) {

huaxin-web/src/views/bigWindow/Ind3/components/StationInfo.vue

@@ -54,7 +54,7 @@
             <div class="left">储罐容积：</div>
             <div class="right zzz">{{ deviceData.volume }}</div>
           </div>
-          <div class="group">
+          <div class="group gy">
             <div class="left">工艺名称：</div>
             <div class="right zzz">{{ deviceData.technologyProcess }}</div>
           </div>
@@ -93,18 +93,31 @@
             <div class="left">危险源名称：</div>
             <div class="right zzz">{{ deviceData.dangerousName }}</div>
           </div>
-          <div class="group">
+          <div class="dashed"></div>
+          <div class="group gy">
             <div class="left">工艺照片：</div>
-            <div class="right zzz">
-              <el-image
+            <div class="right zzz cup">
+              <!-- <el-image
                 v-if="deviceData.processRelationList"
                 style="width: 80px; height: 80px"
                 :src="deviceData.processRelationList"
                 :preview-src-list="[deviceData.processRelationList]"
                 :z-index="999999"
               >
-              </el-image>
-              <div class="imgtext" v-else>暂无图片</div>
+              </el-image> -->
+              <templete v-if="this.deviceData.processRelationList">
+                <div
+                  v-for="item in JSON.parse(
+                    this.deviceData.processRelationList[0].attachment
+                  )"
+                  style="color: blue; font-size: 16px"
+                  :key="item.url"
+                  @click="openUrl(item.url)"
+                >
+                  {{ '查看' }}
+                </div>
+              </templete>
+              <div v-else>暂无图片</div>
             </div>
           </div>
         </div>
@@ -186,6 +199,9 @@ export default {
     close() {
       this.mapClass.infowindowClose();
     },
+    openUrl(url) {
+      window.open(url);
+    },
     //场站类型
     getStationType() {
       this.getDicts("t_station_type").then((response) => {
@@ -226,7 +242,7 @@ export default {
   background-color: #071738;
   padding: 10px;
   position: relative;
-  width: 670px;
+  min-width: 760px;
   border-radius: 7px;
   .title {
     // padding-top: 10px;
@@ -247,7 +263,7 @@ export default {
     margin-bottom: 10px;
     box-sizing: border-box;
     .top-left {
-      flex: 1.8;
+      flex: 1.5;
       .group {
         height: 30px;
         flex: 1;
@@ -274,7 +290,7 @@ export default {
       }
     }
     .top-center {
-      flex: 1.2;
+      flex: 1.5;
       .group {
         height: 30px;
         flex: 1;
@@ -357,4 +373,20 @@ export default {
     justify-content: space-between;
   }
 }
+.gy {
+  margin-top: 8px;
+
+  // border-top:1px solid #fff;
+}
+.dashed {
+  width: 600px;
+  height: 1px;
+  border-top: 1px dotted #f0f0f0f0;
+  position: absolute;
+  margin-top: 2px;
+  left: 30px;
+}
+.cup {
+  cursor: pointer;
+}
 </style>