'展示问题修改'

package.json

@@ -12,10 +12,10 @@
     "dependencies": {
         "@mapbox/geojson-merge": "^1.1.1",
         "@saga-web/base": "2.1.25",
-        "@saga-web/big": "1.0.102",
+        "@saga-web/big": "1.0.105",
         "@saga-web/draw": "2.1.106",
         "@saga-web/feng-map": "1.0.35",
-        "@saga-web/graph": "2.1.119",
+        "@saga-web/graph": "2.1.121",
         "ant-design-vue": "^1.4.10",
         "axios": "^0.19.2",
         "core-js": "^3.4.4",

src/components/floorMap/index.vue

@@ -16,16 +16,16 @@
 
             <div v-if="equipIds.length && !tabData.pointData.length" style="margin-top: 10px;">
                 <el-table :data="tabData.tableData" max-height="235" style="width: 100%" @row-click='handleClickEquipDetail' v-loading="eqLoading">
-                    <el-table-column prop="sbjc" label="设备简称" width="170" :show-overflow-tooltip='true'></el-table-column>
+                    <el-table-column prop="sbjc" label="设备简称" width="164" :show-overflow-tooltip='true'></el-table-column>
                     <el-table-column prop="sl" width="50" label="数量" :show-overflow-tooltip='true'></el-table-column>
                     <el-table-column prop="sb_status" width="70" label="设备状态" :show-overflow-tooltip='true'></el-table-column>
-                    <el-table-column prop="sbglgs" width="80" label="管理归属" :show-overflow-tooltip='true'></el-table-column>
-                    <el-table-column prop="assetnum" width="80" label="设备内码" :show-overflow-tooltip='true'></el-table-column>
+                    <el-table-column prop="sbglgs" width="70" label="管理归属" :show-overflow-tooltip='true'></el-table-column>
+                    <!-- <el-table-column prop="assetnum" width="80" label="设备内码" :show-overflow-tooltip='true'></el-table-column>
                     <el-table-column label="" width="80" :show-overflow-tooltip='true'>
                         <template slot-scope="scope">
                             <span class="equip-detail-btn">台账详情</span>
                         </template>
-                    </el-table-column>
+                    </el-table-column> -->
                 </el-table>
                 <!-- <div style="text-align: right; margin-top: 10px;">
                     <el-button size="mini" type="primary" @click="visible = false">关闭</el-button>
@@ -48,16 +48,16 @@
             <el-tabs v-else-if="equipIds.length && tabData.pointData.length" v-model="activeName">
                 <el-tab-pane label="设备设施" name="equip">
                     <el-table :data="tabData.tableData" max-height="235" style="width: 100%" @row-click='handleClickEquipDetail' v-loading="eqLoading">
-                        <el-table-column prop="sbjc" label="设备简称" width="170" :show-overflow-tooltip='true'></el-table-column>
+                        <el-table-column prop="sbjc" label="设备简称" width="164" :show-overflow-tooltip='true'></el-table-column>
                         <el-table-column prop="sl" width="50" label="数量" :show-overflow-tooltip='true' align="right"></el-table-column>
                         <el-table-column prop="sb_status" width="70" label="设备状态" :show-overflow-tooltip='true'></el-table-column>
-                        <el-table-column prop="sbglgs" width="80" label="管理归属" :show-overflow-tooltip='true'></el-table-column>
-                        <el-table-column prop="assetnum" width="80" label="设备内码" :show-overflow-tooltip='true'></el-table-column>
+                        <el-table-column prop="sbglgs" width="70" label="管理归属" :show-overflow-tooltip='true'></el-table-column>
+                        <!-- <el-table-column prop="assetnum" width="80" label="设备内码" :show-overflow-tooltip='true'></el-table-column>
                         <el-table-column label="" width="80" :show-overflow-tooltip='true'>
                             <template slot-scope="scope">
                                 <span class="equip-detail-btn">台账详情</span>
                             </template>
-                        </el-table-column>
+                        </el-table-column> -->
                     </el-table>
                     <div style="text-align: right; margin-top: 10px;">
                         <!-- <el-button size="mini" type="primary" @click="visible = false">关闭</el-button> -->

src/lib/items/SCustomLegendItem.ts

@@ -77,8 +77,10 @@ export class SCustomLegendItem extends SPolygonItem {
         this._isActive = v;
         if (v) {
             this.cursor = "pointer";
+            this.textItem.cursor = "pointer";
         } else {
             this.cursor = "auto";
+            this.textItem.cursor = "auto";
         }
         this.update();
     } // Set isActive

src/lib/items/SFHFQZoneLegendItem.ts

@@ -76,8 +76,10 @@ export class SFHFQZoneLegendItem extends SPolygonItem {
         this._isActive = v;
         if (v) {
             this.cursor = "pointer";
+            this.textItem.cursor = "pointer";
         } else {
             this.cursor = "auto";
+            this.textItem.cursor = "auto";
         }
         this.update();
     } // Set isActive

src/lib/items/SSCPZZoneLegendItem.ts

@@ -76,8 +76,10 @@ export class SSCPZZoneLegendItem extends SPolygonItem {
         this._isActive = v;
         if (v) {
             this.cursor = "pointer";
+            this.textItem.cursor = "pointer";
         } else {
             this.cursor = "auto";
+            this.textItem.cursor = "auto";
         }
         this.update();
     } // Set isActive

src/lib/items/SZoneLegendItem.ts

@@ -76,8 +76,10 @@ export class SZoneLegendItem extends SPolygonItem {
         this._isActive = v;
         if (v) {
             this.cursor = "pointer";
+            this.textItem.cursor = "pointer";
         } else {
             this.cursor = "auto";
+            this.textItem.cursor = "auto";
         }
         this.update();
     } // Set isActive

vue.config.js

@@ -4,8 +4,8 @@ module.exports = {
         port: 8090,
         proxy: {
             '/data': {
-                // target: "http://60.205.177.43",
-                target: 'http://10.199.143.126',
+                target: "http://60.205.177.43",
+                // target: 'http://10.199.143.126',
                 // target: 'http://192.168.200.11:9003', //yll
                 // target: 'http://localhost:6040/data/',
                 changeOrigin: true,