From 527adc8649a529a6addac568aa86d5f4a9414998 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=BE=A4?= <zhangqun@MacBook-Pro.local>
Date: Thu, 12 Oct 2023 16:07:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=93=81=E8=B7=AF=E8=BF=90=E8=BE=93=E6=83=85?=
 =?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                               |  4 ++--
 pages/bus/busDataInfo/form.vue        |  1 +
 pages/bus/busDataInfo/list.vue        |  9 +++++----
 pages/railway/railwayRunData/form.vue |  4 +++-
 pages/railway/runStatus/list.vue      | 19 ++++++++++++-------
 5 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/App.vue b/App.vue
index 8f34007..1b314ab 100644
--- a/App.vue
+++ b/App.vue
@@ -55,8 +55,8 @@
 		},
 		globalData: {
 			// baseUrl: 'http://27.223.104.50:8001',//接口前缀
-			baseUrl: 'https://jtxx.qdjtcx.cn:8001',//接口前缀
-			// baseUrl: 'http://10.50.3.103:8086',//接口前缀
+			// baseUrl: 'https://jtxx.qdjtcx.cn:8001',//接口前缀
+			baseUrl: 'http://10.50.3.103:8086',//接口前缀
 			mobile: '66007587'
 		},
 		methods: {
diff --git a/pages/bus/busDataInfo/form.vue b/pages/bus/busDataInfo/form.vue
index 85fe8bb..868814f 100644
--- a/pages/bus/busDataInfo/form.vue
+++ b/pages/bus/busDataInfo/form.vue
@@ -668,6 +668,7 @@
 					item.isPassengerCountConvert = 0
 				})
 				this.form.bizBusDataBodySaveOrUpdateDTOList = this.form.bizBusDataDetailVOList;
+				this.form.reportDate = this.form.statDate;
 				console.log(this.form)
 				uni.showModal({
 					title: '提示',
diff --git a/pages/bus/busDataInfo/list.vue b/pages/bus/busDataInfo/list.vue
index 1fbb561..83084ba 100644
--- a/pages/bus/busDataInfo/list.vue
+++ b/pages/bus/busDataInfo/list.vue
@@ -110,12 +110,13 @@
 						_t:Date.parse(new Date()),
 						...this.query
 					}
-					this.$request(getApp().globalData.baseUrl + '/api/biz/highwayParentDataController/getTimeList',params,"GET").then(res =>{
+					this.$request(getApp().globalData.baseUrl + '/api/biz/busdata/getTimeList',params,"GET").then(res =>{
 						console.log(res)
 						if(res.code == 200){
-							// res.data.list.map(item =>{
-							// 	item.show = false;
-							// })
+							res.data.list.map(item =>{
+								// item.show = false;
+								item.statDate = item.reportDate;
+							})
 							this.listData = this.listData.concat(res.data.list);
 							if(res.data.list.length == 0 || res.data.list.length < this.pageSize){
 								this.hasMore = false;
diff --git a/pages/railway/railwayRunData/form.vue b/pages/railway/railwayRunData/form.vue
index df42359..b79331a 100644
--- a/pages/railway/railwayRunData/form.vue
+++ b/pages/railway/railwayRunData/form.vue
@@ -472,6 +472,7 @@
 						res.data.statPeriod = statPeriod;
 						this.form = res.data;
 						this.form.bizRailwayRunDataSaveOrUpdateDTOList = this.form.bizRailwayRunDataVOList;
+						console.log('============init station ==', this.form)
 						//查询汇总同环比
 						this.$request(getApp().globalData.baseUrl + '/api/biz/railwayRunData/getSummaryDataYoYAndMoM?statDate=' + statDate + '&statPeriod=' + statPeriod + '&_t=' + Date.parse(new Date()), {},
 								'GET')
@@ -594,7 +595,8 @@
 								"railwayName": item.railwayName,
 							})
 						})
-					}else{
+					}else{
+						console.log('init station ==', this.form)
 						let arr = JSON.parse(JSON.stringify(this.form.bizRailwayDataSaveOrUpdateDTOList));
 						this.form.bizRailwayDataSaveOrUpdateDTOList = [];
 						this.stationList.map(item => {
diff --git a/pages/railway/runStatus/list.vue b/pages/railway/runStatus/list.vue
index e303a72..34ef029 100644
--- a/pages/railway/runStatus/list.vue
+++ b/pages/railway/runStatus/list.vue
@@ -1,17 +1,17 @@
 <template>
 	<view class="page">
 		<view class="list_box" v-for="(item,index) in data" :key="index">
-			<view class="list_top">
+			<view class="list_top" @click="showDetail(index,!item.show)">
 				<view class="unit_tags">报送时间</view>
 				<view class="unit_name">{{item.statDate || ''}}<text
-					style="margin-left:16rpx;">{{item.statPeriodValue || ''}}</text></view>
+					style="margin-left:16rpx;">{{renderTime(item.statPeriod)}}</text></view>
 				<view class="unit_arrow">
-					<uni-icons @click="showDetail(index,false)" v-if="item.show" type="bottom" size="16" color="#666666"></uni-icons>
-					<uni-icons @click="showDetail(index,true)" v-else type="right" size="16" color="#666666"></uni-icons>
+					<uni-icons v-if="item.show" type="bottom" size="16" color="#666666"></uni-icons>
+					<uni-icons v-else type="right" size="16" color="#666666"></uni-icons>
 				</view>
 			</view>
 			<view class="list_cnt" v-if="item.show">
-				<view class="list_cnt_item" @click="goPage('/pages/railway/runStatus/form?id='+item.id)">{{item.carName || ''}}</view>
+				<view v-for="(car,index2) in item.bizRailwayRunSituationTabVOList" :key="index" class="list_cnt_item" @click="goPage('/pages/railway/runStatus/form?id='+car.id)">{{car.carName || ''}}</view>
 			</view>
 		</view>
 		<uni-load-more iconType="circle" :status="status" @clickLoadMore="loadMore"
@@ -157,9 +157,14 @@
 			closeSearch() {
 				this.$refs.popup.close();
 			},
+			//时段文本转换
+			renderTime(reportPhase) {
+				let idx = this.array.findIndex(item => item.dictValue == reportPhase);
+				return idx > -1 ? this.array[idx].dictLabel : '';
+			},
 			//时段
 			queryTime() {
-				this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date.parse(
+				this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=railway_time' + '&_t=' + Date.parse(
 					new Date()), {}, 'GET').then(res => {
 					this.array = res.data;
 				})
@@ -172,7 +177,7 @@
 					Object.keys(this.query).map(key => {
 						params = params + '&' + key + '=' + this.query[key]
 					})
-					this.$request(getApp().globalData.baseUrl + '/api/biz/railwayRunSituation/list?page=' + this.current +
+					this.$request(getApp().globalData.baseUrl + '/api/biz/railwayRunSituation/getTimeList?page=' + this.current +
 						'&pageSize=' + this.size + '&_t=' + Date.parse(new Date()) + params, {}, 'GET').then(res => {
 						if (res.code == 200) {
 							res.data.list.map(item =>{