From 41586a7d7131e5c1b48195ffe7b06ca66035dace Mon Sep 17 00:00:00 2001
From: xielei <xllove1314>
Date: Fri, 8 Nov 2024 15:40:32 +0800
Subject: [PATCH] 11

---
 App.vue                              |  1 +
 pages/mypage/compents/wtcl/index.vue |  4 ++--
 pages/mypage/compents/wxyh/index.vue | 12 ++++++------
 pages/mypage/compents/xcrw/index.vue | 12 ++++++------
 pages/wtcl/index.vue                 |  4 ++--
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/App.vue b/App.vue
index d9bd2f7..d5acf75 100644
--- a/App.vue
+++ b/App.vue
@@ -93,6 +93,7 @@
 	}
 	.time-ranger{
 	  background-color: #ffffff;
+	  padding: 0px 10px;
 	  padding-bottom: 10px;
 	   .start-time, .end-time{
 	    display: flex;
diff --git a/pages/mypage/compents/wtcl/index.vue b/pages/mypage/compents/wtcl/index.vue
index 95d5398..631cc93 100644
--- a/pages/mypage/compents/wtcl/index.vue
+++ b/pages/mypage/compents/wtcl/index.vue
@@ -76,8 +76,8 @@
 				showTime1: false,
 				start: '请选择开始时间',
 				end: '请选择结束时间',
-				stm: '',
-				etm: '',
+				stm:moment().startOf('year').format('YYYY-MM-DD'),
+				etm:moment().format('YYYY-MM-DD'),
 				customStyle: {
 					background: '#000'
 				},
diff --git a/pages/mypage/compents/wxyh/index.vue b/pages/mypage/compents/wxyh/index.vue
index a7044ef..1c8d0de 100644
--- a/pages/mypage/compents/wxyh/index.vue
+++ b/pages/mypage/compents/wxyh/index.vue
@@ -5,7 +5,7 @@
 			}" :height='44' :safeAreaInsetTop=true leftIconSize='20' leftIconColor='rgb(153, 153, 153)'>
 		</u-navbar>
 		<view style="background-color: #f0f0f0;padding: 10px;margin-top: 44px;">
-			<view style="padding:0 10px;backgroundColor:#fff">
+			<!-- <view style="padding:0 10px;backgroundColor:#fff"> -->
 				<view class="time-ranger">
 					<view class="start-time">
 						<text>开始时间</text>
@@ -19,7 +19,7 @@
 						</view>
 					</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">
@@ -44,9 +44,9 @@
 			</view> -->
 		</view>
 		<!-- <button @click="submitForm">Submit</button> -->
-		<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>
@@ -71,8 +71,8 @@
 				showTime1: false,
 				start: '请选择开始时间',
 				end: '请选择结束时间',
-				stm: '',
-				etm: '',
+				stm:moment().startOf('year').format('YYYY-MM-DD'),
+				etm:moment().format('YYYY-MM-DD'),
 				dataList: [],
 				type: {
 					1: "溢洪道清障",
diff --git a/pages/mypage/compents/xcrw/index.vue b/pages/mypage/compents/xcrw/index.vue
index 4395c8f..59cf185 100644
--- a/pages/mypage/compents/xcrw/index.vue
+++ b/pages/mypage/compents/xcrw/index.vue
@@ -53,14 +53,14 @@
 		  <u-datetime-picker
                 :show="showTime"
                 v-model="startTime"
-                mode="datetime"
+                mode="date"
                 @confirm="handleStartTime"
                 @cancel="showTime=false"
         ></u-datetime-picker>
          <u-datetime-picker
                 :show="showTime1"
                 v-model="endTime"
-                mode="datetime"
+                mode="date"
                 @confirm="handleEndTime"
                 @cancel="showTime1=false"
         ></u-datetime-picker>
@@ -69,8 +69,8 @@
 
 <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().startOf('year').set({minute: 0, second: 0}).format("YYYY-MM-DD");
+    const etm =  moment().set({minute: 0, second: 0}).format("YYYY-MM-DD");
 	export default {
 		data() {
 			return {
@@ -96,12 +96,12 @@
     			     this.getData()
      		   },
 			    handleStartTime(e){
-    				   let time = moment(e.value).format("YYYY-MM-DD HH:mm")
+    				   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 HH:mm")
+    				     let time = moment(e.value).format("YYYY-MM-DD")
     				     this.etm = time;
     				    this.showTime1 = false
     				  },
diff --git a/pages/wtcl/index.vue b/pages/wtcl/index.vue
index d0a102a..021a402 100644
--- a/pages/wtcl/index.vue
+++ b/pages/wtcl/index.vue
@@ -74,8 +74,8 @@
 				showTime1:false,
 				start: '请选择开始时间',
 				end: '请选择结束时间',
-				stm:'',
-				etm:'',
+				stm:moment().startOf('year').format('YYYY-MM-DD'),
+				etm:moment().format('YYYY-MM-DD'),
 				customStyle: {
 					background: '#000'
 				},