|
@@ -69,7 +69,7 @@
|
|
|
effect='dark'
|
|
|
content='新增分布图1'
|
|
|
placement='left'
|
|
|
- v-if='floorSelect.length!=floors.length && type==0'
|
|
|
+ v-if='floorSelect2.length!=floors.length && type==0'
|
|
|
>
|
|
|
<p class='tltk' style='margin-left: -5px;' @click='addFloor'>
|
|
|
<img src='@/assets/imgs/bjj.png' alt />
|
|
@@ -143,7 +143,7 @@ export default {
|
|
|
'remarksText',
|
|
|
'plazaId',
|
|
|
'fmapID',
|
|
|
- 'floorSelect',
|
|
|
+ 'floorSelect2',
|
|
|
'isMessage',
|
|
|
'ssoToken',
|
|
|
'showView',
|
|
@@ -195,7 +195,7 @@ export default {
|
|
|
// 监听 vuex 中currentFloor的变化,切换楼层后,调用接口查询,显示右下角小红点
|
|
|
'$store.state.currentFloor': {
|
|
|
handler(newV, oldV) {
|
|
|
- if (newV.gcname !== oldV.gcname) {
|
|
|
+ if (newV.gname !== oldV.gname) {
|
|
|
clearInterval(this.timer)
|
|
|
this.getDraftNum()
|
|
|
this.timer = setInterval(() => {
|
|
@@ -243,10 +243,10 @@ export default {
|
|
|
*/
|
|
|
async getDraftNum() {
|
|
|
let res = null,
|
|
|
- floorId = this.$store.state.currentFloor.gcname || this.$cookie.get('floorMapId'),
|
|
|
+ floorId = this.$store.state.currentFloor.gname || this.$cookie.get('floorMapId'),
|
|
|
categoryId = this.categoryId || this.$cookie.get('categoryId')
|
|
|
// 弹窗组件内传入floorInfo,使用其楼层id
|
|
|
- this.floorInfo.gcname && (floorId = this.floorInfo.gcname)
|
|
|
+ this.floorInfo.gname && (floorId = this.floorInfo.gname)
|
|
|
// 增加校验 floorId,防止上传 undefined
|
|
|
if (!floorId) {
|
|
|
return true
|
|
@@ -273,8 +273,8 @@ export default {
|
|
|
},
|
|
|
formatFloor() {
|
|
|
this.floorSelectAble = []
|
|
|
- this.floorSelectAble = this.floorSelect.filter((item) => {
|
|
|
- const hit = this.floors.find((i) => i.gcname == item.id)
|
|
|
+ this.floorSelectAble = this.floorSelect2.filter((item) => {
|
|
|
+ const hit = this.floors.find((i) => i.gname == item.id)
|
|
|
return !hit
|
|
|
})
|
|
|
},
|
|
@@ -354,8 +354,8 @@ export default {
|
|
|
let categoryId = this.$cookie.get('categoryId') //系统
|
|
|
|
|
|
// 弹窗组件内传入floorInfo, 楼层参数处理
|
|
|
- if (this.floorInfo.gcname && !this.floor) {
|
|
|
- FloorID = this.floorInfo.gcname
|
|
|
+ if (this.floorInfo.gname && !this.floor) {
|
|
|
+ FloorID = this.floorInfo.gname
|
|
|
floorName = this.floorInfo.code
|
|
|
seq = this.floorInfo.seq
|
|
|
categoryId = this.categoryId
|
|
@@ -363,7 +363,7 @@ export default {
|
|
|
//弹窗组件点击新增楼层,确认的楼层 楼层字段处理
|
|
|
if (this.floor) {
|
|
|
// 从store中筛选出选中的楼层信息
|
|
|
- let floorInfo = this.$store.state.floorsArr.filter((item) => item.gcname === this.floor)[0]
|
|
|
+ let floorInfo = this.$store.state.floorsArr.filter((item) => item.gname === this.floor)[0]
|
|
|
FloorID = this.floor
|
|
|
floorName = floorInfo.code
|
|
|
seq = floorInfo.seq
|
|
@@ -374,7 +374,6 @@ export default {
|
|
|
if (!this.plazaId) {
|
|
|
return
|
|
|
}
|
|
|
- // http://localhost:8091/wandaEditer/editer?categoryId%3DFZQZL%26projectId%3D1001724%26BuildingID%3D1%26FloorID%3Df8%26FloorName%3DF8%26fmapID%3D1001724_31%26seq%3D750%26token%3Dadmin%3Aliujiandong
|
|
|
let data = `categoryId=${categoryId}&projectId=${this.plazaId}&BuildingID=1&FloorID=${FloorID}&FloorName=${floorName}&fmapID=${this.fmapID}&seq=${seq}&token=${this.ssoToken}`
|
|
|
let url = editerUrl + 'editer?' + encodeURIComponent(data)
|
|
|
window.open(url, 'edit')
|
|
@@ -398,10 +397,10 @@ export default {
|
|
|
projectId: this.$store.state.plazaId,
|
|
|
flag: flag,
|
|
|
buildingId: '1',
|
|
|
- floorId: this.$store.state.currentFloor.gcname,
|
|
|
+ floorId: this.$store.state.currentFloor.gname,
|
|
|
}
|
|
|
// 弹窗组件内传入floorInfo,使用其楼层id
|
|
|
- this.floorInfo.gcname && (data.floorId = this.floorInfo.gcname)
|
|
|
+ this.floorInfo.gname && (data.floorId = this.floorInfo.gname)
|
|
|
queryStatis({ data, postParams }).then((res) => {
|
|
|
// this.$store.commit('SETREMARKSTEXT', '')
|
|
|
this.$store.commit('SETPLANNUM', '')
|
|
@@ -451,10 +450,10 @@ export default {
|
|
|
projectId: this.$store.state.plazaId,
|
|
|
flag: flag,
|
|
|
buildingId: '1',
|
|
|
- floorId: this.$store.state.currentFloor.gcname,
|
|
|
+ floorId: this.$store.state.currentFloor.gname,
|
|
|
}
|
|
|
// 弹窗组件内传入floorInfo,使用其楼层id
|
|
|
- this.floorInfo.gcname && (data.floorId = this.floorInfo.gcname)
|
|
|
+ this.floorInfo.gname && (data.floorId = this.floorInfo.gname)
|
|
|
queryStatis({ data, postParams }).then((res) => {
|
|
|
this.loading1 = false
|
|
|
this.editTable = res.data.Data ? res.data.Data : []
|