From 9d999dbe131c5e1feb27d63ed629ad01de9c8390 Mon Sep 17 00:00:00 2001
From: 710356044 <710356044@qq.com>
Date: Fri, 26 Nov 2021 21:53:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A5=AE=E7=94=A8=E6=B0=B4=E7=BB=9F=E8=AE=A1?=
=?UTF-8?q?=E5=88=86=E6=9E=90-=E5=8E=9F=E5=A7=8B=E6=95=B0=E6=8D=AE=20?=
=?UTF-8?q?=E6=9D=BF=E5=9D=97=20=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/ecology/drinking-water-dict.js | 85 +++-
src/api/ecology/drinking-water-village.js | 6 +-
src/api/ecology/drinking-water.js | 4 +
.../dict/countyBottomWaterDict.vue | 387 ++++++++++++++++++
.../dict/countyTopWaterDict.vue | 386 +++++++++++++++++
src/views/water/drinking-water/dict/index.vue | 21 +-
src/views/water/drinking-water/dict/place.vue | 8 +-
.../water/drinking-water/dict/villageDict.vue | 383 +++++++++++++++++
.../water/drinking-water/statistic/base.vue | 16 +-
.../water/drinking-water/statistic/colums.js | 250 ++++++++++-
.../drinking-water/statistic/countyData.vue | 228 +++++++++++
.../water/drinking-water/statistic/index.vue | 17 +-
.../drinking-water/statistic/villageData.vue | 228 +++++++++++
13 files changed, 1987 insertions(+), 32 deletions(-)
create mode 100644 src/views/water/drinking-water/dict/countyBottomWaterDict.vue
create mode 100644 src/views/water/drinking-water/dict/countyTopWaterDict.vue
create mode 100644 src/views/water/drinking-water/dict/villageDict.vue
create mode 100644 src/views/water/drinking-water/statistic/countyData.vue
create mode 100644 src/views/water/drinking-water/statistic/villageData.vue
diff --git a/src/api/ecology/drinking-water-dict.js b/src/api/ecology/drinking-water-dict.js
index 16c24a8..b45dc47 100644
--- a/src/api/ecology/drinking-water-dict.js
+++ b/src/api/ecology/drinking-water-dict.js
@@ -1,5 +1,5 @@
import axios from 'axios';
-// ----------------------列表-----------------------
+// ----------------------市级字典列表-----------------------
const pageDictUrl = '/drinkingWater/drinkingWaterDict';
const listAllUrl = pageDictUrl + "";
@@ -29,7 +29,68 @@ const copyBatchPlace = function (data){
return axios.post("/drinkingWater/drinkingWaterDict/copyBatch",data)
}
+// ----------------------县级地表水字典列表-----------------------
+const pageCountyDictUrl = '/drinkingWater/drinkingWaterCountyDict';
+const listCountyAllUrl = pageCountyDictUrl + "";
+
+// 添加
+const saveDrinkingWaterCountyDict = function (data) {
+ return axios.post("/drinkingWater/drinkingWaterCountyDict/",data)
+}
+
+// 删除
+const removeDrinkingWaterCountyDict = function (id) {
+ return axios.delete(`/drinkingWater/drinkingWaterCountyDict/${id}`,)
+}
+// 批量删除
+const removeBatchDrinkingWaterCountyDict = function (ids) {
+ return axios.delete("/drinkingWater/drinkingWaterCountyDict/batch",{data:ids})
+}
+
+// 修改
+const updateDrinkingWaterCountyDict = function (data) {
+ return axios.put("/drinkingWater/drinkingWaterCountyDict",data)
+}
+
+const getCountyColumnOptions = function(column){
+ return axios.get("/drinkingWater/drinkingWaterCountyDict/options",{params:{column}})
+}
+const copyBatchCountyPlace = function (data){
+ return axios.post("/drinkingWater/drinkingWaterCountyDict/copyBatch",data)
+}
+
+// ----------------------县级地下水字典列表-----------------------
+const pageCountyBottomDictUrl = '/drinkingWater/drinkingWaterCountyBottomDict';
+const listCountyBottomAllUrl = pageCountyBottomDictUrl + "";
+
+// 添加
+const saveDrinkingWaterCountyBottomDict = function (data) {
+ return axios.post("/drinkingWater/drinkingWaterCountyBottomDict/",data)
+}
+
+// 删除
+const removeDrinkingWaterCountyBottomDict = function (id) {
+ return axios.delete(`/drinkingWater/drinkingWaterCountyBottomDict/${id}`,)
+}
+// 批量删除
+const removeBatchDrinkingWaterCountyBottomDict = function (ids) {
+ return axios.delete("/drinkingWater/drinkingWaterCountyBottomDict/batch",{data:ids})
+}
+
+// 修改
+const updateDrinkingWaterCountyBottomDict = function (data) {
+ return axios.put("/drinkingWater/drinkingWaterCountyBottomDict",data)
+}
+
+const getCountyBottomColumnOptions = function(column){
+ return axios.get("/drinkingWater/drinkingWaterCountyBottomDict/options",{params:{column}})
+}
+const copyBatchCountyBottomPlace = function (data){
+ return axios.post("/drinkingWater/drinkingWaterCountyBottomDict/copyBatch",data)
+}
+
export {
+ //市级
pageDictUrl,
listAllUrl,
saveDrinkingWaterDict,
@@ -37,5 +98,25 @@ export {
removeBatchDrinkingWaterDict,
updateDrinkingWaterDict,
getColumnOptions,
- copyBatchPlace
+ copyBatchPlace,
+ // 县级地表水
+ pageCountyDictUrl,
+ listCountyAllUrl,
+ saveDrinkingWaterCountyDict,
+ removeDrinkingWaterCountyDict,
+ removeBatchDrinkingWaterCountyDict,
+ updateDrinkingWaterCountyDict,
+ getCountyColumnOptions,
+ copyBatchCountyPlace,
+ //
+ pageCountyBottomDictUrl,
+ listCountyBottomAllUrl,
+ saveDrinkingWaterCountyBottomDict,
+ removeDrinkingWaterCountyBottomDict,
+ removeBatchDrinkingWaterCountyBottomDict,
+ updateDrinkingWaterCountyBottomDict,
+ getCountyBottomColumnOptions,
+ copyBatchCountyBottomPlace
+ //农村
+
}
\ No newline at end of file
diff --git a/src/api/ecology/drinking-water-village.js b/src/api/ecology/drinking-water-village.js
index f992679..8677b2f 100644
--- a/src/api/ecology/drinking-water-village.js
+++ b/src/api/ecology/drinking-water-village.js
@@ -54,8 +54,8 @@ const updateDrinkingWaterVillage = function (data) {
// -------------------------统计---------------------
-const pageDrinkingWaterVillageStatisticUrl = '/drinkingWaterVillage/drinkingWaterVillage/statistic';
-const pageDrinkingWaterVillageCompare = '/drinkingWaterVillage/drinkingWaterVillage/statistic/compare';
+const pageDrinkingWaterVillageStatisticUrl = '/drinkingWaterVillage/drinkingWaterVillage/VillageAnalysePage';
+// const pageDrinkingWaterVillageCompare = '/drinkingWaterVillage/drinkingWaterVillage/statistic/compare';
const getHistoryyears = function () {
return axios.get("/drinkingWaterVillage/drinkingWaterVillage/history-year")
}
@@ -85,7 +85,7 @@ export {
removeBatchDrinkingWaterVillage,
pageDrinkingWaterVillageStatisticUrl,
getHistoryyears,
- pageDrinkingWaterVillageCompare,
+ // pageDrinkingWaterVillageCompare,
getColumnOptions,
listAll,
getGisBase,
diff --git a/src/api/ecology/drinking-water.js b/src/api/ecology/drinking-water.js
index 1ad0fdb..16d5146 100644
--- a/src/api/ecology/drinking-water.js
+++ b/src/api/ecology/drinking-water.js
@@ -58,7 +58,10 @@ const updateWaterWithdrawal=function(data){
// -------------------------统计---------------------
+//市级原始数据
const pageDrinkingWaterStatisticUrl = '/drinkingWater/drinkingWater/AnalysePage';
+//县级原始数据
+const pageDrinkingWaterCountyStatisticUrl='/drinkingWater/drinkingWater/CountyAnalysePage'
// const pageDrinkingWaterCompare = '/drinkingWater/drinkingWater/statistic/compare';
const getHistoryyears = function () {
return axios.get("/drinkingWater/drinkingWater/history-year")
@@ -88,6 +91,7 @@ export {
updateDrinkingWater,
removeBatchDrinkingWater,
pageDrinkingWaterStatisticUrl,
+ pageDrinkingWaterCountyStatisticUrl,
getHistoryyears,
// pageDrinkingWaterCompare,
getColumnOptions,
diff --git a/src/views/water/drinking-water/dict/countyBottomWaterDict.vue b/src/views/water/drinking-water/dict/countyBottomWaterDict.vue
new file mode 100644
index 0000000..5484a58
--- /dev/null
+++ b/src/views/water/drinking-water/dict/countyBottomWaterDict.vue
@@ -0,0 +1,387 @@
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+
+ {{ item.label }}
+
+
+
+
+ 批量复制
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+ 修改
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+ 查询
+ 重置
+ 按年份导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+
+ {{ item.label }}
+
+
+
+
+ 批量复制
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+ 修改
+
+ 删除
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
@@ -22,13 +31,17 @@
*/
// import LeqLevel from "./surface-water"
import Place from "./place"
-
-
+import countyTopWaterDict from "./countyTopWaterDict.vue"
+import countyBottomWaterDict from "./countyBottomWaterDict.vue"
+import villageDict from "./villageDict.vue"
export default {
name: 'DrinkingWaterDictIndex',
components: {
// LeqLevel,
- Place
+ Place,
+ countyTopWaterDict,
+ countyBottomWaterDict,
+ villageDict
},
data() {
return {
diff --git a/src/views/water/drinking-water/dict/place.vue b/src/views/water/drinking-water/dict/place.vue
index de66726..45176f0 100644
--- a/src/views/water/drinking-water/dict/place.vue
+++ b/src/views/water/drinking-water/dict/place.vue
@@ -309,10 +309,10 @@ export default {
form: {},
loading: false,
rules: {
- year: [{required: true, message: '请输入年份'}],
- sourceWaterName:[{required: true,message: '请选择水源名称'}],
- longitude: [{required: true,message: '请输入经度',},],
- latitude: [{required: true,message: '请输入纬度',},],
+ // year: [{required: true, message: '请输入年份'}],
+ // sourceWaterName:[{required: true,message: '请选择水源名称'}],
+ // longitude: [{required: true,message: '请输入经度',},],
+ // latitude: [{required: true,message: '请输入纬度',},],
},
yearOptions: [],
showNYear:false,
diff --git a/src/views/water/drinking-water/dict/villageDict.vue b/src/views/water/drinking-water/dict/villageDict.vue
new file mode 100644
index 0000000..60048fa
--- /dev/null
+++ b/src/views/water/drinking-water/dict/villageDict.vue
@@ -0,0 +1,383 @@
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+ 查询
+ 重置
+ 按年份导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+
+ {{ item.label }}
+
+
+
+
+ 批量复制
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+ 修改
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+ 导出Excel
+
+
+
+
+
+
+
+
+
+
+ {{
+ record.reportTime==null? text="":
+ record.reportTime.substr(5,2)=="01" || record.reportTime.substr(5,2) == "02" ||record.reportTime.substr(5,2) == "03" ||record.reportTime.substr(5,2)=="12"
+ ? text="K":
+ record.reportTime.substr(5,2)=="04" || record.reportTime.substr(5,2) == "05" ||record.reportTime.substr(5,2)=="10"||record.reportTime.substr(5,2)=="11"
+ ? text="P":
+ record.reportTime.substr(5,2)=="06" || record.reportTime.substr(5,2) == "07" ||record.reportTime.substr(5,2)=="08"||record.reportTime.substr(5,2)=="09"
+ ? text="F":text="无采样时间"
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询3
+ 重置
+ 导出Excel
+
+
+
+
+
+
+
+
+
+
+ {{
+ record.monitorTime==null? text="":
+ record.monitorTime.substr(5,2)=="01" || record.monitorTime.substr(5,2) == "02" ||record.monitorTime.substr(5,2) == "03" ||record.monitorTime.substr(5,2)=="12"
+ ? text="K":
+ record.monitorTime.substr(5,2)=="04" || record.monitorTime.substr(5,2) == "05" ||record.monitorTime.substr(5,2)=="10"||record.monitorTime.substr(5,2)=="11"
+ ? text="P":
+ record.monitorTime.substr(5,2)=="06" || record.monitorTime.substr(5,2) == "07" ||record.monitorTime.substr(5,2)=="08"||record.monitorTime.substr(5,2)=="09"
+ ? text="F":text="无采样时间"
+ }}
+
+
+
+
+