suojin
/
transport_integrated_app
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

高速、水路岛变更修改接口联调

Browse Source
dev201310
zhangqun 2 years ago
parent ce402ac693
commit 6aed1dbd59
7 changed files with 220 additions and 81 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      App.vue
  2. 2
      common/util.js
  3. 133
      pages/highWay/runData/form.vue
  4. 23
      pages/highWay/runData/list.vue
  5. 6
      pages/roadTransport/transportData/list.vue
  6. 123
      pages/water/waterWay/form.vue
  7. 11
      pages/water/waterWay/list.vue

3
App.vue
Unescape View File

@ -54,7 +54,8 @@
console.log('App Hide') console.log('App Hide')
}, },
globalData: { globalData: {
baseUrl: 'http://27.223.104.50:8001',//接口前缀 // baseUrl: 'http://27.223.104.50:8001',//接口前缀
baseUrl: 'http://jtxx.qdjtcx.cn:8001',//接口前缀
mobile: '66007587' mobile: '66007587'
}, },
methods: { methods: {

2
common/util.js
Unescape View File

@ -107,7 +107,7 @@ function calcMom(cur, data) {
} }
// 计算同比 // 计算同比
function calcYoy(cur, data) { function calcYoy(cur, data) {
console.log(cur,"同比==========",data); // console.log(cur,"同比==========",data);
return !checkNotEmpty(cur) || !checkNotEmpty(data) ? '' : data === 0 && parseInt(cur) === 0 ? 0 : data === 0 && parseInt(cur) > 0 ? 100 : (parseInt(cur) - data) / data * 100; return !checkNotEmpty(cur) || !checkNotEmpty(data) ? '' : data === 0 && parseInt(cur) === 0 ? 0 : data === 0 && parseInt(cur) > 0 ? 100 : (parseInt(cur) - data) / data * 100;
} }

133
pages/highWay/runData/form.vue
Unescape View File

@ -21,21 +21,23 @@
<view class="form_item"> <view class="form_item">
<view class="form_item_label">统计日期：</view> <view class="form_item_label">统计日期：</view>
<view class="form_item_input picker"> <view class="form_item_input picker">
<picker mode="date" :value="form.statDate" @change="bindDateChange"> <picker v-if="pageType == 'add'" mode="date" :value="form.statDate" @change="bindDateChange">
<text class="picker_select" <text class="picker_select"
:style="form.statDate?'color:#333;':''">{{form.statDate?form.statDate:'请选择时段'}}</text> :style="form.statDate?'color:#333;':''">{{form.statDate?form.statDate:'请选择时段'}}</text>
<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons> <uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
</picker> </picker>
<text v-else>{{form.statDate?form.statDate:''}}</text>
</view> </view>
</view> </view>
<view class="form_item"> <view class="form_item">
<view class="form_item_label">统计时段：</view> <view class="form_item_label">统计时段：</view>
<view class="form_item_input picker"> <view class="form_item_input picker">
<picker :value="index" :range="array" range-key="dictLabel" @change="changeStatPeriod"> <picker v-if="pageType == 'add'" :value="index" :range="array" range-key="dictLabel" @change="changeStatPeriod">
<text class="picker_select" <text class="picker_select"
:style="index>-1?'color:#333;':''">{{index>-1?array[index].dictLabel:'请选择时段'}}</text> :style="index>-1?'color:#333;':''">{{index>-1?array[index].dictLabel:'请选择时段'}}</text>
<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons> <uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
</picker> </picker>
<text v-else>{{index>-1?array[index].dictLabel:''}}</text>
</view> </view>
</view> </view>
<view class="form_item"> <view class="form_item">
@ -46,13 +48,13 @@
</view> </view>
<!-- 同比环比 --> <!-- 同比环比 -->
<view class="form_item_rate" <view class="form_item_rate"
:class="checkNotEmpty(form.entranceVehicleCount) && form.entranceVehicleCount === yoyMom.minusDaysEntranceVehicleSum ? 'danger' : ''"> :class="checkNotEmpty(form.entranceVehicleCount) && form.entranceVehicleCount === yoyMomSumary.minusDaySummaryData.entranceVehicleCount ? 'danger' : ''">
<view class="rate_item"> <view class="rate_item">
<view class="rate_item_label" <view class="rate_item_label"
:style="checkNotEmpty(form.entranceVehicleCount) && form.entranceVehicleCount === yoyMom.minusDaysEntranceVehicleSum ?'color: #EB4747':''"> :style="checkNotEmpty(form.entranceVehicleCount) && form.entranceVehicleCount === yoyMomSumary.minusDaySummaryData.entranceVehicleCount ?'color: #EB4747':''">
驶入车辆数统计环比</view> 驶入车辆数统计环比</view>
<view class="rate_item_input" <view class="rate_item_input"
:style="checkNotEmpty(form.entranceVehicleCount) && form.entranceVehicleCount === yoyMom.minusDaysEntranceVehicleSum ?'color: #EB4747':''"> :style="checkNotEmpty(form.entranceVehicleCount) && form.entranceVehicleCount === yoyMomSumary.minusDaySummaryData.entranceVehicleCount ?'color: #EB4747':''">
{{formatDigit(form.entranceVehicleCountMom)}}% {{formatDigit(form.entranceVehicleCountMom)}}%
</view> </view>
</view> </view>
@ -72,13 +74,13 @@
</view> </view>
<!-- 同比环比 --> <!-- 同比环比 -->
<view class="form_item_rate" <view class="form_item_rate"
:class="checkNotEmpty(form.exitVehicleCount) && form.exitVehicleCount === yoyMom.minusDaysExitVehicleSum ? 'danger' : ''"> :class="checkNotEmpty(form.exitVehicleCount) && form.exitVehicleCount === yoyMomSumary.minusDaySummaryData.exitVehicleCount ? 'danger' : ''">
<view class="rate_item"> <view class="rate_item">
<view class="rate_item_label" <view class="rate_item_label"
:style="checkNotEmpty(form.exitVehicleCount) && form.exitVehicleCount === yoyMom.minusDaysExitVehicleSum ?'color: #EB4747':''"> :style="checkNotEmpty(form.exitVehicleCount) && form.exitVehicleCount === yoyMomSumary.minusDaySummaryData.exitVehicleCount ?'color: #EB4747':''">
驶出车辆数统计环比</view> 驶出车辆数统计环比</view>
<view class="rate_item_input" <view class="rate_item_input"
:style="checkNotEmpty(form.exitVehicleCount) && form.exitVehicleCount === yoyMom.minusDaysExitVehicleSum ?'color: #EB4747':''"> :style="checkNotEmpty(form.exitVehicleCount) && form.exitVehicleCount === yoyMomSumary.minusDaySummaryData.exitVehicleCount ?'color: #EB4747':''">
{{formatDigit(form.exitVehicleCountMom)}}% {{formatDigit(form.exitVehicleCountMom)}}%
</view> </view>
</view> </view>
@ -262,6 +264,10 @@
index: 2, //时段选择,默认0-24 index: 2, //时段选择,默认0-24
userInfo: {}, userInfo: {},
yoyMom: {}, //同比环比 yoyMom: {}, //同比环比
yoyMomSumary: {
minusDaySummaryData: {},
minusYearSummaryData: {}
},//汇总统计同环比
showStaion: false, //展开收起 showStaion: false, //展开收起
pageType: '', pageType: '',
deptNameList: [], //当前登录人所在单位 deptNameList: [], //当前登录人所在单位
@ -279,10 +285,14 @@
this.pageType = 'add'; this.pageType = 'add';
let now = new Date(); let now = new Date();
this.form.statDate = getDateStr(now, -1); //默认前一天 this.form.statDate = getDateStr(now, -1); //默认前一天
this.queryStation('add'); // this.queryStation('add');
this.queryTime(); //统计时段 this.queryTime(); //统计时段
}else if(options.item) {
this.btnText = '修改并保存';
let obj = JSON.parse(options.item);
this.queryDetailInfo2(obj.statDate, obj.statPeriod);
} }
if (options.id) { else if (options.id) {
this.btnText = '修改并保存'; this.btnText = '修改并保存';
this.queryDetailInfo(options.id); this.queryDetailInfo(options.id);
} }
@ -319,20 +329,39 @@
this.queryStation(); this.queryStation();
}) })
}, },
//日期和时段查询详情
queryDetailInfo2(statDate, statPeriod) {
this.$request(getApp().globalData.baseUrl + '/api/biz/highwayParentDataController/getSubData?statDate=' + statDate + '&statPeriod=' + statPeriod, {},
'GET').then(res => {
res.data.statDate = statDate;
res.data.statPeriod = statPeriod;
this.form = res.data;
this.queryTime();
this.queryStation();
})
},
//同比环比查询 //同比环比查询
queryYoYMom() { queryYoYMom() {
if (this.form.statDate && this.form.statPeriod) { if (this.form.statDate && this.form.statPeriod) {
//汇总统计
this.$request(getApp().globalData.baseUrl + this.$request(getApp().globalData.baseUrl +
'/api/biz/highwayParentDataController/getYoYAndMoM?statDate=' + this.form.statDate + '/api/biz/highwayParentDataController/getSummaryDataYoYAndMoM?statDate=' + this.form.statDate +
'&statPeriod=' + this.form.statPeriod + '&_t=' + Date.parse(new Date()), {}, "GET").then( '&statPeriod=' + this.form.statPeriod + '&_t=' + Date.parse(new Date()), {}, "GET").then(
res => { res => {
this.yoyMom = res.data; this.yoyMomSumary = res.data;
//如果重新更改填报日期，重新计算同比环比 //各收费站同环比查询
if (this.highwaySubDataList.length > 0 && this.form.highwaySubDataList.length > 0) { this.$request(getApp().globalData.baseUrl +
this.highwaySubDataList.map((item, index) => { '/api/biz/highwayParentDataController/getYoYAndMoM?statDate=' + this.form.statDate +
this.checkStationInfo(index); '&statPeriod=' + this.form.statPeriod + '&_t=' + Date.parse(new Date()), {}, "GET").then(
res2 => {
this.yoyMom = res2.data;
//如果重新更改填报日期，重新计算同比环比
if (this.highwaySubDataList.length > 0 && this.form.highwaySubDataList.length > 0) {
this.highwaySubDataList.map((item, index) => {
this.checkStationInfo(index);
})
}
}) })
}
}) })
} }
}, },
@ -377,8 +406,8 @@
}, },
//计算收费站信息是否填写完整 //计算收费站信息是否填写完整
checkStationInfo(index) { checkStationInfo(index) {
this.highwaySubDataList[index].isFinish = this.form.highwaySubDataList[index].entranceVehicleCount != '' && this.highwaySubDataList[index].isFinish = checkNotEmpty(this.form.highwaySubDataList[index].entranceVehicleCount) &&
this.form.highwaySubDataList[index].exitVehicleCount != ''; checkNotEmpty(this.form.highwaySubDataList[index].exitVehicleCount);
//统计计算 //统计计算
let entranceVehicleCount = 0, let entranceVehicleCount = 0,
exitVehicleCount = 0; exitVehicleCount = 0;
@ -391,19 +420,17 @@
}) })
this.form.entranceVehicleCount = entranceVehicleCount; this.form.entranceVehicleCount = entranceVehicleCount;
this.form.exitVehicleCount = exitVehicleCount; this.form.exitVehicleCount = exitVehicleCount;
//环比计算规则 if今天没有值不计算，elseif昨天没有值不计算，elseif昨天===0并且今天===0百分比0，esleif昨天0今天大于0百分比100,else(今天-昨天)/昨天*100
//收费站驶入车辆数统计 //收费站驶入车辆数统计
this.form.entranceVehicleCountMom = this.$calcMom(this.form.entranceVehicleCount,this.yoyMom.minusDaysEntranceVehicleSum); this.form.entranceVehicleCountMom = this.$calcMom(this.form.entranceVehicleCount,this.yoyMomSumary.minusDaySummaryData.entranceVehicleCount);
this.form.entranceVehicleCountYoy = this.$calcYoy(this.form.entranceVehicleCount, this.yoyMom.minusYearsEntranceVehicleSum); this.form.entranceVehicleCountYoy = this.$calcYoy(this.form.entranceVehicleCount, this.yoyMomSumary.minusYearSummaryData.entranceVehicleCount);
//收费站驶出车辆数统计 //收费站驶出车辆数统计
this.form.exitVehicleCountMom = this.$calcMom(this.form.exitVehicleCount, this.yoyMom.minusDaysExitVehicleSum); this.form.exitVehicleCountMom = this.$calcMom(this.form.exitVehicleCount, this.yoyMomSumary.minusDaySummaryData.exitVehicleCount);
this.form.exitVehicleCountYoy = this.$calcYoy(this.form.exitVehicleCount, this.yoyMom.minusYearsExitVehicleSum); this.form.exitVehicleCountYoy = this.$calcYoy(this.form.exitVehicleCount, this.yoyMomSumary.minusYearSummaryData.exitVehicleCount);
//收费站子表计算同比环比 //收费站子表计算同比环比
// if(this.form.highwaySubDataList[index].entranceVehicleCount != '' || this.form.highwaySubDataList[index].exitVehicleCount != ''){
let idx = this.yoyMom.minusDaysList.findIndex(item => { let idx = this.yoyMom.minusDaysList.findIndex(item => {
return item.tollStationName == this.form.highwaySubDataList[index].tollStationName; return item.tollStationName == this.form.highwaySubDataList[index].tollStationName;
}); });
@ -478,8 +505,7 @@
.stationName; .stationName;
}); });
if (idx > -1) { if (idx > -1) {
item.isFinish = arr[idx].entranceVehicleCount != '' && arr[idx] item.isFinish = checkNotEmpty(arr[idx].entranceVehicleCount) && checkNotEmpty(arr[idx].exitVehicleCount) ? true : false;
.exitVehicleCount != '' ? true : false;
this.form.highwaySubDataList.push(arr[idx]); this.form.highwaySubDataList.push(arr[idx]);
} else { } else {
item.isFinish = false; item.isFinish = false;
@ -515,18 +541,42 @@
//选择统计日期 //选择统计日期
bindDateChange(e) { bindDateChange(e) {
this.form.statDate = e.detail.value; this.form.statDate = e.detail.value;
this.queryYoYMom(); if(this.pageType == 'add') {
this.$request(getApp().globalData.baseUrl + '/api/biz/highwayParentDataController/getSubData?statDate=' + this.form.statDate + '&statPeriod=' + this.form.statPeriod, {},
'GET').then(res => {
res.data.statDate = this.form.statDate;
res.data.statPeriod = this.form.statPeriod;
this.form = res.data;
this.queryStation();
this.queryYoYMom();
})
}
else {
this.queryYoYMom();
}
}, },
//统计时段切换 //统计时段切换
changeStatPeriod(e) { changeStatPeriod(e) {
this.index = e.detail.value; this.index = e.detail.value;
this.form.statPeriod = this.array[e.detail.value].dictValue; this.form.statPeriod = this.array[e.detail.value].dictValue;
console.log('change 时段') console.log('change 时段')
this.queryYoYMom(); if(this.pageType == 'add') {
this.$request(getApp().globalData.baseUrl + '/api/biz/highwayParentDataController/getSubData?statDate=' + this.form.statDate + '&statPeriod=' + this.form.statPeriod, {},
'GET').then(res => {
res.data.statDate = this.form.statDate;
res.data.statPeriod = this.form.statPeriod;
this.form = res.data;
this.queryStation();
this.queryYoYMom();
})
}
else {
this.queryYoYMom();
}
}, },
//时段 //时段
queryTime() { queryTime() {
this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=highway_time' + '&_t=' + Date
.parse( .parse(
new Date()), {}, 'GET').then(res => { new Date()), {}, 'GET').then(res => {
this.array = res.data; this.array = res.data;
@ -539,11 +589,28 @@
this.form.statPeriod = '0012'; this.form.statPeriod = '0012';
let idx = this.array.findIndex(item => item.dictValue == '0012'); let idx = this.array.findIndex(item => item.dictValue == '0012');
this.index = idx > -1 ? idx : ''; 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 { } else {
this.form.statPeriod = '03'; //默认0-24 this.form.statPeriod = '03'; //默认0-24
let idx = this.array.findIndex(item => item.dictValue == '03'); let idx = this.array.findIndex(item => item.dictValue == '03');
this.index = idx > -1 ? idx : ''; 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 => {
res.data.statDate = this.form.statDate;
res.data.statPeriod = this.form.statPeriod;
this.form = res.data;
console.log('add == queryTime', this.form)
this.queryStation();
})
} else { } else {
let idx = this.array.findIndex(item => item.dictValue == this.form.statPeriod); let idx = this.array.findIndex(item => item.dictValue == this.form.statPeriod);
this.index = idx > -1 ? idx : ''; this.index = idx > -1 ? idx : '';
@ -575,7 +642,7 @@
} }
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: this.form.id == undefined ? '您确认提交该条报送数据?' : '您确认将该条数据进行修改?', content: this.pageType == 'add' ? '您确认提交该条报送数据?' : '您确认将该条数据进行修改?',
success: (res) => { success: (res) => {
if (res.confirm) { if (res.confirm) {
this.submitForm(); this.submitForm();
@ -588,7 +655,7 @@
title: '提交中...', title: '提交中...',
mask: true mask: true
}) })
this.$request(getApp().globalData.baseUrl + '/api/biz/highwayParentDataController/saveOrUpdate', this this.$request(getApp().globalData.baseUrl + '/api/biz/highwayParentDataController/saveOrUpdateV2', this
.form, .form,
'POST').then(res => { 'POST').then(res => {
uni.hideLoading(); uni.hideLoading();

23
pages/highWay/runData/list.vue
Unescape View File

@ -1,10 +1,10 @@
<template> <template>
<view class="page"> <view class="page">
<view class="list_box" v-for="(item,index) in data" :key="index" @click="goPage('/pages/highway/runData/form?id='+item.id)"> <view class="list_box" v-for="(item,index) in data" :key="index" @click="goPage('/pages/highway/runData/form', item)">
<view class="list_top"> <view class="list_top">
<view class="unit_tags">报送时间</view> <view class="unit_tags">报送时间</view>
<view class="unit_name"> <view class="unit_name">
{{item.statDate || ''}}<text style="margin-left:16rpx;">{{item.statPeriodValue || ''}}</text> {{item.statDate || ''}}<text style="margin-left:16rpx;">{{renderTime(item.statPeriod)}}</text>
</view> </view>
</view> </view>
<!-- <view class="unit_station">{{item.organizationName || ''}}</view> --> <!-- <view class="unit_station">{{item.organizationName || ''}}</view> -->
@ -141,9 +141,14 @@
closeSearch() { closeSearch() {
this.$refs.popup.close(); this.$refs.popup.close();
}, },
//时段文本转换
renderTime(reportPhase) {
let idx = this.array.findIndex(item => item.dictValue == reportPhase);
return idx > -1 ? this.array[idx].dictLabel : '';
},
//时段 //时段
queryTime() { queryTime() {
this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date.parse( this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=highway_time' + '&_t=' + Date.parse(
new Date()), {}, 'GET').then(res => { new Date()), {}, 'GET').then(res => {
this.array = res.data; this.array = res.data;
}) })
@ -156,14 +161,14 @@
Object.keys(this.query).map(key => { Object.keys(this.query).map(key => {
params = params + '&' + key + '=' + this.query[key] params = params + '&' + key + '=' + this.query[key]
}) })
this.$request(getApp().globalData.baseUrl + '/api/biz/highwayParentDataController/list?page=' + this.current + this.$request(getApp().globalData.baseUrl + '/api/biz/highwayParentDataController/getTimeList?page=' + this.current +
'&pageSize=' + this.size + '&_t=' + Date.parse(new Date()) + params, {}, 'GET').then(res => { '&pageSize=' + this.size + '&_t=' + Date.parse(new Date()) + params, {}, 'GET').then(res => {
if (res.code == 200) { if (res.code == 200) {
res.data.list.map(item => { // res.data.list.map(item => {
item.highwaySubDataList.map(item2 => { // item.highwaySubDataList.map(item2 => {
item2.show = false; // item2.show = false;
}) // })
}) // })
console.log(res.data.list) console.log(res.data.list)
this.data = this.data.concat(res.data.list); this.data = this.data.concat(res.data.list);
if (res.data.list.length == 0 || res.data.totalCount < this.size) { if (res.data.list.length == 0 || res.data.totalCount < this.size) {

6
pages/roadTransport/transportData/list.vue
Unescape View File

@ -4,12 +4,12 @@
<view class="top_box"> <view class="top_box">
<view class="list_box"> <view class="list_box">
<view class="list_item" v-for="(item,index) in listData" :key="index"> <view class="list_item" v-for="(item,index) in listData" :key="index">
<view class="list_top"> <view class="list_top" @click="showDetail(index,!item.show)">
<view class="unit_tags">报送时间</view> <view class="unit_tags">报送时间</view>
<view class="unit_name">{{item.statisticalDate || ''}}<text style="margin-left:16rpx;">{{renderTime(item.reportPhase)}}</text></view> <view class="unit_name">{{item.statisticalDate || ''}}<text style="margin-left:16rpx;">{{renderTime(item.reportPhase)}}</text></view>
<view class="unit_arrow"> <view class="unit_arrow">
<uni-icons @click="showDetail(index,false)" v-if="item.show" type="bottom" size="16" color="#666666"></uni-icons> <uni-icons v-if="item.show" type="bottom" size="16" color="#666666"></uni-icons>
<uni-icons @click="showDetail(index,true)" v-else type="right" size="16" color="#666666"></uni-icons> <uni-icons v-else type="right" size="16" color="#666666"></uni-icons>
</view> </view>
</view> </view>
<view class="list_cnt" v-if="item.show"> <view class="list_cnt" v-if="item.show">

123
pages/water/waterWay/form.vue
Unescape View File

@ -12,75 +12,77 @@
{{form.affiliatedUnit}} {{form.affiliatedUnit}}
</view> </view>
</view> --> </view> -->
<view class="form_item" v-if="form.bizWaterwayIslandDataSaveOrUpdateDTOList.length == 1"> <!-- <view class="form_item" v-if="form.bizWaterwayIslandDataSaveOrUpdateDTOList.length == 1">
<view class="form_item_label">陆岛名称：</view> <view class="form_item_label">陆岛名称：</view>
<view class="form_item_input select"> <view class="form_item_input select">
{{form.bizWaterwayIslandDataSaveOrUpdateDTOList.length > 0 ? form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].landName : ''}} {{form.bizWaterwayIslandDataSaveOrUpdateDTOList.length > 0 ? form.bizWaterwayIslandDataSaveOrUpdateDTOList[landNameIndex].landName : ''}}
</view> </view>
</view> </view> -->
<view class="form_item"> <view class="form_item">
<view class="form_item_label">统计日期：</view> <view class="form_item_label">统计日期：</view>
<view class="form_item_input picker"> <view class="form_item_input picker">
<picker mode="date" :value="form.reportDate" @change="bindDateChange"> <picker v-if="pageType == 'add'" mode="date" :value="form.reportDate" @change="bindDateChange">
<text class="picker_select" <text class="picker_select"
:style="form.reportDate?'color:#333;':''">{{form.reportDate?form.reportDate:'请选择时段'}}</text> :style="form.reportDate?'color:#333;':''">{{form.reportDate?form.reportDate:'请选择时段'}}</text>
<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons> <uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
</picker> </picker>
<text v-else>{{form.reportDate?form.reportDate:''}}</text>
</view> </view>
</view> </view>
<view class="form_item"> <view class="form_item">
<view class="form_item_label">统计时段：</view> <view class="form_item_label">统计时段：</view>
<view class="form_item_input picker"> <view class="form_item_input picker">
<picker :value="index" :range="array" range-key="dictLabel" @change="changeStatPeriod"> <picker v-if="pageType == 'add'" :value="index" :range="array" range-key="dictLabel" @change="changeStatPeriod">
<text class="picker_select" <text class="picker_select"
:style="index>-1?'color:#333;':''">{{index>-1?array[index].dictLabel:'请选择时段'}}</text> :style="index>-1?'color:#333;':''">{{index>-1?array[index].dictLabel:'请选择时段'}}</text>
<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons> <uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
</picker> </picker>
<text v-else>{{index>-1?array[index].dictLabel:''}}</text>
</view> </view>
</view> </view>
<!-- 汇总统计 --> <!-- 汇总统计 -->
<view class="form_item"> <view class="form_item">
<view class="form_item_label">航次统计：</view> <view class="form_item_label">航次统计：</view>
<view class="form_item_input"> <view class="form_item_input">
{{form.entranceVehicleCount === 0 ? form.entranceVehicleCount : form.entranceVehicleCount || ''}} {{form.voyage === 0 ? form.voyage : form.voyage || ''}}
</view> </view>
</view> </view>
<!-- 同比环比 --> <!-- 同比环比 -->
<view class="form_item_rate" <view class="form_item_rate"
:class="checkNotEmpty(form.entranceVehicleCount) && form.entranceVehicleCount === yoyMom.minusDaysEntranceVehicleSum ? 'danger' : ''"> :class="checkNotEmpty(form.voyage) && form.voyage === yoySum.minusDaySummaryData.voyage ? 'danger' : ''">
<view class="rate_item"> <view class="rate_item">
<view class="rate_item_label" <view class="rate_item_label"
:style="checkNotEmpty(form.entranceVehicleCount) && form.entranceVehicleCount === yoyMom.minusDaysEntranceVehicleSum ?'color: #EB4747':''"> :style="checkNotEmpty(form.voyage) && form.voyage === yoySum.minusDaySummaryData.voyage ?'color: #EB4747':''">
航次统计环比</view> 航次统计环比</view>
<view class="rate_item_input" <view class="rate_item_input"
:style="checkNotEmpty(form.entranceVehicleCount) && form.entranceVehicleCount === yoyMom.minusDaysEntranceVehicleSum ?'color: #EB4747':''"> :style="checkNotEmpty(form.voyage) && form.voyage === yoySum.minusDaySummaryData.voyage ?'color: #EB4747':''">
{{formatDigit(form.entranceVehicleCountMom)}}% {{formatDigit(form.voyageMom)}}%
</view> </view>
</view> </view>
<view class="line"></view> <view class="line"></view>
<view class="rate_item"> <view class="rate_item">
<view class="rate_item_label">航次统计同比</view> <view class="rate_item_label">航次统计同比</view>
<view class="rate_item_input"> <view class="rate_item_input">
{{formatDigit(form.entranceVehicleCountYoy)}}% {{formatDigit(form.voyageYoy)}}%
</view> </view>
</view> </view>
</view> </view>
<view class="form_item"> <view class="form_item">
<view class="form_item_label">人数统计：</view> <view class="form_item_label">人数统计：</view>
<view class="form_item_input"> <view class="form_item_input">
{{form.exitVehicleCount === 0 ? form.exitVehicleCount : form.exitVehicleCount || ''}} {{form.numberOfPeople === 0 ? form.numberOfPeople : form.numberOfPeople || ''}}
</view> </view>
</view> </view>
<!-- 同比环比 --> <!-- 同比环比 -->
<view class="form_item_rate" <view class="form_item_rate"
:class="checkNotEmpty(form.exitVehicleCount) && form.exitVehicleCount === yoyMom.minusDaysExitVehicleSum ? 'danger' : ''"> :class="checkNotEmpty(form.numberOfPeople) && form.numberOfPeople === yoySum.minusDaySummaryData.numberOfPeople ? 'danger' : ''">
<view class="rate_item"> <view class="rate_item">
<view class="rate_item_label" <view class="rate_item_label"
:style="checkNotEmpty(form.exitVehicleCount) && form.exitVehicleCount === yoyMom.minusDaysExitVehicleSum ?'color: #EB4747':''"> :style="checkNotEmpty(form.numberOfPeople) && form.numberOfPeople === yoySum.minusDaySummaryData.numberOfPeople ?'color: #EB4747':''">
人数统计环比</view> 人数统计环比</view>
<view class="rate_item_input" <view class="rate_item_input"
:style="checkNotEmpty(form.exitVehicleCount) && form.exitVehicleCount === yoyMom.minusDaysExitVehicleSum ?'color: #EB4747':''"> :style="checkNotEmpty(form.numberOfPeople) && form.numberOfPeople === yoySum.minusDaySummaryData.numberOfPeople ?'color: #EB4747':''">
{{formatDigit(form.exitVehicleCountMom)}}% {{formatDigit(form.numberOfPeopletMom)}}%
</view> </view>
</view> </view>
<view class="line"></view> <view class="line"></view>
@ -229,6 +231,8 @@
"yesterdayVoyage": '', "yesterdayVoyage": '',
"remarks": '' "remarks": ''
}], }],
"numberOfPeople": "",
"voyage": '',
"reportDate": "", "reportDate": "",
"statPeriod": "" "statPeriod": ""
}, //登录form }, //登录form
@ -240,7 +244,11 @@
showLand: false, showLand: false,
pageType: '', pageType: '',
btnText: '保存', btnText: '保存',
mobile: getApp().globalData.mobile mobile: getApp().globalData.mobile,
yoySum: {
minusDaySummaryData: {},
minusYearSummaryData: {}
},//汇总同环比
} }
}, },
onLoad(options) { onLoad(options) {
@ -250,13 +258,14 @@
let now = new Date(); let now = new Date();
this.form.reportDate = getDateStr(now, -1); //默认前一天 this.form.reportDate = getDateStr(now, -1); //默认前一天
this.queryTime(); //统计时段 this.queryTime(); //统计时段
this.queryLandList(); //陆岛权限列表 // this.queryLandList(); //陆岛权限列表
} else if (options.item) { } else if (options.item) {
this.btnText = '修改并保存'; this.btnText = '修改并保存';
this.form = JSON.parse(options.item); // this.form = JSON.parse(options.item);
this.form.bizWaterwayIslandDataSaveOrUpdateDTOList = this.form.bizWaterwayIslandDataVOList; // this.form.bizWaterwayIslandDataSaveOrUpdateDTOList = this.form.bizWaterwayIslandDataVOList;
this.queryLandList(); //陆岛权限列表 // this.queryLandList(); //陆岛权限列表
this.queryTime(); // this.queryTime();
this.queryDetailInfo2(options.statDate, options.statPeriod);
} else if (options.id) { } else if (options.id) {
this.btnText = '修改并保存'; this.btnText = '修改并保存';
this.queryDetailInfo(options.id); this.queryDetailInfo(options.id);
@ -281,10 +290,10 @@
this.landNameIndex = index; this.landNameIndex = index;
}, },
//陆岛列表 //陆岛列表
queryLandList() { queryLandList(type) {
this.$request(getApp().globalData.baseUrl + '/api/biz/waterwayIslandData/getByCurrentUserId', {}, 'GET').then(res => { this.$request(getApp().globalData.baseUrl + '/api/biz/waterwayIslandData/getByCurrentUserId', {}, 'GET').then(res => {
this.landList = res.data; this.landList = res.data;
if (this.pageType == 'add') { if (type == 'add') {
this.form.bizWaterwayIslandDataSaveOrUpdateDTOList = []; this.form.bizWaterwayIslandDataSaveOrUpdateDTOList = [];
this.landList.map(item => { this.landList.map(item => {
item.isFinish = false; item.isFinish = false;
@ -359,6 +368,17 @@
this.landList[index].isFinish = checkNotEmpty(this.form this.landList[index].isFinish = checkNotEmpty(this.form
.bizWaterwayIslandDataSaveOrUpdateDTOList[index].voyage) && checkNotEmpty(this.form .bizWaterwayIslandDataSaveOrUpdateDTOList[index].voyage) && checkNotEmpty(this.form
.bizWaterwayIslandDataSaveOrUpdateDTOList[index].numberOfPeople) ? true : false; .bizWaterwayIslandDataSaveOrUpdateDTOList[index].numberOfPeople) ? true : false;
//重新计算汇总统计
let _voyage = 0;
let _numberOfPeople = 0;
this.form.bizWaterwayIslandDataSaveOrUpdateDTOList.map(item => {
_voyage = _voyage + (checkNotEmpty(item.voyage) ? parseInt(item.voyage) : 0);
_numberOfPeople = _numberOfPeople + (checkNotEmpty(item.numberOfPeople) ? parseInt(item.numberOfPeople) : 0);
})
this.form.voyage = _voyage;
this.form.numberOfPeople = _numberOfPeople;
//重新计算汇总同环比
this.calcSum();
this.$request(getApp().globalData.baseUrl + '/api/biz/waterwayIslandData/getYoyMom?statDate=' + this.form this.$request(getApp().globalData.baseUrl + '/api/biz/waterwayIslandData/getYoyMom?statDate=' + this.form
.reportDate + '&statPeriod=' + this.form.statPeriod + '&landName=' + this.form .reportDate + '&statPeriod=' + this.form.statPeriod + '&landName=' + this.form
.bizWaterwayIslandDataSaveOrUpdateDTOList[index].landName + '&_t=' + Date.parse(new Date()), {}, .bizWaterwayIslandDataSaveOrUpdateDTOList[index].landName + '&_t=' + Date.parse(new Date()), {},
@ -391,15 +411,50 @@
this.queryLandList(); this.queryLandList();
}) })
}, },
//根据日期和时段查询详情
queryDetailInfo2(statData, statPeriod) {
this.$request(getApp().globalData.baseUrl + '/api/biz/waterwayIslandData/getSubData?statDate=' + statData + '&statPeriod=' + statPeriod, {},
'GET').then(res => {
res.data.reportDate = statData;
res.data.statPeriod = statPeriod;
this.form = res.data;
this.form.bizWaterwayIslandDataSaveOrUpdateDTOList = this.form.bizWaterwayIslandDataVOList;
//查询汇总同环比
this.$request(getApp().globalData.baseUrl + '/api/biz/waterwayIslandData/getSummaryDataYoYAndMoM?statDate=' + statData + '&statPeriod=' + statPeriod + '&_t=' + Date.parse(new Date()), {},
'GET')
.then(res2 => {
res2.data.minusDaySummaryData = res2.data.minusDaySummaryData ? res2.data.minusDaySummaryData : {};
res2.data.minusYearSummaryData = res2.data.minusYearSummaryData ? res2.data.minusYearSummaryData : {};
this.yoySum = res2.data;
this.calcSum();
})
if(this.pageType != 'add') {
this.queryTime(); //统计时段
}
this.queryLandList();
})
},
//汇总同环比计算
calcSum() {
this.form.voyageMom = this.$calcMom(this.form.voyage,this.yoySum.minusDaySummaryData.voyage);
this.form.voyageYoy = this.$calcYoy(this.form.voyage,this.yoySum.minusYearSummaryData.voyage);
this.form.numberOfPeopleMom = this.$calcMom(this.form.numberOfPeople,this.yoySum.minusDaySummaryData.numberOfPeople);
this.form.numberOfPeopleYoy = this.$calcYoy(this.form.numberOfPeople,this.yoySum.minusYearSummaryData.numberOfPeople);
},
//统计时段切换选择 //统计时段切换选择
changeStatPeriod(e) { changeStatPeriod(e) {
this.index = e.detail.value; this.index = e.detail.value;
this.form.statPeriod = this.array[e.detail.value].dictValue; this.form.statPeriod = this.array[e.detail.value].dictValue;
console.log('change 时段', this.form) console.log('change 时段', this.form)
//重新计算同比环比 if(this.pageType == 'add') {
this.form.bizWaterwayIslandDataSaveOrUpdateDTOList.map((item, index) => { this.queryDetailInfo2(this.form.reportDate, this.form.statPeriod);
this.calcYoyMom(index); }
}) else {
//重新计算同比环比
this.form.bizWaterwayIslandDataSaveOrUpdateDTOList.map((item, index) => {
this.calcYoyMom(index);
})
}
}, },
//取消 //取消
doCancel() { doCancel() {
@ -408,10 +463,15 @@
//选择统计日期 //选择统计日期
bindDateChange(e) { bindDateChange(e) {
this.form.reportDate = e.detail.value; this.form.reportDate = e.detail.value;
//重新计算同比环比 if(this.pageType == 'add') {
this.form.bizWaterwayIslandDataSaveOrUpdateDTOList.map((item, index) => { this.queryDetailInfo2(this.form.reportDate, this.form.statPeriod);
this.calcYoyMom(index); }
}) else {
//重新计算同比环比
this.form.bizWaterwayIslandDataSaveOrUpdateDTOList.map((item, index) => {
this.calcYoyMom(index);
})
}
}, },
//时段 //时段
queryTime() { queryTime() {
@ -434,6 +494,7 @@
let idx = this.array.findIndex(item => item.dictValue == '03'); let idx = this.array.findIndex(item => item.dictValue == '03');
this.index = idx > -1 ? idx : ''; this.index = idx > -1 ? idx : '';
} }
this.queryDetailInfo2(this.form.reportDate, this.form.statPeriod);
} else { } else {
let idx = this.array.findIndex(item => item.dictValue == this.form.statPeriod); let idx = this.array.findIndex(item => item.dictValue == this.form.statPeriod);
this.index = idx > -1 ? idx : ''; this.index = idx > -1 ? idx : '';

11
pages/water/waterWay/list.vue
Unescape View File

@ -1,10 +1,10 @@
<template> <template>
<view class="page"> <view class="page">
<view class="list_box" v-for="(item,index) in data" :key="index" @click="goPage('/pages/water/waterWay/form?id='+item.id)"> <view class="list_box" v-for="(item,index) in data" :key="index" @click="goPage('/pages/water/waterWay/form', item)">
<view class="list_top"> <view class="list_top">
<view class="unit_tags">报送时间</view> <view class="unit_tags">报送时间</view>
<view>{{item.reportDate || ''}}<text <view>{{item.reportDate || ''}}<text
style="margin-left:16rpx;">{{item.statPeriodValue || ''}}</text></view> style="margin-left:16rpx;">{{renderTime(item.statPeriod)}}</text></view>
</view> </view>
</view> </view>
<uni-load-more iconType="circle" :status="status" @clickLoadMore="loadMore" <uni-load-more iconType="circle" :status="status" @clickLoadMore="loadMore"
@ -137,6 +137,11 @@
closeSearch() { closeSearch() {
this.$refs.popup.close(); this.$refs.popup.close();
}, },
//时段文本转换
renderTime(reportPhase) {
let idx = this.array.findIndex(item => item.dictValue == reportPhase);
return idx > -1 ? this.array[idx].dictLabel : '';
},
//时段 //时段
queryTime() { queryTime() {
this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date.parse( this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date.parse(
@ -152,7 +157,7 @@
Object.keys(this.query).map(key => { Object.keys(this.query).map(key => {
params = params + '&' + key + '=' + this.query[key] params = params + '&' + key + '=' + this.query[key]
}) })
this.$request(getApp().globalData.baseUrl + '/api/biz/waterwayIslandData/list?page=' + this.current + this.$request(getApp().globalData.baseUrl + '/api/biz/waterwayIslandData/getTimeList?page=' + this.current +
'&pageSize=' + this.size + '&_t=' + Date.parse(new Date()) + params, {}, 'GET').then(res => { '&pageSize=' + this.size + '&_t=' + Date.parse(new Date()) + params, {}, 'GET').then(res => {
if (res.code == 200) { if (res.code == 200) {
this.data = this.data.concat(res.data.list); this.data = this.data.concat(res.data.list);

Write Preview
Loading…
Cancel
Save