diff --git a/.env.development b/.env.development
index 31b1eb7..a6d0c96 100644
--- a/.env.development
+++ b/.env.development
@@ -1 +1 @@
-VUE_APP_API_BASE_URL=http://localhost:10001/api
+VUE_APP_API_BASE_URL=http://101.132.173.65:10001/api
diff --git a/src/api/ecology/new-lake.js b/src/api/ecology/new-lake.js
new file mode 100644
index 0000000..2fa9711
--- /dev/null
+++ b/src/api/ecology/new-lake.js
@@ -0,0 +1,38 @@
+import axios from 'axios';
+
+// 湖库断面,区域
+export const getLakeDropdown = function () {
+ return axios.get(`/lakeLibrary/lakeCityDict/list`)
+}
+
+// 湖库水质分析城市内湖原始数据接口
+export const cityOriginalUrl = '/lakeLibrary/wateAnalysis/city/originalData'
+export const cityOriginalData = function (data) {
+ return axios.post(cityOriginalUrl,data)
+}
+
+//城市内湖综合营养指数接口
+export const cityComprehensiveNutritionUrl = '/lakeLibrary/wateAnalysis/city/comprehensiveNutrition';
+export const cityComprehensiveNutritionData = function (data) {
+ return axios.post(cityComprehensiveNutritionUrl,data)
+}
+
+
+// 城市内湖平均数据接口
+export const cityAverageUrl = '/lakeLibrary/wateAnalysis/city/average';
+export const cityAverageData = function (data) {
+ return axios.post(cityAverageUrl,data)
+}
+
+
+// 城市内湖平均营养指数接口
+export const cityAverageNutritionUrl = '/lakeLibrary/wateAnalysis/city/averageNutrition';
+export const cityAverageNutrition = function (data) {
+ return axios.post(cityAverageNutritionUrl,data)
+}
+
+// 城市内湖平均营养指数接口
+export const cityYearContrastUrl = '/lakeLibrary/wateAnalysis/city/yearContrast';
+export const cityYearContrastData = function (data) {
+ return axios.post(cityYearContrastUrl,data)
+}
\ No newline at end of file
diff --git a/src/views/water/lake/statistic/inner/component/average.vue b/src/views/water/lake/statistic/inner/component/average.vue
index c6b2956..c8c5e81 100644
--- a/src/views/water/lake/statistic/inner/component/average.vue
+++ b/src/views/water/lake/statistic/inner/component/average.vue
@@ -3,13 +3,13 @@
-
+
import XLSX from "xlsx";
-import {pageLakeUrl, getColumnOptions} from "@/api/ecology/lake";
+// import {pageLakeUrl, getColumnOptions} from "@/api/ecology/lake";
+import {cityAverageData} from "@/api/ecology/new-lake";
import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
import Search from './search.vue';
import {averageTableColumns} from "./raw-colums"
@@ -45,6 +46,9 @@ export default {
default: function () {
return []
},
+ },
+ visiable:{
+ typeof:Boolean
}
},
data() {
@@ -53,7 +57,7 @@ export default {
locale,
bill: {},
// 表格数据接口
- url: pageLakeUrl,
+ datasource:[],
selection: [],
// 表格列配置
columns: averageTableColumns,
@@ -63,10 +67,10 @@ export default {
where:{},
// 表格选中数据
selectionList: [],
+ loading: false
};
},
mounted() {
- // this.loadOptionData();
},
watch: {
filterKeys(newKeys) {
@@ -74,7 +78,24 @@ export default {
},
},
methods: {
- // 传上父级
+
+ // 获取列表数据
+ getPageData(){
+ this.loading = true;
+ cityAverageData(this.where).then(res=>{
+ this.loading = false;
+ if(res.data.code){
+ this.$message.error(res.data.msg);
+ this.datasource = []
+ }else{
+ this.datasource = res.data.data
+ }
+ }).catch(()=>{
+ this.loading = false;
+ })
+ },
+
+ // 传上父级
changeFilter(data){
this.$emit('changeFilter',data)
},
@@ -105,39 +126,12 @@ export default {
this.reload();
},
- /**获取下来框数据 */
- loadOptionData() {
- getColumnOptions("place").then((res) => {
- this.palceOptions = res.data.data.map((item) => {
- return {
- label: item,
- value: item,
- };
- });
- });
- getColumnOptions("area").then((res) => {
- this.areaOptions = res.data.data.map((item) => {
- return {
- label: item,
- value: item,
- };
- });
- });
- getColumnOptions("region_level").then((res) => {
- this.regionLevelOptions = res.data.data.map((item) => {
- return {
- label: item,
- value: item,
- };
- });
- });
- },
/* 刷新表格 */
reload() {
-
- this.$refs.table.reload({
- where: this.where,
- });
+ this.getPageData()
+ // this.$refs.table.reload({
+ // where: this.where,
+ // });
},
/* 重置搜索 */
reset() {
diff --git a/src/views/water/lake/statistic/inner/component/avg-nutritional.vue b/src/views/water/lake/statistic/inner/component/avg-nutritional.vue
index 2af7158..b6f12a3 100644
--- a/src/views/water/lake/statistic/inner/component/avg-nutritional.vue
+++ b/src/views/water/lake/statistic/inner/component/avg-nutritional.vue
@@ -3,15 +3,15 @@
-
+
(data = d.data)"
>
@@ -23,7 +23,8 @@