|
|
@@ -71,7 +71,7 @@
|
|
|
<div class="evacuation-shade-map-box"
|
|
|
:style="'width:'+mapData.minWidth+'px;height:'+mapData.minHeight+'px;'">
|
|
|
<div class="evacuation-shade-map-for-box for-map-box-one"
|
|
|
- v-for="(item,index) in mapData.mapList" :key="index" v-if="item.type == 1"
|
|
|
+ v-for="(item,index) in mapData.mapList" :key="item.key" v-if="item.type == 1"
|
|
|
:style="'background:'+item.classifiedColor+';top:'+item.y+'px;left:'+item.x+'px;width:'+item.w+'px;height:'+item.h+'px;'">
|
|
|
<div class="evacuation-shade-map-min-box">
|
|
|
<!--名称/实验室名称-->
|
|
|
@@ -82,12 +82,12 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="evacuation-shade-map-for-box for-map-box"
|
|
|
- v-for="(item,indexOne) in newMapData.mapList" :key="indexOne" v-if="item.type == 2"
|
|
|
+ v-for="(item,indexOne) in newMapData.mapList" :key="item.key" v-if="item.type == 2"
|
|
|
:style="'top:'+item.y+'px;left:'+item.x+'px;width:'+item.w+'px;height:'+item.h+'px;'">
|
|
|
<div class="evacuation-shade-map-min-box"></div>
|
|
|
</div>
|
|
|
<div class="evacuation-shade-map-for-box for-map-box-two"
|
|
|
- v-for="(item,indexTwo) in newMapData.mapList" :key="indexTwo" v-if="item.type == 3"
|
|
|
+ v-for="(item,indexTwo) in newMapData.mapList" :key="item.key" v-if="item.type == 3"
|
|
|
@click="shadeCheckRoomClick(item)"
|
|
|
:class="item.roomCheckType?'for-map-box-two-check':''"
|
|
|
:style="'top:'+item.y+'px;left:'+item.x+'px;width:'+item.w+'px;height:'+item.h+'px;'">
|
|
|
@@ -102,7 +102,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="right-big-box">
|
|
|
- <div class="lv-max-box">
|
|
|
+ <div class="lv-max-box scrollbar-box">
|
|
|
<div class="lv-for-box" v-for="(item,index) in lvList" :key="index">
|
|
|
<p :style="'background:'+item.classifiedColor+';'"></p>
|
|
|
<p>{{item.classifiedName}}</p>
|
|
|
@@ -235,12 +235,14 @@
|
|
|
minList[x].roomNum = response.data[i].buildFloorLayoutVoList[o].roomNum;
|
|
|
minList[x].subName = response.data[i].buildFloorLayoutVoList[o].subName;
|
|
|
minList[x].subId = response.data[i].buildFloorLayoutVoList[o].subId;
|
|
|
- minList[x].classifiedId = response.data[i].buildFloorLayoutVoList[o].classifiedId;
|
|
|
- minList[x].typeId = response.data[i].buildFloorLayoutVoList[o].typeId;
|
|
|
+ minList[x].classifiedColor = '#062338';
|
|
|
+ minList[x].classifiedId = response.data[i].buildFloorLayoutVoList[o].classifiedId?response.data[i].buildFloorLayoutVoList[o].classifiedId:'';
|
|
|
+ minList[x].typeId = response.data[i].buildFloorLayoutVoList[o].typeId?response.data[i].buildFloorLayoutVoList[o].typeId:'';
|
|
|
}
|
|
|
}
|
|
|
for(let o=0;o<self.lvList.length;o++){
|
|
|
if(minList[x].classifiedId == self.lvList[o].id){
|
|
|
+ console.log('minList[x]',minList[x])
|
|
|
minList[x].classifiedColor = self.lvList[o].classifiedColor;
|
|
|
}
|
|
|
}
|
|
|
@@ -417,12 +419,12 @@
|
|
|
overflow: hidden;
|
|
|
.left-big-box {
|
|
|
width: rw(290);
|
|
|
- height: rh(930);
|
|
|
+ height: rh(880);
|
|
|
overflow: hidden;
|
|
|
.max-building-box{
|
|
|
margin-top:rh(80);
|
|
|
margin-right:rw(40);
|
|
|
- height: rh(975);
|
|
|
+ height: rh(800);
|
|
|
.for-building-box:nth-child(1){
|
|
|
border:none;
|
|
|
}
|
|
|
@@ -742,7 +744,10 @@
|
|
|
}
|
|
|
.right-big-box {
|
|
|
width: rw(290);
|
|
|
+ height: rh(880);
|
|
|
+ overflow: hidden;
|
|
|
.lv-max-box {
|
|
|
+ height: rh(800);
|
|
|
margin-top: rh(80);
|
|
|
margin-left: rw(100);
|
|
|
.lv-for-box {
|
dedsudiyu