heyang

api/request/config.js

@@ -3,14 +3,14 @@ const config = {
 	// 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.8/api',//高升
+    // base_url: 'http://192.168.1.8/api',//高升
 	// 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/appTest/',//88服务器线上
+     base_url: 'https://lab.zjznai.com/appTest/',//88服务器线上
     //base_url: 'https://lab.zjznai.com/labSystem/', //矿大地址
 	// base_url: 'https://lab.zjznai.com/jdlabSystem/', //交大地址
    // base_url: 'https://lab.zjznai.com/jndxlabSystem/', //暨大地址

pages/safetyExamineWorkbench.vue

@@ -810,6 +810,7 @@ export default {
           pageNum:this.getData2.pageNum,
           pageSize:this.getData2.pageSize,
           hazardType:'',
+          staffType:'1',
           rectifyStatus:'3',
         };
       }else if(this.pageType==3){//整改者
@@ -817,6 +818,7 @@ export default {
           pageNum:this.getData3.pageNum,
           pageSize:this.getData3.pageSize,
           hazardType:'',
+		  staffType:'2',
           rectifyStatus:'2',
         };
       }
@@ -898,8 +900,10 @@ export default {
       let obj={
         pageNum:this.getData2.pageNum,
         pageSize:this.getData2.pageSize,
-        rectifyStatus:3,
         hazardType:'',
+		staffType:'1',
+		rectifyStatus:'3',
+		
       };
       const {data} = await checkHazardAppList(obj);
       if(data.code==200){

pages_safetyExamine/dangerManage/dangerList.vue

@@ -34,7 +34,8 @@
 						<img v-if="item.checkRange==3" src="@/pages_safetyExamine/images/icon_xyxc_sys.png"/>
 						<text></text>
 					</view>
-					<view class="list_three_li_t_c">{{item.subRoom}}</view>
+					<view class="list_three_li_t_c" v-if="item.checkCategory==1">{{item.subRoom}}</view>
+					<view class="list_three_li_t_c" v-if="item.checkCategory==2">{{item.subRoom}}-{{item.hazardName}}{{item.code}}</view>
 					<view class="list_three_li_t_c2" v-if="item.overdueStatus==1">已逾期</view>
 					<view class="list_three_li_t_r"></view>
 				</view>

pages_safetyExamine/dangerManage/dangerManage.vue

@@ -41,7 +41,9 @@
 						<img v-if="item.checkRange==3" src="@/pages_safetyExamine/images/icon_xyxc_sys.png"/>
 						<text></text>
 					</view>
-					<view class="list_three_li_t_c">{{item.subRoom}}</view>
+					
+					<view class="list_three_li_t_c" v-if="item.checkCategory==1">{{item.subRoom}}</view>
+					<view class="list_three_li_t_c" v-if="item.checkCategory==2">{{item.subRoom}}-{{item.hazardName}}{{item.code}}</view>
 					<view class="list_three_li_t_c2" v-if="item.overdueStatus==1">已逾期</view>
 					<view class="list_three_li_t_r"></view>
 				</view>
@@ -292,14 +294,7 @@ export default {
 		flex: 1;
 		overflow: scroll;
 
-		padding: 220rpx 0rpx 0;
-		box-sizing: border-box;
-	}
-	.info-max-box{
-		flex: 1;
-		overflow: scroll;
-
-		padding: 210rpx 0rpx 0;
+		padding: 340rpx 0rpx 0;
 		box-sizing: border-box;
 	}
 	/* 切换按钮 */