From 5a30d9ca4c0f5919479dfcbf4b306b9e0db75b27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= <donglinpang@163.com>
Date: Tue, 14 Dec 2021 20:25:50 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E4=B8=8D=E5=85=A8=E7=AD=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lake/statistic/inner/component/average.vue     |  3 +--
 .../statistic/inner/component/avg-nutritional.vue  | 10 ++++++++--
 .../statistic/inner/component/com-nutritional.vue  | 10 ++++++++--
 .../lake/statistic/inner/component/comparison.vue  | 10 ++++++++--
 .../lake/statistic/inner/component/raw-colums.js   | 14 ++++++++++++++
 .../water/lake/statistic/inner/component/raw.vue   |  4 ++--
 .../lake/statistic/special/component/average.vue   |  3 +--
 .../special/component/avg-nutritional.vue          | 10 ++++++++--
 .../special/component/com-nutritional.vue          | 10 ++++++++--
 .../statistic/special/component/comparison.vue     | 10 ++++++++--
 .../lake/statistic/special/component/raw-colums.js | 14 ++++++++++++++
 .../water/lake/statistic/special/component/raw.vue |  3 +--
 12 files changed, 81 insertions(+), 20 deletions(-)

diff --git a/src/views/water/lake/statistic/inner/component/average.vue b/src/views/water/lake/statistic/inner/component/average.vue
index c8c5e81..4cd9ff1 100644
--- a/src/views/water/lake/statistic/inner/component/average.vue
+++ b/src/views/water/lake/statistic/inner/component/average.vue
@@ -6,7 +6,6 @@
            <search :searchForm="searchForm" :filterKeys="filterKeys" @search="searchData" @exportFile="exportFile" @filterColumns="changeFilter" :visiable="visiable"/>
             <!-- 表格 -->
             <ele-pro-table
-                v-model:selection="selectionList"
                 ref="table"
                 :loading="loading"
                 :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);
             });
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 b6f12a3..e822539 100644
--- a/src/views/water/lake/statistic/inner/component/avg-nutritional.vue
+++ b/src/views/water/lake/statistic/inner/component/avg-nutritional.vue
@@ -6,7 +6,6 @@
            <search :searchForm="searchForm" :filterKeys="filterKeys" @search="searchData" @exportFile="exportFile" @filterColumns="changeFilter" :visiable="visiable"/>
             <!-- 表格 -->
             <ele-pro-table
-                v-model:selection="selectionList"
                 ref="table"
                 :datasource="datasource"
                 :columns="columns"
@@ -60,6 +59,13 @@ export default {
             selection: [],
             // 表格列配置
             columns: [
+                {
+                    key: 'index',
+                    dataIndex: 'index',
+                    width: 48,
+                    align: 'center',
+                    customRender: ({index}) => index + 1
+                },
                 {title: "监测时间", dataIndex: "monitorTime", sorter: true,},
                 {title: "类别", dataIndex: "type", sorter: true,},
                 {title: "点位名称", dataIndex: "pointName", sorter: true,},
@@ -125,7 +131,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);
             });
diff --git a/src/views/water/lake/statistic/inner/component/com-nutritional.vue b/src/views/water/lake/statistic/inner/component/com-nutritional.vue
index cd35ed4..45575d7 100644
--- a/src/views/water/lake/statistic/inner/component/com-nutritional.vue
+++ b/src/views/water/lake/statistic/inner/component/com-nutritional.vue
@@ -6,7 +6,6 @@
            <search :searchForm="searchForm" :filterKeys="filterKeys" @search="searchData" @exportFile="exportFile" @filterColumns="changeFilter" :visiable="visiable"/>
             <!-- 表格 -->
             <ele-pro-table
-                v-model:selection="selectionList"
                 ref="table"
                 :datasource="datasource"
                 :columns="columns"
@@ -61,6 +60,13 @@ export default {
             selection: [],
             // 表格列配置
             columns: [
+                {
+                    key: 'index',
+                    dataIndex: 'index',
+                    width: 48,
+                    align: 'center',
+                    customRender: ({index}) => index + 1
+                },
                 {title: "监测时间", dataIndex: "monitorTime", sorter: true,},
                 {title: "类别", dataIndex: "type", sorter: true,},
                 {title: "点位名称", dataIndex: "pointName", sorter: true,},
@@ -129,7 +135,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);
             });
diff --git a/src/views/water/lake/statistic/inner/component/comparison.vue b/src/views/water/lake/statistic/inner/component/comparison.vue
index b328004..8202442 100644
--- a/src/views/water/lake/statistic/inner/component/comparison.vue
+++ b/src/views/water/lake/statistic/inner/component/comparison.vue
@@ -6,7 +6,6 @@
     <search :searchForm="searchForm" :filterKeys="filterKeys" @search="searchData" @exportFile="exportFile" @filterColumns="changeFilter" :visiable="visiable"/>
       <!-- 表格 -->
       <ele-pro-table
