heyang

pages/login.vue

@@ -91,7 +91,7 @@ export default {
         if(data.data.rectifyGentle){
           list.push({name:'整改者',pageType:3})
         }
-        if(!data.data.adminGentle && !data.data.applyGentle && !data.data.myApplyGentle  && !data.data.applyGentle && !data.data.collegeGentle){
+        if(!data.data.adminGentle && !data.data.applyGentle && !data.data.myApplyGentle  && !data.data.rectifyGentle && !data.data.collegeGentle){
           self.pageType='mine'
           list.push({name:'暂无权限',pageType:'mine'})
         }

pages/manageWorkbench.vue

@@ -502,15 +502,18 @@ export default {
 			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})
-			}
+      if(data.data.adminGentle || data.data.collegeGentle){//校级管理员
+        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})
+      }
+      if(!data.data.adminGentle && !data.data.applyGentle && !data.data.myApplyGentle  && !data.data.rectifyGentle && !data.data.collegeGentle){
+
+      }
 		  uni.setStorageSync('gentleIdentifier',list)
 		  uni.setStorageSync('gentleIdentifierData',data.data)
 		  if(list.length>0){

pages/safetyExamineWorkbench.vue

@@ -16,11 +16,11 @@
           </view>
         </view>
         <viwe class="inspect_btn" v-if="pageType==1 || pageType==2">
-          <view class="inspect_btn_li" @click="handleClick('','patrolPlan')" v-if="!collegeGentle">
+          <view class="inspect_btn_li" @click="handleClick('','patrolPlan')" >
             <img src="@/images/Version3.3.3/icon_xyxc_xyxc.png"/>
             <text>校院巡查</text>
           </view>
-          <text class="line" v-if="!collegeGentle"></text>
+          <text class="line"></text>
           <view class="inspect_btn_li"  @click="handleClick('','selfPlan')">
             <img src="@/images/Version3.3.3/icon_xyxc_syszc.png"/>
             <text>实验室自查</text>

pages/studentWorkbench.vue

@@ -1,7 +1,7 @@
 <!-- 学生端工作台 -->
 <template>
   <view class="user-workbench" :style="{paddingTop:navHeight+'rpx'}">
-	<nav-bar :title="title"></nav-bar>  
+	<nav-bar :title="title"></nav-bar>
     <img class="top-big-img" :src="homepageBanner">
     <view class="min-icon-button-box">
       <view @click="goPage('casuallyPat')">
@@ -82,7 +82,7 @@ export default {
   data() {
     return {
 		navHeight: uni.getStorageSync('navHeight'),
-	    title:'实验室安全智能监测与控制系统',		
+	    title:'实验室安全智能监测与控制系统',
 		hintType:false,
 		dataList:[],
 		violationData:{},
@@ -196,7 +196,7 @@ export default {
         // uni.navigateTo({
         //   url: '/pages_manage/workbench/problemRectification/rectifyList',//安全检查
         // });
-		
+
       }else if(type == 'gas'){//气瓶管理
         uni.navigateTo({
           url: '/pages_student/gasManage/gasManage',
@@ -262,22 +262,19 @@ export default {
 		const {data} = await getGentleIdentifier();
 		if(data.code==200){
 			let pageType = null
-		  // 如果是管理员 检查者和整改者 
-		  if(data.data.adminGentle && (data.data.applyGentle || data.data.myApplyGentle) && data.data.rectifyGentle){
-			  pageType=1
-		  }else if(data.data.adminGentle && (data.data.applyGentle || data.data.myApplyGentle) && !data.data.rectifyGentle){
-			  pageType=1
-		  }else if(data.data.adminGentle && !data.data.applyGentle && data.data.rectifyGentle){
-			  pageType=1
-		  }else if(!data.data.adminGentle && (data.data.applyGentle || data.data.myApplyGentle) && data.data.rectifyGentle){
-			  pageType=2
-		  }else if(data.data.adminGentle && !data.data.applyGentle && !data.data.rectifyGentle){
-			  pageType=1
-		  }else if(!data.data.adminGentle && (data.data.applyGentle || data.data.myApplyGentle) && !data.data.rectifyGentle){
-			  pageType=2
-		  }else if(!data.data.adminGentle && !data.data.applyGentle && data.data.rectifyGentle){
-			  pageType=3
-		  }
+		  // 如果是管理员 检查者和整改者
+      if(data.data.adminGentle || data.data.collegeGentle){//校级管理员
+        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})
+      }
+      if(!data.data.adminGentle && !data.data.applyGentle && !data.data.myApplyGentle  && !data.data.rectifyGentle && !data.data.collegeGentle){
+
+      }
 		  uni.setStorageSync('gentleIdentifier',pageType)
 		  uni.setStorageSync('gentleIdentifierData',data.data)
 		  if(pageType){

pages_safetyExamine/dangerManage/dangerManage.vue

@@ -23,7 +23,7 @@
 			</picker>
 			<view class="lab_title_r">
 				<input type="text" v-model="getData.searchValue" placeholder="实验室/房间号" name="search" @confirm='searchBtn'  confirm-type='search' maxlength="50" placeholder-style="color: #CCCCCC;font-size:22rpx;">
-				
+
 				<view v-if="getData.searchValue>0" class="lab_title_r_btn" @click="clearBtn">
 					<img src="@/pages_safetyExamine/images/clear.png"/>
 				</view>
@@ -113,28 +113,15 @@ export default {
 		this.form=JSON.parse(decodeURIComponent(option.form));
 		console.log(this.form)
 	 }
-	 if(option.pageType==1){
-		 if(this.collegeGentle){
-			uni.setNavigationBarTitle({
-				title:'实验室自查隐患'
-			}) 
-		 }else{
-			uni.setNavigationBarTitle({
-				title:'校院巡查隐患'
-			}) 
-		 }
-	 		  
-	 }else if(option.pageType==2){
-		  uni.setNavigationBarTitle({
-				title:'实验室自查隐患'
-		  })
-	 }
+    uni.setNavigationBarTitle({
+      title:'隐患整改'
+    })
   },
   onShow() {
 
   },
   mounted(){
-	  
+
 	  this.dataList=[];
 	  this.getList();
 	  this.conditionCollegeInfo();
@@ -299,7 +286,7 @@ export default {
 		flex: 1;
 		overflow: scroll;
 
-		padding: 340rpx 0rpx 0;
+		padding: 210rpx 0rpx 0;
 		box-sizing: border-box;
 	}
 	/* 切换按钮 */