Merge branch 'xcx-v2' of http://192.168.1.43:3000/git/sass-lab-xcxc into xcx-v2

api/request/config.js

@@ -1,5 +1,5 @@
 const config = {
-	// base_url: 'http://192.168.1.9:8080',//柴
+	base_url: 'http://192.168.1.9:8080',//柴
 	// base_url: 'http://192.168.1.7:8080',//刘波
 	// base_url: 'http://192.168.1.17:8080',//小飞
 	// base_url: 'http://192.168.1.20:8080',//志伟
@@ -15,6 +15,6 @@ const config = {
 	// base_url: 'https://lab.sxitdlc.com/jdlabSystem/', //交大地址
     // base_url: 'https://lab.sxitdlc.com/jndxlabSystem/', //暨大地址
     //  base_url: 'https://lab.sxitdlc.com/kdwclabSystem/', //矿大文昌地址
-    base_url: 'https://lab.sxitdlc.com/sudalabSystem/', //苏大临时地址
+    //base_url: 'https://znyj.labcenter.suda.edu.cn/labSystem/', //苏大临时地址
 }
 export { config }

pages/emergencyEvacuationBig.vue

@@ -115,7 +115,7 @@
           </view>
           <view class="outfire_li" v-if="outfireEnd">
             <img src="@/images/icon_sy_mhwc.png">
-            <text style="color: #FF2333;">灭火完成，请您及时补充灭火设备耗材</text>
+            <text style="color: #FF2333;" class="finish">自动灭火完成，请确保在关闭灭火一体机电源后补充灭火耗材，耗材补充完毕需要打开电源并点击一体机上的复位按钮</text>
           </view>
           <template v-if="fireListType && !fireStartType && !outfireEnd">
             <view class="outfire_li">
@@ -1616,12 +1616,18 @@ export default {
         .outfire_li {
           display: flex;
           justify-content: flex-start;
-          align-items: center;
+		  padding: 20rpx 10rpx;
+		  box-sizing: border-box;
+          //align-items: center;
+		  .finish{
+		  	flex: 1;
+		  }
 
           >img {
             width: 24rpx;
             height: 30rpx;
             margin-right: 12rpx;
+			margin-top: 8rpx;
           }
 
           .normal {

pages_manage/workbench/laboratory/laboratoryInfo.vue

@@ -38,7 +38,7 @@
 	  </view>
 	  <view class="outfire_li" v-if="outfireEnd">
 	    <img src="@/images/icon_sy_mhwc.png">
-	    <text style="color: #FF2333;">灭火完成，请您及时补充灭火设备耗材</text>
+	    <text style="color: #FF2333;" class="finish">自动灭火完成，请确保在关闭灭火一体机电源后补充灭火耗材，耗材补充完毕需要打开电源并点击一体机上的复位按钮</text>
 	  </view>
 	  <template v-if="fireListType && !fireStartType && !outfireEnd">
 	    <view class="outfire_li">
@@ -846,13 +846,17 @@ export default {
     .outfire_li {
       display: flex;
       justify-content: flex-start;
-      align-items: center;
+      //align-items: center;
   
       >img {
         width: 24rpx;
         height: 30rpx;
         margin-right: 12rpx;
+		margin-top: 8rpx;
       }
+	  .finish{
+		  flex: 1;
+	  }
   
       .normal {
         font-size: 24rpx;

pages_manage/workbench/laboratory/monitor.vue

@@ -341,7 +341,7 @@ export default {
     //获取喇叭列表
     async getDeviceListBySub(){
       let obj = {
-        floorId:5,
+        floorId:this.itemData.floorId,
         subId:this.itemData.id,
         page:1,
         pageSize:100