|
@@ -115,9 +115,8 @@ export default {
|
|
|
data() {
|
|
|
return {
|
|
|
remarksText: '', //查询出来的备注
|
|
|
- text1:
|
|
|
- '<p>主要设备房包括:冷源机房,热源机房,开闭站,配变电所(室),发电机房,消防水泵房,消防高位水箱间,生活水泵房,慧云机房,垃圾房</p>',
|
|
|
- text2: '<p>图例后×的数字,代表此位置的数量</p>',
|
|
|
+ text1: '主要设备房包括:冷源机房,热源机房,开闭站,配变电所(室),发电机房,消防水泵房,消防高位水箱间,生活水泵房,慧云机房,垃圾房',
|
|
|
+ text2: '图例后×的数字,代表此位置的数量',
|
|
|
loading: true,
|
|
|
loading1: true,
|
|
|
viewTable: [],
|
|
@@ -270,11 +269,11 @@ export default {
|
|
|
remarksText = Res
|
|
|
} else {
|
|
|
if (this.planNum && this.typeNum) {
|
|
|
- remarksText = `1.${this.text1}2.${this.text2}`
|
|
|
+ remarksText = `<p>1.${this.text1}</p><p>2.${this.text2}</p>`
|
|
|
} else if (this.planNum) {
|
|
|
- remarksText = `1.${this.text1}`
|
|
|
+ remarksText = `<p>1.${this.text1}</p>`
|
|
|
} else if (this.typeNum) {
|
|
|
- remarksText = `1.${this.text2}`
|
|
|
+ remarksText = `<p>1.${this.text2}</p>`
|
|
|
} else {
|
|
|
remarksText = ''
|
|
|
}
|
|
@@ -375,17 +374,17 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
- let remarksTexts = ''
|
|
|
+ let remarksText = ''
|
|
|
if (this.planNum && this.typeNum) {
|
|
|
- remarksText = `1.${this.text1}2.${this.text2}`
|
|
|
+ remarksText = `<p>1.${this.text1}</p><p>2.${this.text2}</p>`
|
|
|
} else if (this.planNum) {
|
|
|
- remarksText = `1.${this.text1}`
|
|
|
+ remarksText = `<p>1.${this.text1}</p>`
|
|
|
} else if (this.typeNum) {
|
|
|
- remarksText = `1.${this.text2}`
|
|
|
+ remarksText = `<p>1.${this.text2}</p>`
|
|
|
} else {
|
|
|
remarksText = ''
|
|
|
}
|
|
|
- this.$store.commit('SETREMARKSTEXT', remarksTexts)
|
|
|
+ this.$store.commit('SETREMARKSTEXT', remarksText)
|
|
|
this.$nextTick(() => {
|
|
|
if (this.$refs.viewLengend) {
|
|
|
this.$refs.viewLengend.setSelected()
|