heyang

pages/mine.vue

@@ -39,7 +39,7 @@
           <view class="view-three-type" :class="!isUpload?'colorA':'marginType'">{{!isUpload?'未上传':'已上传'}}</view>
           <img class="right-img" src="@/images/icon_04.png">
         </view>
-		<view class="button-max-box" @click="goPage('snapshot')">
+		<view class="button-max-box" @click="goPage('snapshot')" v-if="gentleIdentifier=='mine'">
 		  <img class="left-img" src="@/images/snapshot_icon.png">
 		  <view>随手拍</view>
 		  <img class="right-img" src="@/images/icon_04.png">
@@ -87,11 +87,12 @@ export default {
       //签名
       isUpload:"",
       Quantity:0,//指纹录取数量
+	  gentleIdentifier:'',//判断身份权限
 
     }
   },
   onLoad() {
-
+    this.gentleIdentifier=uni.getStorageSync('gentleIdentifier')
   },
   onShow(){
 

pages_safetyExamine/examineManage/examineAddTow.vue

@@ -397,7 +397,7 @@
 					this.$set(this.form.checkHazardDtoList[index],'hazardCheckPro',e.detail.value[e.detail.value.length-1].value);
 					this.$set(this.form.checkHazardDtoList[index],'hazardCheckCode',jcxSstkNum);
 					this.$set(this.form.checkHazardDtoList[index],'hazardCheckName',e.detail.value[e.detail.value.length-1].text);
-					this.$set(this.form.checkHazardDtoList[index],'hazardCheckPoint',e.detail.value[e.detail.value.length-1].text);
+					this.$set(this.form.checkHazardDtoList[index],'hazardCheckPoint',this.getTreeName(this.checkOptionList,e.detail.value[e.detail.value.length-1].value).mainPoint);
 					
 				}else{
 					uni.showToast({
@@ -531,7 +531,7 @@
 					this.form.manageStatus=index;//1保存 2提交
 					for(let i=0;i<self.form.checkHazardDtoList.length;i++){
 						let num = i+1;
-						if(!self.form.checkHazardDtoList[i].hazardCheckName && !self.form.checkHazardDtoList[i].hazardCheckPoint){
+						if(!self.form.checkHazardDtoList[i].hazardCheckName){
 							uni.showToast({
 								title: '第'+num+'未选择隐患项',
 								icon:"none",

pages_safetyExamine/patrolPlan/patrolPlanAdd.vue

@@ -111,6 +111,7 @@ export default {
 			tiemQuickList:[],
 			scopeIndex:'',//0 全校 1学院 2实验室
 			seleteListLab:[],
+			groupDataType:'',//巡查组状态 院级/校级
 		},
 		tiemQuickList:[{name:'本月',type:false},{name:'本季度',type:false},{name:'全年',type:false}],
 		scopeIndex:0,
@@ -207,9 +208,11 @@ export default {
 				if(data.data.userFlg){
 					// 院级
 					this.$set(this,'scopeArray',['学院','实验室']);
+					this.form.groupDataType=2;
 				}else{
 					// 校级
 					this.$set(this,'scopeArray',['全校','学院','实验室']);
+					this.form.groupDataType=0;
 				}
 			}
 		},

pages_safetyExamine/patrolPlan/patrolPlanAddMember.vue

@@ -39,6 +39,7 @@ export default {
       getData:{
 		checkLevel:'0',
 		groupName:'',
+		checkLevel:'',
 		
 		
       },
@@ -55,6 +56,7 @@ export default {
 		  if(this.form.seleteListMember.length>0){
 		  	 this.seleteListMember=this.form.seleteListMember;
 		  }
+		  this.getData.checkLevel=this.form.groupDataType
 	  }
 	  if(option.pageType){//pageType=1添加页面进入2编辑页面进入
 		  this.pageType=option.pageType

pages_safetyExamine/snapshotManage/snapshotAdd.vue

@@ -187,7 +187,6 @@ export default {
 						console.log(res.data)
 						if(res.code == 200){
 							this.form.imgDtoList.push({'fileUrl':res.data.url,'fileName':res.data.name});
-							console.log(res.data.url)
 						}else{
 							uni.showToast({
 								title: res.msg,

pages_safetyExamine/snapshotManage/snapshotDetail.vue

@@ -50,7 +50,7 @@
 					<view class="left-title-p">隐患照片（最多上传5张）：</view>
 					<view class="right-img-box">
 						<view class="img-box" v-for="(imgUrl,imgIndex) in form.imgDtoList" :key="imgIndex">
-							<img class="img-data" :src="baseUrl+imgUrl">
+							<img class="img-data" :src="baseUrl+imgUrl.fileUrl">
 							<img class="position-img" src="@/pages_manage/images/icon_ssp_closure.png" @click="delImg(imgIndex)">
 						</view>
 						<img class="add-button" src="@/pages_manage/images/icon_07.png" @click="selectImage()" v-if="form.imgDtoList.length<5">