heyang

api/commonality/permission.js

@@ -18,4 +18,12 @@ export const systemSubjectGetListByPower = (data) => {
 		method: 'POST',
 		data: { ...data }
 	})
-};
+};
+//根据权限查询实验室列表
+export const systemSubjectGetList = (data) => {
+	return apiResquest({
+		url: `/system/subject/getList`,
+		method: 'POST',
+		data: { ...data }
+	})
+};

api/request/config.js

@@ -1,5 +1,5 @@
 const config = {
-	// base_url: 'http://192.168.1.43/api', //43服务器
+	 base_url: 'http://192.168.1.43/api', //43服务器
 	// base_url: 'http://192.168.1.8/api',//1.8服务器
 	//base_url: 'http://192.168.1.9:8080',//柴
 	// base_url: 'http://192.168.1.24:8080',//林总
@@ -20,7 +20,7 @@ const config = {
 	// 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://labcontrol.nwafu.edu.cn/api/', //西北农林
+	// base_url: 'https://labcontrol.nwafu.edu.cn/api/', //西北农林
 	// base_url: 'http://172.16.0.65/api/', //西北农林
 	//base_url: 'https://lab.zjznai.com/labapp/', //43测试
 }

pages.json

@@ -1,7 +1,5 @@
 {
-	"pages": [
-
-		{
+	"pages": [{
 			"path": "pages/views/login/login", //登录
 			"style": {
 				"navigationBarTitleText": "",
@@ -1012,7 +1010,12 @@
 						"navigationBarTitleText": "随手拍整改项"
 					}
 				},
-
+				{
+					"path": "views/snapshotManage/laboratorySearch",
+					"style": {
+						"navigationBarTitleText": "搜索实验室"
+					}
+				},
 				{
 					"path": "views/snapshotManage/snapshotRectification",
 					"style": {

pages_manage/views/laboratory/safetyCardScan.vue

@@ -20,15 +20,20 @@
 		</view>
 		<view class="safetyCard" v-if="pageType==0">
 			<view class="lab-info">
-				<view class="lab-info-t">
-					<view>{{newData.levelName}}</view>
-					<view>{{newData.typeName}}</view>
-					<view>{{newData.subName}}（{{newData.roomNum}}）</view>
-				</view>
-				<view class="lab-info-b">
-					<img src="@/pages_safetyCheck/images/icon_sys_xz@1x.png">
-					{{newData.buildName}}{{newData.floorName}}
+				<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">{{newData.subName}}</view>
+						<view class="lab-info-c-t-r">
+							<text>{{newData.levelName}}</text>
+							<text>{{newData.typeName}}</text>
+						</view>
+					</view>
+					<view class="lab-info-c-b">
+						{{newData.roomNum}}房间＆{{newData.buildName}}
+					</view>
 				</view>
+				<view class="lab-info-r">{{newData.subArea}}㎡</view>
 			</view>
 			<view class="liability-unit">
 				<view>学院单位</view>
@@ -83,8 +88,29 @@
 			</view>
 		</view>
 		<view class="position-button-box" v-if="pageType == 0">
-			<view class="position-button-p-1" @click="goPage('securityCheck')">安全检查</view>
-			<view class="position-button-p-2" @click="goPage('snapshot')">随手拍</view>
+			<img class="position-button-p-1" @click="goPage('securityCheck')"
+				src="@/pages_safetyCheck/images/icon_aqjc_anquanjiancha.png">
+			<img class="position-button-p-2" @click="goPage('snapshot')"
+				src="@/pages_safetyCheck/images/icon_aqjc_suishoupai.png">
+		</view>
+		<view class="shade" v-if="dialogVisible">
+			<view class="null-box" @click="dialogClose()"></view>
+			<view class="shade_n">
+				<view class="title">
+					<view>检查批次</view>
+					<img src="@/pages_safetyCheck/images/icon_06.png">
+				</view>
+				<view class="batch">
+					<view class="batch-li" @click="batchClick(item)" v-for="(item,index) in shadeList">
+						<view class="batch-li-l">
+							<text>{{item.planTitle}}</text>
+						</view>
+						<view class="batch-li-r">
+							<img src="@/pages_safetyCheck/images/icon_wd_gd@1x.png">
+						</view>
+					</view>
+				</view>
+			</view>
 		</view>
 		<!-- 物联控制 -->
 		<iotControl ref="iotControl" v-if="pageType == 1" :subjectData="subjectData"></iotControl>
@@ -103,6 +129,9 @@
 		pageRestrictVerify
 	} from '@/utils/index'
 	import {
+		securityAppCheckPlanTitleList,
+	} from '@/pages_safetyCheck/api/index.js'
+	import {
 		iotControl
 	} from '@/pages_manage/views/laboratory/iotControl.vue'
 	import {
@@ -160,7 +189,14 @@
 				conditioningPage: false,
 				// 空调弹窗
 				airConditioningData: null,
-				saoCodeType:false,
+				saoCodeType: false,
+				dialogVisible: true,
+				shadeList: [],
+				queryParams: {
+					page: 1,
+					pageSize: 100,
+					checkCategory: '', //1校院巡查 2学院自查
+				},
 
 			}
 		},
@@ -191,26 +227,107 @@
 
 		},
 		mounted() {
-
+			this.securityAppCheckPlanTitleList();
 		},
 		methods: {
+			//查询计划
+			async securityAppCheckPlanTitleList() {
+				let self = this;
+				const {
+					data
+				} = await securityAppCheckPlanTitleList(this.queryParams);
+				if (data.code == 200) {
+					//this.shadeList = data.data.records;
+					if (data.data.record[0]) { //一个计划
+						let planSetId = data.data.record[0]
+						if (data.data.record[0].checkPlanSetVoList[0]) { //一个批次
+							let planSetId = data.data.record[0].checkPlanSetVoList[0].planSetId
+							self.securityAppCheckManageList(planSetId)
+						}
+					}
+				}
+			},
+			//检查任务-在此结果里对比实验室Id判断是否有实验室
+			async securityAppCheckManageList(planSetId) {
+				let self = this;
+				let obj = {
+					page: 1,
+					pageSize: 20,
+					planSetId: planSetId,
+				}
+				const {
+					data
+				} = await securityAppCheckManageList(this.queryParams);
+				if (data.code == 200) {
+					//this.shadeList = data.data.records;
+					data.data.records.forEach(function(item, index) {
+						if (self.newData.subId == item.subId) {
+							let manageId = item.manageId
+							self.securityAppCheckSetOptionList(manageId)
+						} else {
+							uni.showToast({
+								title: '该实验室暂无检查计划!',
+								icon: "none",
+								mask: true,
+								duration: 2000
+							});
+							return
+						}
+					})
+
+
+				}
+			},
+			//查询检查项
+			async securityAppCheckSetOptionList(manageId) {
+				let self = this;
+				let obj = {
+					page: 1,
+					pageSize: 20,
+					checkStatus: '0',
+					manageId: manageId,
+				}
+				const {
+					data
+				} = await securityAppCheckManageList(this.queryParams);
+				if (data.code == 200) {
+					if (data.data.records[0]) {
+						let infoData = row;
+						infoData.pageType = 0;
+						infoData.itemsStatus = 0;
+						infoData.subId = data.data.records[0].subId;
+						infoData.manageId = data.data.records[0].manageId;
+						infoData.setOptionId = data.data.records[0].setOptionId;
+						infoData.hazardCheckPro = data.data.records[0].hazardCheckPro;
+						uni.redirectTo({
+							url: '/pages_safetyCheck/views/inspectManage/inspectAdd?infoData=' +
+								encodeURIComponent(
+									JSON
+									.stringify(infoData))
+						});
+					}
+				}
+			},
+
+
 			//拨打电话
-			callPhone(tel){
+			callPhone(tel) {
 				uni.makePhoneCall({
 					phoneNumber: tel
 				})
 			},
-			goVideoPage(){
+			goVideoPage() {
 				console.log('视频')
 				let obj = {
-					type:4,
-					subId:this.newData.subId
+					type: 4,
+					subId: this.newData.subId
 				}
 				uni.navigateTo({
-						url: '/pages_manage/views/laboratory/videoPlayer?item='+encodeURIComponent(JSON.stringify(obj))
+					url: '/pages_manage/views/laboratory/videoPlayer?item=' + encodeURIComponent(JSON.stringify(
+						obj))
 				});
 			},
-			getIotControlData(){
+			getIotControlData() {
 				this.$refs['iotControl'].iotAppHardwareFindByType();
 			},
 			buttonClick(type, row) {
@@ -241,7 +358,8 @@
 				} else if (type == 'adminShowType') {
 					this.$set(this.newData, 'adminShowType', !this.newData.adminShowType);
 				} else if (type == 'list') {
-					this.$set(this.newData.labInfoBrandModels[index], 'showType', !this.newData.labInfoBrandModels[index].showType);
+					this.$set(this.newData.labInfoBrandModels[index], 'showType', !this.newData.labInfoBrandModels[index]
+						.showType);
 				}
 			},
 			//顶部tab点击
@@ -250,7 +368,7 @@
 					this.$set(this, 'pageType', index);
 				}
 			},
-			goPage(type){
+			goPage(type) {
 				if (!pageRestrictVerify(type)) {
 					uni.showToast({
 						title: '没有相关权限,请联系管理员',
@@ -265,17 +383,6 @@
 					uni.navigateTo({
 						url: "/pages_safetyCheck/views/safetyCheck",
 					});
-					/* if(this.identityData){
-						
-					}else{
-						uni.showToast({
-							mask: true,
-							icon: "none",
-							position: "center",
-							title: '您不是校/院级管理员或督导组成员,无法使用该功能.',
-							duration: 2000
-						});
-					} */
 				} else if (type == 'snapshot') {
 					//随手拍
 					uni.navigateTo({
@@ -289,7 +396,7 @@
 
 <style lang="stylus" scoped>
 	.safetyCardScan {
-		height:100%;
+		height: 100%;
 
 		#fontColor-A {
 			color: #00DEDE;
@@ -304,7 +411,7 @@
 		}
 
 		.header {
-			height:192rpx;
+			height: 192rpx;
 			width: 100%;
 			// position: fixed;
 			// top: 0rpx;
@@ -392,71 +499,85 @@
 		/* 安全信息牌 */
 		.safetyCard {
 			padding-bottom: 150rpx;
+
 			.lab-info {
 				background: #FFFFFF;
+				display: flex;
+				justify-content: space-between;
 
-				.lab-info-t {
-					width: 750rpx;
+				.lab-info-l {
+					width: 80rpx;
 					height: 80rpx;
-					border-bottom: 2rpx dashed #E0E0E0;
-					display: flex;
-					justify-content: flex-start;
-					align-items: center;
-					padding: 0 30rpx;
-					box-sizing: border-box;
+					background: #0183FA;
+					border-radius: 10rpx 10rpx 10rpx 10rpx;
+					margin-left: 30rpx;
+					margin-top: 30rpx;
+				}
 
-					>view:nth-of-type(1) {
-						width: 100rpx;
-						height: 60rpx;
-						background: #FF0000;
-						border-radius: 50rpx 50rpx 50rpx 50rpx;
-						font-size: 30rpx;
-						color: #FFFFFF;
-						line-height: 60rpx;
-						text-align: center;
-					}
+				.lab-info-c {
+					margin: 24rpx 30rpx 0 20rpx;
+					flex: 1;
 
-					>view:nth-of-type(2) {
-						width: 130rpx;
-						height: 60rpx;
-						border-radius: 50rpx 50rpx 50rpx 50rpx;
-						border: 2rpx solid #FF8C00;
-						font-size: 30rpx;
-						color: #FF8C00;
-						line-height: 60rpx;
-						text-align: center;
-						margin: 0 30rpx 0 10rpx;
+					.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 {
+							display: flex;
+							justify-content: flex-start;
+							background: rgba(255, 0, 0, 0.2);
+							border-radius: 10rpx 10rpx 10rpx 10rpx;
+							border: 2rpx solid #FF0000;
+							width: 180rpx;
+							height: 40rpx;
+							margin-left: 10rpx;
+
+							>text {
+								display: inline-block;
+								flex: 1;
+								text-align: center;
+								font-size: 24rpx;
+								color: #FF0000;
+								line-height: 40rpx;
+								text-align: center;
+							}
+
+							>text:nth-of-type(1) {
+								border-right: 2rpx solid #FF0000;
+							}
+
+							>text:nth-of-type(2) {}
+						}
 					}
 
-					>view:nth-of-type(3) {
+					.lab-info-c-b {
 						font-size: 30rpx;
-						color: #333333;
+						color: #666666;
 						line-height: 42rpx;
 						text-align: left;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						white-space: nowrap;
+						margin-top: 10rpx;
 					}
 				}
 
-				.lab-info-b {
-					height: 80rpx;
-					padding: 0 30rpx;
-					box-sizing: border-box;
-					display: flex;
-					justify-content: flex-start;
-					align-items: center;
-
-					>img {
-						width: 34rpx;
-						height: 34rpx;
-						margin-right: 12rpx;
-					}
-
-					font-size: 30rpx;
-					color: #333333;
-					line-height: 42rpx;
-					text-align: left;
+				.lab-info-r {
+					width: 100rpx;
+					height: 150rpx;
+					background: rgba(1, 131, 250, 0.2);
+					border-radius: 0rpx 0rpx 0rpx 0rpx;
+					font-size: 28rpx;
+					color: #0183FA;
+					line-height: 150rpx;
+					text-align: center;
 				}
 			}
 
@@ -682,30 +803,117 @@
 
 		.position-button-box {
 			position: fixed;
-			bottom: 25rpx;
-			left: 30rpx;
-			width: 690rpx;
-			height: 100rpx;
+			bottom: 26rpx;
 			display: flex;
-			color: #fff;
-			overflow: hidden;
-			border-radius: 50rpx;
+			justify-content: center;
+
+			>img {
+				width: 130rpx;
+				height: 130rpx;
+			}
 
 			.position-button-p-1 {
-				width: 345rpx;
-				line-height: 100rpx;
-				font-size: 30rpx;
-				text-align: center;
-				background-color: #FF8C00;
+				margin-left: 174rpx;
+				margin-right: 120rpx;
+			}
+
+			.position-button-p-2 {}
+		}
+
+		.shade {
+			height: 100%;
+			width: 100%;
+			position: fixed;
+			display: flex;
+			flex-direction: column;
+			z-index: 200;
+			background: rgba(0, 0, 0, 0.2);
+			top: 0;
+
+			.null-box {
+				flex: 1;
 			}
 
-			.position-button-p-2 {
-				width: 345rpx;
-				line-height: 100rpx;
-				font-size: 30rpx;
-				text-align: center;
-				background-color: #0183FA;
+			.shade_n {
+				position: absolute;
+				bottom: 0;
+				left: 0;
+				width: 750rpx;
+				height: 466rpx;
+				background: #FFFFFF;
+				border-radius: 20rpx 20rpx 0rpx 0rpx;
+				overflow-y: auto;
+
+				.title {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					padding: 0 50rpx 0 284rpx;
+					box-sizing: border-box;
+					border-bottom: 1rpx solid #E0E0E0;
+
+					>view {
+						font-size: 30rpx;
+						color: #3D3D3D;
+						line-height: 90rpx;
+						text-align: left;
+					}
+
+					>img {
+						width: 24rpx;
+						height: 12rpx;
+					}
+				}
+
+				.batch {
+					padding: 0 30rpx;
+					box-sizing: border-box;
+
+					.batch-li {
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+						border-bottom: 1rpx solid #E0E0E0;
+						padding: 20rpx 0 16rpx 0rpx;
+						box-sizing: border-box;
+
+						.batch-li-l {
+							>text:nth-of-type(1) {
+								display: block;
+								font-size: 30rpx;
+								color: #333333;
+								line-height: 42rpx;
+								text-align: left;
+							}
+
+							>text:nth-of-type(2) {
+								display: block;
+								font-size: 28rpx;
+								color: #666666;
+								line-height: 39rpx;
+								text-align: left;
+								margin-top: 6rpx;
+							}
+						}
+
+						.batch-li-r {
+							font-size: 28rpx;
+							color: #666666;
+							line-height: 39rpx;
+							text-align: left;
+							display: flex;
+							justify-content: flex-start;
+							align-items: center;
+
+							>img {
+								width: 24rpx;
+								height: 24rpx;
+								margin-left: 9rpx;
+							}
+						}
+					}
+				}
 			}
 		}
 	}
-</style>
+</style>

pages_safetyCheck/views/inspectManage/inspectList.vue

@@ -20,53 +20,53 @@
 					@click="tabClickTow(index)">{{item}}</view>
 			</view>
 			<view>
+				<view class="level">
+					<view class="level-li" :id="levelId==item.levelId?'levelColor-A':'levelColor-B'"
+						@click="levelClick(item.levelId)" v-for="(item,index) in levelList">{{item.levelName}}</view>
+				</view>
 				<view class="srearch">
-					<picker @change="deptChange" :value="deptData.index" :range="deptData.list" :range-key="'deptName'">
+					<!-- <picker @change="deptChange" :value="deptData.index" :range="deptData.list" :range-key="'deptName'">
 						<view class="college">
 							<view>{{deptData.name?deptData.name:'学院'}}</view>
 							<img src="@/pages_safetyCheck/images/icon_06.png">
 						</view>
-					</picker>
+					</picker> -->
 					<view class="srearch-n">
 						<view class="srearch-l">
 							<img src="@/pages_safetyCheck/images/icon_aqjc_ss.png">
 						</view>
 						<input class="srearch-c" type="text" @confirm="carriageReturnRequest" v-model="searchValue"
-							placeholder="实验室/房间号" />
-						<view class="srearch-r" @click="saoCode()">
+							placeholder="搜索实验室" />
+						<!-- <view class="srearch-r" @click="saoCode()">
 							<img src="@/pages_safetyCheck/images/icon_aqjc_sm.png">
-						</view>
+						</view> -->
 					</view>
 				</view>
-				<view class="level">
-					<view class="level-li" :id="levelId==item.levelId?'levelColor-A':'levelColor-B'"
-						@click="levelClick(item.levelId)" v-for="(item,index) in levelList">{{item.levelName}}</view>
-				</view>
+				
 			</view>
 			<view class="hidden">
-				<view class="hidden-li" @click="listClick(item)" v-for="(item,index) in dataList">
-					<img class="hidden-li-l" src="@/pages_safetyCheck/images/icon_sys_xz@1x.png">
-					<view class="hidden-li-c">{{item.subName}}</view>
-					<view class="hidden-li-r" :class="item.manageStatus == 2?'manageClass':''" v-if="tabIndexTow==0">
-						{{item.manageStatus == 2?'已检查':'待检查'+item.unCheckCount+'项'}}
-						<img v-if="item.manageStatus != 2" src="@/pages_safetyCheck/images/icon_ssp_gd@1x.png">
-						<img v-if="item.manageStatus == 2" src="@/pages_safetyCheck/images/icon_wd_gd@1x.png">
-					</view>
-					<view class="hidden-li-r" :class="item.manageStatus == 2?'manageClass':''" v-if="tabIndexTow==1">
-						{{item.overCheck?'已复查':'待复查'+item.stayExamineCheckNum+'项'}}
-						<img src="@/pages_safetyCheck/images/icon_ssp_gd@1x.png">
-					</view>
-					<view class="hidden-li-r" :class="item.manageStatus == 2?'manageClass':''" v-if="tabIndexTow==2">
-						{{item.overCheck?'已整改':'待整改'+item.stayExamineCheckNum+'项'}}
-						<img src="@/pages_safetyCheck/images/icon_ssp_gd@1x.png">
+				<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.classLevelColor+';background:'+item.classLevelColorTow+';'">
+								<text
+									:style="'border-right:1rpx solid '+item.classLevelColor+';color:'+item.classLevelColor+';'">{{item.classLevelName?item.classLevelName:''}}</text>
+								<text :style="'color:'+item.classLevelColor+';'">{{item.classTypeNames?item.classTypeNames:''}}</text>
+							</view>
+						</view>
+						<view class="lab-info-c-b">
+							<text>{{tabIndexTow==0?item.roomNum:item.subRoom}}房间＆{{item.buildName}}</text>
+							<text>{{item.deptName}}</text>
+						</view>
 					</view>
 				</view>
-				<!-- <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 class="get-data-null-p" v-if="getDataType">- 没有更多数据 -</view>
 			</view>
+			<img class="saoCode" @click="saoCode()"
+				src="@/pages_safetyCheck/images/icon_aqjc_saoma.png">
 		</scroll-view>
 	</view>
 </template>
@@ -112,7 +112,7 @@
 				//级别
 				levelList: [],
 				levelId: null,
-				optionData:null,
+				optionData: null,
 				//实验室/房间号
 				searchValue: '',
 				subId: '',
@@ -301,7 +301,7 @@
 						data
 					} = await securityAppCheckDangerReviewSubList(obj);
 					if (data.code == 200) {
-						if (data.data[0] && data.data[0].stayExamineCheckNum !=0) {
+						if (data.data[0] && data.data[0].stayExamineCheckNum != 0) {
 							//跳转检查项列表页面
 							let infoData = data.data[0];
 							infoData.pageType = this.tabIndexTow;
@@ -391,8 +391,8 @@
 					data
 				} = await laboratoryLevelConfigGetWebLevelTitleList({});
 				if (data.code == 200) {
-					data.data.forEach(function(item){
-						item.levelName=item.levelName.split('/')[0]
+					data.data.forEach(function(item) {
+						item.levelName = item.levelName.split('/')[0]
 					})
 					this.$set(this, 'levelList', data.data);
 				}
@@ -417,6 +417,13 @@
 						data
 					} = await securityAppCheckManageList(obj);
 					if (data.code == 200) {
+
+						data.data.records.forEach(function(item) {
+							if(item.classLevelColor){
+								item.classLevelColorTow = self.hexToRgb(item.classLevelColor, 0.2)
+							}
+							
+						})
 						if (self.queryParams.page == 1) {
 							this.dataList = data.data.records;
 							this.total = data.data.total;
@@ -430,6 +437,7 @@
 								this.$set(this, 'getDataType', true);
 							}
 						}
+
 					}
 				} else if (this.tabIndexTow == 1) {
 					//复查计划
@@ -483,10 +491,16 @@
 
 				}
 			},
-
-
-
-
+			//十六进制颜色值和RGB格式转换
+			hexToRgb(hex, opacity = 1) {
+				// 去除#号
+				var color = hex.replace("#", "");
+				// 分割成红、绿、蓝三部分的16进制字符串
+				var red = parseInt(color.substring(0, 2), 16);
+				var green = parseInt(color.substring(2, 4), 16);
+				var blue = parseInt(color.substring(4, 6), 16);
+				return `RGB(${red}, ${green}, ${blue},${opacity})`;
+			},
 		}
 	}
 </script>
@@ -599,7 +613,6 @@
 			background: #FFFFFF;
 			border-radius: 0rpx 0rpx 0rpx 0rpx;
 			overflow: hidden;
-			margin-top: 20rpx;
 			display: flex;
 			display: flex;
 			justify-content: space-between;
@@ -641,7 +654,7 @@
 			}
 
 			.srearch-n {
-				width: 480rpx;
+				width: 690rpx;
 				height: 60rpx;
 				border-radius: 50rpx 50rpx 50rpx 50rpx;
 				border: 2rpx solid #E0E0E0;
@@ -690,9 +703,9 @@
 			background: #FFFFFF;
 			display: flex;
 			justify-content: flex-start;
-			padding: 0 30rpx;
+			padding: 30rpx 30rpx 0;
 			box-sizing: border-box;
-
+			margin-top: 20rpx;
 			.level-li {
 				width: 100rpx;
 				height: 50rpx;
@@ -842,53 +855,81 @@
 				border-top: none;
 			}
 
-			.hidden-li {
-				padding: 0 30rpx;
-				height: 80rpx;
+			.lab-info {
 				background: #FFFFFF;
-				border-top: 1rpx solid #E0E0E0;
 				display: flex;
-				justify-content: flex-start;
-				align-items: center;
-
-				.hidden-li-l {
-					width: 34rpx;
-					height: 34rpx;
+				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;
 				}
 
-				.hidden-li-c {
-					font-size: 28rpx;
-					color: #333333;
-					line-height: 30rpx;
-					text-align: left;
+				.lab-info-c {
+					margin: 24rpx 30rpx 0 20rpx;
 					flex: 1;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					white-space: nowrap;
-					margin: 0 84rpx 0 12rpx;
-				}
 
-				.hidden-li-r {
-					font-size: 28rpx;
-					color: #0183FA;
-					line-height: 80rpx;
-					text-align: left;
-					display: flex;
-					justify-content: flex-start;
-					align-items: center;
+					.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;
+						}
 
-					>img {
-						width: 24rpx;
-						height: 24rpx;
+						.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;
+							}
+						}
 					}
-				}
 
-				.manageClass {
-					color: #009c1f !important;
+					.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;
+						}
+					}
 				}
 			}
 
-			.hidden-li:last-of-type {
+			.lab-info:last-of-type {
 				border: none;
 			}
 
@@ -926,5 +967,12 @@
 		#color-C {
 			color: #16B531;
 		}
+		.saoCode{
+			position: fixed;
+			left: 288rpx;
+			bottom: 20rpx;
+			width: 130rpx;
+			height: 130rpx;
+		}
 	}
 </style>

pages_safetyCheck/views/snapshotManage/laboratorySearch.vue

@@ -0,0 +1,366 @@
+<!-- 实验室搜索 -->
+<template>
+	<view class="hiddenDangerItemsSearch">
+		<view class="header">
+			<view class="search">
+				<view class="search-r">
+					<img src="@/pages_safetyCheck/images/icon_aqjc_ss.png" @click="searchBtn">
+					<input type="text" v-model="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>
+		</view>
+		<!-- 
+		<view class="list">
+			<view class="list-li" v-for="(item,index) in dataList" @click="confirm(item)">
+				{{item.hazardCheckCode}}{{item.hazardCheckName}}
+			</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.classLevelColor+';background:'+item.classLevelColorTow+';'">
+						<text
+							:style="'border-right:1rpx solid '+item.classLevelColor+';color:'+item.classLevelColor+';'">{{item.classLevelName?item.classLevelName:''}}</text>
+						<text
+							:style="'color:'+item.classLevelColor+';'">{{item.classTypeNames?item.classTypeNames:''}}</text>
+					</view>
+				</view>
+				<view class="lab-info-c-b">
+					<text>{{tabIndexTow==0?item.roomNum:item.subRoom}}房间＆{{item.buildName}}</text>
+					<text>{{item.deptName}}</text>
+				</view>
+			</view>
+		</view>
+	</view>
+
+</template>
+
+<script>
+	import {
+		config
+	} from '@/api/request/config.js'
+	
+	import {
+		systemSubjectGetList,
+	} from '@/api/commonality/permission.js'
+	import {
+		securityCheckOptionList,
+		laboratorySubRelInfoGetRelList
+	} from '@/pages_safetyCheck/api/index.js'
+	export default {
+		name: "hiddenDangerItemsSearch",
+		components: {
+
+		},
+		data() {
+			return {
+				baseUrl: config.base_url,
+				pageType: 1,
+				checkOptionList: [],
+				dataList: [],
+				searchValue: '',
+				form: {}, //接收上个页面传过来的参数
+				// 查询参数
+				queryParams: {
+					page: 1,
+					pageSize: 20,
+				},
+				total:0,
+
+			}
+		},
+		onLoad(option) {
+			if (option.form) {
+				this.form = JSON.parse(decodeURIComponent(option.form));
+				this.pageType = this.form.pageType;
+			}
+		},
+		onShow() {
+
+		},
+		mounted() {
+			this.buildBySub();
+			//this.treeselect();
+		},
+		methods: {
+			//滚动事件
+			scrollGet() {},
+			//实验室搜索
+			searchBtn() {
+				this.dataList = [];
+				this.treeselect();
+			},
+			//取消
+			cancelBtn() {
+				this.searchValue = '';
+				this.dataList = [];
+				this.treeselect();
+			},
+			confirm(row) {
+				this.$set(this.form, "hazardCheckId1", row.hazardCheckId1)
+				this.$set(this.form, "hazardCheckName1", row.hazardCheckName1)
+				this.$set(this.form, "hazardCheckCode1", row.hazardCheckCode1)
+				this.$set(this.form, "hazardCheckId2", row.hazardCheckId2)
+				this.$set(this.form, "hazardCheckName2", row.hazardCheckName2)
+				this.$set(this.form, "hazardCheckCode2", row.hazardCheckCode2)
+				this.$set(this.form, "hazardCheckId", row.hazardCheckId)
+				this.$set(this.form, "hazardCheckName", row.hazardCheckName)
+				this.$set(this.form, "hazardCheckCode", row.hazardCheckCode)
+				this.$set(this.form, "hazardCheckPoint", row.hazardCheckPoint)
+				if (this.pageType == 1) {
+					//随手拍进入
+					uni.redirectTo({
+						url: '/pages_safetyCheck/views/snapshotManage/snapshotList?form=' + encodeURIComponent(JSON
+							.stringify(this.form))
+					});
+				} else if (this.pageType == 2) {
+					//隐患项列表进入
+					uni.redirectTo({
+						url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItems?infoData=' +
+							encodeURIComponent(JSON.stringify(this.form))
+					});
+				}
+
+			},
+			
+			//搜索房间接口
+			async buildBySub() {
+				let self = this;
+				const {
+					data
+				} = await systemSubjectGetList({
+					'searchValue': this.form.searchValue,
+					'subId': this.form.subId,
+				});
+				if (data.code == 200) {
+					if (data.data[0]) {
+						if (self.queryParams.page == 1) {
+							this.dataList = data.data.records;
+							this.total = data.data.total;
+							if (data.data.total / self.queryParams.pageSize <= self.queryParams.page) {
+								this.$set(this, 'getDataType', true);
+							}
+						} else {
+							this.dataList = [...this.dataList, ...data.data.records]
+							this.total = data.data.total;
+							if (data.data.total / self.queryParams.pageSize <= self.queryParams.page) {
+								this.$set(this, 'getDataType', true);
+							}
+						}
+					} else {
+						uni.showToast({
+							title: '未找到相关实验室',
+							icon: "none",
+							mask: true,
+							duration: 2000
+						});
+					}
+				}
+			},
+			async treeselect() {
+				let self = this;
+				const {
+					data
+				} = await securityCheckOptionList({
+					searchValue: this.searchValue
+				});
+				if (data.code == 200) {
+					let list = [];
+					data.data.forEach(function(item) {
+						item.children.forEach(function(item2) {
+							item2.children.forEach(function(item3) {
+								list.push({
+									hazardCheckId1: item.id,
+									hazardCheckName1: item.name,
+									hazardCheckCode1: item.code,
+									hazardCheckId2: item2.id,
+									hazardCheckName2: item2.name,
+									hazardCheckCode2: item2.code,
+									hazardCheckId: item3.id,
+									hazardCheckName: item3.name,
+									hazardCheckCode: item3.code,
+									hazardCheckPoint: item3.mainPoint
+								})
+							})
+						})
+					})
+					this.dataList = list
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+	.hiddenDangerItemsSearch {
+		height: 100%;
+		display flex;
+		box-sizing: border-box;
+
+		#totalColor-A {
+			color: #0183FA;
+			background: rgba(1, 131, 250, 0.2);
+		}
+
+		#totalColor-B {
+			color: #16B531;
+			background: rgba(22, 181, 49, 0.2);
+		}
+
+		#totalColor-C {
+			color: #FF8C00;
+			background: rgba(255, 140, 0, 0.2);
+		}
+
+		.header {
+			width: 100%;
+			position: fixed;
+			top: 0rpx;
+			z-index: 100;
+			background: #fff;
+
+			.search {
+				width: 750rpx;
+				height: 100rpx;
+				background: #FFFFFF;
+				border-radius: 0rpx 0rpx 0rpx 0rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+
+				.search-r {
+					width: 610rpx;
+					height: 60rpx;
+					background: #FFFFFF;
+					border-radius: 50rpx 50rpx 50rpx 50rpx;
+					border: 1rpx solid #E0E0E0;
+					font-size: 24rpx;
+					color: #999999;
+					line-height: 60rpx;
+					text-align: left;
+					display: flex;
+					justify-content: flex-start;
+					align-items: center;
+					padding: 0 20rpx;
+					box-sizing: border-box;
+
+					>img {
+						width: 30rpx;
+						height: 30rpx;
+						margin-right: 20rpx;
+					}
+
+					>input {
+						width: 500rpx;
+					}
+				}
+			}
+
+			.cancel {
+				font-size: 28rpx;
+				color: #0183FA;
+				line-height: 30rpx;
+				text-align: left;
+				margin-left: 18rpx;
+			}
+		}
+
+		.list {
+			width: 750rpx;
+			background: #FFFFFF;
+			margin-top: 110rpx;
+			padding-top: 12rpx;
+			box-sizing: border-box;
+
+			.list-li {
+				min-height: 80rpx;
+				margin: 0 30rpx;
+				font-size: 29rpx;
+				color: #3D3D3D;
+				line-height: 80rpx;
+				text-align: left;
+				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 {
+						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;
+					}
+				}
+			}
+		}
+	}
+</style>

pages_safetyCheck/views/snapshotManage/snapshotList.vue

@@ -3,7 +3,8 @@
 	<view class="snapshotList">
 		<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
 			<view class="tabTitle" v-if="userType==0">
-				<view :class="tabIndex==index?'tab-A':'tab-B'" v-for="(item,index) in tabList" :key='index' @click="tabClick(index)">
+				<view :class="tabIndex==index?'tab-A':'tab-B'" v-for="(item,index) in tabList" :key='index'
+					@click="tabClick(index)">
 					{{item}}
 				</view>
 			</view>
@@ -13,35 +14,19 @@
 			</view>
 			<view v-if="pageType==0">
 				<view class="list">
-					<view class="list-li srearch">
-						<view>{{form.subName?form.subName:'实验室名称'}}（{{form.subRoom?form.subRoom:'房间号'}}）</view>
-						<view>
-							<view class="srearch-l" @click="popupClick(1)">
-								<img src="@/pages_safetyCheck/images/icon_aqjc_ss.png">
-							</view>
-							<view class="srearch-r" @click="saoCode()">
-								<img src="@/pages_safetyCheck/images/icon_aqjc_sm.png">
-							</view>
-						</view>
+					<view class="list-li srearch" @click="laboratoryClick()">
+						<view class="srearch-l">{{form.subName?form.subName:'实验室名称'}}</view>
+						<img class="srearch-r" src="@/pages_safetyCheck/images/icon_wd_gd@1x.png">
 					</view>
-					<view class="list-li">
+					<view class="list-li" style="margin-bottom: 20rpx;border:none;">
 						<view>学院单位名称</view>
 						<view>{{form.deptName}}</view>
 					</view>
-					<view class="list-li">
-						<view>检查项目</view>
-						<view @click="inspectionItemsClick()">
-							{{form.hazardCheckCode?form.hazardCheckCode:''}}{{form.hazardCheckName?form.hazardCheckName:'模糊搜索检查项'}}
-							<img src="@/pages_safetyCheck/images/icon_wd_gd@1x.png">
-						</view>
-					</view>
-					<view class="list-li">
-						<view>隐患描述</view>
+					<view class="list-li"  v-if="form.imgDtoList[0]">
+						<view>现场照片</view>
 						<view></view>
 					</view>
-					<textarea class="describe" type="text" v-model="form.hazardDescribe" maxlength="200"
-						placeholder="请填写隐患描述" placeholder-style="font-size:24rpx;color:#999;"></textarea>
-					<view class="check-for-img-max-box">
+					<view class="check-for-img-max-box" v-if="form.imgDtoList[0]">
 						<view class="left-title-p"></view>
 						<view class="right-img-box">
 							<view class="img-box" v-for="(imgUrl,imgIndex) in form.imgDtoList" :key="imgIndex">
@@ -49,19 +34,42 @@
 								<img class="position-img" src="@/pages_safetyCheck/images/icon_ssp_closure.png"
 									@click="delImg(imgIndex)">
 							</view>
-							<img class="add-button" src="@/pages_safetyCheck/images/img_ssp_pz@1x.png"
-								@click="selectImage()" v-if="form.imgDtoList.length<5">
+							<!-- 	<img class="add-button" src="@/pages_safetyCheck/images/img_ssp_pz@1x.png"
+								@click="selectImage()" v-if="form.imgDtoList.length<5"> -->
 						</view>
 					</view>
+					<picker @change="bindPickerChange" :value="pickerIndex" :range="pickerList" range-key="name">
+						<view class="list-li">
+							<view>安全类别</view>
+							<view>
+								{{pickerList[pickerIndex].name}}
+								<img src="@/pages_safetyCheck/images/icon_wd_gd@1x.png">
+							</view>
+						</view>
+					</picker>
+
+					<view class="list-li">
+						<view>隐患描述</view>
+						<view></view>
+					</view>
+					<view class="describe">
+						<textarea class="describe-n" type="text" v-model="form.hazardDescribe" maxlength="200"
+							placeholder="请填写隐患描述" placeholder-style="font-size:24rpx;color:#999;"></textarea>
+					</view>
+				</view>
+				<view class="subBtn">
+					<img class="subBtn-l" @click="saoCode()" src="@/pages_safetyCheck/images/icon_aqjc_saoma.png">
+					<img class="subBtn-c" @click="selectImage()" src="@/pages_safetyCheck/images/icon_aqjc_paizhao.png">
+					<img class="subBtn-r" @click="submitForm" src="@/pages_safetyCheck/images/icon_aqjc_tijiao.png">
 				</view>
-				<view class="subBtn" @click="submitForm">提交</view>
 			</view>
 			<!-- 上报记录 -->
 			<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 :id="item.rectifyStatus==0?'color-A':(item.rectifyStatus==1?'color-B':(item.rectifyStatus==2?'color-C':''))">
+						<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?'暂无法整改':''))}}
 							<img src="@/pages_safetyCheck/images/icon_wd_gd@1x.png">
 						</view>
@@ -84,6 +92,7 @@
 				</view>
 			</view>
 			<view class="get-data-null-p" v-if="getDataType">- 没有更多数据 -</view>
+
 		</scroll-view>
 		<view class="popup-max-box" v-if="popupType">
 			<view class="popup-null" @click="popupClick(2)"></view>
@@ -114,6 +123,7 @@
 		securityAppCheckPhotoMyAdd,
 		securityAppCheckPhotoMyList,
 		securityAppCheckPhotoRectifyList,
+		securityCheckOptionList,
 	} from '@/pages_safetyCheck/api/index.js'
 	export default {
 		name: "snapshotList",
@@ -147,7 +157,9 @@
 					pageSize: 20,
 				},
 				total: 0,
-				dataList:[],
+				dataList: [],
+				pickerIndex: 0,
+				pickerList: [],
 			}
 		},
 		onLoad(option) {
@@ -160,7 +172,7 @@
 
 		},
 		mounted() {
-
+			this.treeselect();
 		},
 		methods: {
 			//滚动事件
@@ -171,9 +183,9 @@
 				} else {
 					this.queryParams.page += 1;
 					this.$nextTick(() => {
-						if(this.pageType==1){
+						if (this.pageType == 1) {
 							this.getList();
-						}else if(this.pageType==2){
+						} else if (this.pageType == 2) {
 							this.getListTow();
 						}
 					})
@@ -215,38 +227,70 @@
 					}
 				}
 			},
+			//实验室
+			laboratoryClick(row){
+				let infoData = row;
+				uni.navigateTo({
+					url: '/pages_safetyCheck/views/snapshotManage/laboratorySearch?infoData=' + encodeURIComponent(
+						JSON.stringify(infoData))
+				});
+			},
 			//上报记录跳转详情
-			recordClick(row){
-				let infoData=row;
+			recordClick(row) {
+				let infoData = row;
 				uni.navigateTo({
-					url: '/pages_safetyCheck/views/snapshotManage/snapshotDetail?infoData=' + encodeURIComponent(JSON.stringify(infoData))
+					url: '/pages_safetyCheck/views/snapshotManage/snapshotDetail?infoData=' + encodeURIComponent(
+						JSON.stringify(infoData))
 				});
 			},
 			//隐患整改跳转详情
-			hiddenClick(row){
-				let infoData=row;
-				infoData.pageType=2;
+			hiddenClick(row) {
+				let infoData = row;
+				infoData.pageType = 2;
 				uni.navigateTo({
-					url: '/pages_safetyCheck/views/snapshotManage/snapshotItems?infoData=' + encodeURIComponent(JSON.stringify(infoData))
+					url: '/pages_safetyCheck/views/snapshotManage/snapshotItems?infoData=' + encodeURIComponent(
+						JSON.stringify(infoData))
 				});
 			},
+			//安全类别
+			bindPickerChange(data) {
+				this.pickerIndex = data.detail.value;
+				this.form.hazardCheckName = this.pickerList[data.detail.value].name
+				console.log(data)
+			},
+			//隐患项
+			async treeselect() {
+				let self = this;
+				const {
+					data
+				} = await securityCheckOptionList({
+					searchValue: this.searchValue
+				});
+				if (data.code == 200) {
+					let list = [];
+					data.data.forEach(function(item) {
+						list.push(item)
+					})
+					this.pickerList = list
+				}
+			},
 			tabClick(index) {
 				this.tabIndex = index;
 				this.pageType = index;
-				this.dataList=[];
-				if(index==1){
+				this.dataList = [];
+				if (index == 1) {
 					this.getList();
-				}else if(index==2){
+				} else if (index == 2) {
 					this.getListTow();
 				}
 			},
 			tabClickTow(index) {
 				this.tabIndexTow = index;
 				this.pageType = index;
-				this.dataList=[];
-				if(index==1){
+				this.dataList = [];
+				if (index == 1) {
 					this.getList();
-				}else if(index==2){
+				} else if (index == 2) {
 					this.getListTow();
 				}
 			},
@@ -267,13 +311,13 @@
 					sizeType: ["original", "compressed"],
 					sourceType: ["album", "camera"],
 					success: function(res) {
-						if(res.tempFilePaths[0]){
-							res.tempFilePaths.forEach(function(item,index){
-									self.uploadImg(item);
+						if (res.tempFilePaths[0]) {
+							res.tempFilePaths.forEach(function(item, index) {
+								self.uploadImg(item);
 							})
 						}
-						
-						
+
+
 					}
 				});
 			},
@@ -338,7 +382,7 @@
 					data
 				} = await laboratorySubRelInfoGetRelList({
 					'searchValue': this.form.searchValue,
-					'subId':this.form.subId,
+					'subId': this.form.subId,
 				});
 				if (data.code == 200) {
 					if (data.data[0]) {
@@ -399,14 +443,7 @@
 					}
 				});
 			},
-			//搜索项跳转
-			inspectionItemsClick() {
-				this.form.pageType=1;//1随手拍检查项
-				uni.navigateTo({
-					url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItemsSearch?form=' + encodeURIComponent(
-						JSON.stringify(this.form))
-				});
-			},
+
 			//上报
 			async submitForm() {
 				let self = this;
@@ -428,7 +465,7 @@
 					});
 					return
 				}
