dedsudiyu 2 lat temu
rodzic
commit
f71bc2ec7c

+ 2 - 2
api/request/config.js

@@ -9,9 +9,9 @@ const config = {
 	
 	
 	// base_url: 'https://lab.sxitdlc.com/labNhSystem/',//43服务器高升测试
 	// base_url: 'https://lab.sxitdlc.com/labNhSystem/',//43服务器高升测试
 	// base_url: 'https://lab.sxitdlc.com/labAppTest/',//43服务器线上
 	// base_url: 'https://lab.sxitdlc.com/labAppTest/',//43服务器线上
-    // base_url: 'https://lab.sxitdlc.com/appTest/',//88服务器线上
+    base_url: 'https://lab.sxitdlc.com/appTest/',//88服务器线上
 	// base_url: 'https://lab.sxitdlc.com/labSystem/', //矿大地址
 	// base_url: 'https://lab.sxitdlc.com/labSystem/', //矿大地址
-	base_url: 'https://lab.sxitdlc.com/jdlabSystem/', //交大地址
+	// base_url: 'https://lab.sxitdlc.com/jdlabSystem/', //交大地址
 	
 	
 	
 	
 	//视频地址
 	//视频地址

BIN
images/Version2.3/icon_bj_syspmtcy_jinan.png


BIN
images/Version2.3/icon_sjt.gif


+ 99 - 49
pages/emergencyEvacuationBig.vue

@@ -115,7 +115,7 @@
 						<view class="evacuation-map-big-box">
 						<view class="evacuation-map-big-box">
 							<view class="evacuation-map-min-for-box" :class="subId == item.subjectId?'evacuation-map-min-for-box-color':''"
 							<view class="evacuation-map-min-for-box" :class="subId == item.subjectId?'evacuation-map-min-for-box-color':''"
 							v-for="(item,index) in fjList" :key="index">{{item.room}}</view>
 							v-for="(item,index) in fjList" :key="index">{{item.room}}</view>
-							<img class="map-min-img" src="@/images/Version2.3/icon_zjt.gif" v-show="lightList[0].type">
+							<img class="map-min-img" src="@/images/Version2.3/icon_sjt.gif" v-show="lightList[0].type">
 							<img class="map-min-img" src="@/images/Version2.3/icon_yjt.gif" v-show="lightList[1].type">
 							<img class="map-min-img" src="@/images/Version2.3/icon_yjt.gif" v-show="lightList[1].type">
 							<img class="map-min-img" src="@/images/Version2.3/icon_zjt.gif" v-show="lightList[2].type">
 							<img class="map-min-img" src="@/images/Version2.3/icon_zjt.gif" v-show="lightList[2].type">
 							<img class="map-min-img" src="@/images/Version2.3/icon_yjt.gif" v-show="lightList[3].type">
 							<img class="map-min-img" src="@/images/Version2.3/icon_yjt.gif" v-show="lightList[3].type">
@@ -1050,7 +1050,7 @@
 						.evacuation-map-big-box{
 						.evacuation-map-big-box{
 							height:285rpx;
 							height:285rpx;
 							width:641rpx;
 							width:641rpx;
-							background:url(../images/Version2.3/icon_bj_syspmtcy.png);
+							background:url(../images/Version2.3/icon_bj_syspmtcy_jinan.png);
 							background-size 100%
 							background-size 100%
 							margin:28rpx 13rpx ;
 							margin:28rpx 13rpx ;
 							position relative
 							position relative
@@ -1065,83 +1065,133 @@
 								background: rgba(0,189,255,0.3);
 								background: rgba(0,189,255,0.3);
 							}
 							}
 							.evacuation-map-min-for-box:nth-child(1){
 							.evacuation-map-min-for-box:nth-child(1){
-								margin:4rpx 0 0 2rpx;
-								width:78rpx;
-								height:98rpx;
+								margin:4rpx 82rpx 0 0;
+								width:91rpx;
+								height:91rpx;
 							}
 							}
 							.evacuation-map-min-for-box:nth-child(2){
 							.evacuation-map-min-for-box:nth-child(2){
-								margin:4rpx 0 0 86rpx;
-								width:97rpx;
-								height:98rpx;
+								margin:4rpx 0 0 0;
+								width:57rpx;
+								height:91rpx;
 							}
 							}
 							.evacuation-map-min-for-box:nth-child(3){
 							.evacuation-map-min-for-box:nth-child(3){
-								margin:4rpx 240rpx 0 2rpx;
-								width:68rpx;
-								height:98rpx;
+								margin:4rpx 0 0 0;
+								width:57rpx;
+								height:91rpx;
 							}
 							}
 							.evacuation-map-min-for-box:nth-child(4){
 							.evacuation-map-min-for-box:nth-child(4){
-								margin:75rpx 0 0 94rpx;
-								width:168rpx;
-								height:98rpx;
+								margin:4rpx 0 0 0;
+								width:57rpx;
+								height:91rpx;
 							}
 							}
 							.evacuation-map-min-for-box:nth-child(5){
 							.evacuation-map-min-for-box:nth-child(5){
-								margin:75rpx 0 0 2rpx;
-								width:66rpx;
-								height:98rpx;
+								margin:4rpx 0 0 0;
+								width:58rpx;
+								height:91rpx;
 							}
 							}
 							.evacuation-map-min-for-box:nth-child(6){
 							.evacuation-map-min-for-box:nth-child(6){
-								margin:75rpx 0 0 2rpx;
+								margin:4rpx 0 0 0;
 								width:57rpx;
 								width:57rpx;
-								height:98rpx;
+								height:91rpx;
 							}
 							}
 							.evacuation-map-min-for-box:nth-child(7){
 							.evacuation-map-min-for-box:nth-child(7){
-								margin:75rpx 0 36rpx 2rpx;
-								width:55rpx;
-								height:64rpx;
+								margin:4rpx 0 0 0;
+								width:57rpx;
+								height:91rpx;
 							}
 							}
 							.evacuation-map-min-for-box:nth-child(8){
 							.evacuation-map-min-for-box:nth-child(8){
-								margin:75rpx 0 0 2rpx;
-								width:64rpx;
-								height:98rpx;
+								margin:4rpx 40rpx 0 0;
+								width:57rpx;
+								height:91rpx;
 							}
 							}
 							.evacuation-map-min-for-box:nth-child(9){
 							.evacuation-map-min-for-box:nth-child(9){
-								margin:75rpx 0 0 2rpx;
-								width:43rpx;
-								height:98rpx;
+								margin:47rpx 0 0 0;
+								width:51rpx;
+								height:136rpx;
+								line-height:140rpx;
 							}
 							}
 							.evacuation-map-min-for-box:nth-child(10){
 							.evacuation-map-min-for-box:nth-child(10){
-								margin:75rpx 0 0 2rpx;
-								width:51rpx;
-								height:98rpx;
+								margin:47rpx 0 0 0;
+								width:60rpx;
+								height:136rpx;
+								line-height:140rpx;
+							}
+							.evacuation-map-min-for-box:nth-child(11){
+								margin:47rpx 0 0 0;
+								width:62rpx;
+								height:136rpx;
+								line-height:140rpx;
+							}
+							.evacuation-map-min-for-box:nth-child(12){
+								margin:47rpx 0 0 0;
+								width:58rpx;
+								height:136rpx;
+								line-height:140rpx;
+							}
+							.evacuation-map-min-for-box:nth-child(13){
+								margin:47rpx 0 0 0;
+								width:57rpx;
+								height:136rpx;
+								line-height:140rpx;
+							}
+							.evacuation-map-min-for-box:nth-child(14){
+								margin:47rpx 0 0 0;
+								width:57rpx;
+								height:136rpx;
+								line-height:140rpx;
+							}
+							.evacuation-map-min-for-box:nth-child(15){
+								margin:47rpx 0 0 0;
+								width:57rpx;
+								height:136rpx;
+								line-height:140rpx;
+							}
+							.evacuation-map-min-for-box:nth-child(16){
+								margin:47rpx 0 0 0;
+								width:57rpx;
+								height:136rpx;
+								line-height:140rpx;
+							}
+							.evacuation-map-min-for-box:nth-child(17){
+								margin:47rpx 0 0 0;
+								width:57rpx;
+								height:136rpx;
+								line-height:140rpx;
+							}
+							.evacuation-map-min-for-box:nth-child(18){
+								margin:47rpx 0 0 0;
+								width:57rpx;
+								height:136rpx;
+								line-height:140rpx;
 							}
 							}
 							.map-min-img{
 							.map-min-img{
 								position: absolute;
 								position: absolute;
 								width:34rpx;
 								width:34rpx;
 								height:22rpx;
 								height:22rpx;
 							}
 							}
-							.map-min-img:nth-child(11){
-								top: 130rpx;
-								left: 70rpx;
+							.map-min-img:nth-child(19){
+								top: 64rpx;
+								left: 94rpx;
 							}
 							}
-							.map-min-img:nth-child(12){
-								top: 130rpx;
-								left: 120rpx;
+							.map-min-img:nth-child(20){
+								top: 109rpx;
+								left: 134rpx;
 							}
 							}
-							.map-min-img:nth-child(13){
-								top: 130rpx;
-								left:230rpx;
+							.map-min-img:nth-child(21){
+								top: 109rpx;
+								left:290rpx;
 							}
 							}
-							.map-min-img:nth-child(14){
-								top: 130rpx;
-								left:280rpx;
-							}
-							.map-min-img:nth-child(15){
-								top: 130rpx;
+							.map-min-img:nth-child(22){
+								top: 109rpx;
 								left:350rpx;
 								left:350rpx;
 							}
 							}
-							.map-min-img:nth-child(16){
-								top: 130rpx;
-								left:400rpx;
+							.map-min-img:nth-child(23){
+								top: 109rpx;
+								left:520rpx;
+							}
+							.map-min-img:nth-child(24){
+								top: 109rpx;
+								left:580rpx;
 							}
 							}
 						}
 						}
 					}
 					}