|
@@ -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()
|
|
|
}
|
|
|
}
|