Преглед на файлове

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-bm-guide into develop

shaun-sheep преди 5 години
родител
ревизия
88474109bd

+ 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",

+ 8 - 0
src/lib/items/SImageLegendItem.ts

@@ -75,6 +75,12 @@ export class SImageLegendItem extends SIconTextItem {
         if (data.Properties && data.Properties.color) {
             this.color = new SColor(data.Properties.color);
         }
+        if (data.Properties && data.Properties.IsActive) {
+            this.isActive = data.Properties.IsActive;
+        }
+        if (data.Properties && data.Properties.FrameColor) {
+            this.activeColor = new SColor(data.Properties.FrameColor);
+        }
     }
 
     toData(): Legend {
@@ -88,6 +94,8 @@ export class SImageLegendItem extends SIconTextItem {
         this.data.Properties.sHeight = this.sHeight;
         this.data.Properties.font = this.font.size;
         this.data.Properties.color = this.color.value;
+        this.data.Properties.FrameColor = this.activeColor.value;
+        this.data.Properties.IsActive = this.isActive;
         this.data.AnchorList = this.anchorList.map(t => {
             return {
                 ID: t.id,

+ 3 - 1
src/views/equipment/eqDialog.vue

@@ -5,8 +5,10 @@
             <!-- 除了清单和原理页面,别的都有记录事项detailDialog页面 -->
             <div slot='title' class='header-title' v-if='Object.keys(dialogInfo).length>0'>
                 <span class='title-name'>{{systemName}}-{{dialogInfo.label}}</span>
+                <!-- 2020-7-12 查看图纸时 隐藏图标(查看入口) -->
+                <!-- v-if='dialogInfo.id.slice(2,4)!="QD" && dialogInfo.id.slice(2,4)!="YL" && dialogInfo.id.slice(0,4)!="GJSP"' -->
                 <img
-                    v-if='dialogInfo.id.slice(2,4)!="QD" && dialogInfo.id.slice(2,4)!="YL" && dialogInfo.id.slice(0,4)!="GJSP"'
+                    v-if='dialogInfo.id.slice(2,4)!="QD" && dialogInfo.id.slice(2,4)!="YL" && dialogInfo.id.slice(0,4)!="GJSP" && dialogInfo.label !== "查看图纸"'
                     src='../../assets/imgs/zy1.png'
                     @click='visibalBox'
                     style='margin-top:-4px;'

+ 24 - 10
src/views/equipment/table/djspTable.vue

@@ -44,7 +44,7 @@ import { Select } from 'meri-design'
 import EqDetail from './eqDetaileDialog'
 import { queryShops } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
-
+import store from '../../../store/index'
 export default {
     components: { Select, EqDetail },
     data() {
@@ -102,16 +102,17 @@ export default {
                 console.log(res)
                 this.tableData = []
                 let floor = {}
-                res.data.forEach(i => {
-                    console.log(i)
-                    Object.keys(i).forEach(key => (floor[key] = 0)) // 初始化每一楼层个数为0
-                    Object.values(i).forEach(j => {
-                        Object.values(j).forEach(k => {
-                            console.log(k)
-                            this.tableData.push(k)
+                res.data &&
+                    res.data.forEach(i => {
+                        console.log(i)
+                        Object.keys(i).forEach(key => (floor[key] = 0)) // 初始化每一楼层个数为0
+                        Object.values(i).forEach(j => {
+                            Object.values(j).forEach(k => {
+                                console.log(k)
+                                this.tableData.push(k)
+                            })
                         })
                     })
-                })
 
                 this.tableData.map(n => {
                     if (floor[n.floor] === 0) {
@@ -132,12 +133,25 @@ export default {
                 this.getList()
             }
         },
-        floor() {
+        /* floor() {
+            console.log('watch floor')
             this.getList()
+        }, */
+        // 监听 vuex 中currentFloor的变化,切换楼层后,更新下拉菜单
+        '$store.state.currentFloor': {
+            handler(newV, oldV) {
+                if (newV.gname !== oldV.gname) {
+                    this.floor = newV.gname
+                    this.getList()
+                }
+            },
+            deep: true
         }
     },
     mounted() {
+        console.log('商铺电表数 mounted')
         this.floor = this.$cookie.get('floorMapId')
+        console.log(this.floor)
         this.getList()
     }
 }

+ 13 - 2
src/views/equipment/table/eqListTable.vue

@@ -60,7 +60,7 @@
             <el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.wzjc || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width="300">
+            <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width='300'>
                 <template slot-scope='{row}'>{{row.manufacturer || '--'}}</template>
             </el-table-column>
         </el-table>
@@ -86,6 +86,7 @@ import { Select } from 'meri-design'
 import EqDetail from './eqDetaileDialog'
 import { queryEquipmentList } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
+import store from '../../../store/index'
 
 export default {
     components: { Select, EqDetail },
@@ -162,9 +163,19 @@ export default {
                 this.getList()
             }
         },
-        floor(newV, oldV) {
+        /* floor(newV, oldV) {
             console.log(newV, oldV)
             this.getList()
+        }, */
+        // 监听 vuex 中currentFloor的变化,切换楼层后,更新下拉菜单
+        '$store.state.currentFloor': {
+            handler(newV, oldV) {
+                if (newV.gname !== oldV.gname) {
+                    this.floor = newV.gname
+                    this.getList()
+                }
+            },
+            deep: true
         }
     },
     mounted() {

+ 13 - 1
src/views/equipment/table/standTable.vue

@@ -85,6 +85,8 @@ import EqDetail from './eqDetaileDialog'
 
 import { mapGetters } from 'vuex'
 import { Select } from 'meri-design'
+import store from '../../../store/index'
+
 export default {
     data() {
         return {
@@ -170,8 +172,18 @@ export default {
                 this.getList()
             }
         },
-        floor(newV, oldV) {
+        /* floor(newV, oldV) {
             this.getList()
+        }, */
+        // 监听 vuex 中currentFloor的变化,切换楼层后,更新下拉菜单
+        '$store.state.currentFloor': {
+            handler(newV, oldV) {
+                if (newV.gname !== oldV.gname) {
+                    this.floor = newV.gname
+                    this.getList()
+                }
+            },
+            deep: true
         }
     },
     mounted() {