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

饮用水全部捆绑接口

Browse Source
This commit is contained in:
庞东林
2021-12-16 14:42:27 +08:00
parent 2e86910009
commit bcfc64295f
25 changed files with 226 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/water/drinking-water/statistic/city/base.vue
View File

@@ -14,7 +14,6 @@
/>
<!-- 表格 -->
<ele-pro-table
v-model:selection="selectionList"
ref="table"
row-key="drinkingWaterId"
:datasource="datasource"
@@ -199,7 +198,7 @@ export default {
const arr = [];
const th = columns.map((item) => item.title);
arr.push(th);
this.data.forEach((d) => {
this.datasource.forEach((d) => {
const td = columns.map((item) => d[item.dataIndex]);
arr.push(td);
});

4
src/views/water/drinking-water/statistic/city/index.vue
View File

@@ -77,9 +77,7 @@
checked: 1,
page:1,
limit:10,
drinkingWaterAnalyse:{
regionLevel:"市级"
},
regionLevel:"市级"
},
filterKeys:[]
};

13
src/views/water/drinking-water/statistic/city/overStandard.vue
View File

@@ -12,7 +12,6 @@
/>
<!-- 表格 -->
<ele-pro-table
v-model:selection="selectionList"
ref="table"
row-key="drinkingWaterId"
:datasource="datasource"
@@ -68,12 +67,12 @@ export default {
datasource:[],
selection: [],
columns: [
{title: "城市名称",dataIndex: "sourceWaterName",sorter: true,},
{title: "水源地名称",dataIndex: "waterWithdrawal",sorter: true,},
{title: "城市名称",dataIndex: "city",sorter: true,},
{title: "水源地名称",dataIndex: "sectionName",sorter: true,},
{title: "取水量（万m3）",dataIndex: "waterWithdrawal",sorter: true,},
{title: "超标水源取水量",dataIndex: "waterWithdrawal",sorter: true,},
{title: "超标项目",dataIndex: "waterWithdrawal",sorter: true,},
{title: "水源性质",dataIndex: "waterWithdrawal",sorter: true,},
{title: "超标水源取水量",dataIndex: "overWaterWithdrawal",sorter: true,},
{title: "超标项目",dataIndex: "overTargetname",sorter: true,},
{title: "水源性质",dataIndex: "waterSourceProperty",sorter: true,},
],
// 表格列配置
@@ -142,7 +141,7 @@ export default {
const arr = [];
const th = columns.map((item) => item.title);
arr.push(th);
this.data.forEach((d) => {
this.datasource.forEach((d) => {
const td = columns.map((item) => d[item.dataIndex]);
arr.push(td);
});

7
src/views/water/drinking-water/statistic/city/situation.vue
View File

@@ -86,8 +86,7 @@ import {
} from "@/api/ecology/new-drinking-water";
import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
// import { tableColumns } from "./colums";
// import moment from "moment";
import Search from "./../components/citySearch.vue";
import { CheckOutlined, EditOutlined } from '@ant-design/icons-vue';
@@ -217,7 +216,7 @@ export default {
this.getPageData()
this.columns[6].filters = []
if(this.where.drinkingWaterAnalyse.waterSourceType ==1 ){
if(this.where.waterSourceType ==1 ){
// 地表水
this.columns[6].filters = [
{
@@ -234,7 +233,7 @@ export default {
},
]
}
if(this.where.drinkingWaterAnalyse.waterSourceType ==2 ){
if(this.where.waterSourceType ==2 ){
// 地下水
this.columns[6].filters = [
{

3
src/views/water/drinking-water/statistic/city/waterCount.vue
View File

@@ -12,7 +12,6 @@
/>
<!-- 表格 -->
<ele-pro-table
v-model:selection="selectionList"
ref="table"
row-key="drinkingWaterId"
:datasource="datasource"
@@ -144,7 +143,7 @@ export default {
const arr = [];
const th = columns.map((item) => item.title);
arr.push(th);
this.data.forEach((d) => {
this.datasource.forEach((d) => {
const td = columns.map((item) => d[item.dataIndex]);
arr.push(td);
});

3
src/views/water/drinking-water/statistic/city/waterNutritional.vue
View File

@@ -13,7 +13,6 @@
/>
<!-- 表格 -->
<ele-pro-table
v-model:selection="selectionList"
ref="table"
row-key="drinkingWaterId"
:datasource="datasource"
@@ -145,7 +144,7 @@ export default {
const arr = [];
const th = columns.map((item) => item.title);
arr.push(th);
this.data.forEach((d) => {
this.datasource.forEach((d) => {
const td = columns.map((item) => d[item.dataIndex]);
arr.push(td);
});

1
src/views/water/drinking-water/statistic/city/waterQuality.vue
View File

@@ -13,7 +13,6 @@
/>
<!-- 表格 -->
<ele-pro-table
v-model:selection="selectionList"
ref="table"
row-key="drinkingWaterId"
:datasource="datasource"

3
src/views/water/drinking-water/statistic/city/waterQualityCount.vue
View File

@@ -14,7 +14,6 @@
/>
<!-- 表格 -->
<ele-pro-table
v-model:selection="selectionList"
ref="table"
row-key="drinkingWaterId"
:datasource="datasource"
@@ -145,7 +144,7 @@ export default {
const arr = [];
const th = columns.map((item) => item.title);
arr.push(th);
this.data.forEach((d) => {
this.datasource.forEach((d) => {
const td = columns.map((item) => d[item.dataIndex]);
arr.push(td);
});

6
src/views/water/drinking-water/statistic/city/waterQualityUp.vue
View File

@@ -13,7 +13,6 @@
/>
<!-- 表格 -->
<ele-pro-table
v-model:selection="selectionList"
ref="table"
row-key="drinkingWaterId"
:datasource="datasource"
@@ -115,8 +114,9 @@ export default {
let newData = []
const resData = res.data.data || {}
for(let i in resData){
newData.push(resData[i])
newData.push(...resData[i])
}
console.log('newData',newData)
this.datasource = newData
}
}).catch(()=>{
@@ -156,7 +156,7 @@ export default {
const arr = [];
const th = columns.map((item) => item.title);
arr.push(th);
this.data.forEach((d) => {
this.datasource.forEach((d) => {
const td = columns.map((item) => d[item.dataIndex]);
arr.push(td);
});