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 @@
- 驶入车辆数环比
+ 驶入车辆数环比
+
+
+
+
{{formatDigit(form.highwaySubDataList[stationIndex].entranceVehicleCountMom)}}%
@@ -170,7 +174,11 @@
- 驶出车辆数环比
+ 驶出车辆数环比
+
+
+
+
{{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 @@
报送时间
- {{item.statDate || ''}}{{item.statPeriodValue || ''}}
+
+ {{item.statDate || ''}}{{item.statPeriodValue || ''}}
+
阻断/拥堵持续时间：
-
+
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 @@
-
+
报送时间
{{item.statDate || ''}}
- {{item.direction == 1 ? '入青' : item.direction == 2 ? '出青' : ''}}旅客人数：
+ {{item.direction == '1' ? '入青' : item.direction == '2' ? '出青' : ''}}旅客人数：
@@ -86,7 +86,7 @@
- {{item.direction == 1 ? '入青' : item.direction == 2 ? '出青' : ''}}旅客人数环比
+ {{item.direction == '1' ? '入青' : item.direction == '2' ? '出青' : ''}}旅客人数环比
{{formatDigit(form.passengerDod)}}%
@@ -94,7 +94,7 @@
- {{item.direction == 1 ? '入青' : item.direction == 2 ? '出青' : ''}}旅客人数同比
+ {{item.direction == '1' ? '入青' : item.direction == '2' ? '出青' : ''}}旅客人数同比
{{formatDigit(item.passengerYoy)}}%
@@ -139,7 +139,7 @@
- {{item.direction == 1 ? '入青' : item.direction == 2 ? '出青' : ''}}旅客人数：
+ {{item.direction == '1' ? '入青' : item.direction == '2' ? '出青' : ''}}旅客人数：
@@ -152,7 +152,7 @@
- {{item.direction == 1 ? '入青' : item.direction == 2 ? '出青' : ''}}旅客人数环比
+ {{item.direction == '1' ? '入青' : item.direction == '2' ? '出青' : ''}}旅客人数环比
{{formatDigit(form.passengerDod)}}%
@@ -160,7 +160,7 @@
- {{item.direction == 1 ? '入青' : item.direction == 2 ? '出青' : ''}}旅客人数同比
+ {{item.direction == '1' ? '入青' : item.direction == '2' ? '出青' : ''}}旅客人数同比
{{formatDigit(item.passengerYoy)}}%
@@ -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 @@
-
+
报送时间
{{item.statDate || ''}}
报送时间
- {{item.statDate || ''}}{{item.statPeriodValue || ''}}
+ {{item.statDate || ''}}{{item.statPeriodValue || ''}}
+
+ {{item.railwayName || ''}}
@@ -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 @@
报送时间
- {{item.statDate || ''}}{{item.statDate || ''}}{{item.statPeriodValue || ''}}
+ {{item.carName || ''}}
@@ -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;