gxwebsoft/jczxw-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'xiaoman'

Browse Source
This commit is contained in:
shixiaoman
2021-12-08 18:16:00 +08:00
parent 4d2eceeb52 e7ae6433c3
commit 113733517e
3 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@@ -1,3 +1,3 @@
VUE_APP_VERSION=1.0.0 VUE_APP_VERSION=1.0.0
VUE_APP_NAME=生态环境监测数据综合分析平台 VUE_APP_NAME=生态环境监测数据综合分析平台
VUE_APP_API_BASE_URL=http://1.14.132.108:10002/api VUE_APP_API_BASE_URL=http://localhost:10001/api

43
src/views/water/river/collect/index.vue
View File

@@ -235,6 +235,7 @@
return; return;
} }
const tasks = []; const tasks = [];
let _this =this;
if (billData.length > 0) { if (billData.length > 0) {
hide(); hide();
saveJudgeInfo({ saveJudgeInfo({
@@ -260,7 +261,10 @@
title: "导入成功", title: "导入成功",
content: `成功导入${billData.length}条数据`, content: `成功导入${billData.length}条数据`,
}); });
this.$refs.water && this.$refs.water.reload(); _this.$refs.water && _this.$refs.water.reload();
_this.$router.replace({
path: "/water/river/collect/water/" + res.data.data.surfaceWaterSectionBillId
})
} else { } else {
Modal.error({ Modal.error({
title: "导入失败", title: "导入失败",
@@ -287,7 +291,10 @@
title: "导入成功", title: "导入成功",
content: `成功导入${billData.length}条数据`, content: `成功导入${billData.length}条数据`,
}); });
this.$refs.water && this.$refs.water.reload(); _this.$refs.water && _this.$refs.water.reload();
_this.$router.replace({
path: "/water/river/collect/water/" + res.data.data.surfaceWaterSectionBillId
})
} else { } else {
Modal.error({ Modal.error({
title: "导入失败", title: "导入失败",
@@ -368,6 +375,7 @@
} }
const tasks = []; const tasks = [];
var varType = this.exportType; var varType = this.exportType;
let _this = this;
if (billData.length > 0) { if (billData.length > 0) {
if (this.exportType == "1") { if (this.exportType == "1") {
hide(); hide();
@@ -391,7 +399,10 @@
title: "导入成功", title: "导入成功",
content: `成功导入${billData.length}条数据`, content: `成功导入${billData.length}条数据`,
}); });
this.$refs.water && this.$refs.water.reload(); _this.$refs.water && _this.$refs.water.reload();
_this.$router.replace({
path: "/water/river/function/collect/water/" + res.data.data.nationalLevelWaterFunctionAreaBillId
})
} else { } else {
Modal.error({ Modal.error({
title: "导入失败", title: "导入失败",
@@ -417,7 +428,10 @@
title: "导入成功", title: "导入成功",
content: `成功导入${billData.length}条数据`, content: `成功导入${billData.length}条数据`,
}); });
this.$refs.water && this.$refs.water.reload(); _this.$refs.water && _this.$refs.water.reload();
_this.$router.replace({
path: "/water/river/function/collect/water/" + res.data.data.nationalLevelWaterFunctionAreaBillId
})
} else { } else {
Modal.error({ Modal.error({
title: "导入失败", title: "导入失败",
@@ -457,7 +471,10 @@
title: "导入成功", title: "导入成功",
content: `成功导入${billData.length}条数据`, content: `成功导入${billData.length}条数据`,
}); });
this.$refs.water && this.$refs.water.reload(); _this.$refs.water && _this.$refs.water.reload();
_this.$router.replace({
path: "/water/river/function/city/collect/water/" + res.data.data.nationalLevelWaterFunctionAreaBillId
})
} else { } else {
Modal.error({ Modal.error({
title: "导入失败", title: "导入失败",
@@ -483,7 +500,10 @@
title: "导入成功", title: "导入成功",
content: `成功导入${billData.length}条数据`, content: `成功导入${billData.length}条数据`,
}); });
this.$refs.water && this.$refs.water.reload(); _this.$refs.water && _this.$refs.water.reload();
_this.$router.replace({
path: "/water/river/function/city/collect/water/" + res.data.data.nationalLevelWaterFunctionAreaBillId
})
} else { } else {
Modal.error({ Modal.error({
title: "导入失败", title: "导入失败",
@@ -563,6 +583,7 @@
} }
const tasks = []; const tasks = [];
var system = this.param.system; var system = this.param.system;
let _this = this;
if (billData.length > 0) { if (billData.length > 0) {
hide(); hide();
saveJudgeInfoSite({ saveJudgeInfoSite({
@@ -585,7 +606,10 @@
title: "导入成功", title: "导入成功",
content: `成功导入${billData.length}条数据`, content: `成功导入${billData.length}条数据`,
}); });
this.$refs.water && this.$refs.water.reload(); _this.$refs.water && _this.$refs.water.reload();
_this.$router.replace({
path: "/water/river/station/collect/water/" + res.data.data.waterSiteBillId
})
} else { } else {
Modal.error({ Modal.error({
title: "导入失败", title: "导入失败",
@@ -611,7 +635,10 @@
title: "导入成功", title: "导入成功",
content: `成功导入${billData.length}条数据`, content: `成功导入${billData.length}条数据`,
}); });
this.$refs.water && this.$refs.water.reload(); _this.$refs.water && _this.$refs.water.reload();
_this.$router.replace({
path: "/water/river/station/collect/water/" + res.data.data.waterSiteBillId
})
} else { } else {
Modal.error({ Modal.error({
title: "导入失败", title: "导入失败",

2
src/views/water/river/statistic/avg-standard.vue
View File

@@ -171,7 +171,9 @@
if (res.data.code == 0) { if (res.data.code == 0) {
this.$message.success(res.data.msg); this.$message.success(res.data.msg);
res.data.data.forEach((m) => { res.data.data.forEach((m) => {
if(m.transnormalItem==""){
m.transnormalItem = "--" m.transnormalItem = "--"
}
this.momData.push(m); this.momData.push(m);
}) })
} else { } else {