Merge branch 'master' of http://git.gxwebsoft.com/shengtaiting/shengtai-admin
This commit is contained in:
hey7845
BIN
public/template/各取水点取水量情况表.xlsx
Normal file
BIN
public/template/各取水点取水量情况表.xlsx
Normal file
Binary file not shown.
@@ -76,6 +76,7 @@
|
||||
<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-item @click="download('各取水点取水量情况表','xlsx')" > 各取水点取水量取水量表 </a-menu-item>
|
||||
</a-menu>
|
||||
</template>
|
||||
<a-button type="primary" style="left: 60px">
|
||||
|
||||
@@ -162,8 +162,9 @@
|
||||
>
|
||||
</a-popconfirm>
|
||||
<a-upload
|
||||
:before-upload="importWaterWithdrawal"
|
||||
:before-upload="file=>importWaterWithdrawal(file,record)"
|
||||
:showUploadList="false"
|
||||
|
||||
accept=".xls,.xlsx,.csv"
|
||||
>
|
||||
<a-button
|
||||
@@ -333,7 +334,7 @@ export default {
|
||||
}
|
||||
},
|
||||
/*市级取水量导入 */
|
||||
importWaterWithdrawal(file) {
|
||||
importWaterWithdrawal(file,record) {
|
||||
const hide = this.$message.loading("导入中..", 0);
|
||||
let reader = new FileReader();
|
||||
|
||||
@@ -343,23 +344,29 @@ export default {
|
||||
let workbook = XLSX.read(data, {
|
||||
type: "array",
|
||||
});
|
||||
//0.昼间数据 1.夜间数据 2.其他信息
|
||||
// let sheetNames = workbook.SheetNames;
|
||||
|
||||
let sheetNames = workbook.SheetNames;
|
||||
// 解析成二维数组
|
||||
let aoa1 = XLSX.utils.sheet_to_json(workbook.Sheets["Sheet1"], {
|
||||
let aoa1 = XLSX.utils.sheet_to_json(
|
||||
workbook.Sheets[sheetNames[0]], {
|
||||
header: 1,
|
||||
});
|
||||
|
||||
|
||||
const drinkingWaterList = aoa1.filter((item) => {
|
||||
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;
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
||||
@@ -50,7 +50,18 @@
|
||||
<a-form-item label="点位名称" name="sectionName">
|
||||
<a-input v-model:value="form.sectionName" placeholder="请输入点位名称" allow-clear />
|
||||
</a-form-item>
|
||||
|
||||
<a-form-item label="经度" name="longitude">
|
||||
<a-input v-model:value="form.longitude" placeholder="请输入点位经度" allow-clear />
|
||||
</a-form-item>
|
||||
<a-form-item label="纬度" name="latitude">
|
||||
<a-input v-model:value="form.latitude" placeholder="请输入点位纬度" allow-clear />
|
||||
</a-form-item>
|
||||
<a-form-item label="类别" name="type">
|
||||
<a-input v-model:value="form.type" placeholder="请输入类别" allow-clear />
|
||||
</a-form-item>
|
||||
<a-form-item label="排序" name="sort">
|
||||
<a-input-number v-model:value="form.sort" placeholder="请输入排序" allow-clear />
|
||||
</a-form-item>
|
||||
</a-form>
|
||||
</a-modal>
|
||||
<!-- 表格 -->
|
||||
@@ -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,
|
||||
|
||||
@@ -107,7 +107,18 @@
|
||||
<a-form-item label="水期代码" name="waterCode">
|
||||
<a-input v-model:value="form.waterCode" placeholder="请输入水期代码" allow-clear />
|
||||
</a-form-item>
|
||||
|
||||
<a-form-item label="经度" name="longitude">
|
||||
<a-input v-model:value="form.longitude" placeholder="请输入点位经度" allow-clear />
|
||||
</a-form-item>
|
||||
<a-form-item label="纬度" name="latitude">
|
||||
<a-input v-model:value="form.latitude" placeholder="请输入点位纬度" allow-clear />
|
||||
</a-form-item>
|
||||
<a-form-item label="类别" name="type">
|
||||
<a-input v-model:value="form.type" placeholder="请输入类别" allow-clear />
|
||||
</a-form-item>
|
||||
<a-form-item label="排序" name="sort">
|
||||
<a-input-number v-model:value="form.sort" placeholder="请输入排序" allow-clear />
|
||||
</a-form-item>
|
||||
</a-form>
|
||||
</a-modal>
|
||||
<!-- 表格 -->
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user