|
@@ -77,7 +77,7 @@
|
|
<div class='select-floor' v-if='isFloor'>
|
|
<div class='select-floor' v-if='isFloor'>
|
|
<p class='p1'>请选择需要创建“消防泵房引出管路分布图”的楼层</p>
|
|
<p class='p1'>请选择需要创建“消防泵房引出管路分布图”的楼层</p>
|
|
<p class='p2'>
|
|
<p class='p2'>
|
|
- <Select width='240' tipPlace='top' caption='楼层:' size='mini' :selectdata='floorSelectAble' :placeholder='"请选择"'></Select>
|
|
|
|
|
|
+ <Select width='240' tipPlace='top' v-model='floor' caption='楼层:' size='mini' :selectdata='floorSelectAble' :placeholder='"请选择"'></Select>
|
|
</p>
|
|
</p>
|
|
<p class='p3'>
|
|
<p class='p3'>
|
|
<span @click='cancel'>取消</span>
|
|
<span @click='cancel'>取消</span>
|
|
@@ -117,7 +117,9 @@ export default {
|
|
editSwitch: false,
|
|
editSwitch: false,
|
|
isFloor: false,
|
|
isFloor: false,
|
|
editPmt: true, //是否有跳转道图例库的权限
|
|
editPmt: true, //是否有跳转道图例库的权限
|
|
- floorSelectAble: []
|
|
|
|
|
|
+ floorSelectAble: [],
|
|
|
|
+ floor: '', //传的楼层
|
|
|
|
+ floorName: ''
|
|
}
|
|
}
|
|
},
|
|
},
|
|
computed: {
|
|
computed: {
|
|
@@ -137,21 +139,19 @@ export default {
|
|
systemName: {
|
|
systemName: {
|
|
default: '',
|
|
default: '',
|
|
type: String
|
|
type: String
|
|
|
|
+ },
|
|
|
|
+ categoryId: {
|
|
|
|
+ default: '',
|
|
|
|
+ type: String
|
|
}
|
|
}
|
|
},
|
|
},
|
|
components: { lengendView, legendRemarks, lengendEdit },
|
|
components: { lengendView, legendRemarks, lengendEdit },
|
|
methods: {
|
|
methods: {
|
|
formatFloor() {
|
|
formatFloor() {
|
|
this.floorSelectAble = []
|
|
this.floorSelectAble = []
|
|
- this.floorSelect.forEach(el => {
|
|
|
|
- this.floors.forEach(ele => {
|
|
|
|
- if (el.id == ele.gname) {
|
|
|
|
- this.floorSelectAble.push({
|
|
|
|
- id: ele.gname,
|
|
|
|
- name: ele.code
|
|
|
|
- })
|
|
|
|
- }
|
|
|
|
- })
|
|
|
|
|
|
+ this.floorSelectAble = this.floorSelect.filter(item=>{
|
|
|
|
+ const hit = this.floors.find(i => i.gname == item.id)
|
|
|
|
+ return !hit
|
|
})
|
|
})
|
|
console.log(this.floorSelectAble)
|
|
console.log(this.floorSelectAble)
|
|
},
|
|
},
|
|
@@ -163,7 +163,7 @@ export default {
|
|
// 查询备注
|
|
// 查询备注
|
|
queryMarks() {
|
|
queryMarks() {
|
|
let postParams = {
|
|
let postParams = {
|
|
- categoryId: this.$cookie.get('categoryId'),
|
|
|
|
|
|
+ categoryId: this.categoryId ? this.categoryId : this.$cookie.get('categoryId'),
|
|
projectId: this.$store.state.plazaId,
|
|
projectId: this.$store.state.plazaId,
|
|
BuildingID: '1',
|
|
BuildingID: '1',
|
|
FloorID: this.$cookie.get('floorNow')
|
|
FloorID: this.$cookie.get('floorNow')
|
|
@@ -210,14 +210,23 @@ export default {
|
|
* @description t跳转editer编辑器
|
|
* @description t跳转editer编辑器
|
|
*/
|
|
*/
|
|
goToEditer() {
|
|
goToEditer() {
|
|
- let FloorID = this.$cookie.get('floorMapId') || 'f1'
|
|
|
|
- let categoryId = this.$cookie.get('categoryId')
|
|
|
|
|
|
+ if (this.floor) {
|
|
|
|
+ this.floorSelect.forEach(el=>{
|
|
|
|
+ if(el.id==this.floor){
|
|
|
|
+ this.floorName = el.name
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ console.log(this.floorName)
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ let FloorID = this.floor ? this.floor : this.$cookie.get('floorMapId') || 'f1'
|
|
|
|
+ let categoryId = this.categoryId ? this.categoryId : this.$cookie.get('categoryId')
|
|
const { conf } = window.__systemConf,
|
|
const { conf } = window.__systemConf,
|
|
{ editerUrl } = conf
|
|
{ editerUrl } = conf
|
|
- let data = `categoryId=${categoryId}&projectId=${this.plazaId}&BuildingID=1&FloorID=${FloorID}&FloorName=${this.$cookie.get(
|
|
|
|
- 'floorNow'
|
|
|
|
- )}&fmapID=${this.fmapID}`
|
|
|
|
|
|
+ let floorName = this.floorName ? this.floorName : this.$cookie.get('floorNow')
|
|
|
|
+ let data = `categoryId=${categoryId}&projectId=${this.plazaId}&BuildingID=1&FloorID=${FloorID}&FloorName=${floorName}&fmapID=${this.fmapID}`
|
|
let url = editerUrl + 'editer?' + encodeURIComponent(data)
|
|
let url = editerUrl + 'editer?' + encodeURIComponent(data)
|
|
|
|
+ console.log(data)
|
|
window.open(url, true)
|
|
window.open(url, true)
|
|
},
|
|
},
|
|
isShow2() {
|
|
isShow2() {
|
|
@@ -309,11 +318,15 @@ export default {
|
|
// 新增楼层确定
|
|
// 新增楼层确定
|
|
determine() {
|
|
determine() {
|
|
this.isFloor = false
|
|
this.isFloor = false
|
|
|
|
+ this.goToEditer()
|
|
}
|
|
}
|
|
},
|
|
},
|
|
mounted() {
|
|
mounted() {
|
|
|
|
+ console.log(this.floors)
|
|
|
|
+ console.log(this.floorSelect)
|
|
if (this.floors.length > 0) {
|
|
if (this.floors.length > 0) {
|
|
- this.formatFloor()
|
|
|
|
|
|
+ debugger
|
|
|
|
+ this.formatFloor()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|