日期格式兼容;地铁接口联调

main
张群 2 years ago
parent a7586eec0f
commit b8d39386b2
  1. 10
      pages.json
  2. 2
      pages/airport/airport-runData/form.vue
  3. 2
      pages/airport/airport-runData/list.vue
  4. 2
      pages/airport/airport-runStatus/form.vue
  5. 2
      pages/airport/airport-runStatus/list.vue
  6. 2
      pages/highWay/runData/form.vue
  7. 2
      pages/highWay/runData/list.vue
  8. 2
      pages/highWay/runStatusData/form.vue
  9. 2
      pages/highWay/runStatusData/list.vue
  10. 93
      pages/metro/subwayPage/form.vue
  11. 6
      pages/metro/subwayPage/list.vue
  12. 33
      pages/portShipping/waterInternational/form.vue
  13. 2
      pages/portShipping/waterInternational/list.vue
  14. 2
      pages/railway/railwayRunData/form.vue
  15. 2
      pages/railway/railwayRunData/list.vue
  16. 2
      pages/railway/runStatus/form.vue
  17. 2
      pages/railway/runStatus/list.vue
  18. 2
      pages/water/transportation/form.vue
  19. 2
      pages/water/transportation/list.vue
  20. 2
      pages/water/waterWay/list.vue

