heyang

api/index.js

@@ -3,6 +3,115 @@ import { apiResquestForm } from './request/request.js'
 import { apiResquestJsonList } from './request/request.js'
 import { apiResquestFormVideo } from './request/request.js'
 import { apiResquestTimer } from './request/request.js'
+
+
+/**************************新气瓶-东北大学**************************/
+//气瓶规格列表
+export const airbottleBottleTypeList  = (data) => {
+    return apiResquest({
+        url: `/airbottle/bottleType/list`,
+        method: 'POST',
+        data: {...data}
+    })
+};
+//气瓶入库
+export const airbottleStockEnter  = (data) => {
+    return apiResquest({
+        url: `/airbottle/stock/enter`,
+        method: 'POST',
+        data: {...data}
+    })
+};
+//库存列表
+export const airbottleStockList  = (data) => {
+    return apiResquest({
+        url: `/airbottle/stock/list`,
+        method: 'POST',
+        data: {...data}
+    })
+};
+//通过信标查询库信息
+export const airbottleStockFindByBeaconTag  = (data) => {
+    return apiResquest({
+        url: `/airbottle/stock/findByBeaconTag`,
+		method: 'GET',
+		data: data,
+    })
+};
+
+//通过id查询气瓶详情
+export const airbottleStockFindById  = (data) => {
+    return apiResquest({
+        url: `/airbottle/stock/findById`,
+		method: 'GET',
+		data: data,
+    })
+};
+//更换信标
+export const airbottleBeaconUpdate  = (data) => {
+    return apiResquest({
+        url: `/airbottle/stock/update`,
+        method: 'POST',
+        data: {...data}
+    })
+};
+//通过id查询使用记录详情
+export const airbottleUsageRecordFindById  = (data) => {
+    return apiResquest({
+        url: `/airbottle/usageRecord/findById`,
+		method: 'GET',
+		data: data,
+    })
+};
+//确认使用
+export const airbottleUsageRecordAdd  = (data) => {
+    return apiResquest({
+        url: `/airbottle/usageRecord/add`,
+        method: 'POST',
+        data: {...data}
+    })
+};
+//确认出库
+export const airbottleStockOut  = (data) => {
+    return apiResquest({
+        url: `/airbottle/stock/out`,
+        method: 'POST',
+        data: {...data}
+    })
+};
+//使用记录列表
+export const airbottleUsageRecordList  = (data) => {
+    return apiResquest({
+        url: `/airbottle/usageRecord/list`,
+        method: 'POST',
+        data: {...data}
+    })
+};
+//气瓶预警处理
+export const laboratoryWarningNoticeLogUpdate  = (data) => {
+    return apiResquest({
+        url: `/laboratory/warningNoticeLog/update`,
+        method: 'POST',
+        data: {...data}
+    })
+};
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 //管理端--------------------------------
 //获取openid
 export const getOpenId  = (data) => {

api/request/config.js

@@ -3,13 +3,13 @@ const config = {
 	//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',//志伟
+	 base_url: 'http://192.168.1.20:8080',//志伟
     // base_url: 'http://192.168.1.8:8080',//高升
 	// base_url: 'http://192.168.1.29:8080',//何成
     // 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/labAppTest/',//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/labSaasSystem/', //矿大化工

pages.json

@@ -1,41 +1,109 @@
 {
 	"pages": [
 		{
-		   "path": "pages/gasBottle/stockList/storageAdd",
+			"path": "pages/home",//首页
+			"style": {
+				"navigationBarTitleText": "实验室安全智能监测与控制系统",
+				"navigationBarTextStyle": "white", //导航文字颜色
+				"navigationBarBackgroundColor": "#0183FA" ,//导航背景色
+				"navigationStyle": "custom"
+			}
+		},
+		/* 新气瓶管理 */
+		{
+		   "path": "pages/gasBottle/gasManage/gasManage",
 		   "style": {
-		      "navigationBarTitleText": "新增入库",
+		      "navigationBarTitleText": "用气管理",
+		      "navigationBarTextStyle": "white", 
+		      "navigationBarBackgroundColor": "#0183FA"
+		   }
+		},
+		{
+		   "path": "pages/gasBottle/gasOutstock/gasOutstock",
+		   "style": {
+		      "navigationBarTitleText": "气瓶出库",
 		      "navigationBarTextStyle": "white", 
 		      "navigationBarBackgroundColor": "#0183FA" 
 		   }
 		},
 		{
-		   "path": "pages/gasBottle/stockList/stockList",
+		   "path": "pages/gasBottle/gasOutstock/amendAir",
 		   "style": {
-		      "navigationBarTitleText": "库存列表",
+			  "navigationBarTitleText": "修改气压",
+			  "navigationBarTextStyle": "white", 
+			  "navigationBarBackgroundColor": "#0183FA" 
+		   }
+		},
+		
+		{
+		   "path": "pages/gasBottle/gasUse/gasUse",
+		   "style": {
+		      "navigationBarTitleText": "使用登记",
 		      "navigationBarTextStyle": "white", 
 		      "navigationBarBackgroundColor": "#0183FA" 
 		   }
 		},
 		{
-		   "path": "pages/gasBottle/gasManage/gasManage",
+		   "path": "pages/gasBottle/gasManage/useRecordList",
 		   "style": {
-		      "navigationBarTitleText": "用气管理",
+		      "navigationBarTitleText": "使用记录",
 		      "navigationBarTextStyle": "white", 
-		      "navigationBarBackgroundColor": "#0183FA"
+		      "navigationBarBackgroundColor": "#0183FA" 
 		   }
 		},
-		
-
 		{
-			"path": "pages/home",//首页
-			"style": {
-				"navigationBarTitleText": "实验室安全智能监测与控制系统",
-				"navigationBarTextStyle": "white", //导航文字颜色
-				"navigationBarBackgroundColor": "#0183FA" ,//导航背景色
-				"navigationStyle": "custom"
-			}
+		   "path": "pages/gasBottle/stockList/useRecordDetail",
+		   "style": {
+		      "navigationBarTitleText": "使用详情",
+		      "navigationBarTextStyle": "white", 
+		      "navigationBarBackgroundColor": "#0183FA" 
+		   }
+		},
+		{
+		   "path": "pages/gasBottle/stockList/gasListDetail",
+		   "style": {
+		      "navigationBarTitleText": "气瓶详情",
+		      "navigationBarTextStyle": "white", 
+		      "navigationBarBackgroundColor": "#0183FA" 
+		   }
+		},
+		{
+		   "path": "pages/gasBottle/stockList/gasListBinding",
+		   "style": {
+			  "navigationBarTitleText": "更换标签",
+			  "navigationBarTextStyle": "white", 
+			  "navigationBarBackgroundColor": "#0183FA" 
+		   }
+		},
+		{
+		   "path": "pages/gasBottle/stockList/seleteGas",
+		   "style": {
+		      "navigationBarTitleText": "选择气瓶",
+		      "navigationBarTextStyle": "white", 
+		      "navigationBarBackgroundColor": "#0183FA" 
+		   }
 		},
 		{
+		   "path": "pages/gasBottle/stockList/storageAdd",
+		   "style": {
+		      "navigationBarTitleText": "新增入库",
+		      "navigationBarTextStyle": "white", 
+		      "navigationBarBackgroundColor": "#0183FA" 
+		   }
+		},
+		{
+		   "path": "pages/gasBottle/stockList/stockList",
+		   "style": {
+		      "navigationBarTitleText": "库存列表",
+		      "navigationBarTextStyle": "white", 
+		      "navigationBarBackgroundColor": "#0183FA" 
+		   }
+		},
+		
+		
+
+		
+		{
 		   "path": "pages/safetyExamineWorkbench",//安全检查
 		   "style": {
 		      "navigationBarTitleText": "安全检查",

pages/earlyWarningManage/earlyWarningDetail.vue

@@ -103,13 +103,21 @@
 				<text>{{form.entryTime}}</text>
 			</view>
 			<view class="basics_li" v-if="form.warningSubType==2">
-				<text>申领人：</text>
-				<text>{{form.applyUser}}</text>
+				<text>申领时间：</text>
+				<text>{{form.applyTime}}</text>
 			</view>
 			<view class="basics_li" v-if="form.warningSubType==2">
 				<text>申领时间：</text>
 				<text>{{form.applyTime}}</text>
 			</view>
+			<view class="basics_li">
+				<text>定位状态：</text>
+				<text>{{form.locationState==0?'离位':'在位'}}</text>
+			</view>
+			<view class="basics_li" >
+				<text>处理状态：</text>
+				<text>{{form.dispose==0?'未处理':'已处理'}}</text>
+			</view>
 		</view>
 		<!-- 通知短信 -->
 		<view class="note" v-if="form.warningType==4 || form.warningType==1" >
@@ -146,6 +154,22 @@
 				</view>
 			</view>
 		</view>
+		<!-- 预警处理 -->
+		<view  class="picture" v-if="form.dispose==0">
+			<view class="small_title"><text></text><text>预警处理</text></view>
+			<view class="picture_b" >
+				<textarea v-model="form.remark" class="dispose" placeholder="请输入处理备注"></textarea>
+			</view>
+		</view>
+		<view  class="picture_tow" v-if="form.dispose==1">
+			<view class="small_title"><text></text><text>预警处理</text></view>
+			<view class="picture_b" >
+				<view class="picture_b_li"><text>处理人：</text><text>{{form.updateName}}</text></view>
+				<view class="picture_b_li"><text>处理时间：</text><text>{{form.updateTime}}</text></view>
+				<view class="picture_b_li2"><text>处理备注：</text><text>{{form.remark}}</text></view>
+			</view>
+		</view>
+		<view v-if="form.warningType==3 &&form.dispose==0" class="sub_btn" @click="submitForm()">确认处理</view>
 		<view  class="bottom_btn" v-if="timeStatus && (form.warningSubType!=2 && form.warningSubType!=3 && form.warningSubType!=4)" @click="handleClick('','monitor')">查看监控</view>
 	</scroll-view>	
   </view>
@@ -154,7 +178,7 @@
 
 <script>
 import { config } from '@/api/request/config.js'
-import {checkManageList,conditionCollegeInfo,warningNoticeLogDetail} from '@/api/index.js'
+import {checkManageList,conditionCollegeInfo,warningNoticeLogDetail,laboratoryWarningNoticeLogUpdate} from '@/api/index.js'
 export default {
   name: "rectifyList",
   components: {
@@ -308,6 +332,38 @@ export default {
 		  }
 		  
 		},
+		//提交
+		async submitForm(){
+			let _this = this;
+			if(!this.form.remark){
+				uni.showToast({
+					title: '请输入处理备注',
+					icon:"none",
+					mask:true,
+					duration: 2000
+				});
+				return
+			}
+			let obj={
+				id:this.form.id,
+				remark:this.form.remark,
+				dispose:'1',
+			}
+			const {data} = await laboratoryWarningNoticeLogUpdate(obj);
+			if(data.code == 200){
+			    uni.showToast({
+			        title: '提交成功',
+			        icon:"none",
+			        mask:true,
+			        duration: 2000
+			    });
+			    setTimeout(function(){
+			       uni.redirectTo({
+			            url: '/pages/earlyWarningManage/earlyWarningList'
+			        });
+			    },2000);
+			}
+		},
 		
 	  
   }
@@ -318,7 +374,7 @@ export default {
 .earlyWarning{
 	height:100%;
 	display flex;
-	padding-bottom: 30rpx;
+	padding-bottom: 140rpx;
 	box-sizing: border-box;
 	.red_color{
 		color: #D40000;
@@ -621,6 +677,76 @@ export default {
 					margin-right: 0;
 				}
 			}
+			.dispose{
+				width: 623rpx;
+				height: 180rpx;
+				border-radius: 20rpx 20rpx 20rpx 20rpx;
+				opacity: 1;
+				border: 1rpx solid #E0E0E0;
+				padding: 10rpx;
+				box-sizing: border-box;
+			}
+			.picture_b_li{
+				display: flex;
+				justify-content: space-between;
+				>text{
+					display: inline-block;
+					font-size: 30rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 400;
+					color: #333333;
+				}
+			}
+			
+		}
+	}
+	.picture_tow{
+		margin-left: 30rpx;
+		width: 690rpx;
+		height: auto;
+		background: #FFFFFF;
+		border-radius: 20rpx 20rpx 20rpx 20rpx;
+		margin-top: 20rpx;
+		.picture_b{
+			padding: 40rpx 30rpx 10rpx;
+			box-sizing: border-box;
+			.dispose{
+				width: 623rpx;
+				height: 180rpx;
+				border-radius: 20rpx 20rpx 20rpx 20rpx;
+				opacity: 1;
+				border: 1rpx solid #E0E0E0;
+				padding: 10rpx;
+				box-sizing: border-box;
+			}
+			.picture_b_li{
+				display: flex;
+				justify-content: space-between;
+				>text{
+					display: inline-block;
+					font-size: 30rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 400;
+					color: #333333;
+				}
+			}
+			.picture_b_li2{
+				display: flex;
+				justify-content: space-between;
+				>text{
+					display: inline-block;
+					font-size: 30rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 400;
+					color: #333333;
+				}
+				>text:nth-of-type(1){
+					width: 160rpx;
+				}
+				>text:nth-of-type(2){
+					flex: 1;
+				}
+			}
 			
 		}
 	}
@@ -640,5 +766,22 @@ export default {
 		margin: 90rpx 30rpx 30rpx;
 		
 	}
+	/* 按钮 */
+	.sub_btn{
+		width: 650rpx;
+		height: 100rpx;
+		background: #0183FA;
+		border-radius: 20rpx;
+		font-size: 28rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #FFFFFF;
+		line-height: 100rpx;
+		text-align: center;
+		margin-left: 50rpx;
+		position: fixed;
+		bottom:30rpx;
+		z-index: 1000;
+	}
 }
 </style>

pages/earlyWarningManage/earlyWarningList.vue

@@ -1,6 +1,32 @@
 <!-- 安全检查-校院巡查管理 -->
 <template>
-  <view class="earlyWarning">
+  <view id="earlyWarning">
+	<view class="top-picker-max-box">
+	    <view class="top-picker-box">
+	        <picker @change="facultyChange" :value="facultyIndex" :range="facultyArray">
+	            <view class="picker-view">
+	                <view class="picker-view-l">{{!facultyIndex?'学院':facultyArray[facultyIndex]}}</view>
+	                <img class="picker-img" src="@/pages_manage/images/icon_06.png" alt="">
+	            </view>
+	        </picker>
+	    </view>
+	    <view class="top-picker-box">
+			<picker mode="date"  @change="startChange($event)">
+				<view class="picker-view">
+				    <view class="picker-view-l">{{!getData.startTime?'开始时间':getData.startTime}}</view>
+				    <img class="picker-img" src="@/pages_manage/images/icon_06.png" alt="">
+				</view>
+			</picker>
+	    </view>
+	    <view class="top-picker-box">
+	        <picker mode="date"  @change="endChange($event)">
+	        	<view class="picker-view">
+	        	    <view class="picker-view-l">{{!getData.endTime?'结束时间':getData.endTime}}</view>
+	        	    <img class="picker-img" src="@/pages_manage/images/icon_06.png" alt="">
+	        	</view>
+	        </picker>
+	    </view>
+	</view>  
 	<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
 		<viw class="list" v-for="(item,index) in dataList" :key="index">
 			<view class="list_t">{{item[0].createDate}}</view>
@@ -34,9 +60,9 @@
 
 <script>
 import { config } from '@/api/request/config.js'
-import {checkManageList,conditionCollegeInfo,warningNoticeLogList} from '@/api/index.js'
+import {checkManageList,conditionCollegeInfo,warningNoticeLogList,listDepartments} from '@/api/index.js'
 export default {
-  name: "rectifyList",
+  name: "earlyWarning",
   components: {
    
   },
@@ -46,11 +72,18 @@ export default {
 		getData:{
 			pageNum:1,
 			pageSize:10,
+			startTime:'',
+			endTime:'',
+			searchValue:'',
 		},
 		dataList:[],
 		dataArr:[],//临时存储
 		total:0,
 		timeStatus:false,//判断是否超过当前时间30分钟
+		//院系选择器数据
+		facultyList:[],
+		facultyArray:[],
+		facultyIndex:"",
 		
 	}
   },
@@ -61,6 +94,7 @@ export default {
 	
   },
   mounted(){
+	 this.listDepartments();  
 	 this.getList();  
   },
   methods: {
@@ -79,6 +113,52 @@ export default {
 			}
 			
 		},
+		//获取院系
+		async listDepartments(){
+		    const {data} = await listDepartments();
+		    if(data.code == 200){
+		        let list = [];
+		        for(let i=0;i<data.data.length;i++){
+		            list.push(data.data[i].deptName)
+		        }
+		        this.facultyArray = list;
+		        list.unshift('全部院系');
+		        this.facultyList = data.data;
+		        this.facultyList.unshift({deptName:"全部院系", deptId:""})
+		    }
+		},
+		//学院选中
+		facultyChange: function(e) {
+		    if(this.facultyArray[0]){
+		        this.facultyIndex = parseInt(e.target.value);
+		    }
+		},
+		//开始时间选中事件
+		startChange(e){
+			if(new Date(e.target.value).getTime()>=new Date(this.getData.endTime).getTime()){
+				 uni.showToast({
+					title: '结束时间不能小于开始时间',
+					icon:"none",
+					mask:true,
+					duration: 2000
+				});
+			}else{
+				this.getData.startTime=e.target.value
+			}
+		},
+		//结束时间选中事件
+		endChange(e){
+			if(new Date(this.getData.startTime).getTime()>=new Date(e.target.value).getTime()){
+				 uni.showToast({
+					title: '结束时间不能小于开始时间',
+					icon:"none",
+					mask:true,
+					duration: 2000
+				});
+			}else{
+				this.getData.endTime=e.target.value
+			}
+		},
 		
 		handleClick(row,doType){
 		  let self=this;
@@ -124,11 +204,13 @@ export default {
 </script>
 
 <style lang="stylus" scoped>
-.earlyWarning{
-	height:100%;
+#earlyWarning{
+	height: 100%;
+	width: 100%;
+	flex :1;
 	display flex;
-	padding: 0 30rpx;
-	box-sizing: border-box;
+	flex-direction column
+	overflow hidden;
 	.red_color{
 		color: #D40000;
 		border: 1rpx solid #D40000;
@@ -147,6 +229,64 @@ export default {
 		height:321rpx;
 		margin:100rpx 0 0 274rpx;
 	}
+	.top-picker-max-box{
+	    display:flex;
+	    padding:0 20rpx;
+	    background #fff
+	    border-bottom:1rpx solid #E0E0E0;
+		.top-picker-box{
+		    line-height:80rpx;
+		    height:80rpx;
+		    .picker-view{
+		        display flex;
+		        .picker-view-l{
+		            display:block;
+					
+		            overflow:hidden;
+		            text-overflow:ellipsis;
+		            white-space:nowrap;
+		            font-size:28rpx;
+		        }
+		        .picker-img{
+		            width:24rpx;
+		            height:13rpx;
+		            margin-top:36rpx;
+		            margin-left:13rpx;
+		        }
+		    }
+		}
+		.top-picker-box:nth-child(1){
+		    text-align left;
+		    width:320rpx;
+		    .picker-view{
+		        .picker-view-l{
+		            max-width:260rpx;
+		        }
+		    }
+		}
+		.top-picker-box:nth-child(2){
+		    text-align left;
+		    width:215rpx;
+		    .picker-view{
+		        .picker-view-l{
+		            max-width:156rpx;
+		        }
+		    }
+		}
+		.top-picker-box:nth-child(3){
+		    text-align right;
+		    width:195rpx;
+		    .picker-view{
+		        .picker-view-l{
+		            flex:1;
+				
+		        }
+		    }
+		}
+				
+	    
+	}
+	
 	.list{
 		.list_t{
 			height: 80rpx;
@@ -263,6 +403,8 @@ export default {
 	.info-max-box{
 		flex: 1;
 		overflow: scroll;
+		padding: 0 30rpx;
+		box-sizing: border-box;
 	}
 }
 </style>

pages/manageWorkbench.vue

@@ -4,7 +4,7 @@
 	<nav-bar :title="title"></nav-bar>
     <img class="top-big-img" :src="homepageBanner">
     <top-warn></top-warn>
-    <view class="min-icon-button-box" style="margin-bottom: 0;">
+    <!-- <view class="min-icon-button-box" style="margin-bottom: 0;">
       <view @click="goPage('casuallyPat')">
         <img src="@/images/Version2.2/icon_sy_ssp.png">
         <view>随手拍</view>
@@ -37,19 +37,28 @@
         <img src="@/images/Version3.0/icon_sy_aqxx.png">
         <view>安全档案</view>
       </view>
-    </view>
+    </view> -->
     <view class=big-icon-button-box>
-      <!-- 安全报警 -->
-      <img src="@/images/Version2.3/button_1.png" @click="goPage('alarm')">
-      <!-- 应急疏散 -->
-      <img src="@/images/Version2.3/button_2.png" @click="goPage('emergencyEvacuation')">
+		<!-- 气瓶管理 -->
+		<view class="big-icon-button-box_l">
+			<img  class="big-icon-button-box_bg" src="@/images/img_bg_qpgl.png" @click="goPage('gasManage')">
+			<view class="big-icon-button-box_t1">气瓶管理</view>
+			<view class="big-icon-button-box_t2">安全第一   预防为主</view>
+		</view>
+		<view class="big-icon-button-box_r">
+			<!-- 安全报警 -->
+			<img src="@/images/Version2.3/button_1.png" @click="goPage('alarm')">
+			<!-- 应急疏散 -->
+			<img src="@/images/Version2.3/button_2.png" @click="goPage('emergencyEvacuation')">
+		</view>
+      
     </view>
     <!-- 分级管控 -->
-    <view class="grading">
+    <!-- <view class="grading">
       <img class="grading_l" src="@/images/icon_sy_fjgk.png"/>
       <view class="grading_c">分级管控</view>
       <view class="grading_r" @click="goPage('grading')">{{gradingCount>0?gradingCount+'项工作待完成':''}}<img src="@/images/icon_wdwg_gd.png"/></view>
-    </view>
+    </view> -->
 
     <view class="for-title-p" @click="goSecurityAlertList" v-if="alarmList[0]">
       <img class="left-img" src="@/images/Version2.2/icon_aqbj.png">
@@ -432,9 +441,9 @@ export default {
         uni.navigateTo({
           url: '/pages_manage/gradingControl/gradingControl',//分级管控
         });
-      }else if(type == 'gas'){//气瓶管理
+      }else if(type == 'gasManage'){//气瓶管理
         uni.navigateTo({
-          url: '/pages_manage/gasManage/gasManage',
+          url: '/pages/gasBottle/gasManage/gasManage',
         });
       }else if(type == 'none'){
 		  uni.showToast({
@@ -569,14 +578,59 @@ export default {
   }
   .big-icon-button-box{
     display flex;
+	justify-content: space-between;
     margin:20rpx;
-    img{
-      width:350rpx;
-      height:150rpx;
-    }
-    img:nth-child(2){
-      margin-left:10rpx;
-    }
+	.big-icon-button-box_l{
+		position: relative;
+		width:372rpx;
+		height:260rpx;
+		.big-icon-button-box_bg{
+			width:372rpx;
+			height:260rpx;
+			position: absolute;
+			z-index: 100;
+		}
+		.big-icon-button-box_t1{
+			width: 149rpx;
+			height: 40rpx;
+			background: rgba(225,225,225,0.3);
+			border-radius: 2rpx;
+			font-size: 24rpx;
+			font-family: Microsoft YaHei;
+			font-weight: 400;
+			color: #333333;
+			line-height: 40rpx;
+			text-align: center;
+			position:absolute;
+			right: 42rpx;
+			top: 94rpx;
+			z-index: 200;
+			
+		}
+		.big-icon-button-box_t2{
+			width: 175rpx;
+			height: 20rpx;
+			font-size: 18rpx;
+			font-family: Microsoft YaHei;
+			font-weight: 400;
+			color: #333333;
+			line-height: 20rpx;
+			position:absolute;
+			right: 28rpx;
+			top: 148rpx;
+			z-index: 200;
+			
+		}
+	}
+	.big-icon-button-box_r{
+		img{
+		  width:320rpx;
+		  height:120rpx;
+		}
+		>img:nth-of-type(2){
+			margin-top: 20rpx;
+		}
+	}
   }
   /* 分级管控 */
   .grading{

pages_manage/gasList/gasListBinding.vue

@@ -10,7 +10,7 @@
 				<img @click.stop="saoCode"  class="code_img" src="@/pages_manage/images/Version2.2/icon_aqjc_sm.png">
 			</view>
 		</view>
-		<view  class="sub_btn" @click="getBinding()">确认绑定</view>
+		<view  class="sub_btn" @click="getBinding()">确认更换</view>
 	</view>
 </template>
 

pages_manage/workbench/laboratory/laboratoryInfo.vue

@@ -345,7 +345,7 @@ export default {
 	if(this.itemData.subAddrr.floorId){
 		this.getDeviceListBySub();
 	}
-	
+
 
   },
   onShow(){
@@ -1135,6 +1135,7 @@ export default {
   .small_title{
 	  padding: 0 20rpx;
 	  font-size: 34rpx;
+
   }
    /* 语音广播 */
       .shade-max-big-box {