-        v-model:selection="selectionList"
         ref="table"
         :datasource="datasource"
         :columns="columns"
@@ -187,6 +186,13 @@ export default {
         })
       }
       this.columns = [
+        {
+        key: 'index',
+        dataIndex: 'index',
+        width: 48,
+        align: 'center',
+        customRender: ({index}) => index + 1
+      },
         { title: "类别", dataIndex: "type", sorter: true },
         { title: "点位名称", dataIndex: "pointName", sorter: true},
         ...addCloumns
@@ -237,7 +243,7 @@ export default {
 
       arr.push(th1)
       arr.push(th2)
-      this.data.forEach((d) => {
+      this.datasource.forEach((d) => {
         const td = this.sColumns.map((item) => d[item.dataIndex]);
         arr.push(td);
       });
diff --git a/src/views/water/lake/statistic/inner/component/raw-colums.js b/src/views/water/lake/statistic/inner/component/raw-colums.js
index c02d599..c48d9fe 100644
--- a/src/views/water/lake/statistic/inner/component/raw-colums.js
+++ b/src/views/water/lake/statistic/inner/component/raw-colums.js
@@ -24,6 +24,13 @@ const innerFilterColumns = [
 ]
 
 const innerTableColumns = [
+    {
+        key: 'index',
+        dataIndex: 'index',
+        width: 48,
+        align: 'center',
+        customRender: ({index}) => index + 1
+      },
     {title: "监测时间", dataIndex: "monitorTime", sorter: true,},
     {title: "断面名称", dataIndex: "pointName", sorter: true,},
     {title: "水温(℃)", dataIndex: "waterTemperature", sorter: true,},
@@ -53,6 +60,13 @@ const innerTableColumns = [
 ];
 
 const averageTableColumns = [
+    {
+        key: 'index',
+        dataIndex: 'index',
+        width: 48,
+        align: 'center',
+        customRender: ({index}) => index + 1
+      },
     {title: "监测时间", dataIndex: "monitorTime", sorter: true,},
     {title: "断面名称", dataIndex: "pointName", sorter: true,},
     {title: "水温(℃)", dataIndex: "waterTemperature", sorter: true,},
diff --git a/src/views/water/lake/statistic/inner/component/raw.vue b/src/views/water/lake/statistic/inner/component/raw.vue
index 4becfd6..42730ba 100644
--- a/src/views/water/lake/statistic/inner/component/raw.vue
+++ b/src/views/water/lake/statistic/inner/component/raw.vue
@@ -6,12 +6,12 @@
            <search :searchForm="searchForm" :filterKeys="filterKeys" @search="searchData" @exportFile="exportFile" @filterColumns="changeFilter" :visiable="visiable"/>
             <!-- 表格 -->
             <ele-pro-table
-                v-model:selection="selectionList"
                 ref="table"
                 :datasource="datasource"
                 :columns="columns"
                 :loading="loading"
                 :where="where"
+                row-key="lakeLibraryInnerCityId"
                 :scroll="{ x: 'max-content' }"
                 @done="(d) => (data = d.data)"
             >
@@ -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);
             });
diff --git a/src/views/water/lake/statistic/special/component/average.vue b/src/views/water/lake/statistic/special/component/average.vue
index 8d2a594..317c88e 100644
--- a/src/views/water/lake/statistic/special/component/average.vue
+++ b/src/views/water/lake/statistic/special/component/average.vue
@@ -6,7 +6,6 @@
            <search :searchForm="searchForm" :filterKeys="filterKeys" @search="searchData" @exportFile="exportFile" @filterColumns="changeFilter" :visiable="visiable"/>
             <!-- 表格 -->
             <ele-pro-table
-                v-model:selection="selectionList"
                 ref="table"
                 :loading="loading"
                 :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);
             });
diff --git a/src/views/water/lake/statistic/special/component/avg-nutritional.vue b/src/views/water/lake/statistic/special/component/avg-nutritional.vue
index 39a4ca7..50b67bc 100644
--- a/src/views/water/lake/statistic/special/component/avg-nutritional.vue
+++ b/src/views/water/lake/statistic/special/component/avg-nutritional.vue
@@ -6,7 +6,6 @@
            <search :searchForm="searchForm" :filterKeys="filterKeys" @search="searchData" @exportFile="exportFile" @filterColumns="changeFilter" :visiable="visiable"/>
             <!-- 表格 -->
             <ele-pro-table
-                v-model:selection="selectionList"
                 ref="table"
                 :datasource="datasource"
                 :columns="columns"
@@ -61,6 +60,13 @@ export default {
             selection: [],
             // 表格列配置
             columns: [
+                {
+                    key: 'index',
+                    dataIndex: 'index',
+                    width: 48,
+                    align: 'center',
+                    customRender: ({index}) => index + 1
+                },
                 {title: "监测时间", dataIndex: "monitorTime", sorter: true,},
                 {title: "类别", dataIndex: "type", sorter: true,},
                 {title: "点位名称", dataIndex: "pointName", sorter: true,},
@@ -126,7 +132,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);
             });
