diff --git a/pages/highWay/runData/form.vue b/pages/highWay/runData/form.vue
index 4510c2d..4096609 100644
--- a/pages/highWay/runData/form.vue
+++ b/pages/highWay/runData/form.vue
@@ -310,7 +310,7 @@
if (checkNotEmpty(this.deptNameList)) {
let idx = this.deptNameList.findIndex(item => item.deptName == this.form.organizationName);
this.form.organizationNameIndex = idx > -1 ? idx : '';
- if(!checkNotEmpty(this.form.affiliatedUnit)) {
+ if(!checkNotEmpty(this.form.organizationName)) {
this.form.organizationName = this.deptNameList.length > 0 ? this.deptNameList[0].deptName : '';
this.form.organizationNameIndex = this.deptNameList.length > 0 ? 0 : '';
}
diff --git a/pages/highWay/runData/list.vue b/pages/highWay/runData/list.vue
index bd5cf6b..460ade3 100644
--- a/pages/highWay/runData/list.vue
+++ b/pages/highWay/runData/list.vue
@@ -7,6 +7,7 @@
{{item.statDate || ''}}{{item.statPeriodValue || ''}}
+ {{item.organizationName || ''}}
@@ -248,6 +249,14 @@
text-align: center;
margin-bottom: 30rpx;
}
+ .unit_station {
+ color: #666;
+ font-size: 24rpx;
+ font-family: PingFang SC-Regular, PingFang SC;
+ font-weight: 400;
+ text-align: right;
+ margin-top:10rpx;
+ }
.list_item_box {
padding: 30rpx 30rpx 0;
diff --git a/pages/highWay/runStatusData/form.vue b/pages/highWay/runStatusData/form.vue
index 5822422..9ea48be 100644
--- a/pages/highWay/runStatusData/form.vue
+++ b/pages/highWay/runStatusData/form.vue
@@ -435,7 +435,7 @@
if (checkNotEmpty(this.deptNameList)) {
let idx = this.deptNameList.findIndex(item => item.deptName == this.form.organizationName);
this.form.organizationNameIndex = idx > -1 ? idx : '';
- if(!checkNotEmpty(this.form.affiliatedUnit)) {
+ if(!checkNotEmpty(this.form.organizationName)) {
this.form.organizationName = this.deptNameList.length > 0 ? this.deptNameList[0].deptName : '';
this.form.organizationNameIndex = this.deptNameList.length > 0 ? 0 : '';
}
diff --git a/pages/highWay/runStatusData/list.vue b/pages/highWay/runStatusData/list.vue
index 0b086cf..13b02fd 100644
--- a/pages/highWay/runStatusData/list.vue
+++ b/pages/highWay/runStatusData/list.vue
@@ -6,6 +6,7 @@
{{item.statDate || ''}}{{item.statPeriodValue || ''}}
+ {{item.organizationName || ''}}
@@ -240,6 +241,14 @@
text-align: center;
margin-bottom: 30rpx;
}
+ .unit_station {
+ color: #666;
+ font-size: 24rpx;
+ font-family: PingFang SC-Regular, PingFang SC;
+ font-weight: 400;
+ text-align: right;
+ margin-top:10rpx;
+ }
.list_item_box {
padding: 30rpx 30rpx 0;
diff --git a/pages/portShipping/pilotStation/form.vue b/pages/portShipping/pilotStation/form.vue
index f4c47f9..cc2f6ec 100644
--- a/pages/portShipping/pilotStation/form.vue
+++ b/pages/portShipping/pilotStation/form.vue
@@ -84,43 +84,43 @@
套泊热接组次:
-
+
套泊热接艘次:
-
+
推近一海里(艘次):
-
+
深水航槽直靠(艘次):
-
+
15万吨级油轮全潮时靠泊(艘次):
-
+
20万吨级矿船满载主航道夜航(艘次):
-
+
低能见度情况下完成船舶雾航(艘次):
-
+
+
+ 航次数:
+
+
+
+
+
+
+
{{item.direction == '1' ? '入青' : item.direction == '2' ? '出青' : ''}}旅客人数:
@@ -138,6 +166,34 @@
+
+ 航次数:
+
+
+
+
+
+
+
{{item.direction == '1' ? '入青' : item.direction == '2' ? '出青' : ''}}旅客人数:
@@ -244,6 +300,10 @@
if (checkNotEmpty(this.deptNameList)) {
let idx = this.deptNameList.findIndex(item => item.deptName == this.form.organizationName);
this.form.organizationNameIndex = idx > -1 ? idx : '';
+ if(!checkNotEmpty(this.form.organizationName)) {
+ this.form.organizationName = this.deptNameList.length > 0 ? this.deptNameList[0].deptName : '';
+ this.form.organizationNameIndex = this.deptNameList.length > 0 ? 0 : '';
+ }
}
this.queryTime(); //统计时段
this.queryRoute();
@@ -292,6 +352,7 @@
routeIndex: "",
voyage: "",
voyageIndex: "",
+ voyageNumber: "",
direction: "",
passengerCount: "",
passengerDod: "",//环比
@@ -355,10 +416,14 @@
let yearData = res.data.minusYears;
if(type == 1) {
//客班轮
+ // this.form.passengerShipDTOList[index].voyageNumberDod = this.$calcMom(this.form.passengerShipDTOList[index].voyageNumber,dayData.voyageNumber);
+ // this.form.passengerShipDTOList[index].voyageNumberYoy = this.$calcYoy(this.form.passengerShipDTOList[index].voyageNumber,yearData.voyageNumber);
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].voyageNumberDod = this.$calcMom(this.form.internationalCruiseDTOList[index].voyageNumber,dayData.voyageNumber);
+ // this.form.internationalCruiseDTOList[index].voyageNumberYoy = this.$calcYoy(this.form.internationalCruiseDTOList[index].voyageNumber,yearData.voyageNumber);
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);
}
@@ -469,7 +534,7 @@
let checkList = true;
if (this.form.passengerShipDTOList.length > 0) {
checkList = this.form.passengerShipDTOList.every(item => {
- return checkNotEmpty(item.route) && checkNotEmpty(item.voyage) && checkNotEmpty(item.passengerCount)
+ return checkNotEmpty(item.route) && checkNotEmpty(item.voyage) && checkNotEmpty(item.voyageNumber) && checkNotEmpty(item.passengerCount)
})
}
if (!checkList) {
@@ -482,7 +547,7 @@
let checkList2 = true;
if (this.form.internationalCruiseDTOList.length > 0) {
checkList2 = this.form.internationalCruiseDTOList.every(item => {
- return checkNotEmpty(item.route) && checkNotEmpty(item.voyage) && checkNotEmpty(item.passengerCount)
+ return checkNotEmpty(item.route) && checkNotEmpty(item.voyage) && checkNotEmpty(item.voyageNumber) && checkNotEmpty(item.passengerCount)
})
}
if (!checkList2) {
diff --git a/pages/railway/runStatus/form.vue b/pages/railway/runStatus/form.vue
index 358dba5..e1b6441 100644
--- a/pages/railway/runStatus/form.vue
+++ b/pages/railway/runStatus/form.vue
@@ -9,7 +9,7 @@
车站名称:
-
+
{{form.carName?form.carName:'请选择'}}
diff --git a/pages/roadTransport/transportData/form.vue b/pages/roadTransport/transportData/form.vue
index 7cfcb62..e09f0ac 100644
--- a/pages/roadTransport/transportData/form.vue
+++ b/pages/roadTransport/transportData/form.vue
@@ -555,7 +555,7 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../..
}
},
onLoad(options){
- this.getUnitData()
+ // this.getUnitData()
this.getPersonData();
let arr = uni.getStorageSync('deptName');
this.deptNameList = checkNotEmpty(arr) ? arr : [];
diff --git a/pages/roadTransport/transportData/list.vue b/pages/roadTransport/transportData/list.vue
index 9d5f878..1782e4a 100644
--- a/pages/roadTransport/transportData/list.vue
+++ b/pages/roadTransport/transportData/list.vue
@@ -141,7 +141,7 @@
this.page = 0
this.queryTime();
this.loadMore()
- this.getUnitData();
+ // this.getUnitData();
},
onPullDownRefresh() {
console.log('onPullDownRefresh');
@@ -150,7 +150,7 @@
this.hasMore = true;
this.loadMore();
this.queryTime();
- this.getUnitData();
+ // this.getUnitData();
},
onLoad(){