diff --git a/src/api/ecology/air.js b/src/api/ecology/air.js index 03d2f6e..06d527d 100644 --- a/src/api/ecology/air.js +++ b/src/api/ecology/air.js @@ -57,7 +57,8 @@ const updateAir = function (data) { const getColumnOptions = function(column){ return axios.get("/ambientAir/ambientAir/options",{params:{column}}) } - +//均值 百分位 +const statisticAvg = "/ambientAir/ambientAir/statistic/avg"; export { pageBillUrl, saveAirBill, @@ -73,6 +74,6 @@ export { updateAir, removeBatchAir, getColumnOptions, - + statisticAvg } diff --git a/src/api/ecology/atmosphere/acid-rain-plcae.js b/src/api/ecology/atmosphere/acid-rain-plcae.js new file mode 100644 index 0000000..eeccf92 --- /dev/null +++ b/src/api/ecology/atmosphere/acid-rain-plcae.js @@ -0,0 +1,32 @@ +import axios from 'axios'; +const baseUri = "/ambientAir/airPlaceBasicInfoDict"; +const listAllUrl = baseUri + ""; + +// 添加 +const savePlace = function (data) { + return axios.post("/ambientAir/airPlaceBasicInfoDict",data) +} + +// 删除 +const removePlace = function (id) { + return axios.delete(`/ambientAir/airPlaceBasicInfoDict/${id}`,) +} +// 批量删除 +const removeBatchPlace = function (ids) { + return axios.delete("/ambientAir/airPlaceBasicInfoDict/batch",{data:ids}) +} + +// 修改 +const updatePlace = function (data) { + return axios.put("/ambientAir/airPlaceBasicInfoDict",data) +} + + +export { + listAllUrl, + savePlace, + updatePlace, + removeBatchPlace, + removePlace + +} diff --git a/src/api/ecology/atmosphere/air-api-relate.js b/src/api/ecology/atmosphere/air-api-relate.js new file mode 100644 index 0000000..a8a9847 --- /dev/null +++ b/src/api/ecology/atmosphere/air-api-relate.js @@ -0,0 +1,32 @@ +import axios from 'axios'; +const baseUri = "/ambientAir/airAqiRelateInfoDict"; +const listAllUrl = baseUri + ""; + +// 添加 +const saveAqiRelate = function (data) { + return axios.post("/ambientAir/airAqiRelateInfoDict",data) +} + +// 删除 +const removeAqiRelate = function (id) { + return axios.delete(`/ambientAir/airAqiRelateInfoDict/${id}`,) +} +// 批量删除 +const removeBatchAqiRelate = function (ids) { + return axios.delete("/ambientAir/airAqiRelateInfoDict/batch",{data:ids}) +} + +// 修改 +const updateAqiRelate = function (data) { + return axios.put("/ambientAir/airAqiRelateInfoDict",data) +} + + +export { + listAllUrl, + saveAqiRelate, + updateAqiRelate, + removeBatchAqiRelate, + removeAqiRelate + +} diff --git a/src/api/ecology/atmosphere/air-evaluation-standard.js b/src/api/ecology/atmosphere/air-evaluation-standard.js new file mode 100644 index 0000000..9134f31 --- /dev/null +++ b/src/api/ecology/atmosphere/air-evaluation-standard.js @@ -0,0 +1,32 @@ +import axios from 'axios'; +const baseUri = "/ambientAir/airEvaluationStandard"; +const listAllUrl = baseUri + ""; + +// 添加 +const saveStandard = function (data) { + return axios.post("/ambientAir/airEvaluationStandard",data) +} + +// 删除 +const removeStandard = function (id) { + return axios.delete(`/ambientAir/airEvaluationStandard/${id}`,) +} +// 批量删除 +const removeBatchStandard = function (ids) { + return axios.delete("/ambientAir/airEvaluationStandard/batch",{data:ids}) +} + +// 修改 +const updateStandard = function (data) { + return axios.put("/ambientAir/airEvaluationStandard",data) +} + + +export { + listAllUrl, + saveStandard, + updateStandard, + removeBatchStandard, + removeStandard + +} diff --git a/src/api/ecology/atmosphere/air-indicator-iaqi.js b/src/api/ecology/atmosphere/air-indicator-iaqi.js new file mode 100644 index 0000000..356eb3f --- /dev/null +++ b/src/api/ecology/atmosphere/air-indicator-iaqi.js @@ -0,0 +1,32 @@ +import axios from 'axios'; +const baseUri = "/ambientAir/airIndicatorIaqiDict"; +const listAllUrl = baseUri + ""; + +// 添加 +const saveIndicatorIaqi = function (data) { + return axios.post("/ambientAir/airIndicatorIaqiDict",data) +} + +// 删除 +const removeIndicatorIaqi = function (id) { + return axios.delete(`/ambientAir/airIndicatorIaqiDict/${id}`,) +} +// 批量删除 +const removeBatchIndicatorIaqi = function (ids) { + return axios.delete("/ambientAir/airIndicatorIaqiDict/batch",{data:ids}) +} + +// 修改 +const updateIndicatorIaqi = function (data) { + return axios.put("/ambientAir/airIndicatorIaqiDict",data) +} + + +export { + listAllUrl, + saveIndicatorIaqi, + updateIndicatorIaqi, + removeBatchIndicatorIaqi, + removeIndicatorIaqi + +} diff --git a/src/api/ecology/atmosphere/air-plcae.js b/src/api/ecology/atmosphere/air-plcae.js new file mode 100644 index 0000000..eeccf92 --- /dev/null +++ b/src/api/ecology/atmosphere/air-plcae.js @@ -0,0 +1,32 @@ +import axios from 'axios'; +const baseUri = "/ambientAir/airPlaceBasicInfoDict"; +const listAllUrl = baseUri + ""; + +// 添加 +const savePlace = function (data) { + return axios.post("/ambientAir/airPlaceBasicInfoDict",data) +} + +// 删除 +const removePlace = function (id) { + return axios.delete(`/ambientAir/airPlaceBasicInfoDict/${id}`,) +} +// 批量删除 +const removeBatchPlace = function (ids) { + return axios.delete("/ambientAir/airPlaceBasicInfoDict/batch",{data:ids}) +} + +// 修改 +const updatePlace = function (data) { + return axios.put("/ambientAir/airPlaceBasicInfoDict",data) +} + + +export { + listAllUrl, + savePlace, + updatePlace, + removeBatchPlace, + removePlace + +} diff --git a/src/views/atmosphere/acid-rain/dict/place.vue b/src/views/atmosphere/acid-rain/dict/place.vue index 4e3c05b..5940883 100644 --- a/src/views/atmosphere/acid-rain/dict/place.vue +++ b/src/views/atmosphere/acid-rain/dict/place.vue @@ -3,7 +3,7 @@ - - - - - - - - - - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + { if (res.data.code == 0) { @@ -295,7 +218,7 @@ export default { /* 删除单个 */ remove(row) { const hide = this.$message.loading('请求中..', 0); - removePlace(row.zoneNoisePlaceId).then((res) => { + removePlace(row.airBasicInfoDictId).then((res) => { hide(); if (res.data.code === 0) { this.$message.success(res.data.msg); @@ -311,7 +234,7 @@ export default { /* 批量删除 */ removeBatch() { const hide = this.$message.loading('请求中..', 0); - const ids = this.selectionList.map((item) => item.zoneNoisePlaceId); + const ids = this.selectionList.map((item) => item.airBasicInfoDictId); removeBatchPlace(ids).then((res) => { if (res.data.code === 0) { this.$message.success(res.data.msg); diff --git a/src/views/atmosphere/air/collect/index.vue b/src/views/atmosphere/air/collect/index.vue index 1f3d2b2..3e970f7 100644 --- a/src/views/atmosphere/air/collect/index.vue +++ b/src/views/atmosphere/air/collect/index.vue @@ -77,11 +77,11 @@ export default { // 解析成对象数组 - const billName1 = sheetNames[0]; + const billName1 = file.name + sheetNames[0]; const billData1 = utils.toStationObjData(airList1); - const billName2 = sheetNames[1]; + const billName2 = file.name + sheetNames[1]; const billData2 = utils.toCityObjData(airList2); - const billName3 = sheetNames[2]; + const billName3 = file.name + sheetNames[2]; const billData3 = utils.toAreaObjData(airList3); if ( (!billData1 || billData1.length == 0) && @@ -101,7 +101,7 @@ export default { tasks.push( saveAirBill({ billName: billName1, - regionLevel: "站点", + regionLevel: "place", ambientAirList: billData1, }) ); @@ -110,7 +110,7 @@ export default { tasks.push( saveAirBill({ billName: billName2, - regionLevel: "市级", + regionLevel: "city", ambientAirList: billData2, }) ); @@ -119,7 +119,7 @@ export default { tasks.push( saveAirBill({ billName: billName3, - regionLevel: "县级", + regionLevel: "county", ambientAirList: billData3, }) ); diff --git a/src/views/atmosphere/air/collect/utils.js b/src/views/atmosphere/air/collect/utils.js index f4f67dd..ef33aac 100644 --- a/src/views/atmosphere/air/collect/utils.js +++ b/src/views/atmosphere/air/collect/utils.js @@ -25,8 +25,11 @@ export default { }, toAreaObjData(excelData) { const result = excelData.map(item => { + const place = item[0]; + const county = place.substr(0,place.indexOf("县") + 1); const row = { - place: item[0], + place, + county, monitorTime: moment(item[1]).format("YYYY/MM/DD HH:mm:ss"), airQualityStatus: item[2], aqiLevel: item[3], @@ -46,9 +49,12 @@ export default { }, toStationObjData(excelData) { const result = excelData.map(item => { + const place = item[1]; + // const county = place.substr(0,place.indexOf("县")) const row = { city: item[0], - place: item[1], + // county, + place, monitorTime: moment(item[2]).format("YYYY/MM/DD HH:mm:ss"), so2: Number(item[3]) || null, no2: Number(item[5]) || null, diff --git a/src/views/atmosphere/air/dict/api-relate.vue b/src/views/atmosphere/air/dict/api-relate.vue new file mode 100644 index 0000000..e7632ac --- /dev/null +++ b/src/views/atmosphere/air/dict/api-relate.vue @@ -0,0 +1,292 @@ + + + + + \ No newline at end of file diff --git a/src/views/atmosphere/air/dict/evaluation-standard.vue b/src/views/atmosphere/air/dict/evaluation-standard.vue new file mode 100644 index 0000000..e1d084f --- /dev/null +++ b/src/views/atmosphere/air/dict/evaluation-standard.vue @@ -0,0 +1,299 @@ + + + + + \ No newline at end of file diff --git a/src/views/atmosphere/air/dict/index.vue b/src/views/atmosphere/air/dict/index.vue new file mode 100644 index 0000000..a84e3b2 --- /dev/null +++ b/src/views/atmosphere/air/dict/index.vue @@ -0,0 +1,55 @@ + + + + + \ No newline at end of file diff --git a/src/views/atmosphere/air/dict/indicator-iaqi.vue b/src/views/atmosphere/air/dict/indicator-iaqi.vue new file mode 100644 index 0000000..4049bba --- /dev/null +++ b/src/views/atmosphere/air/dict/indicator-iaqi.vue @@ -0,0 +1,262 @@ + + + + + \ No newline at end of file diff --git a/src/views/atmosphere/air/dict/place-bill.vue b/src/views/atmosphere/air/dict/place-bill.vue new file mode 100644 index 0000000..9e50105 --- /dev/null +++ b/src/views/atmosphere/air/dict/place-bill.vue @@ -0,0 +1,234 @@ + + + + + \ No newline at end of file diff --git a/src/views/atmosphere/air/dict/place.vue b/src/views/atmosphere/air/dict/place.vue new file mode 100644 index 0000000..7bf2b38 --- /dev/null +++ b/src/views/atmosphere/air/dict/place.vue @@ -0,0 +1,257 @@ + + + + + \ No newline at end of file diff --git a/src/views/atmosphere/air/statistic/avg.vue b/src/views/atmosphere/air/statistic/avg.vue new file mode 100644 index 0000000..33b9ba7 --- /dev/null +++ b/src/views/atmosphere/air/statistic/avg.vue @@ -0,0 +1,228 @@ + + + + + \ No newline at end of file diff --git a/src/views/atmosphere/air/statistic/index.vue b/src/views/atmosphere/air/statistic/index.vue index 1ad7a84..ba30c5b 100644 --- a/src/views/atmosphere/air/statistic/index.vue +++ b/src/views/atmosphere/air/statistic/index.vue @@ -5,7 +5,9 @@ - + + + @@ -18,15 +20,16 @@ * */ import BaseStatistic from "./base.vue"; + import AvgStatistic from "./avg"; export default { name: 'StatisticAirIndex', components: { - BaseStatistic, + BaseStatistic,AvgStatistic }, data() { return { - activeKey: 'base' + activeKey: 'avg' }; }, diff --git a/src/views/sound/zone/statistic/index.vue b/src/views/sound/zone/statistic/index.vue index c981c4b..60174f3 100644 --- a/src/views/sound/zone/statistic/index.vue +++ b/src/views/sound/zone/statistic/index.vue @@ -29,8 +29,6 @@ * */ import BaseStatistic from "./base.vue"; - // import QuarterStatistic from "./quarter.vue"; - // import Compare from "./compare.vue"; import AverageStatistic from "./average.vue"; import SourceStatistic from "./source.vue"; import YearStatistic from "./year.vue";