|
@@ -216,7 +216,7 @@
|
|
<el-form-item label="关键字" prop="searchValue" style="margin-right:20px;margin-bottom:20px;">
|
|
<el-form-item label="关键字" prop="searchValue" style="margin-right:20px;margin-bottom:20px;">
|
|
<el-input
|
|
<el-input
|
|
v-model="queryParams.searchValue"
|
|
v-model="queryParams.searchValue"
|
|
- placeholder="请输入关键字"
|
|
|
|
|
|
+ placeholder="房间号/房间名称"
|
|
clearable
|
|
clearable
|
|
size="small"
|
|
size="small"
|
|
/>
|
|
/>
|
|
@@ -777,6 +777,13 @@
|
|
this.$set(this, 'pageType', type)
|
|
this.$set(this, 'pageType', type)
|
|
} else if (type == 2) {
|
|
} else if (type == 2) {
|
|
this.$set(this, 'propsData', item)
|
|
this.$set(this, 'propsData', item)
|
|
|
|
+ if(item.name){
|
|
|
|
+ this.$set(this.propsData, 'buildName', item.buildName)
|
|
|
|
+ this.$set(this.propsData, 'floorName', item.name)
|
|
|
|
+ }else{
|
|
|
|
+ this.$set(this.propsData, 'buildName', this.ldName)
|
|
|
|
+ this.$set(this.propsData, 'floorName', this.lcName)
|
|
|
|
+ }
|
|
this.$set(this, 'pageType', type)
|
|
this.$set(this, 'pageType', type)
|
|
}else if(type == 3){
|
|
}else if(type == 3){
|
|
this.$set(this, 'pageType', 1)
|
|
this.$set(this, 'pageType', 1)
|
|
@@ -908,11 +915,6 @@
|
|
} else {
|
|
} else {
|
|
this.$set(this, 'floorZkType', 3)
|
|
this.$set(this, 'floorZkType', 3)
|
|
}
|
|
}
|
|
- console.log('self.buildingList',self.buildingList)
|
|
|
|
- console.log('self.buildingList.length',self.buildingList.length)
|
|
|
|
- console.log('numOne',numOne)
|
|
|
|
- console.log('numTwo',numTwo)
|
|
|
|
- console.log('floorZkFor',this.floorZkType)
|
|
|
|
},
|
|
},
|
|
//拖拽抓取时触发
|
|
//拖拽抓取时触发
|
|
dragstartPlay(event) {
|
|
dragstartPlay(event) {
|