From 99420a1e873dc036d752a3d592d3b5d47025ae7c Mon Sep 17 00:00:00 2001
From: xielei <xllove1314>
Date: Fri, 8 Nov 2024 15:11:23 +0800
Subject: [PATCH] 11

---
 App.vue                              |  18 +++
 pages/hdDetail/jcsj/jcsj.vue         |  15 ---
 pages/homeIndex/index.vue            |   5 +-
 pages/messageList/detail/index.vue   |   9 +-
 pages/messageList/index.vue          |  19 +--
 pages/mypage/compents/wtcl/index.vue |  34 ++---
 pages/mypage/compents/wxyh/index.vue |  64 +++++++--
 pages/mypage/compents/xcrw/index.vue |  21 +--
 pages/mypage/mypage.vue              |   2 +-
 pages/rainDetail/jcsj/jcsj.vue       |  15 ---
 pages/skDetail/jcsj/jcsj.vue         |  15 ---
 pages/skInfo/index.vue               |  77 +++++++++--
 pages/wtcl/index.vue                 |  85 +++++-------
 pages/wxyh/formZdy/formBottom.vue    |  43 +++---
 pages/wxyh/index.vue                 |  10 +-
 pages/xcrw/index.vue                 | 195 +++++++++++++--------------
 pages/ylzList/detail/index.vue       |  11 --
 static/empty.png                     | Bin 0 -> 9552 bytes
 18 files changed, 326 insertions(+), 312 deletions(-)
 create mode 100644 static/empty.png

diff --git a/App.vue b/App.vue
index 0bc8bfb..d9bd2f7 100644
--- a/App.vue
+++ b/App.vue
@@ -87,4 +87,22 @@
 		display: flex;
 		justify-content: space-between;
 	}
+	page {
+	  height: 100%;
+	  background-color: #f3f5f8;
+	}
+	.time-ranger{
+	  background-color: #ffffff;
+	  padding-bottom: 10px;
+	   .start-time, .end-time{
+	    display: flex;
+	    align-items: center;
+	    padding: 10px 0;
+	    border-bottom: 1px solid #dfdfdf;
+	  }
+	  .search-btn{
+	    margin: 3px 0 0 5px;
+	    // color: #3399ef;
+	  }
+	}
 </style>
diff --git a/pages/hdDetail/jcsj/jcsj.vue b/pages/hdDetail/jcsj/jcsj.vue
index 7338c07..71eacbc 100644
--- a/pages/hdDetail/jcsj/jcsj.vue
+++ b/pages/hdDetail/jcsj/jcsj.vue
@@ -133,21 +133,6 @@
 
 <style lang="scss" scoped>
 .jcsj-box{
-  .time-ranger{
-    // display: flex;
-    // align-items: center;
-    margin-bottom: 10px;
-    .start-time, .end-time{
-      display: flex;
-      align-items: center;
-      padding: 10px 0;
-      border-bottom: 1px solid #dfdfdf;
-    }
-    .search-btn{
-      margin: 3px 0 0 5px;
-      // color: #3399ef;
-    }
-  }
    .jcsj-content{
     max-height:100vh;
     overflow-y:auto
diff --git a/pages/homeIndex/index.vue b/pages/homeIndex/index.vue
index 8e1be6a..3fb22ce 100644
--- a/pages/homeIndex/index.vue
+++ b/pages/homeIndex/index.vue
@@ -76,6 +76,7 @@
 		},
 		onPullDownRefresh() {
 			setTimeout(function () {
+				console.log(11);
 				uni.stopPullDownRefresh();
 			}, 1000);
 		},
@@ -127,6 +128,7 @@
 			}
 		},
 		methods: {
+			
 			getYlzList() {
 				uni.$http.post('/gunshiApp/xyt/stPptnRReal/list').then(res => {
 					if (res.data.code == 200) {
@@ -171,13 +173,14 @@
 			}
 		},
 		onLoad() {
-			this.getList()
+			// this.getList()
 			this.getYlzList()
 			this.userList = uni.getStorageSync('value')
 		},
 
 		onShow() {
 			this.setInsert()
+			this.getList()
 		}
 
 	}
diff --git a/pages/messageList/detail/index.vue b/pages/messageList/detail/index.vue
index 9d001ee..aa4ce51 100644
--- a/pages/messageList/detail/index.vue
+++ b/pages/messageList/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>
@@ -57,15 +57,12 @@
 			};
 		},
 		onLoad(options){
-			console.log(options);
 			this.list.push(JSON.parse(options.item))
-			this.yd(item)
+			this.yd(JSON.parse(options.item))
 		},
 		methods: {
 			yd(item){
-				uni.$http.post('/gunshiApp/xyt/messageCenter/update').then(res => {
-
-				})
+				uni.$http.post('/gunshiApp/xyt/messageCenter/update',{...item,status:1})
 			},
 			confirm(e) {
 				console.log(e);
diff --git a/pages/messageList/index.vue b/pages/messageList/index.vue
index c1549a6..6fcb68c 100644
--- a/pages/messageList/index.vue
+++ b/pages/messageList/index.vue
@@ -76,9 +76,10 @@
 				list: []
 			};
 		},
