From 690daa2855d816f0efa5b98d429c58615e73132c Mon Sep 17 00:00:00 2001 From: weicw <594098497@qq.com> Date: Wed, 11 Aug 2021 18:26:48 +0800 Subject: [PATCH] 6654 --- src/views/sound/function/collect/index.vue | 8 +- .../sound/function/collect/noise-bill.vue | 15 +- .../sound/function/collect/place-bill.vue | 12 +- src/views/sound/function/collect/place.vue | 28 +- src/views/sound/road/collect/noise-bill.vue | 21 +- src/views/sound/road/collect/noise.vue | 5 + src/views/sound/road/collect/place-bill.vue | 18 +- src/views/sound/road/collect/place.vue | 5 + src/views/sound/zone/index.vue | 407 ---------------- src/views/sound/zone/table.vue | 459 ------------------ src/views/sound/zone/utils.js | 37 -- 11 files changed, 69 insertions(+), 946 deletions(-) delete mode 100644 src/views/sound/zone/index.vue delete mode 100644 src/views/sound/zone/table.vue delete mode 100644 src/views/sound/zone/utils.js diff --git a/src/views/sound/function/collect/index.vue b/src/views/sound/function/collect/index.vue index 8ace682..181d30d 100644 --- a/src/views/sound/function/collect/index.vue +++ b/src/views/sound/function/collect/index.vue @@ -95,10 +95,10 @@ // 上传到服务器 Promise.all(tasks).then(() => { - this.$refs.noise.reload(); - this.$refs.place.reload(); - }).catch(() => { - this.$message.error("表格格式有误，请检查后重新上传！"); + this.$refs.noise&&this.$refs.noise.reload(); + this.$refs.noise&&this.$refs.place.reload(); + }).catch(err=>{ + console.log(err); }) // console.log(billData); }; diff --git a/src/views/sound/function/collect/noise-bill.vue b/src/views/sound/function/collect/noise-bill.vue index ffe0b47..cfedbe0 100644 --- a/src/views/sound/function/collect/noise-bill.vue +++ b/src/views/sound/function/collect/noise-bill.vue @@ -72,10 +72,14 @@ 查看 - + 审核 + + 撤回 + 删除 @@ -230,13 +234,14 @@ this.editableData[record.functionNoiseBillId].reportTime = moment(this.editableData[record.functionNoiseBillId] .reportTime) }, - verify(record) { + verify(record,checked) { const hide = this.$message.loading('请求中..', 0); verifyFunctionNoiseBill({ - functionNoiseBillId: record.functionNoiseBillId + functionNoiseBillId: record.functionNoiseBillId, + checked }).then(res => { if (res.data.code == 0) { - record.checked = 1 + record.checked = checked this.$message.success(res.data.msg); } else { this.$message.error(res.data.msg); diff --git a/src/views/sound/function/collect/place-bill.vue b/src/views/sound/function/collect/place-bill.vue index f2d38a4..135e385 100644 --- a/src/views/sound/function/collect/place-bill.vue +++ b/src/views/sound/function/collect/place-bill.vue @@ -73,9 +73,12 @@ 查看 + @confirm="verify(record,1)"> 审核 + + 撤回 + 删除 @@ -228,13 +231,14 @@ this.editableData[record.functionPlaceBillId].reportTime = moment(this.editableData[record.functionPlaceBillId] .reportTime) }, - verify(record) { + verify(record, checked) { const hide = this.$message.loading('请求中..', 0); verifyFunctionPlaceBill({ - functionPlaceBillId: record.functionPlaceBillId + functionPlaceBillId: record.functionPlaceBillId, + checked }).then(res => { if (res.data.code == 0) { - record.checked = 1 + record.checked = checked this.$message.success(res.data.msg); } else { this.$message.error(res.data.msg); diff --git a/src/views/sound/function/collect/place.vue b/src/views/sound/function/collect/place.vue index d97255d..d15c3a9 100644 --- a/src/views/sound/function/collect/place.vue +++ b/src/views/sound/function/collect/place.vue @@ -178,6 +178,7 @@ dataIndex: 'place', sorter: true }, + { title: '测点经度', dataIndex: 'placeLng', @@ -188,19 +189,9 @@ dataIndex: 'placeLat', sorter: true }, - { - title: '机动车车道数', - dataIndex: 'motorway', - sorter: true - }, - { - title: '车道类别', - dataIndex: 'motorwayType', - sorter: true - }, - { - title: '道路等级', - dataIndex: 'motorwayLevel', + { + title: '测点高度', + dataIndex: 'placeHeight', sorter: true }, { @@ -208,14 +199,9 @@ dataIndex: 'refObj', sorter: true }, - { - title: '道路覆盖人口（万人）', - dataIndex: 'people', - sorter: true - }, - { - title: '监测站名', - dataIndex: 'station', + { + title: '功能区代码', + dataIndex: 'functionCode', sorter: true }, { diff --git a/src/views/sound/road/collect/noise-bill.vue b/src/views/sound/road/collect/noise-bill.vue index 8dedf47..15d2c2b 100644 --- a/src/views/sound/road/collect/noise-bill.vue +++ b/src/views/sound/road/collect/noise-bill.vue @@ -72,10 +72,14 @@ 查看 - + 审核 + + 撤回 + 删除 @@ -171,6 +175,12 @@ customRender: 'checked', }, + }, + { + title: '创建人', + dataIndex: 'username', + sorter: true, + }, // { // title: '更新时间', @@ -231,13 +241,14 @@ this.editableData[record.roadNoiseBillId].reportTime = moment(this.editableData[record.roadNoiseBillId] .reportTime) }, - verify(record) { + verify(record,checked) { const hide = this.$message.loading('请求中..', 0); verifyRoadNoiseBill({ - roadNoiseBillId: record.roadNoiseBillId + roadNoiseBillId: record.roadNoiseBillId, + checked }).then(res => { if (res.data.code == 0) { - record.checked = 1 + record.checked = checked this.$message.success(res.data.msg); } else { this.$message.error(res.data.msg); diff --git a/src/views/sound/road/collect/noise.vue b/src/views/sound/road/collect/noise.vue index b6e0019..260f968 100644 --- a/src/views/sound/road/collect/noise.vue +++ b/src/views/sound/road/collect/noise.vue @@ -299,6 +299,11 @@ title: 'LmaxdB(A)', dataIndex: 'indexLmax', sorter: true + }, + { + title: '创建人', + dataIndex: 'username', + sorter: true }, { title: '操作', diff --git a/src/views/sound/road/collect/place-bill.vue b/src/views/sound/road/collect/place-bill.vue index e879e6d..f9823c0 100644 --- a/src/views/sound/road/collect/place-bill.vue +++ b/src/views/sound/road/collect/place-bill.vue @@ -73,9 +73,12 @@ 查看 + @confirm="verify(record,1)"> 审核 + + 撤回 + 删除 @@ -169,6 +172,12 @@ customRender: 'checked', }, + }, + { + title: '创建人', + dataIndex: 'username', + sorter: true, + }, // { // title: '更新时间', @@ -229,13 +238,14 @@ this.editableData[record.roadPlaceBillId].reportTime = moment(this.editableData[record.roadPlaceBillId] .reportTime) }, - verify(record) { + verify(record, checked) { const hide = this.$message.loading('请求中..', 0); verifyRoadPlaceBill({ - roadPlaceBillId: record.roadPlaceBillId + roadPlaceBillId: record.roadPlaceBillId, + checked }).then(res => { if (res.data.code == 0) { - record.checked = 1 + record.checked = checked this.$message.success(res.data.msg); } else { this.$message.error(res.data.msg); diff --git a/src/views/sound/road/collect/place.vue b/src/views/sound/road/collect/place.vue index 33c0497..2c1d101 100644 --- a/src/views/sound/road/collect/place.vue +++ b/src/views/sound/road/collect/place.vue @@ -248,6 +248,11 @@ title: '声校准仪器编号', dataIndex: 'soundInstrumentCode', sorter: true + }, + { + title: '创建人', + dataIndex: 'username', + sorter: true }, { title: '操作', diff --git a/src/views/sound/zone/index.vue b/src/views/sound/zone/index.vue deleted file mode 100644 index b19928e..0000000 --- a/src/views/sound/zone/index.vue +++ /dev/null @@ -1,407 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/sound/zone/table.vue b/src/views/sound/zone/table.vue deleted file mode 100644 index 1734a7e..0000000 --- a/src/views/sound/zone/table.vue +++ /dev/null @@ -1,459 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/sound/zone/utils.js b/src/views/sound/zone/utils.js deleted file mode 100644 index c69b8ff..0000000 --- a/src/views/sound/zone/utils.js +++ /dev/null @@ -1,37 +0,0 @@ -export default { - toObjData(excelData) { - return excelData.map(item => { - const monitorTime = new Date(); - monitorTime.setFullYear(item[0]); - monitorTime.setMonth(item[10]-1); - monitorTime.setDate(item[11]); - monitorTime.setHours(item[12]); - monitorTime.setMinutes(item[13]); - return { - monitorYear: item[0], - place: item[1], - placeCode: item[2], - road: item[3], - area: item[4], - roadLength: item[5], - roadWidth: item[6], - smallTrafficFlow: item[7], - largeTrafficFlow: item[7], - timeSlot: item[9], - monitorMonth: item[10], - monitorDay: item[11], - monitorHour: item[12], - monitorMinute: item[13], - monitorTime: monitorTime.getTime(), - indexLeq: item[14], - indexSd: item[15], - indexL10: item[16], - indexL50: item[17], - indexL90: item[18], - indexLmin: item[19], - indexLmax: item[20], - } - }) - - } -} \ No newline at end of file