-				if (this.form.imgDtoList.length<=0) {
+				if (this.form.imgDtoList.length <= 0) {
 					uni.showToast({
 						title: '请选择现场照片!',
 						icon: "none",
@@ -447,13 +484,14 @@
 						mask: true,
 						duration: 2000
 					});
-					let infoData={
-						photoId:data.data
+					let infoData = {
+						photoId: data.data
 					};
 					uni.navigateTo({
-						url: '/pages_safetyCheck/views/snapshotManage/snapshotDetail?infoData=' + encodeURIComponent(JSON.stringify(infoData))
+						url: '/pages_safetyCheck/views/snapshotManage/snapshotDetail?infoData=' +
+							encodeURIComponent(JSON.stringify(infoData))
 					});
-					
+
 				}
 			},
 
@@ -547,39 +585,39 @@
 
 
 		.list {
-			width: 690rpx;
+			width: 750rpx;
 			min-height: 765rpx;
-			background: #FFFFFF;
-			border-radius: 20rpx 20rpx 20rpx 20rpx;
-			margin: 20rpx 0 0 30rpx;
+			margin: 20rpx 0 0 0;
 
 			.list-li {
+				height: 100rpx;
 				display: flex;
 				justify-content: space-between;
 				border-bottom: 1rpx solid #E0E0E0;
-				padding: 0 22rpx 0 28rpx;
+				padding: 0 30rpx;
 				box-sizing: border-box;
+				background: #FFFFFF;
 
 				>view:nth-of-type(1) {
 					font-size: 30rpx;
 					color: #333333;
-					line-height: 80rpx;
+					line-height: 100rpx;
 					text-align: left;
 				}
 
 				>view:nth-of-type(2) {
 					font-size: 28rpx;
 					color: #666666;
-					line-height: 80rpx;
+					line-height: 100rpx;
 					text-align: left;
 					display: flex;
 					justify-content: flex-start;
 					align-items: center;
 
 					>img {
-						width: 24rpx;
-						height: 24rpx;
-						margin-left: 8rpx;
+						width: 30rpx;
+						height: 30rpx;
+						margin-left: 16rpx;
 					}
 				}
 
@@ -597,42 +635,46 @@
 			}
 
 			.srearch {
-				.srearch-l {
-					width: 60rpx;
-					height: 60rpx;
-					margin-right: 40rpx;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
 
-					>img {
-						width: 30rpx;
-						height: 30rpx;
-						margin: 15rpx 0 0 15rpx;
-					}
+				.srearch-l {
+					font-size: 30rpx;
+					color: #333333;
+					line-height: 100rpx;
+					text-align: left;
 				}
 
 				.srearch-r {
-					width: 60rpx;
-					height: 60rpx;
-
-					>img {
-						width: 30rpx;
-						height: 30rpx;
-						margin: 15rpx 0 0 15rpx;
-					}
+					width: 30rpx;
+					height: 30rpx;
+					margin-right: 0rpx;
 				}
 			}
 
 			.describe {
-				width: 636rpx;
-				height: 120rpx;
-				border-radius: 10rpx 10rpx 10rpx 10rpx;
-				border: 1rpx solid #E0E0E0;
-				margin: 20rpx 0 0 28rpx;
-				padding: 12rpx 16rpx;
-				box-sizing: border-box;
+				width: 750rpx;
+				background: #fff;
+				overflow: hidden;
+
+				.describe-n {
+					width: 690rpx;
+					min-height: 180rpx;
+					border-radius: 10rpx 10rpx 10rpx 10rpx;
+					border: 1rpx solid #E0E0E0;
+					margin: 40rpx;
+					padding: 22rpx;
+					box-sizing: border-box;
+					background: #F5F5F5;
+				}
 			}
 
 			.check-for-img-max-box {
-				margin: 20px 28rpx;
+				padding: 20px 28rpx;
+				box-sizing: border-box;
+				background: #fff;
+				border-bottom: 1rpx solid #E0E0E0;
 
 				.left-title-p {
 					width: 100%;
@@ -767,18 +809,18 @@
 		}
 
 		.subBtn {
-			width: 690rpx;
-			height: 100rpx;
-			background: #0183FA;
-			border-radius: 50rpx 50rpx 50rpx 50rpx;
-			font-weight: 400;
-			font-size: 30rpx;
-			color: #FFFFFF;
-			line-height: 100rpx;
-			text-align: center;
+			width: 750rpx;
 			position: fixed;
-			left: 30rpx;
-			bottom: 10rpx;
+			bottom: 30rpx;
+			display: flex;
+			justify-content: space-between;
+			padding: 0 50rpx;
+			box-sizing: border-box;
+
+			>img {
+				width: 130rpx;
+				height: 130rpx;
+			}
 		}
 
 		/* 上报记录 */
@@ -912,15 +954,16 @@
 		}
 
 		#color-C {
-			
+
 			color: #FF8C00;
 		}
+
 		.get-data-null-p {
 			text-align: center;
 			height: 100rpx;
 			line-height: 100rpx;
 			color: #999;
-			padding-bottom:200rpx;
+			padding-bottom: 200rpx;
 		}
 	}
 </style>