heyang

api/request/config.js

@@ -19,7 +19,7 @@ const config = {
 	// base_url: 'https://lab.zjznai.com/jndxlabSystem/', //暨大地址
 	// base_url: 'https://lab.zjznai.com/api/', //暨大化材
 	// base_url: 'https://lab.zjznai.com/kdwclabSystem/', //矿大文昌地址
-	// base_url: 'https://znyj.zjznai.suda.edu.cn/labSystem/', //苏大临时地址
+    //base_url: 'https://znyj.zjznai.suda.edu.cn/labSystem/', //苏大临时地址
 	// base_url: 'https://labcontrol.nwafu.edu.cn/api/', //西北农林
 	// base_url: 'http://172.16.0.65/api/', //西北农林
 	base_url: 'https://lab.zjznai.com/labapp/', //43测试

manifest.json

@@ -54,7 +54,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxc9180acf05b65dee",
+        "appid" : "wx60e12abd2e79c618",
         "setting" : {
             "urlCheck" : false,
             "minified" : true

pages_manage/views/laboratory/safetyCardScan.vue

@@ -33,7 +33,7 @@
 						</view>
 					</view>
 					<view class="lab-info-c-b">
-						{{newData.roomNum}}房间＆{{newData.buildName}}
+						{{newData.roomNum?newData.roomNum:'-'}}房间＆{{newData.buildName}}
 					</view>
 				</view>
 				<view class="lab-info-r">{{newData.subArea}}㎡</view>
@@ -101,7 +101,7 @@
 			<view class="shade_n">
 				<view class="title">
 					<view>{{dialogTtile}}</view>
-					<img src="@/pages_safetyCheck/images/icon_06.png">
+					<!-- <img src="@/pages_safetyCheck/images/icon_06.png"> -->
 				</view>
 				<view class="batch">
 					<view class="batch-li" @click="batchClick(item)" v-for="(item,index) in batchList">
@@ -245,6 +245,7 @@
 		},
 		methods: {
 			dialogClose() {
+				this.dialogStatus = 0;
 				this.dialogVisible = false;
 			},
 			//十六进制颜色值和RGB格式转换
@@ -298,23 +299,23 @@
 				const {
 					data
 				} = await securityAppCheckPlanAppTitleList(this.queryParams);
-				if (data.code == 200 && data.data.records[0]) {
+				if (data.code == 200) {
 					//循环过滤掉当前计划中批次中已经检查完成的
-					data.data.records.forEach(function(item,index){
-						let list=[];
-						item.checkPlanSetVoList.forEach(function(item2){
+					data.data.records.forEach(function(item, index) {
+						let list = [];
+						item.checkPlanSetVoList.forEach(function(item2) {
 							if (item2.checkSetProgress != 100) {
 								list.push(item2)
 							}
 						})
-						item.checkPlanSetVoList=list
+						item.checkPlanSetVoList = list
 					})
-					let list2=[]
+					let list2 = []
 					list2 = data.data.records.filter(function(item) {
-					  return item.checkPlanSetVoList.length!=0
+						return item.checkPlanSetVoList.length != 0
 					});
-					data.data.records=list2
-					
+					data.data.records = list2
+
 					if (data.data.records.length == 1) { //一个计划
 						if (data.data.records[0].checkPlanSetVoList.length == 1) { //1个批次
 							let planSetId = data.data.records[0]
@@ -339,20 +340,20 @@
 							this.dialogTtile = '批次';
 						}
 
+					} else if (data.data.records.length==0) {
+						this.dialogStatus = 0;
+						uni.showToast({
+							title: '该实验室暂无检查计划!',
+							icon: "none",
+							mask: true,
+							duration: 2000
+						});
+						return
 					} else { //多个计划
 						this.batchList = data.data.records;
 						this.dialogVisible = true;
 						this.dialogTtile = '计划标题';
 					}
-				} else {
-					this.dialogStatus = 0;
-					uni.showToast({
-						title: '该实验室暂无检查计划!',
-						icon: "none",
-						mask: true,
-						duration: 2000
-					});
-					return
 				}
 			},
 			//检查任务-在此结果里对比实验室Id判断是否有实验室
@@ -411,7 +412,7 @@
 						infoData.manageId = data.data.records[0].manageId;
 						infoData.setOptionId = data.data.records[0].setOptionId;
 						infoData.hazardCheckPro = data.data.records[0].hazardCheckPro;
-						uni.redirectTo({
+						uni.navigateTo({
 							url: '/pages_safetyCheck/views/inspectManage/conductInspections?infoData=' +
 								encodeURIComponent(
 									JSON
@@ -521,7 +522,7 @@
 					this.$set(this.form, "classTypeNames", this.newData.typeName)
 					this.$set(this.form, "levelId", this.newData.levelId)
 					this.$set(this.form, "classLevelName", this.newData.levelName)
-					uni.redirectTo({
+					uni.navigateTo({
 						url: '/pages_safetyCheck/views/snapshotManage/snapshotList?form=' +
 							encodeURIComponent(JSON.stringify(this.form))
 					});

pages_safetyCheck/component/checkItemModule.vue

@@ -84,8 +84,9 @@
 						<uni-icons color="#A2A2A2" type="search" size="20"></uni-icons>
 					</view>
 					<input type="text" v-model="searchValue" placeholder="搜索检查项" name="search" @confirm='getSearchValue'
-						confirm-type='search' maxlength="50" placeholder-style="color: #666;font-size:24rpx;">
-					<view class="left-icons" @click="delSearchValue()">
+						confirm-type='search' @input="theBlur" maxlength="50"
+						placeholder-style="color: #666;font-size:24rpx;">
+					<view v-if="searchValue" class="left-icons" @click="delSearchValue()">
 						<uni-icons color="#0183FA" type="clear" size="20"></uni-icons>
 					</view>
 				</view>
@@ -102,8 +103,8 @@
 					<view class="for-box-n">
 						{{item.hazardCheckCode}}{{item.hazardCheckName}}
 					</view>
-					<view class="for-box-n">
-						{{item.hazardCheckPoint}}{{item.hazardCheckName}}
+					<view class="for-box-n" v-html="brightenKeyword(item.hazardCheckPoint,searchValue)">
+						{{item.hazardCheckPoint}}
 					</view>
 				</view>
 			</view>
@@ -173,6 +174,9 @@
 			})
 		},
 		methods: {
+			theBlur(e) {
+				this.searchValue = e.target.value
+			},
 			//输入框查询
 			getSearchValue() {
 				if (this.optionData.infoType == 0) {
@@ -233,6 +237,14 @@
 			checkItemButton(item) {
 				this.$parent.checkItemModuleButton('submit', item);
 			},
+			//高亮
+			brightenKeyword(val, editKeyword) {
+				const Reg = new RegExp(editKeyword);
+				if (val) {
+					const res = val.replace(Reg, `<span style="color: #0183FA;">${editKeyword }</span>`);
+					return res;
+				}
+			},
 			//基础检查项检查
 			async securityCheckOptionSelAllList() {
 				let self = this;
@@ -544,7 +556,7 @@
 				background-color: #fff;
 
 				>view {
-					>view{
+					>view {
 						font-size: 25rpx;
 						line-height: 70rpx;
 						margin: 0 21rpx;

pages_safetyCheck/views/inspectManage/conductInspections.vue

@@ -8,19 +8,22 @@
 					<view class="items-t-r">{{newData.hazardCheckCode}} {{newData.hazardCheckName}}</view>
 					<img class="items-t-img" src="@/pages_safetyCheck/images/icon_wd_gd@1x.png">
 				</view>
-				<view class="items-b">＜ {{newData.hazardCheckCode2}} {{newData.hazardCheckName2}} ＜{{newData.hazardCheckCode1}} {{newData.hazardCheckName1}}</view>
+				<view class="items-b">＜ {{newData.hazardCheckCode2}} {{newData.hazardCheckName2}}
+					＜{{newData.hazardCheckCode1}} {{newData.hazardCheckName1}}</view>
 			</view>
 			<view class="items-number">此检查项在当前实验室累计出现<text>{{hazardCheckNum}}</text>次隐患</view>
 			<view class="list">
-				<view class="list-li">
+				<view class="list-li" v-if="newData.hazardCheckName!=''" @click="inspectDot()">
 					<view>检查要点</view>
 					<view>
-						<img src="@/pages_safetyCheck/images/icon_06.png">
+						<img v-if="!newData.inspectDot" src="@/pages_safetyCheck/images/icon_06.png">
+						<img v-if="newData.inspectDot" src="@/pages_safetyCheck/images/icon_06_1.png">
 					</view>
 				</view>
-				<view class="hidden-content">{{newData.hazardCheckPoint}}
+				<view class="hidden-content" v-if="newData.hazardCheckName!='' && newData.inspectDot">
+					{{newData.hazardCheckPoint}}
 				</view>
-				<view class="radio_group">
+				<view class="radio_group" v-if="newData.inspectDot">
 					<view class="radio" v-for="(item,index) in radioList" :key="index" @click="radioClick(item)">
 						<img v-if="!item.checked" src="@/pages_safetyCheck/images/icon_aqjc_5.png">
 						<img v-if="item.checked" src="@/pages_safetyCheck/images/icon_aqjc_6.png">
@@ -30,11 +33,12 @@
 				<view class="list-li" v-if="!form.checkFlag">
 					<view>检查隐患</view>
 					<view>
-						<img src="@/pages_safetyCheck/images/icon_06.png">
+						<!-- <img src="@/pages_safetyCheck/images/icon_06.png"> -->
 					</view>
 				</view>
-				<textarea v-if="!form.checkFlag" class="describe" type="text" v-model="form.hazardDescribe"
-					maxlength="200" placeholder="请填写隐患描述" placeholder-style="font-size:24rpx;color:#999;"></textarea>
+				<textarea v-if="!form.checkFlag && !checkItemModuleType" class="describe" type="text"
+					v-model="form.hazardDescribe" maxlength="200" placeholder="请填写隐患描述"
+					placeholder-style="font-size:24rpx;color:#999;"></textarea>
 				<view class="list-li" v-if="form.photoList[0]">
 					<view>现场照片</view>
 				</view>
@@ -78,7 +82,7 @@
 			<view @click="submitForm(1)">保存草稿</view>
 			<view @click="submitForm(2)">提交</view>
 		</view> -->
-		<view class="sub-btn">
+		<view class="sub-btn" v-if="!checkItemModuleType">
 			<img @longpress.stop="recordButton(item,$event)" @touchmove.stop="cancelButton"
 				@touchend.stop="sendButton(item,$event)" src="@/pages_safetyCheck/images/icon_aqjc_luyin.png" />
 			<img @click="selectImage()" src="@/pages_safetyCheck/images/icon_aqjc_paizhao.png" />
@@ -145,8 +149,10 @@
 		onLoad(option) {
 			let optionData = JSON.parse(decodeURIComponent(option.infoData));
 			uni.setNavigationBarTitle({
-				title: optionData.subName + '(' + (optionData.pageType == 0 ? optionData.roomNum : optionData
-					.subRoom) + ')'
+				title: optionData.subName + '(' + (optionData.pageType == 0 ? (optionData.roomNum ? optionData
+					.roomNum : '-') : (optionData
+					.subRoom ? optionData
+					.subRoom : '-')) + ')'
 			})
 			this.$set(this, 'pageType', optionData.pageType);
 			this.$set(this, 'itemsStatus', optionData.itemsStatus);
@@ -176,6 +182,12 @@
 			this.securityAppCheckPhotoGetCheckNumBySub();
 		},
 		methods: {
+			//折叠展开
+			inspectDot() {
+				console.log(11)
+				console.log(this.newData.inspectDot)
+				this.newData.inspectDot = !this.newData.inspectDot
+			},
 			//获取提交详情
 			async securityAppCheckPlanCheckInfo() {
 				let obj = {
@@ -186,10 +198,13 @@
 					data
 				} = await securityAppCheckPlanCheckInfo(obj);
 				if (data.code == 200) {
+					data.data.inspectDot = true;
 					this.$set(this, 'newData', data.data);
+					console.log(data.data.hazardCheckPoin)
 					//编辑的时候
 					this.$set(this.form, 'checkFlag', data.data.checkFlag ? data.data.checkFlag : false);
-					this.$set(this.form, 'hazardDescribe', data.data.hazardDescribe ? data.data.hazardDescribe : '');
+					this.$set(this.form, 'hazardDescribe', data.data.hazardCheckPoint ? data.data.hazardCheckPoint :
+						'');
 					this.$set(this.form, 'photoList', data.data.photoList ? data.data.photoList : []);
 					this.$set(this.form, 'voiceList', data.data.voiceList ? data.data.voiceList : []);
 
@@ -205,10 +220,12 @@
 				} = await securityDraftFindBySetOptionId(obj);
 				if (data.code == 200) {
 					//编辑的时候
+					data.data.inspectDot = true;
 					this.$set(this, 'newData', data.data);
+					this.$set(this.form, 'hazardDescribe', data.data.hazardCheckPoint ? data.data.hazardCheckPoint :
+						"");
 					this.$set(this.newData, 'checkPlanSetVoList', this.optionData.checkPlanSetVoList);
 					this.$set(this.form, 'checkFlag', data.data.checkFlag ? data.data.checkFlag : false);
-					this.$set(this.form, 'hazardDescribe', data.data.hazardDescribe ? data.data.hazardDescribe : '');
 					this.$set(this.form, 'photoList', data.data.photoList ? data.data.photoList : []);
 					this.$set(this.form, 'voiceList', data.data.voiceList ? data.data.voiceList : []);
 				}
@@ -249,6 +266,7 @@
 					this.$set(this.newData, 'hazardCheckCode2', item.hazardCheckCode2);
 					this.$set(this.newData, 'hazardCheckName2', item.hazardCheckName2);
 					this.$set(this.newData, 'hazardCheckPoint', item.hazardCheckPoint);
+					this.$set(this.form, 'hazardDescribe', item.hazardCheckPoint);
 					this.$set(this, 'setOptionId', item.setOptionId);
 					this.$set(this, 'hazardCheckPro', item.hazardCheckPro);
 					this.securityAppCheckPhotoGetCheckNumBySub();
@@ -345,7 +363,8 @@
 			},
 			/******图片上传******/
 			selectImage() {
-				let self = this;
+				let self=this;
+				let photoMaxNun = 0;
 				if (this.form.photoList.length > 5) {
 					uni.showToast({
 						title: '最多上传6张图片',
@@ -355,8 +374,9 @@
 					});
 					return
 				}
+				photoMaxNun = 6 - this.form.photoList.length;
 				wx.chooseImage({
-					count: 6,
+					count: photoMaxNun,
 					sizeType: ["original", "compressed"],
 					sourceType: ["album", "camera"],
 					success: function(res) {
@@ -773,12 +793,14 @@
 
 			.describe {
 				width: 636rpx;
-				height: 120rpx;
+				height: 180rpx;
 				border-radius: 10rpx 10rpx 10rpx 10rpx;
 				border: 1rpx solid #E0E0E0;
 				margin: 20rpx 0 20rpx 28rpx;
 				padding: 12rpx 16rpx;
 				box-sizing: border-box;
+				font-size: 24rpx;
+				color: #333333;
 			}
 
 			.check-for-img-max-box {

pages_safetyCheck/views/inspectManage/hiddenDangerRecord.vue

@@ -60,8 +60,9 @@
 		onLoad(option) {
 			let optionData = JSON.parse(decodeURIComponent(option.infoData));
 			uni.setNavigationBarTitle({
-				title: optionData.subName + '(' + (optionData.pageType == 0 ? optionData.roomNum : optionData
-					.subRoom) + ')'
+				title: optionData.subName + '(' + (optionData.pageType == 0 ? (optionData.roomNum?optionData.roomNum:'-') : (optionData
+					.subRoom?optionData
+					.subRoom:'-')) + ')'
 			})
 			this.$set(this, 'optionData', optionData);
 		},

pages_safetyCheck/views/inspectManage/inspectAdd.vue

@@ -7,19 +7,23 @@
 				<view class="items-t">
 					<view class="items-t-r">{{newData.hazardCheckCode}} {{newData.hazardCheckName}}</view>
 				</view>
-				<view class="items-b">＜ {{newData.hazardCheckCode2}} {{newData.hazardCheckName2}} ＜ {{newData.hazardCheckCode1}} {{newData.hazardCheckName1}}</view>
+				<view class="items-b">＜ {{newData.hazardCheckCode2}} {{newData.hazardCheckName2}} ＜
+					{{newData.hazardCheckCode1}} {{newData.hazardCheckName1}}
+				</view>
 			</view>
 			<view class="items-number">此检查项在当前实验室累计出现<text>{{hazardCheckNum}}</text>次隐患</view>
 			<view class="list">
-				<view class="list-li">
+				<view class="list-li" v-if="newData.hazardCheckName!=''" @click="inspectDot()">
 					<view>检查要点</view>
 					<view>
-						<img src="@/pages_safetyCheck/images/icon_06.png">
+						<img v-if="!newData.inspectDot" src="@/pages_safetyCheck/images/icon_06.png">
+						<img v-if="newData.inspectDot" src="@/pages_safetyCheck/images/icon_06_1.png">
 					</view>
 				</view>
-				<view class="hidden-content">{{newData.hazardCheckPoint}}
+				<view class="hidden-content" v-if="newData.hazardCheckName!='' && newData.inspectDot">
+					{{newData.hazardCheckPoint}}
 				</view>
-				<view class="radio_group">
+				<view class="radio_group" v-if="newData.inspectDot">
 					<view class="radio" v-for="(item,index) in radioList" :key="index" @click="radioClick(item)">
 						<img v-if="!item.checked" src="@/pages_safetyCheck/images/icon_aqjc_5.png">
 						<img v-if="item.checked" src="@/pages_safetyCheck/images/icon_aqjc_6.png">
@@ -29,7 +33,7 @@
 				<view class="list-li" v-if="!form.checkFlag">
 					<view>检查隐患</view>
 					<view>
-						<img src="@/pages_safetyCheck/images/icon_06.png">
+						<!-- <img src="@/pages_safetyCheck/images/icon_06.png"> -->
 					</view>
 				</view>
 				<textarea v-if="!form.checkFlag" class="describe" type="text" v-model="form.hazardDescribe"
@@ -129,8 +133,10 @@
 			let optionData = JSON.parse(decodeURIComponent(option.infoData));
 			console.log('新增', optionData)
 			uni.setNavigationBarTitle({
-				title: optionData.subName + '(' + (optionData.pageType == 0 ? optionData.roomNum : optionData
-					.subRoom) + ')'
+				title: optionData.subName + '(' + (optionData.pageType == 0 ? (optionData.roomNum ? optionData
+					.roomNum : '-') : (optionData
+					.subRoom ? optionData
+					.subRoom : '-')) + ')'
 			})
 			this.$set(this, 'pageType', optionData.pageType);
 			this.$set(this, 'itemsStatus', optionData.itemsStatus);
@@ -161,6 +167,10 @@
 			this.securityAppCheckPhotoGetCheckNumBySub();
 		},
 		methods: {
+			//折叠展开
+			inspectDot() {
+				this.newData.inspectDot = !this.newData.inspectDot
+			},
 			hiddenDangerClick(row) {
 				if (!this.hiddenDangerRecordStatus) {
 					let infoData = this.optionData;
@@ -181,17 +191,18 @@
 					data
 				} = await securityAppCheckPlanCheckInfo(obj);
 				if (data.code == 200) {
+					data.data.inspectDot = true;
 					this.$set(this, 'newData', data.data);
 					//编辑的时候
 					this.$set(this.form, 'checkFlag', data.data.checkFlag ? data.data.checkFlag : false);
-					if(data.data.checkFlag){
-						this.radioList[0].checked=true
-						this.radioList[1].checked=false
-					}else{
-						this.radioList[0].checked=false
-						this.radioList[1].checked=true
+					if (data.data.checkFlag) {
+						this.radioList[0].checked = true
+						this.radioList[1].checked = false
+					} else {
+						this.radioList[0].checked = false
+						this.radioList[1].checked = true
 					}
-					
+
 					this.$set(this.form, 'hazardDescribe', data.data.hazardDescribe ? data.data.hazardDescribe : '');
 					this.$set(this.form, 'photoList', data.data.photoList ? data.data.photoList : []);
 					this.$set(this.form, 'voiceList', data.data.voiceList ? data.data.voiceList : []);
@@ -208,15 +219,16 @@
 				} = await securityDraftFindBySetOptionId(obj);
 				if (data.code == 200) {
 					//编辑的时候
+					data.data.inspectDot = true;
 					this.$set(this, 'newData', data.data);
 					this.$set(this.newData, 'checkPlanSetVoList', this.optionData.checkPlanSetVoList);
 					this.$set(this.form, 'checkFlag', data.data.checkFlag ? data.data.checkFlag : false);
-					if(data.data.checkFlag){
-						this.radioList[0].checked=true
-						this.radioList[1].checked=false
-					}else{
-						this.radioList[0].checked=false
-						this.radioList[1].checked=true
+					if (data.data.checkFlag) {
+						this.radioList[0].checked = true
+						this.radioList[1].checked = false
+					} else {
+						this.radioList[0].checked = false
+						this.radioList[1].checked = true
 					}
 					this.$set(this.form, 'hazardDescribe', data.data.hazardDescribe ? data.data.hazardDescribe : '');
 					this.$set(this.form, 'photoList', data.data.photoList ? data.data.photoList : []);
@@ -260,9 +272,9 @@
 						});
 						return
 					}
-				}else{
-					this.$set(this.form, 'hazardDescribe','');
-					this.$set(this.form, 'photoList',[]);
+				} else {
+					this.$set(this.form, 'hazardDescribe', '');
+					this.$set(this.form, 'photoList', []);
 				}
 				let obj = {
 					checkFlag: this.form.checkFlag,
@@ -322,7 +334,8 @@
 			},
 			/******图片上传******/
 			selectImage() {
-				let self = this;
+				let self=this;
+				let photoMaxNun = 0;
 				if (this.form.photoList.length > 5) {
 					uni.showToast({
 						title: '最多上传6张图片',
@@ -332,8 +345,9 @@
 					});
 					return
 				}
+				photoMaxNun = 6 - this.form.photoList.length;
 				wx.chooseImage({
-					count: 6,
+					count: photoMaxNun,
 					sizeType: ["original", "compressed"],
 					sourceType: ["album", "camera"],
 					success: function(res) {

pages_safetyCheck/views/inspectManage/inspectList.vue

@@ -21,7 +21,9 @@
 			</view>
 			<view>
 				<view class="level">
-					<view class="level-li" :id="levelId==item.levelId?'levelColor-A':'levelColor-B'"
+					<view class="level-li" 
+						:style="levelId==item.levelId?'border:1rpx solid '+item.levelColor+';background:'+item.levelColorTow+';':'levelColor-B'"
+					 
 						@click="levelClick(item.levelId)" v-for="(item,index) in levelList">{{item.levelName}}</view>
 				</view>
 				<view class="srearch">
@@ -58,7 +60,7 @@
 							</view>
 						</view>
 						<view class="lab-info-c-b">
-							<text>{{tabIndexTow==0?item.roomNum:item.subRoom}}房间＆{{item.buildName}}</text>
+							<text>{{tabIndexTow==0?(item.roomNum?item.roomNum:'-'):(item.subRoom?item.subRoom:'-')}}房间＆{{item.buildName}}</text>
 							<text>{{item.deptName}}</text>
 						</view>
 					</view>
@@ -387,12 +389,16 @@
 			},
 			//获取分级
 			async laboratoryLevelConfigGetWebLevelTitleList() {
+				let self=this;
 				const {
 					data
 				} = await laboratoryLevelConfigGetWebLevelTitleList({});
 				if (data.code == 200) {
 					data.data.forEach(function(item) {
 						item.levelName = item.levelName.split('/')[0]
+						if(item.levelColor){
+							item.levelColorTow = self.hexToRgb(item.levelColor, 0.2)
+						}
 					})
 					this.$set(this, 'levelList', data.data);
 				}

pages_safetyCheck/views/itemsManage/hiddenDangerItems.vue

@@ -136,8 +136,9 @@
 			let optionData = JSON.parse(decodeURIComponent(option.infoData));
 			console.log('检查项列表',optionData)
 			uni.setNavigationBarTitle({
-				title: optionData.subName + '(' + (optionData.pageType == 0 ? optionData.roomNum : optionData
-					.subRoom) + ')'
+				title: optionData.subName + '(' + (optionData.pageType == 0 ? (optionData.roomNum?optionData.roomNum:'-') : (optionData
+					.subRoom?optionData
+					.subRoom:'-')) + ')'
 			})
 			this.$set(this, 'pageType', optionData.pageType);
 			this.$set(this, 'lotName',

pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail.vue

@@ -209,8 +209,8 @@
 				} = await securityAppCheckPlanCheckInfo(obj);
 				if (data.code == 200) {
 					uni.setNavigationBarTitle({
-						title: data.data.subName + '(' + (this.pageType == 0 ? data.data.roomNum : data.data
-							.subRoom) + ')'
+						title: data.data.subName + '(' + (this.pageType == 0 ? data.data.roomNum?data.data.roomNum:'-' : data.data
+							.subRoom?data.data.subRoom:'-') + ')'
 					})
 					data.data.checkCollapse=true;
 					data.data.inspectDot=false;
@@ -229,7 +229,7 @@
 				} = await securityDraftFindBySetOptionId(obj);
 				if (data.code == 200) {
 					uni.setNavigationBarTitle({
-						title: this.optionData.subName + '(' + (this.pageType == 0 ? this.optionData.roomNum : this.optionData.subRoom) + ')'
+						title: this.optionData.subName + '(' + (this.pageType == 0 ? this.optionData.roomNum?this.optionData.roomNum:'-' : this.optionData.subRoom?this.optionData.subRoom:'-') + ')'
 					})
 					data.data.checkCollapse=true;
 					data.data.inspectDot=false;

pages_safetyCheck/views/itemsManage/hiddenDangerRectification.vue

@@ -208,7 +208,7 @@
 				} = await securityAppCheckDangerGetCheckProDetail(obj);
 				if (data.code == 200) {
 					uni.setNavigationBarTitle({
-						title: data.data.subName + '(' + data.data.roomNum + ')'
+						title: data.data.subName + '(' + data.data.roomNum?data.data.roomNum:'-' + ')'
 					})
 					data.data.checkCollapse=false;
 					data.data.inspectDot=false;
@@ -343,7 +343,8 @@
 			},
 			/******图片上传******/
 			selectImage() {
-				let self = this;
+				let self=this;
+				let photoMaxNun = 0;
 				if (this.form.imgDtoList.length > 5) {
 					uni.showToast({
 						title: '最多上传6张图片',
@@ -353,8 +354,9 @@
 					});
 					return
 				}
+				photoMaxNun = 6 - this.form.imgDtoList.length;
 				wx.chooseImage({
-					count: 6,
+					count: photoMaxNun,
 					sizeType: ["original", "compressed"],
 					sourceType: ["album", "camera"],
 					success: function(res) {

pages_safetyCheck/views/planDetail.vue

@@ -208,6 +208,7 @@
 					}
 
 					>view:nth-of-type(2) {
+						word-break: break-all;
 						padding: 20rpx;
 						box-sizing: border-box;
 						width: 630rpx;

pages_safetyCheck/views/safetyCheck.vue

@@ -41,7 +41,7 @@
 			<view class="shade_n">
 				<view class="title">
 					<view>检查批次</view>
-					<img src="@/pages_safetyCheck/images/icon_06.png">
+					<!-- <img src="@/pages_safetyCheck/images/icon_06.png"> -->
 				</view>
 				<view class="batch">
 					<view class="batch-li" @click="batchClick(item)" v-for="(item,index) in batchList.checkPlanSetVoList">

pages_safetyCheck/views/snapshotManage/laboratorySearch.vue

@@ -6,32 +6,35 @@
 				<view class="search">
 					<view class="search-r">
 						<img src="@/pages_safetyCheck/images/icon_aqjc_ss.png" @click="searchBtn">
-						<input type="text" v-model="queryParams.searchValue" placeholder="模糊搜索检查项" name="search"
+						<input type="text" v-model="queryParams.searchValue" placeholder="学院单位、实验室名称或房间号" name="search"
 							@confirm='searchBtn' confirm-type='search' maxlength="50"
 							placeholder-style="color: #333333;font-size:24rpx;">
 					</view>
-					<view class="cancel" @click="cancelBtn">取消</view>
+					<view class="cancel" @click="cancelBtn()">取消</view>
 				</view>
 			</view>
-			<view class="lab-info" @click="listClick(item)" v-for="(item,index) in dataList">
-				<img class="lab-info-l" src="@/pages_safetyCheck/images/icon_aqjc_shiyanshi.png">
-				<view class="lab-info-c">
-					<view class="lab-info-c-t">
-						<view class="lab-info-c-t-l">{{item.subName}}</view>
-						<view class="lab-info-c-t-r"
-							:style="'border:1rpx solid '+item.levelColor+';background:'+item.levelColorTow+';'">
-							<text
-								:style="'border-right:1rpx solid '+item.levelColor+';color:'+item.levelColor+';'">{{item.levelName?item.levelName:''}}</text>
-							<text
-								:style="'color:'+item.levelColor+';'">{{item.typeName?item.typeName:''}}</text>
+			<view class="lab">
+				<view class="lab-info" @click="listClick(item)" v-for="(item,index) in dataList">
+					<img class="lab-info-l" src="@/pages_safetyCheck/images/icon_aqjc_shiyanshi.png">
+					<view class="lab-info-c">
+						<view class="lab-info-c-t">
+							<view class="lab-info-c-t-l">{{item.subName}}</view>
+							<view class="lab-info-c-t-r"
+								:style="'border:1rpx solid '+item.levelColor+';background:'+item.levelColorTow+';'">
+								<text
+									:style="'border-right:1rpx solid '+item.levelColor+';color:'+item.levelColor+';'">{{item.levelName?item.levelName:''}}</text>
+								<text
+									:style="'color:'+item.levelColor+';'">{{item.typeName?item.typeName:''}}</text>
+							</view>
+						</view>
+						<view class="lab-info-c-b">
+							<text>{{item.roomNum?item.roomNum:'-'}}房间＆{{item.buildName}}</text>
+							<text>{{item.deptName}}</text>
 						</view>
-					</view>
-					<view class="lab-info-c-b">
-						<text>{{item.roomNum}}房间＆{{item.buildName}}</text>
-						<text>{{item.deptName}}</text>
 					</view>
 				</view>
 			</view>
+			
 		</scroll-view>
 	</view>
 
@@ -110,9 +113,10 @@
 			},
 			//取消
 			cancelBtn() {
-				this.queryParams.searchValue = '';
-				this.getList = [];
-				this.treeselect();
+				let self=this;
+				self.queryParams.searchValue = '';
+				self.dataList = [];
+				self.getList();
 			},
 			//十六进制颜色值和RGB格式转换
 			hexToRgb(hex, opacity = 1) {
@@ -193,8 +197,6 @@
 		display flex;
 		overflow: hidden;
 		.info-max-box {
-			padding-top: 120rpx;
-			box-sizing: border-box;
 		}
 
 		#totalColor-A {
@@ -271,6 +273,7 @@
 			margin-top: 110rpx;
 			padding-top: 12rpx;
 			box-sizing: border-box;
+			margin-top: 120rpx;
 
 			.list-li {
 				min-height: 80rpx;
@@ -282,80 +285,85 @@
 				border-bottom: 1rpx solid #E0E0E0;
 			}
 		}
-
-		.lab-info {
-			background: #FFFFFF;
-			display: flex;
-			justify-content: space-between;
-			border: 2rpx dashed #D8D8D8;
-
-			.lab-info-l {
-				width: 80rpx;
-				height: 80rpx;
-				background: #0183FA;
-				border-radius: 10rpx 10rpx 10rpx 10rpx;
-				margin-left: 30rpx;
-				margin-top: 30rpx;
-				margin-bottom: 42rpx;
-			}
-
-			.lab-info-c {
-				margin: 24rpx 30rpx 0 20rpx;
-				flex: 1;
-
-				.lab-info-c-t {
-					display: flex;
-					justify-content: space-between;
-
-					.lab-info-c-t-l {
-						font-size: 30rpx;
-						color: #333333;
-						line-height: 42rpx;
-						text-align: left;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						white-space: nowrap;
-					}
-
-					.lab-info-c-t-r {
+		.lab{
+			margin-top: 120rpx;
+			.lab-info {
+				background: #FFFFFF;
+				display: flex;
+				justify-content: space-between;
+				border: 2rpx dashed #D8D8D8;
+				
+			
+				.lab-info-l {
+					width: 80rpx;
+					height: 80rpx;
+					background: #0183FA;
+					border-radius: 10rpx 10rpx 10rpx 10rpx;
+					margin-left: 30rpx;
+					margin-top: 30rpx;
+					margin-bottom: 42rpx;
+				}
+			
+				.lab-info-c {
+					margin: 24rpx 30rpx 0 20rpx;
+					flex: 1;
+			
+					.lab-info-c-t {
 						display: flex;
-						justify-content: flex-start;
-						border-radius: 10rpx 10rpx 10rpx 10rpx;
-						width: 180rpx;
-						height: 40rpx;
-						margin-left: 10rpx;
-
-						>text {
-							display: inline-block;
-							flex: 1;
-							text-align: center;
-							font-size: 24rpx;
-							line-height: 40rpx;
-							text-align: center;
+						justify-content: space-between;
+			
+						.lab-info-c-t-l {
+							font-size: 30rpx;
+							color: #333333;
+							line-height: 42rpx;
+							text-align: left;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							white-space: nowrap;
+						}
+			
+						.lab-info-c-t-r {
+							display: flex;
+							justify-content: flex-start;
+							border-radius: 10rpx 10rpx 10rpx 10rpx;
+							width: 180rpx;
+							height: 40rpx;
+							margin-left: 10rpx;
+			
+							>text {
+								display: inline-block;
+								flex: 1;
+								text-align: center;
+								font-size: 24rpx;
+								line-height: 40rpx;
+								text-align: center;
+							}
 						}
 					}
-				}
-
-				.lab-info-c-b {
-					margin-top: 16rpx;
-					display: flex;
-					justify-content: space-between;
-
-					>text:nth-of-type(1) {
-						font-size: 30rpx;
-						color: #666666;
-						line-height: 30rpx;
-						text-align: left;
-					}
-
-					>text:nth-of-type(2) {
-						font-size: 30rpx;
-						color: #666666;
-						line-height: 30rpx;
-						text-align: left;
+			
+					.lab-info-c-b {
+						margin-top: 16rpx;
+						display: flex;
+						justify-content: space-between;
+			
+						>text:nth-of-type(1) {
+							font-size: 30rpx;
+							color: #666666;
+							line-height: 30rpx;
+							text-align: left;
+						}
+			
+						>text:nth-of-type(2) {
+							font-size: 30rpx;
+							color: #666666;
+							line-height: 30rpx;
+							text-align: left;
+						}
 					}
 				}
 			}
+				
 		}
+		
 	}
 </style>

pages_safetyCheck/views/snapshotManage/snapshotDetail.vue

@@ -5,7 +5,7 @@
 			<view class="items" v-if="inspectionItems==0">
 				<view class="items-li">
 					<view>实验室</view>
-					<view>{{newData.subName}}({{newData.subRoom}})</view>
+					<view>{{newData.subName}}({{newData.subRoom?newData.subRoom:''}})</view>
 				</view>
 				<view class="items-li">
 					<view>学院单位</view>

pages_safetyCheck/views/snapshotManage/snapshotItems.vue

@@ -97,9 +97,10 @@
 		},
 		onLoad(option) {
 			let optionData = JSON.parse(decodeURIComponent(option.infoData));
+			console.log(optionData)
 			uni.setNavigationBarTitle({
-				title: optionData.subName + '(' + optionData.subRoom + ')'
-			})
+				title: optionData.subName + '(' + (optionData.subRoom?optionData.subRoom:'-')+ ')',
+				})
 			this.$set(this, 'pageType', optionData.pageType);
 			this.$set(this, 'tabTextTow',[{
 							value: '0',

pages_safetyCheck/views/snapshotManage/snapshotList.vue

@@ -66,7 +66,7 @@
 			<view class="escalation" v-if="pageType==1">
 				<view class="escalation-li" @click="recordClick(item)" v-for="(item,index) in dataList">
 					<view class="escalation-li-t">
-						<view>{{item.subName}} ({{item.subRoom}})</view>
+						<view>{{item.subName}} ({{item.subRoom?item.subRoom:'-'}})</view>
 						<view
 							:id="item.rectifyStatus==0?'color-A':(item.rectifyStatus==1?'color-B':(item.rectifyStatus==2?'color-C':''))">
 							{{item.rectifyStatus==0?'待整改':(item.rectifyStatus==1?'已整改':(item.rectifyStatus==2?'暂无法整改':''))}}
@@ -90,7 +90,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="get-data-null-p" v-if="getDataType">- 没有更多数据 -</view>
+			<!-- <view class="get-data-null-p" v-if="getDataType">- 没有更多数据 -</view> -->
 
 		</scroll-view>
 		<view class="popup-max-box" v-if="popupType">
@@ -157,14 +157,17 @@
 				},
 				total: 0,
 				dataList: [],
-				pickerIndex: 0,
+				pickerIndex: 5,
 				pickerList: [],
+				photoMaxNun:0,
 			}
 		},
 		onLoad(option) {
 
 			if (option.form) {
 				this.form = JSON.parse(decodeURIComponent(option.form));
+				this.$set(this.form, "rectifyDescribe", '')
+				this.$set(this.form, "imgDtoList", [])
 			}
 		},
 		onShow() {
@@ -255,7 +258,8 @@
 			bindPickerChange(data) {
 				this.pickerIndex = data.detail.value;
 				this.form.hazardCheckName = this.pickerList[data.detail.value].name
-				console.log(data)
+				this.form.hazardCheckCode = this.pickerList[data.detail.value].code
+				this.form.hazardCheckId = this.pickerList[data.detail.value].id
 			},
 			//隐患项
 			async treeselect() {
@@ -267,10 +271,16 @@
 				});
 				if (data.code == 200) {
 					let list = [];
-					data.data.forEach(function(item) {
+					data.data.forEach(function(item,index) {
+						if(index==5){
+							console.log(item)
+							self.form.hazardCheckName = item.name
+							self.form.hazardCheckCode = item.code
+							self.form.hazardCheckId = item.id
+						}
 						list.push(item)
 					})
-					this.pickerList = list
+					this.pickerList = list;
 				}
 			},
 			tabClick(index) {
@@ -296,6 +306,7 @@
 			/******图片上传******/
 			selectImage() {
 				let self = this;
+				let photoMaxNun=0;
 				if (this.form.imgDtoList.length > 5) {
 					uni.showToast({
 						title: '最多上传6张图片',
@@ -305,8 +316,9 @@
 					});
 					return
 				}
+				photoMaxNun=6-this.form.imgDtoList.length;
 				wx.chooseImage({
-					count: 6,
+					count: photoMaxNun,
 					sizeType: ["original", "compressed"],
 					sourceType: ["album", "camera"],
 					success: function(res) {
@@ -447,7 +459,6 @@
 
 			//上报
 			async submitForm() {
-				
 				let self = this;
 				if (!this.form.subId) {
 					uni.showToast({
@@ -818,6 +829,7 @@
 			justify-content: space-between;
 			padding: 0 50rpx;
 			box-sizing: border-box;
+			z-index: 200;
 
 			>img {
 				width: 130rpx;

pages_safetyCheck/views/snapshotManage/snapshotRectification.vue

@@ -61,7 +61,7 @@
 				</view> -->
 			</view>
 		</scroll-view>
-		<view class="sub-btn" >
+		<view class="sub-btn">
 			<view @click="submitForm(2)">暂无法整改</view>
 			<view @click="submitForm(1)">完成整改</view>
 		</view>
@@ -87,8 +87,8 @@
 				inspectionItems: 0, //0有检查项 1无检查项
 				form: {
 					imgDtoList: [],
-					rectifyProjectName:'',
-					rectifyProjectUrl:'',
+					rectifyProjectName: '',
+					rectifyProjectUrl: '',
 				},
 				newData: {},
 			}
@@ -109,14 +109,14 @@
 			selectFile() {
 				let self = this;
 				wx.chooseMessageFile({
-				  count: 1,
-				  type: 'file',
-				  success (res) {
-				    // tempFilePath可以作为img标签的src属性显示图片
-				    const tempFilePaths = res.tempFiles[0].path
-					self.form.rectifyProjectName=res.tempFiles[0].name
-					self.uploadFile(tempFilePaths);
-				  }
+					count: 1,
+					type: 'file',
+					success(res) {
+						// tempFilePath可以作为img标签的src属性显示图片
+						const tempFilePaths = res.tempFiles[0].path
+						self.form.rectifyProjectName = res.tempFiles[0].name
+						self.uploadFile(tempFilePaths);
+					}
 				})
 			},
 			async uploadFile(tempFilePaths) {
@@ -139,7 +139,7 @@
 						let res = JSON.parse(uploadFileRes.data);
 						console.log(res)
 						if (res.code == 200) {
-							self.form.rectifyProjectUrl=res.data.url;
+							self.form.rectifyProjectUrl = res.data.url;
 						} else {
 							uni.showToast({
 								title: res.msg,
@@ -158,6 +158,7 @@
 			/******图片上传******/
 			selectImage() {
 				let self = this;
+				let photoMaxNun = 0;
 				if (this.form.imgDtoList.length > 5) {
 					uni.showToast({
 						title: '最多上传6张图片',
@@ -167,8 +168,9 @@
 					});
 					return
 				}
+				photoMaxNun = 6 - this.form.imgDtoList.length;
 				wx.chooseImage({
-					count: 6,
+					count: photoMaxNun,
 					sizeType: ["original", "compressed"],
 					sourceType: ["album", "camera"],
 					success: function(res) {
@@ -236,13 +238,13 @@
 					});
 					return
 				} */
-				let obj={
-					photoId:this.newData.photoId,
-					rectifyStatus:status,//1已整改2暂无法整改
-					rectifyDescribe:this.form.rectifyDescribe,
-					imgDtoList:this.form.imgDtoList,
-					rectifyProjectName:this.form.rectifyProjectName,
-					rectifyProjectUrl:this.form.rectifyProjectUrl,
+				let obj = {
+					photoId: this.newData.photoId,
+					rectifyStatus: status, //1已整改2暂无法整改
+					rectifyDescribe: this.form.rectifyDescribe,
+					imgDtoList: this.form.imgDtoList,
+					rectifyProjectName: this.form.rectifyProjectName,
+					rectifyProjectUrl: this.form.rectifyProjectUrl,
 				}
 				const {
 					data
@@ -254,11 +256,12 @@
 						mask: true,
 						duration: 2000
 					});
-					let infoData=this.newData;
+					let infoData = this.newData;
 					uni.redirectTo({
-						url: '/pages_safetyCheck/views/snapshotManage/snapshotDetail?infoData=' + encodeURIComponent(JSON.stringify(infoData))
+						url: '/pages_safetyCheck/views/snapshotManage/snapshotDetail?infoData=' +
+							encodeURIComponent(JSON.stringify(infoData))
 					});
-					
+
 				}
 			},
 		}
@@ -328,7 +331,8 @@
 					align-items: center;
 				}
 			}
-			.items-li:last-of-type{
+
+			.items-li:last-of-type {
 				border-bottom: none;
 			}