diff --git a/src/views/sound/road/collect/noise-bill.vue b/src/views/sound/road/collect/noise-bill.vue
index a8ffb3d..8d5a11f 100644
--- a/src/views/sound/road/collect/noise-bill.vue
+++ b/src/views/sound/road/collect/noise-bill.vue
@@ -139,10 +139,9 @@
},
{
- title: '行政等级',
+ title: '区域等级',
dataIndex: 'regionLevel',
sorter: true,
-
},
{
title: '条目',
diff --git a/src/views/sound/road/collect/noise.vue b/src/views/sound/road/collect/noise.vue
index d9b07b9..461aeeb 100644
--- a/src/views/sound/road/collect/noise.vue
+++ b/src/views/sound/road/collect/noise.vue
@@ -10,11 +10,10 @@
-
+
{{ item.label }}
@@ -22,11 +21,10 @@
-
+
{{ item.label }}
@@ -34,11 +32,10 @@
-
+
{{ item.label }}
@@ -379,6 +376,15 @@
/>
+
+
+
+
+
@@ -643,6 +649,16 @@ export default {
dataIndex: "soundInstrumentCode",
sorter: true,
},
+ {
+ title: "区域等级",
+ dataIndex: "regionLevel",
+ sorter: true,
+ },
+ {
+ title: "备注",
+ dataIndex: "remark",
+ sorter: true,
+ },
{
title: "创建人",
dataIndex: "username",
diff --git a/src/views/sound/road/statistic/base.vue b/src/views/sound/road/statistic/base.vue
index 361f1f9..159887b 100644
--- a/src/views/sound/road/statistic/base.vue
+++ b/src/views/sound/road/statistic/base.vue
@@ -9,12 +9,22 @@
>
-
-
+
+
{{ item.label }}
+
+
+
+
+
+
+ {{ item.label }}
@@ -22,11 +32,10 @@
-
+
{{ item.label }}
@@ -34,11 +43,10 @@
-
+
{{ item.label }}
@@ -266,6 +274,16 @@ export default {
title: "声校准仪器编号",
dataIndex: "soundInstrumentCode",
sorter: true,
+ },
+ {
+ title: "区域等级",
+ dataIndex: "regionLevel",
+ sorter: true,
+ },
+ {
+ title: "备注",
+ dataIndex: "remark",
+ sorter: true,
},
{
title: "创建人",
@@ -276,6 +294,7 @@ export default {
palceOptions: [],
areaOptions: [],
roadOptions: [],
+ regionLevelOptions: [],
// 表格搜索条件
where: {
checked: 1,
@@ -314,6 +333,14 @@ export default {
};
});
});
+ getColumnOptions("region_level").then((res) => {
+ this.regionLevelOptions = res.data.data.map((item) => {
+ return {
+ label: item,
+ value: item,
+ };
+ });
+ });
},
/* 刷新表格 */
reload() {
@@ -332,6 +359,11 @@ export default {
},
exportFile() {
const columns = [
+ {
+ title: "行政区划代码",
+ dataIndex: "regionCode",
+ sorter: true,
+ },
{
title: "监测年度",
dataIndex: "monitorYear",
@@ -391,6 +423,11 @@ export default {
title: "测点参照物",
dataIndex: "refObj",
sorter: true,
+ },
+ {
+ title: "路段覆盖人口(万人)",
+ dataIndex: "people",
+ sorter: true,
},
{
title: "月",
@@ -495,16 +532,22 @@ export default {
dataIndex: "soundInstrumentCode",
sorter: true,
},
+ {
+ title: "区域等级",
+ dataIndex: "regionLevel",
+ sorter: true,
+ },
+ {
+ title: "备注",
+ dataIndex: "remark",
+ sorter: true,
+ },
];
const arr = [];
const th = columns.map((item) => item.title);
- th.unshift("行政区划代码");
- th.push("备注");
arr.push(th);
this.data.forEach((d) => {
const td = columns.map((item) => d[item.dataIndex]);
- td.unshift("")
- // td.push("备注")
arr.push(td);
});
let sheet = XLSX.utils.aoa_to_sheet(arr);