diff --git a/src/api/ecology/drinking-water-village.js b/src/api/ecology/drinking-water-village.js index 8677b2f..4364efa 100644 --- a/src/api/ecology/drinking-water-village.js +++ b/src/api/ecology/drinking-water-village.js @@ -51,7 +51,10 @@ const updateDrinkingWaterVillage = function (data) { return axios.put("/drinkingWaterVillage/drinkingWaterVillage",data) } - +//批量修改取水量 +const updateVillageWaterWithdrawal=function(data){ + return axios.put("/drinkingWaterVillage/drinkingWaterVillage/updateVillageWater",data) +} // -------------------------统计--------------------- const pageDrinkingWaterVillageStatisticUrl = '/drinkingWaterVillage/drinkingWaterVillage/VillageAnalysePage'; @@ -89,6 +92,6 @@ export { getColumnOptions, listAll, getGisBase, - getGisArea - + getGisArea, + updateVillageWaterWithdrawal } diff --git a/src/views/atmosphere/acid-rain/trend/index.vue b/src/views/atmosphere/acid-rain/trend/index.vue index 3b10fa0..806ce57 100644 --- a/src/views/atmosphere/acid-rain/trend/index.vue +++ b/src/views/atmosphere/acid-rain/trend/index.vue @@ -4,10 +4,14 @@ - + + + - + + + @@ -18,12 +22,12 @@ - + - + @@ -133,6 +137,11 @@ export default { this.getPlaceOptions(value) } }, + handleMonthChange(value) { + if (value.includes('全部')) { + this.queryParams.monthList = [1,2,3,4,5,6,7,8,9,10,11,12] + } + }, // 纵坐标变化 handleYcoChange(value) { if (value.includes('rate') && !this.queryParams.categoryList.includes('酸雨频率')) { diff --git a/src/views/atmosphere/air/trend/index.vue b/src/views/atmosphere/air/trend/index.vue index 24ce4fe..f737520 100644 --- a/src/views/atmosphere/air/trend/index.vue +++ b/src/views/atmosphere/air/trend/index.vue @@ -4,10 +4,14 @@ - + + + - + + + @@ -17,16 +21,18 @@ - + + + - + - + @@ -188,6 +194,11 @@ export default { this.getCountryPlace(); } }, + handleMonthChange(value) { + if (value.includes('全部')) { + this.queryParams.monthList = [1,2,3,4,5,6,7,8,9,10,11,12] + } + }, // 纵坐标变化 handleYcoChange(value) { if (value.length > 2) { @@ -286,10 +297,29 @@ export default { return value.toFixed(1); } }; + let yMax = 0 + this.trendData.series && this.trendData.series.forEach(item => { + yMax = Math.max(...item.data) > yMax ? Math.max(...item.data) : yMax + if (item.name === '二氧化氮') { + yMax = yMax > 40 ? yMax : 40 + } else if (item.name === '二氧化硫') { + yMax = yMax > 60 ? yMax : 60 + } else if (item.name === '可吸入颗粒物') { + yMax = yMax > 70 ? yMax : 70 + } else if (item.name === '一氧化碳') { + yMax = yMax > 4 ? yMax : 4 + } else if (item.name === '臭氧') { + yMax = yMax > 160 ? yMax : 160 + } else if (item.name === '细颗粒物') { + yMax = yMax > 35 ? yMax : 35 + } + }) + console.log("yMax", yMax); this.trendData.yAxis && this.trendData.yAxis.forEach(item=>{ console.log("item", item); if (item.name === '浓度') { item.name = '浓度 单位：微克/立方米（一氧化碳：毫克/立方米）' + item.max = yMax } }) if (trendChart != null && trendChart != '' && trendChart != undefined) { diff --git a/src/views/water/drinking-water-village/collect/colums.js b/src/views/water/drinking-water-village/collect/colums.js index b3add5b..cb407b9 100644 --- a/src/views/water/drinking-water-village/collect/colums.js +++ b/src/views/water/drinking-water-village/collect/colums.js @@ -1,5 +1,6 @@ //地表水表格 const tableColumns = [ + {title:"取水量",dataIndex:"waterWithdrawal",sorter:true}, {title:"断面代码",dataIndex:"sectionCode",sorter:true}, {title: "省",dataIndex: "province",sorter: true,}, {title: "市",dataIndex: "city",sorter: true,}, diff --git a/src/views/water/drinking-water-village/collect/utils.js b/src/views/water/drinking-water-village/collect/utils.js index d11120d..e4a469c 100644 --- a/src/views/water/drinking-water-village/collect/utils.js +++ b/src/views/water/drinking-water-village/collect/utils.js @@ -136,5 +136,14 @@ export default { }; return row; }) - } + }, + importWaterWithdrawalData(excelData){ + return excelData.map(item => { + const row = { + place:item[0], + waterWithdrawal:item[1], + } + return row; + }) +} } \ No newline at end of file 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 c7a8249..b765116 100644 --- a/src/views/water/drinking-water-village/collect/water-bill.vue +++ b/src/views/water/drinking-water-village/collect/water-bill.vue @@ -118,6 +118,25 @@ 删除 + + + 取水量导入 + @@ -132,13 +151,16 @@ EditOutlined } from '@ant-design/icons-vue'; import { Modal } from 'ant-design-vue'; + import utils from "./utils"; + import XLSX from "xlsx"; import { pageBillUrl, // saveDrinkingWaterVillageBill, removeDrinkingWaterVillageBill, removeBatchDrinkingWaterVillageBill, updateDrinkingWaterVillageBill, - verifyDrinkingWaterVillageBill + verifyDrinkingWaterVillageBill, + updateVillageWaterWithdrawal } from "@/api/ecology/drinking-water-village"; import moment from "moment"; export default { @@ -271,7 +293,94 @@ }; }, methods: { + /*取水量导入 */ + importWaterWithdrawal(file,record) { + const hide = this.$message.loading("导入中..", 0); + let reader = new FileReader(); + reader.onload = (e) => { + try { + let data = new Uint8Array(e.target.result); + let workbook = XLSX.read(data, { + type: "array", + }); + + let sheetNames = workbook.SheetNames; + // 解析成二维数组 + let aoa1 = XLSX.utils.sheet_to_json( + workbook.Sheets[sheetNames[0]], { + header: 1, + }); + + + const drinkingWaterList = aoa1.filter((item) => { + return ( + item[0] && !item[0].includes("取水点") && !item[0].includes("合计") + ); + }); + + + const drinkingWaterVillageBillId=record.drinkingWaterVillageBillId; + + // drinkingWaterList.drinkingWaterBillId=record.drinkingWaterBillId; + // 解析成对象数组 + // const billName1 = file.name; + const billData1 = utils.importWaterWithdrawalData(drinkingWaterList); + // console.log(drinkingWaterList.length); + // console.log(billData1.place); + if (!billData1 || billData1.length == 0) { + hide(); + Modal.error({ + title: "导入失败", + content: "找不到可用数据", + }); + return; + } + + if (billData1.length > 0) { + updateVillageWaterWithdrawal({ + // drinkingWaterBillId:record.drinkingWaterBillId, + id:drinkingWaterVillageBillId, + waterWithdrawals: billData1, + }) + .then((res) => { + if (res.data.code == 0) { + Modal.success({ + title: "导入成功", + content: `成功导入${billData1.length}条数据`, + }); + this.$refs.water && this.$refs.water.reload(); + } else { + Modal.error({ + title: "导入失败", + content: "数据上传出错1", + + }); + } + }) + .catch(() => { + Modal.error({ + title: "导入失败", + content: "数据上传出错2", + }); + }) + .finally(() => { + hide(); + }); + + } + } catch (error) { + hide(); + Modal.error({ + title: "导入失败", + content: error.message, + }); + console.log(error); + } + }; + reader.readAsArrayBuffer(file); + return false; + }, /* 刷新表格 */ reload() { diff --git a/src/views/water/drinking-water/collect/water-bill.vue b/src/views/water/drinking-water/collect/water-bill.vue index b393f0d..32836f9 100644 --- a/src/views/water/drinking-water/collect/water-bill.vue +++ b/src/views/water/drinking-water/collect/water-bill.vue @@ -196,12 +196,18 @@ accept=".xls,.xlsx,.csv" > - 取水量导入 --> + 取水量导入 @@ -355,14 +361,15 @@ export default { methods: { /* 判断是否是市级，用于取水量导入 */ - isCity(record) { - if (record.regionLevel === "市级") { - return false; - } else { - return true; - } - }, - /*市级取水量导入 */ + // isCity(record) { + // if (record.regionLevel === "市级") { + // return false; + // } else { + // return true; + // } + // }, + + /*取水量导入 */ importWaterWithdrawal(file,record) { const hide = this.$message.loading("导入中..", 0); let reader = new FileReader();