From d63ffc1e9ed1d45e15c88d0f47b6de964be7275a Mon Sep 17 00:00:00 2001
From: xielei <xllove1314>
Date: Thu, 31 Oct 2024 17:39:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/skInfo/detail/index.vue |  17 +-
 pages/skInfo/index.vue        |  47 ++--
 pages/xcrw/detail/dbForm.vue  | 461 +++++++++++++++++-----------------
 pages/yj/detail/aiyj.vue      |  21 +-
 pages/yj/detail/qxyj.vue      |   6 +-
 pages/yj/detail/wyyj.vue      |  18 +-
 pages/yj/index.vue            |  15 +-
 7 files changed, 311 insertions(+), 274 deletions(-)

diff --git a/pages/skInfo/detail/index.vue b/pages/skInfo/detail/index.vue
index 30d32d9..4ecff59 100644
--- a/pages/skInfo/detail/index.vue
+++ b/pages/skInfo/detail/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<view :style="{height:'100vh',overflow:'hidden',backgroundColor:'#f0f0f0'}">
-		<u-navbar title="小玉潭水库" :autoBack="true" :titleStyle="{
+		<u-navbar title="小玉潭水库1" :autoBack="true" :titleStyle="{
 				fontSize:'18px'
 			}" :height='44' :safeAreaInsetTop=true leftIconSize='20' leftIconColor='rgb(153, 153, 153)'>
 		</u-navbar>
@@ -47,8 +47,9 @@
 				}]
 			};
 		},
