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

高速补充填报单位;道路运输注释废弃接口;引航站艘次input类型修改，组次艘次空值算法;国际客运增加航次量

Browse Source
main
zhangqun 2 years ago
parent 4b5f6e6cfc
commit 59e14d07c2
9 changed files with 99 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      pages/highWay/runData/form.vue
  2. 9
      pages/highWay/runData/list.vue
  3. 2
      pages/highWay/runStatusData/form.vue
  4. 9
      pages/highWay/runStatusData/list.vue
  5. 16
      pages/portShipping/pilotStation/form.vue
  6. 69
      pages/portShipping/waterInternational/form.vue
  7. 2
      pages/railway/runStatus/form.vue
  8. 2
      pages/roadTransport/transportData/form.vue
  9. 4
      pages/roadTransport/transportData/list.vue

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

@ -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 : '';
}

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

@ -7,6 +7,7 @@
{{item.statDate || ''}}<text style="margin-left:16rpx;">{{item.statPeriodValue || ''}}</text>
</view>
</view>
<view class="unit_station">{{item.organizationName || ''}}</view>
</view>
<uni-load-more iconType="circle" :status="status" @clickLoadMore="loadMore"
:contentText="contentText"></uni-load-more>
@ -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;

2
pages/highWay/runStatusData/form.vue
Unescape View File

@ -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 : '';
}

9
pages/highWay/runStatusData/list.vue
Unescape View File

@ -6,6 +6,7 @@
<view class="unit_name">{{item.statDate || ''}}<text
style="margin-left:16rpx;">{{item.statPeriodValue || ''}}</text></view>
</view>
<view class="unit_station">{{item.organizationName || ''}}</view>
</view>
<uni-load-more iconType="circle" :status="status" @clickLoadMore="loadMore"
:contentText="contentText"></uni-load-more>
@ -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;

16
pages/portShipping/pilotStation/form.vue
Unescape View File

