diff --git a/public/template/县级地下水.xlsx b/public/template/县级地下水.xlsx
new file mode 100644
index 0000000..b7e12e3
Binary files /dev/null and b/public/template/县级地下水.xlsx differ
diff --git a/public/template/县级地表水(在用).xlsm b/public/template/县级地表水(在用).xlsm
new file mode 100644
index 0000000..049eb91
Binary files /dev/null and b/public/template/县级地表水(在用).xlsm differ
diff --git a/public/template/县级地表水(备用).xls b/public/template/县级地表水(备用).xls
new file mode 100644
index 0000000..95e8af1
Binary files /dev/null and b/public/template/县级地表水(备用).xls differ
diff --git a/public/template/市级地表水(在用)导入.xls b/public/template/市级地表水(在用)导入.xls
new file mode 100644
index 0000000..2609791
Binary files /dev/null and b/public/template/市级地表水(在用)导入.xls differ
diff --git a/public/template/市级地表水(备用)导入.xlsx b/public/template/市级地表水(备用)导入.xlsx
new file mode 100644
index 0000000..c8f8233
Binary files /dev/null and b/public/template/市级地表水(备用)导入.xlsx differ
diff --git a/src/api/ecology/drinking-water-dict.js b/src/api/ecology/drinking-water-dict.js
new file mode 100644
index 0000000..16c24a8
--- /dev/null
+++ b/src/api/ecology/drinking-water-dict.js
@@ -0,0 +1,41 @@
+import axios from 'axios';
+// ----------------------列表-----------------------
+const pageDictUrl = '/drinkingWater/drinkingWaterDict';
+const listAllUrl = pageDictUrl + "";
+
+// 添加
+const saveDrinkingWaterDict = function (data) {
+ return axios.post("/drinkingWater/drinkingWaterDict/",data)
+}
+
+// 删除
+const removeDrinkingWaterDict = function (id) {
+ return axios.delete(`/drinkingWater/drinkingWaterDict/${id}`,)
+}
+// 批量删除
+const removeBatchDrinkingWaterDict = function (ids) {
+ return axios.delete("/drinkingWater/drinkingWaterDict/batch",{data:ids})
+}
+
+// 修改
+const updateDrinkingWaterDict = function (data) {
+ return axios.put("/drinkingWater/drinkingWaterDict",data)
+}
+
+const getColumnOptions = function(column){
+ return axios.get("/drinkingWater/drinkingWaterDict/options",{params:{column}})
+}
+const copyBatchPlace = function (data){
+ return axios.post("/drinkingWater/drinkingWaterDict/copyBatch",data)
+}
+
+export {
+ pageDictUrl,
+ listAllUrl,
+ saveDrinkingWaterDict,
+ removeDrinkingWaterDict,
+ removeBatchDrinkingWaterDict,
+ updateDrinkingWaterDict,
+ getColumnOptions,
+ copyBatchPlace
+}
\ No newline at end of file
diff --git a/src/utils/excel-util.js b/src/utils/excel-util.js
index 27c1c1a..b498723 100644
--- a/src/utils/excel-util.js
+++ b/src/utils/excel-util.js
@@ -15,6 +15,27 @@ const downloadTemplate = function (name){
a.remove(); // 一次性的,用完就删除a标签
}
+//下载xls文件
+const downloadTemplatexls = function (name){
+ var a = document.createElement("a"); //创建一个标签
+ a.href = `/template/${name}.xls`; // 给a标签的href属性值加上地址,注意,这里是绝对路径,不用加 点.
+ a.download = `${name}-导入模板.xls`; //设置下载文件文件名,这里加上.xlsx指定文件类型,pdf文件就指定.fpd即可
+ a.style.display = "none"; // 障眼法藏起来a标签
+ document.body.appendChild(a); // 将a标签追加到文档对象中
+ a.click(); // 模拟点击了a标签,会触发a标签的href的读取,浏览器就会自动下载了
+ a.remove(); // 一次性的,用完就删除a标签
+}
+//下载xlsm文件
+const downloadTemplatexlsm = function (name){
+ var a = document.createElement("a"); //创建一个标签
+ a.href = `/template/${name}.xlsm`; // 给a标签的href属性值加上地址,注意,这里是绝对路径,不用加 点.
+ a.download = `${name}-导入模板.xlsm`; //设置下载文件文件名,这里加上.xlsx指定文件类型,pdf文件就指定.fpd即可
+ a.style.display = "none"; // 障眼法藏起来a标签
+ document.body.appendChild(a); // 将a标签追加到文档对象中
+ a.click(); // 模拟点击了a标签,会触发a标签的href的读取,浏览器就会自动下载了
+ a.remove(); // 一次性的,用完就删除a标签
+}
+
const excelToJson = async function (buffer){
const wb = new ExcelJS.Workbook();
await wb.xlsx.load(buffer);
@@ -37,7 +58,10 @@ const excelToJson = async function (buffer){
export {
exportTableData,
downloadTemplate,
- excelToJson
+ excelToJson,
+ downloadTemplatexls,
+ downloadTemplatexlsm
+
}
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 6af1540..47853bb 100644
--- a/src/views/water/drinking-water-village/collect/water-bill.vue
+++ b/src/views/water/drinking-water-village/collect/water-bill.vue
@@ -77,7 +77,8 @@
查看
-
+
+
审核
@@ -191,14 +192,14 @@
text
}) => this.$util.toDateString(text)
},
- {
- title: '导入时间',
- dataIndex: 'createTime',
- sorter: true,
- customRender: ({
- text
- }) => this.$util.toDateString(text)
- },
+ // {
+ // title: '导入时间',
+ // dataIndex: 'createTime',
+ // sorter: true,
+ // customRender: ({
+ // text
+ // }) => this.$util.toDateString(text)
+ // },
{
title: '审核状态',
dataIndex: 'checked',
diff --git a/src/views/water/drinking-water/collect/colums.js b/src/views/water/drinking-water/collect/colums.js
index d801d8d..c430105 100644
--- a/src/views/water/drinking-water/collect/colums.js
+++ b/src/views/water/drinking-water/collect/colums.js
@@ -121,8 +121,10 @@ const tableColumns = [
{title: "余氯",dataIndex: "residualChlorine",sorter: true,},
{title: "六六六",dataIndex: "c6h6cl6666",sorter: true,},
{title: "2,4,6-三氯酚",dataIndex: "c6h3cl3o246",sorter: true,},
-
-
+ //新增
+ {title: "叶绿素(mg/m3)",dataIndex:"chlorophyll",sorter:true,},
+ {title: "透明度(cm)",dataIndex:"transparency",sorter:true,},
+
];
export {tableColumns}
\ No newline at end of file
diff --git a/src/views/water/drinking-water/collect/index.vue b/src/views/water/drinking-water/collect/index.vue
index 553cd7a..c591e9a 100644
--- a/src/views/water/drinking-water/collect/index.vue
+++ b/src/views/water/drinking-water/collect/index.vue
@@ -1,30 +1,88 @@
-
+
-
-
- 市级地表水导入
-
-
- 县级地表水导入
-
-
- 县级地下水导入
-
-
+
+
+
+
+
+ 市级在用导入
+
+
+
+
+ 市级备用导入
+
+
+
+
+
+ 市级导入
+
+
+
+
+
+
+
+
+
+ 县级在用导入
+
+
+
+
+ 县级备用导入
+
+
+
+
+ 县级地下水导入
+
+
+
+
+
+ 县级导入
+
+
+
+
+
+
+ 市级在用导入{{"\xa0"}} 模板下载
+ 市级备用导入{{"\xa0"}} 模板下载
+ 县级在用导入{{"\xa0"}} 模板下载
+ 县级备用导入{{"\xa0"}} 模板下载
+ 县级地下水导入{{"\xa0"}} 模板下载
+
+
+
+ 模板下载
+
+
+
@@ -38,147 +96,32 @@
diff --git a/src/views/water/drinking-water/collect/utils.js b/src/views/water/drinking-water/collect/utils.js
index ab28e4e..49d51d3 100644
--- a/src/views/water/drinking-water/collect/utils.js
+++ b/src/views/water/drinking-water/collect/utils.js
@@ -1,6 +1,6 @@
import moment from "moment";
export default {
- // 市级在用地表水
+ // 市级在用地表水 已可用
toCityUseTopWaterObjData(excelData) {
return excelData.map(item => {
const row = {
@@ -125,7 +125,7 @@ export default {
})
},
- // 市级备用地表水
+ // 市级备用地表水 待修改
toCitySpareTopWaterObjData(excelData) {
return excelData.map(item => {
const row = {
@@ -250,8 +250,133 @@ export default {
})
},
- // 县级在用地表水
+ // 县级在用地表水 待修改
toCountyUseTopWaterObjData(excelData) {
+ return excelData.map(item => {
+ const row = {
+ regionLevel: "县级",
+ drinkingWaterType: 1, // 1在用、2备用
+ waterSourceType: 1, // 1地表水、2地下水
+ place: item[0],
+ waterTemperature: item[1],
+ ph: item[2],
+ dissolvedOxygen: item[3],
+ permanganateIndex: item[4],
+ cod: item[5],
+ fiveDayBod: item[6],
+ ammonia: item[7],
+ totalPhosphorus: item[8],
+ totalNitrogen: item[9],
+ cu: item[10],
+ zn: item[11],
+ fluoride: item[12],
+ se: item[13],
+ as: item[14],
+ hg: item[15],
+ cd: item[16],
+ cr: item[17],
+ pb: item[18],
+ cyanide: item[19],
+ volatilePhenol: item[20],
+ petro: item[21],
+ anionicSurfactant: item[22],
+ sulfide: item[23],
+ fecalColiforms: item[24],
+ sulfate: item[25],
+ chloride: item[26],
+ nitrateNitrogen: item[27],
+ fe: item[28],
+ mn: item[29],
+ chcl3: item[30],
+ ccl4: item[31],
+ chbr3: item[32],
+ ch2cl2: item[33],
+ c2h4cl2: item[34],
+ c3h5clO: item[35],
+ c2h3cl: item[36],
+ c2h2cl211: item[37],
+ c2h2cl212: item[38],
+ c2hcl3: item[39],
+ c2cl4: item[40],
+ c4h5cl: item[41],
+ c4cl6: item[42],
+ c8h8: item[43],
+ ch2o: item[44],
+ c2h4o: item[45],
+ c3h4o: item[46],
+ c2hcl3o: item[47],
+ c6h6: item[48],
+ c7h8: item[49],
+ c8h10Ethylbenzene: item[50],
+ c8h10Dimethylbenzene: item[51],
+ c9h12: item[52],
+ c6h5cl: item[53],
+ c6h4cl212: item[54],
+ c6h4cl214: item[55],
+ c6h3cl3: item[56],
+ c6h2cl4: item[57],
+ c6cl6: item[58],
+ c6h5no2: item[59],
+ c6h4n2o4: item[60],
+ c7h6n2o4: item[61],
+ c7h5o6n3: item[62],
+ c6h4clno2: item[63],
+ c6h3cln2o4: item[64],
+ c6h4cl2o: item[65],
+ c6h3cl3o: item[66],
+ c6hcl5o: item[67],
+ c6h7n: item[68],
+ c6h4nh22: item[69],
+ c3h5no: item[70],
+ c3h3n: item[71],
+ c16h22o4: item[72],
+ c16h35o4p: item[73],
+ n2h4h2o: item[74],
+ c8h20pd: item[75],
+ c5h5n: item[76],
+ turpentine: item[77],
+ c6h3n3o7: item[78],
+ butylXanthogenAcid: item[79],
+ activeChlorine: item[80],
+ c14h9cl5: item[81],
+ c6h6cl6: item[82],
+ c10h5cl7O: item[83],
+ c10h14no5ps: item[84],
+ c8h10o5nps: item[85],
+ c10h19o6ps2: item[86],
+ c5h12no3ps2: item[87],
+ c4h7cl2o4p: item[88],
+ c4h8cl3o4p: item[89],
+ c8h19o3ps2: item[90],
+ c8cl4n2: item[91],
+ c12h11no2: item[92],
+ c22h19br2no3: item[93],
+ c8h14cln5: item[94],
+ c20h12: item[95],
+ ch3hg: item[96],
+ c12h10Xclx: item[97],
+ c49h74n10o12: item[98],
+ p4: item[99],
+ mo: item[100],
+ co: item[101],
+ be: item[102],
+ b: item[103],
+ sb: item[104],
+ ni: item[105],
+ ba: item[106],
+ v: item[107],
+ ti: item[108],
+ tl: item[109],
+ phosphate: item[110],
+ transparency: item[111],
+ chlorophyll: item[112],
+ }
+ return row;
+ })
+
+ },
+ //县级备用地表水 待修改
+ toCountySpareTopWaterObjData(excelData) {
return excelData.map(item => {
const row = {
regionLevel: "县级",
@@ -375,15 +500,15 @@ export default {
})
},
- // 县级在用地下水
+ // 县级在用地下水 已可用
toCountyUseBottomWaterObjData(excelData) {
return excelData.map(item => {
const row = {
regionLevel: "县级",
- drinkingWaterType: 2, // 1在用、2备用
+ drinkingWaterType: 1, // 1在用、2备用
county: item[0],
place: item[1],
- waterSourceType: (item[2] && item[2].includes("地下")) ? 2 : 1, // 1地表水、2地下水
+ waterSourceType: 2, // 1地表水、2地下水
monitorTime: moment(item[3], "YYYY年M月D日H:m").valueOf(),
waterTemperature: item[4],
chroma: item[5],
diff --git a/src/views/water/drinking-water/collect/water-bill.vue b/src/views/water/drinking-water/collect/water-bill.vue
index efeb6d6..f4e4fe5 100644
--- a/src/views/water/drinking-water/collect/water-bill.vue
+++ b/src/views/water/drinking-water/collect/water-bill.vue
@@ -45,7 +45,8 @@
@@ -57,7 +58,7 @@
@@ -77,7 +78,8 @@
查看
-
+
+
审核
@@ -191,14 +193,14 @@
text
}) => this.$util.toDateString(text)
},
- {
- title: '导入时间',
- dataIndex: 'createTime',
- sorter: true,
- customRender: ({
- text
- }) => this.$util.toDateString(text)
- },
+ // {
+ // title: '最后更新时间',
+ // dataIndex: 'updateTime',
+ // sorter: true,
+ // customRender: ({
+ // text
+ // }) => this.$util.toDateString(text)
+ // },
{
title: '审核状态',
dataIndex: 'checked',
@@ -206,13 +208,13 @@
slots: {
customRender: 'checked',
},
-
+
},
{
title: '创建人',
- dataIndex: 'userName',
+ dataIndex: 'userId',
sorter: true,
-
+ customRender: ({ text }) => (text == 1 ? "admin" : ""),
},
// {
// title: '更新时间',
@@ -233,7 +235,10 @@
}
],
// 表格搜索条件
- where: {},
+ where: {
+ // sort: "createTime",
+ // order: "desc"
+ },
reportTimeScope: [],
// 表格选中数据
selectionList: [],
@@ -270,8 +275,7 @@
},
edit(record) {
this.editableData[record.drinkingWaterBillId] = _.cloneDeep(record);
- this.editableData[record.drinkingWaterBillId].reportTime = moment(this.editableData[record.drinkingWaterBillId]
- .reportTime)
+ this.editableData[record.drinkingWaterBillId].reportTime = moment(this.editableData[record.drinkingWaterBillId].reportTime);
},
verify(record,checked) {
const hide = this.$message.loading('请求中..', 0);
@@ -298,11 +302,17 @@
})
},
save(record) {
-
let {
drinkingWaterBillId,
billName,
- reportTime
+ reportTime,
+ regionLevel,
+ createTime,
+ checked,
+ waterSourceType,
+ drinkingWaterType,
+ userId
+
} = this.editableData[record.drinkingWaterBillId];
if (!drinkingWaterBillId || !reportTime) {
this.$message.error('请填写完整信息再提交')
@@ -314,12 +324,18 @@
updateDrinkingWaterBill({
drinkingWaterBillId,
billName,
- reportTime
+ reportTime,
+ regionLevel,
+ createTime,
+ checked,
+ waterSourceType,
+ drinkingWaterType,
+ userId
}).then(res => {
if (res.data.code == 0) {
this.$message.success(res.data.msg);
record.billName = billName;
- record.reportTime = reportTime
+ record.reportTime = reportTime;
} else {
this.$message.error(res.data.msg);
}
diff --git a/src/views/water/drinking-water/collect/water.vue b/src/views/water/drinking-water/collect/water.vue
index 13824cf..286e163 100644
--- a/src/views/water/drinking-water/collect/water.vue
+++ b/src/views/water/drinking-water/collect/water.vue
@@ -179,7 +179,7 @@ export default {
},
{
title: "创建人",
- dataIndex: "username",
+ dataIndex: "userName",
sorter: true,
},
{
diff --git a/src/views/water/drinking-water/dict/index.vue b/src/views/water/drinking-water/dict/index.vue
index 780551a..8c56681 100644
--- a/src/views/water/drinking-water/dict/index.vue
+++ b/src/views/water/drinking-water/dict/index.vue
@@ -5,9 +5,9 @@
-
+
@@ -20,19 +20,19 @@
*
*
*/
-import LeqLevel from "./surface-water"
+// import LeqLevel from "./surface-water"
import Place from "./place"
export default {
name: 'DrinkingWaterDictIndex',
components: {
- LeqLevel,
+ // LeqLevel,
Place
},
data() {
return {
- activeKey: 'standard'
+ activeKey: 'place'
};
},
diff --git a/src/views/water/drinking-water/dict/place.vue b/src/views/water/drinking-water/dict/place.vue
index b2efb8e..f822098 100644
--- a/src/views/water/drinking-water/dict/place.vue
+++ b/src/views/water/drinking-water/dict/place.vue
@@ -1,13 +1,40 @@
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+ 查询
+ 重置
+ 按年份导出
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -70,15 +115,29 @@
(data = d.data)"
>
新增
+
+
+
+
+ {{ item.label }}
+
+
+
+
+ 批量复制
+
+
+
删除
+
@@ -126,98 +186,104 @@