|
@@ -16,7 +16,7 @@
|
|
|
</div>
|
|
|
<el-badge :is-dot="showSpaceDot" style="margin-left:15px;">
|
|
|
<label style="line-height:32px;">业务空间类型:</label>
|
|
|
- <el-cascader v-model="space" placeholder="请选择业务空间" :props="{value:'Code',label:'Name',children:'ZoneType'}"
|
|
|
+ <el-cascader v-model="space" placeholder="请选择业务空间" :props="{value:'code',label:'name',children:'zoneType'}"
|
|
|
:options="spaceList"
|
|
|
@change="changeSpace" style="margin-left:15px;"></el-cascader>
|
|
|
</el-badge>
|
|
@@ -48,8 +48,8 @@
|
|
|
<span class="floor-item" style="border-bottom:1px solid #e4e4e4;">楼 层</span>
|
|
|
<div v-if="building" v-loading="buildingLoading">
|
|
|
<span class="floor-item" @click="changeFloor(item)"
|
|
|
- :class="{floorItemChoose:(item.FloorID == floor)}"
|
|
|
- v-for="item in buildingObj.Floor" :key="item.FloorID">{{ item.FloorLocalName }}</span>
|
|
|
+ :class="{floorItemChoose:(item.id == floor)}"
|
|
|
+ v-for="item in buildingObj.floor" :key="item.id">{{ item.localName }}</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
</el-scrollbar>
|
|
@@ -62,7 +62,7 @@
|
|
|
<elevation-map ref="elevationMap" :onlyRead="cenoteObj.onlyRead=='true'" :isEdit="isEdit" :isAI="isAI"
|
|
|
@elevationChecked="handleCheckedSpace"
|
|
|
@elevationUncheck="handleUncheckSpace"
|
|
|
- :params="{BuildingId: building, ObjectType: ObjectType, ShaftId: $route.query.ShaftId}">
|
|
|
+ :params="{buildingId: building, objectType: ObjectType, shaftId: $route.query.ShaftId}">
|
|
|
</elevation-map>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -147,7 +147,7 @@ export default {
|
|
|
}
|
|
|
shaftSpaceTypeQuery(pa, res => {
|
|
|
this.spaceList = res.content.map(item => {
|
|
|
- return { Code: item.ObjectType, Name: item.ObjectTypeName };
|
|
|
+ return { code: item.objectType, name: item.objectTypeName };
|
|
|
});
|
|
|
this.showDefaultSpace();
|
|
|
});
|
|
@@ -177,8 +177,8 @@ export default {
|
|
|
this.space = [val2.content[0].objectType];
|
|
|
} else {
|
|
|
this.space = this.spaceList.find((item) => {
|
|
|
- return item.Code == "GeneralZone"
|
|
|
- }) ? ["GeneralZone"] : [this.spaceList[0].Code];
|
|
|
+ return item.code == "GeneralZone"
|
|
|
+ }) ? ["GeneralZone"] : [this.spaceList[0].code];
|
|
|
}
|
|
|
this.ObjectType = this.space[0];
|
|
|
//加载楼层信息
|
|
@@ -213,9 +213,9 @@ export default {
|
|
|
this.buildingLoading = true;
|
|
|
shaftSpaceBuildingQuery(param, res => {
|
|
|
this.buildingLoading = false;
|
|
|
- this.buildingList = res.Content;
|
|
|
+ this.buildingList = res.content;
|
|
|
this.buildingList = this.buildingList.map(item => {
|
|
|
- item.Floor = item.FloorList;
|
|
|
+ item.floor = item.floorList;
|
|
|
item.BuildID = item.BuildingId;
|
|
|
item.BuildLocalName = item.BuildingLocalName;
|
|
|
if (item.Floor) {
|
|
@@ -304,7 +304,6 @@ export default {
|
|
|
if (item.id == bid) {
|
|
|
this.buildingObj = item;
|
|
|
if (item.floor && item.floor.length) {
|
|
|
- // this.floor = item.Floor[0].FloorID
|
|
|
this.changeFloor(item.floor[0]);
|
|
|
}
|
|
|
}
|
|
@@ -313,12 +312,9 @@ export default {
|
|
|
},
|
|
|
//更换楼层
|
|
|
changeFloor(floorObj) {
|
|
|
- debugger
|
|
|
- this.buildFloorName = `${this.buildingObj.BuildLocalName ? this.buildingObj.BuildLocalName :
|
|
|
- this.buildingObj.BuildName ? this.buildingObj.BuildName : ""}-${floorObj.FloorLocalName ?
|
|
|
- floorObj.FloorLocalName : floorObj.FloorName ? floorObj.FloorName : ""}`
|
|
|
- this.floor = floorObj.FloorID;
|
|
|
- let buildfloor = [this.building, floorObj.FloorID]
|
|
|
+ this.buildFloorName = `${this.buildingObj.BuildLocalName || this.buildingObj.BuildName || ""}-${floorObj.FloorLocalName || floorObj.FloorName || ""}`
|
|
|
+ this.floor = floorObj.id;
|
|
|
+ let buildfloor = [this.building, floorObj.id]
|
|
|
this.$refs.cenotegraphy.getFloorMap(buildfloor, this.ObjectType)
|
|
|
},
|
|
|
//平面图选中空间,立面图对应选中
|