diff --git a/pages/airport/airport-runData/form.vue b/pages/airport/airport-runData/form.vue
index 60860a4..5adaa9e 100644
--- a/pages/airport/airport-runData/form.vue
+++ b/pages/airport/airport-runData/form.vue
@@ -530,15 +530,15 @@
let now = new Date();
//11:00-13:30 默认选择0-12
let dateStr = getDateStr(now, 0).replaceAll('-','/');
- if (new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() <
- new Date(dateStr +
- ' 13:30').getTime()) {
- this.form.statPeriod = '0012';
- this.index = this.array.findIndex(item => item.dictValue == '0012');
- } else {
+ // if (new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() <
+ // new Date(dateStr +
+ // ' 13:30').getTime()) {
+ // this.form.statPeriod = '0012';
+ // this.index = this.array.findIndex(item => item.dictValue == '0012');
+ // } else {
this.form.statPeriod = '03'; //默认0-24
this.index = this.array.findIndex(item => item.dictValue == '03');
- }
+ // }
} else {
this.index = this.array.findIndex(item => item.dictValue == this.form.statPeriod);
}
diff --git a/pages/airport/airport-runStatus/form.vue b/pages/airport/airport-runStatus/form.vue
index 1ef837c..8346af3 100644
--- a/pages/airport/airport-runStatus/form.vue
+++ b/pages/airport/airport-runStatus/form.vue
@@ -140,15 +140,15 @@
let now = new Date();
//11:00-13:30 默认选择0-12
let dateStr = getDateStr(now, 0).replaceAll('-','/');
- if(new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() < new Date(dateStr + ' 13:30').getTime()) {
- this.form.statPeriod = '0012';
- let idx = this.array.findIndex(item => item.dictValue == '0012');
- this.index = idx > -1 ? idx : idx;
- }else{
+ // if(new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() < new Date(dateStr + ' 13:30').getTime()) {
+ // this.form.statPeriod = '0012';
+ // let idx = this.array.findIndex(item => item.dictValue == '0012');
+ // this.index = idx > -1 ? idx : idx;
+ // }else{
this.form.statPeriod = '03'; //默认0-24
let idx = this.array.findIndex(item => item.dictValue == '03');
this.index = idx > -1 ? idx : idx;
- }
+ // }
}else{
let idx = this.array.findIndex(item => item.dictValue == this.form.statPeriod);
this.index = idx > -1 ? idx : idx;
diff --git a/pages/bus/busDataInfo/form.vue b/pages/bus/busDataInfo/form.vue
index a82738e..54a40c4 100644
--- a/pages/bus/busDataInfo/form.vue
+++ b/pages/bus/busDataInfo/form.vue
@@ -601,17 +601,17 @@
//11:00-13:30 默认选择0-12
// let dateStr = getDateStr(now, 0);
let dateStr = getDateStr(now, 0).replaceAll('-','/');
- if (new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() <
- new Date(dateStr +
- ' 13:30').getTime()) {
- this.form.statPeriod = '0012';
- let idx = this.array.findIndex(item => item.dictValue == '0012');
- this.index = idx > -1 ? idx : '';
- } else {
+ // if (new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() <
+ // new Date(dateStr +
+ // ' 14:30').getTime()) {
+ // this.form.statPeriod = '0012';
+ // let idx = this.array.findIndex(item => item.dictValue == '0012');
+ // this.index = idx > -1 ? idx : '';
+ // } else {
this.form.statPeriod = '03'; //默认0-24
let idx = this.array.findIndex(item => item.dictValue == '03');
this.index = idx > -1 ? idx : '';
- }
+ // }
this.getDetail2(this.form.statDate, this.form.statPeriod);
} else {
let idx = this.array.findIndex(item => item.dictValue == this.form.statPeriod);
diff --git a/pages/highWay/runData/form.vue b/pages/highWay/runData/form.vue
index feb037b..6160dd2 100644
--- a/pages/highWay/runData/form.vue
+++ b/pages/highWay/runData/form.vue
@@ -588,24 +588,24 @@
let now = new Date();
//11:00-13:30 默认选择0-12
let dateStr = getDateStr(now, 0).replaceAll('-','/');
- if (new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() <
- new Date(dateStr + ' 13:30').getTime()) {
- this.form.statPeriod = '0012';
- let idx = this.array.findIndex(item => item.dictValue == '0012');
- this.index = idx > -1 ? idx : '';
- if(idx > -1) {
- this.index = idx;
- }else {
- //字典值没有0-12 默认0-24
- this.form.statPeriod = '03'; //默认0-24
- let _idx = this.array.findIndex(item => item.dictValue == '03');
- this.index = _idx > -1 ? _idx : '';
- }
- } else {
+ // if (new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() <
+ // new Date(dateStr + ' 13:30').getTime()) {
+ // this.form.statPeriod = '0012';
+ // let idx = this.array.findIndex(item => item.dictValue == '0012');
+ // this.index = idx > -1 ? idx : '';
+ // if(idx > -1) {
+ // this.index = idx;
+ // }else {
+ // //字典值没有0-12 默认0-24
+ // this.form.statPeriod = '03'; //默认0-24
+ // let _idx = this.array.findIndex(item => item.dictValue == '03');
+ // this.index = _idx > -1 ? _idx : '';
+ // }
+ // } else {
this.form.statPeriod = '03'; //默认0-24
let idx = this.array.findIndex(item => item.dictValue == '03');
this.index = idx > -1 ? idx : '';
- }
+ // }
//报送阶段 - 初始化汇总数据
this.$request(getApp().globalData.baseUrl + '/api/biz/highwayParentDataController/getSubData?statDate=' + this.form.statDate + '&statPeriod=' + this.form.statPeriod, {},
'GET').then(res => {
diff --git a/pages/highWay/runStatusData/form.vue b/pages/highWay/runStatusData/form.vue
index a431cb4..5f481b9 100644
--- a/pages/highWay/runStatusData/form.vue
+++ b/pages/highWay/runStatusData/form.vue
@@ -515,14 +515,14 @@
let now = new Date();
//11:00-13:30 默认选择0-12
let dateStr = getDateStr(now, 0).replaceAll('-','/');
- if (new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() < new Date(dateStr +
- ' 13:30').getTime()) {
- this.form.statPeriod = '0012';
- this.index = this.array.findIndex(item => item.dictValue == '0012');
- } else {
+ // if (new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() < new Date(dateStr +
+ // ' 13:30').getTime()) {
+ // this.form.statPeriod = '0012';
+ // this.index = this.array.findIndex(item => item.dictValue == '0012');
+ // } else {
this.form.statPeriod = '03'; //默认0-24
this.index = this.array.findIndex(item => item.dictValue == '03');
- }
+ // }
}else{
this.index = this.array.findIndex(item => item.dictValue == this.form.statPeriod);
}
diff --git a/pages/metro/subwayPage/form.vue b/pages/metro/subwayPage/form.vue
index d94d23e..0b14906 100644
--- a/pages/metro/subwayPage/form.vue
+++ b/pages/metro/subwayPage/form.vue
@@ -244,16 +244,16 @@
let now = new Date();
//11:00-13:30 默认选择0-12
let dateStr = getDateStr(now, 0).replaceAll('-','/');
- if (new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() <
- new Date(dateStr + ' 13:30').getTime()) {
- this.form.statPeriod = '0012';
- let idx = this.array.findIndex(item => item.dictValue == '0012');
- this.index = idx > -1 ? idx : idx;
- } else {
+ // if (new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() <
+ // new Date(dateStr + ' 13:30').getTime()) {
+ // this.form.statPeriod = '0012';
+ // let idx = this.array.findIndex(item => item.dictValue == '0012');
+ // this.index = idx > -1 ? idx : idx;
+ // } else {
this.form.statPeriod = '03'; //默认0-24
let idx = this.array.findIndex(item => item.dictValue == '03');
this.index = idx > -1 ? idx : idx;
- }
+ // }
} else {
let idx = this.array.findIndex(item => item.dictValue == this.form.statPeriod);
this.index = idx > -1 ? idx : idx;
diff --git a/pages/portShipping/pilotStation/form.vue b/pages/portShipping/pilotStation/form.vue
index e367256..a987b41 100644
--- a/pages/portShipping/pilotStation/form.vue
+++ b/pages/portShipping/pilotStation/form.vue
@@ -118,7 +118,8 @@
- 低能见度情况下完成船舶雾航(艘次):
+
+ 低能见度集装箱班轮通航效率提升(艘次):
@@ -238,15 +239,15 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr } from '../../../common/uti
let now = new Date();
// let dateStr = getDateStr(now,0);
let dateStr = getDateStr(now, 0).replaceAll('-','/');
- if(new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() < new Date(dateStr + ' 13:30').getTime()) {
- this.form.statPeriod = "0012";
- this.index = this.roadTime.findIndex(item => item.dictValue == "0012")
- this.timeName = this.roadTime.find(item => item.dictValue == "0012").dictLabel
- }else{
+ // if(new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() < new Date(dateStr + ' 13:30').getTime()) {
+ // this.form.statPeriod = "0012";
+ // this.index = this.roadTime.findIndex(item => item.dictValue == "0012")
+ // this.timeName = this.roadTime.find(item => item.dictValue == "0012").dictLabel
+ // }else{
this.form.statPeriod = "03";
this.index = this.roadTime.findIndex(item => item.dictValue == "03")
this.timeName = this.roadTime.find(item => item.dictValue == "03").dictLabel
- }
+ // }
this.getYoyMom()
}
diff --git a/pages/portShipping/waterInternational/form.vue b/pages/portShipping/waterInternational/form.vue
index e47eec8..5938a60 100644
--- a/pages/portShipping/waterInternational/form.vue
+++ b/pages/portShipping/waterInternational/form.vue
@@ -87,6 +87,14 @@
+
+ 方向：
+
+
+
+
+
航次数：
@@ -193,6 +201,14 @@
+
+ 方向：
+
+
+
+
+
航次数：
@@ -222,7 +238,8 @@
-->
- {{item.direction == '1' ? '入青' : item.direction == '2' ? '出青' : ''}}旅客人数：
+
+ 旅客人数：
@@ -232,8 +249,9 @@
+
- {{item.direction == '1' ? '入青' : item.direction == '2' ? '出青' : ''}}旅客人数环比
+ 旅客人数环比
{{formatDigit(form.passengerDod)}}%
@@ -241,7 +259,8 @@
- {{item.direction == '1' ? '入青' : item.direction == '2' ? '出青' : ''}}旅客人数同比
+
+ 旅客人数同比
{{formatDigit(item.passengerYoy)}}%
@@ -417,7 +436,8 @@
this.getDept();
} else if (options.id) {
this.btnText = '修改并保存';
- this.$request(getApp().globalData.baseUrl + '/api/biz/internationalPassengerTransport/selectById/' + options
+ // this.$request(getApp().globalData.baseUrl + '/api/biz/internationalPassengerTransport/selectById/' + options
+ this.$request(getApp().globalData.baseUrl + '/api/biz/internationalPassengerTransport/selectByIdV2/' + options
.id, {}, "GET").then(
res => {
this.form = res.data;
@@ -600,7 +620,6 @@
},
//环比同比计算
calcYoyMom(type, index) {
- console.log('同比环比计算')
let _voyage = type == 1 ? this.form.passengerShipDTOList[index].voyage : this.form.internationalCruiseDTOList[
index].voyage;
this.$request(getApp().globalData.baseUrl + '/api/biz/internationalPassengerTransport/getYoYAndMoM?statDate=' +
@@ -639,7 +658,7 @@
.value ? '' : this.form.passengerShipDTOList[index].voyage;
this.form.passengerShipDTOList[index].routeIndex = e.detail.value;
this.form.passengerShipDTOList[index].route = this.shipRouteList[e.detail.value].route;
- this.form.passengerShipDTOList[index].direction = this.shipRouteList[e.detail.value].direction;
+ this.form.passengerShipDTOList[index].direction = this.shipRouteList[e.detail.value].direction == 1 ? '入青' : this.shipRouteList[e.detail.value].direction == 2 ? '出青' : '';
} else {
//国际邮轮
this.form.internationalCruiseDTOList[index].voyageIndex = this.form.internationalCruiseDTOList[index]
@@ -698,7 +717,6 @@
.voyageInfoVOList[e.detail.value].voyageCode;
}
}
- console.log('航次选择', this.form)
},
//统计时段切换选择
changeStatPeriod(e) {
@@ -722,17 +740,17 @@
let now = new Date();
//11:00-13:30 默认选择0-12
let dateStr = getDateStr(now, 0).replaceAll('-', '/');
- if (new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() <
- new Date(dateStr +
- ' 13:30').getTime()) {
- this.form.statPeriod = '0012';
- let idx = this.array.findIndex(item => item.dictValue == '0012');
- this.index = idx > -1 ? idx : '';
- } else {
+ // if (new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() <
+ // new Date(dateStr +
+ // ' 13:30').getTime()) {
+ // this.form.statPeriod = '0012';
+ // let idx = this.array.findIndex(item => item.dictValue == '0012');
+ // this.index = idx > -1 ? idx : '';
+ // } else {
this.form.statPeriod = '03'; //默认0-24
let idx = this.array.findIndex(item => item.dictValue == '03');
this.index = idx > -1 ? idx : '';
- }
+ // }
} else {
let idx = this.array.findIndex(item => item.dictValue == this.form.statPeriod);
this.index = idx > -1 ? idx : '';
@@ -782,6 +800,7 @@
content: this.form.id == undefined ? '您确认提交该条报送数据?' : '您确认将该条数据进行修改?',
success: (res) => {
if (res.confirm) {
+ console.log('form =====>',this.form)
this.submitForm();
}
}
@@ -980,6 +999,10 @@
text-align: right;
}
}
+ /deep/.is-disabled{
+ background: transparent !important;
+ color:#333;
+ }
}
}
}
diff --git a/pages/railway/railwayRunData/form.vue b/pages/railway/railwayRunData/form.vue
index 5263168..efd558e 100644
--- a/pages/railway/railwayRunData/form.vue
+++ b/pages/railway/railwayRunData/form.vue
@@ -200,7 +200,7 @@
车站名称：
- {{form.bizRailwayRunDataSaveOrUpdateDTOList[railwayNameIndex].railwayName}}
+ {{form.bizRailwayRunDataSaveOrUpdateDTOList[railwayNameIndex].railwayName ? form.bizRailwayRunDataSaveOrUpdateDTOList[railwayNameIndex].railwayName : ''}}
@@ -402,7 +402,7 @@
"inRailwayMomDo": '',
"inRailwayYomDo": '',
"inboundPassengersDo": '',
- "inboundRailwayDo": '',
+ "inboundRailwayDo": 0,
"isHoliday": "",
"outMark": "",
"outPepole": '',
@@ -411,7 +411,7 @@
"outRailwayMomDo": '',
"outRailwayYomDo": '',
"outboundPassengersDo": '',
- "outboundRailwayDo": '',
+ "outboundRailwayDo": 0,
"railwayName": "",
}],
@@ -478,7 +478,7 @@
res.data.statDate = statDate;
res.data.statPeriod = statPeriod;
this.form = res.data;
- this.form.bizRailwayRunDataSaveOrUpdateDTOList = this.form.bizRailwayRunDataVOList;
+ 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()), {},
@@ -593,7 +593,7 @@
"inRailwayMomDo": '',
"inRailwayYomDo": '',
"inboundPassengersDo": '',
- "inboundRailwayDo": '',
+ "inboundRailwayDo": 0,
"isHoliday": "",
"outMark": "",
"outPepole": '',
@@ -602,7 +602,7 @@
"outRailwayMomDo": '',
"outRailwayYomDo": '',
"outboundPassengersDo": '',
- "outboundRailwayDo": '',
+ "outboundRailwayDo": 0,
"railwayName": item.railwayName,
})
})
@@ -626,7 +626,7 @@
"inRailwayMomDo": '',
"inRailwayYomDo": '',
"inboundPassengersDo": '',
- "inboundRailwayDo": '',
+ "inboundRailwayDo": 0,
"isHoliday": "",
"outMark": "",
"outPepole": '',
@@ -635,7 +635,7 @@
"outRailwayMomDo": '',
"outRailwayYomDo": '',
"outboundPassengersDo": '',
- "outboundRailwayDo": '',
+ "outboundRailwayDo":0,
"railwayName": item.railwayName,
})
}
@@ -691,17 +691,17 @@
let now = new Date();
//11:00-13:30 默认选择0-12
let dateStr = getDateStr(now, 0).replaceAll('-','/');
- if (new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() <
- new Date(dateStr +
- ' 13:30').getTime()) {
- this.form.statPeriod = '0012';
- let idx = this.array.findIndex(item => item.dictValue == '0012');
- this.index = idx > -1 ? idx : '';
- } else {
+ // if (new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() <
+ // new Date(dateStr +
+ // ' 13:30').getTime()) {
+ // this.form.statPeriod = '0012';
+ // let idx = this.array.findIndex(item => item.dictValue == '0012');
+ // this.index = idx > -1 ? idx : '';
+ // } else {
this.form.statPeriod = '03'; //默认0-24
let idx = this.array.findIndex(item => item.dictValue == '03');
this.index = idx > -1 ? idx : '';
- }
+ // }
this.queryDetail(this.form.statDate, this.form.statPeriod);
} else {
let idx = this.array.findIndex(item => item.dictValue == this.form.statPeriod);
diff --git a/pages/railway/runStatus/form.vue b/pages/railway/runStatus/form.vue
index 523704f..65f64b3 100644
--- a/pages/railway/runStatus/form.vue
+++ b/pages/railway/runStatus/form.vue
@@ -171,15 +171,15 @@
let now = new Date();
//11:00-13:30 默认选择0-12
let dateStr = getDateStr(now, 0).replaceAll('-','/');
- if(new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() < new Date(dateStr + ' 13:30').getTime()) {
- this.form.statPeriod = '0012';
- let idx = this.array.findIndex(item => item.dictValue == '0012');
- this.index = idx > -1 ? idx : idx;
- }else{
+ // if(new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() < new Date(dateStr + ' 13:30').getTime()) {
+ // this.form.statPeriod = '0012';
+ // let idx = this.array.findIndex(item => item.dictValue == '0012');
+ // this.index = idx > -1 ? idx : idx;
+ // }else{
this.form.statPeriod = '03'; //默认0-24
let idx = this.array.findIndex(item => item.dictValue == '03');
this.index = idx > -1 ? idx : idx;
- }
+ // }
}else{
let idx = this.array.findIndex(item => item.dictValue == this.form.statPeriod);
this.index = idx > -1 ? idx : idx;
diff --git a/pages/roadTransport/dataSubmission/form.vue b/pages/roadTransport/dataSubmission/form.vue
index afa033c..1a74264 100644
--- a/pages/roadTransport/dataSubmission/form.vue
+++ b/pages/roadTransport/dataSubmission/form.vue
@@ -164,15 +164,15 @@
let now = new Date();
// let dateStr = getDateStr(now,0);
let dateStr = getDateStr(now, 0).replaceAll('-','/');
- if(new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() < new Date(dateStr + ' 13:30').getTime()){
- this.synthData.reportPhase = "0012";
- this.index = this.roadTime.findIndex(item => item.dictValue == "0012")
- this.timeName = this.roadTime.find(item => item.dictValue == "0012").dictLabel
- }else{
+ // if(new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() < new Date(dateStr + ' 14:30').getTime()){
+ // this.synthData.reportPhase = "0012";
+ // this.index = this.roadTime.findIndex(item => item.dictValue == "0012")
+ // this.timeName = this.roadTime.find(item => item.dictValue == "0012").dictLabel
+ // }else{
this.synthData.reportPhase = "03";
this.index = this.roadTime.findIndex(item => item.dictValue == "03")
this.timeName = this.roadTime.find(item => item.dictValue == "03").dictLabel
- }
+ // }
}
})
},
diff --git a/pages/roadTransport/quantitySent/form.vue b/pages/roadTransport/quantitySent/form.vue
index 07d76ec..4bc598e 100644
--- a/pages/roadTransport/quantitySent/form.vue
+++ b/pages/roadTransport/quantitySent/form.vue
@@ -166,15 +166,15 @@
let now = new Date();
let dateStr = getDateStr(now,0);
console.log(new Date().getTime())
- if(new Date(dateStr + ' 11:00').getTime() < new Date().getTime() < new Date(dateStr + ' 13:30').getTime()){
- this.roadData.reportPhase = "0012";
- this.index = this.roadTime.findIndex(item => item.dictValue == "0012")
- this.timeName = this.roadTime.find(item => item.dictValue == "0012").dictLabel
- }else{
+ // if(new Date(dateStr + ' 11:00').getTime() < new Date().getTime() < new Date(dateStr + ' 14:30').getTime()){
+ // this.roadData.reportPhase = "0012";
+ // this.index = this.roadTime.findIndex(item => item.dictValue == "0012")
+ // this.timeName = this.roadTime.find(item => item.dictValue == "0012").dictLabel
+ // }else{
this.roadData.reportPhase = "03";
this.index = this.roadTime.findIndex(item => item.dictValue == "03")
this.timeName = this.roadTime.find(item => item.dictValue == "03").dictLabel
- }
+ // }
}
})
},
diff --git a/pages/roadTransport/transportData/form.vue b/pages/roadTransport/transportData/form.vue
index 2785336..c1e1589 100644
--- a/pages/roadTransport/transportData/form.vue
+++ b/pages/roadTransport/transportData/form.vue
@@ -75,7 +75,7 @@
投放运力-班车数
-
+
@@ -133,7 +133,7 @@
投放运力-班车班次
-
+
@@ -171,7 +171,7 @@
班车客运量(人)
-
+
@@ -387,7 +387,7 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../..
migrantWorkersTrips:"", //运送农民工班次
otherTrips:"", //除定线通勤包车、农民工包车班次
capacityCharterTrips:null, //投放运力：包车班次
- capacityShuttleTrips:"", //投放运力：班车班次
+ capacityShuttleTrips:"", //投放运力：班车班次
capacityTotalTrips:null, //投放运力：班次
regularCommutePassengerVolume:"", //定线通勤包车客运量(万)
migrantWorkersPassengerVolume:"", //运送农民工包车客运量(万)
@@ -497,6 +497,7 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../..
mobile: getApp().globalData.mobile,
unitName:'',
peopleNumber:'',
+ isEdit:false,
}
},
onLoad(options){
@@ -511,8 +512,9 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../..
}else if(options.type == 'add'){
this.pageType = 'add';
let now = new Date();
- this.roadData.statisticalDate = getDateStr(now, -1);//默认前一天
- this.getDept();
+ this.roadData.statisticalDate = getDateStr(now, 0);//默认当天
+ // this.getDept();
+ this.getDict();
}
},
@@ -522,6 +524,12 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../..
phoneNumber: tel
});
},
+ getDict(){
+ this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=industry',"GET").then(res =>{
+ let code = res.data.find(item => item.dictLabel == '道路运输').dictValue
+ this.getDept(code)
+ })
+ },
getDataDetail(reportPhase,reportUnit,statisticalDate){
this.$request(getApp().globalData.baseUrl + '/api/biz/roadtransport/road/getDetail?reportPhase=' + reportPhase + '&reportUnit=' + reportUnit + '&statisticalDate=' + statisticalDate,{},"GET").then(res =>{
res.data.reportPhase = this.roadData.reportPhase;
@@ -539,6 +547,11 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../..
this.peopleName = tmp ? tmp.people.split(',')[0] : ''
this.peopleNumber = tmp ? tmp.people.split(',')[1] : this.roadData.contactNumber
}
+ if(this.isEdit){
+ this.roadData.capacityShuttle = this.roadData.capacityShuttle ? this.roadData.capacityShuttle : 0
+ this.roadData.capacityShuttleTrips = this.roadData.capacityShuttleTrips ? this.roadData.capacityShuttleTrips : 0
+ this.roadData.shuttlePassengerVolume = this.roadData.shuttlePassengerVolume ? this.roadData.shuttlePassengerVolume : 0
+ }
this.getRatio();
})
},
@@ -641,11 +654,11 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../..
})
},
- getDept(){
+ getDept(code){
// this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=industry',{},"GET").then(res =>{
// console.log('行业code===>',res)
// })
- this.$request(getApp().globalData.baseUrl + '/api/dept/getCurrentAndSubordinateDept?tradeCode=09&deptName=',{},"GET").then(res =>{
+ this.$request(getApp().globalData.baseUrl + '/api/dept/getCurrentAndSubordinateDept?tradeCode='+ code +'&deptName=',{},"GET").then(res =>{
console.log('单位===>',res)
this.treeData = res.data;
if(this.pageType == 'add'){
@@ -654,6 +667,11 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../..
this.roadData.reportingUnitId = this.deptNameList.length > 0 ? this.deptNameList[0].deptName : '';
this.roadData.reportingUnitIdIndex = this.deptNameList.length > 0 ? 0 : '';
this.selectId1 = this.unitId;
+ if(res.data[0].children.length == 0){
+ this.isEdit = true
+ }else{
+ this.isEdit = false
+ }
this.getRoadTime()
}else if(this.pageType == 'edit'){
console.log('reportingUnitId===>',this.roadData.reportingUnitId)
@@ -661,6 +679,14 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../..
this.unitId = this.roadData.responsiblePersonId;
this.unitName = this.roadData.reportingUnitId;
this.selectId1 = this.unitId;
+ if(res.data[0].children.length == 0){
+ this.isEdit = true
+ this.roadData.capacityShuttle = this.roadData.capacityShuttle ? this.roadData.capacityShuttle : 0
+ this.roadData.capacityShuttleTrips = this.roadData.capacityShuttleTrips ? this.roadData.capacityShuttleTrips : 0
+ this.roadData.shuttlePassengerVolume = this.roadData.shuttlePassengerVolume ? this.roadData.shuttlePassengerVolume : 0
+ }else{
+ this.isEdit = false
+ }
this.getPeople()
}
})
@@ -669,7 +695,8 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../..
this.$request(getApp().globalData.baseUrl + '/api/biz/roadtransport/road/getDataByTime?reportPhase=' + reportPhase + '&reportUnit=' + reportUnit + '&statisticalDate=' + statisticalDate,{},"GET").then(res =>{
this.roadData = res.data;
this.getRoadTime();
- this.getDept();
+ this.getDict()
+ // this.getDept();
// console.log('last==>',lastYearDate(this.roadData.statisticalDate))
})
},
@@ -814,21 +841,25 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../..
let now = new Date();
// let dateStr = getDateStr(now,0);
let dateStr = getDateStr(now, 0).replaceAll('-','/');
- if(new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() < new Date(dateStr + ' 13:30').getTime()) {
- this.roadData.reportPhase = "0012";
- this.index = this.roadTime.findIndex(item => item.dictValue == "0012")
- this.timeName = this.roadTime.find(item => item.dictValue == "0012").dictLabel
- }else{
+ // if(new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() < new Date(dateStr + ' 13:30').getTime()) {
+ // this.roadData.reportPhase = "0012";
+ // this.index = this.roadTime.findIndex(item => item.dictValue == "0012")
+ // this.timeName = this.roadTime.find(item => item.dictValue == "0012").dictLabel
+ // }else{
this.roadData.reportPhase = "03";
this.index = this.roadTime.findIndex(item => item.dictValue == "03")
this.timeName = this.roadTime.find(item => item.dictValue == "03").dictLabel
- }
+ // }
//报送阶段 - 初始化查询当前账户下级报送汇总数据
this.$request(getApp().globalData.baseUrl + '/api/biz/roadtransport/road/getDetail?reportPhase=' + this.roadData.reportPhase + '&reportUnit=' + this.roadData.reportingUnitId + '&statisticalDate=' + this.roadData.statisticalDate,{},"GET").then(res =>{
res.data.reportPhase = this.roadData.reportPhase;
res.data.reportingUnitId = this.roadData.reportingUnitId;
res.data.statisticalDate = this.roadData.statisticalDate;
this.roadData = res.data;
+ console.log('roadData ====>',this.roadData.capacityShuttle)
+ this.roadData.capacityShuttle = this.roadData.capacityShuttle ? this.roadData.capacityShuttle : 0
+ this.roadData.capacityShuttleTrips = this.roadData.capacityShuttleTrips ? this.roadData.capacityShuttleTrips : 0
+ this.roadData.shuttlePassengerVolume = this.roadData.shuttlePassengerVolume ? this.roadData.shuttlePassengerVolume : 0
this.getPeople()
})
this.getRatio()
@@ -1027,6 +1058,11 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../..
/deep/ .content-clear-icon{
padding: 0 !important;
}
+
+ /deep/.is-disabled{
+ background: transparent !important;
+ color:#333;
+ }
}
}
diff --git a/pages/roadTransport/transportData/list.vue b/pages/roadTransport/transportData/list.vue
index eb21fe5..4934dac 100644
--- a/pages/roadTransport/transportData/list.vue
+++ b/pages/roadTransport/transportData/list.vue
@@ -207,13 +207,15 @@
}
console.log('params ===>',params)
this.$request(getApp().globalData.baseUrl + '/api/biz/roadtransport/road/getTimeList',params,"GET").then(res =>{
+ // this.$request(getApp().globalData.baseUrl + '/api/biz/roadtransport/road/list',params,"GET").then(res =>{
console.log(res)
if(res.code == 200){
res.data.list.map(item =>{
item.show = false;
})
this.listData = this.listData.concat(res.data.list);
- if(res.data.list.length == 0 || res.data.list.length < this.size){
+ // if(res.data.list.length == 0 || res.data.list.length < this.size){
+ if(res.data.list.length == 0){
this.hasMore = false;
this.status = 'nomore';
}else{
diff --git a/pages/water/TransportData/form.vue b/pages/water/TransportData/form.vue
index 95345da..7a4db28 100644
--- a/pages/water/TransportData/form.vue
+++ b/pages/water/TransportData/form.vue
@@ -217,14 +217,14 @@
let now = new Date();
//11:00-13:30 默认选择0-12
let dateStr = getDateStr(now, 0);
- if (new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() < new Date(dateStr +
- ' 13:30').getTime()) {
- this.form.statPeriod = '0012';
- this.index = this.array.findIndex(item => item.dictValue == '0012');
- } else {
+ // if (new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() < new Date(dateStr +
+ // ' 14:30').getTime()) {
+ // this.form.statPeriod = '0012';
+ // this.index = this.array.findIndex(item => item.dictValue == '0012');
+ // } else {
this.form.statPeriod = '03'; //默认0-24
this.index = this.array.findIndex(item => item.dictValue == '03');
- }
+ // }
}else{
this.index = this.array.findIndex(item => item.dictValue == this.form.statPeriod);
}
diff --git a/pages/water/transportation/form.vue b/pages/water/transportation/form.vue
index 5d79226..830d8e4 100644
--- a/pages/water/transportation/form.vue
+++ b/pages/water/transportation/form.vue
@@ -255,14 +255,14 @@
let now = new Date();
//11:00-13:30 默认选择0-12
let dateStr = getDateStr(now, 0).replaceAll('-','/');
- if (new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() < new Date(dateStr +
- ' 13:30').getTime()) {
- this.form.statPeriod = '0012';
- this.index = this.array.findIndex(item => item.dictValue == '0012');
- } else {
+ // if (new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() < new Date(dateStr +
+ // ' 14:30').getTime()) {
+ // this.form.statPeriod = '0012';
+ // this.index = this.array.findIndex(item => item.dictValue == '0012');
+ // } else {
this.form.statPeriod = '03'; //默认0-24
this.index = this.array.findIndex(item => item.dictValue == '03');
- }
+ // }
}else{
this.index = this.array.findIndex(item => item.dictValue == this.form.statPeriod);
}
diff --git a/pages/water/waterWay/form.vue b/pages/water/waterWay/form.vue
index f5b4416..d305cc3 100644
--- a/pages/water/waterWay/form.vue
+++ b/pages/water/waterWay/form.vue
@@ -493,17 +493,17 @@
let now = new Date();
//11:00-13:30 默认选择0-12
let dateStr = getDateStr(now, 0).replaceAll('-', '/');
- if (new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() <
- new Date(dateStr +
- ' 13:30').getTime()) {
- this.form.statPeriod = '0012';
- let idx = this.array.findIndex(item => item.dictValue == '0012');
- this.index = idx > -1 ? idx : '';
- } else {
+ // if (new Date(dateStr + ' 11:00').getTime() < new Date().getTime() && new Date().getTime() <
+ // new Date(dateStr +
+ // ' 14:30').getTime()) {
+ // this.form.statPeriod = '0012';
+ // let idx = this.array.findIndex(item => item.dictValue == '0012');
+ // this.index = idx > -1 ? idx : '';
+ // } else {
this.form.statPeriod = '03'; //默认0-24
let idx = this.array.findIndex(item => item.dictValue == '03');
this.index = idx > -1 ? idx : '';
- }
+ // }
this.queryDetailInfo2(this.form.reportDate, this.form.statPeriod);
} else {
let idx = this.array.findIndex(item => item.dictValue == this.form.statPeriod);