Explorar o código

修改右侧图例多选列表 选中切换时图展示

haojianlong %!s(int64=4) %!d(string=hai) anos
pai
achega
d3cc6e3c34
Modificáronse 3 ficheiros con 21 adicións e 26 borrados
  1. 2 2
      package.json
  2. 18 23
      src/components/floorMap/index.vue
  3. 1 1
      vue.config.js

+ 2 - 2
package.json

@@ -10,10 +10,10 @@
     "dependencies": {
         "@mapbox/geojson-merge": "^1.1.1",
         "@saga-web/base": "2.1.22",
-        "@saga-web/big": "1.0.71",
+        "@saga-web/big": "1.0.72",
         "@saga-web/draw": "2.1.100",
         "@saga-web/feng-map": "1.0.20",
-        "@saga-web/graph": "2.1.104",
+        "@saga-web/graph": "2.1.105",
         "ant-design-vue": "^1.4.10",
         "axios": "^0.19.2",
         "core-js": "^3.4.4",

+ 18 - 23
src/components/floorMap/index.vue

@@ -91,10 +91,6 @@ export default {
                     let imgItem = new SImageItem(null, `${this.mapServerURL}/webtheme/${this.fmapID}/${window.fengmapData.frImg}`)
                     this.scene.addItem(imgItem)
                     this.view.scene = this.scene
-                    this.view.minScale = this.view.scale
-                    if (this.$refs.canvasFun) {
-                        this.$refs.canvasFun.everyScale = this.view.scale
-                    }
                     this.view.fitSceneToView()
                 }
             } else {
@@ -108,7 +104,6 @@ export default {
                         this.fParser.parseData(res)
                         this.fParser.spaceList.forEach(t => {
                             this.scene.addItem(t)
-                            t.nameSize = 16
                             if (t.data.Name && this.bunkObj[t.data.Name]) {
                                 t.name = this.bunkObj[t.data.Name].detailtype
                             } else {
@@ -122,10 +117,6 @@ export default {
                         this.fParser.casementList.forEach(t => this.scene.addItem(t))
                         this.view.scene = this.scene
                         this.view.fitSceneToView()
-                        this.view.minScale = this.view.scale
-                        if (this.$refs.canvasFun) {
-                            this.$refs.canvasFun.everyScale = this.view.scale
-                        }
                     })
                 } else {
                     console.log('楼层不正确')
@@ -191,6 +182,10 @@ export default {
                     this.scene.addItem(t)
                 })
                 this.view.fitSceneToView()
+                this.view.minScale = this.view.scale
+                if (this.$refs.canvasFun) {
+                    this.$refs.canvasFun.everyScale = this.view.scale
+                }
             })
         },
         clearGraphy() {
@@ -342,25 +337,25 @@ export default {
                     let id = t.data.GraphElementId
                     t.maskFlag = !(res.indexOf(id) > -1)
                 })
-                this.topologyParser.textMarkerList.forEach(t => {
-                    let id = t.data.GraphElementId
-                    t.maskFlag = !(res.indexOf(id) > -1)
-                })
-                this.topologyParser.imageMarkerList.forEach(t => {
-                    let id = t.data.GraphElementId
-                    t.maskFlag = !(res.indexOf(id) > -1)
-                })
-                this.topologyParser.lineMarkerList.forEach(t => {
-                    let id = t.data.GraphElementId
-                    t.maskFlag = !(res.indexOf(id) > -1)
-                })
+                // this.topologyParser.textMarkerList.forEach(t => {
+                //     let id = t.data.GraphElementId
+                //     t.maskFlag = !(res.indexOf(id) > -1)
+                // })
+                // this.topologyParser.imageMarkerList.forEach(t => {
+                //     let id = t.data.GraphElementId
+                //     t.maskFlag = !(res.indexOf(id) > -1)
+                // })
+                // this.topologyParser.lineMarkerList.forEach(t => {
+                //     let id = t.data.GraphElementId
+                //     t.maskFlag = !(res.indexOf(id) > -1)
+                // })
                 this.topologyParser.imageLegendList.forEach(t => {
                     let id = t.data.GraphElementId
-                    t.maskFlag = !(res.indexOf(id) > -1)
+                    t.selected = (res.indexOf(id) > -1)
                 })
                 this.topologyParser.relationList.forEach(t => {
                     let id = t.data.GraphElementId
-                    t.maskFlag = !(res.indexOf(id) > -1)
+                    t.selected = (res.indexOf(id) > -1)
                 })
             })
         }

+ 1 - 1
vue.config.js

@@ -39,7 +39,7 @@ module.exports = {
             },
             // 图例库服务
             '/serve': {
-                target: 'http://192.168.200.87:8088',
+                target: 'http://60.205.177.43:8080', //阿里云
                 // target: 'http://192.168.200.83:8085',
                 changeOrigin: true,
                 pathRewrite: {