From e397be61c51d277fad9592db3fc6c8e541994e11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=BE=A4?= Date: Mon, 11 Sep 2023 16:12:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E8=B7=AF=E5=9B=BD=E9=99=85=E5=AE=A2?= =?UTF-8?q?=E8=BF=90=E5=92=8C=E5=9C=B0=E9=93=81=E9=A1=B5=E9=9D=A2=E5=BC=80?= =?UTF-8?q?=E5=8F=91=EF=BC=9B=E6=9D=83=E9=99=90=E5=8D=95=E4=BD=8D=E5=92=8C?= =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 24 + pages/airport/airport-runData/form.vue | 58 +- pages/highWay/runData/form.vue | 58 +- pages/login/login.vue | 4 +- pages/metro/runData/form.vue | 535 ++++++++++++ pages/metro/runData/list.vue | 445 ++++++++++ .../internationalTransport/form.vue | 792 ++++++++++++++++++ .../internationalTransport/list.vue | 445 ++++++++++ pages/water/waterWay/form.vue | 2 +- 9 files changed, 2310 insertions(+), 53 deletions(-) create mode 100644 pages/metro/runData/form.vue create mode 100644 pages/metro/runData/list.vue create mode 100644 pages/portShipping/internationalTransport/form.vue create mode 100644 pages/portShipping/internationalTransport/list.vue diff --git a/pages.json b/pages.json index ca75977..97dc466 100644 --- a/pages.json +++ b/pages.json @@ -153,6 +153,30 @@ "navigationBarTitleText": "机场运行情况报送" } }, + { + "path": "pages/portShipping/internationalTransport/form", + "style": { + "navigationBarTitleText": "水路国际客运报送" + } + }, + { + "path": "pages/portShipping/internationalTransport/list", + "style": { + "navigationBarTitleText": "水路国际客运" + } + }, + { + "path": "pages/metro/runData/form", + "style": { + "navigationBarTitleText": "地铁客流量报送" + } + }, + { + "path": "pages/metro/runData/list", + "style": { + "navigationBarTitleText": "地铁客流量" + } + }, { "path": "pages/roadTransport/transportData/list", "style": { diff --git a/pages/airport/airport-runData/form.vue b/pages/airport/airport-runData/form.vue index 8928841..e2b1f2d 100644 --- a/pages/airport/airport-runData/form.vue +++ b/pages/airport/airport-runData/form.vue @@ -47,14 +47,14 @@ 入青航班架次环比 - {{form.inFlightsMomDo === 0 ? form.inFlightsMomDo : form.inFlightsMomDo ? formatDigit(form.inFlightsMomDo) : '--'}}% + {{formatDigit(form.inFlightsMomDo)}}% 入青航班架次同比 - {{form.inFlightsYoyDo === 0 ? form.inFlightsYoyDo : form.inFlightsYoyDo ? formatDigit(form.inFlightsYoyDo) : '--'}}% + {{formatDigit(form.inFlightsYoyDo)}}% @@ -72,14 +72,14 @@ 出青航班架次环比 - {{form.outFlightsMomDo === 0 ? form.outFlightsMomDo : form.outFlightsMomDo ? formatDigit(form.outFlightsMomDo) : '--'}}% + {{formatDigit(form.outFlightsMomDo)}}% 出青航班架次同比 - {{form.outFlightsYoyDo === 0 ? form.outFlightsYoyDo : form.outFlightsYoyDo ? formatDigit(form.outFlightsYoyDo) : '--'}}% + {{formatDigit(form.outFlightsYoyDo)}}% @@ -97,14 +97,14 @@ 入青航班旅客环比 - {{form.inPassengersMomDo === 0 ? form.inPassengersMomDo : form.inPassengersMomDo ? formatDigit(form.inPassengersMomDo) : '--'}}% + {{formatDigit(form.inPassengersMomDo)}}% 入青航班旅客同比 - {{form.inPassengersYoyDo === 0 ? form.inPassengersYoyDo : form.inPassengersYoyDo ? formatDigit(form.inPassengersYoyDo) : '--'}}% + {{formatDigit(form.inPassengersYoyDo)}}% @@ -122,14 +122,14 @@ 出青航班旅客环比 - {{form.outPassengersMomDo === 0 ? form.outPassengersMomDo : form.outPassengersMomDo ? formatDigit(form.outPassengersMomDo) : '--'}}% + {{formatDigit(form.outPassengersMomDo)}}% 出青航班旅客同比 - {{form.outPassengersYoyDo === 0 ? form.outPassengersYoyDo : form.outPassengersYoyDo ? formatDigit(form.outPassengersYoyDo) : '--'}}% + {{formatDigit(form.outPassengersYoyDo)}}% @@ -156,14 +156,14 @@ 入青航班架次环比 - {{form.inFlightsMomIn === 0 ? form.inFlightsMomIn : form.inFlightsMomIn ? formatDigit(form.inFlightsMomIn) : '--'}}% + {{formatDigit(form.inFlightsMomIn)}}% 入青航班架次同比 - {{form.inFlightsYoyIn === 0 ? form.inFlightsYoyIn : form.inFlightsYoyIn ? formatDigit(form.inFlightsYoyIn) : '--'}}% + {{formatDigit(form.inFlightsYoyIn)}}% @@ -181,14 +181,14 @@ 出青航班架次环比 - {{form.outFlightsMomIn === 0 ? form.outFlightsMomIn : form.outFlightsMomIn ? formatDigit(form.outFlightsMomIn) : '--'}}% + {{formatDigit(form.outFlightsMomIn)}}% 出青航班架次同比 - {{form.outFlightsYoyIn === 0 ? form.outFlightsYoyIn : form.outFlightsYoyIn ? formatDigit(form.outFlightsYoyIn) : '--'}}% + {{formatDigit(form.outFlightsYoyIn)}}% @@ -206,14 +206,14 @@ 入青航班旅客环比 - {{form.inPassengersMomIn === 0 ? form.inPassengersMomIn : form.inPassengersMomIn ? formatDigit(form.inPassengersMomIn) : '--'}}% + {{formatDigit(form.inPassengersMomIn)}}% 入青航班旅客同比 - {{form.inPassengersYoyIn === 0 ? form.inPassengersYoyIn : form.inPassengersYoyIn ? formatDigit(form.inPassengersYoyIn) : '--'}}% + {{formatDigit(form.inPassengersYoyIn)}}% @@ -231,14 +231,14 @@ 出青航班旅客环比 - {{form.outPassengersMomIn === 0 ? form.outPassengersMomIn : form.outPassengersMomIn ? formatDigit(form.outPassengersMomIn) : '--'}}% + {{formatDigit(form.outPassengersMomIn)}}% 出青航班旅客同比 - {{form.outPassengersYoyIn === 0 ? form.outPassengersYoyIn : form.outPassengersYoyIn ? formatDigit(form.outPassengersYoyIn) : '--'}}% + {{formatDigit(form.outPassengersYoyIn)}}% @@ -262,14 +262,14 @@ 入青航班架次环比 - {{form.inFlightsMomTo === 0 ? form.inFlightsMomTo : form.inFlightsMomTo ? formatDigit(form.inFlightsMomTo) : '--'}}% + {{formatDigit(form.inFlightsMomTo)}}% 入青航班架次同比 - {{form.inFlightsYoyTo === 0 ? form.inFlightsYoyTo : form.inFlightsYoyTo ? formatDigit(form.inFlightsYoyTo) : '--'}}% + {{formatDigit(form.inFlightsYoyTo)}}% @@ -285,14 +285,14 @@ 出青航班架次环比 - {{form.outFlightsMomTo === 0 ? form.outFlightsMomTo : form.outFlightsMomTo ? formatDigit(form.outFlightsMomTo) : '--'}}% + {{formatDigit(form.outFlightsMomTo)}}% 出青航班架次同比 - {{form.outFlightsYoyTo === 0 ? form.outFlightsYoyTo : form.outFlightsYoyTo ? formatDigit(form.outFlightsYoyTo) : '--'}}% + {{formatDigit(form.outFlightsYoyTo)}}% @@ -308,14 +308,14 @@ 入青航班旅客环比 - {{form.inPassengersMomTo === 0 ? form.inPassengersMomTo : form.inPassengersMomTo ? formatDigit(form.inPassengersMomTo) : '--'}}% + {{formatDigit(form.inPassengersMomTo)}}% 入青航班旅客同比 - {{form.inPassengersYoyTo === 0 ? form.inPassengersYoyTo : form.inPassengersYoyTo ? formatDigit(form.inPassengersYoyTo) : '--'}}% + {{formatDigit(form.inPassengersYoyTo)}}% @@ -331,14 +331,14 @@ 出青航班旅客环比 - {{form.outPassengersMomTo === 0 ? form.outPassengersMomTo : form.outPassengersMomTo ? formatDigit(form.outPassengersMomTo) : '--'}}% + {{formatDigit(form.outPassengersMomTo)}}% 出青航班旅客同比 - {{form.outPassengersYoyTo === 0 ? form.outPassengersYoyTo : form.outPassengersYoyTo ? formatDigit(form.outPassengersYoyTo) : '--'}}% + {{formatDigit(form.outPassengersYoyTo)}}% @@ -443,7 +443,7 @@ }, methods: { formatDigit(data) { - return (data+'').indexOf('.') > -1 && (data+'').substring((data+'').indexOf('.')).length > 2 ? data.toFixed(2) : data; + return !checkNotEmpty(data) ? '--' : (data+'').indexOf('.') > -1 && (data+'').substring((data+'').indexOf('.')).length > 2 ? data.toFixed(2) : data; }, //环比同比 queryYoyMom() { @@ -484,15 +484,15 @@ this.form.outPassengersMomIn = this.$calcMom(this.form.outboundPassengersIn,yesterdayData.outboundPassengersIn); this.form.outPassengersYoyIn =this.$calcYoy(this.form.outboundPassengersIn,lastYearData.outboundPassengersIn); //汇总-入 - this.form.inboundFlightsTo = (checkNotEmpty(this.form.inboundFlightsDo) ? parseInt(this.form.inboundFlightsDo) : 0) + (checkNotEmpty(this.form.inboundFlightsIn) ? parseInt(this.form.inboundFlightsIn) : 0);//入青-航班 - this.form.inboundPassengersTo = (checkNotEmpty(this.form.inboundPassengersDo) ? parseInt(this.form.inboundPassengersDo) : 0) + (checkNotEmpty(this.form.inboundPassengersIn) ? parseInt(this.form.inboundPassengersIn) : 0);//入青-旅客 + this.form.inboundFlightsTo = !checkNotEmpty(this.form.inboundFlightsDo) && !checkNotEmpty(this.form.inboundFlightsIn) ? '' : (checkNotEmpty(this.form.inboundFlightsDo) ? parseInt(this.form.inboundFlightsDo) : 0) + (checkNotEmpty(this.form.inboundFlightsIn) ? parseInt(this.form.inboundFlightsIn) : 0);//入青-航班 + this.form.inboundPassengersTo = !checkNotEmpty(this.form.inboundPassengersDo) && !checkNotEmpty(this.form.inboundPassengersIn) ? '' : (checkNotEmpty(this.form.inboundPassengersDo) ? parseInt(this.form.inboundPassengersDo) : 0) + (checkNotEmpty(this.form.inboundPassengersIn) ? parseInt(this.form.inboundPassengersIn) : 0);//入青-旅客 this.form.inFlightsMomTo = this.$calcMom(this.form.inboundFlightsTo,yesterdayData.inboundFlightsTo); this.form.inFlightsYoyTo =this.$calcYoy(this.form.inboundFlightsTo,lastYearData.inboundFlightsTo); this.form.inPassengersMomTo = this.$calcMom(this.form.inboundPassengersTo,yesterdayData.inboundPassengersTo); this.form.inPassengersYoyTo =this.$calcYoy(this.form.inboundPassengersTo,lastYearData.inboundPassengersTo); //汇总-出 - this.form.outboundFlightsTo = (checkNotEmpty(this.form.outboundFlightsDo) ? parseInt(this.form.outboundFlightsDo) : 0) + (checkNotEmpty(this.form.outboundFlightsIn) ? parseInt(this.form.outboundFlightsIn) : 0);//出青-航班 - this.form.outboundPassengersTo = (checkNotEmpty(this.form.outboundPassengersDo) ? parseInt(this.form.outboundPassengersDo) : 0) + (checkNotEmpty(this.form.outboundPassengersIn) ? parseInt(this.form.outboundPassengersIn) : 0);//出青-旅客 + this.form.outboundFlightsTo = !checkNotEmpty(this.form.outboundFlightsDo) && !checkNotEmpty(this.form.outboundFlightsIn) ? '' : (checkNotEmpty(this.form.outboundFlightsDo) ? parseInt(this.form.outboundFlightsDo) : 0) + (checkNotEmpty(this.form.outboundFlightsIn) ? parseInt(this.form.outboundFlightsIn) : 0);//出青-航班 + this.form.outboundPassengersTo = !checkNotEmpty(this.form.outboundPassengersDo) && !checkNotEmpty(this.form.outboundPassengersIn) ? '' : (checkNotEmpty(this.form.outboundPassengersDo) ? parseInt(this.form.outboundPassengersDo) : 0) + (checkNotEmpty(this.form.outboundPassengersIn) ? parseInt(this.form.outboundPassengersIn) : 0);//出青-旅客 this.form.outFlightsMomTo = this.$calcMom(this.form.outboundFlightsTo,yesterdayData.outboundFlightsTo); this.form.outFlightsYoyTo =this.$calcYoy(this.form.outboundFlightsTo,lastYearData.outboundFlightsTo); this.form.outPassengersMomTo = this.$calcMom(this.form.outboundPassengersTo,yesterdayData.outboundPassengersTo); diff --git a/pages/highWay/runData/form.vue b/pages/highWay/runData/form.vue index e19967b..ab5f6db 100644 --- a/pages/highWay/runData/form.vue +++ b/pages/highWay/runData/form.vue @@ -9,7 +9,7 @@ 管理单位名称： - {{form.organizationName?form.organizationName:'请选择'}} @@ -53,14 +53,14 @@ 驶入车辆数统计环比 - {{form.entranceVehicleCountMom === 0 ? form.entranceVehicleCountMom : checkNotEmpty(form.entranceVehicleCountMom) ? formatDigit(form.entranceVehicleCountMom) : '--'}}% + {{formatDigit(form.entranceVehicleCountMom)}}% 驶入车辆数统计同比 - {{form.entranceVehicleCountYoy === 0 ? form.entranceVehicleCountYoy : checkNotEmpty(form.entranceVehicleCountYoy) ? formatDigit(form.entranceVehicleCountYoy) : '--'}}% + {{formatDigit(form.entranceVehicleCountYoy)}}% @@ -79,14 +79,14 @@ 驶出车辆数统计环比 - {{form.exitVehicleCountMom === 0 ? form.exitVehicleCountMom : checkNotEmpty(form.exitVehicleCountMom) ? formatDigit(form.exitVehicleCountMom) : '--'}}% + {{formatDigit(form.exitVehicleCountMom)}}% 驶出车辆数统计同比 - {{form.exitVehicleCountYoy === 0 ? form.exitVehicleCountYoy : checkNotEmpty(form.exitVehicleCountYoy) ? formatDigit(form.exitVehicleCountYoy) : '--'}}% + {{formatDigit(form.exitVehicleCountYoy)}}% @@ -144,14 +144,14 @@ 驶入车辆数环比 - {{form.highwaySubDataList.length == 0 ? '--' : form.highwaySubDataList[stationIndex].entranceVehicleCountMom === 0 ? form.highwaySubDataList[stationIndex].entranceVehicleCountMom : form.highwaySubDataList[stationIndex].entranceVehicleCountMom ? formatDigit(form.highwaySubDataList[stationIndex].entranceVehicleCountMom) : '--'}}% + {{formatDigit(form.highwaySubDataList[stationIndex].entranceVehicleCountMom)}}% 驶入车辆数同比 - {{form.highwaySubDataList.length == 0 ? '--' : form.highwaySubDataList[stationIndex].entranceVehicleCountYoy === 0 ? form.highwaySubDataList[stationIndex].entranceVehicleCountYoy : form.highwaySubDataList[stationIndex].entranceVehicleCountYoy ? formatDigit(form.highwaySubDataList[stationIndex].entranceVehicleCountYoy) : '--'}}% + {{formatDigit(form.highwaySubDataList[stationIndex].entranceVehicleCountYoy)}}% @@ -173,14 +173,14 @@ 驶出车辆数环比 - {{form.highwaySubDataList.length == 0 ? '--' : form.highwaySubDataList[stationIndex].exitVehicleCountMom === 0 ? formatDigit(form.highwaySubDataList[stationIndex].exitVehicleCountMom) : form.highwaySubDataList[stationIndex].exitVehicleCountMom ? formatDigit(form.highwaySubDataList[stationIndex].exitVehicleCountMom) : '--'}}% + {{formatDigit(form.highwaySubDataList[stationIndex].exitVehicleCountMom)}}% 驶出车辆数同比 - {{form.highwaySubDataList.length == 0 ? '--' : form.highwaySubDataList[stationIndex].exitVehicleCountYoy === 0 ? form.highwaySubDataList[stationIndex].exitVehicleCountYoy : form.highwaySubDataList[stationIndex].exitVehicleCountYoy ? formatDigit(form.highwaySubDataList[stationIndex].exitVehicleCountYoy) : '--'}}% + {{formatDigit(form.highwaySubDataList[stationIndex].exitVehicleCountYoy)}}% @@ -245,7 +245,9 @@ exitVehicleCount: '', exitVehicleCountMom: '', exitVehicleCountYoy: '', - highwaySubDataList: [], + highwaySubDataList: [ + {} + ], }, //登录form highwaySubDataList: [], //收费站列表 stationIndex: 0, //收费站选中索引 @@ -285,7 +287,7 @@ }, //只保留两位小数 formatDigit(data) { - return (data+'').indexOf('.') > -1 && (data+'').substring((data+'').indexOf('.')).length > 2 ? data.toFixed(2) : data; + return !checkNotEmpty(data) ? '--' : (data+'').indexOf('.') > -1 && (data+'').substring((data+'').indexOf('.')).length > 2 ? data.toFixed(2) : data; }, //id查询详情 queryDetailInfo(id) { @@ -316,17 +318,31 @@ } }) } + }, + //切换管理单位 + bindDeptChange(e) { + this.form.organizationNameIndex = e.detail.value; + this.form.organizationName = this.deptNameList[e.detail.value].deptName; }, //报送人 - queryPerson() { - this.$request(getApp().globalData.baseUrl + '/api/biz/personnelContactInfoController/all?query=&_t=' + Date - .parse(new Date()), {}, "GET").then(res => { - let arr = []; - res.data.list.map(item => { - arr.push(item.name); - }) - this.submitPerson = arr; - }) + // queryPerson() { + // this.$request(getApp().globalData.baseUrl + '/api/biz/personnelContactInfoController/all?query=&_t=' + Date + // .parse(new Date()), {}, "GET").then(res => { + // let arr = []; + // res.data.list.map(item => { + // arr.push(item.name); + // }) + // this.submitPerson = arr; + // }) + // }, + queryPerson() { + this.$request(getApp().globalData.baseUrl + '/api/user/getByDeptId/' + this.deptNameList[this.form.organizationNameIndex].deptId, {}, "GET").then(res => { + let arr = []; + res.data.map(item => { + arr.push(item.username+(item.mobile?','+item.mobile:'')); + }) + this.submitPerson = arr; + }) }, changeSubmitPerson(e, index) { this.form.highwaySubDataList[index].submitPersonnelContact = this.submitPerson[e.detail.value]; @@ -400,7 +416,7 @@ if (idx > -1) { //环比 let obj = this.yoyMom.minusDaysList[idx]; - console.log(obj) + // console.log(obj) this.form.highwaySubDataList[index].entranceVehicleCountMom = !checkNotEmpty(this.form .highwaySubDataList[index].entranceVehicleCount) ? '' : !checkNotEmpty(obj .entranceVehicleCount) ? '' : obj.entranceVehicleCount === 0 ? 100 : (parseInt(this.form diff --git a/pages/login/login.vue b/pages/login/login.vue index 270e74c..e52e093 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -25,7 +25,7 @@ username: '', password: '', verCode: '', - vercodeType: 5 + vercodeType: 1 }, //登录form codeImg: '', //图形验证码 } @@ -36,7 +36,7 @@ methods: { //获取图形验证码 getVerCode() { - this.$request1(getApp().globalData.baseUrl + '/api/common/captchaBase64?type=5&_t=' + Date.parse(new Date()), {}, 'GET').then(res => { + this.$request1(getApp().globalData.baseUrl + '/api/common/captchaBase64?type=1&_t=' + Date.parse(new Date()), {}, 'GET').then(res => { if(res.code == 200) { this.codeImg = res.data.img; } diff --git a/pages/metro/runData/form.vue b/pages/metro/runData/form.vue new file mode 100644 index 0000000..ba49d2d --- /dev/null +++ b/pages/metro/runData/form.vue @@ -0,0 +1,535 @@ + + + + diff --git a/pages/metro/runData/list.vue b/pages/metro/runData/list.vue new file mode 100644 index 0000000..9660072 --- /dev/null +++ b/pages/metro/runData/list.vue @@ -0,0 +1,445 @@ + + + + \ No newline at end of file diff --git a/pages/portShipping/internationalTransport/form.vue b/pages/portShipping/internationalTransport/form.vue new file mode 100644 index 0000000..3214664 --- /dev/null +++ b/pages/portShipping/internationalTransport/form.vue @@ -0,0 +1,792 @@ + + + + diff --git a/pages/portShipping/internationalTransport/list.vue b/pages/portShipping/internationalTransport/list.vue new file mode 100644 index 0000000..7669ffe --- /dev/null +++ b/pages/portShipping/internationalTransport/list.vue @@ -0,0 +1,445 @@ + + + + \ No newline at end of file diff --git a/pages/water/waterWay/form.vue b/pages/water/waterWay/form.vue index 4133ee8..1cc72b6 100644 --- a/pages/water/waterWay/form.vue +++ b/pages/water/waterWay/form.vue @@ -213,7 +213,7 @@ }, //陆岛列表 queryLandList() { - this.$request(getApp().globalData.baseUrl + '/api/biz/bizWaterwayIslandAuthority/list', {}, 'GET').then(res => { + this.$request(getApp().globalData.baseUrl + '/api/biz/waterwayIslandData/getByCurrentUserId', {}, 'GET').then(res => { this.landList = res.data; if (this.pageType == 'add') { this.landList.map(item => {