@@ -106,15 +106,15 @@
import { Modal } from 'ant-design-vue';
import {
pageBillUrl,
- // saveZoneNoiseBill,
- removeZoneNoiseBill,
- removeBatchZoneNoiseBill,
- updateZoneNoiseBill,
- verifyZoneNoiseBill
- } from "@/api/ecology/zone-sound";
+ // saveRainBill,
+ removeAcidRainBill,
+ removeBatchAcidRainBill,
+ updateAcidRainBill,
+ verifyAcidRainBill
+ } from "@/api/ecology/acid";
import moment from "moment";
export default {
- name: 'ZoneCollectNoiseBill',
+ name: 'RainCollectNoiseBill',
components: {
CheckOutlined,
EditOutlined
@@ -144,11 +144,11 @@
},
},
- {
- title: '区域等级',
- dataIndex: 'regionLevel',
- sorter: true,
- },
+ // {
+ // title: '区域等级',
+ // dataIndex: 'regionLevel',
+ // sorter: true,
+ // },
{
title: '条目',
dataIndex: 'recordSize',
@@ -160,17 +160,17 @@
// dataIndex: 'title',
// sorter: true
// },
- {
- title: '上报时间',
- dataIndex: 'reportTime',
- sorter: true,
- slots: {
- customRender: 'reportTime',
- },
- // customRender: ({
- // text
- // }) => this.$util.toDateString(text)
- },
+ // {
+ // title: '上报时间',
+ // dataIndex: 'reportTime',
+ // sorter: true,
+ // slots: {
+ // customRender: 'reportTime',
+ // },
+ // // customRender: ({
+ // // text
+ // // }) => this.$util.toDateString(text)
+ // },
{
title: '导入时间',
dataIndex: 'createTime',
@@ -190,7 +190,7 @@
},
{
title: '创建人',
- dataIndex: 'username',
+ dataIndex: 'userName',
sorter: true,
},
@@ -245,18 +245,18 @@
},
detail(record) {
this.$router.replace({
- path: "/sound/zone/collect/noise/" + record.zoneNoiseBillId
+ path: "/atmosphere/acid-rain/collect/rain/" + record.acidRainBillId
})
},
edit(record) {
- this.editableData[record.zoneNoiseBillId] = _.cloneDeep(record);
- this.editableData[record.zoneNoiseBillId].reportTime = moment(this.editableData[record.zoneNoiseBillId]
+ this.editableData[record.acidRainBillId] = _.cloneDeep(record);
+ this.editableData[record.acidRainBillId].reportTime = moment(this.editableData[record.acidRainBillId]
.reportTime)
},
verify(record,checked) {
const hide = this.$message.loading('请求中..', 0);
- verifyZoneNoiseBill({
- zoneNoiseBillId: record.zoneNoiseBillId,
+ verifyAcidRainBill({
+ acidRainBillId: record.acidRainBillId,
checked
}).then(res => {
if (res.data.code == 0) {
@@ -280,19 +280,19 @@
save(record) {
let {
- zoneNoiseBillId,
+ acidRainBillId,
billName,
reportTime
- } = this.editableData[record.zoneNoiseBillId];
- if (!zoneNoiseBillId || !reportTime) {
+ } = this.editableData[record.acidRainBillId];
+ if (!acidRainBillId || !reportTime) {
this.$message.error('请填写完整信息再提交')
return
}
const hide = this.$message.loading('请求中..', 0);
reportTime = reportTime.format("x")
reportTime = Number(reportTime)
- updateZoneNoiseBill({
- zoneNoiseBillId,
+ updateAcidRainBill({
+ acidRainBillId,
billName,
reportTime
}).then(res => {
@@ -307,7 +307,7 @@
console.log(e);
this.$message.error(e.message);
}).finally(() => {
- delete this.editableData[record.zoneNoiseBillId]
+ delete this.editableData[record.acidRainBillId]
hide()
})
@@ -315,7 +315,7 @@
/* 删除单个 */
remove(row) {
const hide = this.$message.loading('请求中..', 0);
- removeZoneNoiseBill(row.zoneNoiseBillId).then(res => {
+ removeAcidRainBill(row.acidRainBillId).then(res => {
if (res.data.code === 0) {
this.$message.success(res.data.msg);
this.reload();
@@ -327,9 +327,9 @@
}).finally(() => hide());
},
removeBatch() {
- const ids = this.selectionList.map(item => item.zoneNoiseBillId);
+ const ids = this.selectionList.map(item => item.acidRainBillId);
const hide = this.$message.loading('请求中..', 0);
- removeBatchZoneNoiseBill(ids).then(res => {
+ removeBatchAcidRainBill(ids).then(res => {
if (res.data.code === 0) {
this.$message.success(res.data.msg);
this.reload();
diff --git a/src/views/atmosphere/acid-rain/collect/noise.vue b/src/views/atmosphere/acid-rain/collect/rain.vue
similarity index 51%
rename from src/views/atmosphere/acid-rain/collect/noise.vue
rename to src/views/atmosphere/acid-rain/collect/rain.vue
index d04785a..c59e403 100644
--- a/src/views/atmosphere/acid-rain/collect/noise.vue
+++ b/src/views/atmosphere/acid-rain/collect/rain.vue
@@ -42,7 +42,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{text}}
- {{text}}
- {{text}}
- {{text}}
- {{text}}
- {{text}}
+
+ {{record.area?record.area:record.county?record.county:record.city}}
@@ -333,14 +158,14 @@
+
\ No newline at end of file
diff --git a/src/views/visualiz/sound/road/geojson.json b/src/views/visualiz/sound/road/geojson.json
deleted file mode 100644
index e69de29..0000000
diff --git a/src/views/visualiz/sound/road/index.vue b/src/views/visualiz/sound/road/index.vue
index 09f859b..050c149 100644
--- a/src/views/visualiz/sound/road/index.vue
+++ b/src/views/visualiz/sound/road/index.vue
@@ -1,64 +1,200 @@
-
+
+
+
+
+ {{
+ item.label
+ }}
+
+
+ 点位
+ 城区
+
+
+ 昼
+ 夜
+
+
+
+
-