-		onLoad(options) {
+		onShow(options) {
 			this.getList()
 		},
+		
 		computed:{
 			startTime:function (){
 				return this.stm?moment(this.stm).format('YYYY-MM-DD HH:mm:ss'):this.start
@@ -135,22 +136,6 @@
 </script>
 
 <style lang="scss" scoped>
-	.time-ranger {
-		margin-bottom: 10px;
-
-		.start-time,
-		.end-time {
-			display: flex;
-			align-items: center;
-			padding: 10px 0;
-			border-bottom: 1px solid #dfdfdf;
-		}
-
-		.search-btn {
-			margin: 3px 0 0 5px;
-			// color: #3399ef;
-		}
-	}
 
 	.uni-input-placeholder {
 		text-align: center;
diff --git a/pages/mypage/compents/wtcl/index.vue b/pages/mypage/compents/wtcl/index.vue
index 1eedfde..95d5398 100644
--- a/pages/mypage/compents/wtcl/index.vue
+++ b/pages/mypage/compents/wtcl/index.vue
@@ -6,7 +6,7 @@
 			}" :height='44' :safeAreaInsetTop=true leftIconSize='20' leftIconColor='rgb(153, 153, 153)'>
 		</u-navbar>
 		<view class=""
-			style="margin-top: 44px;;background-color: #f0f0f0;border-top: 1px solid #f0f0f0;overflow: auto;">
+			style="margin-top: 50px;;background-color: #f0f0f0;border-top: 1px solid #f0f0f0;overflow: auto;">
 			<view style="padding:0 10px;backgroundColor:#fff">
 				<view class="time-ranger">
 					<view class="start-time">
@@ -22,7 +22,7 @@
 					</view>
 				</view>
 			</view>
-			<view style="height:calc(100vh - 150px);overflow: auto;">
+			<view style="height:calc(100vh - 150px);overflow: auto;" v-if='list.length !== 0'>
 				<view class="" v-for="(item,index) in list" :key="index"
 					style="margin:10px;background-color: #fff;padding: 10px;">
 					<view class="item">
@@ -53,6 +53,9 @@
 					</view>
 				</view>
 			</view>
+			<view style="height:calc(100vh - 150px);display: flex;align-items: center;justify-content: center;background-color: #fff;" v-else>
+				<image src="../../../../static/empty.png" mode="" ></image>
+			</view>
 
 		</view>
 		<u-datetime-picker :show="showTime" v-model="stm" mode="datetime" @confirm="showTime=false"
@@ -87,10 +90,10 @@
 		computed: {
 			startTime: function () {
 
-				return this.stm ? moment(this.stm).format('YYYY-MM-DD HH:mm:ss') : this.start
+				return this.stm ? moment(this.stm).format('YYYY-MM-DD') : this.start
 			},
 			endTime: function () {
-				return this.etm ? moment(this.etm).format('YYYY-MM-DD HH:mm:ss') : this.end
+				return this.etm ? moment(this.etm).format('YYYY-MM-DD') : this.end
 			}
 		},
 		methods: {
@@ -101,12 +104,12 @@
 				console.log(uni.getStorageSync('value'));
 				let params = {
 					"pageSo": {
-						"pageSize": 10,
+						"pageSize": 999,
 						"pageNumber": 1
 					},
 					"dateTimeRangeSo": {
-						start: this.stm ? moment(this.stm).format('YYYY-MM-DD HH:mm:ss') : '',
-						end: this.etm ? moment(this.etm).format('YYYY-MM-DD HH:mm:ss') : ''
+						start:this.stm?moment(this.stm).format('YYYY-MM-DD 00:00:00'):'',
+						end:this.etm?moment(this.etm).format('YYYY-MM-DD 23:59:59'):''
 					},
 					"isHandle": 1,
 					"inspectUserId": uni.getStorageSync('value').userId
@@ -134,23 +137,6 @@
 </script>
 
 <style lang="scss" scoped>
-	.time-ranger {
-		margin-bottom: 10px;
-
-		.start-time,
-		.end-time {
-			display: flex;
-			align-items: center;
-			padding: 10px 0;
-			border-bottom: 1px solid #dfdfdf;
-		}
-
-		.search-btn {
-			margin: 3px 0 0 5px;
-			// color: #3399ef;
-		}
-	}
-
 	.myTitleStyle {
 		font-size: 30px;
 		background-color: red;
diff --git a/pages/mypage/compents/wxyh/index.vue b/pages/mypage/compents/wxyh/index.vue
index 067cb36..a7044ef 100644
--- a/pages/mypage/compents/wxyh/index.vue
+++ b/pages/mypage/compents/wxyh/index.vue
@@ -4,18 +4,38 @@
 				fontSize:'18px'
 			}" :height='44' :safeAreaInsetTop=true leftIconSize='20' leftIconColor='rgb(153, 153, 153)'>
 		</u-navbar>
-		<view style="background-color: #f0f0f0;padding: 10px;overflow: auto;margin-top: 44px;">
-			<view class="" v-for="item in dataList" class="contentItemWx" @click="toDetail(item)">
-				<view class="contentItem">
-					<view class="itemWxyhT">
-						<text>{{type[item.maintainType]}}</text>
-						<uni-icons type="right"></uni-icons>
+		<view style="background-color: #f0f0f0;padding: 10px;margin-top: 44px;">
+			<view style="padding:0 10px;backgroundColor:#fff">
+				<view class="time-ranger">
+					<view class="start-time">
+						<text>开始时间</text>
+						<text @click="showTime=true" style="margin-left:15%;color:#3399ef">{{startTime}}</text>
 					</view>
-					<view class="itemWxyhB">
-						<text>{{item.reportTime}}</text>
+					<view class="end-time">
+						<text>结束时间</text>
+						<text @click="showTime1=true" style="margin:0 15%;color:#3399ef">{{endTime}}</text>
+						<view class="search-btn" @click="searchTm">
+							搜索
+						</view>
 					</view>
 				</view>
 			</view>
+			<view class="" style="height:calc(100vh - 150px);overflow: auto;" v-if="dataList.length !== 0">
+				<view class="" v-for="item in dataList" class="contentItemWx" @click="toDetail(item)">
+					<view class="contentItem">
+						<view class="itemWxyhT">
+							<text>{{type[item.maintainType]}}</text>
+							<uni-icons type="right"></uni-icons>
+						</view>
+						<view class="itemWxyhB">
+							<text>{{item.reportTime}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view style="height:calc(100vh - 150px);display: flex;align-items: center;justify-content: center;background-color: #fff;" v-else>
+				<image src="../../../../static/empty.png" mode="" ></image>
+			</view>
 			<!-- <view class="content">
 				<formTop labelWidth="150rpx" />
 			</view> -->
@@ -24,6 +44,10 @@
 			</view> -->
 		</view>
 		<!-- <button @click="submitForm">Submit</button> -->
+		<u-datetime-picker :show="showTime" v-model="stm" mode="datetime" @confirm="showTime=false"
+			@cancel="showTime=false"></u-datetime-picker>
+		<u-datetime-picker :show="showTime1" v-model="etm" mode="datetime" @confirm="showTime1=false"
+			@cancel="showTime1=false"></u-datetime-picker>
 	</view>
 </template>
 
@@ -43,6 +67,12 @@
 					reportTime: moment().format('YYYY-MM-DD HH:mm:ss'),
 					userId: ''
 				},
+				showTime: false,
+				showTime1: false,
+				start: '请选择开始时间',
+				end: '请选择结束时间',
+				stm: '',
+				etm: '',
 				dataList: [],
 				type: {
 					1: "溢洪道清障",
@@ -57,6 +87,15 @@
 		onShow() {
 			this.getList()
 		},
+		computed: {
+			startTime: function () {
+		
+				return this.stm ? moment(this.stm).format('YYYY-MM-DD') : this.start
+			},
+			endTime: function () {
+				return this.etm ? moment(this.etm).format('YYYY-MM-DD') : this.end
+			}
+		},
 		methods: {
 			toDetail(item){
 				uni.navigateTo({
@@ -66,12 +105,12 @@
 			getList() {
 				let params = {
 					"pageSo": {
-						"pageSize": 10,
+						"pageSize": 999,
 						"pageNumber": 1
 					},
 					"dateTimeSo": {
-						"start": "2023-11-06 00:00:00",
-						"end": "2024-11-06 00:00:00"
+						start:this.stm?moment(this.stm).format('YYYY-MM-DD 00:00:00'):'',
+						end:this.etm?moment(this.etm).format('YYYY-MM-DD 23:59:59'):''
 					}
 				}
 				uni.$http.post('/gunshiApp/xyt/maintain/service/page', params).then(res => {
@@ -103,7 +142,7 @@
 	}
 </script>
 
-<style>
+<style lang="scss" scoped>
 	.content {
 		/* margin: 10px; */
 		padding: 10px;
@@ -131,5 +170,6 @@
 		background-color: rgba(255, 255, 255, 1);
 		padding: 10px;
 		margin-bottom: 10px;
+		margin-top: 10px;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/mypage/compents/xcrw/index.vue b/pages/mypage/compents/xcrw/index.vue
index 11e6fcd..4395c8f 100644
--- a/pages/mypage/compents/xcrw/index.vue
+++ b/pages/mypage/compents/xcrw/index.vue
@@ -20,8 +20,8 @@
     		  </view>
 
         </view>
-		<view class="" style="style='overflow: auto;height:calc(100vh - 150px)'">		
-			<view class="" v-for="(item,i) in list" :key="i" style="background-color: #fff;margin-top:10px;">
+		<view class="" style='overflow: auto;height:calc(100vh - 150px)' v-if="list.length !== 0">		
+			<view class="" v-for="(item,i) in list" :key="i" style="background-color: #fff;margin-top:10px;padding: 10px;">
 				<view class="item">
 					<!-- {{item.title}} -->
 					<view class="title">
@@ -46,7 +46,9 @@
 				</view>
 			</view>
 			</view>
-
+<view style="height:calc(100vh - 150px);display: flex;align-items: center;justify-content: center;background-color: #fff;" v-else>
+				<image src="../../../../static/empty.png" mode="" ></image>
+			</view>
 		</view>
 		  <u-datetime-picker
                 :show="showTime"
@@ -131,19 +133,6 @@
 </script>
 
 <style lang="scss" scoped>
-    .time-ranger{
-    margin-bottom: 10px;
-     .start-time, .end-time{
-      display: flex;
-      align-items: center;
-      padding: 10px 0;
-      border-bottom: 1px solid #dfdfdf;
-    }
-    .search-btn{
-      margin: 3px 0 0 5px;
-      // color: #3399ef;
-    }
-  }
 	.myTitleStyle {
 		font-size: 30px;
 		background-color: red;
diff --git a/pages/mypage/mypage.vue b/pages/mypage/mypage.vue
index a9cf404..5ce5541 100644
--- a/pages/mypage/mypage.vue
+++ b/pages/mypage/mypage.vue
@@ -135,7 +135,7 @@
 		margin-bottom: 2vh;
 		width: 95%;
 		height: 15vh;
-		background-color: #fff;
+		/* background-color: #fff; */
 
 	}
 
diff --git a/pages/rainDetail/jcsj/jcsj.vue b/pages/rainDetail/jcsj/jcsj.vue
index 130deb8..e94d4ed 100644
--- a/pages/rainDetail/jcsj/jcsj.vue
+++ b/pages/rainDetail/jcsj/jcsj.vue
@@ -144,21 +144,6 @@
 
 <style lang="scss" scoped>
 .jcsj-box{
-  .time-ranger{
-    // display: flex;
-    // align-items: center;
-    margin-bottom: 10px;
-    .start-time, .end-time{
-      display: flex;
-      align-items: center;
-      padding: 10px 0;
-      border-bottom: 1px solid #dfdfdf;
-    }
-    .search-btn{
-      margin: 3px 0 0 5px;
-      // color: #3399ef;
-    }
-  }
   .jcsj-content{
     max-height:calc(100vh - 89px - 43px - 45px);
     overflow-y:auto
diff --git a/pages/skDetail/jcsj/jcsj.vue b/pages/skDetail/jcsj/jcsj.vue
index 7d7a4a4..06d7087 100644
--- a/pages/skDetail/jcsj/jcsj.vue
+++ b/pages/skDetail/jcsj/jcsj.vue
@@ -138,21 +138,6 @@
 
 <style lang="scss" scoped>
 .jcsj-box{
-  .time-ranger{
-    // display: flex;
-    // align-items: center;
-    margin-bottom: 10px;
-     .start-time, .end-time{
-      display: flex;
-      align-items: center;
-      padding: 10px 0;
-      border-bottom: 1px solid #dfdfdf;
-    }
-    .search-btn{
-      margin: 3px 0 0 5px;
-      // color: #3399ef;
-    }
-  }
    .jcsj-content{
     max-height:100vh;
     width: 100%;
diff --git a/pages/skInfo/index.vue b/pages/skInfo/index.vue
index fadaa57..2e538f4 100644
--- a/pages/skInfo/index.vue
+++ b/pages/skInfo/index.vue
@@ -1,8 +1,9 @@
 <template>
-	<view class="skinfo" @click="toDetail()">
+	<view class="skinfo">
 		<view class="title">
 			<view class="left">
 				<u-icon name="file-text" color="#f59d29" size="20"></u-icon>
+				
 				<text style="margin-left:5px">{{dataform.resName}}</text>
 			</view>
 			<view class="right">
@@ -11,23 +12,24 @@
 		</view>
 		<view class="content">
 			<view class="" style="display: flex;">
-				<image src="../../static/c1.png" mode="" style="width:30%;height: 120px;"></image>
-				<view class="listItem">
+				<!-- <image src="../../static/c1.png" mode="" style="width:30%;height: 120px;"></image> -->
+				<image :src="showImg" style="width: 30%;height: 120px;margin: 5px;" @click="previewImage(showImg)"></image>
+				<view class="listItem"  @click="toDetail()">
 					<view class="item-text" v-for="(v,k) of list"  :key="k">
 						<text>{{v}}</text>:
 						<text>{{dataform[k]}}</text>
 					</view>
 				</view>
 			</view>
-			<view class="bottom">
+			<view class="bottom"  @click="toDetail()">
 				<view class="bottomItem">
 					<view class="withd-2">
 						<text>生活供水m³/s</text>:
-						<text>0</text>
+						<text>{{shgs}}</text>
 					</view>
 					<view class="withd-2">
 						<text>生态供水m³/s</text>:
-						<text>2.1</text>
+						<text>{{stgs}}</text>
 					</view>
 				</view>
 			</view>
@@ -45,10 +47,10 @@
 					"rz":'当前水位m',
 					"today":'今日雨量mm',
 					'flLowLimLev':'汛限水位m',
-					"demo":'比汛期m',
+					"afsltdz":'比汛期m',
 					'wcrstel':'堰顶高程m',
 					'crestElev':'坝顶高程m',
-					"24h":'24h预报mm',
+					"h24":'24h预报mm',
 					"yesterdayDrp":'昨日雨量mm',
 					'totCap':'总库容m³',
 					"cap":'蓄水量万m³'
@@ -66,15 +68,72 @@
 					// 8:15.4,
 					// 9:129.06,
 					// 10:75.34
-				}
+				},
+				stgs:'',
+				shgs:'',
+				imageList:[],
+				baseUrl:'http://223.75.53.141:9102/test.by-lyf.tmp',
+				showImg:''
 				
 			}
 		},
 		mounted() {
 			console.log('小玉潭水库222');
 			this.getList()
+			this.getDrp()
 		},
 		methods:{
+			previewImage(item){
+				uni.previewImage({
+							urls: [this.showImg],
+							longPressActions: {
+								itemList: ['发送给朋友', '保存图片', '收藏'],
+								success: function(data) {
+									console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+								},
+								fail: function(err) {
+									console.log(err.errMsg);
+								}
+							}
+						});
+			},
+			getDrp(){
+				uni.$http.get('/gunshiApp/xyt/reservoir/water/detail?stcd=716164061&_=1731028927554').then(res=>{
+					
+					this.dataform={...this.dataform,...res.data.data}
+					console.log(this.dataform,'drp yesterdayDrp');
+				})
+				uni.$http.post('/gunshiApp/xyt/reservoir/water/list').then(res=>{
+					console.log(res,'drp list');
+					this.dataform={...this.dataform,...res.data.data[0]}
+					console.log(this.dataform,'drp list');
+				})
+				uni.$http.post('/gunshiApp/xyt/stWaterRReal/list').then(res=>{
+					res.data.data.forEach(item=>{
+						if(item.sttp == 'QQ'){
+							this.stgs=item.q
+						}
+						if(item.sttp == 'PQ'){
+							this.shgs=item.q
+						}
+					})
+				})
+				uni.$http.post('/gunshiApp/xyt/resProjectImg/list',{resCode:42120250085}).then(res=>{
+					res.data.data.forEach(item=>{
+						if(item.projType == 1){
+							this.imageList = item.files.map((item,index)=>
+							{item.url = this.baseUrl + item.filePath
+							if(index == 0){
+								
+								this.showImg = item.url
+								console.log(this.showImg,'this.showImg');
+							}
+							return item})
+						}
+					})
+				})
+				
+			},
 			toDetail(){
 				uni.navigateTo({
 					url:'/pages/skInfo/detail/index'
diff --git a/pages/wtcl/index.vue b/pages/wtcl/index.vue
index 96580a9..d0a102a 100644
--- a/pages/wtcl/index.vue
+++ b/pages/wtcl/index.vue
@@ -5,7 +5,7 @@
 				fontSize:'18px'
 			}" :height='44' :safeAreaInsetTop=true leftIconSize='20' leftIconColor='rgb(153, 153, 153)'>
 		</u-navbar>
-		<view class="" style="margin-top: 44px;;background-color: #f0f0f0;border-top: 1px solid #f0f0f0;overflow: auto;">
+		<view class="" style="margin-top: 50px;;background-color: #f0f0f0;border-top: 1px solid #f0f0f0;overflow: auto;">
 			<view style="padding:0 10px;backgroundColor:#fff">
 				<view class="time-ranger">
 					<view class="start-time">
@@ -21,39 +21,44 @@
 					</view>
 				</view>
 			</view>
-			<view class="" v-for="item in list" style="margin: 10px;background-color: #fff;padding: 10px;">
-				<view class="item">
-					<!-- {{item.title}} -->
-					<view class="title">
-						{{item.taskTitle}}
-					</view>
-					<view class="titleRight" @click="toDetail(item)">
-						<view class="border">
-							{{isHandle==0?'已处理':'待处理'}}
+			<view class="" v-if="list.length !== 0">
+				<view class="" v-for="item in list" style="margin: 10px;background-color: #fff;padding: 10px;" >
+					<view class="item">
+						<!-- {{item.title}} -->
+						<view class="title">
+							{{item.taskTitle}}
+						</view>
+						<view class="titleRight" @click="toDetail(item)">
+							<view class="border">
+								{{isHandle==0?'已处理':'待处理'}}
+							</view>
+							<u-icon name="arrow-right" size="20"></u-icon>
 						</view>
-						<u-icon name="arrow-right" size="20"></u-icon>
 					</view>
-				</view>
-				<view class="contentItem">
-					<view class="itemC">
-						<text>巡检项</text>
-						<text>{{item.itemDesc}}</text>
-					</view>
-					<view class="itemC">
-						<text>巡查人</text>
-						<text>{{item.inspectUserName}}</text>
-					</view>
-					<view class="itemC">
-						<text>巡查时间</text>
-						<text>{{item.finishTime}}</text>
+					<view class="contentItem">
+						<view class="itemC">
+							<text>巡检项</text>
+							<text>{{item.itemDesc}}</text>
+						</view>
+						<view class="itemC">
+							<text>巡查人</text>
+							<text>{{item.inspectUserName}}</text>
+						</view>
+						<view class="itemC">
+							<text>巡查时间</text>
+							<text>{{item.finishTime}}</text>
+						</view>
 					</view>
 				</view>
 			</view>
+			<view style="height:calc(100vh - 150px);display: flex;align-items: center;justify-content: center;background-color: #fff;" v-else>
+				<image src="../../static/empty.png" mode="" ></image>
+			</view>
 
 		</view>
-		<u-datetime-picker :show="showTime" v-model="stm" mode="datetime" @confirm="showTime=false"
+		<u-datetime-picker :show="showTime" v-model="stm" mode="date" @confirm="showTime=false"
 			@cancel="showTime=false"></u-datetime-picker>
-		<u-datetime-picker :show="showTime1" v-model="etm" mode="datetime" @confirm="showTime1=false"
+		<u-datetime-picker :show="showTime1" v-model="etm" mode="date" @confirm="showTime1=false"
 			@cancel="showTime1=false"></u-datetime-picker>
 	</view>
 </template>
@@ -84,10 +89,10 @@
 		computed:{
 			startTime:function (){
 				
-				return this.stm?moment(this.stm).format('YYYY-MM-DD HH:mm:ss'):this.start
+				return this.stm?moment(this.stm).format('YYYY-MM-DD'):this.start
 			},
 			endTime:function (){
-				return this.etm?moment(this.etm).format('YYYY-MM-DD HH:mm:ss'):this.end
+				return this.etm?moment(this.etm).format('YYYY-MM-DD'):this.end
 			}
 		},
 		methods: {
@@ -98,15 +103,15 @@
 				console.log(uni.getStorageSync('value'));
 				let params = {
 					"pageSo": {
-						"pageSize": 10,
+						"pageSize": 999,
 						"pageNumber": 1
 					},
 					"dateTimeRangeSo": {
-						start:this.stm?moment(this.stm).format('YYYY-MM-DD HH:mm:ss'):'',
-						end:this.etm?moment(this.etm).format('YYYY-MM-DD HH:mm:ss'):''
+						start:this.stm?moment(this.stm).format('YYYY-MM-DD 00:00:00'):'',
+						end:this.etm?moment(this.etm).format('YYYY-MM-DD 23:59:59'):''
 					},
 					"isHandle": 0,
-					"inspectUserId": uni.getStorageSync('value').userId
+					"handleUserId": uni.getStorageSync('value').userId
 				}
 				uni.$http.post('/gunshiApp/xyt/inspect/detail/page', params).then(res => {
 					this.list=res.data.data.records
@@ -131,22 +136,6 @@
 </script>
 
 <style lang="scss" scoped>
-	.time-ranger {
-		margin-bottom: 10px;
-	
-		.start-time,
-		.end-time {
-			display: flex;
-			align-items: center;
-			padding: 10px 0;
-			border-bottom: 1px solid #dfdfdf;
-		}
-	
-		.search-btn {
-			margin: 3px 0 0 5px;
-			// color: #3399ef;
-		}
-	}
 	.myTitleStyle {
 		font-size: 30px;
 		background-color: red;
diff --git a/pages/wxyh/formZdy/formBottom.vue b/pages/wxyh/formZdy/formBottom.vue
index ec4343c..cbdea3f 100644
--- a/pages/wxyh/formZdy/formBottom.vue
+++ b/pages/wxyh/formZdy/formBottom.vue
@@ -13,13 +13,13 @@
 			<u-form-item label="内容说明" prop="maintainContent" borderBottom labelPosition='top' required labelWidth="100px">
 				<u--textarea v-model="model1.maintainContent" placeholder="请输入内容"></u--textarea>
 			</u-form-item>
-			<u-form-item label="现场图片" prop="fileListpics" borderBottom labelPosition='top' labelWidth="100px">
-				<u-upload :fileList="fileListpics" @afterRead="afterRead" @delete="deletePic" name="pics" multiple
+			<u-form-item label="现场图片" prop="pics" borderBottom labelPosition='top' labelWidth="100px" required>
+				<u-upload :fileList="model1.pics" @afterRead="(e)=>afterRead(e,'pics')" @delete="deletePic" name="pics" multiple
 				multiple accept='image'	:maxCount="10"></u-upload>
 
 			</u-form-item>
-			<u-form-item label="现场视频" prop="fileListvideos" borderBottom labelPosition='top' labelWidth="100px">
-				<u-upload :fileList="fileListvideos" @afterRead="afterRead" @delete="deletePic" name="videos" multiple
+			<u-form-item label="现场视频" prop="videos" borderBottom labelPosition='top' labelWidth="100px">
+				<u-upload :fileList="model1.videos" @afterRead="(e)=>afterRead(e,'videos')" @delete="deletePic" name="videos" multiple
 				multiple accept='video'	:maxCount="10"></u-upload>
 
 			</u-form-item>
@@ -80,6 +80,11 @@
 						message: '请选择管护类型',
 						trigger: ['blur', 'change']
 					},
+					'fileListpics': {
+						required: true,
+						message: '请选择上传现场图片',
+						trigger: ['blur', 'change']
+					},
 				},
 				radio: '',
 				switchVal: false
@@ -91,13 +96,14 @@
 				this.$refs.uForm.validateField('maintainType')
 			},
 			submit() {
+				
 				this.$refs.uForm.validate().then(res => {
 					
 					let params = {
 						...this.model1,
 						maintainType: this.actions.find(item => item.name == this.model1.maintainType).value,
 					}
-
+					console.log(params);
 					this.$emit('submitForm', params)
 				}).catch(errors => {
 					uni.$u.toast('校验失败')
@@ -105,16 +111,15 @@
 			},
 			// 删除图片
 			deletePic(event) {
-				this[`fileList${event.name}`].splice(event.index, 1)
+				this.model1[`${event.name}`].splice(event.index, 1)
 			},
 			// 新增图片
-			async afterRead(event) {
+			async afterRead(event,key) {
 				// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
 				let lists = [].concat(event.file)
-				console.log(`fileList${event.name}`,event);
-				let fileListLen = this[`fileList${event.name}`].length
+				let fileListLen = this.model1[`${event.name}`].length
 				lists.map((item) => {
-					this[`fileList${event.name}`].push({
+					this.model1[`${event.name}`].push({
 						...item,
 						status: 'uploading',
 						message: '上传中'
@@ -122,14 +127,17 @@
 				})
 				for (let i = 0; i < lists.length; i++) {
 					const result = await this.uploadFilePromise(lists[i].url,event.name)
-					let item = this[`fileList${event.name}`][fileListLen]
-					this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
+					let item = this.model1[`${event.name}`][fileListLen]
+					console.log(this.model1[`${event.name}`],fileListLen,item);
+					this.model1[`${event.name}`].splice(fileListLen, 1, Object.assign(item, {
 						status: 'success',
 						message: '',
-						url: result
+						...result
 					}))
+					console.log(this.model1[`${event.name}`],this.model1);
 					fileListLen++
 				}
+				
 			},
 			uploadFilePromise(url,name) {
 				return new Promise((resolve, reject) => {
@@ -146,9 +154,12 @@
 								// if(obj){
 									
 								// }
-								console.log(JSON.parse(res.data),this.model1,name);
-								this.model1[name].push({fileId:JSON.parse(res.data).data.fileId})
-								resolve(res.data.data)
+								// console.log(JSON.parse(res.data),this.model1,name);
+								console.log(JSON.parse(res.data).data);
+								let params = JSON.parse(res.data).data
+								params.url = 'http://223.75.53.141:9102/test.by-lyf.tmp' +JSON.parse(res.data).data.filePath
+								// this.model1[name].push({fileId:JSON.parse(res.data).data.fileId})
+								resolve(params)
 							}, 1000)
 						}
 					});
diff --git a/pages/wxyh/index.vue b/pages/wxyh/index.vue
index 2855764..cfb5a89 100644
--- a/pages/wxyh/index.vue
+++ b/pages/wxyh/index.vue
@@ -52,10 +52,14 @@ export default {
 			console.log({...params,...this.formData});
 			uni.$http.post('/gunshiApp/xyt/maintain/service/insert',{...params,...this.formData}).then(res=>{
 				if(res.data.code == 200){
+					// uni.$u.toast('新增成功')
 					uni.$u.toast('新增成功')
-					uni.switchTab({
-						url: '/pages/homeIndex/index'
-					});
+					setTimeout(()=>{
+						uni.switchTab({
+							url: '/pages/homeIndex/index'
+						});
+					},500)
+					
 				}
 			})
 		},
diff --git a/pages/xcrw/index.vue b/pages/xcrw/index.vue
index a071958..7507159 100644
--- a/pages/xcrw/index.vue
+++ b/pages/xcrw/index.vue
@@ -1,132 +1,131 @@
 <template>
 	<view :style="{height:'100vh',overflow:'hidden'}">
 		<u-status-bar></u-status-bar>
-		<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>
 		<view style="padding:0 10px; margin-top:50px">
-			<view class="time-ranger" >
-    		    <view class="start-time">
-    		    <text>开始时间</text>
-    		    <text @click="showTime=true" style="margin-left:15%;color:#3399ef">{{stm}}</text>
-    		  </view>
-    		  <view class="end-time">
-    		    <text>结束时间</text>
-    		    <text @click="showTime1=true" style="margin:0 15%;color:#3399ef">{{etm}}</text>
-    		     <view class="search-btn" @click="searchHandle">
-    		      搜索
-    		    </view>
-    		  </view>
-
-        </view >
-			<view class="" style='overflow: auto;height:calc(100vh - 150px)'>
-				
-			
-			<view class="" v-for="(item,i) in list" :key="i" style="background-color: #fff;margin-top:10px;">
-				<view class="item">
-					<!-- {{item.title}} -->
-					<view class="title">
-						{{item.taskTitle}}
+			<view class="time-ranger">
+				<view class="start-time">
+					<text>开始时间</text>
+					<text @click="showTime=true" style="margin-left:15%;color:#3399ef">{{stm}}</text>
+				</view>
+				<view class="end-time">
+					<text>结束时间</text>
+					<text @click="showTime1=true" style="margin:0 15%;color:#3399ef">{{etm}}</text>
+					<view class="search-btn" @click="searchHandle">
+						搜索
 					</view>
-					<view class="titleRight" @click="toDetail(item)">
-						<view class="border">
-							{{status[item.status]}}
+				</view>
+
+			</view>
+			<view class="" style='overflow: auto;height:calc(100vh - 150px)' v-if="list.length !== 0">
+				<view class="" v-for="(item,i) in list" :key="i" style="background-color: #fff;margin-top:10px;padding: 10px;">
+					<view class="item">
+						<!-- {{item.title}} -->
+						<view class="title">
+							{{item.taskTitle}}
+						</view>
+						<view class="titleRight" @click="toDetail(item)">
+							<view class="border">
+								{{status[item.status]}}
+							</view>
+							<u-icon name="arrow-right" size="20"></u-icon>
 						</view>
-						<u-icon name="arrow-right"  size="20"></u-icon>
 					</view>
-				</view>
-				<view class="contentItem">
-					<view class="itemC">
-						<text>开始日期</text>
-						<text>{{item.startDate}}</text>
-					</view>
-					<view class="itemC">
-						<text>结束日期</text>
-						<text>{{item.endDate}}</text>
+					<view class="contentItem">
+						<view class="itemC">
+							<text>开始日期</text>
+							<text>{{item.startDate}}</text>
+						</view>
+						<view class="itemC">
+							<text>结束日期</text>
+							<text>{{item.endDate}}</text>
+						</view>
 					</view>
 				</view>
 			</view>
+			<view
+				style="height:calc(100vh - 150px);display: flex;align-items: center;justify-content: center;background-color: #fff;"
+				v-else>
+				<image src="../../static/empty.png" mode=""></image>
 			</view>
-
 		</view>
-		  <u-datetime-picker
-                :show="showTime"
-                v-model="startTime"
-                mode="datetime"
-                @confirm="handleStartTime"
-                @cancel="showTime=false"
-        ></u-datetime-picker>
-         <u-datetime-picker
-                :show="showTime1"
-                v-model="endTime"
-                mode="datetime"
-                @confirm="handleEndTime"
-                @cancel="showTime1=false"
-        ></u-datetime-picker>
+		<u-datetime-picker :show="showTime" v-model="startTime" mode="date" @confirm="handleStartTime"
+			@cancel="showTime=false"></u-datetime-picker>
+		<u-datetime-picker :show="showTime1" v-model="endTime" mode="date" @confirm="handleEndTime"
+			@cancel="showTime1=false"></u-datetime-picker>
 	</view>
 </template>
 
 <script>
 	import moment from 'moment'
-    const stm = moment().subtract(7, 'months').add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD");
-    const etm =  moment().add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD");
+	const stm = moment().subtract(7, 'months').add(1, 'hour').set({
+		minute: 0,
+		second: 0
+	}).format("YYYY-MM-DD");
+	const etm = moment().add(1, 'hour').set({
+		minute: 0,
+		second: 0
+	}).format("YYYY-MM-DD");
 	export default {
 		data() {
 			return {
-				status:{
-					0:'开始任务',
-					1:'继续任务',
-					// 2:'已完成'
+				status: {
+					0: '开始任务',
+					1: '继续任务',
+					2: '已完成'
 				},
-				  startTime:stm,
-    		      endTime:etm,
-    		      stm,
-    		      etm,
-    		      showTime:false,
-    		      showTime1:false,
-				  list: []
+				startTime: stm,
+				endTime: etm,
+				stm,
+				etm,
+				showTime: false,
+				showTime1: false,
+				list: []
 			};
 		},
 		mounted() {
+
 			this.getData()
 		},
 		methods: {
-				searchHandle(){
-    			     this.getData()
-     		   },
-			    handleStartTime(e){
-    				   let time = moment(e.value).format("YYYY-MM-DD HH:mm")
-    				    this.stm = time
-    				    this.showTime = false
-    				  }, 
-    				  handleEndTime(e){
-    				     let time = moment(e.value).format("YYYY-MM-DD HH:mm")
-    				     this.etm = time;
-    				    this.showTime1 = false
-    				  },
-			
-			async getData(){
+			searchHandle() {
+				this.getData()
+			},
+			handleStartTime(e) {
+				let time = moment(e.value).format("YYYY-MM-DD")
+				this.stm = time
+				this.showTime = false
+			},
+			handleEndTime(e) {
+				let time = moment(e.value).format("YYYY-MM-DD")
+				this.etm = time;
+				this.showTime1 = false
+			},
+
+			async getData() {
 				const userId = uni.getStorageSync('value')?.userId
 				const params = {
-					dateRangeSo:{
-						start:moment(this.stm).format("YYYY-MM-DD"),
-                        end:moment(this.etm).format("YYYY-MM-DD"),
+					dateRangeSo: {
+						start: moment(this.stm).format("YYYY-MM-DD"),
+						end: moment(this.etm).format("YYYY-MM-DD"),
 					},
-					inspectUserId:userId,
-					statusList:[0,1]
+					inspectUserId: userId,
+					statusList: [0, 1]
 				}
 				try {
-					const res = await uni.$http.post("/gunshiApp/xyt/inspect/task/list",params)
-						this.list = [...res.data.data];
+					const res = await uni.$http.post("/gunshiApp/xyt/inspect/task/list", params)
+					this.list = [...res.data.data];
 				} catch (error) {
 					uni.$showMsg();
 				}
 			},
-			toDetail(record){
+			toDetail(record) {
 				console.log(record);
 				uni.navigateTo({
-					url:`/pages/xcrw/detail/index?taskTitle=${record.taskTitle}&taskType=${record.taskType}&taskContent=${record.taskContent}&startDate=${record.startDate}&endDate=${record.endDate}&status=${record.status}&id=${record.id}`
+					url: `/pages/xcrw/detail/index?taskTitle=${record.taskTitle}&taskType=${record.taskType}&taskContent=${record.taskContent}&startDate=${record.startDate}&endDate=${record.endDate}&status=${record.status}&id=${record.id}`
 				})
 			}
 		}
@@ -134,19 +133,7 @@
 </script>
 
 <style lang="scss" scoped>
-    .time-ranger{
-    margin-bottom: 10px;
-     .start-time, .end-time{
-      display: flex;
-      align-items: center;
-      padding: 10px 0;
-      border-bottom: 1px solid #dfdfdf;
-    }
-    .search-btn{
-      margin: 3px 0 0 5px;
-      // color: #3399ef;
-    }
-  }
+
 	.myTitleStyle {
 		font-size: 30px;
 		background-color: red;
@@ -178,6 +165,7 @@
 
 		.titleRight {
 			display: flex;
+
 			.border {
 				border-width: 0px;
 				background-color: rgba(236, 245, 255, 1);
@@ -195,8 +183,9 @@
 		}
 
 	}
-	.contentItem{
-		.itemC{
+
+	.contentItem {
+		.itemC {
 			display: flex;
 			justify-content: space-between;
 			display: flex;
diff --git a/pages/ylzList/detail/index.vue b/pages/ylzList/detail/index.vue
index 602a121..17de353 100644
--- a/pages/ylzList/detail/index.vue
+++ b/pages/ylzList/detail/index.vue
@@ -152,17 +152,6 @@
 </script>
 
 <style lang="scss" scoped>
-    .time-ranger {
-        margin-bottom: 10px;
-
-        .start-time,
-        .end-time {
-            display: flex;
-            align-items: center;
-            padding: 10px 0;
-            border-bottom: 1px solid #dfdfdf;
-        }
-    }
 
     .tab-bar {
         display: flex;
diff --git a/static/empty.png b/static/empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..9acfed66322d96ac99bb5f76e29a34173633b083
GIT binary patch
literal 9552
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

literal 0
HcmV?d00001