heyang

pages/views/teacherPage/teacherHome.vue

@@ -153,7 +153,10 @@
 
 				} else if (type == 'securityCheck') {
 					//安全检查
-					if(this.identityData){
+					uni.navigateTo({
+						url: "/pages_safetyCheck/views/safetyCheck",
+					});
+					/* if(this.identityData){
 						uni.navigateTo({
 							url: "/pages_safetyCheck/views/safetyCheck",
 						});
@@ -165,7 +168,7 @@
 							title: '您不是校/院级管理员或督导组成员,无法使用该功能.',
 							duration: 2000
 						});
-					}
+					} */
 				} else if (type == 'securityExamination') {
 					//安全考试
 

pages_safetyCheck/api/index.js

@@ -73,9 +73,9 @@ export const securityAppCheckPlanTitleList = (data) => {
     })
 };
 //获取分级列表
-export const laboratoryClassLevelGetList = (data) => {
+export const laboratoryLevelConfigGetWebLevelTitleList = (data) => {
 	return apiResquest({
-		url: `/laboratory/classLevel/getList`,
+		url: `/laboratory/levelConfig/getWebLevelTitleList`,
 		method: 'POST',
 		data: { ...data }
 	})

pages_safetyCheck/views/inspectManage/hiddenDangerRecord.vue

@@ -36,7 +36,7 @@
 				// 查询参数
 				queryParams: {
 					page: 1,
-					pageSize: 10,
+					pageSize: 20,
 				},
 				total:0,
 				getDataType: false,
@@ -86,8 +86,13 @@
 			},
 			clickInfo(row){
 				let infoData = this.optionData;
+				
 				if(row.flagType==1){
 					//检查时间
+					infoData.checkPlanSetVoList.planId=row.planId;
+					infoData.checkPlanSetVoList.planSetId=row.planSetId;
+					infoData.subId=row.subId;
+					infoData.hazardCheckPro=row.hazardCheckPro;
 					uni.navigateTo({
 						url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail?infoData=' +
 							encodeURIComponent(JSON

pages_safetyCheck/views/inspectManage/inspectAdd.vue

@@ -9,7 +9,7 @@
 				</view>
 				<view class="items-b">＜ {{newData.hazardCheckCode2}} {{newData.hazardCheckName2}} ＜</view>
 			</view>
-			<view class="items-number">此检查项在当前实验室累计出现<text>{{hazardCheckNum}}</text>次隐患</view>
+			<view class="items-number" >此检查项在当前实验室累计出现<text>{{hazardCheckNum}}</text>次隐患</view>
 			<view class="list">
 				<view class="list-li">
 					<view>检查要点</view>
@@ -159,6 +159,16 @@
 			this.securityAppCheckPhotoGetCheckNumBySub();
 		},
 		methods: {
+			hiddenDangerClick(row) {
+				if(!this.hiddenDangerRecordStatus){
+					let infoData = this.optionData;
+					infoData.hiddenDangerRecordStatus = true;//判断是否跳转隐患列表
+					uni.redirectTo({
+						url: '/pages_safetyCheck/views/inspectManage/hiddenDangerRecord?infoData=' +
+							encodeURIComponent(JSON.stringify(infoData))
+					});
+				}
+			},
 			//获取提交详情
 			async securityAppCheckPlanCheckInfo() {
 				let obj = {
@@ -212,7 +222,7 @@
 			},
 			//提交
 			async submitForm(status) {
-				if(!this.form.checkFlag){
+				if(!this.form.checkFlag || status==2){
 					if(!this.form.hazardDescribe){
 						uni.showToast({
 							title: '请填写隐患描述!',
@@ -261,22 +271,6 @@
 					}
 					let infoData = this.optionData;
 					infoData.itemsStatus = status==1?2:0;
-					/* let infoData = {
-						setOptionId:this.setOptionId,
-						manageId:this.manageId,
-						subId:this.subId,
-						hazardCheckPro:this.hazardCheckPro,
-						pageType:this.pageType,
-						itemsStatus:status==1?2:0,
-						checkPlanSetVoList:this.optionData.checkPlanSetVoList,
-						checkCategory:this.optionData.checkCategory,
-						planTitle:this.optionData.planTitle,
-						checkTypeName:this.optionData.checkTypeName,
-						crossCheck:this.optionData.crossCheck,
-						subName:this.optionData.subName,
-						roomNum:this.optionData.roomNum,
-						subRoom:this.optionData.subRoom,
-					}; */
 					uni.redirectTo({
 						url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail?infoData=' + encodeURIComponent(JSON
 							.stringify(infoData))

pages_safetyCheck/views/inspectManage/inspectList.vue

@@ -61,10 +61,10 @@
 						<img src="@/pages_safetyCheck/images/icon_ssp_gd@1x.png">
 					</view>
 				</view>
-				<view class="get-data-p" v-if="!getDataType">
+				<!-- <view class="get-data-p" v-if="!getDataType">
 					<img class="get-data-img" src="@/pages_safetyCheck/images/icon_aqjc_sl.png">
 					<view class="get-data-text">上拉加载</view>
-				</view>
+				</view> -->
 				<view class="get-data-null-p" v-if="getDataType">- 没有更多数据 -</view>
 			</view>
 		</scroll-view>
@@ -80,7 +80,7 @@
 	} from '@/pages/api/index.js'
 	import {
 		laboratorySubRelInfoGetRelList,
-		laboratoryClassLevelGetList,
+		laboratoryLevelConfigGetWebLevelTitleList,
 		securityAppCheckManageList,
 		securityAppCheckDangerGetCheckDangerSubList,
 		securityAppCheckDangerReviewSubList,
@@ -120,7 +120,7 @@
 				// 查询参数
 				queryParams: {
 					page: 1,
-					pageSize: 10,
+					pageSize: 20,
 				},
 				dataList: [],
 				total: 0,
@@ -142,7 +142,7 @@
 		},
 		created() {
 			this.systemDeptDropList();
-			this.laboratoryClassLevelGetList();
+			this.laboratoryLevelConfigGetWebLevelTitleList();
 		},
 		mounted() {
 			let self = this;
@@ -386,11 +386,14 @@
 				}
 			},
 			//获取分级
-			async laboratoryClassLevelGetList() {
+			async laboratoryLevelConfigGetWebLevelTitleList() {
 				const {
 					data
-				} = await laboratoryClassLevelGetList({});
+				} = await laboratoryLevelConfigGetWebLevelTitleList({});
 				if (data.code == 200) {
+					data.data.forEach(function(item){
+						item.levelName=item.levelName.split('/')[0]
+					})
 					this.$set(this, 'levelList', data.data);
 				}
 			},

pages_safetyCheck/views/itemsManage/hiddenDangerItems.vue

@@ -76,7 +76,7 @@
 			<view class="get-data-null-p" v-if="getDataType">- 没有更多数据 -</view>
 		</scroll-view>
 		<checkItemModule :propsData="propsData" v-if="checkItemModuleType"></checkItemModule>
-		<view class="sub-btn" v-if="pageType==0 && total !=0">
+		<view class="sub-btn" v-if="pageType==0 && curTabTow==0 && curTabTow==2 && total !=0">
 			<view @click="submitBtn(1)">开展检查</view>
 			<view @click="submitBtn(2)">检查完成</view>
 		</view>
@@ -119,7 +119,7 @@
 				// 查询参数
 				queryParams: {
 					page: 1,
-					pageSize: 10,
+					pageSize: 20,
 				},
 				//符合/不符合
 				checkFlag: null,
@@ -332,14 +332,10 @@
 
 			},
 			hiddenDangerClick(row) {
-				let infoData = row;
+				let infoData = this.newData;
+				infoData.hazardCheckPro = row.hazardCheckPro; 
 				infoData.pageType = this.pageType;
 				infoData.itemsStatus = this.curTabTow;
-				infoData.checkCategory = this.newData.checkCategory;
-				infoData.checkPlanSetVoList = this.newData.checkPlanSetVoList;
-				infoData.subName = this.newData.subName;
-				infoData.roomNum = this.newData.roomNum;
-				infoData.subRoom = this.newData.subRoom;
 				infoData.hiddenDangerRecordStatus = true; //判断是否跳转隐患列表
 				uni.redirectTo({
 					url: '/pages_safetyCheck/views/inspectManage/hiddenDangerRecord?infoData=' +

pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail.vue

@@ -36,7 +36,10 @@
 				<view v-if="newData.checkCollapse">
 					<view class="hidden-content" v-if="!newData.checkFlag">{{newData.hazardDescribe}}
 					</view>
-					<view class="photo">
+					<view v-if="pageType==0" class="photo" @click="lockImg(newData.photoList)">
+						<img v-for="(item,index) in newData.photoList" :src="baseUrl+item.fileUrl">
+					</view>
+					<view v-if="pageType==1 || pageType==2" class="photo" @click="lockImg(newData.yhDtoList)">
 						<img v-for="(item,index) in newData.yhDtoList" :src="baseUrl+item.fileUrl">
 					</view>
 					<view class="list-li">
@@ -98,7 +101,7 @@
 				</view>
 			</view>
 		</scroll-view>
-		<view class="sub-btn" v-if="pageType==0 && !newData.checkFlag && !hiddenDangerRecordStatus">
+		<view class="sub-btn" v-if="pageType==0 && newData.checkSetProgress !=100 && !hiddenDangerRecordStatus">
 			<view @click="submitBtn(1)">编辑</view>
 			<view @click="submitBtn(2)">继续检查</view>
 		</view>
@@ -106,7 +109,7 @@
 			<view @click="submitBtn(1)">编辑</view>
 			<view @click="submitBtn(2)">继续复查</view>
 		</view>
-		<view class="sub-btn" v-if="pageType==2 && !hiddenDangerRecordStatus">
+		<view class="sub-btn" v-if="pageType==2 && !hiddenDangerRecordStatus && !newData.finishRectify">
 			<view @click="submitBtn(1)">编辑</view>
 			<view @click="submitBtn(2)">继续整改</view>
 		</view>
@@ -184,13 +187,11 @@
 					//保存草稿详情
 					this.securityDraftFindBySetOptionId();
 					
-					
 				}
 			}else if(this.pageType==1 || this.pageType==2){
 				//复查-整改
 				this.securityAppCheckDangerGetCheckProDetail();
 			}
-			
 			this.securityAppCheckPhotoGetCheckNumBySub();
 		},
 		methods: {
@@ -304,16 +305,6 @@
 					//编辑
 					if(this.pageType==0){
 						//检查
-						/* let infoData = {
-							setOptionId: this.setOptionId,
-							manageId: this.manageId,
-							subId: this.subId,
-							hazardCheckPro: this.hazardCheckPro,
-							pageType: this.pageType,
-							itemsStatus: this.itemsStatus,
-							checkPlanSetVoList: this.optionData.checkPlanSetVoList,
-							editStatus:true,
-						}; */
 						let infoData = this.optionData;
 						infoData.editStatus = true;
 						uni.redirectTo({
@@ -359,19 +350,6 @@
 				} else if (status == 2) {
 					//继续检查
 					let infoData = this.optionData;
-					/* let infoData = {
-						subId: this.subId,
-						checkCategory:this.optionData.checkCategory,
-						planTitle:this.optionData.planTitle,
-						checkTypeName:this.optionData.checkTypeName,
-						crossCheck:this.optionData.crossCheck,
-						
-						subName: this.newData.subName,
-						roomNum: this.newData.roomNum,
-						manageId: this.manageId,
-						checkPlanSetVoList: this.optionData.checkPlanSetVoList,
-						pageType: this.pageType,
-					}; */
 
 					uni.redirectTo({
 						url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItems?infoData=' +
@@ -387,7 +365,7 @@
 				}
 				let urlList = [];
 				for (let i = 0; i < list.length; i++) {
-					urlList.push(config.base_url + list[i].photoUrl)
+					urlList.push(config.base_url + list[i].fileUrl)
 				}
 				wx.previewImage({
 					urls: urlList, //需要预览的图片http链接列表，多张的时候，url直接写在后面就行了

pages_safetyCheck/views/itemsManage/hiddenDangerRectification.vue

@@ -34,7 +34,7 @@
 				<view v-if="newData.checkCollapse">
 					<view class="hidden-content" v-if="!newData.checkFlag">{{newData.hazardDescribe}}
 					</view>
-					<view class="photo">
+					<view class="photo" @click="lockImg(newData.yhDtoList)">
 						<img v-for="(item,index) in newData.yhDtoList" :src="baseUrl+item.fileUrl">
 					</view>
 					<view class="list-li">
@@ -270,6 +270,23 @@
 						encodeURIComponent(JSON.stringify(infoData))
 				});
 			},
+			//图片预览
+			lockImg(list) {
+				if (!list[0]) {
+					return
+				}
+				let urlList = [];
+				for (let i = 0; i < list.length; i++) {
+					urlList.push(config.base_url + list[i].fileUrl)
+				}
+				wx.previewImage({
+					urls: urlList, //需要预览的图片http链接列表，多张的时候，url直接写在后面就行了
+					current: '', // 当前显示图片的http链接，默认是第一个
+					success: function(res) {},
+					fail: function(res) {},
+					complete: function(res) {},
+				})
+			},
 			//滚动事件
 			scrollGet() {},
 			/******文件上传******/

pages_safetyCheck/views/snapshotManage/snapshotItems.vue

@@ -81,7 +81,7 @@
 				// 查询参数
 				queryParams: {
 					page: 1,
-					pageSize: 10,
+					pageSize: 20,
 				},
 				//符合/不符合
 				checkFlag: null,

pages_safetyCheck/views/snapshotManage/snapshotList.vue

@@ -144,7 +144,7 @@
 				// 查询参数
 				queryParams: {
 					page: 1,
-					pageSize: 10,
+					pageSize: 20,
 				},
 				total: 0,
 				dataList:[],