@ -2,7 +2,7 @@
"pages": [{
"path": "pages/home/home",
"style": {
"navigationBarTitleText": "首页"
"navigationBarTitleText": "交通运输报送系统"
}
},
{
@ -14,7 +14,7 @@
{
"path": "pages/login/login",
"style": {
"navigationBarTitleText": "",
"navigationBarTitleText": "交通运输报送系统",
"navigationBarBackgroundColor": "#2D8CF0"
}
},
@ -144,7 +144,8 @@
{
"path": "pages/portShipping/waterInternational/list",
"style": {
"navigationBarTitleText": "水路国际客运"
"navigationBarTitleText": "水路国际客运",
"enablePullDownRefresh": true
}
},
{
@ -156,7 +157,8 @@
{
"path": "pages/metro/subwayPage/list",
"style": {
"navigationBarTitleText": "地铁客流量"
"navigationBarTitleText": "地铁客流量",
"enablePullDownRefresh": true
}
},
{

@ -529,7 +529,7 @@
if (this.pageType == 'add') {
let now = new Date();
//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()) {

@ -312,7 +312,7 @@
display: flex;
// justify-content: space-around;
background-color: #F8F8F8;
padding: 20rpx 30rpx 40px;
padding: 40rpx 30rpx;
.act_btn {
width: 690rpx;

@ -139,7 +139,7 @@
if(this.pageType == 'add') {
let now = new Date();
//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');

@ -312,7 +312,7 @@
display: flex;
// justify-content: space-around;
background-color: #F8F8F8;
padding: 20rpx 30rpx 40px;
padding: 40rpx 30rpx;
.act_btn {
width: 690rpx;

@ -529,7 +529,7 @@
if (this.pageType == 'add') {
let now = new Date();
//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';

@ -320,7 +320,7 @@
right: 0;
bottom: 0;
background-color: #F8F8F8;
padding: 20px 30rpx 40px;
padding: 40rpx 30rpx;
.act_btn {
width: 690rpx;

@ -506,7 +506,7 @@
if (this.pageType == 'add') {
let now = new Date();
//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';

@ -312,7 +312,7 @@
right: 0;
bottom: 0;
background-color: #F8F8F8;
padding: 20px 30rpx 40px;
padding: 40rpx 30rpx;
.act_btn {
width: 690rpx;

@ -47,52 +47,52 @@
<view class="form_item">
<view class="form_item_label">车次</view>
<view class="form_item_input form_input">
<uni-easyinput v-model="form.dataDetails" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
<uni-easyinput @blur="calcMomYoy" @clear="calcMomYoy" type="number" v-model="form.trainNumber" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
placeholder="请输入" maxlength="30">
</uni-easyinput>
</view>
</view>
<!-- 同比环比 -->
<view class="form_item_rate" :class="form.inboundRailwayDo === 0 ? 'danger' : '' ">
<view class="form_item_rate" :class="form.trainNumberDod === 0 ? 'danger' : '' ">
<view class="rate_item">
<view class="rate_item_label" :style="form.inboundRailwayDo === 0 ? 'color: #EB4747' : ''">
<view class="rate_item_label" :style="form.trainNumberDod === 0 ? 'color: #EB4747' : ''">
总车次环比</view>
<view class="rate_item_input" :style="form.inboundRailwayDo === 0 ? 'color: #EB4747' : ''">
{{formatDigit(form.inRailwayYomDo)}}%
<view class="rate_item_input" :style="form.trainNumberDod === 0 ? 'color: #EB4747' : ''">
{{formatDigit(form.trainNumberDod)}}%
</view>
</view>
<view class="line"></view>
<view class="rate_item">
<view class="rate_item_label">总车次同比</view>
<view class="rate_item_input">
{{formatDigit(form.inRailwayMomDo)}}%
{{formatDigit(form.trainNumberYoy)}}%
</view>
</view>
</view>
<view class="form_item">
<view class="form_item_label">总客流量()</view>
<view class="form_item_input form_input">
<uni-easyinput v-model="form.dataDetails" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
<uni-easyinput @blur="calcMomYoy" @clear="calcMomYoy" type="number" v-model="form.passengerFlow" placeholderStyle="color: #D4D4D4;font-size:28rpx;"
placeholder="请输入" maxlength="30">
</uni-easyinput>
</view>
</view>
<!-- 同比环比 -->
<view class="form_item_rate" :class="form.inboundRailwayDo === 0 ? 'danger' : '' ">
<view class="form_item_rate" :class="form.passengerFlowDod === 0 ? 'danger' : '' ">
<view class="rate_item">
<view class="rate_item_label" :style="form.inboundRailwayDo === 0 ? 'color: #EB4747' : ''">
<view class="rate_item_label" :style="form.passengerFlowDod === 0 ? 'color: #EB4747' : ''">
总客流量人数环比</view>
<view class="rate_item_input" :style="form.inboundRailwayDo === 0 ? 'color: #EB4747' : ''">
{{formatDigit(form.inRailwayYomDo)}}%
<view class="rate_item_input" :style="form.passengerFlowDod === 0 ? 'color: #EB4747' : ''">
{{formatDigit(form.passengerFlowDod)}}%
</view>
</view>
<view class="line"></view>
<view class="rate_item">
<view class="rate_item_label">总客流量人数</view>
<view class="rate_item_label">总客流量人数同比</view>
<view class="rate_item_input">
{{formatDigit(form.inRailwayMomDo)}}%
{{formatDigit(form.passengerFlowYoy)}}%
</view>
</view>
</view>
@ -122,12 +122,15 @@
data() {
return {
form: {
"children": [{
"dataDetails": ""
}],
"carName": "",
"statDate": "",
"statPeriod": ""
"organizationName" : "",
"passengerFlow" : "",
"passengerFlowDod" : "",
"passengerFlowYoy" : "",
"statDate" : "",
"statPeriod" : "",
"trainNumber" : "",
"trainNumberDod" : "",
"trainNumberYoy" : ""
}, //form
array: [], //
index: 2, //,0-24
@ -135,7 +138,8 @@
pageType: '',
btnText: '保存',
mobile: getApp().globalData.mobile,
deptNameList: []
deptNameList: [],
momYoy: {}
}
},
onLoad(options) {
@ -149,15 +153,17 @@
let now = new Date();
this.form.statDate = getDateStr(now, -1); //
this.queryTime(); //
this.queryMom();
}
if (options.item) {
else if (options.item) {
this.btnText = '修改并保存';
this.form = JSON.parse(options.item);
this.queryTime(); //
this.queryMom();
}
if (options.id) {
this.btnText = '修改并保存';
this.$request(getApp().globalData.baseUrl + '/api/biz/railwayRunSituation/find//' + options.id, {}, "GET")
this.$request(getApp().globalData.baseUrl + '/api/biz/subwayInfo/selectById/' + options.id, {}, "GET")
.then(res => {
this.form = res.data;
if (checkNotEmpty(this.deptNameList)) {
@ -165,10 +171,33 @@
this.form.organizationNameIndex = idx > -1 ? idx : '';
}
this.queryTime(); //
this.queryMom();
});
}
},
methods: {
//
queryMom(type) {
if(!checkNotEmpty(this.form.statDate) || !checkNotEmpty(this.form.statPeriod)){
return;
}
this.$request(getApp().globalData.baseUrl + '/api/biz/subwayInfo/getYoYMoM?statDate=' + this.form.statDate + '&statPeriod=' + this.form.statPeriod + '&_t=' + Date.parse(new Date()), {}, "GET")
.then(res => {
this.momYoy = res.data;
if(type == 1) {
this.calcMomYoy();
}
});
},
//
calcMomYoy() {
let yesterdayData = this.momYoy.yesterdayData;
let lastYearData = this.momYoy.lastYearData;
this.form.trainNumberDod = this.$calcMom(this.form.trainNumber, yesterdayData.trainNumber);
this.form.trainNumberYoy = this.$calcYoy(this.form.trainNumber, lastYearData.trainNumber);
this.form.passengerFlowDod = this.$calcMom(this.form.passengerFlow, yesterdayData.passengerFlow);
this.form.passengerFlowYoy = this.$calcYoy(this.form.passengerFlow, lastYearData.passengerFlow);
},
//
bindDeptChange(e) {
this.form.organizationNameIndex = e.detail.value;
@ -192,6 +221,7 @@
this.index = e.detail.value;
this.form.statPeriod = this.array[e.detail.value].dictValue;
console.log('change 时段', this.form);
this.queryMom(1);
},
//
doCancel() {
@ -200,6 +230,7 @@
//
bindDateChange(e) {
this.form.statDate = e.detail.value;
this.queryMom(1);
},
//
queryTime() {
@ -210,7 +241,7 @@
if (this.pageType == 'add') {
let now = new Date();
//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';
@ -236,6 +267,20 @@
})
return;
}
if (!checkNotEmpty(this.form.trainNumber)) {
uni.showToast({
title: '车次不能为空',
icon: 'none'
})
return;
}
if (!checkNotEmpty(this.form.passengerFlow)) {
uni.showToast({
title: '客流量不能为空',
icon: 'none'
})
return;
}
uni.showModal({
title: '提示',
content: this.form.id == undefined ? '您确认提交该条报送数据?' : '您确认将该条数据进行修改?',
@ -251,7 +296,7 @@
title: '提交中...',
mask: true
})
this.$request(getApp().globalData.baseUrl + '/api/biz/airportRunSituation/saveOrUpdate', this.form,
this.$request(getApp().globalData.baseUrl + '/api/biz/subwayInfo/saveOrUpdate', this.form,
'POST').then(res => {
uni.hideLoading();
if (res.code == 200) {

@ -1,6 +1,6 @@
<template>
<view class="page">
<view class="list_box" v-for="(item,index) in data" :key="index" @click="goPage('/pages/metro/subwayPage/form', item)">
<view class="list_box" v-for="(item,index) in data" :key="index" @click="goPage('/pages/metro/subwayPage/form?id='+item.id)">
<view class="list_top">
<view class="unit_tags">报送时间</view>
<view>{{item.statDate || ''}}<text
@ -142,7 +142,7 @@
Object.keys(this.query).map(key => {
params = params + '&' + key + '=' + this.query[key]
})
this.$request(getApp().globalData.baseUrl + '/api/biz/airportRunSituation/list?page=' + this.current +
this.$request(getApp().globalData.baseUrl + '/api/biz/subwayInfo/list?page=' + this.current +
'&pageSize=' + this.size + '&_t=' + Date.parse(new Date()) + params, {}, 'GET').then(res => {
if (res.code == 200) {
this.data = this.data.concat(res.data.list);
@ -312,7 +312,7 @@
display: flex;
// justify-content: space-around;
background-color: #F8F8F8;
padding: 20rpx 30rpx 40px;
padding: 40rpx 30rpx;
.act_btn {
width: 690rpx;

@ -55,7 +55,7 @@
<view class="form_item">
<view class="form_item_label">航线</view>
<view class="form_item_input picker">
<picker :value="routeIndex" :range="shipRouteList" range-key="route" @change="e => changeRoute(e, index)">
<picker :value="item.routeIndex" :range="shipRouteList" range-key="route" @change="e => changeRoute(e, index)">
<text class="picker_select"
:style="item.route?'color:#333;':''">{{item.route?item.route:'请选择'}}</text>
<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
@ -65,7 +65,7 @@
<view class="form_item">
<view class="form_item_label">航次</view>
<view class="form_item_input picker">
<picker :value="voyageIndex" :range="item.routeIndex ? shipRouteList[item.routeIndex].voyageInfoVOList : []" range-key="voyageCode" @change="e => changeVoyage(e, index)">
<picker :value="item.voyageIndex" :range="item.routeIndex > -1 ? shipRouteList[item.routeIndex].voyageInfoVOList : []" range-key="voyageCode" @change="e => changeVoyage(e, index)">
<text class="picker_select"
:style="item.voyage?'color:#333;':''">{{item.voyage?item.voyage:'请选择'}}</text>
<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
@ -121,7 +121,7 @@
<view class="form_item">
<view class="form_item_label">航线</view>
<view class="form_item_input picker">
<picker :value="routeIndex" :range="internationalRouteList" range-key="route" @change="e => changeRoute(e, index)">
<picker :value="item.routeIndex" :range="internationalRouteList" range-key="route" @change="e => changeRoute(e, index)">
<text class="picker_select"
:style="item.route?'color:#333;':''">{{item.route?item.route:'请选择'}}</text>
<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
@ -131,7 +131,7 @@
<view class="form_item">
<view class="form_item_label">航次</view>
<view class="form_item_input picker">
<picker :value="voyageIndex" :range="item.routeIndex ? internationalRouteList[item.routeIndex].voyageInfoVOList : []" range-key="voyageCode" @change="e => changeVoyage(e, index)">
<picker :value="item.voyageIndex" :range="item.routeIndex > -1 ? internationalRouteList[item.routeIndex].voyageInfoVOList : []" range-key="voyageCode" @change="e => changeVoyage(e, index)">
<text class="picker_select"
:style="item.voyage?'color:#333;':''">{{item.voyage?item.voyage:'请选择'}}</text>
<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
@ -256,7 +256,6 @@
this.$request(getApp().globalData.baseUrl + '/api/biz/internationalPassengerTransportPermissions/findList', {}, "GET").then(res => {
this.shipRouteList = res.data['客班轮'];
this.internationalRouteList = res.data['国际邮轮'];
console.log(this.shipRouteList)
this.form.passengerShipDTOList.map(item => {
let idx = this.shipRouteList.findIndex(item2 => item2.route == item.route);
item.routeIndex = idx > -1 ? idx : '';
@ -266,13 +265,14 @@
}
})
this.form.internationalCruiseDTOList.map(item => {
let idx = this.shipRouteList.findIndex(item2 => item2.route == item.route);
let idx = this.internationalRouteList.findIndex(item2 => item2.route == item.route);
item.routeIndex = idx > -1 ? idx : '';
if(idx > -1) {
let _idx = this.shipRouteList[idx].voyageInfoVOList.findIndex(item2 => item2.voyageCode == item.voyage);
let _idx = this.internationalRouteList[idx].voyageInfoVOList.findIndex(item2 => item2.voyageCode == item.voyage);
item.voyageIndex = _idx > -1 ? _idx : '';
}
})
console.log(this.form)
})
},
//
@ -368,12 +368,18 @@
changeRoute(e, index) {
if(this.tabType == 1) {
//
this.form.passengerShipDTOList[index].voyageIndex = this.form.passengerShipDTOList[index].routeIndex != e.detail.value ? '' : this.form.passengerShipDTOList[index].voyageIndex;
this.form.passengerShipDTOList[index].voyage = this.form.passengerShipDTOList[index].routeIndex != e.detail.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;
}else{
//
this.form.internationalCruiseDTOList[index].voyageIndex = this.form.internationalCruiseDTOList[index].routeIndex != e.detail.value ? '' : this.form.internationalCruiseDTOList[index].voyageIndex;
this.form.internationalCruiseDTOList[index].voyage = this.form.internationalCruiseDTOList[index].routeIndex != e.detail.value ? '' : this.form.internationalCruiseDTOList[index].voyage;
this.form.internationalCruiseDTOList[index].routeIndex = e.detail.value;
this.form.internationalCruiseDTOList[index].route = this.internationalRouteList[e.detail.value].route;
this.form.internationalCruiseDTOList[index].direction = this.internationalRouteList[e.detail.value].direction;
}
},
//
@ -383,7 +389,7 @@
//
let routeIndex = this.form.passengerShipDTOList[index].routeIndex;
let idx = this.form.passengerShipDTOList.findIndex(item => item.voyageIndex == e.detail.value);
if (idx > -1 && this.form.passengerShipDTOList[index].voyageIndex != idx) {
if (idx > -1 && this.form.passengerShipDTOList[index].voyageIndex != idx+'') {
uni.showToast({
title: '客班轮航次不能重复选择',
icon: 'none'
@ -398,15 +404,18 @@
//
let routeIndex = this.form.internationalCruiseDTOList[index].routeIndex;
let idx = this.form.internationalCruiseDTOList.findIndex(item => item.voyageIndex == e.detail.value);
if (idx > -1 && this.form.internationalCruiseDTOList[index].voyageIndex != idx) {
if (idx > -1 && this.form.internationalCruiseDTOList[index].voyageIndex != idx+'') {
uni.showToast({
title: '国际邮轮航次不能重复选择',
icon: 'none'
});
}
this.form.internationalCruiseDTOList[index].voyageIndex = e.detail.value;
this.form.internationalCruiseDTOList[index].voyage = this.internationalRouteList[routeIndex].voyageInfoVOList[e.detail.value].voyageCode;
else {
this.form.internationalCruiseDTOList[index].voyageIndex = e.detail.value;
this.form.internationalCruiseDTOList[index].voyage = this.internationalRouteList[routeIndex].voyageInfoVOList[e.detail.value].voyageCode;
}
}
console.log('航次选择',this.form)
},
//
changeStatPeriod(e) {
@ -429,7 +438,7 @@
if (this.pageType == 'add') {
let now = new Date();
//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()) {

@ -310,7 +310,7 @@
right: 0;
bottom: 0;
background-color: #F8F8F8;
padding: 20px 30rpx 40px;
padding: 40rpx 30rpx;
.act_btn {
width: 690rpx;

@ -426,7 +426,7 @@
if (this.pageType == 'add') {
let now = new Date();
//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()) {

@ -321,7 +321,7 @@
right: 0;
bottom: 0;
background-color: #F8F8F8;
padding: 20px 30rpx 40px;
padding: 40rpx 30rpx;
.act_btn {
width: 690rpx;

@ -166,7 +166,7 @@
if(this.pageType == 'add') {
let now = new Date();
//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');

@ -322,7 +322,7 @@
display: flex;
// justify-content: space-around;
background-color: #F8F8F8;
padding: 20rpx 30rpx 40px;
padding: 40rpx 30rpx;
.act_btn {
width: 690rpx;

@ -250,7 +250,7 @@
if (this.pageType == 'add') {
let now = new Date();
//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';

@ -310,7 +310,7 @@
right: 0;
bottom: 0;
background-color: #F8F8F8;
padding: 20px 30rpx 40px;
padding: 40rpx 30rpx;
.act_btn {
width: 690rpx;

@ -310,7 +310,7 @@
right: 0;
bottom: 0;
background-color: #F8F8F8;
padding: 20px 30rpx 40px;
padding: 40rpx 30rpx;
.act_btn {
width: 690rpx;

Loading…
Cancel
Save