From 72b7ca39d02c325aa3098f34697ba68eb7eaf3aa Mon Sep 17 00:00:00 2001
From: zhangqun <179111901@qq.com>
Date: Tue, 19 Sep 2023 16:52:00 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=EF=BC=8C=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E8=BF=87=E6=BB=A4=E9=9D=9E=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E5=85=A5=E5=8F=A3=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/bus/busDataInfo/list.vue        |  2 +-
 pages/highWay/runStatusData/form.vue  |  4 ++--
 pages/home/home.vue                   |  3 ++-
 pages/railway/railwayRunData/form.vue | 10 +++++++---
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pages/bus/busDataInfo/list.vue b/pages/bus/busDataInfo/list.vue
index 788d00c..fa04d21 100644
--- a/pages/bus/busDataInfo/list.vue
+++ b/pages/bus/busDataInfo/list.vue
@@ -6,7 +6,7 @@
 				<view class="list_item" v-for="(item,index) in listData" :key="index" @click="editItem(item)">
 					<view class="list_top">
 						<view class="unit_tags">报送时间</view>
-						<view class="unit_name">{{item.reportDate || ''}}<text style="margin-left:16rpx;">{{item.statPeriodValue || ''}}</text></view>
+						<view class="unit_name">{{item.reportDate || ''}}<text style="margin-left:16rpx;">{{item.documentStatusValue || ''}}</text></view>
 					</view>
 				</view>
 			</view>
diff --git a/pages/highWay/runStatusData/form.vue b/pages/highWay/runStatusData/form.vue
index 4fb4bb8..9ef1822 100644
--- a/pages/highWay/runStatusData/form.vue
+++ b/pages/highWay/runStatusData/form.vue
@@ -255,7 +255,7 @@
 				<view class="form_item">
 					<view class="form_item_label">事故内容：</view>
 					<view class="form_item_input form_input">
-						<uni-easyinput v-model="item.congestionContent"
+						<uni-easyinput v-model="item.accidentContent"
 							placeholderStyle="color: #D4D4D4;font-size:28rpx;" placeholder="请输入" maxlength="50">
 						</uni-easyinput>
 					</view>
@@ -266,7 +266,7 @@
 						<picker :value="item.accidentLevelIndex" :range="accidentLevel" range-key="dictLabel"
 							@change="e => changeAccidentLevel(e, 'highwayAccidentDetailDTOS', index)">
 							<text class="picker_select"
-								:style="item.accidentLevelIndex > -1?'color:#333;':''">{{item.accidentLevelIndex > -1 ? accidentLevel[item.accidentLevelIndex].dictLabel : '请选择'}}</text>
+								:style="item.accidentLevelIndex === 0 || item.accidentLevelIndex ? 'color:#333;':''">{{item.accidentLevelIndex === 0 || item.accidentLevelIndex ? accidentLevel[item.accidentLevelIndex].dictLabel : '请选择'}}</text>
 							<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
 						</picker>
 					</view>
diff --git a/pages/home/home.vue b/pages/home/home.vue
index a47406b..644530c 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="home_warp">
 		<view class="home_box">
-			<view @click="goPage(item)" class="home_item" v-for="(item, index) in routeData" :index="index" :key="index">
+			<view v-if="filterRoute.indexOf(item.meta.title) > -1" @click="goPage(item)" class="home_item" v-for="(item, index) in routeData" :index="index" :key="index">
 				<image :src="imgFix + item.name.replace('/','') + '.png'" class="img"></image>
 				<view class="txt">{{item.meta.title}}</view>
 			</view>
@@ -14,6 +14,7 @@
 			return {
 				imgFix: '/static/image/',
 				routeData: [], //路由权限
+				filterRoute:['机场','地铁','道路运输','铁路','水运','高速','港口','公交'],//排除非小程序菜单
 			}
 		},
 		onShow() {
diff --git a/pages/railway/railwayRunData/form.vue b/pages/railway/railwayRunData/form.vue
index f541119..17950a1 100644
--- a/pages/railway/railwayRunData/form.vue
+++ b/pages/railway/railwayRunData/form.vue
@@ -254,18 +254,19 @@
 		},
 		onLoad(options) {
 			this.userInfo = uni.getStorageSync('userInfo');
-			this.queryStation(); //车展名称列表
 			if (options.type == 'add') {
 				this.pageType = 'add';
 				let now = new Date();
 				this.form.statDate = getDateStr(now, -1); //默认前一天
 				this.queryTime(); //统计时段
+				this.queryStation();
 			} else if (options.id) {
 				this.btnText = '修改并保存';
 				this.$request(getApp().globalData.baseUrl + '/api/biz/railwayRunData/find/' + options.id, {}, "GET").then(
 					res => {
 						this.form = res.data;
 						this.queryTime(); //统计时段
+						this.queryStation();
 					});
 			}
 		},
@@ -281,12 +282,12 @@
 			},
 			//环比同比
 			queryYoyMom() {
-				if (this.form.statDate == '' || this.form.statPeriod == '') {
+				if (this.form.statDate == '' || this.form.statPeriod == '' || this.form.railwayName == '') {
 					return;
 				}
 				// let _date = getDateStr(new Date(this.form.statDate), -1);
 				this.$request(getApp().globalData.baseUrl + '/api/biz/railwayRunData/getYoYMoM?statDate=' + this.form
-						.statDate + '&statPeriod=' + this.form.statPeriod + '&_t=' + Date.parse(new Date()), {}, 'GET')
+						.statDate + '&statPeriod=' + this.form.statPeriod + '&railwayName=' + this.form.railwayName + '&_t=' + Date.parse(new Date()), {}, 'GET')
 					.then(res => {
 						this.yoyMom = res.data;
 						this.calcYoyMom(); //同步更新环比同比
@@ -394,12 +395,15 @@
 						this.form.railwayName = res.data[0];
 						this.railwayNameIndex = 0;
 					}
+					this.queryYoyMom();
 				})
 			},
 			//车站选择
 			changeRailway(e) {
 				this.railwayNameIndex = e.detail.value;
 				this.form.railwayName = this.stationList[e.detail.value];
+				this.queryYoyMom();
+				
 			},
 			//统计时段切换选择
 			changeStatPeriod(e) {