|
@@ -11,11 +11,11 @@
|
|
<el-collapse-transition v-if='(type==1 || floors.length>0)&& isMessage && legendTable.length>0'>
|
|
<el-collapse-transition v-if='(type==1 || floors.length>0)&& isMessage && legendTable.length>0'>
|
|
<div class='legend-tab' v-if='showView===1'>
|
|
<div class='legend-tab' v-if='showView===1'>
|
|
<div class='legend-table2' v-if='systemName=="土建装饰"'>
|
|
<div class='legend-table2' v-if='systemName=="土建装饰"'>
|
|
- <lengend-view @changeSwitch='handleSwich' :remarksText='remarksText' ref='viewLengend' :systemName='systemName'></lengend-view>
|
|
|
|
|
|
+ <lengend-view @changeSwitch='handleSwich' ref='viewLengend' :systemName='systemName'></lengend-view>
|
|
</div>
|
|
</div>
|
|
<div class='legend-table' v-else>
|
|
<div class='legend-table' v-else>
|
|
<div>
|
|
<div>
|
|
- <lengend-view @changeSwitch='handleSwich' :remarksText='remarksText' ref='viewLengend' :systemName='systemName'></lengend-view>
|
|
|
|
|
|
+ <lengend-view @changeSwitch='handleSwich' ref='viewLengend' :systemName='systemName'></lengend-view>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -31,7 +31,6 @@
|
|
:editTable='editTable'
|
|
:editTable='editTable'
|
|
@saveNum='saveNum'
|
|
@saveNum='saveNum'
|
|
@cance='cance'
|
|
@cance='cance'
|
|
- :remarksText='remarksText'
|
|
|
|
></lengend-edit>
|
|
></lengend-edit>
|
|
</div>
|
|
</div>
|
|
</el-collapse-transition>
|
|
</el-collapse-transition>
|
|
@@ -116,7 +115,7 @@ export default {
|
|
name: 'Legend',
|
|
name: 'Legend',
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
- remarksText: '', //查询出来的备注
|
|
|
|
|
|
+ // remarksText: '', //查询出来的备注
|
|
text1: '主要设备房包括:冷源机房,热源机房,开闭站,配变电所(室),发电机房,消防水泵房,消防高位水箱间,生活水泵房,慧云机房,垃圾房',
|
|
text1: '主要设备房包括:冷源机房,热源机房,开闭站,配变电所(室),发电机房,消防水泵房,消防高位水箱间,生活水泵房,慧云机房,垃圾房',
|
|
text2: '图例后×的数字,代表此位置的数量',
|
|
text2: '图例后×的数字,代表此位置的数量',
|
|
loading: true,
|
|
loading: true,
|
|
@@ -134,8 +133,8 @@ export default {
|
|
floorSelectAble: [],
|
|
floorSelectAble: [],
|
|
floor: '', //传的楼层
|
|
floor: '', //传的楼层
|
|
floorName: '',
|
|
floorName: '',
|
|
- planNum: '', //主要设备房
|
|
|
|
- typeNum: '',
|
|
|
|
|
|
+ // planNum: '', //主要设备房
|
|
|
|
+ // typeNum: '',
|
|
draftNum: null, //草稿箱数量, 编辑器修改icon右上角显示
|
|
draftNum: null, //草稿箱数量, 编辑器修改icon右上角显示
|
|
interval: 10 * 60 * 1000, //定时器时长,默认 10分钟
|
|
interval: 10 * 60 * 1000, //定时器时长,默认 10分钟
|
|
timer: null, //保存定时器
|
|
timer: null, //保存定时器
|
|
@@ -143,7 +142,7 @@ export default {
|
|
}
|
|
}
|
|
},
|
|
},
|
|
computed: {
|
|
computed: {
|
|
- ...mapGetters(['plazaId', 'fmapID', 'floorSelect', 'isMessage', 'ssoToken', 'showView', 'legendTable'])
|
|
|
|
|
|
+ ...mapGetters(['planNum', 'typeNum', 'plazaId', 'fmapID', 'floorSelect', 'isMessage', 'ssoToken', 'showView', 'legendTable'])
|
|
},
|
|
},
|
|
props: {
|
|
props: {
|
|
floors: {
|
|
floors: {
|
|
@@ -254,7 +253,7 @@ export default {
|
|
},
|
|
},
|
|
// 查询备注
|
|
// 查询备注
|
|
queryMarks() {
|
|
queryMarks() {
|
|
- this.remarksText = ''
|
|
|
|
|
|
+ // this.remarksText = ''
|
|
let postParams = {
|
|
let postParams = {
|
|
categoryId: this.categoryId ? this.categoryId : this.$cookie.get('categoryId'),
|
|
categoryId: this.categoryId ? this.categoryId : this.$cookie.get('categoryId'),
|
|
projectId: this.$store.state.plazaId,
|
|
projectId: this.$store.state.plazaId,
|
|
@@ -264,36 +263,47 @@ export default {
|
|
}
|
|
}
|
|
let data = {}
|
|
let data = {}
|
|
queryRead({ data, postParams }).then(res => {
|
|
queryRead({ data, postParams }).then(res => {
|
|
|
|
+ console.log(2222222222222222222222222222222222222222222)
|
|
if (res.data.Data && res.data.Data[0].Note) {
|
|
if (res.data.Data && res.data.Data[0].Note) {
|
|
|
|
+ console.log('bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb')
|
|
|
|
+
|
|
let Res = res.data ? res.data.Data[0].Note : ''
|
|
let Res = res.data ? res.data.Data[0].Note : ''
|
|
if (Res) {
|
|
if (Res) {
|
|
|
|
+ this.$store.commit('SETREMARKSTEXT', Res)
|
|
|
|
+ console.log(22222222222222222222)
|
|
// 返回有备注
|
|
// 返回有备注
|
|
- this.remarksText = Res
|
|
|
|
-
|
|
|
|
- let defaultCom = ''
|
|
|
|
- if (this.planNum && this.typeNum) {
|
|
|
|
- defaultCom = `${Res}<ol style="padding-left: 1.5em;"><li>${this.text1}</li><li>${this.text2}</li></ol>`
|
|
|
|
- } else if (this.planNum) {
|
|
|
|
- defaultCom = `${Res}<ol style="padding-left: 1.5em;"><li>${this.text1}</li></ol>`
|
|
|
|
- } else if (this.typeNum) {
|
|
|
|
- defaultCom = `${Res}<ol style="padding-left: 1.5em;" ><li>${this.text2}</li></ol>`
|
|
|
|
- } else {
|
|
|
|
- defaultCom = Res
|
|
|
|
- }
|
|
|
|
- this.$store.commit('SETDEFAULTCOMMENT', defaultCom)
|
|
|
|
|
|
+ // this.remarksText = Res
|
|
|
|
+ // let defaultCom = ''
|
|
|
|
+ // if (this.planNum && this.typeNum) {
|
|
|
|
+ // defaultCom = `${Res}<ol style="padding-left: 1.5em;"><li>${this.text1}</li><li>${this.text2}</li></ol>`
|
|
|
|
+ // } else if (this.planNum) {
|
|
|
|
+ // defaultCom = `${Res}<ol style="padding-left: 1.5em;"><li>${this.text1}</li></ol>`
|
|
|
|
+ // } else if (this.typeNum) {
|
|
|
|
+ // defaultCom = `${Res}<ol style="padding-left: 1.5em;" ><li>${this.text2}</li></ol>`
|
|
|
|
+ // } else {
|
|
|
|
+ // defaultCom = Res
|
|
|
|
+ // }
|
|
|
|
+ // this.$store.commit('SETDEFAULTCOMMENT', defaultCom)
|
|
} else {
|
|
} else {
|
|
|
|
+ let marks = ''
|
|
if (this.planNum && this.typeNum) {
|
|
if (this.planNum && this.typeNum) {
|
|
- this.remarksText = `<ol style="padding-left: 1.5em;"><li>${this.text1}</li><li>${this.text2}</li></ol>`
|
|
|
|
|
|
+ marks = `<ol style="padding-left: 1.5em;"><li>${this.text1}</li><li>${this.text2}</li></ol>`
|
|
} else if (this.planNum) {
|
|
} else if (this.planNum) {
|
|
- this.remarksText = `<ol style="padding-left: 1.5em;"><li>${this.text1}</li></ol>`
|
|
|
|
|
|
+ marks = `<ol style="padding-left: 1.5em;"><li>${this.text1}</li></ol>`
|
|
} else if (this.typeNum) {
|
|
} else if (this.typeNum) {
|
|
- this.remarksText = `<ol style="padding-left: 1.5em;" ><li>${this.text2}</li></ol>`
|
|
|
|
|
|
+ marks = `<ol style="padding-left: 1.5em;" ><li>${this.text2}</li></ol>`
|
|
} else {
|
|
} else {
|
|
- this.remarksText = ''
|
|
|
|
|
|
+ marks = ''
|
|
}
|
|
}
|
|
|
|
+ console.log(marks)
|
|
|
|
+ this.$store.commit('SETREMARKSTEXT', marks)
|
|
|
|
+ console.log(33333333333333333333)
|
|
}
|
|
}
|
|
- this.$store.commit('SETREMARKSTEXT', this.remarksText)
|
|
|
|
|
|
+ // this.$store.commit('SETREMARKSTEXT', this.remarksText)
|
|
}
|
|
}
|
|
|
|
+ // else {
|
|
|
|
+ // this.$store.commit('SETREMARKSTEXT', '')
|
|
|
|
+ // }
|
|
})
|
|
})
|
|
},
|
|
},
|
|
// 点击展示图例框
|
|
// 点击展示图例框
|
|
@@ -374,34 +384,63 @@ export default {
|
|
queryStatis({ data, postParams }).then(res => {
|
|
queryStatis({ data, postParams }).then(res => {
|
|
this.loading = false
|
|
this.loading = false
|
|
let viewTable = []
|
|
let viewTable = []
|
|
- this.planNum = ''
|
|
|
|
- this.typeNum = ''
|
|
|
|
|
|
+ // this.planNum = ''
|
|
|
|
+ // this.typeNum = ''
|
|
viewTable = res.data.Data ? res.data.Data : []
|
|
viewTable = res.data.Data ? res.data.Data : []
|
|
this.$store.commit('SETLEGENDTABLE', viewTable)
|
|
this.$store.commit('SETLEGENDTABLE', viewTable)
|
|
if (viewTable.length > 0) {
|
|
if (viewTable.length > 0) {
|
|
viewTable.forEach(el => {
|
|
viewTable.forEach(el => {
|
|
if (el.Name == '主要设备房') {
|
|
if (el.Name == '主要设备房') {
|
|
- this.planNum = el.Num
|
|
|
|
|
|
+ this.$store.commit('SETPLANNUM', el.Num)
|
|
}
|
|
}
|
|
if (el.Type == 'Image' && el.Num > 1) {
|
|
if (el.Type == 'Image' && el.Num > 1) {
|
|
- this.typeNum = el.Num
|
|
|
|
|
|
+ this.$store.commit('SETTYPENUM', el.Num)
|
|
}
|
|
}
|
|
})
|
|
})
|
|
|
|
+ if (this.remarksText) {
|
|
|
|
+ this.$store.commit('SETREMARKSTEXT', this.remarksText)
|
|
|
|
+ console.log()
|
|
|
|
+ // 返回有备注
|
|
|
|
+ // this.remarksText = Res
|
|
|
|
+ // let defaultCom = ''
|
|
|
|
+ // if (this.planNum && this.typeNum) {
|
|
|
|
+ // defaultCom = `${Res}<ol style="padding-left: 1.5em;"><li>${this.text1}</li><li>${this.text2}</li></ol>`
|
|
|
|
+ // } else if (this.planNum) {
|
|
|
|
+ // defaultCom = `${Res}<ol style="padding-left: 1.5em;"><li>${this.text1}</li></ol>`
|
|
|
|
+ // } else if (this.typeNum) {
|
|
|
|
+ // defaultCom = `${Res}<ol style="padding-left: 1.5em;" ><li>${this.text2}</li></ol>`
|
|
|
|
+ // } else {
|
|
|
|
+ // defaultCom = Res
|
|
|
|
+ // }
|
|
|
|
+ // this.$store.commit('SETDEFAULTCOMMENT', defaultCom)
|
|
|
|
+ } else {
|
|
|
|
+ let marks = ''
|
|
|
|
+ if (this.planNum && this.typeNum) {
|
|
|
|
+ marks = `<ol style="padding-left: 1.5em;"><li>${this.text1}</li><li>${this.text2}</li></ol>`
|
|
|
|
+ } else if (this.planNum) {
|
|
|
|
+ marks = `<ol style="padding-left: 1.5em;"><li>${this.text1}</li></ol>`
|
|
|
|
+ } else if (this.typeNum) {
|
|
|
|
+ marks = `<ol style="padding-left: 1.5em;" ><li>${this.text2}</li></ol>`
|
|
|
|
+ } else {
|
|
|
|
+ marks = ''
|
|
|
|
+ }
|
|
|
|
+ this.$store.commit('SETREMARKSTEXT', marks)
|
|
|
|
+ }
|
|
}
|
|
}
|
|
// let remarksText = ''
|
|
// let remarksText = ''
|
|
- this.remarksText = ''
|
|
|
|
- this.$store.commit('SETREMARKSTEXT', '')
|
|
|
|
|
|
+ // this.remarksText = ''
|
|
|
|
+ // this.$store.commit('SETREMARKSTEXT', '')
|
|
|
|
|
|
- if (this.planNum && this.typeNum) {
|
|
|
|
- this.remarksText = `<ol style="padding-left: 1.5em;"><li>${this.text1}</li><li>${this.text2}</li></ol>`
|
|
|
|
- } else if (this.planNum) {
|
|
|
|
- this.remarksText = `<ol style="padding-left: 1.5em;"><li>${this.text1}</li></ol>`
|
|
|
|
- } else if (this.typeNum) {
|
|
|
|
- this.remarksText = `<ol style="padding-left: 1.5em;" ><li>${this.text2}</li></ol>`
|
|
|
|
- } else {
|
|
|
|
- this.remarksText = ''
|
|
|
|
- }
|
|
|
|
- this.$store.commit('SETREMARKSTEXT', this.remarksText)
|
|
|
|
|
|
+ // if (this.planNum && this.typeNum) {
|
|
|
|
+ // this.remarksText = `<ol style="padding-left: 1.5em;"><li>${this.text1}</li><li>${this.text2}</li></ol>`
|
|
|
|
+ // } else if (this.planNum) {
|
|
|
|
+ // this.remarksText = `<ol style="padding-left: 1.5em;"><li>${this.text1}</li></ol>`
|
|
|
|
+ // } else if (this.typeNum) {
|
|
|
|
+ // this.remarksText = `<ol style="padding-left: 1.5em;" ><li>${this.text2}</li></ol>`
|
|
|
|
+ // } else {
|
|
|
|
+ // this.remarksText = ''
|
|
|
|
+ // }
|
|
|
|
+ // this.$store.commit('SETREMARKSTEXT', this.remarksText)
|
|
this.$nextTick(() => {
|
|
this.$nextTick(() => {
|
|
if (this.$refs.viewLengend) {
|
|
if (this.$refs.viewLengend) {
|
|
this.$refs.viewLengend.setSelected()
|
|
this.$refs.viewLengend.setSelected()
|
|
@@ -503,7 +542,7 @@ export default {
|
|
},
|
|
},
|
|
queryRemarksMethods() {},
|
|
queryRemarksMethods() {},
|
|
init() {
|
|
init() {
|
|
- this.remarksText = ''
|
|
|
|
|
|
+ // this.remarksText = ''
|
|
// 图例
|
|
// 图例
|
|
bus.$off('queryViewMethods') //解决触发多次监听
|
|
bus.$off('queryViewMethods') //解决触发多次监听
|
|
bus.$on('queryViewMethods', () => {
|
|
bus.$on('queryViewMethods', () => {
|
|
@@ -513,32 +552,45 @@ export default {
|
|
bus.$off('queryRemarksMethods')
|
|
bus.$off('queryRemarksMethods')
|
|
bus.$on('queryRemarksMethods', res => {
|
|
bus.$on('queryRemarksMethods', res => {
|
|
if (res) {
|
|
if (res) {
|
|
|
|
+ this.$store.commit('SETREMARKSTEXT', res)
|
|
// 返回有备注
|
|
// 返回有备注
|
|
- this.remarksText = res
|
|
|
|
-
|
|
|
|
- let defaultCom = ''
|
|
|
|
- if (this.planNum && this.typeNum) {
|
|
|
|
- defaultCom = `${res}<ol style="padding-left: 1.5em;"><li>${this.text1}</li><li>${this.text2}</li></ol>`
|
|
|
|
- } else if (this.planNum) {
|
|
|
|
- defaultCom = `${res}<ol style="padding-left: 1.5em;"><li>${this.text1}</li></ol>`
|
|
|
|
- } else if (this.typeNum) {
|
|
|
|
- defaultCom = `${res}<ol style="padding-left: 1.5em;" ><li>${this.text2}</li></ol>`
|
|
|
|
- } else {
|
|
|
|
- defaultCom = res
|
|
|
|
- }
|
|
|
|
- this.$store.commit('SETDEFAULTCOMMENT', defaultCom)
|
|
|
|
|
|
+ // this.remarksText = res
|
|
|
|
+ // let defaultCom = ''
|
|
|
|
+ // if (this.planNum && this.typeNum) {
|
|
|
|
+ // defaultCom = `${res}<ol style="padding-left: 1.5em;"><li>${this.text1}</li><li>${this.text2}</li></ol>`
|
|
|
|
+ // } else if (this.planNum) {
|
|
|
|
+ // defaultCom = `${res}<ol style="padding-left: 1.5em;"><li>${this.text1}</li></ol>`
|
|
|
|
+ // } else if (this.typeNum) {
|
|
|
|
+ // defaultCom = `${res}<ol style="padding-left: 1.5em;" ><li>${this.text2}</li></ol>`
|
|
|
|
+ // } else {
|
|
|
|
+ // defaultCom = res
|
|
|
|
+ // }
|
|
|
|
+ // this.$store.commit('SETDEFAULTCOMMENT', defaultCom)
|
|
} else {
|
|
} else {
|
|
|
|
+ // if (this.planNum && this.typeNum) {
|
|
|
|
+ // this.remarksText = `<ol style="padding-left: 1.5em;"><li>${this.text1}</li><li>${this.text2}</li></ol>`
|
|
|
|
+ // } else if (this.planNum) {
|
|
|
|
+ // this.remarksText = `<ol style="padding-left: 1.5em;"><li>${this.text1}</li></ol>`
|
|
|
|
+ // } else if (this.typeNum) {
|
|
|
|
+ // this.remarksText = `<ol style="padding-left: 1.5em;" ><li>${this.text2}</li></ol>`
|
|
|
|
+ // } else {
|
|
|
|
+ // this.remarksText = ''
|
|
|
|
+ // }
|
|
|
|
+ // }
|
|
|
|
+ // this.$store.commit('SETREMARKSTEXT', this.remarksText)
|
|
|
|
+ let marks = ''
|
|
if (this.planNum && this.typeNum) {
|
|
if (this.planNum && this.typeNum) {
|
|
- this.remarksText = `<ol style="padding-left: 1.5em;"><li>${this.text1}</li><li>${this.text2}</li></ol>`
|
|
|
|
|
|
+ marks = `<ol style="padding-left: 1.5em;"><li>${this.text1}</li><li>${this.text2}</li></ol>`
|
|
} else if (this.planNum) {
|
|
} else if (this.planNum) {
|
|
- this.remarksText = `<ol style="padding-left: 1.5em;"><li>${this.text1}</li></ol>`
|
|
|
|
|
|
+ marks = `<ol style="padding-left: 1.5em;"><li>${this.text1}</li></ol>`
|
|
} else if (this.typeNum) {
|
|
} else if (this.typeNum) {
|
|
- this.remarksText = `<ol style="padding-left: 1.5em;" ><li>${this.text2}</li></ol>`
|
|
|
|
|
|
+ marks = `<ol style="padding-left: 1.5em;" ><li>${this.text2}</li></ol>`
|
|
} else {
|
|
} else {
|
|
- this.remarksText = ''
|
|
|
|
|
|
+ marks = ''
|
|
}
|
|
}
|
|
|
|
+ console.log(marks)
|
|
|
|
+ this.$store.commit('SETREMARKSTEXT', marks)
|
|
}
|
|
}
|
|
- this.$store.commit('SETREMARKSTEXT', this.remarksText)
|
|
|
|
})
|
|
})
|
|
},
|
|
},
|
|
// 设置图例整体高度
|
|
// 设置图例整体高度
|
|
@@ -829,7 +881,7 @@ export default {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-@media screen and (max-width:1600px){
|
|
|
|
|
|
+@media screen and (max-width: 1600px) {
|
|
.legend-container .legend-tab .legend-table {
|
|
.legend-container .legend-tab .legend-table {
|
|
max-height: 546px;
|
|
max-height: 546px;
|
|
}
|
|
}
|