heyang

pages/login.vue

@@ -75,42 +75,6 @@ export default {
       this.curTab = index;
 
     },
-    //获取用户身份标识"adminGentle": false,   管理员身份 "rectifyGentle": false,   整改身份"applyGentle": false    检查者身份
-    async getGentleIdentifier(){
-      let self = this;
-      const {data} = await getGentleIdentifier();
-      if(data.code==200){
-        uni.setStorageSync('gentleIdentifierData',data.data)
-        let list=[];
-        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){
-          self.pageType='mine'
-          list.push({name:'暂无权限',pageType:'mine'})
-        }
-        uni.setStorageSync('gentleIdentifier',list)
-        if(uni.getStorageSync('saoCode')){
-          uni.redirectTo({
-            url: '/pages/saoCode/saoCode'
-          });
-        }else if(self.pageType=='mine'){
-          uni.redirectTo({
-            url: '/pages/mine',
-          });
-        }else{
-          uni.redirectTo({
-            url: '/pages/home',
-          });
-        }
-      }
-    },
     //获取openID
     async getOpenId(){
       let _this=this;
@@ -206,8 +170,15 @@ export default {
           uni.removeStorageSync('userName')
           uni.removeStorageSync('password')
         }
-        //获取身份标识
-        this.getGentleIdentifier();
+		if(uni.getStorageSync('saoCode')){
+		  uni.redirectTo({
+		    url: '/pages/saoCode/saoCode'
+		  });
+		}else{
+		  uni.redirectTo({
+		    url: '/pages/home',
+		  });
+		}
 
 
 

pages/safetyExamineWorkbench.vue

@@ -15,17 +15,18 @@
             <text>{{item.value}}</text>
           </view>
         </view>
-        <viwe class="inspect_btn" v-if="pageType==1 || pageType==2">
-          <view class="inspect_btn_li" @click="handleClick('','patrolPlan')" >
+		<!-- 管理员 -->
+        <viwe class="inspect_btn" v-if="pageType==1">
+          <view class="inspect_btn_li" @click="handleClick('','patrolPlan')" v-if="adminGentle">
             <img src="@/images/Version3.3.3/icon_xyxc_xyxc.png"/>
             <text>校院巡查</text>
           </view>
-          <text class="line"></text>
-          <view class="inspect_btn_li"  @click="handleClick('','selfPlan')">
+          <text class="line" v-if="adminGentle"></text>
+          <view class="inspect_btn_li"  @click="handleClick('','selfPlan')" v-if="collegeGentle">
             <img src="@/images/Version3.3.3/icon_xyxc_syszc.png"/>
             <text>实验室自查</text>
           </view>
-          <text class="line"></text>
+          <text class="line" v-if="collegeGentle"></text>
           <view class="inspect_btn_li"  @click="handleClick('','dangerPlan')">
             <img src="@/images/Version3.3.3/icon_xyxc_aqyh.png"/>
             <text>安全隐患</text>
@@ -36,6 +37,28 @@
             <text>随手拍</text>
           </view>
         </viwe>
+		<!-- 检查者 -->
+		<viwe class="inspect_btn" v-if="pageType==2">
+		  <view class="inspect_btn_li" @click="handleClick('','patrolPlan')">
+		    <img src="@/images/Version3.3.3/icon_xyxc_xyxc.png"/>
+		    <text>校院巡查</text>
+		  </view>
+		  <text class="line"></text>
+		  <view class="inspect_btn_li"  @click="handleClick('','selfPlan')">
+		    <img src="@/images/Version3.3.3/icon_xyxc_syszc.png"/>
+		    <text>实验室自查</text>
+		  </view>
+		  <text class="line"></text>
+		  <view class="inspect_btn_li"  @click="handleClick('','dangerPlan')">
+		    <img src="@/images/Version3.3.3/icon_xyxc_aqyh.png"/>
+		    <text>安全隐患</text>
+		  </view>
+		  <text class="line"></text>
+		  <view class="inspect_btn_li"  @click="handleClick('','snapshot')">
+		    <img src="@/images/Version3.3.3/icon_aqjc_ssp.png"/>
+		    <text>随手拍</text>
+		  </view>
+		</viwe>
         <!--管理员------------- -->
         <view class="tabTitle" v-if="pageType==1">
           <view class="tabTitle_li" @tap="tabClick(index)"  :key="index" v-for="(item,index) in tabText">
@@ -292,6 +315,7 @@ export default {
       myApplyGentle:'',//自查身份 校院巡查管理 里操作按钮隐藏
       applyGentle:'',//检查组身份 实验室自查管理 里操作按钮隐藏
       collegeGentle:'',//院级管理员身份 如果是院级管理员隐藏校院巡查
+      adminGentle:'',//校级管理员 如果是校级管理员隐藏实验室自查
       buttonHide:false,//判断按钮显示隐藏
     }
   },
@@ -311,6 +335,7 @@ export default {
     this.myApplyGentle=uni.getStorageSync('gentleIdentifierData').myApplyGentle
     this.applyGentle=uni.getStorageSync('gentleIdentifierData').applyGentle
     this.collegeGentle=uni.getStorageSync('gentleIdentifierData').collegeGentle
+    this.adminGentle=uni.getStorageSync('gentleIdentifierData').adminGentle
     //获取当前日期
     this.currentDate=this.getNowFormatDate()
 

pages/studentWorkbench.vue

@@ -257,27 +257,29 @@ export default {
       }
     },
 	//获取用户身份标识"adminGentle": false,   管理员身份 "rectifyGentle": false,   整改身份"applyGentle": false    检查者身份
+	//获取用户身份标识"adminGentle": false,   管理员身份 "rectifyGentle": false,   整改身份"applyGentle": false    检查者身份
 	async getGentleIdentifier(){
 		let self = this;
 		const {data} = await getGentleIdentifier();
 		if(data.code==200){
 			let pageType = null
-		  // 如果是管理员 检查者和整改者
-      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)
+		   // 如果是管理员 检查者和整改者
+		   let list=[];
+	  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(pageType){
+		  if(list.length>0){
 			  uni.navigateTo({
 			    url: '/pages/safetyExamineWorkbench',
 			  });