-		mounted() {
-
+		onLoad() {
+			console.log('小玉潭水库');
+			this.getList()
 		},
 		methods: {
 			click(item) {
@@ -58,11 +59,11 @@
 				console.log(e);
 				this.nowNum = e.current+1
 			},
-			// getList(){
-			// 	uni.$http.post('/gunshiApp/xyt/stQxWarnR/home/warn',this.model).then(res=>{
-
-			// 	})
-			// },
+			getList(){
+				uni.$http.post('/gunshiApp/xyt/attResBase/list',this.model).then(res=>{
+					console.log(res,'res');
+				})
+			},
 			confirm(e) {
 				console.log(e);
 				this.model.start = e[0]
diff --git a/pages/skInfo/index.vue b/pages/skInfo/index.vue
index b0a0c4d..61288aa 100644
--- a/pages/skInfo/index.vue
+++ b/pages/skInfo/index.vue
@@ -3,10 +3,10 @@
 		<view class="title">
 			<view class="left">
 				<u-icon name="file-text" color="origin"></u-icon>
-				<text>小玉潭水库</text>
+				<text>{{dataform.resName}}</text>
 			</view>
 			<view class="right">
-				2024-08-12 11:00
+				{{tm}}
 			</view>
 		</view>
 		<view class="content">
@@ -37,42 +37,55 @@
 </template>
 
 <script>
+	import moment from 'moment'
 	export default{
 		data(){
 			return{
 				list:{
 					1:'当前水位m',
 					2:'今日雨量mm',
-					3:'汛限水位m',
+					'flLowLimLev':'汛限水位m',
 					4:'比汛期m',
-					5:'堰顶高程m',
-					6:'坝顶高程m',
+					'wcrstel':'堰顶高程m',
+					'crestElev':'坝顶高程m',
 					7:'24h预报',
 					8:'昨日雨量',
-					9:'总库容m³',
+					'totCap':'总库容m³',
 					10:'蓄水量万m³'
 				},
+				tm:	moment().format('YYYY-MM-DD HH:mm:ss'),
 				dataform:{
-					1:192.41,
-					2:112,
-					3:194.00,
-					4:-1.59,
-					5:194.00,
-					6:196.28,
-					7:12,
-					8:15.4,
-					9:129.06,
-					10:75.34
+					// resName:'',
+					// 1:192.41,
+					// 2:112,
+					// 3:194.00,
+					// 4:-1.59,
+					// 5:194.00,
+					// 6:196.28,
+					// 7:12,
+					// 8:15.4,
+					// 9:129.06,
+					// 10:75.34
 				}
 				
 			}
 		},
+		mounted() {
+			console.log('小玉潭水库222');
+			this.getList()
+		},
 		methods:{
 			toDetail(){
 				uni.navigateTo({
 					url:'/pages/skInfo/detail/index'
 				})
-			}
+			},
+			getList(){
+				uni.$http.post('/gunshiApp/xyt/attResBase/list').then(res=>{
+					console.log(res.data.data[0]);
+					this.dataform=res.data.data[0]
+				})
+			},
 		}
 	}
 </script>
diff --git a/pages/xcrw/detail/dbForm.vue b/pages/xcrw/detail/dbForm.vue
index 68bc3a4..dbacff0 100644
--- a/pages/xcrw/detail/dbForm.vue
+++ b/pages/xcrw/detail/dbForm.vue
@@ -1,297 +1,288 @@
 <template>
 	<view class="contentItem">
-		<uni-collapse >
-			  	
-			<uni-collapse-item 
-			title-border="none" 
-			v-for="(item,index) in listData" 
-			:key="index" 
-			:border="false" 
-			:show-animation="true"
-			>
-				<template v-slot:title >
-				<view style="display: flex;align-items: center;">
-				<text class="yuandian"></text>
-				<text>{{item.name}}</text>
-				<text style="margin-left: auto; color:#ff0000">{{getIsItem(item.children)}}项未填写</text>
-				</view>	
-			   </template>
+		<uni-collapse>
+
+			<uni-collapse-item title-border="none" v-for="(item,index) in listData" :key="index" :border="false"
+				:show-animation="true">
+				<template v-slot:title>
+					<view style="display: flex;align-items: center;">
+						<text class="yuandian"></text>
+						<text>{{item.name}}</text>
+						<text style="margin-left: auto; color:#ff0000">{{getIsItem(item.children)}}项未填写</text>
+					</view>
+				</template>
 				<view class="xj-content">
 					<view class="xj-text" v-for="(o,i) in item.children" :key="i">
 						<text>{{o.itemDesc}}</text>
 						<view class="subsectioin">
-							<u--form labelPosition="left" :model="o"  ref="uForm">
-								<u-form-item label="状态" prop="isNormal" borderBottom 
-								    required>
-								    <u-subsection
-								    :list="list" 
-								    :current="getNormal(o.isNormal)" 
-								    mode="subsection"
-									@change="(e)=>change(e,o,index,i,'isNormal')"
-								    style="width:200px;margin-left: 10px"
-								    ></u-subsection>
+							<u--form labelPosition="left" :model="o" ref="uForm">
+								<u-form-item label="状态" prop="isNormal" borderBottom required>
+									<u-subsection :list="list" :current="getNormal(o.isNormal)" mode="subsection"
+										@change="(e)=>change(e,o,index,i,'isNormal')"
+										style="width:200px;margin-left: 10px"></u-subsection>
 								</u-form-item>
-								<view class="" v-if="o.isNormal">					
-							    <u-form-item label="现场图片" prop="inspectPics" borderBottom 
-							        required>
-							        <u-upload accept="image" :fileList="o.inspectPics" @afterRead="(e)=>afterRead(e,o,index,i)" @delete="(e)=>deletePic(e,o,index,i)" name="inspectPics" multiple
-							            :maxCount="10"></u-upload>
-							    </u-form-item>
-							    <u-form-item label="现场视频" prop="inspectVideos" borderBottom 
-							       >
-							        <u-upload accept="video" :fileList="o.inspectVideos" @afterRead="(e)=>afterRead(e,o,index,i)" @delete="(e)=>deletePic(e,o,index,i)" name="inspectVideos" multiple
-							            :maxCount="10"></u-upload>
-							    </u-form-item>
-								<u-form-item label="问题描述" prop="itemProblemDesc" borderBottom 
-								    required>
-								    <u--textarea v-model="o.itemProblemDesc" placeholder="请输入内容"></u--textarea>
-								</u-form-item>
-								<u-form-item label="处理状态" prop="isHandle" borderBottom
-								    required>
-								    <u-subsection
-								    :list="listStatus" 
-								    :current="getHandle(o.isHandle)" 
-									mode="subsection"
-									@change="(e)=>change(e,o,index,i,'isHandle')"
-								    style="width:200px;margin-left: 10px"
-								    ></u-subsection>
-								</u-form-item>
-								<view class="" v-if="o.isHandle !== 1">
-								<u-form-item label="现场图片" prop="handlePics" borderBottom
-								    required>
-								    <u-upload accept="image" :fileList="o.handlePics" @afterRead="(e)=>afterRead(e,o,index,i)" @delete="(e)=>deletePic(e,o,index,i)" name="handlePics" multiple
-								        :maxCount="10"></u-upload>
-								</u-form-item>
-								<u-form-item label="现场视频" prop="handleVideos" borderBottom 
-								   >
-								    <u-upload accept="video" :fileList="o.handleVideos" @afterRead="(e)=>afterRead(e,o,index,i)" @delete="(e)=>deletePic(e,o,index,i)" name="handleVideos" multiple
-								        :maxCount="10"></u-upload>
-								</u-form-item>
-								<u-form-item label="问题描述" prop="handleDesc" borderBottom 
-								   required>
-								    <u--textarea v-model="o.handleDesc" placeholder="请输入内容"></u--textarea>
-								</u-form-item>
-								</view>
-								<view class="" v-if="o.isHandle == 1">
-								<u-form-item label="责任人" prop="handleUserId" borderBottom @click="showSex = true; hideKeyboard()" required
-								   >
-								    <u--input v-model="o.handleUserId" disabled disabledColor="#ffffff" placeholder="请选择性别"
-								        border="none"></u--input>
-								    <u-icon slot="right" name="arrow-right"></u-icon>
-								</u-form-item>
-								
-								</view>
+								<view class="" v-if="o.isNormal">
+									<u-form-item label="现场图片" prop="inspectPics" borderBottom required>
+										<u-upload accept="image" :fileList="o.inspectPics"
+											@afterRead="(e)=>afterRead(e,o,index,i)"
+											@delete="(e)=>deletePic(e,o,index,i)" name="inspectPics" multiple
+											:maxCount="10"></u-upload>
+									</u-form-item>
+									<u-form-item label="现场视频" prop="inspectVideos" borderBottom>
+										<u-upload accept="video" :fileList="o.inspectVideos"
+											@afterRead="(e)=>afterRead(e,o,index,i)"
+											@delete="(e)=>deletePic(e,o,index,i)" name="inspectVideos" multiple
+											:maxCount="10"></u-upload>
+									</u-form-item>
+									<u-form-item label="问题描述" prop="itemProblemDesc" borderBottom required>
+										<u--textarea v-model="o.itemProblemDesc" placeholder="请输入内容"></u--textarea>
+									</u-form-item>
+									<u-form-item label="处理状态" prop="isHandle" borderBottom required>
+										<u-subsection :list="listStatus" :current="getHandle(o.isHandle)"
+											mode="subsection" @change="(e)=>change(e,o,index,i,'isHandle')"
+											style="width:200px;margin-left: 10px"></u-subsection>
+									</u-form-item>
+									<view class="" v-if="o.isHandle !== 1">
+										<u-form-item label="现场图片" prop="handlePics" borderBottom required>
+											<u-upload accept="image" :fileList="o.handlePics"
+												@afterRead="(e)=>afterRead(e,o,index,i)"
+												@delete="(e)=>deletePic(e,o,index,i)" name="handlePics" multiple
+												:maxCount="10"></u-upload>
+										</u-form-item>
+										<u-form-item label="现场视频" prop="handleVideos" borderBottom>
+											<u-upload accept="video" :fileList="o.handleVideos"
+												@afterRead="(e)=>afterRead(e,o,index,i)"
+												@delete="(e)=>deletePic(e,o,index,i)" name="handleVideos" multiple
+												:maxCount="10"></u-upload>
+										</u-form-item>
+										<u-form-item label="问题描述" prop="handleDesc" borderBottom required>
+											<u--textarea v-model="o.handleDesc" placeholder="请输入内容"></u--textarea>
+										</u-form-item>
+									</view>
+									<view class="" v-if="o.isHandle == 1">
+										<u-form-item label="责任人" prop="handleUserId" borderBottom
+											@click="showSex = true; hideKeyboard()" required>
+											<u--input v-model="o.handleUserId" disabled disabledColor="#ffffff"
+												placeholder="请选择性别" border="none"></u--input>
+											<u-icon slot="right" name="arrow-right"></u-icon>
+										</u-form-item>
+
+									</view>
 								</view>
 							</u--form>
 							<u-action-sheet :show="showSex" :actions="actions" title="请选择性别" description="如果选择保密会报错"
-							    @close="showSex = false" @select="sexSelect">
+								@close="showSex = false" @select="sexSelect">
 							</u-action-sheet>
 						</view>
 					</view>
 				</view>
-			</uni-collapse-item >
-				
+			</uni-collapse-item>
+<view class="" style="display: flex;">
+			<u-button  text="保存" customStyle="margin-top: 50px" @click="submit"></u-button>
+			<u-button type="primary" text="结束巡检" customStyle="margin-top: 50px" @click="submit"></u-button>
+		</view>
 		</uni-collapse>
-		<u-button type="primary" text="结束巡检" customStyle="margin-top: 50px" @click="submit"></u-button>
+		
+		
 	</view>
 </template>
 
 <script>
-	export default{
-		props:{
-		  xjItem:Array
+	export default {
+		props: {
+			xjItem: Array
 		},
-		data(){
-			return{
-				list:["正常","异常"],
-				listStatus:["已处理","未处理"],
-				current:0,
-				listData:[],
-				showSex:false,
+		data() {
+			return {
+				list: ["正常", "异常"],
+				listStatus: ["已处理", "未处理"],
+				current: 0,
+				listData: [],
+				showSex: false,
 				actions: [{
-				    name: '男',
-				},
-				{
-				    name: '女',
-				},
-				{
-				    name: '保密',
-				},
+						name: '男',
+					},
+					{
+						name: '女',
+					},
+					{
+						name: '保密',
+					},
 				],
 			}
 		},
 		mounted() {
 			// this.listData = this.xjItem
 		},
-		watch:{
-			xjItem:function(n,o){
-				
-				this.listData = n.map(item=>{
-				 item.childen=item.children.map(i=>{
-						if(!i.handlePics){
-							i.handlePics=[]
+		watch: {
+			xjItem: function(n, o) {
+
+				this.listData = n.map(item => {
+					item.childen = item.children.map(i => {
+						if (!i.handlePics) {
+							i.handlePics = []
 						}
-						if(!i.handleVideos){
-							i.handleVideos=[]
+						if (!i.handleVideos) {
+							i.handleVideos = []
 						}
-						if(!i.inspectPics){
-							i.inspectPics=[]
+						if (!i.inspectPics) {
+							i.inspectPics = []
 						}
-						if(!i.inspectVideos){
-							i.inspectVideos=[]
+						if (!i.inspectVideos) {
+							i.inspectVideos = []
 						}
 						return i
 					})
 					return item
 				})
-				console.log(n,this.listData,'this.listData ');
+				console.log(n, this.listData, 'this.listData ');
 			}
 		},
-		methods:{
-			getIsItem(arr){
-				return arr.filter(item1=> item1.isNormal!==1 && item1.isNormal!==0).length
+		methods: {
+			getIsItem(arr) {
+				return arr.filter(item1 => item1.isNormal !== 1 && item1.isNormal !== 0).length
 			},
-			getNormal(isNormal){
-				if(isNormal == 0){
+			getNormal(isNormal) {
+				if (isNormal == 0) {
 					return 0
 				}
-				if(isNormal == 1){
+				if (isNormal == 1) {
 					return 1
 				}
-				if(isNormal == null){
+				if (isNormal == null) {
 					return 3
 				}
 			},
-			getHandle(isHandle){
-				if(isHandle == 0){
+			getHandle(isHandle) {
+				if (isHandle == 0) {
 					return 0
 				}
-				if(isHandle == 1){
+				if (isHandle == 1) {
 					return 1
 				}
-				if(isHandle == null){
+				if (isHandle == null) {
 					return 3
 				}
 			},
-			async uploadContent(){
-				
-							try {
-								let params={
-									status:2,
-									list:[]
-								}
-								this.listData.map(i=>{
-									params.list.push(i.children)
-								})
-								const {data} = await uni.$http.post(`/gunshiApp/xyt/inspect/task/finish`,params)
-								if(data.code == 200){
-									this.xjItem = data.data
-								}
-							} catch (error) {
-								uni.$showMsg();
-							}
-						},
+			async uploadContent() {
+				try {
+					let params = {
+						status: 2,
+						list: []
+					}
+					this.listData.map(i => {
+						params.list.push(i.children)
+					})
+					const {
+						data
+					} = await uni.$http.post(`/gunshiApp/xyt/inspect/task/finish`, params)
+
+				} catch (error) {
+					uni.$showMsg();
+				}
+			},
 			submit() {
-				let tigger =true
+				let tigger = true
 				//判断是否符合提交条件
-			this.listData.forEach(item=>{
-				 item.ab = item.children.filter(i=>{
-					 if(i.isNormal ==1){
-						 if(i.inspectPics?.length && i.itemProblemDesc){
-							 tigger=true
-						 }else{
-							 tigger=false
-						 }
-						 if(i.isHandle ==0){
-							 if(i.handlePics?.length && i.handleDesc){
-							 		tigger=true
-							 }else{
-							 		tigger=false
-							 }
-						 }else if(i.isHandle ==1){
-							 tigger=true
-						 }
-					 }else if(i.isNormal == 0){
-						 tigger=true
-					 } 
+				this.listData.forEach(item => {
+					item.ab = item.children.filter(i => {
+						if (i.isNormal == 1) {
+							if (i.inspectPics?.length && i.itemProblemDesc) {
+								tigger = true
+							} else {
+								tigger = false
+							}
+							if (i.isHandle == 0) {
+								if (i.handlePics?.length && i.handleDesc) {
+									tigger = true
+								} else {
+									tigger = false
+								}
+							} else if (i.isHandle == 1) {
+								tigger = true
+							}
+						} else if (i.isNormal == 0) {
+							tigger = true
+						}
 					})
 					return item
 				})
-			console.log(tigger,'arr');
-			if(tigger){
-				this.uploadContent()
-			}
-			// 
-			// if()
-				},
-				// 删除图片
-				deletePic(event,o,index,index1) {
-					this.listData[index].children[index1][event.name].splice(event.index, 1)
-				},
-				// 新增图片
-				async afterRead(event,o,index,index1) {
-					console.log(event,index1,this.listData[index]);
-					// let file
-					// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
-					let lists = [].concat(event.file)
-					let fileListLen = this.listData[index].children[index1][event.name]?.length
-					lists.map((item) => {
-						this.listData[index].children[index1][event.name].push({
-							...item,
-							status: 'uploading',
-							message: '上传中'
-						})
+				console.log(tigger, 'arr');
+				if (tigger) {
+					this.uploadContent()
+				}
+				// 
+				// if()
+			},
+			// 删除图片
+			deletePic(event, o, index, index1) {
+				this.listData[index].children[index1][event.name].splice(event.index, 1)
+			},
+			// 新增图片
+			async afterRead(event, o, index, index1) {
+				console.log(event, index1, this.listData[index]);
+				// let file
+				// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
+				let lists = [].concat(event.file)
+				let fileListLen = this.listData[index].children[index1][event.name]?.length
+				lists.map((item) => {
+					this.listData[index].children[index1][event.name].push({
+						...item,
+						status: 'uploading',
+						message: '上传中'
 					})
-					for (let i = 0; i < lists.length; i++) {
-						const result = await this.uploadFilePromise(lists[i].url,event.name,index,index1)
-						console.log(result);
-						let item = this.listData[index].children[index1][event.name][fileListLen]
-						this.listData[index].children[index1][event.name].splice(fileListLen, 1, Object.assign(item, {
-							status: 'success',
-							message: '',
-							...result
-						}))
-						fileListLen++
-					}
-				},
-				uploadFilePromise(url,name,index,index1) {
-					return new Promise((resolve, reject) => {
-						let a = uni.uploadFile({
-							url: 'http://local.gunshiiot.com:18083/gunshiApp/xyt/maintain/service/file/upload/singleSimple', // 仅为示例，非真实的接口地址
-							filePath: url,
-							name: 'file',
-							formData: {
-								user: 'test'
-							},
-							success: (res) => {
-								setTimeout(() => {
-									// this.listData[index].children[index1][name].push({...res.data.data,url:res.data.data.filePath})
-									console.log(res.data)
-									resolve(JSON.parse(res.data).data)
-								}, 1000)
-							}
-						});
-						// resolve(a)
-					})
-				},
-			change(e,o,index,i,key){
-				
-			    this.listData[index].children[i][key] = e;
+				})
+				for (let i = 0; i < lists.length; i++) {
+					const result = await this.uploadFilePromise(lists[i].url, event.name, index, index1)
+					console.log(result);
+					let item = this.listData[index].children[index1][event.name][fileListLen]
+					this.listData[index].children[index1][event.name].splice(fileListLen, 1, Object.assign(item, {
+						status: 'success',
+						message: '',
+						...result
+					}))
+					fileListLen++
+				}
+			},
+			uploadFilePromise(url, name, index, index1) {
+				return new Promise((resolve, reject) => {
+					let a = uni.uploadFile({
+						url: 'http://local.gunshiiot.com:18083/gunshiApp/xyt/maintain/service/file/upload/singleSimple', // 仅为示例，非真实的接口地址
+						filePath: url,
+						name: 'file',
+						formData: {
+							user: 'test'
+						},
+						success: (res) => {
+							setTimeout(() => {
+								// this.listData[index].children[index1][name].push({...res.data.data,url:res.data.data.filePath})
+								console.log(res.data)
+								resolve(JSON.parse(res.data).data)
+							}, 1000)
+						}
+					});
+					// resolve(a)
+				})
+			},
+			change(e, o, index, i, key) {
+
+				this.listData[index].children[i][key] = e;
 				this.$forceUpdate()
 			},
 			sexSelect(e) {
-			    // this.model1.userInfo.sex = e.name
-			    // this.$refs.uForm.validateField('userInfo.sex')
+				// this.model1.userInfo.sex = e.name
+				// this.$refs.uForm.validateField('userInfo.sex')
 			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	.contentItem{
+	.contentItem {
 		height: 260px;
 		overflow: auto;
-		.itemC{
+
+		.itemC {
 			display: flex;
 			justify-content: space-between;
 			display: flex;
@@ -299,21 +290,24 @@
 			padding: 10px;
 			border-bottom: 1px solid #f0f0f0;
 		}
-		.itemNo{
+
+		.itemNo {
 			color: #666666;
 			padding: 10px;
 		}
 	}
-	.circle-btn{
+
+	.circle-btn {
 		width: 120px;
 		height: 120px;
 		background-color: #007aff;
 		border-radius: 50%;
-		color:#fff;
+		color: #fff;
 		text-align: center;
 		line-height: 120px;
 	}
-	.yuandian{
+
+	.yuandian {
 		display: inline-block;
 		width: 10px;
 		height: 10px;
@@ -321,15 +315,18 @@
 		border-radius: 50%;
 		margin-right: 10px;
 	}
-	.xj-content{
+
+	.xj-content {
 		height: 300px;
 		overflow-y: auto;
 	}
-	.xj-text{
+
+	.xj-text {
 		margin-left: 10%;
 		margin-top: 2%;
 	}
-	.subsectioin{
+
+	.subsectioin {
 		display: flex;
 		column-gap: 10px;
 		align-items: center;
diff --git a/pages/yj/detail/aiyj.vue b/pages/yj/detail/aiyj.vue
index ea08d4f..ab638f3 100644
--- a/pages/yj/detail/aiyj.vue
+++ b/pages/yj/detail/aiyj.vue
@@ -9,17 +9,17 @@
 			<view class="" v-for="item in list" style="margin: 10px;background-color: #fff;padding: 10px;">
 				<view class="item">
 					<!-- {{item.title}} -->
-					<image src="../../../static/c1.png"  style="width:100%;"></image>
+					<image :src="item.imgPath"  style="width:100%;"></image>
 					<view class="context">
 						<view class="type">
-							工程车辆识别
+							{{typeObj[item.type]}}
 						</view>
 						<view class="time">
-							{{item.time}}
+							{{item.tm}}
 						</view>
 					</view>
 					<view class="adress">
-						大坝右岸
+						{{item.name}}
 					</view>
 				</view>
 			</view>
@@ -31,11 +31,17 @@
 
 <script>
 	import moment from 'moment'
-
+	
 	export default {
 		data() {
 			return {
 				show: false,
+				typeObj:{
+					1:"人员闯入",
+					2: "工程车辆识别",
+					3: "漂浮物识别",
+					4: "游泳识别",
+				},
 				model: {
 					stm: '',
 					etm: ''
@@ -61,9 +67,12 @@
 			};
 		},
 		onLoad(options){
-			// this.list = JSON.parse(decodeURIComponent(options.arr))
+			this.list = JSON.parse(decodeURIComponent(options.arr))
 		},
 		methods: {
+			getType(type){
+				
+			},
 			confirm(e) {
 				console.log(e);
 				this.model.stm = e[0]
diff --git a/pages/yj/detail/qxyj.vue b/pages/yj/detail/qxyj.vue
index 8a43e1f..e55d4d9 100644
--- a/pages/yj/detail/qxyj.vue
+++ b/pages/yj/detail/qxyj.vue
@@ -14,18 +14,18 @@
 							<image src="../../../static/c1.png"  style="width: 79px;height: 68px;"></image>
 							<view class="">
 								<view class="title">
-									麻城市气象台发布暴雨橙色预警
+									{{item.title}}
 								</view>
 								<view class=title>
 									[Ⅱ级/严重]
 								</view>
 								<view class="time">
-									2024-06-23 15:18:42
+									{{item.tm}}
 								</view>
 							</view>
 						</view>
 						<view class="content">
-							麻城市2024年06月23日03时18分42秒发布暴雨橙色预警信号：过去3小时麻城市乘马岗镇汪家垅降雨量已达45毫米，预计未来3小时，麻城市中南部降雨量将达70毫米以上，伴有雷电，阵风6-8级，致灾风险高，请加强防范。
+							{{item.content}}
 						</view>
 					</view>
 				</view>
diff --git a/pages/yj/detail/wyyj.vue b/pages/yj/detail/wyyj.vue
index cb58e02..b84badb 100644
--- a/pages/yj/detail/wyyj.vue
+++ b/pages/yj/detail/wyyj.vue
@@ -8,23 +8,27 @@
 		<view class="" style="margin-top: 44px;border-top: 1px solid #f0f0f0;">
 			<view class="" v-for="item in list" style="margin: 10px;background-color: #fff;padding: 10px;">
 				<view class="item">
-					<!-- {{item.title}} -->
-					<image src="../../../static/c1.png"  style="width: 79px;height: 68px;"></image>
+					<text>{{item.stationCode}}</text>
+					<text>{{item.tm}}</text>
 					
 				</view>
 				<view class="contentItem">
 					<view class="itemC">
-						<text>巡检项:</text>
-						<text>{{item.xjx}}</text>
+						<text>预警级别:</text>
+						<text>{{item.level===1?'黄色':'红色'}}</text>
 					</view>
 					<view class="itemC">
-						<text>巡查人:</text>
-						<text>{{item.name}}</text>
+						<text>监测值(mm):</text>
+						<text>{{item.value}}</text>
 					</view>
 					<view class="itemC">
-						<text>巡查时间:</text>
+						<text>阈值:</text>
 						<text>{{item.time}}</text>
 					</view>
+					<view class="itemC">
+						<text>校验规则描述:</text>
+						<text>{{item.ruleDesc}}</text>
+					</view>
 				</view>
 			</view>
 
diff --git a/pages/yj/index.vue b/pages/yj/index.vue
index c7fc413..2219740 100644
--- a/pages/yj/index.vue
+++ b/pages/yj/index.vue
@@ -77,7 +77,10 @@
 			},
 			todetail(key,e){
 				let arr = encodeURIComponent(JSON.stringify(e))
-				console.log(key);
+				console.log(key,e.length?.length);
+				if(!e.length?.length){
+					return;
+				}
 				if(key=='qxWarn'){
 					uni.navigateTo({
 						url:'/pages/yj/detail/qxyj?list='+arr
@@ -88,6 +91,16 @@
 						url:'/pages/yj/detail/wyyj?list='+arr
 					})
 				}
+				if(key == 'flowWarn'){
+					uni.navigateTo({
+						url:'/pages/yj/detail/wyyj?list='+arr
+					})
+				}
+				if(key == 'pressWarn'){
+					uni.navigateTo({
+						url:'/pages/yj/detail/wyyj?list='+arr
+					})
+				}
 				if(key == 'aiWarnCount'){
 					uni.navigateTo({
 						url:'/pages/yj/detail/aiyj?list='+arr