Merge branch 'develop' of http://39.106.8.246:3003/web/persagy_topo_editer into develop

src/components/editview/baseTopoEditer.vue

@@ -6,6 +6,7 @@
       ref="topoTooltip"
       @closeTooltip="showTooltip = false"
       :havItem="havItem"
+      :havEquipItem="havEquipItem"
       :isLock="isLock"
     ></topoTooltip>
     <canvas
@@ -59,6 +60,7 @@ export default {
       canvasWidth: 700, //画布宽
       canvasHeight: 700, //画布高
       havItem: false, //右击是否选中item
+      havEquipItem: false, //右击是否为设备
       showTooltip: false, //是否显示tooltip
       topoContent: {}, // 读图后存储图所有数据
       autoSave: null, // 自动保存定时器
@@ -133,9 +135,15 @@ export default {
         } else {
           this.isLock = true;
         }
+        if (item.legendData?.properties.type == "BaseEquipment") {
+          this.havEquipItem = true;
+        } else {
+          this.havEquipItem = false;
+        }
         this.havItem = true;
       } else {
         this.havItem = false;
+        this.havEquipItem = false;
       }
       const doms = document.getElementsByClassName("topoTooltip-box")[0];
       doms.style.left = event.offsetX + "px";
@@ -533,7 +541,7 @@ export default {
     changeSize(isbiger) {
       if (isbiger) {
         this.view.scaleByPoint(
-          (this.view.scale + 0.1),
+          this.view.scale + 0.1,
           this.canvasWidth / 2,
           this.canvasHeight / 2
         );

src/components/editview/topoTooltip.vue

@@ -4,10 +4,12 @@
     <div v-if="havItem" class="tooltip-card">
       <ul>
         <li @click="editItem">编辑</li>
-        <li @click="setLock">{{isLock?'解锁':"锁定"}}</li>
+        <li @click="setLock">{{ isLock ? "解锁" : "锁定" }}</li>
         <li @click="toTop">置顶</li>
         <li @click="toBottom">置底</li>
         <li @click="deleteItem">删除</li>
+        <li v-show="havEquipItem" @click="showItem(1)">显示</li>
+        <li v-show="havEquipItem" @click="showItem(0)">隐藏</li>
       </ul>
     </div>
     <div v-else class="tooltip-card">
@@ -23,7 +25,7 @@
 import { SItemStatus } from "@persagy-web/big";
 import bus from "@/bus/bus";
 export default {
-  props: ["havItem","isLock"],
+  props: ["havItem", "havEquipItem", "isLock"],
   name: "topoTooltip",
   data() {
     return {};
@@ -55,23 +57,32 @@ export default {
     },
     // 保存图
     saveGraph() {
-      bus.$emit('saveTopo');
+      bus.$emit("saveTopo");
       this.closetooltip();
     },
     // 发布图
     publishGraph() {
-      bus.$emit('issueTopo');
+      bus.$emit("issueTopo");
       this.closetooltip();
     },
     // 下载
     downPng() {
-      bus.$emit('saveTopoImg');
+      bus.$emit("saveTopoImg");
       this.closetooltip();
     },
     // 关闭窗口
     closetooltip() {
       this.$emit("closeTooltip");
     },
+    //显示隐藏
+    showItem(val) {
+      if (val) {
+        bus.$emit("updateStyle", "visible", true);
+      } else {
+        bus.$emit("updateStyle", "visible", false);
+      }
+      this.closetooltip();
+    },
   },
   mounted() {},
 };

vue.config.js

@@ -8,26 +8,26 @@ module.exports = {
         },
         proxy: {
             '/labsl': {
-                target: 'http://39.102.40.239:8080',
-                // target: 'http://192.168.64.17:28888',
+                // target: 'http://39.102.40.239:8080',
+                target: 'http://192.168.64.17:28888',
                 changeOrigin: true,
                 secure: false,
             },
             '/meiku': {
-                target: 'http://39.102.40.239:8080',
-                // target: 'http://192.168.64.17:28888',
+                // target: 'http://39.102.40.239:8080',
+                target: 'http://192.168.64.17:28888',
                 changeOrigin: true,
                 secure: false,
             },
             '/datacenter': {
-                target: 'http://39.102.40.239:8080',
-                // target: 'http://192.168.64.17:28888',
+                // target: 'http://39.102.40.239:8080',
+                target: 'http://192.168.64.17:28888',
                 changeOrigin: true,
                 secure: false,
             },
             '/equip-component': {
-                target: 'http://39.102.40.239:8080',
-                // target: 'http://192.168.64.17:28888',
+                // target: 'http://39.102.40.239:8080',
+                target: 'http://192.168.64.17:28888',
                 changeOrigin: true,
                 secure: false,
             },