Merge branch 'gzu_1st_main_20260903(安全检查)' into SCHOOL-gzu-1st(贵州大学发布分支)

pages_safetyCheck/views/inspectManage/conductInspections.vue

@@ -42,6 +42,25 @@
 					<view>隐患描述</view>
 					<view></view>
 				</view>
+				<view class="list-button-max-box">
+					<view class="list-button-title-box">隐患级别</view>
+					<view class="list-button-big-box" 
+					:class="form.dangerLevel == 1?'list-button-big-box-check':''"
+					@click="checkDangerLevel(1)">
+						<view class="check-left-button">
+							<view></view>
+						</view>
+						<view>一般隐患</view>
+					</view>
+					<view class="list-button-big-box" 
+					:class="form.dangerLevel == 2?'list-button-big-box-check':''"
+					@click="checkDangerLevel(2)">
+						<view class="check-left-button">
+							<view></view>
+						</view>
+						<view>重大隐患</view>
+					</view>
+				</view>
 				<view class="describe">
 					<textarea v-if="!form.checkFlag && !checkItemModuleType" cursor-spacing="40" class="describe-n" type="text"
 						v-model="form.hazardDescribe" maxlength="200" placeholder="请填写隐患描述"
@@ -109,6 +128,7 @@
 			return {
 				baseUrl: config.base_url,
 				form: {
+					dangerLevel:1,
 					checkFlag: false,
 					photoList: [],
 					voiceList: [],
@@ -157,6 +177,10 @@
 			}
 		},
 		methods: {
+			//选择隐患级别
+			checkDangerLevel(type){
+				this.$set(this.form,'dangerLevel',type);
+			},
 			//折叠展开
 			inspectDot() {
 				
@@ -204,6 +228,7 @@
 						// list=data.data.hazardCheckPoint.split('#');
 						// this.$set(this.form, 'hazardDescribe', list[0]);
 					}
+					this.$set(this.form, 'dangerLevel', data.data.dangerLevel ? data.data.dangerLevel : 1);
 					this.$set(this.form, 'photoList', data.data.photoList ? data.data.photoList : []);
 					this.$set(this.form, 'voiceList', data.data.voiceList ? data.data.voiceList : []);
 
@@ -302,6 +327,7 @@
 				let obj = {
 					checkFlag: this.form.checkFlag,
 					checkStatus: 1,
+					dangerLevel: this.form.dangerLevel,
 					hazardDescribe: this.form.hazardDescribe,
 					photoList: this.form.photoList,
 					voiceList: this.form.voiceList,
@@ -659,7 +685,44 @@
 				}
 
 			}
-
+			.list-button-max-box{
+				background-color: #fff;
+				display: flex;
+				.list-button-title-box{
+					line-height:40rpx;
+					width:200rpx;
+					padding:30rpx 30rpx 0 30rpx;
+				}
+				.list-button-big-box{
+					padding:30rpx 30rpx 0 0;
+					margin-right:40rpx;
+					display: flex;
+					.check-left-button{
+						width:28rpx;
+						height:28rpx;
+						border-radius:50%;
+						border:1rpx solid #0183fa;
+						margin:5rpx 20rpx 0 0;
+					}
+					view:nth-child(2){
+						line-height:40rpx;
+					}
+				}
+				.list-button-big-box-check{
+					.check-left-button{
+						view{
+							margin:5rpx;
+							width:20rpx;
+							height:20rpx;
+							background-color:#0183fa;
+							border-radius:50%;
+						}
+					}
+					view:nth-child(2){
+						line-height:40rpx;
+					}
+				}
+			}
 			.hidden-content {
 				width: 630rpx;
 				min-height: 200rpx;

pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail.vue

@@ -32,6 +32,12 @@
 						<view>隐患描述</view>
 						<view></view>
 					</view>
+					<view class="list-button-max-box">
+						<view class="list-button-title-box">隐患级别</view>
+						<view class="list-button-big-box list-button-big-box-check">
+							<view>{{newData.dangerLevel==1?'一般隐患':'重大隐患'}}</view>
+						</view>
+					</view>
 					<view class="hidden" v-if="!newData.checkFlag">
 						<view class="hidden-content">{{newData.hazardDescribe}}</view>
 					</view>
@@ -696,7 +702,30 @@
 		box-sizing: border-box;
 		padding-bottom: 160rpx;
 		box-sizing: border-box;
-
+		.list-button-max-box{
+			background-color: #fff;
+			display: flex;
+			.list-button-title-box{
+				line-height:40rpx;
+				width:200rpx;
+				padding:30rpx 30rpx 0 30rpx;
+			}
+			.list-button-big-box{
+				padding:30rpx 30rpx 0 0;
+				flex:1;
+				display: flex;
+				view:nth-child(1){
+					flex:1;
+					text-align: right;
+					line-height:40rpx;
+				}
+			}
+			.list-button-big-box-check{
+				view:nth-child(1){
+					line-height:40rpx;
+				}
+			}
+		}
 		.tip {
 			width: 750rpx;
 			height: 80rpx;

pages_safetyCheck/views/itemsManage/hiddenDangerRectification.vue

@@ -23,6 +23,12 @@
 					</view>
 				</view>
 				<view v-if="newData.checkCollapse">
+					<view class="list-button-max-box">
+						<view class="list-button-title-box">隐患级别</view>
+						<view class="list-button-big-box list-button-big-box-check">
+							<view>{{newData.dangerLevel==1?'一般隐患':'重大隐患'}}</view>
+						</view>
+					</view>
 					<view class="hidden-content" v-if="!newData.checkFlag">{{newData.hazardDescribe}}
 					</view>
 					<view class="photo" @click="lockImg(newData.yhDtoList)">
@@ -561,6 +567,44 @@
 		padding-bottom: 160rpx;
 		box-sizing: border-box;
 
+		.list-button-max-box{
+			background-color: #fff;
+			display: flex;
+			.list-button-title-box{
+				line-height:40rpx;
+				width:200rpx;
+				padding:30rpx 30rpx 0 30rpx;
+			}
+			.list-button-big-box{
+				padding:30rpx 30rpx 0 0;
+				margin-right:40rpx;
+				display: flex;
+				.check-left-button{
+					width:28rpx;
+					height:28rpx;
+					border-radius:50%;
+					border:1rpx solid #0183fa;
+					margin:5rpx 20rpx 0 0;
+				}
+				view:nth-child(2){
+					line-height:40rpx;
+				}
+			}
+			.list-button-big-box-check{
+				.check-left-button{
+					view{
+						margin:5rpx;
+						width:20rpx;
+						height:20rpx;
+						background-color:#0183fa;
+						border-radius:50%;
+					}
+				}
+				view:nth-child(2){
+					line-height:40rpx;
+				}
+			}
+		}
 		#bgColor-A {
 			color: #FFD400;
 		}