heyang

pages_safetyCheck/views/inspectManage/hiddenDangerRecord.vue

@@ -7,7 +7,7 @@
 				<view class="list-li" v-for="(item,index) in dataList">
 					<view>{{item.name}}</view>
 					<view>{{item.time}}
-						<img  src="@/pages_safetyCheck/images/icon_wd_gd@1x.png">
+						<img src="@/pages_safetyCheck/images/icon_wd_gd@1x.png">
 					</view>
 				</view>
 			</view>
@@ -30,26 +30,24 @@
 			return {
 				baseUrl: config.base_url,
 				pageType: 0,
-				dataList:[
-					{
-						name:'检查时间',
-						time:'2024-09-06',
+				dataList: [{
+						name: '检查时间',
+						time: '2024-09-06',
 					},
 					{
-						name:'检查时间',
-						time:'2024-09-06',
+						name: '检查时间',
+						time: '2024-09-06',
 					},
 					{
-						name:'检查时间',
-						time:'2024-09-06',
+						name: '检查时间',
+						time: '2024-09-06',
 					},
 				]
-				
+
 			}
 		},
 		onLoad(option) {
-
-
+			this.$set(this, 'newData', JSON.parse(decodeURIComponent(option.infoData)));
 		},
 		onShow() {
 
@@ -60,7 +58,7 @@
 		methods: {
 			//滚动事件
 			scrollGet() {},
-			
+
 
 		}
 	}
@@ -70,35 +68,40 @@
 	.hiddenDangerRecord {
 		height: 100%;
 		display flex;
-		.tip{
+
+		.tip {
 			width: 750rpx;
 			height: 80rpx;
-			background: rgba(255,140,0,0.2);
+			background: rgba(255, 140, 0, 0.2);
 			border-radius: 0rpx 0rpx 0rpx 0rpx;
 			font-size: 30rpx;
 			color: #FF8C00;
 			line-height: 80rpx;
 			text-align: center;
 		}
-		.list{
+
+		.list {
 			width: 690rpx;
 			background: #FFFFFF;
 			border-radius: 20rpx 20rpx 20rpx 20rpx;
 			margin: 20rpx 30rpx 0;
-			.list-li{
+
+			.list-li {
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
 				border-bottom: 1rpx solid #E0E0E0;
 				padding: 0 30rpx;
 				box-sizing: border-box;
-				>view:nth-of-type(1){
+
+				>view:nth-of-type(1) {
 					font-size: 30rpx;
 					color: #333333;
 					line-height: 100rpx;
 					text-align: left;
 				}
-				>view:nth-of-type(2){
+
+				>view:nth-of-type(2) {
 					font-size: 28rpx;
 					color: #666666;
 					line-height: 100rpx;
@@ -106,17 +109,19 @@
 					display: flex;
 					justify-content: space-between;
 					align-items: center;
-					>img{
+
+					>img {
 						width: 24rpx;
 						height: 24rpx;
 						margin-left: 10rpx;
 					}
 				}
 			}
-			.list-li:last-of-type{
+
+			.list-li:last-of-type {
 				border: none;
 			}
 		}
-		
+
 	}
 </style>

pages_safetyCheck/views/inspectManage/inspectAdd.vue

@@ -3,15 +3,6 @@
 	<view class="inspectAdd">
 		<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
 			<view class="tip">第一次检查</view>
-			<view class="title">
-				<view class="title-l">
-					<view class="title-l-t">{{newData.data10}}</view>
-					<view class="title-l-b">
-						<view v-for="(item,index) in newData.data11" :key="index">{{item}}</view>
-					</view>
-				</view>
-				<img class="title-r" src="@/pages_safetyCheck/images/icon_wd_gd@1x.png">
-			</view>
 			<view class="items">
 				<view class="items-t">
 					<view class="items-t-r">{{newData.data3}}</view>
@@ -67,7 +58,7 @@
 				<view class="voice-btn">
 					<img class="voice_t_r" src="@/pages_safetyCheck/images/icon_sskz_azsh.png"
 						@longpress.stop="recordButton(item,$event)" @touchmove.stop="cancelButton"
-						@touchend.stop="sendButton(item,$event)"/>
+						@touchend.stop="sendButton(item,$event)" />
 					<text>按住说话</text>
 				</view>
 			</view>
@@ -110,15 +101,15 @@
 					data11: ['校级检查', '全面检查', '交叉检查'],
 					rectificationStatus: 0, //整改状态 0待整改 1暂无法整改 2已整改
 				},
-				voiceList: [
-					{
+				voiceList: [{
 					'times': '10',
 					'url': '2312312'
-					},
-				],
+				}, ],
 			}
 		},
-		onLoad(option) {},
+		onLoad(option) {
+			//this.$set(this, 'newData', JSON.parse(decodeURIComponent(option.infoData)));
+		},
 		onShow() {
 
 		},
@@ -382,56 +373,7 @@
 			text-align: center;
 		}
 
-		.title {
-			width: 690rpx;
-			height: 150rpx;
-			background: #FFFFFF;
-			border-radius: 20rpx 20rpx 20rpx 20rpx;
-			margin: 20rpx 30rpx 0;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			padding: 0 30rpx;
-			box-sizing: border-box;
-
-			.title-l {
-				width: 594rpx;
-
-				.title-l-t {
-					font-size: 30rpx;
-					color: #333333;
-					line-height: 42rpx;
-					text-align: left;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					white-space: nowrap;
-				}
-
-				.title-l-b {
-					display: flex;
-					justify-content: flex-start;
-					margin-top: 16rpx;
-
-					>view {
-						width: 130rpx;
-						height: 50rpx;
-						background: rgba(1, 131, 250, 0.2);
-						border-radius: 6rpx 6rpx 6rpx 6rpx;
-						font-size: 24rpx;
-						color: #0183FA;
-						line-height: 50rpx;
-						text-align: center;
-						margin-right: 14rpx;
-					}
-				}
-			}
-
-			.title-r {
-				width: 24rpx;
-				height: 24rpx;
-			}
-		}
-
+		
 		.items {
 			width: 690rpx;
 			min-height: 165rpx;
@@ -719,17 +661,20 @@
 					margin-left: 20rpx;
 				}
 			}
-			.voice-btn{
+
+			.voice-btn {
 				width: 150rpx;
 				height: 150rpx;
 				position: relative;
-				margin:62rpx 0 0 238rpx;
-				>img{
+				margin: 62rpx 0 0 238rpx;
+
+				>img {
 					width: 150rpx;
 					height: 150rpx;
 					position: absolute;
 				}
-				>text{
+
+				>text {
 					font-size: 24rpx;
 					color: #999999;
 					line-height: 30rpx;

pages_safetyCheck/views/inspectManage/inspectList.vue

@@ -2,8 +2,8 @@
 <template>
 	<view class="snapshotList">
 		<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
-			<view class="title">
-				<view class="title-l" @click="planClick()">
+			<view class="title" @click="planClick()">
+				<view class="title-l" >
 					<view class="title-l-t">{{newData.data10}}</view>
 					<view class="title-l-b">
 						<view v-for="(item,index) in newData.data11" :key="index">{{item}}</view>
@@ -116,8 +116,8 @@
 			}
 		},
 		onLoad(option) {
-			this.$set(this, 'newData', JSON.parse(decodeURIComponent(option.infoData)));
-			this.pageType = this.newData.pageType;
+			//this.$set(this, 'newData', JSON.parse(decodeURIComponent(option.infoData)));
+			this.pageType = option.infoData.pageType;
 			console.log( this.newData)
 			uni.setNavigationBarTitle({
 				title: '第1次检查'

pages_safetyCheck/views/itemsManage/hiddenDangerItems.vue

@@ -22,11 +22,11 @@
 		<view class="list">
 			<view class="total">待整改共2项</view>
 			<view class="list-li" v-for="(item,index) in dataList">
-				<view class="list-li-t">
+				<view class="list-li-t" @click="itemsClick(item)">
 					<img src="@/pages_safetyCheck/images/icon_xz_fc@1x.png">
 					<view>{{item.name}}</view>
 				</view>
-				<view class="list-li-b">此检查项在当前实验室累计出现<text>{{item.num}}</text>次隐患</view>
+				<view class="list-li-b" @click="hiddenDangerClick(item)">此检查项在当前实验室累计出现<text>{{item.num}}</text>次隐患</view>
 			</view>
 		</view>
 	</view>
@@ -103,8 +103,19 @@
 			dialogClose() {
 				this.dialogVisible = false;
 			},
-			quotaClick(index) {
-				this.quotaIndex = index
+			itemsClick(row){
+				let infoData=row;
+				infoData.pageType=this.pageType;
+				uni.redirectTo({
+					url: '/pages_safetyCheck/views/inspectManage/inspectAdd?infoData=' + encodeURIComponent(JSON.stringify(infoData))
+				});
+			},
+			hiddenDangerClick(row){
+				let infoData=row;
+				infoData.pageType=this.pageType;
+				uni.redirectTo({
+					url: '/pages_safetyCheck/views/inspectManage/hiddenDangerRecord?infoData=' + encodeURIComponent(JSON.stringify(infoData))
+				});
 			},
 
 		}

pages_safetyCheck/views/planDetail.vue

@@ -105,7 +105,7 @@
 		},
 		onLoad(option) {
 
-			this.$set(this, 'newData', JSON.parse(decodeURIComponent(option.infoData)));
+			//this.$set(this, 'newData', JSON.parse(decodeURIComponent(option.infoData)));
 		},
 		onShow() {