@ -84,43 +84,43 @@
<view class="edit_item input">
<p class="left">套泊热接组次:</p>
<view class="right">
<uni-easyinput @blur="overCount" v-model="form.berthingHeatConnectionCount" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
<uni-easyinput type="number" @blur="overCount" @clear="overCount" v-model="form.berthingHeatConnectionCount" placeholder="请输入" placeholderStyle="color:#d4d4d4;" maxlength="20"></uni-easyinput>
</view>
</view>
<view class="edit_item input">
<p class="left">套泊热接艘次:</p>
<view class="right">
<uni-easyinput v-model="form.berthingHeatConnectionShipsCount" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
<uni-easyinput type="number" v-model="form.berthingHeatConnectionShipsCount" placeholder="请输入" placeholderStyle="color:#d4d4d4;" maxlength="20"></uni-easyinput>
</view>
</view>
<view class="edit_item input">
<p class="left">推近一海里(艘次):</p>
<view class="right">
<uni-easyinput type="digit" v-model="form.seaMilesPerPropulsion" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
<uni-easyinput type="number" v-model="form.seaMilesPerPropulsion" placeholder="请输入" placeholderStyle="color:#d4d4d4;" maxlength="20"></uni-easyinput>
</view>
</view>
<view class="edit_item input">
<p class="left">深水航槽直靠(艘次):</p>
<view class="right">
<uni-easyinput type="digit" v-model="form.deepWaterChannelDirectBerthingCount" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
<uni-easyinput type="number" v-model="form.deepWaterChannelDirectBerthingCount" placeholder="请输入" placeholderStyle="color:#d4d4d4;" maxlength="20"></uni-easyinput>
</view>
</view>
<view class="edit_item input">
<p class="left">15万吨级油轮全潮时靠泊(艘次):</p>
<view class="right">
<uni-easyinput type="digit" v-model="form.berthingCountDuringHighTideFor150kTonTanker" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
<uni-easyinput type="number" v-model="form.berthingCountDuringHighTideFor150kTonTanker" placeholder="请输入" placeholderStyle="color:#d4d4d4;" maxlength="20"></uni-easyinput>
</view>
</view>
<view class="edit_item input">
<p class="left">20万吨级矿船满载主航道夜航(艘次):</p>
<view class="right">
<uni-easyinput type="digit" v-model="form.nightNavigationCountFor200kTonLoadedBulkCarrier" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
<uni-easyinput type="number" v-model="form.nightNavigationCountFor200kTonLoadedBulkCarrier" placeholder="请输入" placeholderStyle="color:#d4d4d4;" maxlength="20"></uni-easyinput>
</view>
</view>
<view class="edit_item input">
<p class="left">低能见度情况下完成船舶雾航(艘次):</p>
<view class="right">
<uni-easyinput type="digit" v-model="form.shipFogNavigationCountUnderLowVisibility" placeholder="请输入" placeholderStyle="color:#d4d4d4;"></uni-easyinput>
<uni-easyinput type="number" v-model="form.shipFogNavigationCountUnderLowVisibility" placeholder="请输入" placeholderStyle="color:#d4d4d4;" maxlength="20"></uni-easyinput>
</view>
</view>
<view class="remark_item">
@ -212,7 +212,7 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr } from '../../../common/uti
// 根据套泊热接组次计算艘次
overCount(){
console.log(this.form.berthingHeatConnectionCount)
this.form.berthingHeatConnectionShipsCount = this.form.berthingHeatConnectionCount * 2
this.form.berthingHeatConnectionShipsCount = this.form.berthingHeatConnectionCount ? this.form.berthingHeatConnectionCount * 2 : '';
console.log(this.form)
},
getDetail(id){

69
pages/portShipping/waterInternational/form.vue
Unescape View File

@ -72,6 +72,34 @@
</picker>
</view>
</view>
<view class="form_item">
<view class="form_item_label">航次数：</view>
<view class="form_item_input form_input">
<uni-easyinput @blur="calcYoyMom(1,index)" @clear="calcYoyMom(1,index)" v-model="item.voyageNumber" type="number"
placeholderStyle="color: #D4D4D4;font-size:28rpx;" placeholder="请输入" maxlength="20">
</uni-easyinput>
</view>
</view>
<!-- 同比环比 -->
<!-- <view class="form_item_rate"
:class="item.passengerDod === 0 ? 'danger' : '' ">
<view class="rate_item">
<view class="rate_item_label"
:style="item.passengerDod === 0 ? 'color: #EB4747' : ''">
航次数环比</view>
<view class="rate_item_input"
:style="item.passengerDod === 0 ? 'color: #EB4747' : ''">
{{formatDigit(form.passengerDod)}}%
</view>
</view>
<view class="line"></view>
<view class="rate_item">
<view class="rate_item_label">航次数同比</view>
<view class="rate_item_input">
{{formatDigit(item.passengerYoy)}}%
</view>
</view>
</view> -->
<view class="form_item">
<view class="form_item_label">{{item.direction == '1' ? '入青' : item.direction == '2' ? '出青' : ''}}旅客人数：</view>
<view class="form_item_input form_input">
@ -138,6 +166,34 @@
</picker>
</view>
</view>
<view class="form_item">
<view class="form_item_label">航次数：</view>
<view class="form_item_input form_input">
<uni-easyinput @blur="calcYoyMom(1,index)" @clear="calcYoyMom(1,index)" v-model="item.voyageNumber" type="number"
placeholderStyle="color: #D4D4D4;font-size:28rpx;" placeholder="请输入" maxlength="20">
</uni-easyinput>
</view>
</view>
<!-- 同比环比 -->
<!-- <view class="form_item_rate"
:class="item.passengerDod === 0 ? 'danger' : '' ">
<view class="rate_item">
<view class="rate_item_label"
:style="item.passengerDod === 0 ? 'color: #EB4747' : ''">
航次数环比</view>
<view class="rate_item_input"
:style="item.passengerDod === 0 ? 'color: #EB4747' : ''">
{{formatDigit(form.passengerDod)}}%
</view>
</view>
<view class="line"></view>
<view class="rate_item">
<view class="rate_item_label">航次数同比</view>
<view class="rate_item_input">
{{formatDigit(item.passengerYoy)}}%
</view>
</view>
</view> -->
<view class="form_item">
<view class="form_item_label">{{item.direction == '1' ? '入青' : item.direction == '2' ? '出青' : ''}}旅客人数：</view>
<view class="form_item_input form_input">
@ -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) {

2
pages/railway/runStatus/form.vue
Unescape View File

@ -9,7 +9,7 @@
<view class="form_item">
<view class="form_item_label">车站名称：</view>
<view class="form_item_input picker">
<picker v-if="pageType == 'add'" :value="railwayNameIndex" :range="stationList" @change="changeRailway">
<picker v-if="pageType == 'add' && stationList.length > 1" :value="railwayNameIndex" :range="stationList" @change="changeRailway">
<text class="picker_select"
:style="form.carName?'color:#333;':''">{{form.carName?form.carName:'请选择'}}</text>
<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>

2
pages/roadTransport/transportData/form.vue
Unescape View File

@ -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 : [];

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

@ -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(){

Write Preview
Loading…
Cancel
Save