heyang

api/index.js

@@ -142,6 +142,15 @@ export const checkClapMylist  = (data) => {
         data: data,
     })
 };
+//随手拍--获取当前登录人身份信息
+export const getUserCollegCheck  = (data) => {
+    return apiResquest({
+        url: `/security/collegCheck/getloginUser`,
+        method: 'GET',
+        data: data,
+    })
+};
+
 //随手拍--详情
 export const checkClapById  = (data) => {
     return apiResquest({
@@ -220,8 +229,17 @@ export const getCheckPlanBySubId = (data) => {
 //开展检查-根据实验室id查询该实验室有关计划
 export const buildBySub = (data) => {
     return apiResquestForm({
-        url: '/laboratory/subject/buildBySub/list?name='+data,
+        url: '/laboratory/subject/buildBySub/list',
         method: 'GET',
+		data: data
+    })
+};
+//开展检查-根据计划id查询附件列表
+export const findByPlanIdAttachment = (data) => {
+    return apiResquestForm({
+        url: '/zd-security/upload/findByCheckPlanId',
+        method: 'GET',
+		data: data
     })
 };
 //问题整改重大项-判断是否上传签名

api/request/config.js

@@ -2,20 +2,20 @@ const config = {
 	//base_url: 'http://192.168.1.9:8080',//柴
 	// base_url: 'http://192.168.1.7:8080',//刘波
 	// base_url: 'http://192.168.1.17:8080',//小飞
-	// base_url: 'http://192.168.1.20:8080',//志伟
+	 //base_url: 'http://192.168.1.20:8080',//志伟
     // base_url: 'http://192.168.1.8:8080',//高升
 	// base_url: 'http://192.168.1.29:8080',//何成
     // base_url: 'http://192.168.1.43:9800',//43服务器
-	// base_url: 'https://demo.sxitdlc.com/xzgd/',
+	// base_url: 'https://demo.zjznai.com/xzgd/',
 
-	// base_url: 'https://lab.sxitdlc.com/labNhSystem/',//43服务器高升测试
-	base_url: 'https://lab.sxitdlc.com/labAppTest/',//43服务器线上
-    // base_url: 'https://lab.sxitdlc.com/appTest/',//88服务器线上
-	 //base_url: 'https://lab.sxitdlc.com/labSystem/', //矿大地址
-      // base_url: 'https://lab.sxitdlc.com/labSaasSystem/', //矿大化工
-	// base_url: 'https://lab.sxitdlc.com/jdlabSystem/', //交大地址
-    // base_url: 'https://lab.sxitdlc.com/jndxlabSystem/', //暨大地址
-    //  base_url: 'https://lab.sxitdlc.com/kdwclabSystem/', //矿大文昌地址
+	// base_url: 'https://lab.zjznai.com/labNhSystem/',//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/labSaasSystem/', //矿大化工
+	// base_url: 'https://lab.zjznai.com/jdlabSystem/', //交大地址
+    // base_url: 'https://lab.zjznai.com/jndxlabSystem/', //暨大地址
+    //  base_url: 'https://lab.zjznai.com/kdwclabSystem/', //矿大文昌地址
     //base_url: 'https://znyj.labcenter.suda.edu.cn/labSystem/', //苏大临时地址
 }
 export { config }

pages.json

@@ -4,6 +4,13 @@
 	
 	
 		
+		
+		
+		
+		
+		
+		
+		
 		{
 			"path": "pages/safetyExamineWorkbench",//安全检查
 			"style": {
@@ -12,119 +19,6 @@
 				"navigationBarBackgroundColor": "#0183FA" //导航背景色
 			}
 		},
-		
-		{
-			"path": "pages/pages_safetyExamine/patrolPlan/patrolPlanAdd",
-			"style": {
-				"navigationBarTitleText": "发起巡查计划"
-			}
-		},
-		{
-			"path": "pages/pages_safetyExamine/patrolPlan/patrolPlanAddLab",
-			"style": {
-				"navigationBarTitleText": "选择实验室"
-			}
-		},
-		{
-			"path": "pages/pages_safetyExamine/patrolPlan/patrolPlanAddMember",
-			"style": {
-				"navigationBarTitleText": "选择巡查组"
-			}
-		},
-		{
-			"path": "pages/pages_safetyExamine/patrolPlan/patrolPlanList",
-			"style": {
-				"navigationBarTitleText": "校院巡查计划"
-			}
-		},
-		{
-			"path": "pages/pages_safetyExamine/patrolPlan/patrolPlanDetail",
-			"style": {
-				"navigationBarTitleText": "计划详情"
-			}
-		},
-		{
-			"path": "pages/pages_safetyExamine/patrolPlan/patrolPlanEdit",
-			"style": {
-				"navigationBarTitleText": "计划编辑"
-			}
-		},
-		{
-			"path": "pages/pages_safetyExamine/examineManage/examineAddTow",
-			"style": {
-				"navigationBarTitleText": "开始检查"
-			}
-		},
-		{
-			"path": "pages/pages_safetyExamine/examineManage/examineAdd",
-			"style": {
-				"navigationBarTitleText": "开始检查"
-			}
-		},
-		{
-			"path": "pages/pages_safetyExamine/examineManage/examineDetail",
-			"style": {
-				"navigationBarTitleText": "检查详情"
-			}
-		},
-		{
-			"path": "pages/pages_safetyExamine/examineManage/examineList",
-			"style": {
-				"navigationBarTitleText": "校院巡查管理"
-			}
-		},
-		{
-			"path": "pages/pages_safetyExamine/dangerManage/dangerManage",
-			"style": {
-				"navigationBarTitleText": "隐患整改"
-			}
-		},
-		{
-			"path": "pages/pages_safetyExamine/dangerManage/dangerList",
-			"style": {
-				"navigationBarTitleText": "校院巡查隐患"
-			}
-		},
-		{
-			"path": "pages/pages_safetyExamine/dangerManage/dangerDetail",
-			"style": {
-				"navigationBarTitleText": "校院巡查隐患"
-			}
-		},
-		{
-			"path": "pages/pages_safetyExamine/snapshotManage/snapshotDetail",
-			"style": {
-				"navigationBarTitleText": "待整改"
-			}
-		},
-		{
-			"path": "pages/pages_safetyExamine/snapshotManage/snapshotAdd",
-			"style": {
-				"navigationBarTitleText": "随手拍上报"
-			}
-		},	
-		{
-			"path": "pages/pages_safetyExamine/snapshotManage/snapshotList",
-			"style": {
-				"navigationBarTitleText": "随手拍上报记录"
-			}
-		},
-		{
-			"path": "pages/pages_safetyExamine/inforSign",
-			"style": {
-				"navigationBarTitleText": "安全信息牌"
-			}
-		},
-		
-		
-		
-		
-		
-		
-		
-		
-		
-
 		{
 			"path": "pages/home",//首页
 			"style": {
@@ -133,6 +27,7 @@
 				"navigationBarBackgroundColor": "#0183FA" //导航背景色
 			}
 		},
+		
 		{
 			"path": "pages/supplierWorkbench",
 			"style": {
@@ -232,6 +127,117 @@
 	"subPackages": [
 		{
 			
+			/* 安全检查分包 */
+			"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": "安全信息牌"
+					}
+				}
+				
+			]
+		},
+		{
+			
 			/* 供应商端分包 */
 			"root": "pages_supplier",  //分包根路径
 			"name": "supplier", //分包名字可写可不写

pages/mine.vue

@@ -102,6 +102,11 @@
           <view class="view-three-type" :class="Quantity>0?'marginType':'colorA'">{{Quantity>0?'已配置'+Quantity+'个':''}}</view>
           <img class="right-img" src="@/images/icon_04.png">
         </view>
+		<view class="button-max-box" @click="goPage('snapshot')" v-if="userType==1">
+		  <img class="left-img" src="@/images/snapshot_icon.png">
+		  <view>随手拍</view>
+		  <img class="right-img" src="@/images/icon_04.png">
+		</view>
       </view>
     </view>
     <view class="out-button" @click="clickOut">退出登录</view>
@@ -340,7 +345,13 @@ export default {
         uni.navigateTo({
           url: '/pages_manage/workbench/signature/signature?item='+this.signatureUrl,//电子签名
         });
+      }else if(type == 'snapshot'){
+		  
+        uni.navigateTo({
+          url: '/pages/pages_safetyExamine/snapshotManage/snapshotAdd',//随手拍
+        });
       }
+	  
 
 
     },
@@ -404,6 +415,8 @@ export default {
   height:100%;
   .top-max-big-box{
     /*background:#ffffff;*/
+	overflow-y: auto;
+	padding-bottom: 300rpx;
     .user-top-max-box-one{
       overflow hidden
       background url("@/images/img_wd_bg.png") no-repeat
@@ -631,7 +644,7 @@ export default {
     }
   }
   .out-button{
-    position absolute
+    position fixed;
     bottom:140rpx;
     left:25rpx;
     width:700rpx;

pages/safetyExamineWorkbench.vue

@@ -393,47 +393,47 @@ export default {
 		  
 		  if(self.pageType==1 && doType=='patrolPlan'){//校院巡查-计划
 			 uni.navigateTo({
-			     url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanList?pageType=1'
+			     url: '/pages_safetyExamine/patrolPlan/patrolPlanList?pageType=1'
 			 });
 		  }else if(self.pageType==1 && doType=='selfPlan'){//实验室自查-计划
 			  uni.navigateTo({
-			      url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanList?pageType=2'
+			      url: '/pages_safetyExamine/patrolPlan/patrolPlanList?pageType=2'
 			  });
 		  }else if(self.pageType==1 && doType=='dangerPlan'){//安全隐患-计划
 			  uni.navigateTo({
-			      url: '/pages/pages_safetyExamine/dangerManage/dangerManage?pageType=1'
+			      url: '/pages_safetyExamine/dangerManage/dangerManage?pageType=1'
 			  });
 		  }else if(self.pageType==2 && doType=='patrolPlan'){//校院巡查-检查
 			  uni.navigateTo({
-			      url: '/pages/pages_safetyExamine/examineManage/examineList?pageType=1'
+			      url: '/pages_safetyExamine/examineManage/examineList?pageType=1'
 			  });
 		  }else if(self.pageType==2 && doType=='selfPlan'){//实验室自查-检查
 			  uni.navigateTo({
-			      url: '/pages/pages_safetyExamine/examineManage/examineList?pageType=2'
+			      url: '/pages_safetyExamine/examineManage/examineList?pageType=2'
 			  });
 		  }else if(self.pageType==2 && doType=='dangerPlan'){//安全隐患-检查
 			  uni.navigateTo({
-			      url: '/pages/pages_safetyExamine/dangerManage/dangerManage?pageType=2'
+			      url: '/pages_safetyExamine/dangerManage/dangerManage?pageType=2'
 			  });
 		  }else if(self.pageType==3 && doType=='schoolDanger'){//校院巡查隐患
 			  uni.navigateTo({
-			      url: '/pages/pages_safetyExamine/dangerManage/dangerList?pageType=1'
+			      url: '/pages_safetyExamine/dangerManage/dangerList?pageType=1'
 			  });
 		  }else if(self.pageType==3 && doType=='labDanger'){//实验室自查隐患
 			  uni.navigateTo({
-			      url: '/pages/pages_safetyExamine/dangerManage/dangerList?pageType=2'
+			      url: '/pages_safetyExamine/dangerManage/dangerList?pageType=2'
 			  });
 		  }else if(doType=='edit'){//编辑
 			  uni.navigateTo({
-			      url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanEdit?pageType='+row.checkType+'&id='+row.id
+			      url: '/pages_safetyExamine/patrolPlan/patrolPlanEdit?pageType='+row.checkType+'&id='+row.id
 			  });
 		  }else if(doType=='snapshot'){//随手拍
 			  uni.navigateTo({
-			      url: '/pages/pages_safetyExamine/snapshotManage/snapshotAdd'
+			      url: '/pages_safetyExamine/snapshotManage/snapshotAdd'
 			  });
 		  }else if(doType=='start'){//开展检查
 			  uni.navigateTo({
-			      url: '/pages/pages_safetyExamine/examineManage/examineAdd'
+			      url: '/pages_safetyExamine/examineManage/examineAdd'
 			  });
 		  }
 		  
@@ -443,15 +443,15 @@ export default {
 	  handleTowClick(row,doType){
 		  if(doType=='add'){//开始检查
 				uni.navigateTo({
-				    url: '/pages/pages_safetyExamine/examineManage/examineAdd?id='+row.id
+				    url: '/pages_safetyExamine/examineManage/examineAdd?id='+row.id
 				});
 		  }else if(doType=='edit'){//编辑
 			  uni.navigateTo({
-			      url: '/pages/pages_safetyExamine/examineManage/examineAdd?id='+row.id
+			      url: '/pages_safetyExamine/examineManage/examineAdd?id='+row.id
 			  });
 		  }else if(doType=='check'){//复核
 			  uni.navigateTo({
-			  	 url: '/pages/pages_safetyExamine/dangerManage/dangerDetail?item='+encodeURIComponent(JSON.stringify(row))
+			  	 url: '/pages_safetyExamine/dangerManage/dangerDetail?item='+encodeURIComponent(JSON.stringify(row))
 			  })
 		  }
 	  },
@@ -460,11 +460,11 @@ export default {
 			if(doType=='detail'){
 				if(this.curTabThree==0){//隐患待整改详情
 					uni.navigateTo({
-						 url: '/pages/pages_safetyExamine/dangerManage/dangerDetail?item='+encodeURIComponent(JSON.stringify(row))
+						 url: '/pages_safetyExamine/dangerManage/dangerDetail?item='+encodeURIComponent(JSON.stringify(row))
 					})
 				}else if(this.curTabThree==1){
 					uni.navigateTo({
-						 url: '/pages/pages_safetyExamine/snapshotManage/snapshotDetail?id='+row.id+'&rectifyStatus='+this.getData3.rectifyStatus
+						 url: '/pages_safetyExamine/snapshotManage/snapshotDetail?id='+row.id+'&rectifyStatus='+this.getData3.rectifyStatus
 					})
 				}
 				
@@ -523,12 +523,12 @@ export default {
 	  	if(data.code == 200){
 			if(data.data){
 				uni.navigateTo({
-				    url: '/pages/pages_safetyExamine/examineManage/examineAdd?subId='+id
+				    url: '/pages_safetyExamine/examineManage/examineAdd?subId='+id
 				});
 			}else{
 				 let id = uni.setStorageSync('saoCodeId',id);
 				 uni.redirectTo({
-					 url: '/pages/pages_safetyExamine/inforSign'
+					 url: '/pages_safetyExamine/inforSign'
 				 })
 			}
 			
@@ -548,7 +548,7 @@ export default {
 	  			}else{
 	  				 let id = uni.setStorageSync('saoCodeId',id);
 	  				 uni.redirectTo({
-	  					 url: '/pages/pages_safetyExamine/inforSign'
+	  					 url: '/pages_safetyExamine/inforSign'
 	  				 })
 	  			}	
 	  	}
@@ -576,7 +576,7 @@ export default {
 		  _this.hiddenList.forEach(function(item){
 		  	if(item.type==true){
 		  		uni.redirectTo({
-		  			 url: '/pages/pages_safetyExamine/dangerManage/dangerDetail?item='+encodeURIComponent(JSON.stringify(item))
+		  			 url: '/pages_safetyExamine/dangerManage/dangerDetail?item='+encodeURIComponent(JSON.stringify(item))
 		  		})
 		  	}
 		  })

pages/pages_safetyExamine/dangerManage/dangerDetail.vue

@@ -23,7 +23,7 @@
 				</view>
 				<view class="basics_li">
 					<text>楼栋：</text>
-					<text>{{infoData.subjectName}}</text>
+					<text>{{infoData.buildName}}</text>
 				</view>
 				<view class="basics_li">
 					<text>检查类型：</text>
@@ -34,7 +34,7 @@
 					<text>{{infoData.checkRange==1?'全校':(infoData.checkRange==2?'学院':'实验室')}}</text>
 				</view>
 				<view class="basics_li" style="border:none;">
-					<text>检查计划：</text>
+					<text>计划标题：</text>
 					<text>{{infoData.title}}</text>
 				</view>
 			</view>
@@ -49,7 +49,7 @@
 				</view>	
 				<view class="basics_li">
 					<text>整改通知：</text>
-					<text style="color: #0183FA;">{{infoData.rectifyNotice == 1?'整改告知书':(infoData.rectifyNotice == 2?'整改通知书':'')}}</text>
+					<text style="color: #0183FA;" @click="rectifyInform">{{infoData.rectifyNotice == 1?'整改告知书':(infoData.rectifyNotice == 2?'整改通知书':'')}}</text>
 				</view>
 				<view class="basics_li">
 					<text>检查者：</text>
@@ -64,7 +64,8 @@
 				<view class="danger_title">不符合项</view>
 				<view class="grade">
 					<text>隐患等级：</text>
-					<text>{{infoData.checkHazardApplyDto.hazardLevel==0?'一般隐患':(infoData.checkHazardApplyDto.hazardLevel==1?'重大隐患':(infoData.checkHazardApplyDto.hazardLevel==2?'管理问题':''))}}</text>
+					<text>{{infoData.checkHazardApplyDto.hazardLevel==2?'一般隐患':(infoData.checkHazardApplyDto.hazardLevel==1?'重大隐患':(infoData.checkHazardApplyDto.hazardLevel==3?'管理问题':''))}}</text>
+					
 				</view>
 				<view class="project">
 					<view class="project_t">检查项目：</view>
@@ -117,8 +118,8 @@
 			<view v-if="item.applyFlag == 2" class="review_result danger">
 				<view class="audit">
 					<text>审核结果：</text>
-					<img v-if="item.examineResult == 0" src="@/images/Version3.3.3/icon_ywc.png"/>
-					<img v-if="item.examineResult == 1" src="@/images/Version3.3.3/icon_cg.png"/>
+					<img v-if="item.examineResult == 0" src="@/pages_safetyExamine/images/icon_ywc.png"/>
+					<img v-if="item.examineResult == 1" src="@/pages_safetyExamine/images/icon_cg.png"/>
 				</view>
 				<view class="project">
 					<view class="project_t">审核意见：</view>
@@ -250,7 +251,7 @@ export default {
 			examineOpinion:'',
 		},
 		quickIndex:0,
-		quickArray:[{name:'复核驳回',type:false},{name:'驳回在整改',type:false},{name:'请补充材料',type:false},{name:'请补充描述',type:false},{name:'未解决',type:false}],
+		quickArray:[{name:'复核驳回',type:false},{name:'驳回再整改',type:false},{name:'请补充材料',type:false},{name:'请补充描述',type:false},{name:'未解决',type:false}],
 		infoData:{},
 		item:{},
 		rectifyStatus:'',//1已完成 2待整改 3待复核 4 暂无法整改
@@ -306,6 +307,15 @@ export default {
 					this.infoData=data.data
 					this.form.checkHazardId=data.data.checkHazardApplyDto.id;
 					this.form.rectifyType=data.data.checkType;
+					if(data.data.checkType==1){
+						uni.setNavigationBarTitle({
+							title:'校院巡查隐患'
+						})
+					}else if(data.data.checkType==2){
+						uni.setNavigationBarTitle({
+							title:'实验室自查隐患'
+						})
+					}
 					
 					this.applyGentle=data.data.checkHazardApplyDto.applyGentle
 					this.rectifyGentle=data.data.checkHazardApplyDto.rectifyGentle
@@ -474,6 +484,152 @@ export default {
 		    this.form.uploadDtoList.splice(minIndex,1);
 			this.$forceUpdate();
 		},
+		//整改通知
+		rectifyInform(){//rectifyNotice 整改通知(1整改告知书 2整改通知书)
+			if(this.infoData.rectifyNotice==1){//1整改告知书
+				this.genReport(this.infoData.id)
+			}else if(this.infoData.rectifyNotice==2){//2整改通知书
+				this.genNotice(this.infoData.id)
+			}
+		},
+		//整改报告
+		rectifyReport(){
+			uni.showLoading({
+				title: '下载中'
+			});
+			wx.downloadFile({
+				url: config.base_url+'/zd-security/checkRectify/genReport/' + this.infoData.id,
+				header: {
+					Authorization: uni.getStorageSync('token')
+				},
+				success: function (res) {
+					const fileManager = wx.getFileSystemManager()
+					const filePath = wx.env.USER_DATA_PATH + '/(整改报告).docx'
+					fileManager.saveFile({
+						tempFilePath: res.tempFilePath,
+						filePath,
+						success: () => {
+							uni.hideLoading();
+							wx.openDocument({
+							filePath: filePath,
+							showMenu: true,
+							fileType: 'docx'
+							})
+						},
+						fail: function (res){
+							uni.hideLoading();
+							uni.showToast({
+								title: '下载失败',
+								icon:"none",
+								mask:true,
+								duration: 2000
+							});
+						}
+					})
+				},
+				fail: function (res){
+					uni.hideLoading();
+					uni.showToast({
+						title: '下载失败',
+						icon:"none",
+						mask:true,
+						duration: 2000
+					});
+				}
+			})
+		},
+		//整改通知书
+		genNotice(id){
+			uni.showLoading({
+				title: '下载中'
+			});
+			wx.downloadFile({
+				url: config.base_url+'/zd-security/checkManage/getRectifyAdviceNote/' + id,
+				header: {
+					Authorization: uni.getStorageSync('token')
+				},
+				success: function (res) {
+					const fileManager = wx.getFileSystemManager()
+					const filePath = wx.env.USER_DATA_PATH + '/(整改通知书).docx'
+					fileManager.saveFile({
+						tempFilePath: res.tempFilePath,
+						filePath,
+						success: () => {
+							uni.hideLoading();
+							wx.openDocument({
+							filePath: filePath,
+							showMenu: true,
+							fileType: 'docx'
+							})
+						},
+						fail: function (res){
+							uni.hideLoading();
+							uni.showToast({
+								title: '下载失败',
+								icon:"none",
+								mask:true,
+								duration: 2000
+							});
+						}
+					})
+				},
+				fail: function (res){
+					uni.hideLoading();
+					uni.showToast({
+						title: '下载失败',
+						icon:"none",
+						mask:true,
+						duration: 2000
+					});
+				}
+			})
+		},
+		//整改告知书
+		genReport(id){
+			uni.showLoading({
+				title: '下载中'
+			});
+			wx.downloadFile({
+				url: config.base_url+'/zd-security/checkManage/getRectifyNotification/' + id,
+				header: {
+					Authorization: uni.getStorageSync('token')
+				},
+				success: function (res) {
+					const fileManager = wx.getFileSystemManager()
+					const filePath = wx.env.USER_DATA_PATH + '/整改报告.docx'
+					fileManager.saveFile({
+						tempFilePath: res.tempFilePath,
+						filePath,
+						success: () => {
+							uni.hideLoading();
+							wx.openDocument({
+								filePath: filePath,
+								showMenu: true,
+								fileType: 'docx'
+							})
+						},
+						fail: function (res){
+							uni.hideLoading();
+							uni.showToast({
+								title: '下载失败',
+								icon:"none",
+								mask:true,
+								duration: 2000
+							});
+						}
+					})
+				},
+				fail: function (res){
+					uni.hideLoading();
+					uni.showToast({
+						title: '下载失败',
+						icon:"none",
+						mask:true,
+						duration: 2000
+					});
+				}
+			})
+		},
 		
 		async submitForm(doType){
 			let _this = this;
@@ -503,7 +659,7 @@ export default {
 			        duration: 2000
 			    });
 				uni.navigateTo({
-				    url: '/pages/pages_safetyExamine/examineManage/examineList?pageType='+this.checkType
+				    url: '/pages_safetyExamine/examineManage/examineList?pageType='+this.checkType
 				});
 			   
 			}

pages/pages_safetyExamine/dangerManage/dangerList.vue

@@ -12,12 +12,12 @@
 			<picker @change="collegeChange" :value="collegeIndex" :range="collegeArray" class="lab_title_l">
 				<view class="lab_title_l_n">
 					<view>{{getData.deptName?getData.deptName:'选择学院'}}</view>
-					<img src="@/images/Version3.3.3/icon_06.png">
+					<img src="@/pages_safetyExamine/images/icon_06.png">
 				</view>
 			</picker>
 			<view class="lab_title_r">
 				<view class="lab_title_r_btn" @click="searchBtn">
-					<img src="@/images/Version3.3.3/icon_aqjc_ss.png"/>
+					<img src="@/pages_safetyExamine/images/icon_aqjc_ss.png"/>
 				</view>
 				<input type="text" v-model="getData.searchValue" placeholder="实验室/房间号" maxlength="50" placeholder-style="color: #CCCCCC;font-size:22rpx;">
 				<view class="clear" @click="clearBtn">清除</view>
@@ -30,7 +30,7 @@
 			<view class="list_three_li" v-for="(item,index) in  dataList" :key="index" @click="handleClick(item,'detail')">
 				<view class="list_three_li_t">
 					<view class="list_three_li_t_l">
-						<img src="@/images/Version3.3.3/icon_xyxc_qx.png"/>
+						<img src="@/pages_safetyExamine/images/icon_xyxc_qx.png"/>
 						<text></text>
 					</view>
 					<view class="list_three_li_t_c">{{item.subRoom}}</view>
@@ -98,17 +98,18 @@ export default {
   },
   onLoad(option) {
 	 if(option.form){
-	 		this.form=JSON.parse(decodeURIComponent(option.form)); 
-	 		console.log(this.form)
+		this.form=JSON.parse(decodeURIComponent(option.form)); 
 	 }
 	 if(option.pageType==1){
-	 		  uni.setNavigationBarTitle({
-	 				title:'校院巡查隐患'
-	 		  })
+		  uni.setNavigationBarTitle({
+				title:'校院巡查隐患'
+		  })
+		  this.getData.hazardType=option.pageType;
 	 }else if(option.pageType==2){
-	 		  uni.setNavigationBarTitle({
-	 				title:'实验室自查隐患'
-	 		  })
+		  uni.setNavigationBarTitle({
+				title:'实验室自查隐患'
+		  })
+		  this.getData.hazardType=option.pageType;
 	 }
   },
   onShow() {
@@ -201,7 +202,7 @@ export default {
 	      
 	      }else if(doType=='detail'){//详情
 	    	  uni.navigateTo({
-	    	  	 url: '/pages/pages_safetyExamine/dangerManage/dangerDetail?item='+encodeURIComponent(JSON.stringify(row))
+	    	  	 url: '/pages_safetyExamine/dangerManage/dangerDetail?item='+encodeURIComponent(JSON.stringify(row))
 	    	  })
 	      }
 	      

pages/pages_safetyExamine/dangerManage/dangerManage.vue

@@ -18,12 +18,12 @@
 			<picker @change="collegeChange" :value="collegeIndex" :range="collegeArray" class="lab_title_l">
 				<view class="lab_title_l_n">
 					<view>{{getData.deptName?getData.deptName:'选择学院'}}</view>
-					<img src="@/images/Version3.3.3/icon_06.png">
+					<img src="@/pages_safetyExamine/images/icon_06.png">
 				</view>
 			</picker>
 			<view class="lab_title_r">
 				<view class="lab_title_r_btn" @click="searchBtn">
-					<img src="@/images/Version3.3.3/icon_aqjc_ss.png"/>
+					<img src="@/pages_safetyExamine/images/icon_aqjc_ss.png"/>
 				</view>
 				<input type="text" v-model="getData.searchValue" placeholder="实验室/房间号" maxlength="50" placeholder-style="color: #CCCCCC;font-size:22rpx;">
 				<view class="clear" @click="clearBtn">清除</view>
@@ -36,7 +36,7 @@
 			<view class="list_three_li" v-for="(item,index) in  dataList" :key="index" @click="handleClick(item,'detail')">
 				<view class="list_three_li_t">
 					<view class="list_three_li_t_l">
-						<img src="@/images/Version3.3.3/icon_xyxc_qx.png"/>
+						<img src="@/pages_safetyExamine/images/icon_xyxc_qx.png"/>
 						<text></text>
 					</view>
 					<view class="list_three_li_t_c">{{item.subRoom}}</view>
@@ -225,7 +225,7 @@ export default {
 		  
 		  }else if(doType=='detail'){//详情
 			  uni.navigateTo({
-			  	 url: '/pages/pages_safetyExamine/dangerManage/dangerDetail?item='+encodeURIComponent(JSON.stringify(row))
+			  	 url: '/pages_safetyExamine/dangerManage/dangerDetail?item='+encodeURIComponent(JSON.stringify(row))
 			  })
 		  }
 		  

pages/pages_safetyExamine/examineManage/examineAdd.vue

@@ -8,7 +8,7 @@
 				<view class="basics_li_r lab_r">
 					<input class="picker-text" @click="popupClick(1)" type="text" disabled v-model="form.subjectName" placeholder="请选择房间" placeholder-style="font-size: 30rpx;color:#333;">
 					<view class="img-box" @click.stop="saoCode">
-						<img src="@/images/Version3.3.3/icon_aqjc_sm.png">
+						<img src="@/pages_safetyExamine/images/icon_aqjc_sm.png">
 					</view>
 				</view>
 			</view>
@@ -17,7 +17,7 @@
 				<picker @change="collegeChange" :value="collegeIndex" :range="collegeArray" class="scope_r">
 					<view class="basics_li_r college_r">
 						<view>{{form.collegeName?form.collegeName:'选择学院'}}</view>
-						<img src="@/images/Version3.3.3/icon_06.png">
+						<img src="@/pages_safetyExamine/images/icon_06.png">
 					</view>
 				</picker>
 			</view>
@@ -32,7 +32,7 @@
 				<picker @change="buildingChange" :value="collegeIndex" :range="buildingArray" class="scope_r">
 					<view class="basics_li_r college_r">
 						<view>{{form.buildName?form.buildName:'选择楼栋'}}</view>
-						<img src="@/images/Version3.3.3/icon_06.png">
+						<img src="@/pages_safetyExamine/images/icon_06.png">
 					</view>
 				</picker>
 			</view>
@@ -42,7 +42,7 @@
 				<picker @change="planChange" :value="planIndex" :range="planArray" class="scope_r">
 					<view class="basics_li_r college_r">
 						<view>{{form.title?form.title:'选择计划标题'}}</view>
-						<img src="@/images/Version3.3.3/icon_06.png">
+						<img src="@/pages_safetyExamine/images/icon_06.png">
 					</view>
 				</picker>
 			</view>
@@ -51,7 +51,7 @@
 				<picker @change="categoryChange" :value="categoryIndex" :disabled="isCustom" :range="categoryArray" class="scope_r">
 					<view class="basics_li_r college_r">
 						<view>{{form.checkType?(form.checkType==1?'校院巡查':'实验室自查'):'选择检查类型'}}</view>
-						<img src="@/images/Version3.3.3/icon_06.png">
+						<img src="@/pages_safetyExamine/images/icon_06.png">
 					</view>
 				</picker>
 			</view>
@@ -75,7 +75,7 @@
 				<picker @change="resultChange" :value="resultIndex" :range="resultArray" class="scope_r">
 					<view class="inspect_li_r college_r">
 						<view>{{form.checkResult==1?'符合':'不符合'}}</view>
-						<img src="@/images/Version3.3.3/icon_06.png">
+						<img src="@/pages_safetyExamine/images/icon_06.png">
 					</view>
 				</picker>
 			</view>
@@ -84,7 +84,7 @@
 				<picker mode="date" @change="rectifyDeadline(form,$event)">
 					<view class="inspect_li_r date_r">
 						<input disabled class="picker-text" type="text" v-model="form.rectifyDeadline" placeholder="请选择日期" placeholder-style="font-size: 30rpx;color:#333;">
-						<img src="@/images/Version3.3.3/icon_rl.png">
+						<img src="@/pages_safetyExamine/images/icon_rl.png">
 					</view>
 				</picker>
 			</view>
@@ -171,7 +171,7 @@ export default {
 			checkHazardDtoList:[
 				{
 					voiceRemark:[],//语音备忘存储
-					hazardLevel:'0',//隐患等级
+					hazardLevel:2,//隐患等级
 					hazardLevelName:'一般隐患',//隐患等级
 					hazardCheckCode:'', //检查项目code序号 
 					hazardCheckName:'', //检查项目名称 
@@ -204,7 +204,8 @@ export default {
 		isCustom:true,
 		buildingArray:[],
 		buildingList:[],
-		
+		//扫一扫进入
+		laboratoryList:[],
 	}
   },
   onLoad(option) {
@@ -217,7 +218,9 @@ export default {
 	 }
 	 //通过实验室id查询计划
 	 if(option.subId){
+		this.form.subId=option.subId
 	 	this.getCheckPlanBySubId(option.subId)
+		this.getByIdLaboratoryList();
 	 }
 	 
   },
@@ -226,6 +229,7 @@ export default {
   },
   mounted(){
 	   this.listDepartments();
+	  
   },
   methods: {
 		//滚动事件
@@ -234,7 +238,7 @@ export default {
 		  let self=this;
 		  if( doType=='nextStep'){//下一步	
 			  uni.redirectTo({
-				  url: '/pages/pages_safetyExamine/examineManage/examineAddTow?form='+encodeURIComponent(JSON.stringify(this.form))
+				  url: '/pages_safetyExamine/examineManage/examineAddTow?form='+encodeURIComponent(JSON.stringify(this.form))
 			  });
 		  }
 		  
@@ -268,7 +272,7 @@ export default {
 		},
 		//开始时间选中事件
 		startChange(form,e){
-			if(new Date(e.target.value).getTime()>=new Date(form.cycleEndTime).getTime()){
+			if(new Date(e.target.value).getTime()>new Date(form.cycleEndTime).getTime()){
 				 uni.showToast({
 					title: '结束时间不能小于开始时间',
 					icon:"none",
@@ -310,11 +314,22 @@ export default {
 					this.form.buildId=data.data.buildId;
 					this.form.buildName=data.data.buildName;
 					this.form.checkType=data.data.checkType;
+					this.form.roomNumber=data.data.roomNumber;
 					this.form.checkResult=data.data.checkResult==null?'1':data.data.checkResult;
 					this.form.rectifyDeadline=data.data.rectifyDeadline;
 					this.form.rectifyNotice=data.data.rectifyNotice==null?'1':data.data.rectifyNotice;
 					if(data.data.checkHazardDtoList.length>0){//隐患项
 						this.form.checkHazardDtoList=data.data.checkHazardDtoList;
+						//语音备注
+						for(let i=0;i<this.form.checkHazardDtoList.length;i++){
+							if(this.form.checkHazardDtoList[i].voiceRemark){
+								this.form.checkHazardDtoList[i].voiceRemark=JSON.parse(this.form.checkHazardDtoList[i].voiceRemark)
+							}else{
+								this.form.checkHazardDtoList[i].voiceRemark=[];
+							}
+						}
+					}else{
+						this.form.checkHazardDtoList[0].voiceRemark=[];
 					}
 					this.form.id=data.data.id;
 					//根据实验室id查询实验室计划
@@ -323,6 +338,7 @@ export default {
 						this.form.cycleEndTime=data.data.cycleEndTime;
 						this.getCheckPlanBySubId(data.data.subId)
 					}
+					console.log(this.form)
 			}
 		},
 		//查询学院列表
@@ -442,6 +458,33 @@ export default {
 				this.popupType = false;
 			}
 		},
+		//扫一扫进入通过id查询实验室列表
+		async getByIdLaboratoryList(){
+			let self = this;
+			const {data} = await buildBySub({'name':this.room});
+			if(data.code==200){
+				if(data.data[0]){
+					this.laboratoryList = data.data;
+					data.data.forEach(function(item){
+						if(self.form.subId==item.id){
+							self.form.subjectName=item.name;
+							self.form.deptId=item.deptId;
+							self.form.buildId=item.buildId;
+							self.form.roomNumber=item.room;
+							
+						}
+					})
+					//获取学院名称
+					for(let i=0;i<this.collegeList.length;i++){
+						if(this.collegeList[i].deptId==self.form.deptId){
+							this.$set(this.form,"collegeName",this.collegeList[i].deptName)
+						}
+					}
+					//请求楼栋数据
+					this.getBuildingList(self.form.deptId)
+				}
+			}
+		},
 		//搜索房间接口
 		async buildBySub(){
 			let self = this;
@@ -454,7 +497,7 @@ export default {
 				});
 				return
 			}
-			const {data} = await buildBySub(this.room);
+			const {data} = await buildBySub({'name':this.room});
 			if(data.code==200){
 				if(data.data[0]){
 					this.roomList = data.data;
@@ -535,7 +578,7 @@ export default {
 					duration: 2000
 				});
 				uni.redirectTo({
-				    url: '/pages/pages_safetyExamine/examineManage/examineList'
+				    url: '/pages_safetyExamine/examineManage/examineList'
 				});
 			}
 		  },

pages/pages_safetyExamine/examineManage/examineAddTow.vue

@@ -10,7 +10,7 @@
 						<picker @change="gradeChange(item,$event)" :value="gradeIndex" :range="gradeArray" class="scope_r">
 							<view class="grade_r">
 								<view>{{item.hazardLevel==2?'一般隐患':(item.hazardLevel==1?'重大隐患':(item.hazardLevel==3?'管理问题':''))}}</view>
-								<img src="@/images/Version3.3.3/icon_06.png">
+								<img src="@/pages_safetyExamine/images/icon_06.png">
 							</view>
 						</picker>
 					</view>
@@ -21,7 +21,7 @@
 						ref="uniDataPicker" :addType="true" :addIndex="index">
 							<view  class="project_r">{{item.hazardCheckName?item.hazardCheckName:'请选择检查项'}}</view>
 						</uni-data-picker> -->
-						<uni-data-picker placeholder="请选择班级" popup-title="请选择所属目录" :localdata="checkOptionList" :map="{text:'name',value:'id'}" v-model="item.hazardCheckName"
+						<uni-data-picker placeholder="请选择班级" popup-title="请选择所属目录" :localdata="checkOptionList" :map="{text:'name',value:'id'}" 
 										@change="(e)=>onchange(e,index)" @nodeclick="onnodeclick">
 							<view  class="project_r">{{item.hazardCheckName?item.hazardCheckName:'请选择检查项'}}</view>			
 						</uni-data-picker>
@@ -48,7 +48,7 @@
 				   <view class="voice">
 					   <view class="voice_t">
 						   <view class="voice_t_l">语音备注：</view>
-						   <img class="voice_t_r" src="@/images/Version3.3.3/icon_ksjc_yysr.png" @longpress.stop="recordButton(item,$event)" @touchmove.stop="cancelButton"  @touchend.stop="sendButton(item,$event)">
+						   <img class="voice_t_r" src="@/pages_safetyExamine/images/icon_ksjc_yysr.png" @longpress.stop="recordButton(item,$event)" @touchmove.stop="cancelButton"  @touchend.stop="sendButton(item,$event)">
 					   </view>
 					   <view class="voice_b" v-for="(voiceItem,voiceIndex) in item.voiceRemark" :key="voiceIndex">
 						   <view class="voice_b_l" @tap="voicePlay(voiceItem.url)"><img class="add-button" src="@/pages_manage/images/icon_yyt.png"/>{{voiceItem.times}}″</view>
@@ -99,10 +99,11 @@
 					checkResult:'1',// 检查结果 0不符合 1符合 
 					rectifyDeadline:'',//整改期限
 					rectifyNotice:'1',//整改通知(1整改告知书 2整改通知书)
+					roomNumber:'',//房间号
 					checkHazardDtoList:[
 						{
 							voiceRemark:[],//语音备忘存储
-							hazardLevel:1,//隐患等级
+							hazardLevel:2,//隐患等级
 							hazardCheckCode:'', //检查项目code序号 
 							hazardCheckName:'', //检查项目名称 
 							hazardCheckPro:'', //最后一级的id  
@@ -138,28 +139,7 @@
 				gradeIndex :0,
 				gradeArray:['一般隐患','重大隐患','问题管理'],
 				bottomBtnList:['上一步','保存','提交'],
-				items: [{
-				          text: "一年级",
-				          value: "1-0",
-				          children: [
-				            {
-				              text: "1.1班",
-				              value: "1-1"
-				            },
-				            {
-				              text: "1.2班",
-				              value: "1-2"
-				            }
-				          ]
-				        },
-				        {
-				          text: "二年级",
-				          value: "2-0"
-				        },
-				        {
-				          text: "三年级",
-				          value: "3-0"
-				        }]
+				
             }
         },
         onLoad(option) {
@@ -186,6 +166,7 @@
 			},
 			//语音备忘播放
 			async voicePlay(item){
+				console.log(myaudio.src)
 				 myaudio.src = config.base_url+item;
 				 myaudio.play();
 			},
@@ -396,20 +377,28 @@
 				//hazardCheckCode:'', //检查项目code序号
 				//hazardCheckName:'', //检查项目名称 
 				//hazardCheckPro:'', //最后一级的id 
-				console.log(e)
-				console.log(index)
-				let jcxSstkNum=this.getTreeName(this.checkOptionList[0],e.detail.value[e.detail.value.length-1].value)
-				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);
+				 
+				if(this.getTreeName(this.checkOptionList,e.detail.value[e.detail.value.length-1].value).level==3){
+					let jcxSstkNum=this.getTreeName(this.checkOptionList,e.detail.value[e.detail.value.length-1].value).code
+					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);
+				}else{
+					uni.showToast({
+						title: '暂无数据',
+						icon:"none",
+						mask:true,
+						duration: 2000
+					});
+				}
 			},
-			  //根据id查找父元素
+			  //根据id查找元素
 			getTreeName(list,id){
 			   let _this=this
 			  for (let i = 0; i < list.length; i++) {
 				let a=list[i]
 				if(a.id===id){
-				  return a.code
+				  return a
 				}else{
 				  if(a.children && a.children.length>0){
 					let res=_this.getTreeName(a.children,id)
@@ -420,7 +409,9 @@
 				}
 			  }
 			},
-			onnodeclick(node) {},
+			onnodeclick(node) {
+				
+			},
             // 图片上传
             selectImage(item) {
                 let self = this;
@@ -495,7 +486,7 @@
 				}
 				let obj = {
 					voiceRemark:[],//语音备忘存储
-					hazardLevel:1,//隐患等级
+					hazardLevel:2,//隐患等级
 					hazardCheckCode:'', //检查项目code序号 
 					hazardCheckName:'', //检查项目名称 
 					hazardCheckPro:'', //最后一级的id  
@@ -518,7 +509,7 @@
 				let self = this;
 				if(index == 0){
 					uni.redirectTo({
-					    url: '/pages/pages_safetyExamine/examineManage/examineAdd?form='+encodeURIComponent(JSON.stringify(this.form))
+					    url: '/pages_safetyExamine/examineManage/examineAdd?form='+encodeURIComponent(JSON.stringify(this.form))
 					});
 				}else if(index == 1 || index == 2){
 					this.form.manageStatus=index;//1保存 2提交
@@ -547,9 +538,15 @@
             },
 			//提交
 			async submitForm(){
-				let _this = this;
-				
-				const {data} = await checkManageAdd(_this.form);
+				let self = this;
+				let obj=self.form;
+				//语音备注JSON对象转字符串
+				for(let i=0;i<obj.checkHazardDtoList.length;i++){
+					if(obj.checkHazardDtoList[i].voiceRemark){
+						obj.checkHazardDtoList[i].voiceRemark=JSON.stringify(obj.checkHazardDtoList[i].voiceRemark)
+					}
+				}
+				const {data} = await checkManageAdd(obj);
 				if(data.code == 200){
 					uni.showToast({
 						title: '提交成功',
@@ -558,7 +555,7 @@
 						duration: 2000
 					});
 					uni.redirectTo({
-					    url: '/pages/pages_safetyExamine/examineManage/examineList'
+					    url: '/pages_safetyExamine/examineManage/examineList'
 					});
 				}
 			  },

pages/pages_safetyExamine/examineManage/examineDetail.vue

@@ -24,21 +24,21 @@
 				<text>{{infoData.checkRange==1?'全校':(infoData.checkRange==2?'学院':'实验室')}}</text>
 			</view>
 			<view class="basics_li" style="border:none;">
-				<text>检查计划：</text>
+				<text>计划标题：</text>
 				<text>{{infoData.title}}</text>
 			</view>
 		</view>
-		<!-- <view class="attachment">
+		<view class="attachment" v-if="infoData.isAttachment==1">
 			<view class="attachment_t">
 				<text>材料附件</text>
 				<text>点击文件标题查看</text>
 			</view>
-			<view class="attachment_li">
-				<img src="@/images/Version3.3.3/icon_djc_wj.png"/>
-				<text>文件标题文件标题</text>
-				<img class="attachment_li_del" src="@/images/Version3.3.3/icon_fjgk_sc.png"/>
+			<view class="attachment_li" v-for="item in attachmentList">
+				<img src="@/pages_safetyExamine/images/icon_djc_wj.png"/>
+				<text  @click="attachmentPreview(item)">{{item.fileName}}</text>
+				<!-- <img class="attachment_li_del" src="@/images/Version3.3.3/icon_fjgk_sc.png"/> -->
 			</view>
-		</view> -->
+		</view>
 		<view class="basics" v-if="manageStatus==2">
 			<view class="basics_li">
 				<text>检查结果：</text>
@@ -61,7 +61,7 @@
 				<text>{{infoData.checkTime}}</text>
 			</view>
 		</view>
-		<view class="inconformity" @click="inconformityFun()" v-if="manageStatus==2">不符合项<img v-if="inconformityStatus" src="@/images/Version3.3.3/icon_bfhx_xq.png"/><img v-if="!inconformityStatus" src="@/images/Version3.3.3/icon_bfhx_sq.png"/></view>
+		<view class="inconformity" @click="inconformityFun()" v-if="manageStatus==2">不符合项<img v-if="inconformityStatus" src="@/pages_safetyExamine/images/icon_bfhx_xq.png"/><img v-if="!inconformityStatus" src="@/pages_safetyExamine/images/icon_bfhx_sq.png"/></view>
 		<view v-for="(item,index) in infoData.checkHazardDtoList" v-if="manageStatus==2">
 			<view class="danger">
 				<view class="sort">{{item.sort}}</view>
@@ -95,7 +95,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="pack_up" @click="switchFun(item)">{{item.switch?'收起':'展开'}}<img v-if="item.switch" src="@/images/Version3.3.3/icon_06_1.png"/><img v-if="!item.switch" src="@/images/Version3.3.3/icon_06.png"/></view>
+			<view class="pack_up" @click="switchFun(item)">{{item.switch?'收起':'展开'}}<img v-if="item.switch" src="@/pages_safetyExamine/images/icon_06_1.png"/><img v-if="!item.switch" src="@/pages_safetyExamine/images/icon_06.png"/></view>
 		</view>
 	</scroll-view>
 	<view class="report" @change="rectifyReport" v-if="manageStatus==2">整改报告</view>	
@@ -106,7 +106,7 @@
 
 <script>
 import { config } from '@/api/request/config.js'
-import {checkSign,queryDeptSignByUserId,findCheckManage} from '@/api/index.js'
+import {checkSign,queryDeptSignByUserId,findCheckManage,findByPlanIdAttachment} from '@/api/index.js'
 export default {
   name: "rectifyList",
   components: {
@@ -119,6 +119,7 @@ export default {
 		pageType:0,
 		inconformityStatus:false,
 		infoData:{},
+		attachmentList:[],
 	}
   },
   onLoad(option) {
@@ -155,10 +156,18 @@ export default {
 		handleClick(row,doType){
 			if(doType=='startInspect'){
 				uni.navigateTo({
-				    url: '/pages/pages_safetyExamine/examineManage/examineAdd?id='+this.id
+				    url: '/pages_safetyExamine/examineManage/examineAdd?id='+this.id
 				});
 			}
 		},
+		//根据计划id查询附件列表
+		async findByPlanIdAttachment(){
+			let _this = this;
+			const {data} = await findByPlanIdAttachment({checkPlanId:this.infoData.checkPlanId});
+			if(data.code == 200){
+				_this.attachmentList=data.data;
+			}
+		},
 		//详情
 		async findCheckManage(){
 			let _this = this;
@@ -169,8 +178,44 @@ export default {
 					item.switch=false;
 				})
 				this.infoData=data.data;
+				
+				if(data.data.isAttachment==1){//0没有附件 1有附件
+					this.findByPlanIdAttachment()
+				}
+				
 			}
 		},
+		//附件查看
+		attachmentPreview(item){
+			uni.showLoading({
+				title: '下载中'
+			});
+			wx.downloadFile({
+				url: config.base_url+item.fileUrl,
+				header: {
+					Authorization: uni.getStorageSync('token')
+				},
+				success: function (res) {
+					uni.hideLoading();
+					const filePath = res.tempFilePath
+					wx.openDocument({
+					  filePath: filePath,
+					  success: function (res) {
+						console.log('打开文档成功')
+					  }
+					})
+				},
+				fail: function (res){
+					uni.hideLoading();
+					uni.showToast({
+						title: '下载失败',
+						icon:"none",
+						mask:true,
+						duration: 2000
+					});
+				}
+			})
+		},
 		//查看图片
 		lockImg(list){
 			console.log(list)
@@ -192,7 +237,7 @@ export default {
 		//隐患项跳转详情
 		dangerItem(row){
 			uni.navigateTo({
-				 url: '/pages/pages_safetyExamine/dangerManage/dangerDetail?item='+encodeURIComponent(JSON.stringify(row))
+				 url: '/pages_safetyExamine/dangerManage/dangerDetail?item='+encodeURIComponent(JSON.stringify(row))
 			})
 		},
 		//隐患项收起展开
@@ -370,6 +415,7 @@ export default {
 	.info-max-box{
 		flex: 1;
 		overflow: scroll;
+		padding-bottom: 140rpx;
 	}
 	.basics{
 		width: 690rpx;

pages/pages_safetyExamine/examineManage/examineList.vue

@@ -12,12 +12,12 @@
 			<picker @change="collegeChange" :value="collegeIndex" :range="collegeArray" class="lab_title_l">
 				<view class="lab_title_l_n">
 					<view>{{getData.deptName?getData.deptName:'选择学院'}}</view>
-					<img src="@/images/Version3.3.3/icon_06.png">
+					<img src="@/pages_safetyExamine/images/icon_06.png">
 				</view>
 			</picker>
 			<view class="lab_title_r">
 				<view class="lab_title_r_btn" @click="searchBtn">
-					<img src="@/images/Version3.3.3/icon_aqjc_ss.png"/>
+					<img src="@/pages_safetyExamine/images/icon_aqjc_ss.png"/>
 				</view>
 				<input type="text" v-model="getData.searchValue" placeholder="计划标题/实验室/房间号" maxlength="50" placeholder-style="color: #CCCCCC;font-size:22rpx;">
 				<view class="clear" @click="clearBtn">清除</view>
@@ -30,7 +30,7 @@
 			<view class="list_three_li" v-for="(item,index) in  dataList" :key="index">
 				<view class="list_three_li_t">
 					<view class="list_three_li_t_l">
-						<img src="@/images/Version3.3.3/icon_xyxc_qx.png"/>
+						<img src="@/pages_safetyExamine/images/icon_xyxc_qx.png"/>
 						<text></text>
 					</view>
 					<view class="list_three_li_t_c">{{item.subjectName}}-{{item.roomNumber}}</view>
@@ -50,9 +50,9 @@
 				<!-- 开始检查 -->
 				<view v-if="item.manageStatus==0 && item.notStarted" class="list_three_li_b" @click="handleClick(item,'add')">开始检查</view>
 				<view v-if="item.manageStatus==1" class="list_three_li_b" @click="handleClick(item,'edit')">编辑</view>
-				<view v-if="!item.notStarted" class="list_three_li_b_tow"><img src="@/images/Version3.3.3/icon_xyxcgl_jhwks.png"/>计划未开始</view>
+				<view v-if="!item.notStarted" class="list_three_li_b_tow"><img src="@/pages_safetyExamine/images/icon_xyxcgl_jhwks.png"/>计划未开始</view>
 				<view v-if="item.manageStatus==2" class="list_three_li_b_three">
-					<img src="@/images/Version3.3.3/icon_djcsys.png"/>
+					<img src="@/pages_safetyExamine/images/icon_djcsys.png"/>
 					<text>整改进度：</text>
 					<text @click="handleClick(item,'detail')">{{item.rectifySchedule}}</text>
 					<text class="report" @click="handleClick(item,'download')">整改报告</text>
@@ -203,19 +203,19 @@ export default {
 		  let self=this;
 		  if( doType=='add'){//开始检查	
 			  uni.navigateTo({
-			      url: '/pages/pages_safetyExamine/examineManage/examineAdd?id='+row.id
+			      url: '/pages_safetyExamine/examineManage/examineAdd?id='+row.id
 			  });
 		  }else if(doType=='edit'){
 			  uni.navigateTo({
-			      url: '/pages/pages_safetyExamine/examineManage/examineAdd?id='+row.id
+			      url: '/pages_safetyExamine/examineManage/examineAdd?id='+row.id
 			  });
 		  }else if(doType=='detail'){
 			  uni.navigateTo({
-			      url: '/pages/pages_safetyExamine/examineManage/examineDetail?id='+row.id+'&manageStatus='+row.manageStatus
+			      url: '/pages_safetyExamine/examineManage/examineDetail?id='+row.id+'&manageStatus='+row.manageStatus
 			  });
 		  }else if(doType=='startInspect'){//开始检查
 			  uni.navigateTo({
-			      url: '/pages/pages_safetyExamine/examineManage/examineAdd'
+			      url: '/pages_safetyExamine/examineManage/examineAdd'
 			  });
 		  }else if(doType=='download'){//整改报告下载rectifyNotice 整改通知(1整改告知书 2整改通知书)
 			  this.rectifyReport(row.id)

pages/pages_safetyExamine/inforSign.vue

@@ -109,7 +109,7 @@ export default {
 		  let self=this;
 		  if(doType=='start'){//提交
 			  uni.navigateTo({
-			      url: '/pages/pages_safetyExamine/examineManage/examineAdd?id='+ uni.getStorageSync('saoCodeId')
+			      url: '/pages_safetyExamine/examineManage/examineAdd?id='+ uni.getStorageSync('saoCodeId')
 			  });
 		  }
 	    },

pages/pages_safetyExamine/patrolPlan/patrolPlanAdd.vue

@@ -31,7 +31,7 @@
 				<picker @change="scopeChange" :value="scopeIndex" :range="scopeArray" class="scope_r">
 					<view class="scope_r_n">
 						<view>{{form.checkRange?(form.checkRange==1?'全校':(form.checkRange==2?'学院':'实验室')):'选择检查范围'}}</view>
-						<img src="@/images/Version3.3.3/icon_06.png">
+						<img src="@/pages_safetyExamine/images/icon_06.png">
 					</view>
 				</picker>
 			</view>
@@ -48,13 +48,13 @@
 				<view class="patrol_l">巡查组</view>
 				<view class="patrol_r_n" @click="patrolChange">
 					<view>{{form.checkGroupName?form.checkGroupName:'请选择巡查组'}}</view>
-					<img src="@/images/Version3.3.3/icon_06.png">
+					<img src="@/pages_safetyExamine/images/icon_06.png">
 				</view>
 			</view>
 			<view class="list">
-				<view class="list_title"><img src="@/images/Version3.3.3/icon_jcjh_cy.png">成员</view>
+				<view class="list_title"><img src="@/pages_safetyExamine/images/icon_jcjh_cy.png">成员</view>
 				<view class="list_header"><text>工号</text><text>姓名</text></view>
-				<view class="list_li" v-for="(item,index) in form.checkMemberDtoList"><text>12345678</text><text>{{item.name}}</text></view>
+				<view class="list_li" v-for="(item,index) in form.checkMemberDtoList"><text>{{item.jobNum}}</text><text>{{item.name}}</text></view>
 				<view class="list_bottom" v-if="form.checkMemberDtoList.length==0">无数据</view>
 			</view>
 		</view>
@@ -68,7 +68,7 @@
 			<view class="shade_n_b">
 				<view class="shade_n_b_li" v-for="(item,index) in  collegeList" :key="index" @click="collegeSelete(index)">
 					<text :class="item.type?'color_B':'color_A'">{{item.deptName}}</text>
-					<img v-if="item.type" src="@/images/Version3.3.3/icon_xzwt_xz.png">
+					<img v-if="item.type" src="@/pages_safetyExamine/images/icon_xzwt_xz.png">
 				</view>
 			</view>
 		</view>
@@ -153,7 +153,7 @@ export default {
 		},
 	    //开始时间选中事件
 		startChange(form,e){
-			if(new Date(e.target.value).getTime()>=new Date(form.cycleEndTime).getTime()){
+			if(new Date(e.target.value).getTime()>new Date(form.cycleEndTime).getTime()){
 				 uni.showToast({
 					title: '结束时间不能小于开始时间',
 					icon:"none",
@@ -287,7 +287,7 @@ export default {
 			this.form.tiemQuickList=this.tiemQuickList//检查周期快捷存储
 			this.form.scopeIndex=this.scopeIndex//检查范围
 			uni.redirectTo({
-			    url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanAddMember?form='+encodeURIComponent(JSON.stringify(this.form))+'&pageType=1'
+			    url: '/pages_safetyExamine/patrolPlan/patrolPlanAddMember?form='+encodeURIComponent(JSON.stringify(this.form))+'&pageType=1'
 			});
 		},
 		//选择学院或者实验室
@@ -299,7 +299,7 @@ export default {
 			    this.form.tiemQuickList=this.tiemQuickList//检查周期快捷存储
 			    this.form.scopeIndex=this.scopeIndex//检查范围
 				uni.redirectTo({
-				    url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanAddLab?form='+encodeURIComponent(JSON.stringify(this.form))+'&pageType=1'
+				    url: '/pages_safetyExamine/patrolPlan/patrolPlanAddLab?form='+encodeURIComponent(JSON.stringify(this.form))+'&pageType=1'
 				});
 			}
 		},
@@ -370,7 +370,7 @@ export default {
 			        duration: 2000
 			    });
 				uni.redirectTo({
-					url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanList?pageType='+this.form.checkType
+					url: '/pages_safetyExamine/patrolPlan/patrolPlanList?pageType='+this.form.checkType
 				});
 			   
 			}

pages/pages_safetyExamine/patrolPlan/patrolPlanAddLab.vue

@@ -7,12 +7,12 @@
 				<picker @change="collegeChange" :value="collegeIndex" :range="collegeArray" class="lab_title_l">
 					<view class="lab_title_l_n">
 						<view>{{getData.deptName?getData.deptName:'选择学院'}}</view>
-						<img src="@/images/Version3.3.3/icon_06.png">
+						<img src="@/pages_safetyExamine/images/icon_06.png">
 					</view>
 				</picker>
 				<view class="lab_title_r">
 					<view class="lab_title_r_btn" @click="searchBtn">
-						<img src="@/images/Version3.3.3/icon_aqjc_ss.png"/>
+						<img src="@/pages_safetyExamine/images/icon_aqjc_ss.png"/>
 					</view>
 					<input type="text" v-model="getData.searchValue" placeholder="请输入实验室名称" maxlength="50" placeholder-style="color: #CCCCCC;font-size:26rpx;">
 					<view class="clear" @click="clearBtn">清除</view>
@@ -21,7 +21,7 @@
 			<view class="list">
 				<view class="list_li" v-for="(item,index) in  dataList" :key="index" @click="labSelete(index)">
 					<text :class="item.type?'color_B':'color_A'">{{item.subjectName}}-{{item.roomNumber}}</text>
-					<img v-if="item.type" src="@/images/Version3.3.3/icon_xzwt_xz.png">
+					<img v-if="item.type" src="@/pages_safetyExamine/images/icon_xzwt_xz.png">
 				</view>
 			</view>
 		</view>
@@ -149,11 +149,11 @@ export default {
 		}
 		if(this.pageType==1){
 			uni.redirectTo({
-				url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanAdd?form='+encodeURIComponent(JSON.stringify(this.form))
+				url: '/pages_safetyExamine/patrolPlan/patrolPlanAdd?form='+encodeURIComponent(JSON.stringify(this.form))
 			});
 		}else if(this.pageType==2){
 			uni.redirectTo({
-				url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanEdit?form='+encodeURIComponent(JSON.stringify(this.form))
+				url: '/pages_safetyExamine/patrolPlan/patrolPlanEdit?form='+encodeURIComponent(JSON.stringify(this.form))
 			});
 		}
 		

pages/pages_safetyExamine/patrolPlan/patrolPlanAddMember.vue

@@ -6,7 +6,7 @@
 			<view class="lab_title">
 				<view class="lab_title_n">
 					<view class="lab_title_r_btn" @click="searchBtn">
-						<img src="@/images/Version3.3.3/icon_aqjc_ss.png"/>
+						<img src="@/pages_safetyExamine/images/icon_aqjc_ss.png"/>
 					</view>
 					<input type="text" v-model="getData.groupName" placeholder="请输入巡查组名称" maxlength="50" placeholder-style="color: #CCCCCC;font-size:26rpx;">
 				</view>
@@ -14,7 +14,7 @@
 			<view class="list">
 				<view class="list_li" v-for="(item,index) in  dataList" :key="index" @click="labSelete(index)">
 					<text :class="item.type?'color_B':'color_A'">{{item.groupName}}</text>
-					<img v-if="item.type" src="@/images/Version3.3.3/icon_xzwt_xz.png">
+					<img v-if="item.type" src="@/pages_safetyExamine/images/icon_xzwt_xz.png">
 				</view>
 			</view>
 		</view>
@@ -114,21 +114,35 @@ export default {
 	  async submitForm(){
 	  	let _this = this;
 		let id=this.seleteListMember[0].id
+		this.form.checkMemberDtoList=[];
 		
 		this.$set(this.form,'checkGroupId',this.seleteListMember[0].id)
 		this.$set(this.form,'checkGroupName',this.seleteListMember[0].groupName)
 	  	const {data} = await checkGroupDetail({id:id,selectEnable:'1'});
 	  	if(data.code == 200){
-	  	    this.$set(this.form,'checkMemberDtoList',data.data.checkGroupMemberList)
-			console.log(this.pageType)
+			let obj={};
+			for(let i=0;i<data.data.checkGroupMemberList.length;i++){
+				 obj={
+					"deptId":data.data.checkGroupMemberList[i].deptId,
+					"deptName":data.data.checkGroupMemberList[i].deptName,
+					"enable":data.data.checkGroupMemberList[i].enable,
+					"jobNum":data.data.checkGroupMemberList[i].jobNum,
+					"name":data.data.checkGroupMemberList[i].name,
+					"userId":data.data.checkGroupMemberList[i].userId,
+					"userType":data.data.checkGroupMemberList[i].userType
+				}
+				this.form.checkMemberDtoList.push(obj)	
+			}
+			
+			
 			
 			if(this.pageType==1){
 				uni.redirectTo({
-				    url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanAdd?form='+encodeURIComponent(JSON.stringify(this.form))
+				    url: '/pages_safetyExamine/patrolPlan/patrolPlanAdd?form='+encodeURIComponent(JSON.stringify(this.form))
 				});
 			}else if(this.pageType==2){
 				uni.redirectTo({
-				    url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanEdit?form='+encodeURIComponent(JSON.stringify(this.form))
+				    url: '/pages_safetyExamine/patrolPlan/patrolPlanEdit?form='+encodeURIComponent(JSON.stringify(this.form))
 				});
 			}
 			

pages/pages_safetyExamine/patrolPlan/patrolPlanDetail.vue

@@ -19,12 +19,12 @@
 			<picker @change="collegeChange" :value="collegeIndex" :range="collegeArray" class="lab_title_l">
 				<view class="lab_title_l_n">
 					<view>{{collegeArray[collegeIndex]}}</view>
-					<img src="@/images/Version3.3.3/icon_06.png">
+					<img src="@/pages_safetyExamine/images/icon_06.png">
 				</view>
 			</picker>
 			<view class="lab_title_r">
 				<view class="lab_title_r_btn" @click="searchBtn">
-					<img src="@/images/Version3.3.3/icon_aqjc_ss.png"/>
+					<img src="@/pages_safetyExamine/images/icon_aqjc_ss.png"/>
 				</view>
 				<input type="text" v-model="getData.name" placeholder="请输入实验室名称" maxlength="50" placeholder-style="color: #CCCCCC;font-size:26rpx;">
 			</view>
@@ -65,9 +65,9 @@
 					<text>点击文件标题查看</text>
 				</view>
 				<view class="attachment_li">
-					<img src="@/images/Version3.3.3/icon_djc_wj.png"/>
+					<img src="@/pages_safetyExamine/images/icon_djc_wj.png"/>
 					<text>文件标题文件标题</text>
-					<img class="attachment_li_del" src="@/images/Version3.3.3/icon_fjgk_sc.png"/>
+					<img class="attachment_li_del" src="@/pages_safetyExamine/images/icon_fjgk_sc.png"/>
 				</view>
 			</view>
 			<view class="patrol_group">
@@ -76,7 +76,7 @@
 					<view class="patrol_r">校级巡查组</view>
 				</view>
 				<view class="list">
-					<view class="list_title"><img src="@/images/Version3.3.3/icon_jcjh_cy.png">成员</view>
+					<view class="list_title"><img src="@/pages_safetyExamine/images/icon_jcjh_cy.png">成员</view>
 					<view class="list_header"><text>工号</text><text>姓名</text></view>
 					<view class="list_li"><text>12345678</text><text>刘洋</text></view>
 					<view class="list_li"><text>12345678</text><text>刘洋</text></view>
@@ -90,7 +90,7 @@
 				<view class="list_three_li" v-for="(item,index) in  dataList" :key="index">
 					<view class="list_three_li_t">
 						<view class="list_three_li_t_l">
-							<img src="@/images/Version3.3.3/icon_xyxc_qx.png"/>
+							<img src="@/pages_safetyExamine/images/icon_xyxc_qx.png"/>
 							<text></text>
 						</view>
 						<view class="list_three_li_t_c">实验室名称-房间号</view>
@@ -106,7 +106,7 @@
 						</view>
 					</view>
 					<view class="list_three_li_b">
-						<img src="@/images/Version3.3.3/icon_djcsys.png"/>
+						<img src="@/pages_safetyExamine/images/icon_djcsys.png"/>
 						<text>整改进度：</text>
 						<text>待检查22/待复核1/已完成/暂无法整改</text>
 					</view>

pages/pages_safetyExamine/patrolPlan/patrolPlanEdit.vue

@@ -19,12 +19,12 @@
 			<picker @change="collegeChange" :value="collegeIndex" :range="collegeArray" class="lab_title_l">
 				<view class="lab_title_l_n">
 					<view>{{getData.deptName?getData.deptName:'选择学院'}}</view>
-					<img src="@/images/Version3.3.3/icon_06.png">
+					<img src="@/pages_safetyExamine/images/icon_06.png">
 				</view>
 			</picker>
 			<view class="lab_title_r">
 				<view class="lab_title_r_btn" @click="searchBtn">
-					<img src="@/images/Version3.3.3/icon_aqjc_ss.png"/>
+					<img src="@/pages_safetyExamine/images/icon_aqjc_ss.png"/>
 				</view>
 				<input type="text" v-model="getData.searchValue" placeholder="请输入实验室名称" maxlength="50" placeholder-style="color: #CCCCCC;font-size:26rpx;">
 				<view class="clear" @click="clearBtn">清除</view>
@@ -70,7 +70,7 @@
 					<picker @change="scopeChange" :value="scopeIndex" :range="scopeArray" class="scope_r">
 						<view class="scope_r_n">
 							<view>{{scopeArray[scopeIndex]}}</view>
-							<img src="@/images/Version3.3.3/icon_06.png">
+							<img src="@/pages_safetyExamine/images/icon_06.png">
 						</view>
 					</picker>
 				</view>
@@ -87,10 +87,10 @@
 					<text>材料附件</text>
 					<text>点击文件标题查看</text>
 				</view>
-				<view class="attachment_li" v-for="item in form.uploadDtoList">
-					<img src="@/images/Version3.3.3/icon_djc_wj.png"/>
-					<text @click="attachmentPreview(item)">{{item.fileName}}</text>
-					<img class="attachment_li_del" src="@/images/Version3.3.3/icon_fjgk_sc.png"/>
+				<view class="attachment_li"   v-for="item in form.uploadDtoList">
+					<img  src="@/pages_safetyExamine/images/icon_djc_wj.png"/>
+					<text  @click="attachmentPreview(item)">{{item.fileName}}</text>
+					<img  @click="attachmentDle(item)" class="attachment_li_del" src="@/pages_safetyExamine/images/icon_fjgk_sc.png"/>
 				</view>
 			</view>
 			<view class="patrol_group" v-if="form.checkType==1">
@@ -98,11 +98,11 @@
 					<view class="patrol_l">巡查组</view>
 					<view class="patrol_r_n" @click="patrolChange">
 						<view>{{form.checkGroupName?form.checkGroupName:'请选择巡查组'}}</view>
-						<img src="@/images/Version3.3.3/icon_06.png">
+						<img src="@/pages_safetyExamine/images/icon_06.png">
 					</view>
 				</view>
 				<view class="list">
-					<view class="list_title"><img src="@/images/Version3.3.3/icon_jcjh_cy.png">成员</view>
+					<view class="list_title"><img src="@/pages_safetyExamine/images/icon_jcjh_cy.png">成员</view>
 					<view class="list_header"><text>工号</text><text>姓名</text></view>
 					<view class="list_li" v-for="(item,index) in form.checkMemberDtoList"><text>12345678</text><text>{{item.name}}</text></view>
 					<view class="list_bottom" v-if="form.checkMemberDtoList.length==0">无数据</view>
@@ -114,9 +114,9 @@
 				<view class="list_three_li" v-for="(item,index) in  dataList" :key="index" @click="handleClick(item,'detail')">
 					<view class="list_three_li_t">
 						<view class="list_three_li_t_l">
-							<img v-if="item.checkRange==1" src="@/images/Version3.3.3/icon_xyxc_qx.png"/>
-							<img v-if="item.checkRange==2" src="@/images/Version3.3.3/icon_xyxc_xy.png"/>
-							<img v-if="item.checkRange==3" src="@/images/Version3.3.3/icon_xyxc_sys.png"/>
+							<img v-if="item.checkRange==1" src="@/pages_safetyExamine/images/icon_xyxc_qx.png"/>
+							<img v-if="item.checkRange==2" src="@/pages_safetyExamine/images/icon_xyxc_xy.png"/>
+							<img v-if="item.checkRange==3" src="@/pages_safetyExamine/images/icon_xyxc_sys.png"/>
 							<text></text>
 						</view>
 						<view class="list_three_li_t_c">{{item.subjectName}}-{{item.roomNumber}}</view>
@@ -134,7 +134,7 @@
 						</view>
 					</view>
 					<view class="list_three_li_b" v-if="item.manageStatus==2">
-						<img src="@/images/Version3.3.3/icon_djcsys.png"/>
+						<img src="@/pages_safetyExamine/images/icon_djcsys.png"/>
 						<text>整改进度：</text>
 						<text>{{item.rectifySchedule}}</text>
 					</view>
@@ -142,7 +142,7 @@
 			</view>
 		</view>
 	</scroll-view>	
-	<view class="bottom_btn" @click="submitForm()">保存</view>
+	<view class="bottom_btn" v-if="form.checkStatus==1" @click="submitForm()">保存</view>
 	 <!-- 选择学院-->
 	<view class="shade" v-if="dialogVisible">
 		<view class="null-box" @click="dialogClose()"></view>
@@ -151,7 +151,7 @@
 			<view class="shade_n_b">
 				<view class="shade_n_b_li" v-for="(item,index) in  collegeList" :key="index" @click="collegeSelete(index)">
 					<text :class="item.type?'color_B':'color_A'">{{item.deptName}}</text>
-					<img v-if="item.type" src="@/images/Version3.3.3/icon_xzwt_xz.png">
+					<img v-if="item.type" src="@/pages_safetyExamine/images/icon_xzwt_xz.png">
 				</view>
 			</view>
 		</view>
@@ -266,6 +266,10 @@ export default {
 			this.dataList=[];
 			this.getList()
 		},
+		//删除附件
+		attachmentDle(item){
+			this.form.uploadDtoList.splice(this.form.uploadDtoList.indexOf(item),1);
+		},
 		attachmentPreview(item){
 			uni.showLoading({
 				title: '下载中'
@@ -284,31 +288,6 @@ export default {
 						console.log('打开文档成功')
 					  }
 					})
-					// console.log("resresresresresres",res)
-					// const fileManager = wx.getFileSystemManager()
-					// const filePath = wx.env.USER_DATA_PATH + '/' + item.fileName
-					// console.log('filePath',filePath);
-					// fileManager.saveFile({
-					// 	tempFilePath: res.tempFilePath,
-					// 	filePath,
-					// 	success: () => {
-					// 		uni.hideLoading();
-					// 		wx.openDocument({
-					// 			filePath: filePath,
-					// 			showMenu: true,
-					// 			fileType: fileType.type
-					// 		})
-					// 	},
-					// 	fail: function (res){
-					// 		uni.hideLoading();
-					// 		uni.showToast({
-					// 			title: '下载失败',
-					// 			icon:"none",
-					// 			mask:true,
-					// 			duration: 2000
-					// 		});
-					// 	}
-					// })
 				},
 				fail: function (res){
 					uni.hideLoading();
@@ -362,7 +341,7 @@ export default {
 		},
 	    //开始时间选中事件
 	    startChange(form,e){
-	    	if(new Date(e.target.value).getTime()>=new Date(form.cycleEndTime).getTime()){
+	    	if(new Date(e.target.value).getTime()>new Date(form.cycleEndTime).getTime()){
 	    		 uni.showToast({
 	    			title: '结束时间不能小于开始时间',
 	    			icon:"none",
@@ -482,7 +461,7 @@ export default {
 			this.form.tiemQuickList=this.tiemQuickList//检查周期快捷存储
 			this.form.scopeIndex=this.scopeIndex//检查范围
 			uni.navigateTo({
-			    url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanAddMember?form='+encodeURIComponent(JSON.stringify(this.form))+'&pageType=2'
+			    url: '/pages_safetyExamine/patrolPlan/patrolPlanAddMember?form='+encodeURIComponent(JSON.stringify(this.form))+'&pageType=2'
 			});
 		},
 		//选择学院或者实验室
@@ -494,7 +473,7 @@ export default {
 			    this.form.tiemQuickList=this.tiemQuickList//检查周期快捷存储
 			    this.form.scopeIndex=this.scopeIndex//检查范围
 				uni.navigateTo({
-				    url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanAddLab?form='+encodeURIComponent(JSON.stringify(this.form))+'&pageType=2'
+				    url: '/pages_safetyExamine/patrolPlan/patrolPlanAddLab?form='+encodeURIComponent(JSON.stringify(this.form))+'&pageType=2'
 				});
 			}
 		},
@@ -599,7 +578,7 @@ export default {
 			  console.log(11)
 		  }else if(doType=='detail'){//详情
 			  uni.navigateTo({
-			      url: '/pages/pages_safetyExamine/examineManage/examineDetail?id='+item.id+'&manageStatus='+item.manageStatus
+			      url: '/pages_safetyExamine/examineManage/examineDetail?id='+item.id+'&manageStatus='+item.manageStatus
 			  });
 		  }
 		  
@@ -617,7 +596,7 @@ export default {
 			        duration: 2000
 			    });
 				uni.redirectTo({
-					url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanList?pageType='+this.form.checkType
+					url: '/pages_safetyExamine/patrolPlan/patrolPlanList?pageType='+this.form.checkType
 				});
 			   
 			}

pages/pages_safetyExamine/patrolPlan/patrolPlanList.vue

@@ -11,7 +11,7 @@
 		<view>
 			<view class="search">
 				<view class="search_btn"  @click="searchBtn">
-					<img src="@/images/Version3.3.3/icon_aqjc_ss.png"/>
+					<img src="@/pages_safetyExamine/images/icon_aqjc_ss.png"/>
 				</view>
 				<input type="text" v-model="getData.searchValue" placeholder="计划标题" maxlength="50" placeholder-style="color: #CCCCCC;font-size:26rpx;">
 			</view>
@@ -19,9 +19,9 @@
 				<view class="list_li" v-for="(item,index) in  dataList" :key="index" @click="handleClick(item,'edit')">
 					<view class="list_li_t">
 						<view class="list_li_t_l">
-							<img v-if="item.checkRange==1" src="@/images/Version3.3.3/icon_xyxc_qx.png"/>
-							<img v-if="item.checkRange==2" src="@/images/Version3.3.3/icon_xyxc_xy.png"/>
-							<img v-if="item.checkRange==3" src="@/images/Version3.3.3/icon_xyxc_sys.png"/>
+							<img v-if="item.checkRange==1" src="@/pages_safetyExamine/images/icon_xyxc_qx.png"/>
+							<img v-if="item.checkRange==2" src="@/pages_safetyExamine/images/icon_xyxc_xy.png"/>
+							<img v-if="item.checkRange==3" src="@/pages_safetyExamine/images/icon_xyxc_sys.png"/>
 							<text></text>
 						</view>
 						<view class="list_li_t_c">{{item.title}}</view>
@@ -38,7 +38,7 @@
 						</view>
 					</view>
 					<view class="list_li_b">
-						<img src="@/images/Version3.3.3/icon_djcsys.png"/>
+						<img src="@/pages_safetyExamine/images/icon_djcsys.png"/>
 						<text v-if="item.checkStatus==1">待检查实验室：</text>
 						<text v-if="item.checkStatus==1">{{item.subjectNum}}间</text>
 						<text v-if="item.checkStatus==2 || item.checkStatus==3">检查进度：</text>
@@ -132,11 +132,11 @@ export default {
 		  
 		  if( doType=='subBtn'){//发起巡查计划	
 			 uni.redirectTo({
-			     url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanAdd?pageType='+this.getData.checkType
+			     url: '/pages_safetyExamine/patrolPlan/patrolPlanAdd?pageType='+this.getData.checkType
 			 });
 		  }else if(doType=='edit'){//编辑
 			  uni.redirectTo({
-			      url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanEdit?pageType='+row.checkType+'&id='+row.id
+			      url: '/pages_safetyExamine/patrolPlan/patrolPlanEdit?pageType='+row.checkType+'&id='+row.id
 			  });
 		  }
 		  

pages/pages_safetyExamine/snapshotManage/snapshotAdd.vue

@@ -1,18 +1,19 @@
 <!-- 随手拍-添加 -->
 <template>
   <view class="examine">
+	  <view class="header"  @click="handleClick('manage')">
+	  	<text>随手拍管理</text>
+	  	<img src="@/pages_safetyExamine/images/icon_04.png">
+	  </view>
 	<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
-		<view class="header"  @click="handleClick('manage')">
-			<text>随手拍管理</text>
-			<img src="@/images/Version3.3.3/icon_04.png">
-		</view>
+		
 		<view class="basics">
 			<view class="basics_li">
 				<view class="basics_li_l">学院</view>
 				<picker @change="collegeChange" :value="collegeIndex" :range="collegeArray" class="scope_r">
 					<view class="basics_li_r college_r">
 						<view>{{form.deptName?form.deptName:'选择学院'}}</view>
-						<img src="@/images/Version3.3.3/icon_06.png">
+						<img src="@/pages_safetyExamine/images/icon_06.png">
 					</view>
 				</picker>
 			</view>
@@ -21,7 +22,7 @@
 				<view class="basics_li_r lab_r">
 					<input class="picker-text" @click="popupClick(1)" type="text" disabled v-model="form.subName" placeholder="请选择房间" placeholder-style="font-size: 30rpx;color:#333;">
 					<view class="img-box" @click.stop="saoCode">
-						<img src="@/images/Version3.3.3/icon_aqjc_sm.png">
+						<img src="@/pages_safetyExamine/images/icon_aqjc_sm.png">
 					</view>
 				</view>
 			</view>
@@ -48,7 +49,7 @@
 		<view class="popup-big-box">
 			<view class="popup-input-box">
 				<input type="text" maxlength="10" v-model="room" placeholder="请输入房间号">
-				<view @click="getSelectInfoByRoom">搜索</view>
+				<view @click="buildBySub">搜索</view>
 			</view>
 			<view class="popup-for-max-box">
 				<view class="popup-for-null" v-if="!roomList[0]">暂无数据</view>
@@ -66,7 +67,7 @@
 
 <script>
 import { config } from '@/api/request/config.js'
-import { getSelectInfoByRoom,conditionCollegeInfo,checkClapAdd,subjectList} from '@/api/index.js'
+import { buildBySub,conditionCollegeInfo,checkClapAdd,subjectList,getUserCollegCheck,listDepartments} from '@/api/index.js'
 export default {
   name: "rectifyList",
   components: {
@@ -117,7 +118,8 @@ export default {
 	  
   },
   mounted(){
-	  this.conditionCollegeInfo();
+	  this.listDepartments();
+	  this.getUserCollegCheck();
   },
   methods: {
 		//滚动事件
@@ -125,12 +127,12 @@ export default {
 	    handleClick(doType){
 		  let self=this;
 		  if( doType=='manage'){//随手拍管理
-			  uni.navigateTo({
-			      url: '/pages/pages_safetyExamine/snapshotManage/snapshotList?pageType=1'
+			  uni.redirectTo({
+			      url: '/pages_safetyExamine/snapshotManage/snapshotList?pageType=1'
 			  });
 		  }else if(doType=='self'){//随手拍上报记录
-			  uni.navigateTo({
-			      url: '/pages/pages_safetyExamine/snapshotManage/snapshotList?pageType=2'
+			  uni.redirectTo({
+			      url: '/pages_safetyExamine/snapshotManage/snapshotList?pageType=2'
 			  });
 		  }else if(doType=='subBtn'){//提交
 			  
@@ -155,12 +157,12 @@ export default {
 		        return
 		    }
 		    wx.chooseImage({
-		        count: 1,
+		        count: 5,
 		        sizeType: ["original", "compressed"],
 		        sourceType: ["album", "camera"],
 		        success: function(res) {
-		            let tempFilePaths = res.tempFilePaths[0];
-		            self.uploadImg(tempFilePaths);
+		            //let tempFilePaths = res.tempFilePaths[0];
+		            self.uploadImg(res.tempFilePaths);
 		        }
 		    });
 		},
@@ -170,34 +172,38 @@ export default {
 		        title: '上传中',
 		        mask: true
 		    });
-		    uni.uploadFile({
-		        url: config.base_url+'/base/file/upload', //仅为示例，非真实的接口地址
-		        header:{'Authorization':uni.getStorageSync('token')},
-		        filePath: tempFilePaths,
-		        name: 'file',
-		        formData: {
-		            'user': 'test'
-		        },
-		        success: (uploadFileRes) => {
-		            let res = JSON.parse(uploadFileRes.data);
-					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,
-							icon:"none",
-							mask:true,
-							duration: 2000
-						});
-					}
-		        },
-		        fail: err => {},
-		        complete: () => {
-		            uni.hideLoading()
-		        }
-		    });
+			for(let i=0;i<tempFilePaths.length;i++){
+				console.log(tempFilePaths[i])
+				uni.uploadFile({
+				    url: config.base_url+'/base/file/upload', //仅为示例，非真实的接口地址
+				    header:{'Authorization':uni.getStorageSync('token')},
+				    filePath: tempFilePaths[i],
+				    name: 'file',
+				    formData: {
+				        'user': 'test'
+				    },
+				    success: (uploadFileRes) => {
+				        let res = JSON.parse(uploadFileRes.data);
+						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,
+								icon:"none",
+								mask:true,
+								duration: 2000
+							});
+						}
+				    },
+				    fail: err => {},
+				    complete: () => {
+				        uni.hideLoading()
+				    }
+				});
+			}
+		    
 		},
 		//删除图片
 		delImg(minIndex){
@@ -215,7 +221,7 @@ export default {
 			}
 		},
 		//搜索房间接口
-		async getSelectInfoByRoom(){
+		async buildBySub(){
 			let self = this;
 			if(!this.room){
 				uni.showToast({
@@ -226,7 +232,7 @@ export default {
 				});
 				return
 			}
-			const {data} = await getSelectInfoByRoom(this.room);
+			const {data} = await buildBySub({'name':this.room,'deptId':this.form.deptId});
 			if(data.code==200){
 				if(data.data[0]){
 					this.roomList = data.data;
@@ -245,6 +251,12 @@ export default {
 			console.log(item)
 			this.$set(this.form,"subId",item.id)
 			this.$set(this.form,"subName",item.name)
+			this.$set(this.form,"deptId",item.deptId)
+			for(let i=0;i<this.collegeList.length;i++){
+				if(item.deptId==this.collegeList[i].deptId){
+					this.$set(this.form,"deptName",this.collegeList[i].deptName)
+				}
+			}
 			this.popupType = false;
 		},
 		//调用摄像头
@@ -261,7 +273,7 @@ export default {
 						if(codeRoom){
 							self.roomList = [];
 							self.room = codeRoom;
-							self.getSelectInfoByRoom();
+							self.buildBySub();
 							self.popupType = true;
 						}else{
 							uni.showToast({
@@ -282,10 +294,20 @@ export default {
 				}
 			});
 		},
+		
+		//查询用户身份信息
+		async getUserCollegCheck(){
+			let _this = this;
+			const {data} = await getUserCollegCheck();
+			if(data.code == 200){
+				this.form.deptId=data.data.dept.deptId;
+				this.form.deptName=data.data.dept.deptName;
+			}
+		},
 		//查询学院列表
-		async conditionCollegeInfo(){
+		async listDepartments(){
 			let _this = this;
-			const {data} = await conditionCollegeInfo();
+			const {data} = await listDepartments();
 			if(data.code == 200){
 					
 				for(let i=0;i<data.data.length;i++){
@@ -306,7 +328,7 @@ export default {
 			        duration: 2000
 			    });
 				uni.redirectTo({
-					  url: '/pages/pages_safetyExamine/snapshotManage/snapshotList?pageType=2'
+					  url: '/pages_safetyExamine/snapshotManage/snapshotList?pageType=2'
 				});
 			   
 			}
@@ -422,7 +444,7 @@ export default {
 					>img{
 						width:30rpx;
 						height:28rpx;
-						margin:16rpx 18rpx 0 0;
+						margin:26rpx 18rpx 0 0;
 					}
 				}
 			}

pages/pages_safetyExamine/snapshotManage/snapshotDetail.vue

@@ -103,7 +103,7 @@ export default {
 		baseUrl:config.base_url,
 		id:'',
 		rectifyStatus:'',//整改状态，0是待整改，1是已整改，2是暂无法整改
-		pageType:2,
+		pageType:0,
 		form:{
 			id:'',
 			rectifyStatus:1,//0待整改 1已整改 2暂无法整改
@@ -119,7 +119,10 @@ export default {
   onLoad(option) {
 	  console.log(option.id)
 	  if(option.id){
-		   this.id=option.id
+		this.id=option.id
+	  }
+	  if(option.pageType){
+	  	this.pageType=option.pageType
 	  }
 	  if(option.rectifyStatus){
 		  this.rectifyStatus=option.rectifyStatus
@@ -269,7 +272,7 @@ export default {
 			        duration: 2000
 			    }); 
 				uni.redirectTo({
-					url: '/pages/pages_safetyExamine/snapshotManage/snapshotList?pageType=2'
+					url: '/pages_safetyExamine/snapshotManage/snapshotList?pageType='+this.pageType
 				});
 			   
 			}

pages/pages_safetyExamine/snapshotManage/snapshotList.vue

@@ -29,7 +29,7 @@
 				</view>
 				<view class="list_three_li_b">
 					<view class="list_three_li_b_l">
-						<img src="@/images/Version3.3.3/icon_ssp_ry.png"/>
+						<img src="@/pages_safetyExamine/images/icon_ssp_ry.png"/>
 						<text>上报人：{{item.createName}}</text>
 					</view>
 					<view class="list_three_li_b_r">{{item.createTime}}</view>
@@ -132,8 +132,8 @@ export default {
 		  if( doType=='subBtn'){//	
 		  
 		  }else if(doType=='detail'){//详情
-			  uni.navigateTo({
-			  	 url: '/pages/pages_safetyExamine/snapshotManage/snapshotDetail?id='+item.id+'&rectifyStatus='+this.getData.rectifyStatus
+			  uni.redirectTo({
+			  	 url: '/pages_safetyExamine/snapshotManage/snapshotDetail?id='+item.id+'&rectifyStatus='+this.getData.rectifyStatus+'&pageType='+this.pageType
 			  })
 		  }