Merge branch 'master' of http://192.168.1.43:3000/v3/v3-lab-xcx

pages_manage/emergencyEvacuationBig.vue

@@ -20,8 +20,7 @@
 						<view></view>
 						<view>楼层</view>
 					</view>
-					<picker @change="floorChange" :disabled="!buildingId" :range-key="'name'" 
-						:range="floorList">
+					<picker @change="floorChange" :disabled="!buildingId" :range-key="'name'" :range="floorList">
 						<view class="picker-min-box">
 							<view>{{floorName?floorName:'请选择楼层'}}</view>
 							<img src="@/images/basicsModules/icon_06.png">
@@ -33,8 +32,7 @@
 						<view></view>
 						<view>实验室</view>
 					</view>
-					<picker @change="fjListChange" :disabled="!floorId" :range-key="'subName'" 
-						:range="fjListArray">
+					<picker @change="fjListChange" :disabled="!floorId" :range-key="'subName'" :range="fjListArray">
 						<view class="picker-min-box">
 							<view>{{subName?subName:'请选择实验室'}}</view>
 							<img src="@/images/basicsModules/icon_06.png">
@@ -49,8 +47,8 @@
 				<!-- 头部 -->
 				<view class="evacuation-title-box">
 					<view class="evacuation-title-left">
-						<view class="evacuation-title-name-box">{{checkSubName}}</view>
-						<view class="site"><img src="@/images/basicsModules/icon_14.png">{{address}}</view>
+						<view class="evacuation-title-name-box">{{subName}}</view>
+						<view class="site"><img src="@/images/basicsModules/icon_14.png">{{buildingName}} {{floorName}}</view>
 					</view>
 					<view class="evacuation-title-right" @click="backButton()">选择房间</view>
 				</view>
@@ -780,7 +778,7 @@
 				}
 				this.$set(this, 'pageType', 2);
 				this.getDeviceList();
-				this.laboratoryInfo();
+				//this.laboratoryInfo();
 				this.getRedisEvacuation();
 
 			},
@@ -859,14 +857,12 @@
 						let subList = [];
 						for (let o = 0; o < data.data[0].buildLayoutVoList.length; o++) {
 							subList.push(data.data[0].buildLayoutVoList[o])
-							if (self.subId == data.data[0].buildLayoutVoList[o].subId) {
-								self.$set(self, 'checkSubName', data.data[0].buildLayoutVoList[o].subName);
-								self.$set(self, 'address', data.data.labExitLineVo.buildName + '' + data.data[0]
-									.labExitLineVo.floorName);
-							}
+							// if (self.subId == data.data[0].buildLayoutVoList[o].subId) {
+							// 	self.$set(self, 'checkSubName', data.data[0].buildLayoutVoList[o].subName);
+							// 	self.$set(self, 'address', data.data.labExitLineVo.buildName + '' + data.data[0]
+							// 		.labExitLineVo.floorName);
+							// }
 						}
-						console.log(1111)
-						console.log(subList)
 						this.$set(this, 'fjListArray', subList);
 						this.$set(this, 'mapList', JSON.parse(JSON.stringify(list)));
 						// this.$set(this, 'shadeMapList', JSON.parse(JSON.stringify(list)));
@@ -1822,6 +1818,7 @@
 
 					.broadcast_m {
 						width: 100%;
+						margin-bottom: 80rpx;
 
 						.broadcast_m_t {
 							width: 142rpx;
@@ -1833,7 +1830,6 @@
 							font-weight: 500;
 							line-height: 170rpx;
 							text-align: center;
-
 							>img {
 								width: 142rpx;
 								height: 142rpx;