Merge remote-tracking branch 'remotes/origin/3.3.4-kdyh' into kdnh-xcx

# Conflicts:
#	api/request/config.js

api/request/config.js

@@ -8,13 +8,13 @@ const config = {
     // base_url: 'http://192.168.1.43:9800',//43服务器
 	// base_url: 'https://demo.zjznai.com/xzgd/',
 
-	 //base_url: 'https://lab.zjznai.com/labNhSystem/',//43服务器高升测试
+    //base_url: 'https://lab.zjznai.com/labNhSystem/',//43服务器高升测试
 	//base_url: 'https://lab.zjznai.com/labAppTest/',//43服务器线上
     // base_url: 'https://lab.zjznai.com/appTest/',//88服务器线上
-	 base_url: 'https://lab.zjznai.com/labSystem/', //矿大地址
+       base_url: 'https://lab.zjznai.com/labSystem/', //矿大地址
 	// base_url: 'https://lab.zjznai.com/jdlabSystem/', //交大地址
-    // base_url: 'https://lab.zjznai.com/jndxlabSystem/', //暨大地址
-    //  base_url: 'https://lab.zjznai.com/kdwclabSystem/', //矿大文昌地址
-    //base_url: 'https://znyj.zjznai.suda.edu.cn/labSystem/', //苏大临时地址
+   // base_url: 'https://lab.zjznai.com/jndxlabSystem/', //暨大地址
+   //  base_url: 'https://lab.zjznai.com/kdwclabSystem/', //矿大文昌地址
+   //base_url: 'https://znyj.zjznai.suda.edu.cn/labSystem/', //苏大临时地址
 }
 export { config }

pages.json

@@ -357,9 +357,9 @@
 					}
 				},
 				{
-					"path": "workbench/photoInspection",//离开检查
+					"path": "workbench/photoInspection",//拍照检查
 					"style": {
-						"navigationBarTitleText": "离开检查"
+						"navigationBarTitleText": "拍照检查"
 					}
 				},
 				{

pages/manageWorkbench.vue

@@ -15,7 +15,7 @@
       </view>
       <view @click="goPage('photoInspection')">
         <img src="@/images/icon_dzt_pzjc.png">
-        <view>离开检查</view>
+        <view>拍照检查</view>
       </view>
       <view @click="goPage('accessQualification')">
         <img src="@/images/Version2.2/icon_sy_zrsq.png">

pages/studentWorkbench.vue

@@ -22,7 +22,7 @@
       </view>
       <view @click="goPage('photoInspection')">
         <img src="@/images/icon_dzt_pzjc.png">
-        <view>离开检查</view>
+        <view>拍照检查</view>
       </view>
       <view @click="goPage('gas')">
         <img src="@/images/Version3.0/icon_sy_qpgl.png">

pages_manage/emergencyEvacuationBig.vue

@@ -149,10 +149,9 @@
           </video>
         </view>
         <view class="bottom-button-box">
-          <view class="voice" @click="shadeTypeClick()">语音广播</view>
-          <view class="plan" v-if="planStatus"  @click="closePlan()">结束预案</view>
-          <view class="evacuate" @click="evacuationButton(1)" v-if="isEvacuate">执行疏散</view>
-          <view class="evacuate" @click="evacuationButton(2)" v-if="!isEvacuate">结束疏散</view>
+          <view @click="shadeTypeClick()">语音广播</view>
+          <view @click="evacuationButton(1)" v-if="isEvacuate">执行疏散</view>
+          <view @click="evacuationButton(2)" v-if="!isEvacuate">结束疏散</view>
         </view>
       </view>
       <!-- 语音广播-->
@@ -219,8 +218,7 @@ import {
   firedeviceStatus,
   firedeviceStatusTiming,
   firedeviceStart,
-  firedeviceCancel,
-  closeRiskPlan
+  firedeviceCancel
 } from '@/api/index.js'
 import {
   getBuildOrFloorList,
@@ -349,8 +347,6 @@ export default {
       fireCode:null,// //灭火设备code
       fireStartType:false, //灭火启动状态
       outfireData: {}, //一键灭火
-	  groupId:null,
-	  planStatus:false,
     }
   },
   onLoad(option) {
@@ -361,7 +357,6 @@ export default {
       this.$set(this,'floorId',obj.floorId);
       this.$set(this,'subId',obj.subId);
       this.$set(this.itemData,'subjectId',obj.subId);
-	  this.$set(this,'groupId',obj.groupId);
       this.$set(this,'pageType',2);
       this.confirmBtn();
 	  this.riskPlanId(obj.groupId);
@@ -422,33 +417,6 @@ export default {
       this.$set(this,'urlList',[]);
       this.treeselectByUser();
     },
-	//结束预案
-	closePlan(){
-		let self = this;
-		uni.showModal({
-			content: '传感器数据监测异常，确定要强制结束预案?关闭报警后，3分钟内系统不再触发预案报警，请核实确认后再执行此操作?',
-			cancelColor:"#999",
-			confirmColor:"#0183FA",
-			success: function (res) {
-				if (res.confirm) {
-					self.closeRiskPlan();
-				} else if (res.cancel) {
-				}
-			}
-		});
-	},
-	async closeRiskPlan(){
-		const {data} = await closeRiskPlan({id:this.groupId});
-		if(data.code == 200){
-			this.planStatus=false;
-			uni.showToast({
-				title: '操作成功',
-				icon:"none",
-				mask:true,
-				duration: 2000
-			});
-		}
-	},
     //全屏疏散页面
     goAllPage() {
       let obj = {
@@ -713,10 +681,6 @@ export default {
           for(let o=0;o<self.fjListArray.length;o++){
             for(let i=0;i<data.data.length;i++){
               if(data.data[i].subId == self.fjListArray[o].subId){
-				  console.log('预案')
-				  console.log(data.data[i])
-				self.planStatus=true;//如果有预案发生
-				self.$set(this,'groupId',data.data[i].groupId)
 				self.fjListArray[o].subName.replace('(预案发生)')
                 self.fjListArray[o].subName = '(预案发生) '+self.fjListArray[o].subName
               }
@@ -2030,15 +1994,13 @@ export default {
           font-size: 28rpx;
         }
 
-        .voice {
+        view:nth-child(1) {
           border-top-left-radius: 50rpx;
           border-bottom-left-radius: 50rpx;
           background: #FF9C00;
         }
-		.plan{
-			background: #21A743;
-		}
-        .evacuate{
+
+        view:nth-child(2) {
           border-top-right-radius: 50rpx;
           border-bottom-right-radius: 50rpx;
           background: #0183FA;

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;