From ee3e0fb14863617a7a1c9ea31081cc3ad1a790d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=BE=A4?= <zhangqun@MacBook-Pro.local>
Date: Mon, 18 Sep 2023 10:51:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E4=B8=8B=E8=BE=B9=E8=B7=9D=E8=A1=A5=E5=85=85=EF=BC=9B?=
 =?UTF-8?q?=E9=AB=98=E9=80=9F=E9=A2=84=E8=AD=A6=E6=8F=90=E7=A4=BAtooltip?=
 =?UTF-8?q?=EF=BC=9B=E9=93=81=E8=B7=AF=E5=88=97=E8=A1=A8=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E7=AB=99=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |  2 +-
 pages/airport/airport-runData/list.vue        |  2 +-
 pages/airport/airport-runStatus/list.vue      |  2 +-
 pages/highWay/runData/form.vue                | 19 ++++-
 pages/highWay/runData/list.vue                |  6 +-
 pages/highWay/runStatusData/form.vue          |  2 +-
 pages/highWay/runStatusData/list.vue          |  2 +-
 pages/home/index.vue                          |  3 +
 pages/metro/subwayPage/form.vue               |  2 +-
 pages/metro/subwayPage/list.vue               |  4 +-
 .../portShipping/waterInternational/form.vue  | 69 ++++++-------------
 .../portShipping/waterInternational/list.vue  |  4 +-
 pages/railway/railwayRunData/list.vue         | 15 +++-
 pages/railway/runStatus/list.vue              | 12 +++-
 pages/water/transportation/list.vue           |  2 +-
 pages/water/waterWay/list.vue                 |  2 +-
 16 files changed, 79 insertions(+), 69 deletions(-)