diff --git a/src/views/water/lake/statistic/special/component/com-nutritional.vue b/src/views/water/lake/statistic/special/component/com-nutritional.vue
index 03552de..4264e5e 100644
--- a/src/views/water/lake/statistic/special/component/com-nutritional.vue
+++ b/src/views/water/lake/statistic/special/component/com-nutritional.vue
@@ -6,7 +6,6 @@
            <search :searchForm="searchForm" :filterKeys="filterKeys" @search="searchData" @exportFile="exportFile" @filterColumns="changeFilter" :visiable="visiable"/>
             <!-- 表格 -->
             <ele-pro-table
-                v-model:selection="selectionList"
                 ref="table"
                 :datasource="datasource"
                 :columns="columns"
@@ -61,6 +60,13 @@ export default {
             selection: [],
             // 表格列配置
             columns: [
+                {
+                    key: 'index',
+                    dataIndex: 'index',
+                    width: 48,
+                    align: 'center',
+                    customRender: ({index}) => index + 1
+                },
                 {title: "监测时间", dataIndex: "monitorTime", sorter: true,},
                 {title: "类别", dataIndex: "type", sorter: true,},
                 {title: "点位名称", dataIndex: "pointName", sorter: true,},
@@ -129,7 +135,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);
             });
diff --git a/src/views/water/lake/statistic/special/component/comparison.vue b/src/views/water/lake/statistic/special/component/comparison.vue
index b336b93..292e943 100644
--- a/src/views/water/lake/statistic/special/component/comparison.vue
+++ b/src/views/water/lake/statistic/special/component/comparison.vue
@@ -6,7 +6,6 @@
     <search :searchForm="searchForm" :filterKeys="filterKeys" @search="searchData" @exportFile="exportFile" @filterColumns="changeFilter" :visiable="visiable"/>
       <!-- 表格 -->
       <ele-pro-table
-        v-model:selection="selectionList"
         ref="table"
         :datasource="datasource"
         :columns="columns"
