heyang

pages.json

@@ -1,7 +1,7 @@
 {
 	"pages": [
-		
-		
+
+
 		{
 			"path": "pages/home",//首页
 			"style": {
@@ -11,9 +11,9 @@
 				"navigationStyle": "custom"
 			}
 		},
-		
+
 		/* 预警信息 */
-		
+
 		{
 			"path": "pages/earlyWarningManage/earlyWarningDetail",
 			"style": {
@@ -26,13 +26,13 @@
 				"navigationBarTitleText": "预警记录"
 			}
 		},
-			
+
 		{
 			"path": "pages/earlyWarningManage/videoMonitoring",
 			"style": {
 				"navigationBarTitleText": "监控信息"
 			}
-		},		
+		},
 
 		{
 			"path": "pages/supplierWorkbench",
@@ -945,6 +945,117 @@
 					}
 				}
 			]
+		},
+		{
+
+			/* 安全检查分包 */
+			"root": "pages_safetyExamine",  //分包根路径
+			"name": "safetyExamine", //分包名字可写可不写
+			"pages": [
+				{
+					"path": "patrolPlan/patrolPlanAdd",
+					"style": {
+						"navigationBarTitleText": "发起巡查计划"
+					}
+				},
+				{
+					"path": "patrolPlan/patrolPlanAddLab",
+					"style": {
+						"navigationBarTitleText": "选择实验室"
+					}
+				},
+				{
+					"path": "patrolPlan/patrolPlanAddMember",
+					"style": {
+						"navigationBarTitleText": "选择巡查组"
+					}
+				},
+				{
+					"path": "patrolPlan/patrolPlanList",
+					"style": {
+						"navigationBarTitleText": "校院巡查计划"
+					}
+				},
+				{
+					"path": "patrolPlan/patrolPlanDetail",
+					"style": {
+						"navigationBarTitleText": "计划详情"
+					}
+				},
+				{
+					"path": "patrolPlan/patrolPlanEdit",
+					"style": {
+						"navigationBarTitleText": "计划编辑"
+					}
+				},
+				{
+					"path": "examineManage/examineAddTow",
+					"style": {
+						"navigationBarTitleText": "开始检查"
+					}
+				},
+				{
+					"path": "examineManage/examineAdd",
+					"style": {
+						"navigationBarTitleText": "开始检查"
+					}
+				},
+				{
+					"path": "examineManage/examineDetail",
+					"style": {
+						"navigationBarTitleText": "检查详情"
+					}
+				},
+				{
+					"path": "examineManage/examineList",
+					"style": {
+						"navigationBarTitleText": "校院巡查管理"
+					}
+				},
+				{
+					"path": "dangerManage/dangerManage",
+					"style": {
+						"navigationBarTitleText": "隐患整改"
+					}
+				},
+				{
+					"path": "dangerManage/dangerList",
+					"style": {
+						"navigationBarTitleText": "安全隐患"
+					}
+				},
+				{
+					"path": "dangerManage/dangerDetail",
+					"style": {
+						"navigationBarTitleText": "安全隐患"
+					}
+				},
+				{
+					"path": "snapshotManage/snapshotDetail",
+					"style": {
+						"navigationBarTitleText": "待整改"
+					}
+				},
+				{
+					"path": "snapshotManage/snapshotAdd",
+					"style": {
+						"navigationBarTitleText": "随手拍上报"
+					}
+				},
+				{
+					"path": "snapshotManage/snapshotList",
+					"style": {
+						"navigationBarTitleText": "随手拍上报记录"
+					}
+				},
+				{
+					"path": "inforSign",
+					"style": {
+						"navigationBarTitleText": "安全信息牌"
+					}
+				}
+
+			]
 		}
 	],
 

pages/manageWorkbench.vue

@@ -124,7 +124,7 @@ export default {
   },
   data() {
     return {
-	  navHeight: uni.getStorageSync('navHeight'),		
+	  navHeight: uni.getStorageSync('navHeight'),
 	  title:'实验室安全智能监测与控制系统',
       //随手拍数量
       appReceivePhotoNoteNum:0,
@@ -416,10 +416,7 @@ export default {
         });
 
       }else if(type == 'safetyInspect'){//安全检查
-
-        uni.navigateTo({
-          url: '/pages_manage/workbench/securityCheck/inspectionRecords',//安全检查
-        });
+        this.getGentleIdentifier();
       }
       else if(type == 'alarm'){
         uni.navigateTo({
@@ -493,6 +490,39 @@ export default {
         }
       }
     },
+    //获取用户身份标识"adminGentle": false,   管理员身份 "rectifyGentle": false,   整改身份"applyGentle": false    检查者身份
+    async getGentleIdentifier(){
+      let self = this;
+      const {data} = await getGentleIdentifier();
+      if(data.code==200){
+        let pageType = null
+        // 如果是管理员 检查者和整改者
+        let list=[];
+        if(data.data.adminGentle){
+          list.push({name:'管理员',pageType:1})
+        }
+        if(data.data.applyGentle ||data.data.myApplyGentle){
+          list.push({name:'检查者',pageType:2})
+        }
+        if(data.data.rectifyGentle){
+          list.push({name:'整改者',pageType:3})
+        }
+        uni.setStorageSync('gentleIdentifier',list)
+        uni.setStorageSync('gentleIdentifierData',data.data)
+        if(list.length>0){
+          uni.navigateTo({
+            url: '/pages/safetyExamineWorkbench',
+          });
+        }else{
+          uni.showToast({
+            title: '没有相关权限',
+            icon:"none",
+            mask:true,
+            duration: 2000
+          });
+        }
+      }
+    },
   },
   beforeDestroy(){
 	//断开mqtt连接