diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 47459c4..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/pages/highWay/runStatusData/form.vue b/pages/highWay/runStatusData/form.vue index 72cd057..a431cb4 100644 --- a/pages/highWay/runStatusData/form.vue +++ b/pages/highWay/runStatusData/form.vue @@ -51,14 +51,14 @@ 已处理事故数量： - 正在处理事故数量： - @@ -330,31 +330,35 @@ "accidentCount": 0, "congestionCount": 0, "deceasedCount": 0, - "highwayAccidentDetailDTOS": [{ - "accidentContent": "", - "accidentEndTime": "", - "accidentLevel": "", - "accidentStartTime": "", - "additionalNotes": "", - "congestionRange": "", - "disposalStatus": "", - "duration": "", - "higwayNameIndex": "", - "highwayName": "", - "location": "", - }], - "highwayCongestionDetailDTOS": [{ - "additionalNotes": "", - "congestionContent": "", - "congestionEndTime": "", - "congestionRange": "", - "congestionStartTime": "", - "disposalStatus": "", - "duration": "", - "higwayNameIndex": "", - "highwayName": "", - "location": "", - }], + "highwayAccidentDetailDTOS": [ + // { + // "accidentContent": "", + // "accidentEndTime": "", + // "accidentLevel": "", + // "accidentStartTime": "", + // "additionalNotes": "", + // "congestionRange": "", + // "disposalStatus": "", + // "duration": "", + // "higwayNameIndex": "", + // "highwayName": "", + // "location": "", + // }, + ], + "highwayCongestionDetailDTOS": [ + // { + // "additionalNotes": "", + // "congestionContent": "", + // "congestionEndTime": "", + // "congestionRange": "", + // "congestionStartTime": "", + // "disposalStatus": "", + // "duration": "", + // "higwayNameIndex": "", + // "highwayName": "", + // "location": "", + // }, + ], "injuredCount": 0, "isOpen": 1, "organizationName": "", @@ -569,7 +573,7 @@ "highwayName": "", "location": "", }); - this.form.accidentCount = this.form.highwayCongestionDetailDTOS.length; + this.form.accidentCount = this.form.highwayAccidentDetailDTOS.length; } }, //删行 @@ -581,7 +585,7 @@ } else { //事故删行 this.form.highwayAccidentDetailDTOS.splice(index, 1); - this.form.accidentCount = this.form.highwayCongestionDetailDTOS.length; + this.form.accidentCount = this.form.highwayAccidentDetailDTOS.length; } }, //确认提交 diff --git a/pages/home/index.vue b/pages/home/index.vue index 8a953b0..3fa6112 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -53,6 +53,7 @@ if(this.routersData.path.indexOf('/') == '-1'){ this.routersData.path = '/' + this.routersData.path } + console.log('routerData =====>',this.routersData) } }, methods: { diff --git a/pages/railway/runStatus/form.vue b/pages/railway/runStatus/form.vue index e1b6441..523704f 100644 --- a/pages/railway/runStatus/form.vue +++ b/pages/railway/runStatus/form.vue @@ -140,8 +140,12 @@ }, //车站选择 changeRailway(e) { - this.railwayNameIndex = e.detail.value; - this.form.railwayName = this.stationList[e.detail.value]; + console.log('车站选择=======>',typeof(e.detail.value)) + console.log('车站列表=======>',this.stationList) + console.log('车站=====>',this.stationList[Number(e.detail.value)]) + this.railwayNameIndex = Number(e.detail.value); + this.form.railwayName = this.stationList[Number(e.detail.value)]; + this.form.carName = this.stationList[Number(e.detail.value)]; }, //统计时段切换选择 changeStatPeriod(e) { diff --git a/pages/roadTransport/transportData/form.vue b/pages/roadTransport/transportData/form.vue index 4a310c3..2785336 100644 --- a/pages/roadTransport/transportData/form.vue +++ b/pages/roadTransport/transportData/form.vue @@ -55,9 +55,14 @@ - {{peopleName ? peopleName : '请选择'}} - + + + {{!peopleName && !peopleNumber ? ' 请选择' : ''}} + {{peopleName ? peopleName : ''}} + {{peopleNumber ? peopleNumber : ''}} + + + @@ -490,7 +495,8 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../.. selectName:'', selectId1:'', mobile: getApp().globalData.mobile, - unitName:'' + unitName:'', + peopleNumber:'', } }, onLoad(options){ @@ -516,6 +522,26 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../.. phoneNumber: tel }); }, + getDataDetail(reportPhase,reportUnit,statisticalDate){ + this.$request(getApp().globalData.baseUrl + '/api/biz/roadtransport/road/getDetail?reportPhase=' + reportPhase + '&reportUnit=' + reportUnit + '&statisticalDate=' + statisticalDate,{},"GET").then(res =>{ + res.data.reportPhase = this.roadData.reportPhase; + res.data.reportingUnitId = this.roadData.reportingUnitId; + res.data.statisticalDate = this.roadData.statisticalDate; + this.roadData = res.data; + console.log('peopleList =====>',this.peopleList) + this.peopleName = '' + this.peopleNumber = '' + if(this.roadData.responsiblePersonId){ + let tmp = this.peopleList.find(item => item.id == this.roadData.responsiblePersonId) + this.peopleIndex = this.peopleList.findIndex(item => item.id == this.roadData.responsiblePersonId) <= -1 + ? '' : this.peopleList.findIndex(item => item.id == this.roadData.responsiblePersonId) + console.log('peopleIndex ===>',this.peopleIndex) + this.peopleName = tmp ? tmp.people.split(',')[0] : '' + this.peopleNumber = tmp ? tmp.people.split(',')[1] : this.roadData.contactNumber + } + this.getRatio(); + }) + }, // 计算包车数 calcBusNum(){ let capacityShuttle = checkNotEmpty(this.roadData.capacityShuttle) ? parseInt(this.roadData.capacityShuttle) : 0; @@ -594,10 +620,23 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../.. if(this.pageType == 'edit'){ console.log('deptNameList ===>',this.peopleList) let tmp = this.peopleList.find(item => item.id == this.roadData.responsiblePersonId) - this.peopleIndex = this.peopleList.findIndex(item => item.id == this.roadData.responsiblePersonId) <= -1 ? '' : this.peopleList.findIndex(item => item.id == this.roadData.responsiblePersonId) + this.peopleIndex = this.peopleList.findIndex(item => item.id == this.roadData.responsiblePersonId) <= -1 + ? '' : this.peopleList.findIndex(item => item.id == this.roadData.responsiblePersonId) console.log('peopleIndex ===>',this.peopleIndex) - this.peopleName = tmp ? tmp.people : '' + this.roadData.contactNumber - + // this.peopleName = tmp ? tmp.people : '' + this.roadData.contactNumber + this.peopleName = tmp ? tmp.people.split(',')[0] : '' + this.peopleNumber = tmp ? tmp.people.split(',')[1] : this.roadData.contactNumber + }else{ + console.log('responsiblePersonId =====>',this.roadData.responsiblePersonId) + if(this.roadData.responsiblePersonId){ + let tmp = this.peopleList.find(item => item.id == this.roadData.responsiblePersonId) + this.peopleIndex = this.peopleList.findIndex(item => item.id == this.roadData.responsiblePersonId) <= -1 + ? '' : this.peopleList.findIndex(item => item.id == this.roadData.responsiblePersonId) + console.log('peopleIndex ===>',this.peopleIndex) + // this.peopleName = tmp ? tmp.people : '' + this.roadData.contactNumber + this.peopleName = tmp ? tmp.people.split(',')[0] : '' + this.peopleNumber = tmp ? tmp.people.split(',')[1] : this.roadData.contactNumber + } } }) @@ -616,7 +655,6 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../.. this.roadData.reportingUnitIdIndex = this.deptNameList.length > 0 ? 0 : ''; this.selectId1 = this.unitId; this.getRoadTime() - this.getPeople() }else if(this.pageType == 'edit'){ console.log('reportingUnitId===>',this.roadData.reportingUnitId) console.log('treeData ==>',this.treeData) @@ -683,7 +721,9 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../.. //选择统计日期 bindDateChange(e) { this.roadData.statisticalDate = e.detail.value; - this.getRatio() + console.log('统计单位 ======>',this.roadData.reportingUnitId,'统计日期 ======>',this.roadData.statisticalDate,'统计时段=====>',this.roadData.reportPhase) + // this.getRatio() + this.getDataDetail(this.roadData.reportPhase,this.roadData.reportingUnitId,e.detail.value) }, // 确定选择人员 bindPeoChange(e){ @@ -691,8 +731,11 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../.. let index = e.target.value //取其下标 var selected = this.peopleList[index] //获取选中的数组 this.roadData.responsiblePersonId = selected.id; - this.peopleName = selected.people; - this.roadData.contactNumber = this.peopleName.split(',')[1]; + // this.peopleName = selected.people; + console.log('selected =====>',selected) + this.roadData.contactNumber = selected.people.split(',')[1]; + this.peopleName = selected.people.split(',')[0]; + this.peopleNumber = selected.people.split(',')[1]; }, // 确认修改道路运输数据 confirmRoad(){ @@ -715,7 +758,7 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../.. success:(res) =>{ if(res.confirm){ params.isPassengerCountConvert = 0; - console.log(params) + console.log('params =======>',params) this.$request(getApp().globalData.baseUrl + '/api/biz/roadtransport/road/saveOrUpdate',params,'POST').then(res =>{ if(res.code == 200){ uni.showToast({ @@ -786,6 +829,7 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../.. res.data.reportingUnitId = this.roadData.reportingUnitId; res.data.statisticalDate = this.roadData.statisticalDate; this.roadData = res.data; + this.getPeople() }) this.getRatio() } @@ -819,13 +863,15 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../.. }) }, - // 选中时段数据 + // 选中统计时段数据 bindPickerChange(e){ let index = e.target.value //取其下标 var selected = this.roadTime[index] //获取选中的数组 this.roadData.reportPhase = selected.dictValue; this.timeName = selected.dictLabel; - this.getRatio() + // this.getRatio() + console.log('统计单位 ======>',this.roadData.reportingUnitId,'统计日期 ======>',this.roadData.statisticalDate,'统计时段=====>',this.roadData.reportPhase) + this.getDataDetail(this.roadData.reportPhase,this.roadData.reportingUnitId,this.roadData.statisticalDate) }, formatDigit(data) { return (data+'').indexOf('.') > -1 && (data+'').substring((data+'').indexOf('.')).length > 2 ? data.toFixed(2) : data; @@ -927,7 +973,7 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../.. .left{ // margin-left: 30rpx; - min-width: 320rpx; + min-width: 300rpx; color: #666; font-size: 26rpx; diff --git a/static/.DS_Store b/static/.DS_Store deleted file mode 100644 index 6e3c60e..0000000 Binary files a/static/.DS_Store and /dev/null differ diff --git a/static/image/.DS_Store b/static/image/.DS_Store deleted file mode 100644 index 5008ddf..0000000 Binary files a/static/image/.DS_Store and /dev/null differ diff --git a/static/image/airport.png b/static/image/airport.png index 12e1e02..eaa437b 100644 Binary files a/static/image/airport.png and b/static/image/airport.png differ diff --git a/static/image/bus.png b/static/image/bus.png index 6000973..deaee3b 100644 Binary files a/static/image/bus.png and b/static/image/bus.png differ diff --git a/static/image/bus01.png b/static/image/bus01.png deleted file mode 100644 index 888c344..0000000 Binary files a/static/image/bus01.png and /dev/null differ diff --git a/static/image/bus1.png b/static/image/bus1.png new file mode 100644 index 0000000..6000973 Binary files /dev/null and b/static/image/bus1.png differ diff --git a/static/image/highway.png b/static/image/highway.png index ddc1e65..a67b0a3 100644 Binary files a/static/image/highway.png and b/static/image/highway.png differ diff --git a/static/image/highway01.png b/static/image/highway01.png index ca403d3..1f47be5 100644 Binary files a/static/image/highway01.png and b/static/image/highway01.png differ diff --git a/static/image/loginBg.png b/static/image/loginBg.png index 90ca486..0ed0b0a 100644 Binary files a/static/image/loginBg.png and b/static/image/loginBg.png differ diff --git a/static/image/portShipping.png b/static/image/portShipping.png index ae7de5f..f9b877c 100644 Binary files a/static/image/portShipping.png and b/static/image/portShipping.png differ diff --git a/static/image/railway.png b/static/image/railway.png index 1441140..94096de 100644 Binary files a/static/image/railway.png and b/static/image/railway.png differ