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

新增/修复农村饮用水板块，修复市级县级饮用水板块

Browse Source
This commit is contained in:
710356044
2021-11-22 13:03:50 +08:00
parent 05f2424bea
commit 534db1163c
23 changed files with 901 additions and 615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/views/water/drinking-water/collect/index.vue
View File

@@ -71,11 +71,11 @@
<a-dropdown>
<template #overlay>
<a-menu style="word-spacing:10px;">
<a-menu-item @click="download('市级地表水（在用）导入','xls')"> 市级在用导入{{"\xa0"}} <span style="color:#1890FF">模板下载</span> </a-menu-item>
<a-menu-item @click="download('市级地表水（备用）导入','xlsx')"> 市级备用导入{{"\xa0"}} <span style="color:#1890FF">模板下载</span> </a-menu-item>
<a-menu-item @click="download('县级地表水（在用）','xlsm')"> 县级在用导入{{"\xa0"}} <span style="color:#1890FF">模板下载</span> </a-menu-item>
<a-menu-item @click="download('县级地表水（备用）','xls')"> 县级备用导入{{"\xa0"}} <span style="color:#1890FF">模板下载</span> </a-menu-item>
<a-menu-item @click="download('县级地下水','xlsx')" style="word-spacing:3px"> 县级地下水导入{{"\xa0"}} <span style="color:#1890FF">模板下载</span> </a-menu-item>
<a-menu-item @click="download('市级（在用）地表水饮用水','xls')" > 市级（在用）地表水饮用水 </a-menu-item>
<a-menu-item @click="download('市级（备用）地表水饮用水','xlsx')" > 市级（备用）地表水饮用水 </a-menu-item>
<a-menu-item @click="download('县级（在用）地表水饮用水','xlsm')" > 县级（在用）地表水饮用水 </a-menu-item>
<a-menu-item @click="download('县级（备用、规划）地表水饮用水','xls')"> 县级（备用、规划）地表水饮用水 </a-menu-item>
<a-menu-item @click="download('县级地下水饮用水','xlsx')" > 县级地下水饮用水 </a-menu-item>
</a-menu>
</template>
<a-button type="primary" style="left: 60px">
@@ -84,8 +84,10 @@
</a-button>
</a-dropdown>
</template>
<a-tabs v-model:activeKey="activeKey">
<a-tab-pane tab="饮用水" key="water">
<a-tab-pane tab="饮用水页面" key="water">
<water-bill ref="water"></water-bill>
</a-tab-pane>
</a-tabs>
@@ -149,7 +151,7 @@ export default {
});
// 解析成对象数组
const billName1 = aoa1[0][0] + aoa1[1][0];
const billName1 = file.name;
const billData1 = utils.toCityUseTopWaterObjData(drinkingWaterList);
if (!billData1 || billData1.length == 0) {
@@ -237,7 +239,7 @@ export default {
});
// 解析成对象数组
const billName1 = aoa1[0][0] + aoa1[1][0];
const billName1 = file.name;
const billData1 = utils.toCitySpareTopWaterObjData(drinkingWaterList);
if (!billData1 || billData1.length == 0) {
@@ -325,7 +327,7 @@ export default {
});
// 解析成对象数组
const billName1 = aoa1[0][0];
const billName1 = file.name;
const billData1 = utils.toCountyUseTopWaterObjData(drinkingWaterList);
if (!billData1 || billData1.length == 0) {
@@ -413,7 +415,7 @@ export default {
});
// 解析成对象数组
const billName1 = aoa1[0][0];
const billName1 = file.name;
const billData1 = utils.toCountyUseTopWaterObjData(drinkingWaterList);
if (!billData1 || billData1.length == 0) {
@@ -501,10 +503,10 @@ export default {
});
// 解析成对象数组
const billName1 = aoa1[0][1];
const billName1 = file.name;
const billData1 =
utils.toCountyUseBottomWaterObjData(drinkingWaterList);
utils.toCountyUseBottomWaterObjData(drinkingWaterList);
console.log(billData1);
if (!billData1 || billData1.length == 0) {
hide();
Modal.error({
@@ -571,19 +573,6 @@ export default {
downloadTemplate(filename);
}
},
// //下载市级在用地表水文件
// downloadCityUseFile(){
// downloadTemplate();
// },
// //下载市级在用地表水文件
// downloadCityUseFile(){
// downloadTemplate();
// },
// //下载市级在用地表水文件
// downloadCityUseFile(){
// downloadTemplate();
// },
},
};
</script>