diff --git a/pages.json b/pages.json index c6fc74d..2cb74fa 100644 --- a/pages.json +++ b/pages.json @@ -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" } }, diff --git a/pages/bus/busDataInfo/form.vue b/pages/bus/busDataInfo/form.vue index 67eb7c7..deb2a1e 100644 --- a/pages/bus/busDataInfo/form.vue +++ b/pages/bus/busDataInfo/form.vue @@ -38,6 +38,85 @@ + + + 投入车辆统计： + + {{form.entranceVehicleCount === 0 ? form.entranceVehicleCount : form.entranceVehicleCount || ''}} + + + + + + + 投入车辆统计环比 + + {{formatDigit(form.entranceVehicleCountMom)}}% + + + + + 投入车辆统计同比 + + {{formatDigit(form.entranceVehicleCountYoy)}}% + + + + + 人数统计： + + {{form.exitVehicleCount === 0 ? form.exitVehicleCount : form.exitVehicleCount || ''}} + + + + + + + 人数统计环比 + + {{formatDigit(form.exitVehicleCountMom)}}% + + + + + 人数统计同比 + + {{formatDigit(form.exitVehicleCountYoy)}}% + + + + + 班次统计： + + {{form.exitVehicleCount === 0 ? form.exitVehicleCount : form.exitVehicleCount || ''}} + + + + + + + 班次统计环比 + + {{formatDigit(form.exitVehicleCountMom)}}% + + + + + 班次统计同比 + + {{formatDigit(form.exitVehicleCountYoy)}}% + + + @@ -246,6 +325,9 @@ phoneNumber: tel }); }, + checkNotEmpty(data) { + return checkNotEmpty(data); + }, formatDigit(data) { return (data+'').indexOf('.') > -1 && (data+'').substring((data+'').indexOf('.')).length > 2 ? data.toFixed(2) : data; }, @@ -292,20 +374,20 @@ busUnit:item.stationName, // busIndex:'', vehicleInput:'', - vehicleInputMom:0, - vehicleInputYoy:0, - operatingShiftsMom:0, - operatingShiftsYoy:0, + vehicleInputMom:'', + vehicleInputYoy:'', + operatingShiftsMom:'', + operatingShiftsYoy:'', passengerCount:'', - passengerCountMom:0, - passengerCountYoy:0, + passengerCountMom:'', + passengerCountYoy:'', yestVehicleInput:'', yestOperatingShifts:'', yestPassengerCount:'', lyVehicleInput:'', lyPassengerCount:'', lyOperatingShifts:'', - isPassengerCountConvert:0, + isPassengerCountConvert:'', }) }) } else { @@ -338,7 +420,7 @@ "yestPassengerCount": '', "yesterdayvehicleInput": '', "yestOperatingShifts":'', - "isPassengerCountConvert":0, + "isPassengerCountConvert":'', }) } }) diff --git a/pages/highWay/runData/form.vue b/pages/highWay/runData/form.vue index 4096609..c58a9f4 100644 --- a/pages/highWay/runData/form.vue +++ b/pages/highWay/runData/form.vue @@ -6,7 +6,7 @@ 基本信息 - + 统计日期： @@ -271,11 +271,11 @@ }, onLoad(options) { this.userInfo = uni.getStorageSync('userInfo'); - let arr = uni.getStorageSync('deptName'); - this.deptNameList = checkNotEmpty(arr) ? arr : []; + // let arr = uni.getStorageSync('deptName'); + // this.deptNameList = checkNotEmpty(arr) ? arr : []; if (options.type == 'add') { - this.form.organizationName = this.deptNameList.length > 0 ? this.deptNameList[0].deptName : ''; - this.form.organizationNameIndex = this.deptNameList.length > 0 ? 0 : ''; + // this.form.organizationName = this.deptNameList.length > 0 ? this.deptNameList[0].deptName : ''; + // this.form.organizationNameIndex = this.deptNameList.length > 0 ? 0 : ''; this.pageType = 'add'; let now = new Date(); this.form.statDate = getDateStr(now, -1); //默认前一天 @@ -307,14 +307,14 @@ this.$request(getApp().globalData.baseUrl + '/api/biz/highwayParentDataController/selectById/' + id, {}, 'GET').then(res => { this.form = res.data; - 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 : ''; - } - } + // 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.queryStation(); }) diff --git a/pages/highWay/runData/list.vue b/pages/highWay/runData/list.vue index 460ade3..d6dc7c4 100644 --- a/pages/highWay/runData/list.vue +++ b/pages/highWay/runData/list.vue @@ -7,7 +7,7 @@ {{item.statDate || ''}}{{item.statPeriodValue || ''}} - {{item.organizationName || ''}} + diff --git a/pages/highWay/runStatusData/list.vue b/pages/highWay/runStatusData/list.vue index 13b02fd..e6cf3f6 100644 --- a/pages/highWay/runStatusData/list.vue +++ b/pages/highWay/runStatusData/list.vue @@ -6,7 +6,7 @@ {{item.statDate || ''}}{{item.statPeriodValue || ''}} - {{item.organizationName || ''}} + diff --git a/pages/home/index.vue b/pages/home/index.vue index 1d460ad..74a6f54 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -44,7 +44,7 @@ if(this.routersData.length == 0 && options.routers) { this.routersData = JSON.parse(options.routers); uni.setNavigationBarTitle({ - title: this.routersData.meta.title || '交通运输报送系统' + title: this.routersData.meta.title || '青岛交通信息' }) this.routersData.children.map((item,index) => { item.show = index == 0 ? true : false; diff --git a/pages/portShipping/waterInternational/form.vue b/pages/portShipping/waterInternational/form.vue index ab8e304..a0afff3 100644 --- a/pages/portShipping/waterInternational/form.vue +++ b/pages/portShipping/waterInternational/form.vue @@ -9,13 +9,19 @@ 所属单位： - {{form.organizationName?form.organizationName:'请选择'}} - {{form.organizationName}} + {{form.organizationName}} --> + + {{form.organizationName}} @@ -55,9 +61,9 @@ 航线： - - {{item.route?item.route:'请选择'}} + + {{item.route?item.route:'请选择'}} @@ -65,9 +71,10 @@ 航次： - - {{item.voyage?item.voyage:'请选择'}} + + {{item.voyage?item.voyage:'请选择'}} @@ -75,8 +82,8 @@ 航次数： - + @@ -103,26 +110,25 @@ {{item.direction == '1' ? '入青' : item.direction == '2' ? '出青' : ''}}旅客人数： - + - + - - {{item.direction == '1' ? '入青' : item.direction == '2' ? '出青' : ''}}旅客人数环比 - + + {{item.direction == '1' ? '入青' : item.direction == '2' ? '出青' : ''}}旅客人数环比 + + {{formatDigit(form.passengerDod)}}% - {{item.direction == '1' ? '入青' : item.direction == '2' ? '出青' : ''}}旅客人数同比 + {{item.direction == '1' ? '入青' : item.direction == '2' ? '出青' : ''}}旅客人数同比 + {{formatDigit(item.passengerYoy)}}% @@ -131,16 +137,16 @@ 备注： - + - + 国际邮轮-{{ index+1 }} @@ -149,9 +155,9 @@ 航线： - - {{item.route?item.route:'请选择'}} + + {{item.route?item.route:'请选择'}} @@ -159,9 +165,10 @@ 航次： - - {{item.voyage?item.voyage:'请选择'}} + + {{item.voyage?item.voyage:'请选择'}} @@ -169,8 +176,8 @@ 航次数： - + @@ -197,26 +204,25 @@ {{item.direction == '1' ? '入青' : item.direction == '2' ? '出青' : ''}}旅客人数： - + - + - - {{item.direction == '1' ? '入青' : item.direction == '2' ? '出青' : ''}}旅客人数环比 - + + {{item.direction == '1' ? '入青' : item.direction == '2' ? '出青' : ''}}旅客人数环比 + + {{formatDigit(form.passengerDod)}}% - {{item.direction == '1' ? '入青' : item.direction == '2' ? '出青' : ''}}旅客人数同比 + {{item.direction == '1' ? '入青' : item.direction == '2' ? '出青' : ''}}旅客人数同比 + {{formatDigit(item.passengerYoy)}}% @@ -225,9 +231,8 @@ 备注： - + @@ -238,6 +243,99 @@ {{btnText}} + + + + + + + 填报单位 + + + + + + + + + + + + + + {{item.deptName}} + + + + + + + + + + + {{item1.deptName}} + + + + + + + + + + + {{item2.deptName}} + + + + + + + + + + + {{item3.deptName}} 123 + + + + + + + + + + + + + + + + + +

取消

+

确认

+ + + +