heyang

api/request/config.js

@@ -1,5 +1,5 @@
 const config = {
-	base_url: 'http://192.168.1.24:8080',//柴
+	//base_url: 'http://192.168.1.24: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',//小飞
@@ -10,7 +10,7 @@ const config = {
 	// base_url: 'https://demo.sxitdlc.com/xzgd/',
 
 	// 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/labSystem/', //矿大地址
       // base_url: 'https://lab.sxitdlc.com/labSaasSystem/', //矿大化工

pages_manage/workbench/laboratory/laboratoryInfo.vue

@@ -116,6 +116,33 @@
 			  <view>{{item.phone?item.phone:'未填写'}}</view>
 			</view>
         </view>
+		<ivew class="small_title">管控一体机信息</ivew>
+		<view class="safety-max-box" v-if="itemData.hazardCategory[0]||itemData.riskMeasure[0]||itemData.outfire[0]">
+		  <view class="max-for-box" v-if="itemData.hazardCategory[0]">
+		    <view class="title-box">主要危险类别</view>
+		    <view class="for-box" v-for="(item,index1) in itemData.hazardCategory" :key="index1">● {{item}}</view>
+		  </view>
+		  <view class="max-for-box" v-if="itemData.riskMeasure[0]">
+		    <view class="title-box">风险防控措施</view>
+		    <view class="for-box" v-for="(item,index1) in itemData.riskMeasure" :key="index1">● {{item}}</view>
+		  </view>
+		  <view class="max-for-box" v-if="itemData.outfire[0]">
+		    <view class="title-box">灭火要点</view>
+		    <view class="for-box" v-for="(item,index1) in itemData.outfire" :key="index1">● {{item}}</view>
+		  </view>
+		</view>
+		<view class="img-bottom-box" v-if="itemData.safeSigns[0]||itemData.qrCode">
+		  <view class="title-box">安全警示标识</view>
+		  <view class="for-box">
+		    <img class="img-ojb" src="@/pages_manage/images/icon_aqxxp_jzxy.png" v-if="item == 'xiyan'" v-for="(item,index) in itemData.safeSigns" :key="index">
+		    <img class="img-ojb" src="@/pages_manage/images/icon_aqxxp_jzys.png" v-if="item == 'yinshi'" v-for="(item,index) in itemData.safeSigns" :key="index">
+		    <img class="img-ojb" src="@/pages_manage/images/icon_aqxxp_dxaq.png" v-if="item == 'anquan'" v-for="(item,index) in itemData.safeSigns" :key="index">
+		    <img class="img-ojb" src="@/pages_manage/images/icon_aqxxp_gzf.png" v-if="item == 'gongzuofu'" v-for="(item,index) in itemData.safeSigns" :key="index">
+		    <img class="img-ojb" src="@/pages_manage/images/icon_aqxxp_gbmc.png" v-if="item == 'menchuang'" v-for="(item,index) in itemData.safeSigns" :key="index">
+		    <img class="img-ojb" src="@/pages_manage/images/icon_aqxxp_gbsd.png" v-if="item == 'shuidian'" v-for="(item,index) in itemData.safeSigns" :key="index">
+		  </view>
+		</view>
+		<ivew class="small_title">电子信息牌信息</ivew>
         <view class="safety-max-box" v-if="item.privateList.length>0 && item.classifyType==1" v-for="(item,index) in  itemData.classifyList">
           <view class="max-for-box">
             <view class="title-box">{{item.classifyName}}</view>
@@ -315,7 +342,10 @@ export default {
     }
 	this.firedeviceStatus();
 	this.getListData();
-	this.getDeviceListBySub();
+	if(this.itemData.subAddrr.floorId){
+		this.getDeviceListBySub();
+	}
+	
 
   },
   onShow(){
@@ -1102,6 +1132,10 @@ export default {
   height:100%;
   display flex;
   flex-direction column;
+  .small_title{
+	  padding: 0 20rpx;
+	  font-size: 34rpx;
+  }
    /* 语音广播 */
       .shade-max-big-box {
         height: 100%;
@@ -1642,6 +1676,7 @@ export default {
       background #fff
       padding:8rpx 20rpx;
       border-bottom:1rpx solid #e0e0e0;
+	  margin-bottom: 20rpx;
       .text-min-box{
         display:flex;
         view{
@@ -1680,6 +1715,8 @@ export default {
       margin-top:20rpx;
       background #fff
       padding:8rpx 20rpx 20rpx;
+	  border-bottom: 1rpx solid #e0e0e0;
+	  margin-bottom: 20rpx;
       .title-box{
         line-height:76rpx;
         font-size:28rpx;