heyang

api/request/config.js

@@ -1,4 +1,5 @@
 const config = {
+	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',//小飞
@@ -9,7 +10,7 @@ const config = {
 	// 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/jdlabSystem/', //交大地址

pages/login.vue

@@ -157,6 +157,7 @@ export default {
       if(data.code == 200){
         uni.setStorageSync('token','Bearer '+data.data.access_token);
         uni.setStorageSync('userId',data.data.user_id);
+		uni.setStorageSync('tenantId',2);//0 系统 1化工 2能动
         this.getOpenId();//获取openid
         if(data.data.type == "00" ||data.data.type == "11"){//管理端
           uni.setStorageSync('userType',"1");
@@ -169,6 +170,7 @@ export default {
           uni.setStorageSync('userType',"3");
           this.getToken2()//订阅消息
         }
+		
         if(this.checkedType){
           uni.setStorageSync('userName',this.username)
           uni.setStorageSync('password',this.password)

pages/manageWorkbench.vue

@@ -17,7 +17,7 @@
         <img src="@/images/icon_dzt_pzjc.png">
         <view>离开检查</view>
       </view>
-      <view @click="goPage('accessQualification')">
+      <view @click="goPage('accessQualification')">	
         <img src="@/images/Version2.2/icon_sy_zrsq.png">
         <view>准入审核</view>
       </view>
@@ -125,6 +125,7 @@ export default {
   },
   data() {
     return {
+	  tenantId:uni.getStorageSync('tenantId'),//0 系统 1化工 2能动
 	  navHeight: uni.getStorageSync('navHeight'),		
 	  title:'实验室安全智能监测与控制系统',
       //随手拍数量
@@ -403,51 +404,54 @@ export default {
     },
     //页面跳转
     goPage(type){
-      if(type=='casuallyPat'){
-        uni.navigateTo({
-          url: '/pages/casuallyPat',//随手拍
-        });
-      }else if(type=='receiveCasuallyPat'){//收到随手拍
-        uni.navigateTo({
-          url: '/pages_manage/workbench/receiveCasuallyPat/receiveCasuallyPat',
-        });
-      }else if(type=='accessQualification'){//收到随手拍
-        uni.navigateTo({
-          url: '/pages_manage/workbench/accessQualification/accessQualification',
-        });
+		if(this.tenantId==2){
+			type='none'
+		}
+		if(type=='casuallyPat'){
+			uni.navigateTo({
+			  url: '/pages/casuallyPat',//随手拍
+			});
+		}else if(type=='receiveCasuallyPat'){//收到随手拍
+			uni.navigateTo({
+			  url: '/pages_manage/workbench/receiveCasuallyPat/receiveCasuallyPat',
+			});
+		}else if(type=='accessQualification'){//收到随手拍
+			uni.navigateTo({
+			  url: '/pages_manage/workbench/accessQualification/accessQualification',
+			});
 
-      }else if(type == 'safetyInspect'){//安全检查
+		}else if(type == 'safetyInspect'){//安全检查
 
-        uni.navigateTo({
-          url: '/pages_manage/workbench/securityCheck/inspectionRecords',//安全检查
-        });
-      }
-      else if(type == 'alarm'){
-        uni.navigateTo({
-		  url: '/pages/earlyWarningManage/earlyWarningList',//安全警报
-		});
-      }else if(type == 'emergencyEvacuation'){
-        uni.navigateTo({
-          url: '/pages_manage/emergencyEvacuationBig',//安全警报
-        });
-      }else if(type == 'photoInspection'){
-        this.outSubjectPhoto();
-      }else if(type == 'grading'){
-        uni.navigateTo({
-          url: '/pages_manage/gradingControl/gradingControl',//分级管控
-        });
-      }else if(type == 'gas'){//气瓶管理
-        uni.navigateTo({
-          url: '/pages_manage/gasManage/gasManage',
-        });
-      }else if(type == 'none'){
-		  uni.showToast({
-		    title: '暂未开放',
-		    icon:"none",
-		    mask:true,
-		    duration: 2000
-		  });
-	  }
+			uni.navigateTo({
+			  url: '/pages_manage/workbench/securityCheck/inspectionRecords',//安全检查
+			});
+		}
+		else if(type == 'alarm'){
+			uni.navigateTo({
+			  url: '/pages/earlyWarningManage/earlyWarningList',//安全警报
+			});
+		}else if(type == 'emergencyEvacuation'){
+			uni.navigateTo({
+			  url: '/pages_manage/emergencyEvacuationBig',//安全警报
+			});
+		}else if(type == 'photoInspection'){
+			this.outSubjectPhoto();
+		}else if(type == 'grading'){
+			uni.navigateTo({
+			  url: '/pages_manage/gradingControl/gradingControl',//分级管控
+			});
+		}else if(type == 'gas'){//气瓶管理
+			uni.navigateTo({
+			  url: '/pages_manage/gasManage/gasManage',
+			});
+		}else if(type == 'none'){
+			  uni.showToast({
+				title: '暂未开放',
+				icon:"none",
+				mask:true,
+				duration: 2000
+			  });
+		}
     },//获取拍照检查配置
     async outSubjectPhoto(){
       const {data} = await outSubjectPhoto();