From 72e1addf37f0575bd1b8e0c3a001a164647c022e Mon Sep 17 00:00:00 2001
From: zhangqun <179111901@qq.com>
Date: Sun, 8 Oct 2023 17:03:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=88=E4=BF=AE=E6=AD=A3=EF=BC=9B?=
=?UTF-8?q?=E9=93=81=E8=B7=AF=E8=BF=90=E8=A1=8C=E6=83=85=E5=86=B5=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=94=B9=E4=B8=BA=E6=8A=98=E5=8F=A0?=
=?UTF-8?q?=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/railway/railwayRunData/form.vue | 18 +++++-----
pages/railway/runStatus/list.vue | 47 ++++++++++++++++++++++++---
2 files changed, 52 insertions(+), 13 deletions(-)
diff --git a/pages/railway/railwayRunData/form.vue b/pages/railway/railwayRunData/form.vue
index 7a4db00..15f3e8c 100644
--- a/pages/railway/railwayRunData/form.vue
+++ b/pages/railway/railwayRunData/form.vue
@@ -40,7 +40,7 @@
- 进终到车次统计：
+ 进青终到车次统计：
{{form.entranceVehicleCount === 0 ? form.entranceVehicleCount : form.entranceVehicleCount || ''}}
@@ -51,7 +51,7 @@
- 终到此次统计环比
+ 终到车次统计环比
{{formatDigit(form.entranceVehicleCountMom)}}%
@@ -59,7 +59,7 @@
- 终到此次统计同比
+ 终到车次统计同比
{{formatDigit(form.entranceVehicleCountYoy)}}%
@@ -72,7 +72,7 @@
- 进青人次统计：
+ 进青人数统计：
{{form.exitVehicleCount === 0 ? form.exitVehicleCount : form.exitVehicleCount || ''}}
@@ -83,7 +83,7 @@
- 人次统计环比
+ 人数统计环比
{{formatDigit(form.exitVehicleCountMom)}}%
@@ -91,7 +91,7 @@
- 人次统计同比
+ 人数统计同比
{{formatDigit(form.exitVehicleCountYoy)}}%
@@ -131,7 +131,7 @@
- 出青人次统计：
+ 出青人数统计：
{{form.exitVehicleCount === 0 ? form.exitVehicleCount : form.exitVehicleCount || ''}}
@@ -142,7 +142,7 @@
- 人次统计环比
+ 人数统计环比
{{formatDigit(form.exitVehicleCountMom)}}%
@@ -150,7 +150,7 @@
- 人次统计同比
+ 人数统计同比
{{formatDigit(form.exitVehicleCountYoy)}}%
diff --git a/pages/railway/runStatus/list.vue b/pages/railway/runStatus/list.vue
index a3b624f..e303a72 100644
--- a/pages/railway/runStatus/list.vue
+++ b/pages/railway/runStatus/list.vue
@@ -1,12 +1,18 @@
-
+
报送时间
{{item.statDate || ''}}{{item.statPeriodValue || ''}}
+
+
+
+
+
+
+ {{item.carName || ''}}
- {{item.carName || ''}}
@@ -99,9 +105,20 @@
},
methods: {
//折叠
- showDetail(index1, index2, flag) {
- this.data[index1].highwaySubDataList[index2].show = flag;
+ showDetail(index1,flag) {
+ if(flag) {
+ //展开的同时折叠已展开的其他项
+ let idx = this.data.findIndex(item => item.show == true);
+ if(idx > -1) {
+ this.data[idx].show = false;
+ }
+ }
+ this.data[index1].show = flag;
},
+ // //折叠
+ // showDetail(index1, index2, flag) {
+ // this.data[index1].highwaySubDataList[index2].show = flag;
+ // },
//搜索时段选择
bindPickerChange: function(e) {
console.log('picker发送选择改变，携带值为', e.detail.value)
@@ -158,6 +175,9 @@
this.$request(getApp().globalData.baseUrl + '/api/biz/railwayRunSituation/list?page=' + this.current +
'&pageSize=' + this.size + '&_t=' + Date.parse(new Date()) + params, {}, 'GET').then(res => {
if (res.code == 200) {
+ res.data.list.map(item =>{
+ item.show = false;
+ })
this.data = this.data.concat(res.data.list);
if (res.data.list.length == 0 || res.data.totalCount < this.size) {
this.hasMore = false;
@@ -222,6 +242,7 @@
}
.unit_name {
+ flex: 1;
color: #333333;
font-size: 30rpx;
font-family: PingFang SC-Bold, PingFang SC;
@@ -230,6 +251,10 @@
margin-left: 20rpx;
word-break: break-all;
}
+ .unit_arrow{
+ float: right;
+ line-height: 48rpx;
+ }
}
.unit_station {
color: #666;
@@ -238,6 +263,20 @@
font-weight: 400;
text-align: right;
}
+
+ // 层级填报单位
+ .list_cnt{
+ border-top: 1rpx solid #F7F0EE;
+ margin-top: 30rpx;
+ .list_cnt_item {
+ color: #666666;
+ font-size: 30rpx;
+ line-height: 40rpx;
+ font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+ font-weight: 400;
+ margin-top: 30rpx;
+ }
+ }
.report_time {
color: #999999;