@@ -187,6 +186,13 @@ export default {
         })
       }
       this.columns = [
+            {
+        key: 'index',
+        dataIndex: 'index',
+        width: 48,
+        align: 'center',
+        customRender: ({index}) => index + 1
+      },
         { title: "类别", dataIndex: "type", sorter: true },
         { title: "点位名称", dataIndex: "pointName", sorter: true},
         ...addCloumns
@@ -237,7 +243,7 @@ export default {
 
       arr.push(th1)
       arr.push(th2)
-      this.data.forEach((d) => {
+      this.datasource.forEach((d) => {
         const td = this.sColumns.map((item) => d[item.dataIndex]);
         arr.push(td);
       });
diff --git a/src/views/water/lake/statistic/special/component/raw-colums.js b/src/views/water/lake/statistic/special/component/raw-colums.js
index c02d599..c48d9fe 100644
--- a/src/views/water/lake/statistic/special/component/raw-colums.js
+++ b/src/views/water/lake/statistic/special/component/raw-colums.js
@@ -24,6 +24,13 @@ const innerFilterColumns = [
 ]
 
 const innerTableColumns = [
+    {
+        key: 'index',
+        dataIndex: 'index',
+        width: 48,
+        align: 'center',
+        customRender: ({index}) => index + 1
+      },
     {title: "监测时间", dataIndex: "monitorTime", sorter: true,},
     {title: "断面名称", dataIndex: "pointName", sorter: true,},
     {title: "水温(℃)", dataIndex: "waterTemperature", sorter: true,},
@@ -53,6 +60,13 @@ const innerTableColumns = [
 ];
 
 const averageTableColumns = [
+    {
+        key: 'index',
+        dataIndex: 'index',
+        width: 48,
+        align: 'center',
+        customRender: ({index}) => index + 1
+      },
     {title: "监测时间", dataIndex: "monitorTime", sorter: true,},
     {title: "断面名称", dataIndex: "pointName", sorter: true,},
     {title: "水温(℃)", dataIndex: "waterTemperature", sorter: true,},
diff --git a/src/views/water/lake/statistic/special/component/raw.vue b/src/views/water/lake/statistic/special/component/raw.vue
index 9f8b5ef..50586a5 100644
--- a/src/views/water/lake/statistic/special/component/raw.vue
+++ b/src/views/water/lake/statistic/special/component/raw.vue
@@ -6,7 +6,6 @@
            <search :searchForm="searchForm" :filterKeys="filterKeys" @search="searchData" @exportFile="exportFile" @filterColumns="changeFilter" :visiable="visiable"/>
             <!-- 表格 -->
             <ele-pro-table
-                v-model:selection="selectionList"
                 ref="table"
                 row-key="lakeLibrarySpecialId"
                 :datasource="datasource"
@@ -157,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);
             });

From f9b912316481c4beea6a18de1d8c4fdae8e8d318 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= <donglinpang@163.com>
Date: Tue, 14 Dec 2021 21:31:43 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ecology/water/lake/import.js   |  24 ++
 src/views/water/lake/collect/index.vue | 471 +++++++++++++------------
 2 files changed, 270 insertions(+), 225 deletions(-)
 create mode 100644 src/api/ecology/water/lake/import.js

diff --git a/src/api/ecology/water/lake/import.js b/src/api/ecology/water/lake/import.js
new file mode 100644
index 0000000..60b19f2
--- /dev/null
+++ b/src/api/ecology/water/lake/import.js
@@ -0,0 +1,24 @@
+import axios from 'axios';
+const baseUri = '/api/lakeLibrary/lakeLibraryImport'
+
+
+export const cityOther  = `${baseUri}/cityOther`
+export const appointCity  = `${baseUri}/appointCity`
+export const special  = `${baseUri}/special`
+
+
+// 城市内湖-其他内湖：/api/lakeLibrary/lakeLibraryImport/
+export const importCityOther = function (data) {
+    return axios.post(cityOther,data)
+}
+
+// 城市内湖-五象湖：/api/lakeLibrary/lakeLibraryImport/appointCity
+export const importCppointCity = function (data) {
+    console.log('data',data)
+    return axios.post(appointCity,data)
+}
+
+// 专项湖库：/api/lakeLibrary/lakeLibraryImport/special
+export const importSpecial = function (data) {
+    return axios.post(special,data)
+}
\ No newline at end of file
diff --git a/src/views/water/lake/collect/index.vue b/src/views/water/lake/collect/index.vue
index 256165e..a0a168c 100644
--- a/src/views/water/lake/collect/index.vue
+++ b/src/views/water/lake/collect/index.vue
@@ -61,13 +61,14 @@
 </template>
 
 <script>
-import XLSX from "xlsx";
-import utils from "./utils";
-import {Modal} from "ant-design-vue";
+// import XLSX from "xlsx";
+// import utils from "./utils";
+// import {Modal} from "ant-design-vue";
 import WaterBill from "./water-bill.vue";
 import SpecialBill from "./special-bill.vue";
-import {saveLakeBill} from "@/api/ecology/lake";
-import {saveLakeBill as saveSpecialLake} from "@/api/ecology/special-lake";
+// import {saveLakeBill} from "@/api/ecology/lake";
+// import {saveLakeBill as saveSpecialLake} from "@/api/ecology/special-lake";
+import {importCityOther,importCppointCity,importSpecial} from "@/api/ecology/water/lake/import";
 
 export default {
     name: "LakeCollectIndex",
@@ -87,255 +88,275 @@ export default {
         /* 导入本地excel文件 */
         importFileInnerCity(file) {
             const hide = this.$message.loading("导入中..", 0);
+            const formData = new FormData();
+            formData.append('file', file);
+                importCityOther(formData).then(res=>{
+                    console.log(res)
+                    hide()
+                })
 
-            let reader = new FileReader();
-            reader.onload = (e) => {
-                try {
-                    let data = new Uint8Array(e.target.result);
-                    let workbook = XLSX.read(data, {
-                        type: "array",
-                    });
-                    //0.昼间数据 1.夜间数据 2.其他信息
-                    let sheetNames = workbook.SheetNames;
-                    // 解析成二维数组
-                    let aoa = XLSX.utils.sheet_to_json(workbook.Sheets[sheetNames[0]], {
-                        header: 1,
-                    });
+            // let reader = new FileReader();
+            // reader.onload = (e) => {
+            //     try {
+            //         let data = new Uint8Array(e.target.result);
+            //         let workbook = XLSX.read(data, {
+            //             type: "array",
+            //         });
+            //         //0.昼间数据 1.夜间数据 2.其他信息
+            //         let sheetNames = workbook.SheetNames;
+            //         // 解析成二维数组
+            //         let aoa = XLSX.utils.sheet_to_json(workbook.Sheets[sheetNames[0]], {
+            //             header: 1,
+            //         });
 
-                    const reportDate = aoa[2][0].replace(/[^\d]+/g, "-");
+            //         const reportDate = aoa[2][0].replace(/[^\d]+/g, "-");
 
-                    const lakeList = aoa.filter(
-                        (item) => {
-                            return item.length >= 24 && item[0] && !item[0].includes("点位名称");
-                        }
-                    );
+            //         const lakeList = aoa.filter(
+            //             (item) => {
+            //                 return item.length >= 24 && item[0] && !item[0].includes("点位名称");
+            //             }
+            //         );
 
 
-                    // 解析成对象数组
-                    const billName = file.name;
-                    const billData = utils.toInnerCityLakeObjData(lakeList, reportDate);
-                    if (!billData || billData.length == 0) {
-                        hide()
-                        Modal.error({
-                            title: "导入失败",
-                            content: "找不到数据",
-                        });
-                        return;
-                    }
-                    const tasks = [];
-                    if (billData.length > 0) {
-                        tasks.push(
-                            saveLakeBill({
-                                reportTime: new Date(reportDate).getTime(),
-                                billName: billName,
-                                regionLevel: "市级",
-                                lakeLibraryInnerCityList: billData,
-                            })
-                        );
-                    }
+            //         // 解析成对象数组
+            //         const billName = file.name;
+            //         const billData = utils.toInnerCityLakeObjData(lakeList, reportDate);
+            //         if (!billData || billData.length == 0) {
+            //             hide()
+            //             Modal.error({
+            //                 title: "导入失败",
+            //                 content: "找不到数据",
+            //             });
+            //             return;
+            //         }
+            //         const tasks = [];
+            //         if (billData.length > 0) {
+            //             tasks.push(
+            //                 saveLakeBill({
+            //                     reportTime: new Date(reportDate).getTime(),
+            //                     billName: billName,
+            //                     regionLevel: "市级",
+            //                     lakeLibraryInnerCityList: billData,
+            //                 })
+            //             );
+            //         }
 
 
-                    // 上传到服务器
+            //         // 上传到服务器
 
-                    Promise.all(tasks)
-                        .then((res) => {
-                            if (res[0].data.code == 0) {
-                                Modal.success({
-                                    title: "导入成功",
-                                    content: `成功导入${billData.length}条数据`,
-                                });
-                                this.$refs.water && this.$refs.water.reload();
-                            } else {
-                                Modal.error({
-                                    title: "导入失败",
-                                    content: "数据上传出错",
-                                });
-                            }
+            //         Promise.all(tasks)
+            //             .then((res) => {
+            //                 if (res[0].data.code == 0) {
+            //                     Modal.success({
+            //                         title: "导入成功",
+            //                         content: `成功导入${billData.length}条数据`,
+            //                     });
+            //                     this.$refs.water && this.$refs.water.reload();
+            //                 } else {
+            //                     Modal.error({
+            //                         title: "导入失败",
+            //                         content: "数据上传出错",
+            //                     });
+            //                 }
 
-                        })
-                        .catch(() => {
-                            Modal.error({
-                                title: "导入失败",
-                                content: "数据上传出错",
-                            });
-                        })
-                        .finally(() => {
-                            hide();
-                        });
-                } catch (error) {
-                    hide();
-                    Modal.error({
-                        title: "导入失败",
-                        content: error.message,
-                    });
-                }
-                // console.log(billData);
-            };
-            reader.readAsArrayBuffer(file);
+            //             })
+            //             .catch(() => {
+            //                 Modal.error({
+            //                     title: "导入失败",
+            //                     content: "数据上传出错",
+            //                 });
+            //             })
+            //             .finally(() => {
+            //                 hide();
+            //             });
+            //     } catch (error) {
+            //         hide();
+            //         Modal.error({
+            //             title: "导入失败",
+            //             content: error.message,
+            //         });
+            //     }
+            //     // console.log(billData);
+            // };
+            // reader.readAsArrayBuffer(file);
 
             return false;
         },
         importFileWuxiang(file) {
             const hide = this.$message.loading("导入中..", 0);
 
-            let reader = new FileReader();
-            reader.onload = (e) => {
-                try {
-                    let data = new Uint8Array(e.target.result);
-                    let workbook = XLSX.read(data, {
-                        type: "array",
-                    });
-                    let sheetNames = workbook.SheetNames;
-                    // 解析成二维数组
-                    let aoa = XLSX.utils.sheet_to_json(workbook.Sheets[sheetNames[0]], {
-                        header: 1,
-                    });
-                    const lakeList = aoa.filter(
-                        (item) => {
-                            return item.length >= 24 && item[0] && !item[0].includes("点位名称");
-                        }
-                    );
-                    // 解析成对象数组
-                    const billName = file.name;
-                    const billData = utils.toWuxiangLakeObjData(lakeList);
-                    if (!billData || billData.length == 0) {
-                        hide()
-                        Modal.error({
-                            title: "导入失败",
-                            content: "找不到数据",
-                        });
-                        return;
-                    }
-                    const tasks = [];
-                    if (billData.length > 0) {
-                        tasks.push(
-                            saveLakeBill({
-                                billName: billName,
-                                lakeLibraryInnerCityList: billData,
-                            })
-                        );
-                    }
+          const formData = new FormData();
+            formData.append('file', file);
+            importCppointCity(formData).then(res=>{
+                console.log(res)
+                hide()
+            })
 
 
-                    // 上传到服务器
+            // let reader = new FileReader();
+            // reader.onload = (e) => {
+            //     try {
+            //         let data = new Uint8Array(e.target.result);
+            //         let workbook = XLSX.read(data, {
+            //             type: "array",
+            //         });
+            //         let sheetNames = workbook.SheetNames;
+            //         // 解析成二维数组
+            //         let aoa = XLSX.utils.sheet_to_json(workbook.Sheets[sheetNames[0]], {
+            //             header: 1,
+            //         });
+            //         const lakeList = aoa.filter(
+            //             (item) => {
+            //                 return item.length >= 24 && item[0] && !item[0].includes("点位名称");
+            //             }
+            //         );
+            //         // 解析成对象数组
+            //         const billName = file.name;
+            //         const billData = utils.toWuxiangLakeObjData(lakeList);
+            //         if (!billData || billData.length == 0) {
+            //             hide()
+            //             Modal.error({
+            //                 title: "导入失败",
+            //                 content: "找不到数据",
+            //             });
+            //             return;
+            //         }
+            //         const tasks = [];
+            //         if (billData.length > 0) {
+            //             tasks.push(
+            //                 saveLakeBill({
+            //                     billName: billName,
+            //                     lakeLibraryInnerCityList: billData,
+            //                 })
+            //             );
+            //         }
 
-                    Promise.all(tasks)
-                        .then((res) => {
-                            if (res[0].data.code == 0) {
-                                Modal.success({
-                                    title: "导入成功",
-                                    content: `成功导入${billData.length}条数据`,
-                                });
-                                this.$refs.water && this.$refs.water.reload();
-                            } else {
-                                Modal.error({
-                                    title: "导入失败",
-                                    content: "数据上传出错",
-                                });
-                            }
 
-                        })
-                        .catch(() => {
-                            Modal.error({
-                                title: "导入失败",
-                                content: "数据上传出错",
-                            });
-                        })
-                        .finally(() => {
-                            hide();
-                        });
-                } catch (error) {
-                    hide();
-                    Modal.error({
-                        title: "导入失败",
-                        content: error.message,
-                    });
-                }
-                // console.log(billData);
-            };
-            reader.readAsArrayBuffer(file);
+            //         // 上传到服务器
+
+            //         Promise.all(tasks)
+            //             .then((res) => {
+            //                 if (res[0].data.code == 0) {
+            //                     Modal.success({
+            //                         title: "导入成功",
+            //                         content: `成功导入${billData.length}条数据`,
+            //                     });
+            //                     this.$refs.water && this.$refs.water.reload();
+            //                 } else {
+            //                     Modal.error({
+            //                         title: "导入失败",
+            //                         content: "数据上传出错",
+            //                     });
+            //                 }
+
+            //             })
+            //             .catch(() => {
+            //                 Modal.error({
+            //                     title: "导入失败",
+            //                     content: "数据上传出错",
+            //                 });
+            //             })
+            //             .finally(() => {
+            //                 hide();
+            //             });
+            //     } catch (error) {
+            //         hide();
+            //         Modal.error({
+            //             title: "导入失败",
+            //             content: error.message,
+            //         });
+            //     }
+            //     // console.log(billData);
+            // };
+            // reader.readAsArrayBuffer(file);
 
             return false;
         },
         importFileSpecial(file) {
             const hide = this.$message.loading("导入中..", 0);
+            const formData = new FormData();
+            formData.append('file', file);
+                importSpecial(formData).then(res=>{
+                    console.log(res)
+                    hide()
+                })
 
-            let reader = new FileReader();
-            reader.onload = (e) => {
-                try {
-                    let data = new Uint8Array(e.target.result);
-                    let workbook = XLSX.read(data, {
-                        type: "array",
-                    });
-                    let sheetNames = workbook.SheetNames;
-                    // 解析成二维数组
-                    let aoa = XLSX.utils.sheet_to_json(workbook.Sheets[sheetNames[0]], {
-                        header: 1,
-                    });
-                    const lakeList = aoa.filter(
-                        (item) => {
-                            return item.length >= 24 && item[1] && !item[1].includes("测站名称");
-                        }
-                    );
-                    // 解析成对象数组
-                    const billName = file.name;
-                    const billData = utils.toSpecialLakeData(lakeList);
-                    if (!billData || billData.length == 0) {
-                        hide()
-                        Modal.error({
-                            title: "导入失败",
-                            content: "找不到数据",
-                        });
-                        return;
-                    }
-                    const tasks = [];
-                    if (billData.length > 0) {
-                        tasks.push(
-                            saveSpecialLake({
-                                billName: billName,
-                                lakeLibrarySpecialList: billData,
-                            })
-                        );
-                    }
+            // let reader = new FileReader();
+            // reader.onload = (e) => {
+            //     try {
+            //         let data = new Uint8Array(e.target.result);
+            //         let workbook = XLSX.read(data, {
+            //             type: "array",
+            //         });
+            //         let sheetNames = workbook.SheetNames;
+            //         // 解析成二维数组
+            //         let aoa = XLSX.utils.sheet_to_json(workbook.Sheets[sheetNames[0]], {
+            //             header: 1,
+            //         });
+            //         const lakeList = aoa.filter(
+            //             (item) => {
+            //                 return item.length >= 24 && item[1] && !item[1].includes("测站名称");
+            //             }
+            //         );
+            //         // 解析成对象数组
+            //         const billName = file.name;
+            //         const billData = utils.toSpecialLakeData(lakeList);
+            //         if (!billData || billData.length == 0) {
+            //             hide()
+            //             Modal.error({
+            //                 title: "导入失败",
+            //                 content: "找不到数据",
+            //             });
+            //             return;
+            //         }
+            //         const tasks = [];
+            //         if (billData.length > 0) {
+            //             tasks.push(
+            //                 saveSpecialLake({
+            //                     billName: billName,
+            //                     lakeLibrarySpecialList: billData,
+            //                 })
+            //             );
+            //         }
 
 
-                    // 上传到服务器
+            //         // 上传到服务器
 
-                    Promise.all(tasks)
-                        .then((res) => {
-                            if (res[0].data.code == 0) {
-                                Modal.success({
-                                    title: "导入成功",
-                                    content: `成功导入${billData.length}条数据`,
-                                });
-                                this.$refs.special && this.$refs.special.reload();
-                            } else {
-                                Modal.error({
-                                    title: "导入失败",
-                                    content: "数据上传出错",
-                                });
-                            }
+            //         Promise.all(tasks)
+            //             .then((res) => {
+            //                 if (res[0].data.code == 0) {
+            //                     Modal.success({
+            //                         title: "导入成功",
+            //                         content: `成功导入${billData.length}条数据`,
+            //                     });
+            //                     this.$refs.special && this.$refs.special.reload();
+            //                 } else {
+            //                     Modal.error({
+            //                         title: "导入失败",
+            //                         content: "数据上传出错",
+            //                     });
+            //                 }
 
-                        })
-                        .catch(() => {
-                            Modal.error({
-                                title: "导入失败",
-                                content: "数据上传出错",
-                            });
-                        })
-                        .finally(() => {
-                            hide();
-                        });
-                } catch (error) {
-                    hide();
-                    Modal.error({
-                        title: "导入失败",
-                        content: error.message,
-                    });
-                }
-                // console.log(billData);
-            };
-            reader.readAsArrayBuffer(file);
+            //             })
+            //             .catch(() => {
+            //                 Modal.error({
+            //                     title: "导入失败",
+            //                     content: "数据上传出错",
+            //                 });
+            //             })
+            //             .finally(() => {
+            //                 hide();
+            //             });
+            //     } catch (error) {
+            //         hide();
+            //         Modal.error({
+            //             title: "导入失败",
+            //             content: error.message,
+            //         });
+            //     }
+            //     // console.log(billData);
+            // };
+            // reader.readAsArrayBuffer(file);
 
             return false;
         },

From 9a277d0b4736e18ee6a3abf278976116ba7c8b1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= <donglinpang@163.com>
Date: Tue, 14 Dec 2021 21:42:11 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/water/lake/collect/index.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/views/water/lake/collect/index.vue b/src/views/water/lake/collect/index.vue
index a0a168c..8f9cfae 100644
--- a/src/views/water/lake/collect/index.vue
+++ b/src/views/water/lake/collect/index.vue
@@ -93,6 +93,9 @@ export default {
                 importCityOther(formData).then(res=>{
                     console.log(res)
                     hide()
+                }).catch(err=>{
+                    console.log(err)
+                    hide()
                 })
 
             // let reader = new FileReader();
@@ -190,7 +193,10 @@ export default {
             importCppointCity(formData).then(res=>{
                 console.log(res)
                 hide()
-            })
+            }).catch(err=>{
+                    console.log(err)
+                    hide()
+                })
 
 
             // let reader = new FileReader();
@@ -279,6 +285,9 @@ export default {
                 importSpecial(formData).then(res=>{
                     console.log(res)
                     hide()
+                }).catch(err=>{
+                    console.log(err)
+                    hide()
                 })
 
             // let reader = new FileReader();

From 1cea39495969092371b9fdda7aa45615fcced6cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= <pande@gxai-data.cn>
Date: Wed, 15 Dec 2021 09:17:54 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                 | 2 +-
 src/api/ecology/water/lake/import.js | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.env b/.env
index b7bd75e..89cca9a 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
 VUE_APP_VERSION=1.0.0
 VUE_APP_NAME=生态环境监测数据综合分析平台
-VUE_APP_API_BASE_URL=http://1.14.132.108:10002/api
+VUE_APP_API_BASE_URL=http://101.132.173.65:10001/api
diff --git a/src/api/ecology/water/lake/import.js b/src/api/ecology/water/lake/import.js
index 60b19f2..f507303 100644
--- a/src/api/ecology/water/lake/import.js
+++ b/src/api/ecology/water/lake/import.js
@@ -1,5 +1,5 @@
 import axios from 'axios';
-const baseUri = '/api/lakeLibrary/lakeLibraryImport'
+const baseUri = '/lakeLibrary/lakeLibraryImport'
 
 
 export const cityOther  = `${baseUri}/cityOther`
@@ -7,18 +7,18 @@ export const appointCity  = `${baseUri}/appointCity`
 export const special  = `${baseUri}/special`
 
 
-// 城市内湖-其他内湖：/api/lakeLibrary/lakeLibraryImport/
+// 城市内湖-其他内湖：/lakeLibrary/lakeLibraryImport/
 export const importCityOther = function (data) {
     return axios.post(cityOther,data)
 }
 
-// 城市内湖-五象湖：/api/lakeLibrary/lakeLibraryImport/appointCity
+// 城市内湖-五象湖：/lakeLibrary/lakeLibraryImport/appointCity
 export const importCppointCity = function (data) {
     console.log('data',data)
     return axios.post(appointCity,data)
 }
 
-// 专项湖库：/api/lakeLibrary/lakeLibraryImport/special
+// 专项湖库：/lakeLibrary/lakeLibraryImport/special
 export const importSpecial = function (data) {
     return axios.post(special,data)
 }
\ No newline at end of file

From 697954ffd8a738a0f7ecaa11f6977077de175961 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= <pande@gxai-data.cn>
Date: Wed, 15 Dec 2021 09:25:17 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                   | 2 +-
 src/views/water/lake/collect/index.vue | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.env b/.env
index 89cca9a..b7bd75e 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
 VUE_APP_VERSION=1.0.0
 VUE_APP_NAME=生态环境监测数据综合分析平台
-VUE_APP_API_BASE_URL=http://101.132.173.65:10001/api
+VUE_APP_API_BASE_URL=http://1.14.132.108:10002/api
diff --git a/src/views/water/lake/collect/index.vue b/src/views/water/lake/collect/index.vue
index 8f9cfae..077779a 100644
--- a/src/views/water/lake/collect/index.vue
+++ b/src/views/water/lake/collect/index.vue
@@ -63,7 +63,7 @@
 <script>
 // import XLSX from "xlsx";
 // import utils from "./utils";
-// import {Modal} from "ant-design-vue";
+import {Modal} from "ant-design-vue";
 import WaterBill from "./water-bill.vue";
 import SpecialBill from "./special-bill.vue";
 // import {saveLakeBill} from "@/api/ecology/lake";
@@ -92,6 +92,7 @@ export default {
             formData.append('file', file);
                 importCityOther(formData).then(res=>{
                     console.log(res)
+                     Modal.success({  title:res.data.msg, });
                     hide()
                 }).catch(err=>{
                     console.log(err)
@@ -192,6 +193,7 @@ export default {
             formData.append('file', file);
             importCppointCity(formData).then(res=>{
                 console.log(res)
+                Modal.success({  title:res.data.msg, });
                 hide()
             }).catch(err=>{
                     console.log(err)
@@ -284,6 +286,7 @@ export default {
             formData.append('file', file);
                 importSpecial(formData).then(res=>{
                     console.log(res)
+                    Modal.success({  title:res.data.msg, });
                     hide()
                 }).catch(err=>{
                     console.log(err)

From 4d09555428715c37cd1beeba133f7080cf23dc76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= <pande@gxai-data.cn>
Date: Wed, 15 Dec 2021 09:30:28 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/water/lake/collect/index.vue | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/views/water/lake/collect/index.vue b/src/views/water/lake/collect/index.vue
index 077779a..07f5824 100644
--- a/src/views/water/lake/collect/index.vue
+++ b/src/views/water/lake/collect/index.vue
@@ -92,10 +92,16 @@ export default {
             formData.append('file', file);
                 importCityOther(formData).then(res=>{
                     console.log(res)
-                     Modal.success({  title:res.data.msg, });
+                    if(!res.data.code){
+                        Modal.success({  title:res.data.msg, });
+                    }else{
+                        Modal.error({  title:res.data.msg || '文件导入失败', });
+                    }
+                     
                     hide()
                 }).catch(err=>{
                     console.log(err)
+                    Modal.error({  title:err.data.msg || '文件导入失败', });
                     hide()
                 })
 
@@ -193,10 +199,15 @@ export default {
             formData.append('file', file);
             importCppointCity(formData).then(res=>{
                 console.log(res)
-                Modal.success({  title:res.data.msg, });
+                 if(!res.data.code){
+                        Modal.success({  title:res.data.msg, });
+                    }else{
+                        Modal.error({  title:res.data.msg || '文件导入失败', });
+                    }
                 hide()
             }).catch(err=>{
                     console.log(err)
+                    Modal.error({  title:err.data.msg || '文件导入失败', });
                     hide()
                 })
 
@@ -286,10 +297,15 @@ export default {
             formData.append('file', file);
                 importSpecial(formData).then(res=>{
                     console.log(res)
-                    Modal.success({  title:res.data.msg, });
+                     if(!res.data.code){
+                        Modal.success({  title:res.data.msg, });
+                    }else{
+                        Modal.error({  title:res.data.msg || '文件导入失败', });
+                    }
                     hide()
                 }).catch(err=>{
                     console.log(err)
+                    Modal.error({  title:err.data.msg || '文件导入失败', });
                     hide()
                 })