diff --git a/public/template/专项湖库数据报送表.xlsx b/public/template/专项湖库数据报送表.xlsx
new file mode 100644
index 0000000..af09d64
Binary files /dev/null and b/public/template/专项湖库数据报送表.xlsx differ
diff --git a/public/template/五象湖水质监测报告表.xlsx b/public/template/五象湖水质监测报告表.xlsx
new file mode 100644
index 0000000..27d45d3
Binary files /dev/null and b/public/template/五象湖水质监测报告表.xlsx differ
diff --git a/public/template/其它内湖水质监测报告表.xls b/public/template/其它内湖水质监测报告表.xls
new file mode 100644
index 0000000..4bb0616
Binary files /dev/null and b/public/template/其它内湖水质监测报告表.xls differ
diff --git a/src/views/sound/road/trend/index.vue b/src/views/sound/road/trend/index.vue
index 505e8fb..d9b47c4 100644
--- a/src/views/sound/road/trend/index.vue
+++ b/src/views/sound/road/trend/index.vue
@@ -29,6 +29,13 @@
+
+
+
+ {{ item.label }}
+
+
+
@@ -70,10 +77,12 @@
areaList: ['南宁市'],
placeList: [],
regionLevel: '市级', // 区域等级
+ timeSlot: '昼',
xco: '年度' // 横坐标
},
trendData: [],
regionLevelOptions: [],
+ timeSlotOptions: [],
placeOptions: [],
areaOptions: [],
yearOptions: [],
@@ -112,6 +121,14 @@
};
});
});
+ getColumnOptions("time_slot").then((res) => {
+ this.timeSlotOptions = res.data.data.map((item) => {
+ return {
+ label: item,
+ value: item,
+ };
+ });
+ });
this.getArea()
this.getPlace('市级')
},
@@ -136,6 +153,7 @@
value: item.dictDataName,
};
});
+ this.areaOptions.unshift({ label: '所有县', value: '所有县'})
})
},
// 测点名称下拉列表
diff --git a/src/views/sound/zone/trend/index.vue b/src/views/sound/zone/trend/index.vue
index 96db22c..5ff9562 100644
--- a/src/views/sound/zone/trend/index.vue
+++ b/src/views/sound/zone/trend/index.vue
@@ -153,6 +153,7 @@
value: item.dictDataName,
};
});
+ this.areaOptions.unshift({ label: '所有县', value: '所有县'})
})
},
// 测点名称下拉列表
diff --git a/src/views/water/drinking-water-village/collect/water-bill.vue b/src/views/water/drinking-water-village/collect/water-bill.vue
index 1398ce2..4cb7807 100644
--- a/src/views/water/drinking-water-village/collect/water-bill.vue
+++ b/src/views/water/drinking-water-village/collect/water-bill.vue
@@ -7,33 +7,60 @@
+
市级
县级
+
+
已审核
未审核
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
查询
重置
+
@@ -248,12 +275,12 @@
/* 刷新表格 */
reload() {
- this.where.reportTimeStart = null;
- this.where.reportTimeEnd = null;
- if (this.reportTimeScope && this.reportTimeScope.length == 2) {
- this.where.reportTimeStart = this.reportTimeScope[0].format("Y-M-D H:m:s")
- this.where.reportTimeEnd = this.reportTimeScope[1].format("Y-M-D H:m:s")
- }
+ // this.where.reportTimeStart = null;
+ // this.where.reportTimeEnd = null;
+ // if (this.reportTimeScope && this.reportTimeScope.length == 2) {
+ // this.where.reportTimeStart = this.reportTimeScope[0].format("Y-M-D H:m:s")
+ // this.where.reportTimeEnd = this.reportTimeScope[1].format("Y-M-D H:m:s")
+ // }
this.$refs.table.reload({
where: this.where
});
@@ -388,6 +415,9 @@