diff --git a/public/template/各取水点取水量情况表.xlsx b/public/template/各取水点取水量情况表.xlsx
new file mode 100644
index 0000000..e04305f
Binary files /dev/null and b/public/template/各取水点取水量情况表.xlsx differ
diff --git a/src/views/sound/function/trend/index.vue b/src/views/sound/function/trend/index.vue
index 91347d7..abe9791 100644
--- a/src/views/sound/function/trend/index.vue
+++ b/src/views/sound/function/trend/index.vue
@@ -23,12 +23,12 @@
-
+
@@ -86,8 +86,8 @@
return {
queryParams: {
yearList: ["2021"],
- areaList: [],
- placeList: ['广西大学'], // 测点名称
+ areaList: ['南宁市'],
+ placeList: [], // 测点名称
quarterList: [], // 季度
regionLevel: '市级', // 区域等级
xco: '年度' ,// 横坐标
@@ -187,6 +187,7 @@
value: item.dictDataName,
};
});
+ this.areaOptions.unshift({ label: '所有县', value: '所有县'})
})
},
// 测点名称下拉列表
diff --git a/src/views/sound/road/trend/index.vue b/src/views/sound/road/trend/index.vue
index 505e8fb..d9b47c4 100644
--- a/src/views/sound/road/trend/index.vue
+++ b/src/views/sound/road/trend/index.vue
@@ -29,6 +29,13 @@
+
+
+
+ {{ item.label }}
+
+
+
@@ -70,10 +77,12 @@
areaList: ['南宁市'],
placeList: [],
regionLevel: '市级', // 区域等级
+ timeSlot: '昼',
xco: '年度' // 横坐标
},
trendData: [],
regionLevelOptions: [],
+ timeSlotOptions: [],
placeOptions: [],
areaOptions: [],
yearOptions: [],
@@ -112,6 +121,14 @@
};
});
});
+ getColumnOptions("time_slot").then((res) => {
+ this.timeSlotOptions = res.data.data.map((item) => {
+ return {
+ label: item,
+ value: item,
+ };
+ });
+ });
this.getArea()
this.getPlace('市级')
},
@@ -136,6 +153,7 @@
value: item.dictDataName,
};
});
+ this.areaOptions.unshift({ label: '所有县', value: '所有县'})
})
},
// 测点名称下拉列表
diff --git a/src/views/sound/zone/trend/index.vue b/src/views/sound/zone/trend/index.vue
index 96db22c..5ff9562 100644
--- a/src/views/sound/zone/trend/index.vue
+++ b/src/views/sound/zone/trend/index.vue
@@ -153,6 +153,7 @@
value: item.dictDataName,
};
});
+ this.areaOptions.unshift({ label: '所有县', value: '所有县'})
})
},
// 测点名称下拉列表
diff --git a/src/views/water/drinking-water/collect/index.vue b/src/views/water/drinking-water/collect/index.vue
index 2966e9a..8911552 100644
--- a/src/views/water/drinking-water/collect/index.vue
+++ b/src/views/water/drinking-water/collect/index.vue
@@ -76,6 +76,7 @@
县级（在用）地表水饮用水
县级（备用、规划）地表水饮用水
县级地下水饮用水
+ 各取水点取水量取水量表
diff --git a/src/views/water/drinking-water/collect/water-bill.vue b/src/views/water/drinking-water/collect/water-bill.vue
index 20cf2bd..2166920 100644
--- a/src/views/water/drinking-water/collect/water-bill.vue
+++ b/src/views/water/drinking-water/collect/water-bill.vue
@@ -162,8 +162,9 @@
>
{
return (
item[0] && !item[0].includes("取水点") && !item[0].includes("合计")
);
});
+
+ const id=record.drinkingWaterBillId;
+
+ // drinkingWaterList.drinkingWaterBillId=record.drinkingWaterBillId;
// 解析成对象数组
// const billName1 = file.name;
const billData1 = utils.importWaterWithdrawalData(drinkingWaterList);
- console.log(billData1);
+ // console.log(drinkingWaterList.length);
// console.log(billData1.place);
if (!billData1 || billData1.length == 0) {
hide();
@@ -369,9 +376,11 @@ export default {
});
return;
}
-
+
if (billData1.length > 0) {
updateWaterWithdrawal({
+ // drinkingWaterBillId:record.drinkingWaterBillId,
+ drinkingWaterBillId:id,
drinkingWaterList: billData1,
})
.then((res) => {
@@ -384,7 +393,7 @@ export default {
Modal.error({
title: "导入失败",
content: "数据上传出错1",
-
+
});
}
})
@@ -397,7 +406,7 @@ export default {
.finally(() => {
hide();
});
-
+
}
// if (billData1.length > 0) {
// // 上传到服务器
@@ -633,4 +642,4 @@ export default {
.editable-cell:hover .editable-cell-icon {
display: inline-block;
}
-
\ No newline at end of file
+
diff --git a/src/views/water/lake/dict/inner.vue b/src/views/water/lake/dict/inner.vue
index 9c9a2ac..929a7bc 100644
--- a/src/views/water/lake/dict/inner.vue
+++ b/src/views/water/lake/dict/inner.vue
@@ -50,7 +50,18 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -136,6 +147,23 @@
title: "点位名称",
dataIndex: "sectionName",
sorter: true,
+ },
+ {
+ title: "点位经度",
+ dataIndex: "longitude",
+ },
+ {
+ title: "点位纬度",
+ dataIndex: "latitude",
+ },
+ {
+ title: "类别",
+ dataIndex: "type",
+ },
+ {
+ title: "排序",
+ dataIndex: "sort",
+ sorter: true,
},
{
title: "操作",
@@ -171,6 +199,22 @@
required: true,
message: '请输入点位名称'
}],
+ longitude: [{
+ required: true,
+ message: '请输入点位经度'
+ }],
+ latitude: [{
+ required: true,
+ message: '请输入点位纬度'
+ }],
+ type: [{
+ required: true,
+ message: '请输入类型'
+ }],
+ sort: [{
+ required: true,
+ message: '请输入排序'
+ }],
},
yearOptions: [],
showNYear: false,
diff --git a/src/views/water/lake/dict/special.vue b/src/views/water/lake/dict/special.vue
index ce6c261..60a4503 100644
--- a/src/views/water/lake/dict/special.vue
+++ b/src/views/water/lake/dict/special.vue
@@ -107,7 +107,18 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -251,6 +262,23 @@ export default {
title: "水期代码",
dataIndex: "waterCode",
},
+ {
+ title: "点位经度",
+ dataIndex: "longitude",
+ },
+ {
+ title: "点位纬度",
+ dataIndex: "latitude",
+ },
+ {
+ title: "类别",
+ dataIndex: "type",
+ },
+ {
+ title: "排序",
+ dataIndex: "sort",
+ sorter: true,
+ },
{
title: "操作",
key: "action",
@@ -276,7 +304,23 @@ export default {
year: [{required: true, message: '请输入年份'}],
sectionName:[{
required:true,message: "请输入点位名称",
- }]
+ }],
+ longitude: [{
+ required: true,
+ message: '请输入点位经度'
+ }],
+ latitude: [{
+ required: true,
+ message: '请输入点位纬度'
+ }],
+ type: [{
+ required: true,
+ message: '请输入类型'
+ }],
+ sort: [{
+ required: true,
+ message: '请输入排序'
+ }],
},
yearOptions: [],
showNYear:false,