@@ -100,12 +101,11 @@
import { Modal } from 'ant-design-vue';
import {
pageBillUrl,
- // saveRiverStationBill,
removeRiverStationBill,
removeBatchRiverStationBill,
updateRiverStationBill,
verifyRiverStationBill
- } from "@/api/ecology/river-station";
+ } from "@/api/ecology/river-site";
import moment from "moment";
export default {
name: 'DrinkingCollectWaterBill',
@@ -144,30 +144,6 @@
sorter: true,
},
- // {
- // title: '菜单名称',
- // dataIndex: 'title',
- // sorter: true
- // },
- // {
- // title: '监测时间',
- // dataIndex: 'reportTime',
- // sorter: true,
- // slots: {
- // customRender: 'reportTime',
- // },
- // // customRender: ({
- // // text
- // // }) => this.$util.toDateString(text)
- // },
- // {
- // title: '导入时间',
- // dataIndex: 'createTime',
- // sorter: true,
- // customRender: ({
- // text
- // }) => this.$util.toDateString(text)
- // },
{
title: '导入时间',
dataIndex: 'createTime',
@@ -242,18 +218,18 @@
},
detail(record) {
this.$router.replace({
- path: "/water/river/station/collect/water/" + record.waterStationWaterFunctionAreaBillId
+ path: "/water/river/station/collect/water/" + record.waterSiteBillId
})
},
edit(record) {
- this.editableData[record.waterStationWaterFunctionAreaBillId] = _.cloneDeep(record);
- this.editableData[record.waterStationWaterFunctionAreaBillId].reportTime = moment(this.editableData[record.waterStationWaterFunctionAreaBillId]
+ this.editableData[record.waterSiteBillId] = _.cloneDeep(record);
+ this.editableData[record.waterSiteBillId].reportTime = moment(this.editableData[record.waterSiteBillId]
.reportTime)
},
verify(record,checked) {
const hide = this.$message.loading('请求中..', 0);
verifyRiverStationBill({
- waterStationWaterFunctionAreaBillId: record.waterStationWaterFunctionAreaBillId,
+ waterSiteBillId: record.waterSiteBillId,
checked
}).then(res => {
if (res.data.code == 0) {
@@ -277,11 +253,11 @@
save(record) {
let {
- waterStationWaterFunctionAreaBillId,
+ waterSiteBillId,
billName,
reportTime
- } = this.editableData[record.waterStationWaterFunctionAreaBillId];
- if (!waterStationWaterFunctionAreaBillId || !reportTime) {
+ } = this.editableData[record.waterSiteBillId];
+ if (!waterSiteBillId || !reportTime) {
this.$message.error('请填写完整信息再提交')
return
}
@@ -289,7 +265,7 @@
reportTime = reportTime.format("x")
reportTime = Number(reportTime)
updateRiverStationBill({
- waterStationWaterFunctionAreaBillId,
+ waterSiteBillId,
billName,
reportTime
}).then(res => {
@@ -304,7 +280,7 @@
console.log(e);
this.$message.error(e.message);
}).finally(() => {
- delete this.editableData[record.waterStationWaterFunctionAreaBillId]
+ delete this.editableData[record.waterSiteBillId]
hide()
})
@@ -312,7 +288,7 @@
/* 删除单个 */
remove(row) {
const hide = this.$message.loading('请求中..', 0);
- removeRiverStationBill(row.waterStationWaterFunctionAreaBillId).then(res => {
+ removeRiverStationBill(row.waterSiteBillId).then(res => {
if (res.data.code === 0) {
this.$message.success(res.data.msg);
this.reload();
@@ -324,7 +300,7 @@
}).finally(() => hide());
},
removeBatch() {
- const ids = this.selectionList.map(item => item.waterStationWaterFunctionAreaBillId);
+ const ids = this.selectionList.map(item => item.waterSiteBillId);
const hide = this.$message.loading('请求中..', 0);
removeBatchRiverStationBill(ids).then(res => {
if (res.data.code === 0) {
diff --git a/src/views/water/river-station/collect/water.vue b/src/views/water/river-station/collect/water.vue
index 0c8b92c..32d7056 100644
--- a/src/views/water/river-station/collect/water.vue
+++ b/src/views/water/river-station/collect/water.vue
@@ -1,3 +1,4 @@
+
@@ -31,7 +32,7 @@
-
+
@@ -95,7 +96,7 @@
{
if (res.data.code == 0) {
@@ -290,7 +276,8 @@ export default {
hide();
});
} else {
- form.nationalLevelRiverStationBillId = this.nationalLevelRiverStationBillId;
+ form.waterSiteBillId = this.waterSiteBillId;
+ form.userId = this.$store.state.user.user.userId
saveRiverStation(form)
.then((res) => {
if (res.data.code == 0) {
@@ -312,7 +299,7 @@ export default {
/* 删除单个 */
remove(row) {
const hide = this.$message.loading("请求中..", 0);
- removeRiverStation(row.waterStationRiverStationId)
+ removeRiverStation(row.waterSiteId)
.then((res) => {
if (res.data.code === 0) {
this.$message.success(res.data.msg);
@@ -327,7 +314,7 @@ export default {
.finally(() => hide());
},
removeBatch() {
- const ids = this.selectionList.map((item) => item.waterStationRiverStationId);
+ const ids = this.selectionList.map((item) => item.waterSiteId);
const hide = this.$message.loading("请求中..", 0);
removeBatchRiverStation(ids)
.then((res) => {
diff --git a/src/views/water/river/collect/index.vue b/src/views/water/river/collect/index.vue
index 687ae40..778cd06 100644
--- a/src/views/water/river/collect/index.vue
+++ b/src/views/water/river/collect/index.vue
@@ -2,29 +2,75 @@
-
-
+
+
+
江河导入
-
-
- 水功能区导入
-
-
- 水站导入
-
+
+ 水功能区导入
+
+
+ 国家级水功能
+ 区控水站水功能
+
+
+ 导入
+
+
+ 水站导入
+
+
+ {{item.stationName}}
+
+
+ 导入
+
+
+ 模板下载
+
+
+
+
国家级水功能模板下载
+
区控水功能模板下载
+
+
+
+
+
@@ -52,8 +98,14 @@ import {saveWaterFunctionAreaBill} from "@/api/ecology/water-function-area"
import {saveRiverBill} from "@/api/ecology/river";
import {saveRiverStationBill} from "@/api/ecology/river-station";
+import {listInfo} from "@/api/ecology/water/river-water";
+
+import {saveRiverSiteBill} from "@/api/ecology/river-site";
+import {downloadTemplate} from "@/utils/excel-util";
+
export default {
name: "RiverCollectIndex",
+
components: {
WaterBill,
FunctionBill,
@@ -62,9 +114,63 @@ export default {
data() {
return {
activeKey: "functionWater",
+ visible: false,
+ exportType:String,
+ visibleWater:false,
+ visibleTemplate:false,
+ form:{},
+ param:{}
};
},
methods: {
+ //模板下载
+ downloadRiver() {
+ let filename = "江河"
+ (filename)
+ },
+ downloadNational() {
+ let filename = "国家级水功能区"
+ downloadTemplate(filename)
+ },
+ downloadWater() {
+ let filename = "区控水功能区"
+ downloadTemplate(filename)
+ },
+ downloadState() {
+ let filename = "国家水站"
+ downloadTemplate(filename)
+ },
+ downloadCity() {
+ let filename = "广西水站"
+ downloadTemplate(filename)
+ },
+ currentSel(selVal) {
+ this.param.waterStationPointId = selVal.waterStationPointId;
+ this.param.riverName = selVal.riverName;
+ this.param.stationName = selVal.stationName;
+ this.param.system = selVal.system;
+ this.param.waterTarget = selVal.waterTarget;
+ },
+ currentVal(val) {
+ this.exportType = val;
+ },
+ showModal(){
+ this.visible = true;
+ },
+ templateExp(){
+ this.visibleTemplate = true;
+ },
+ showModalWater(){
+ listInfo().then((res) => {
+ if (res.data.code == 0) {
+ console.log(res.data.data)
+ this.visibleWater = true;
+ this.form = res.data.data
+ } else {
+ this.$message.error(res.data.msg);
+ }
+ })
+ },
/* 导入本地excel文件 */
importFileCity(file) {
const hide = this.$message.loading("导入中..", 0);
@@ -174,13 +280,25 @@ export default {
});
const riverList = aoa.filter(
(item) => {
- console.log(item[8])
- return item.length >= 30 && item[8] && item[8] != "水体类型"
+ console.log("export"+this.exportType)
+ if(this.exportType == "1"){ //国家级水功能
+ return item.length >= 30 && item[8] && item[8] != "水体类型"
+ }else{ //区控水站水功能模板
+ return item[6] && item[6] != "站点名称"
+ }
+
}
);
+ console.log(riverList)
// 解析成对象数组
const billName = file.name;
- const billData = utils.toNationalLevelDataObj(riverList);
+ var billData;
+ if(this.exportType == "1"){
+ billData = utils.toNationalLevelDataObj(riverList);
+ }else{
+ billData = utils.towaterStationDataObj(riverList);
+ }
+
if (!billData || billData.length == 0) {
hide()
Modal.error({
@@ -191,15 +309,27 @@ export default {
}
const tasks = [];
if (billData.length > 0) {
- tasks.push(
- saveWaterFunctionAreaBill({
- billName: billName,
- nationalLevelWaterFunctionAreaList: billData,
- })
- );
+ if(this.exportType == "1"){
+ tasks.push(
+ saveWaterFunctionAreaBill({
+ billName: billName,
+ regionLevel:this.exportType,
+ nationalLevelWaterFunctionAreaList: billData,
+ })
+ );
+ }else{
+ tasks.push(
+ saveRiverStationBill({
+ billName: billName,
+ regionLevel:this.exportType,
+ waterStationWaterFunctionAreaList: billData,
+ })
+ );
+ }
+
}
// 上传到服务器
-
+ console.log(tasks);
Promise.all(tasks)
.then((res) => {
if (res[0].data.code == 0) {
@@ -207,11 +337,12 @@ export default {
title: "导入成功",
content: `成功导入${billData.length}条数据`,
});
+ this.visible=false;
this.$refs.functionWater && this.$refs.functionWater.reload();
} else {
Modal.error({
title: "导入失败",
- content: "数据上传出错",
+ content: res[0].data.msg,
});
}
@@ -247,6 +378,7 @@ export default {
let data = new Uint8Array(e.target.result);
let workbook = XLSX.read(data, {
type: "array",
+ cellDates:true
});
let sheetNames = workbook.SheetNames;
// 解析成二维数组
@@ -255,12 +387,25 @@ export default {
});
const riverList = aoa.filter(
(item) => {
- return item.length >= 15 && item[0] && item[0] != "序号"
+ if(this.param.system == "1"){
+ return item[1] && item[1] != "时间"
+ }else{
+
+ return item[2] && item[2] != "时间" && item[2] != "三类标准"&& item[2] != "平均值"&& item[2] != "最大值"&& item[2] != "最小值"&& item[2] != "有效数据个数"&& item[2] != "总数据个数"
+ }
+
}
);
+ console.log(riverList)
// 解析成对象数组
const billName = file.name;
- const billData = utils.toRiverStationObjData(riverList);
+ var billData;
+ if(this.param.system == "1"){ //国家系统
+ billData = utils.toRiverStationObjData(riverList,this.param);
+ }else{
+ billData = utils.toCityStationObjData(riverList,this.param);
+ }
+
if (!billData || billData.length == 0) {
hide()
Modal.error({
@@ -272,9 +417,10 @@ export default {
const tasks = [];
if (billData.length > 0) {
tasks.push(
- saveRiverStationBill({
+ saveRiverSiteBill({
billName: billName,
- waterStationWaterFunctionAreaList: billData,
+ systemType:this.param.system,
+ waterSiteList: billData,
})
);
}
@@ -287,6 +433,7 @@ export default {
title: "导入成功",
content: `成功导入${billData.length}条数据`,
});
+ this.visibleWater=false;
this.$refs.station && this.$refs.station.reload();
} else {
Modal.error({
diff --git a/src/views/water/river/collect/utils.js b/src/views/water/river/collect/utils.js
index 043a0ee..123ef50 100644
--- a/src/views/water/river/collect/utils.js
+++ b/src/views/water/river/collect/utils.js
@@ -1,4 +1,4 @@
-import moment from "moment";
+// import moment from "moment";
export default {
toObjData(excelData) {
@@ -60,28 +60,53 @@ export default {
})
},
- // 水站均值数据 水功能区
- toRiverStationObjData(excelData) {
+ // 江河水站(国家系统)均值数据
+ toRiverStationObjData(excelData,form) {
return excelData.map(item => {
+ console.log("时间"+item[1])
const row = {
- area: item[1].includes("区") ? item[1] : null,
- county: item[1].includes("县") ? item[1] : null,
- watershed: item[2],
- river: item[3],
- place: item[4],
- periodWaterQuality: item[5],
- waterTemperature: item[6],
- ph: item[7],
- dissolvedOxygen: item[8],
- conductivity: item[9],
- turbidity: item[10],
- permanganateIndex: item[11],
- ammonia: item[12],
- totalPhosphorus: item[13],
- totalNitrogen: item[14],
- mainPollutionIndicators: item[15],
- remark: item[15],
- // dissolvedOxygen: item[16],
+ riverName:form.riverName,
+ stationName:form.stationName,
+ waterTarget:form.waterTarget,
+ samplingTime: item[1],
+ waterTemperature: item[2],
+ ph: item[3],
+ dissolvedOxygen: item[4],
+ conductivity: item[5],
+ turbidity: item[6],
+ permanganateIndex: item[7],
+ ammonia: item[8],
+ totalPhosphorus: item[9],
+ totalNitrogen: item[10],
+ chlorophyll: item[11],
+ algalDensity: item[12],
+ waterQualityType: item[13],
+ mainPollutionIndicators: item[14],
+ }
+ return row;
+ })
+
+ },
+ // 江河水站(广西系统)均值数据
+ toCityStationObjData(excelData,form) {
+ return excelData.map(item => {
+ console.log("时间"+item[2])
+ var reg = RegExp("--")
+ const row = {
+ riverName:form.riverName,
+ stationName:form.stationName,
+ waterTarget:form.waterTarget,
+ samplingTime: item[2],
+ waterQualityType: item[3],
+ waterTemperature:item[4],
+ ph: reg.test(item[5])?null:item[5],
+ dissolvedOxygen: item[6],
+ conductivity: item[7],
+ turbidity: item[8],
+ permanganateIndex: reg.test(item[9])?null:item[9],
+ ammonia: item[10],
+ totalPhosphorus: item[11],
+ totalNitrogen: item[12],
}
return row;
})
@@ -90,58 +115,99 @@ export default {
// 国家级水功能区上报数据
toNationalLevelDataObj(excelData) {
return excelData.map(item => {
+ let date = new Date();
+ let year = date.getFullYear(); // 年
+ var time;
+ var samplingTime="";
+ if(item[14]){
+ time = item[14].replace('月','-').replace('日','').trim();
+ samplingTime = year+"-"+time;
+ }
+
const row = {
- waterBodyType: item[8],
- provinceRegionCode: item[0],
- waterResourcesFirstLevelZoneName: item[10],
- waterQualityGoal: item[11],
- dataSources: item[12],
- sectionName: item[13],
- samplingTime: item[14] ? moment(item[14], "Y年M月D日").valueOf() : null,
- wTemp: item[15],
- ph: item[16],
- dissolvedOxygen: item[17],
- permanganateIndex: item[18],
- cod: item[19],
- fiveDayBod: item[20],
- ammonia: item[21],
- pTotal: item[22],
- cu: item[23],
- zn: item[24],
- f: item[25],
- se: item[26],
- as: item[27],
- hg: item[28],
- cd: item[29],
- cr6: item[30],
- pb: item[31],
- cyanide: item[32],
- vPhen: item[33],
- oils: item[34],
- anSaa: item[35],
- s: item[36],
- coloOrg: item[37],
- so4: item[38],
- cl: item[39],
- nitrateNitrogen: item[40],
- fe: item[41],
- mn: item[42],
- nTotal: item[43],
- transp: item[44],
- chla: item[45],
- ffeWaterFunctionAreaWaterQualityCategory: item[46],
- ffeCompliantEvaluationConclusion: item[47],
- ffeMajorOverStandardItemsMultiples: item[48],
- lprlWaterFunctionAreaWaterQualityCategory: item[49],
- lprlCompliantEvaluationConclusion: item[50],
- lprlMajorOverStandardItemsMultiples: item[51],
- remark: item[52],
- systemCode: item[53],
-
+ waterSystem:item[1],
+ riverLakeLibrary:item[2],
+ city:item[3],
+ firstLevelWaterFunctionZoneName:item[4],
+ secondLevelWaterFunctionZoneName:item[5],
+ waterFunctionalIndexCode:item[6],
+ waterFunctionalAreaType:item[7],
+ waterBodyType:item[8],
+ provinceRegionCode:item[9],
+ waterResourcesFirstLevelZoneName:item[10],
+ waterQualityGoal:item[11],
+ dataSources:item[12],
+ sectionName:item[13],
+ samplingTime:samplingTime,
+ wTemp:item[15],
+ ph:item[16],
+ dissolvedOxygen:item[17],
+ permanganateIndex:item[18],
+ cod:item[19],
+ fiveDayBod:item[20],
+ ammonia:item[21],
+ totalPhosphorus:item[22],
+ cu:item[23],
+ zn:item[24],
+ f:item[25],
+ se:item[26],
+ as:item[27],
+ hg:item[28],
+ cd:item[29],
+ cr6:item[30],
+ pb:item[31],
+ cyanide:item[32],
+ vPhen:item[33],
+ oils:item[34],
+ anSaa:item[35],
+ s:item[36],
+ coloOrg:item[37],
+ so4:item[38],
+ cl:item[39],
+ nitrateNitrogen:item[40],
+ fe:item[41],
+ mn:item[42],
+ nTotal:item[43],
+ transp:item[44],
+ chla:item[45],
+ ffeWaterFunctionAreaWaterQualityCategory:item[46],
+ ffeCompliantEvaluationConclusion:item[47],
+ ffeMajorOverStandardItemsMultiples:item[48],
+ lprlWaterFunctionAreaWaterQualityCategory:item[49],
+ lprlCompliantEvaluationConclusion:item[50],
+ lprlMajorOverStandardItemsMultiples:item[51],
+ remark:item[52],
+ systemCode:item[53],
}
return row;
})
},
+ // 区控水站水功能区上报数据
+ towaterStationDataObj(excelData) {
+ return excelData.map(item => {
+ const row = {
+ area: item[1].includes("区") ? item[1] : null,
+ county: item[1].includes("县") ? item[1] : null,
+ watershed:item[2],
+ river:item[3],
+ sectionName:item[4],
+ monitorTime:item[5],
+ place:item[6],
+ periodWaterQuality:item[7],
+ waterTemperature:item[8],
+ ph:item[9],
+ dissolvedOxygen:item[10],
+ conductivity:item[11],
+ turbidity:item[12],
+ permanganateIndex:item[13],
+ ammonia:item[14],
+ totalPhosphorus:item[15],
+ totalNitrogen:item[16],
+ mainPollutionIndicators:item[17],
+ }
+ return row;
+ })
+},
}
diff --git a/src/views/water/river/collect/water-bill.vue b/src/views/water/river/collect/water-bill.vue
index dca440f..64e586f 100644
--- a/src/views/water/river/collect/water-bill.vue
+++ b/src/views/water/river/collect/water-bill.vue
@@ -1,3 +1,4 @@
+
diff --git a/src/views/water/river/collect/water.vue b/src/views/water/river/collect/water.vue
index 4e6c1e5..e5202a8 100644
--- a/src/views/water/river/collect/water.vue
+++ b/src/views/water/river/collect/water.vue
@@ -1,3 +1,4 @@
+
@@ -31,7 +32,7 @@
-
+
@@ -77,7 +78,7 @@
{
this.bill = res.data.data;
if (res.data.data.checked == 1) {
@@ -250,14 +252,17 @@ export default {
form.monitorHour = date.getHours();
form.monitorMinute = date.getMinutes();
delete form["monitorDate"];
- if (form.drinkingWaterVillageId) {
+ console.log(form,'form');
+ const { billId } = this.$route.params;
+ form.surfaceWaterSectionBillId = billId;
+ if (form.surfaceWaterSectionId) {
updateRiver(form)
.then((res) => {
if (res.data.code == 0) {
this.showEdit = false;
this.$message.success(res.data.msg);
this.reload();
- } else {
+ } else {
this.$message.error(res.data.msg);
}
})
@@ -269,7 +274,8 @@ export default {
hide();
});
} else {
- form.surfaceWaterSectionBillId = this.surfaceWaterSectionId;
+ console.log(this.$store.state.user.user.userId);
+ form.userId = this.$store.state.user.user.userId
saveRiver(form)
.then((res) => {
if (res.data.code == 0) {
@@ -291,7 +297,7 @@ export default {
/* 删除单个 */
remove(row) {
const hide = this.$message.loading("请求中..", 0);
- removeRiver(row.drinkingWaterVillageId)
+ removeRiver(row.surfaceWaterSectionId)
.then((res) => {
if (res.data.code === 0) {
this.$message.success(res.data.msg);
@@ -306,7 +312,7 @@ export default {
.finally(() => hide());
},
removeBatch() {
- const ids = this.selectionList.map((item) => item.drinkingWaterVillageId);
+ const ids = this.selectionList.map((item) => item.surfaceWaterSectionId);
const hide = this.$message.loading("请求中..", 0);
removeBatchRiver(ids)
.then((res) => {
diff --git a/src/views/water/river/dict/api-relate.vue b/src/views/water/river/dict/api-relate.vue
new file mode 100644
index 0000000..42ab428
--- /dev/null
+++ b/src/views/water/river/dict/api-relate.vue
@@ -0,0 +1,506 @@
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ (data = d.data)"
+ >
+
+
+ 新增
+
+
+
+
+ {{ item.label }}
+
+
+
+
+ 批量复制
+
+
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+ 修改
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/water/river/dict/autonomous.vue b/src/views/water/river/dict/autonomous.vue
new file mode 100644
index 0000000..53f1d18
--- /dev/null
+++ b/src/views/water/river/dict/autonomous.vue
@@ -0,0 +1,525 @@
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ (data = d.data)"
+ >
+
+
+ 新增
+
+
+
+
+ {{ item.label }}
+
+
+
+
+ 批量复制
+
+
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+ 修改
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/water/river/dict/index.vue b/src/views/water/river/dict/index.vue
new file mode 100644
index 0000000..b8f3cba
--- /dev/null
+++ b/src/views/water/river/dict/index.vue
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/water/river/dict/place.vue b/src/views/water/river/dict/place.vue
new file mode 100644
index 0000000..ef20005
--- /dev/null
+++ b/src/views/water/river/dict/place.vue
@@ -0,0 +1,428 @@
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ (data = d.data)"
+ >
+
+
+ 新增
+
+
+
+
+ {{ item.label }}
+
+
+
+
+ 批量复制
+
+
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+ 修改
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/water/river/dict/water.vue b/src/views/water/river/dict/water.vue
new file mode 100644
index 0000000..b3167d0
--- /dev/null
+++ b/src/views/water/river/dict/water.vue
@@ -0,0 +1,377 @@
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 国家水站
+ 广西水系统
+
+
+
+
+
+
+
+
+
+ (data = d.data)"
+ >
+
+
+ 新增
+
+
+
+
+ {{ item.label }}
+
+
+
+
+ 批量复制
+
+
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+ 修改
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/water/river/statistic/base.vue b/src/views/water/river/statistic/base.vue
index 86a40d6..9c3c336 100644
--- a/src/views/water/river/statistic/base.vue
+++ b/src/views/water/river/statistic/base.vue
@@ -1,128 +1,301 @@
-
-
-
-
-
-
-
-
- {{ item.label }}
-
-
-
-
-
-
- 查询
- 重置
- 导出Excel
-
-
-
-
-
-
- (data = d.data)"
- >
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+ {{ item.label }}
+
+
+
-
-
-
-
+
+ 查询
+ 重置
+ 导出Excel
+
+
+
+ (data = d.data)"
+ :init-load="false"
+ >
+
+
+
+
+
\ No newline at end of file
+
diff --git a/src/views/water/river/statistic/index.vue b/src/views/water/river/statistic/index.vue
index a207c59..1d8a2d5 100644
--- a/src/views/water/river/statistic/index.vue
+++ b/src/views/water/river/statistic/index.vue
@@ -5,6 +5,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -17,17 +29,19 @@
*
*/
import BaseStatistic from "./base.vue";
-
-
-
+ import AvgStatistic from "./avg";
+ import CityCountyPlace from "./city-county-place";
+ import AreaBase from "./area-base";
export default {
- name: 'StatisticSoundZone',
+ name: 'StatisticAirIndex',
components: {
- BaseStatistic,
+ // eslint-disable-next-line vue/no-unused-components
+ BaseStatistic,AvgStatistic,CityCountyPlace,AreaBase
+
},
data() {
return {
- activeKey: 'base'
+ activeKey: 'ccp'
};
},
diff --git a/src/views/water/water-function-area/collect/colums.js b/src/views/water/water-function-area/collect/colums.js
index 5ed52a6..0224995 100644
--- a/src/views/water/water-function-area/collect/colums.js
+++ b/src/views/water/water-function-area/collect/colums.js
@@ -53,4 +53,25 @@ const tableColumns = [
];
-export {tableColumns}
+
+const tableCityColumns = [
+ {title: "城区", dataIndex: "area", sorter: true,},
+ {title: "县", dataIndex: "county", sorter: true,},
+ {title: "所在流域", dataIndex: "watershed", sorter: true,},
+ {title: "所在河流", dataIndex: "river", sorter: true,},
+ {title: "断面名称", dataIndex: "sectionName", sorter: true,},
+ {title: "站点名称", dataIndex: "place", sorter: true,},
+ {title: "本期水质", dataIndex: "periodWaterQuality", sorter: true,},
+ {title: "水温", dataIndex: "waterTemperature", sorter: true,},
+ {title: "pH值", dataIndex: "ph", sorter: true,},
+ {title: "溶解氧", dataIndex: "dissolvedOxygen", sorter: true,},
+ {title: "电导率", dataIndex: "conductivity", sorter: true,},
+ {title: "浊度", dataIndex: "turbidity", sorter: true,},
+ {title: "高锰酸盐指数", dataIndex: "permanganateIndex", sorter: true,},
+ {title: "氨氮", dataIndex: "ammonia", sorter: true,},
+ {title: "总磷", dataIndex: "totalPhosphorus", sorter: true,},
+ {title: "总氮", dataIndex: "totalNitrogen", sorter: true,},
+ {title: "主要污染指标(超标倍数)", dataIndex: "mainPollutionIndicators", sorter: true,},
+];
+
+export {tableColumns,tableCityColumns}
diff --git a/src/views/water/water-function-area/collect/water-bill.vue b/src/views/water/water-function-area/collect/water-bill.vue
index 4829329..bf93c4e 100644
--- a/src/views/water/water-function-area/collect/water-bill.vue
+++ b/src/views/water/water-function-area/collect/water-bill.vue
@@ -133,6 +133,12 @@
customRender: 'billName',
},
+ },
+ {
+ title: '行政类型',
+ dataIndex: 'regionLevel',
+ sorter: true,
+
},
{
title: '条目',
@@ -221,9 +227,15 @@
this.reload();
},
detail(record) {
- this.$router.replace({
- path: "/water/river/acid/collect/water/" + record.nationalLevelWaterFunctionAreaBillId
- })
+ if(record.regionLevel == "1"){ //国家级
+ this.$router.push({
+ path: "/water/river/function/collect/water/" + record.nationalLevelWaterFunctionAreaBillId
+ })
+ }else{
+ this.$router.push({
+ path: "/water/river/function/city/collect/water/" + record.nationalLevelWaterFunctionAreaBillId
+ })
+ }
},
edit(record) {
this.editableData[record.nationalLevelWaterFunctionAreaBillId] = _.cloneDeep(record);
diff --git a/src/views/water/water-function-area/collect/water-city.vue b/src/views/water/water-function-area/collect/water-city.vue
new file mode 100644
index 0000000..f404e9f
--- /dev/null
+++ b/src/views/water/water-function-area/collect/water-city.vue
@@ -0,0 +1,325 @@
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+ 删除
+
+
+
+
+
+ 修改
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/water/water-function-area/collect/water.vue b/src/views/water/water-function-area/collect/water.vue
index c84cbe4..1e2f8dc 100644
--- a/src/views/water/water-function-area/collect/water.vue
+++ b/src/views/water/water-function-area/collect/water.vue
@@ -255,14 +255,13 @@ export default {
},
save() {
+ console.log("save开始"+this.form)
const hide = this.$message.loading("请求中..", 0);
const form = _.cloneDeep(this.form);
const date = new Date();
date.setFullYear(form.monitorDate.year());
date.setMonth(form.monitorDate.month());
date.setDate(form.monitorDate.date());
- date.setHours(form.monitorTime.hour());
- date.setMinutes(form.monitorTime.minutes());
form.samplingTime = date.getTime();
// form.monitorYear = date.getFullYear();
// form.monitorMonth = date.getMonth() + 1;
@@ -272,6 +271,7 @@ export default {
delete form["monitorDate"];
delete form["monitorTime"];
if (form.nationalLevelWaterFunctionAreaId) {
+ console.log("编辑开始"+form)
updateWaterFunctionArea(form)
.then((res) => {
if (res.data.code == 0) {
@@ -290,7 +290,9 @@ export default {
hide();
});
} else {
+ console.log("保存开始"+form);
form.nationalLevelWaterFunctionAreaBillId = this.nationalLevelWaterFunctionAreaBillId;
+ form.userId = this.$store.state.user.user.userId
saveWaterFunctionArea(form)
.then((res) => {
if (res.data.code == 0) {