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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
710356044
2021-11-20 11:56:21 +08:00
parent 92f9678525 6eee7d778f
commit 05f2424bea
2 changed files with 108 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/views/atmosphere/air/statistic/city-county-place.vue
View File

@@ -104,8 +104,8 @@ export default {
},
{
title: "一氧化碳", children: [
{title: "本次", dataIndex: "coCurrent",align:"center",customRender:({text})=> typeof text == "number"?text.toFixed(1)+"":text},
{title: "上年同期", dataIndex: "coSameTimeLastYear",align:"center",customRender:({text})=> typeof text == "number"?text.toFixed(1)+"":text},
{title: "本次", dataIndex: "coCurrent",align:"center",customRender:({text})=>text + ""},
{title: "上年同期", dataIndex: "coSameTimeLastYear",align:"center",customRender:({text})=>text + ""},
{title: "增减（%）", dataIndex: "coChangePercentage",align:"center",customRender:({text})=> typeof text == "number"?text.toFixed(1)+"":text},
{title: "排名（按浓度值）", dataIndex: "coRank",align:"center"},
]
@@ -128,28 +128,28 @@ export default {
},
{
title: "综合指数", children: [
{title: "本次", dataIndex: "comprehensiveAirQualityIndexCurrent",align:"center",customRender:({text})=> typeof text == "number"?text.toFixed(2)+"":text},
{title: "上年同期", dataIndex: "comprehensiveAirQualityIndexSameTimeLastYear",align:"center",customRender:({text})=> typeof text == "number"?text.toFixed(2)+"":text},
{title: "本次", dataIndex: "comprehensiveAirQualityIndexCurrent",align:"center",customRender:({text})=>text + ""},
{title: "上年同期", dataIndex: "comprehensiveAirQualityIndexSameTimeLastYear",align:"center",customRender:({text})=>text + ""},
{title: "增减（%）", dataIndex: "comprehensiveAirQualityIndexChangePercentage",customRender:({text})=> typeof text == "number"?text.toFixed(1)+"":""},
{title: "排名（按浓度值）", dataIndex: "comprehensiveAirQualityIndexRank",align:"center"},
]
},
// {
// title: "优天数", children: [
// {title: "本次", dataIndex: "excellentDaysCurrent",align:"center"},
// {title: "上年同期", dataIndex: "excellentDaysSameTimeLastYear",align:"center"},
// {title: "增减（%）", dataIndex: "excellentDaysChangePercentage",align:"center",customRender:({text})=> typeof text == "number"?text.toFixed(1)+"":""},
// // {title: "排名（按浓度值）", dataIndex: "excellentDaysRank",align:"center"},
// ]
// },
// {
// title: "良天数", children: [
// {title: "本次", dataIndex: "goodDaysCurrent",align:"center"},
// {title: "上年同期", dataIndex: "goodDaysSameTimeLastYear",align:"center"},
// {title: "增减（%）", dataIndex: "goodDaysChangePercentage",align:"center",customRender:({text})=> typeof text == "number"?text.toFixed(1)+"":""},
// // {title: "排名（按浓度值）", dataIndex: "goodDaysRank",align:"center"},
// ]
// },
{
title: "优天数", children: [
{title: "本次", dataIndex: "excellentDaysCurrent",align:"center",customRender:({text})=>text + ""},
{title: "上年同期", dataIndex: "excellentDaysSameTimeLastYear",align:"center",customRender:({text})=>text + ""},
{title: "增减（%）", dataIndex: "excellentDaysChangePercentage",align:"center",customRender:({text})=> typeof text == "number"?text.toFixed(1)+"":""},
// {title: "排名（按浓度值）", dataIndex: "excellentDaysRank",align:"center"},
]
},
{
title: "良天数", children: [
{title: "本次", dataIndex: "goodDaysCurrent",align:"center",customRender:({text})=>text + ""},
{title: "上年同期", dataIndex: "goodDaysSameTimeLastYear",align:"center",customRender:({text})=>text + ""},
{title: "增减（%）", dataIndex: "goodDaysChangePercentage",align:"center",customRender:({text})=> typeof text == "number"?text.toFixed(1)+"":""},
// {title: "排名（按浓度值）", dataIndex: "goodDaysRank",align:"center"},
]
},
// {
// title: "轻度污染天数", children: [
// {title: "本次", dataIndex: "lightPollutionDaysCurrent",align:"center"},

115
src/views/water/water-function-area/collect/water-bill.vue
View File

@@ -102,6 +102,11 @@
updateWaterFunctionAreaBill,
verifyWaterFunctionAreaBill
} from "@/api/ecology/water-function-area";
import {
removeRiverStationBill,
removeBatchRiverStationBill,
verifyRiverStationBill
} from "@/api/ecology/river-station";
import moment from "moment";
export default {
name: 'DrinkingCollectWaterBill',
@@ -244,27 +249,52 @@
},
verify(record,checked) {
const hide = this.$message.loading('请求中..', 0);
verifyWaterFunctionAreaBill({
nationalLevelWaterFunctionAreaBillId: record.nationalLevelWaterFunctionAreaBillId,
checked
}).then(res => {
if (res.data.code == 0) {
record.checked = checked
Modal.success({
title: "提示",
content: checked?"审核成功":"撤回成功"
});
} else {
Modal.error({
title: "提示",
content: res.data.msg
});
}
}).catch((e) => {
this.$message.error(e.message);
}).finally(() => {
hide();
})
if(record.regionLevel == "1"){
verifyWaterFunctionAreaBill({
nationalLevelWaterFunctionAreaBillId: record.nationalLevelWaterFunctionAreaBillId,
checked
}).then(res => {
if (res.data.code == 0) {
record.checked = checked
Modal.success({
title: "提示",
content: checked?"审核成功":"撤回成功"
});
} else {
Modal.error({
title: "提示",
content: res.data.msg
});
}
}).catch((e) => {
this.$message.error(e.message);
}).finally(() => {
hide();
})
}else{
verifyRiverStationBill({
nationalLevelWaterFunctionAreaBillId: record.nationalLevelWaterFunctionAreaBillId,
checked
}).then(res => {
if (res.data.code == 0) {
record.checked = checked
Modal.success({
title: "提示",
content: checked?"审核成功":"撤回成功"
});
} else {
Modal.error({
title: "提示",
content: res.data.msg
});
}
}).catch((e) => {
this.$message.error(e.message);
}).finally(() => {
hide();
})
}
},
save(record) {
@@ -304,6 +334,7 @@
/* 删除单个 */
remove(row) {
const hide = this.$message.loading('请求中..', 0);
if(row.regionLevel == "1"){ //国家级
removeWaterFunctionAreaBill(row.nationalLevelWaterFunctionAreaBillId).then(res => {
if (res.data.code === 0) {
this.$message.success(res.data.msg);
@@ -314,11 +345,8 @@
}).catch(e => {
this.$message.error(e.msg);
}).finally(() => hide());
},
removeBatch() {
const ids = this.selectionList.map(item => item.nationalLevelWaterFunctionAreaBillId);
const hide = this.$message.loading('请求中..', 0);
removeBatchWaterFunctionAreaBill(ids).then(res => {
}else{
removeRiverStationBill(row.nationalLevelWaterFunctionAreaBillId).then(res => {
if (res.data.code === 0) {
this.$message.success(res.data.msg);
this.reload();
@@ -326,9 +354,42 @@
this.$message.error(res.data.msg);
}
}).catch(e => {
this.$message.error(e.msg);
}).finally(() => hide());
}
},
removeBatch() {
const hide = this.$message.loading('请求中..', 0);
const functionIds = [];
const waterIds = [];
this.selectionList.map(item => {
if (item.regionLevel == "1"){
functionIds.push(item.nationalLevelWaterFunctionAreaBillId);
}else{
waterIds.push(item.nationalLevelWaterFunctionAreaBillId);
}
});
removeBatchWaterFunctionAreaBill(functionIds).then(res => {
if (res.data.code === 0) {
this.$message.success(res.data.msg);
this.reload();
} else {
this.$message.error(res.data.msg);
}
}).catch(e => {
this.$message.error(e.msg);
}).finally(() => hide());
removeBatchRiverStationBill(waterIds).then(res => {
if (res.data.code === 0) {
this.$message.success(res.data.msg);
this.reload();
} else {
this.$message.error(res.data.msg);
}
}).catch(e => {
this.$message.error(e.msg);
}).finally(() => hide());
},
}