diff --git a/pages.json b/pages.json
index 116f604..31b3644 100644
--- a/pages.json
+++ b/pages.json
@@ -8,7 +8,7 @@
 		{
 			"path": "pages/home/index",
 			"style": {
-				"navigationBarTitleText": "高速"
+				"navigationBarTitleText": ""
 			}
 		},
 		{
diff --git a/pages/airport/airport-runData/list.vue b/pages/airport/airport-runData/list.vue
index 886c634..0c7cf9e 100644
--- a/pages/airport/airport-runData/list.vue
+++ b/pages/airport/airport-runData/list.vue
@@ -312,7 +312,7 @@
 		display: flex;
 		// justify-content: space-around;
 		background-color: #F8F8F8;
-		padding: 20rpx 30rpx;
+		padding: 20rpx 30rpx 40px;
 
 		.act_btn {
 			width: 690rpx;
diff --git a/pages/airport/airport-runStatus/list.vue b/pages/airport/airport-runStatus/list.vue
index 0a3de03..1d0d4de 100644
--- a/pages/airport/airport-runStatus/list.vue
+++ b/pages/airport/airport-runStatus/list.vue
@@ -312,7 +312,7 @@
 		display: flex;
 		// justify-content: space-around;
 		background-color: #F8F8F8;
-		padding: 20rpx 30rpx;
+		padding: 20rpx 30rpx 40px;
 
 		.act_btn {
 			width: 690rpx;
diff --git a/pages/highWay/runData/form.vue b/pages/highWay/runData/form.vue
index 4f26b8e..4a2222b 100644
--- a/pages/highWay/runData/form.vue
+++ b/pages/highWay/runData/form.vue
@@ -141,7 +141,11 @@
 				<view class="rate_item">
 					<view class="rate_item_label"
 						:style="form.highwaySubDataList.length == 0 ? '' : checkNotEmpty(form.highwaySubDataList[stationIndex].entranceVehicleCount) && (form.highwaySubDataList[stationIndex].entranceVehicleCountMom === 0 || (form.highwaySubDataList[stationIndex].entranceVehicleCount === form.highwaySubDataList[stationIndex].exitVehicleCount)) ? 'color: #EB4747' : ''">
-						驶入车辆数环比</view>
+						驶入车辆数环比
+						<uni-tooltip v-if="form.highwaySubDataList.length == 0 ? '' : checkNotEmpty(form.highwaySubDataList[stationIndex].entranceVehicleCount) && (form.highwaySubDataList[stationIndex].entranceVehicleCountMom === 0 || (form.highwaySubDataList[stationIndex].entranceVehicleCount === form.highwaySubDataList[stationIndex].exitVehicleCount)) ? 'color: #EB4747' : ''" content="预警:环比持平和驶入驶出车辆相同">
+						  <uni-icons type="help" size="18" color="#EB4747"></uni-icons>
+						</uni-tooltip>
+					</view>
 					<view class="rate_item_input"
 						:style="form.highwaySubDataList.length == 0 ? '' : checkNotEmpty(form.highwaySubDataList[stationIndex].entranceVehicleCount) && (form.highwaySubDataList[stationIndex].entranceVehicleCountMom === 0 || (form.highwaySubDataList[stationIndex].entranceVehicleCount === form.highwaySubDataList[stationIndex].exitVehicleCount)) ? 'color: #EB4747' : ''">
 						{{formatDigit(form.highwaySubDataList[stationIndex].entranceVehicleCountMom)}}%
@@ -170,7 +174,11 @@
 				<view class="rate_item">
 					<view class="rate_item_label"
 						:style="form.highwaySubDataList.length == 0 ? '' : checkNotEmpty(form.highwaySubDataList[stationIndex].exitVehicleCount) && (form.highwaySubDataList[stationIndex].exitVehicleCountMom === 0 || (form.highwaySubDataList[stationIndex].entranceVehicleCount === form.highwaySubDataList[stationIndex].exitVehicleCount)) ? 'color: #EB4747' : ''">
-						驶出车辆数环比</view>
+						驶出车辆数环比
+						<uni-tooltip v-if="form.highwaySubDataList.length == 0 ? '' : checkNotEmpty(form.highwaySubDataList[stationIndex].exitVehicleCount) && (form.highwaySubDataList[stationIndex].exitVehicleCountMom === 0 || (form.highwaySubDataList[stationIndex].entranceVehicleCount === form.highwaySubDataList[stationIndex].exitVehicleCount))" content="预警:环比持平和驶入驶出车辆相同">
+						  <uni-icons type="help" size="18" color="#EB4747"></uni-icons>
+						</uni-tooltip>
+					</view>
 					<view class="rate_item_input"
 						:style="form.highwaySubDataList.length == 0 ? '' : checkNotEmpty(form.highwaySubDataList[stationIndex].exitVehicleCount) && (form.highwaySubDataList[stationIndex].exitVehicleCountMom === 0 || (form.highwaySubDataList[stationIndex].entranceVehicleCount === form.highwaySubDataList[stationIndex].exitVehicleCount)) ? 'color: #EB4747' : ''">
 						{{formatDigit(form.highwaySubDataList[stationIndex].exitVehicleCountMom)}}%
@@ -651,7 +659,12 @@
 
 					.rate_item_label {
 						color: #666;
-						font-size: 24rpx;
+						font-size: 24rpx;
+						display: flex;
+						align-items: center;
+						/deep/.uni-tooltip-popup{
+							width: 200rpx;
+						}
 					}
 
 					.rate_item_input {
diff --git a/pages/highWay/runData/list.vue b/pages/highWay/runData/list.vue
index 8d0df5b..88f11f1 100644
--- a/pages/highWay/runData/list.vue
+++ b/pages/highWay/runData/list.vue
@@ -3,7 +3,9 @@
 		<view class="list_box" v-for="(item,index) in data" :key="index" @click="goPage('/pages/highway/runData/form?id='+item.id)">
 			<view class="list_top">
 				<view class="unit_tags">报送时间</view>
-				<view class="unit_name">{{item.statDate || ''}}<text style="margin-left:16rpx;">{{item.statPeriodValue || ''}}</text></view>
+				<view class="unit_name">
+					{{item.statDate || ''}}<text style="margin-left:16rpx;">{{item.statPeriodValue || ''}}</text>
+				</view>
 			</view>
 		</view>
 		<uni-load-more iconType="circle" :status="status" @clickLoadMore="loadMore"
@@ -318,7 +320,7 @@
 		right: 0;
 		bottom: 0;
 		background-color: #F8F8F8;
-		padding: 20px 30rpx;
+		padding: 20px 30rpx 40px;
 
 		.act_btn {
 			width: 690rpx;
diff --git a/pages/highWay/runStatusData/form.vue b/pages/highWay/runStatusData/form.vue
index e197e09..57d9413 100644
--- a/pages/highWay/runStatusData/form.vue
+++ b/pages/highWay/runStatusData/form.vue
@@ -163,7 +163,7 @@
 				</view>
 				<view class="form_item">
 					<view class="form_item_label">阻断/拥堵持续时间：</view>
-					<view class="form_item_input form_input">
+					<view class="form_item_input picker">
 						<!-- <uni-easyinput v-model="item.duration" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
 							placeholder="请输入" maxlength="200"></uni-easyinput> -->
 							<uni-datetime-picker type="datetime" v-model="item.duration" :border="false" :hide-second="true" >
diff --git a/pages/highWay/runStatusData/list.vue b/pages/highWay/runStatusData/list.vue
index dda9851..2743686 100644
--- a/pages/highWay/runStatusData/list.vue
+++ b/pages/highWay/runStatusData/list.vue
@@ -312,7 +312,7 @@
 		right: 0;
 		bottom: 0;
 		background-color: #F8F8F8;
-		padding: 20px 30rpx;
+		padding: 20px 30rpx 40px;
 
 		.act_btn {
 			width: 690rpx;
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 93c16c8..a00d534 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -43,6 +43,9 @@
 		onLoad(options) {
 			if(this.routersData.length == 0 && options.routers) {
 				this.routersData = JSON.parse(options.routers);
+				uni.setNavigationBarTitle({
+					title: this.routersData.meta.title || '交通运输报送系统'
+				})
 				this.routersData.children.map((item,index) => {
 					item.show = index == 0 ? true : false;
 				})
diff --git a/pages/metro/subwayPage/form.vue b/pages/metro/subwayPage/form.vue
index 5834d16..42e03e8 100644
--- a/pages/metro/subwayPage/form.vue
+++ b/pages/metro/subwayPage/form.vue
@@ -262,7 +262,7 @@
 								if (this.form.id == undefined) {
 									setTimeout(() => {
 										uni.redirectTo({
-											url: '/pages/airport/airport-runStatus/list'
+											url: '/pages/metro/subwayPage/list'
 										})
 									}, 300)
 								} else {
diff --git a/pages/metro/subwayPage/list.vue b/pages/metro/subwayPage/list.vue
index 0ff5cda..ccd5e14 100644
--- a/pages/metro/subwayPage/list.vue
+++ b/pages/metro/subwayPage/list.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="page">
-		<view class="list_box" v-for="(item,index) in data" :key="index" @click="goPage('/pages/metro/runData/form', item)">
+		<view class="list_box" v-for="(item,index) in data" :key="index" @click="goPage('/pages/metro/subwayPage/form', item)">
 			<view class="list_top">
 				<view class="unit_tags">报送时间</view>
 				<view>{{item.statDate || ''}}<text
@@ -312,7 +312,7 @@
 		display: flex;
 		// justify-content: space-around;
 		background-color: #F8F8F8;
-		padding: 20rpx 30rpx;
+		padding: 20rpx 30rpx 40px;
 
 		.act_btn {
 			width: 690rpx;
diff --git a/pages/portShipping/waterInternational/form.vue b/pages/portShipping/waterInternational/form.vue
index 2a737af..2df729b 100644
--- a/pages/portShipping/waterInternational/form.vue
+++ b/pages/portShipping/waterInternational/form.vue
@@ -73,7 +73,7 @@
 					</view>
 				</view>
 				<view class="form_item">
-					<view class="form_item_label">{{item.direction == 1 ? '入青' : item.direction == 2 ? '出青' : ''}}旅客人数：</view>
+					<view class="form_item_label">{{item.direction == '1' ? '入青' : item.direction == '2' ? '出青' : ''}}旅客人数：</view>
 					<view class="form_item_input form_input">
 						<uni-easyinput @blur="calcYoyMom(1,index)" @clear="calcYoyMom(1,index)" v-model="item.passengerCount" type="number"
 							placeholderStyle="color: #D4D4D4;font-size:28rpx;" placeholder="请输入" maxlength="20">
@@ -86,7 +86,7 @@
 					<view class="rate_item">
 						<view class="rate_item_label"
 							:style="item.passengerDod === 0 ? 'color: #EB4747' : ''">
-							{{item.direction == 1 ? '入青' : item.direction == 2 ? '出青' : ''}}旅客人数环比</view>
+							{{item.direction == '1' ? '入青' : item.direction == '2' ? '出青' : ''}}旅客人数环比</view>
 						<view class="rate_item_input"
 							:style="item.passengerDod === 0 ? 'color: #EB4747' : ''">
 							{{formatDigit(form.passengerDod)}}%
@@ -94,7 +94,7 @@
 					</view>
 					<view class="line"></view>
 					<view class="rate_item">
-						<view class="rate_item_label">{{item.direction == 1 ? '入青' : item.direction == 2 ? '出青' : ''}}旅客人数同比</view>
+						<view class="rate_item_label">{{item.direction == '1' ? '入青' : item.direction == '2' ? '出青' : ''}}旅客人数同比</view>
 						<view class="rate_item_input">
 							{{formatDigit(item.passengerYoy)}}%
 						</view>
@@ -139,7 +139,7 @@
 					</view>
 				</view>
 				<view class="form_item">
-					<view class="form_item_label">{{item.direction == 1 ? '入青' : item.direction == 2 ? '出青' : ''}}旅客人数：</view>
+					<view class="form_item_label">{{item.direction == '1' ? '入青' : item.direction == '2' ? '出青' : ''}}旅客人数：</view>
 					<view class="form_item_input form_input">
 						<uni-easyinput @blur="calcYoyMom(2,index)" @clear="calcYoyMom(2,index)" v-model="item.passengerCount" type="number"
 							placeholderStyle="color: #D4D4D4;font-size:28rpx;" placeholder="请输入" maxlength="20">
@@ -152,7 +152,7 @@
 					<view class="rate_item">
 						<view class="rate_item_label"
 							:style="item.passengerDod === 0 ? 'color: #EB4747' : ''">
-							{{item.direction == 1 ? '入青' : item.direction == 2 ? '出青' : ''}}旅客人数环比</view>
+							{{item.direction == '1' ? '入青' : item.direction == '2' ? '出青' : ''}}旅客人数环比</view>
 						<view class="rate_item_input"
 							:style="item.passengerDod === 0 ? 'color: #EB4747' : ''">
 							{{formatDigit(form.passengerDod)}}%
@@ -160,7 +160,7 @@
 					</view>
 					<view class="line"></view>
 					<view class="rate_item">
-						<view class="rate_item_label">{{item.direction == 1 ? '入青' : item.direction == 2 ? '出青' : ''}}旅客人数同比</view>
+						<view class="rate_item_label">{{item.direction == '1' ? '入青' : item.direction == '2' ? '出青' : ''}}旅客人数同比</view>
 						<view class="rate_item_input">
 							{{formatDigit(item.passengerYoy)}}%
 						</view>
@@ -193,16 +193,7 @@
 		data() {
 			return {
 				form: {
-					"internationalCruiseDTOList": [{
-						"route": "",
-						"routeIndex": "",
-						"voyage": "",
-						"voyageIndex": "",
-						"direction": "",
-						"passengerCount": "",
-						"passengerDod": "",//环比
-						"passengerYoy": "",//同比
-					}],//国际客运
+					"internationalCruiseDTOList": [],//客班轮
 					"passengerShipDTOList":[{
 						"route": "",
 						"routeIndex": "",
@@ -212,7 +203,7 @@
 						"passengerCount": "",
 						"passengerDod": "",//环比
 						"passengerYoy": "",//同比
-					}],//客班轮
+					}],//国际邮轮
 					"organizationName": "",
 					"statDate": "",
 					"statPeriod": ""
@@ -247,7 +238,9 @@
 				this.btnText = '修改并保存';
 				this.$request(getApp().globalData.baseUrl + '/api/biz/internationalPassengerTransport/selectById/' + options.id, {}, "GET").then(
 					res => {
-						this.form = res.data;
+						this.form = res.data;
+						this.form.passengerShipDTOList = this.form.passengerShipVOList;
+						this.form.internationalCruiseDTOList = this.form.internationalCruiseVOList;
 						if (checkNotEmpty(this.deptNameList)) {
 							let idx = this.deptNameList.findIndex(item => item.deptName = this.form.organizationName);
 							this.form.organizationNameIndex = idx > -1 ? idx : '';
@@ -358,14 +351,16 @@
 				this.$request(getApp().globalData.baseUrl + '/api/biz/internationalPassengerTransport/getYoYAndMoM?statDate=' + this.form
 						.statDate + '&statPeriod=' + this.form.statPeriod + '&voyage=' + _voyage + '&_t=' + Date.parse(new Date()), {}, 'GET')
 					.then(res => {
+						let dayData = res.data.minusDays;
+						let yearData = res.data.minusYears;
 						if(type == 1) {
 							//客班轮
-							this.form.passengerShipDTOList[index].passengerDod = this.$calcMom(this.form.passengerShipDTOList[index].passengerCount,res.data);
-							this.form.passengerShipDTOList[index].passengerYoy = this.$calcYoy(this.form.passengerShipDTOList[index].passengerCount,res.data);
+							this.form.passengerShipDTOList[index].passengerDod = this.$calcMom(this.form.passengerShipDTOList[index].passengerCount,dayData.passengerCount);
+							this.form.passengerShipDTOList[index].passengerYoy = this.$calcYoy(this.form.passengerShipDTOList[index].passengerCount,yearData.passengerCount);
 						}else{
 							//国际邮轮
-							this.form.internationalCruiseDTOList[index].passengerDod = this.$calcMom(this.form.internationalCruiseDTOList[index].passengerCount,res.data);
-							this.form.internationalCruiseDTOList[index].passengerYoy = this.$calcYoy(this.form.internationalCruiseDTOList[index].passengerCount,res.data);
+							this.form.internationalCruiseDTOList[index].passengerDod = this.$calcMom(this.form.internationalCruiseDTOList[index].passengerCount,dayData.passengerCount);
+							this.form.internationalCruiseDTOList[index].passengerYoy = this.$calcYoy(this.form.internationalCruiseDTOList[index].passengerCount,yearData.passengerCount);
 						}
 					})
 			},
@@ -373,32 +368,12 @@
 			changeRoute(e, index) {
 				if(this.tabType == 1) {
 					//客班轮
-					//判断是否重复选择
-					let idx = this.form.passengerShipDTOList.findIndex(item => item.routeIndex == e.detail.value);
-					if (idx > -1 && this.form.passengerShipDTOList[index].routeIndex != idx) {
-						uni.showToast({
-							title: '客班轮航线不能重复选择',
-							icon: 'none'
-						});
-					}
-					else{
-						this.form.passengerShipDTOList[index].routeIndex = e.detail.value;
-						this.form.passengerShipDTOList[index].route = this.shipRouteList[e.detail.value].route;
-					}
+					this.form.passengerShipDTOList[index].routeIndex = e.detail.value;
+					this.form.passengerShipDTOList[index].route = this.shipRouteList[e.detail.value].route;
 				}else{
 					//国际邮轮
-					//判断是否重复选择
-					let idx = this.form.internationalCruiseDTOList.findIndex(item => item.routeIndex == e.detail.value);
-					if (idx > -1 && this.form.internationalCruiseDTOList[index].routeIndex != idx) {
-						uni.showToast({
-							title: '国际邮轮航线不能重复选择',
-							icon: 'none'
-						});
-					}
-					else {
-						this.form.internationalCruiseDTOList[index].routeIndex = e.detail.value;
-						this.form.internationalCruiseDTOList[index].route = this.internationalRouteList[e.detail.value].route;
-					}
+					this.form.internationalCruiseDTOList[index].routeIndex = e.detail.value;
+					this.form.internationalCruiseDTOList[index].route = this.internationalRouteList[e.detail.value].route;
 				}
 			},
 			//航次选择
@@ -534,7 +509,7 @@
 								if (this.form.id == undefined) {
 									setTimeout(() => {
 										uni.redirectTo({
-											url: '/pages/railway/railwayRunData/list'
+											url: '/pages/portShipping/waterInternational/list'
 										})
 									}, 300)
 								} else {
diff --git a/pages/portShipping/waterInternational/list.vue b/pages/portShipping/waterInternational/list.vue
index 759dd94..5297e91 100644
--- a/pages/portShipping/waterInternational/list.vue
+++ b/pages/portShipping/waterInternational/list.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="page">
-		<view class="list_box" v-for="(item,index) in data" :key="index" @click="goPage('/pages/portShipping/internationalTransport/form?id='+item.id)">
+		<view class="list_box" v-for="(item,index) in data" :key="index" @click="goPage('/pages/portShipping/waterInternational/form?id='+item.id)">
 			<view class="list_top">
 				<view class="unit_tags">报送时间</view>
 				<view class="unit_name">{{item.statDate || ''}}<text
@@ -310,7 +310,7 @@
 		right: 0;
 		bottom: 0;
 		background-color: #F8F8F8;
-		padding: 20px 30rpx;
+		padding: 20px 30rpx 40px;
 
 		.act_btn {
 			width: 690rpx;
diff --git a/pages/railway/railwayRunData/list.vue b/pages/railway/railwayRunData/list.vue
index 575e1c6..a8ad6a5 100644
--- a/pages/railway/railwayRunData/list.vue
+++ b/pages/railway/railwayRunData/list.vue
@@ -3,9 +3,11 @@
 		<view class="list_box" v-for="(item,index) in data" :key="index" @click="goPage('/pages/railway/railwayRunData/form?id='+item.id)">
 			<view class="list_top">
 				<view class="unit_tags">报送时间</view>
-				<view>{{item.statDate || ''}}<text
-					style="margin-left:16rpx;">{{item.statPeriodValue || ''}}</text></view>
+				<view class="unit_name">{{item.statDate || ''}}<text
+					style="margin-left:16rpx;">{{item.statPeriodValue || ''}}</text>
+				</view>
 			</view>
+			<view class="unit_station">{{item.railwayName || ''}}</view>
 		</view>
 		<uni-load-more iconType="circle" :status="status" @clickLoadMore="loadMore"
 			:contentText="contentText"></uni-load-more>
@@ -220,6 +222,13 @@
 				word-break: break-all;
 			}
 		}
+		.unit_station {
+			color: #666;
+			font-size: 24rpx;
+			font-family: PingFang SC-Regular, PingFang SC;
+			font-weight: 400;
+			text-align: right;
+		}
 
 		.report_time {
 			color: #999999;
@@ -312,7 +321,7 @@
 		right: 0;
 		bottom: 0;
 		background-color: #F8F8F8;
-		padding: 20px 30rpx;
+		padding: 20px 30rpx 40px;
 
 		.act_btn {
 			width: 690rpx;
diff --git a/pages/railway/runStatus/list.vue b/pages/railway/runStatus/list.vue
index b2ad684..46f759d 100644
--- a/pages/railway/runStatus/list.vue
+++ b/pages/railway/runStatus/list.vue
@@ -3,9 +3,10 @@
 		<view class="list_box" v-for="(item,index) in data" :key="index" @click="goPage('/pages/railway/runStatus/form?id='+item.id)">
 			<view class="list_top">
 				<view class="unit_tags">报送时间</view>
-				<view>{{item.statDate || ''}}<text
+				<view class="unit_name">{{item.statDate || ''}}<text
 					style="margin-left:16rpx;">{{item.statPeriodValue || ''}}</text></view>
 			</view>
+			<view class="unit_station">{{item.carName || ''}}</view>
 		</view>
 		<uni-load-more iconType="circle" :status="status" @clickLoadMore="loadMore"
 			:contentText="contentText"></uni-load-more>
@@ -220,6 +221,13 @@
 				word-break: break-all;
 			}
 		}
+		.unit_station {
+			color: #666;
+			font-size: 24rpx;
+			font-family: PingFang SC-Regular, PingFang SC;
+			font-weight: 400;
+			text-align: right;
+		}
 
 		.report_time {
 			color: #999999;
@@ -314,7 +322,7 @@
 		display: flex;
 		// justify-content: space-around;
 		background-color: #F8F8F8;
-		padding: 20rpx 30rpx;
+		padding: 20rpx 30rpx 40px;
 
 		.act_btn {
 			width: 690rpx;
diff --git a/pages/water/transportation/list.vue b/pages/water/transportation/list.vue
index a27cc08..6afd680 100644
--- a/pages/water/transportation/list.vue
+++ b/pages/water/transportation/list.vue
@@ -310,7 +310,7 @@
 		right: 0;
 		bottom: 0;
 		background-color: #F8F8F8;
-		padding: 20px 30rpx;
+		padding: 20px 30rpx 40px;
 
 		.act_btn {
 			width: 690rpx;
diff --git a/pages/water/waterWay/list.vue b/pages/water/waterWay/list.vue
index ddaa851..25e5132 100644
--- a/pages/water/waterWay/list.vue
+++ b/pages/water/waterWay/list.vue
@@ -310,7 +310,7 @@
 		right: 0;
 		bottom: 0;
 		background-color: #F8F8F8;
-		padding: 20px 30rpx;
+		padding: 20px 30rpx 40px;
 
 		.act_btn {
 			width: 690rpx;