结构

src/views/atmosphere/acid-rain/collect/colums.js

@@ -0,0 +1,18 @@
+const tableColumns = [
+        {title: "编号",dataIndex: "code",sorter: true,},
+        {title: "降水类型",dataIndex: "precipitationType",sorter: true,},
+        {title: "降雨量(mm)",dataIndex: "precipitation",sorter: true,},
+        {title: "pH值（无量纲）",dataIndex: "ph",sorter: true,},
+        {title: "电导率(mS/m)",dataIndex: "conductivity",sorter: true,},
+        {title: "氟离子",dataIndex: "fluorine",sorter: true,},
+        {title: "氯离子",dataIndex: "chlorine",sorter: true,},
+        {title: "硫酸根离子",dataIndex: "sulfateRadical",sorter: true,},
+        {title: "硝酸根离子",dataIndex: "nitrate",sorter: true,},
+        {title: "钠离子",dataIndex: "na",sorter: true,},
+        {title: "铵根离子",dataIndex: "ammoniumRadical",sorter: true,},
+        {title: "钾离子",dataIndex: "k",sorter: true,},
+        {title: "镁离子",dataIndex: "ng",sorter: true,},
+        {title: "钙离子",dataIndex: "ca",sorter: true,},
+        {title: "备注",dataIndex: "remark",sorter: true,},
+    ];
+    export {tableColumns}

src/views/atmosphere/acid-rain/collect/index.vue

@@ -4,19 +4,13 @@
       <template #title>
         <a-space>
           <a-upload
-            :before-upload="importFileCity"
-            :showUploadList="false"
-            accept=".xls,.xlsx,.csv"
+              :before-upload="importFileCity"
+              :showUploadList="false"
+              accept=".xls,.xlsx,.csv"
           >
             <a-button>数据导入</a-button>
           </a-upload>
-          <!-- <a-upload
-            :before-upload="importFileArea"
-            :showUploadList="false"
-            accept=".xls,.xlsx,.csv"
-          >
-            <a-button>县级导入</a-button>
-          </a-upload> -->
+
         </a-space>
       </template>
       <a-tabs v-model:activeKey="activeKey">
@@ -31,9 +25,10 @@
 <script>
 import XLSX from "xlsx";
 import utils from "./utils";
-import { Modal } from "ant-design-vue";
+import {Modal} from "ant-design-vue";
 import RainBill from "./rain-bill.vue";
-import { saveAcidRainBill } from "@/api/ecology/acid";
+import {saveAcidRainBill} from "@/api/ecology/acid";
+
 export default {
   name: "RainCollectIndex",
   components: {
@@ -56,35 +51,25 @@ export default {
           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 aoa2 = XLSX.utils.sheet_to_json(workbook.Sheets[sheetNames[1]], {
-          //   header: 1,
-          // });
 
-          // const reportDate = aoa[2][0].replace(/[^\d]+/g, "-");
-          // const reportDate2 = aoa2[1][0].replace(/[^\d]+/g, "-");
+          const reportDate = aoa[2][0].replace(/[^\d]+/g, "-");
 
           const acidList = aoa.filter((item) => {
-            return item.length >= 23 && typeof item[0] == "number";
+            return item.length >= 23 && item[0] && !item[0].includes("编号");
           });
-          // const acidList2 = aoa2.filter(
-          //   (item) => item.length >= 26 && typeof item[0] == "number"
-          // );
-
           // 解析成对象数组
           const billName = aoa[0][0] + aoa[1][0];
-          const billData = utils.toObjData(acidList);
-          // const billName2 = aoa2[0][0];
-          // const billData2 = utils.toObjData(acidList2);
+          const billData = utils.toObjData(acidList, new Date(reportDate).getFullYear());
+
           if (
-            !billData ||
-            billData.length == 0
-            // (!billData2 || billData2.length == 0)
+              !billData ||
+              billData.length == 0
+              // (!billData2 || billData2.length == 0)
           ) {
             hide();
             Modal.error({
@@ -97,112 +82,19 @@ export default {
           const tasks = [];
           if (billData.length > 0) {
             tasks.push(
-              saveAcidRainBill({
-                // reportTime: new Date(reportDate).getTime(),
-                billName: billName,
-                regionLevel: "市级",
-                acidRainList: billData,
-              })
+                saveAcidRainBill({
+                  // reportTime: new Date(reportDate).getTime(),
+                  billName: billName,
+                  regionLevel: "市级",
+                  acidRainList: billData,
+                })
             );
           }
 
-          // if (billData2.length > 0) {
-          //   tasks.push(
-          //     saveAcidRainBill({
-          //       reportTime: new Date(reportDate2).getTime(),
-          //       billName: billName2,
-          //       regionLevel: "市级",
-          //       acidList: billData2,
-          //     })
-          //   );
-          // }
-
           // 上传到服务器
-
           Promise.all(tasks)
-            .then((res) => {
-              if (res[0].data.code == 0) {
-                Modal.success({
-                  title: "导入成功",
-                  content: `成功导入${billData.length}条数据`,
-                });
-                this.$refs.rain && this.$refs.rain.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;
-    },
-    importFileArea(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",
-          });
-          //0.昼间数据 1.夜间数据 2.其他信息
-          let sheetNames = workbook.SheetNames;
-          // 解析成二维数组
-          let aoa = XLSX.utils.sheet_to_json(workbook.Sheets[sheetNames[0]], {
-            header: 1,
-          });
-
-          const reportDate = aoa[1][0].replace(/[^\d]+/g, "-");
-          const acidList = aoa.filter((item) => {
-            return item.length >= 35 && item[0] != "行政区划代码";
-          });
-
-          // 解析成对象数组
-          const billName = aoa[0][0];
-          const billData = utils.toAreaObjData(acidList);
-
-          if (!billData || billData.length == 0) {
-            hide();
-            Modal.error({
-              title: "导入失败",
-              content: "找不到可用数据",
-            });
-
-            return;
-          }
-
-          if (billData.length > 0) {
-            // 上传到服务器
-            saveAcidRainBill({
-              reportTime: new Date(reportDate).getTime(),
-              billName: billName,
-              regionLevel: "县级",
-              acidList: billData,
-            })
               .then((res) => {
-                if (res.data.code == 0) {
+                if (res[0].data.code == 0) {
                   Modal.success({
                     title: "导入成功",
                     content: `成功导入${billData.length}条数据`,
@@ -224,7 +116,6 @@ export default {
               .finally(() => {
                 hide();
               });
-          }
         } catch (error) {
           hide();
           Modal.error({
@@ -235,6 +126,7 @@ export default {
         // console.log(billData);
       };
       reader.readAsArrayBuffer(file);
+
       return false;
     },
   },

src/views/atmosphere/acid-rain/collect/rain.vue

@@ -72,21 +72,13 @@
                 />
               </a-form-item>
             </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="测点名称" name="place">
+
+            <a-col v-for="(item,index) in tableColumns" :key="index" :md="12" :sm="24">
+              <a-form-item :label="item.title" :name="item.dataIndex">
                 <a-input
-                  v-model:value="form.place"
-                  placeholder="请输入测点名称"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="备注" name="remark">
-                <a-input
-                  v-model:value="form.remark"
-                  placeholder="请输入备注"
-                  allow-clear
+                    v-model:value="form[item.dataIndex]"
+                    :placeholder="'请输入' + item.title"
+                    allow-clear
                 />
               </a-form-item>
             </a-col>
@@ -168,7 +160,7 @@ import {
 } from "@/api/ecology/acid";
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 import moment from "moment";
-//   import utils from "./utils";
+import { tableColumns } from "./colums";
 export default {
   name: "ZoneCollectNoise",
   components: {},
@@ -195,104 +187,10 @@ export default {
           sorter: true,
           customRender: ({text})=> moment(text,"YYYY/MM/DD HH:mm:ss").format("YYYY-MM-DD HH:mm")
         },
-         {
-          title: "行政代码",
-          dataIndex: "regionCode",
-          sorter: true,
-        },
-        {
-          title: "市(县，区)",
-          slots: {customRender: "Address"},
-        },
-         {
-          title: "采样点",
-          dataIndex: "place",
-          sorter: true,
-        },
-         {
-          title: "点位类型",
-          dataIndex: "placeType",
-          sorter: true,
-        },
-         {
-          title: "降水类型",
-          dataIndex: "precipitationType",
-          sorter: true,
-        },
-         {
-          title: "降水量",
-          dataIndex: "precipitation",
-          sorter: true,
-        },
-         {
-          title: "pH",
-          dataIndex: "ph",
-          sorter: true,
-        },
-         {
-          title: "电导率",
-          dataIndex: "conductivity",
-          sorter: true,
-        },
-         {
-          title: "SO42",
-          dataIndex: "so42",
-          sorter: true,
-        },
-         {
-          title: "NO3",
-          dataIndex: "no3",
-          sorter: true,
-        },
-         {
-          title: "F",
-          dataIndex: "f",
-          sorter: true,
-        },
-         {
-          title: "CL",
-          dataIndex: "cl",
-          sorter: true,
-        },
-         {
-          title: "NH4",
-          dataIndex: "nh4",
-          sorter: true,
-        },
-         {
-          title: "Ca2",
-          dataIndex: "ca2",
-          sorter: true,
-        },
-         {
-          title: "Mg2",
-          dataIndex: "mg2",
-          sorter: true,
-        },
-         {
-          title: "Na",
-          dataIndex: "na",
-          sorter: true,
-        },
-         {
-          title: "K",
-          dataIndex: "k",
-          sorter: true,
-        },
-         {
-          title: "系统编码",
-          dataIndex: "systemCode",
-          sorter: true,
-        },
-
-        {
-          title: "备注",
-          dataIndex: "remark",
-          sorter: true,
-        },
+        ...tableColumns,
         {
           title: "创建人",
-          dataIndex: "username",
+          dataIndex: "userName",
           sorter: true,
         },
         {
@@ -355,8 +253,7 @@ export default {
     },
     /* 刷新表格 */
     reload() {
-      console.log(this.$route);
-      console.log(this.$router);
+
       this.$refs.table.reload({
         where: this.where,
       });

src/views/atmosphere/acid-rain/collect/utils.js

@@ -1,158 +1,34 @@
+import moment from "moment";
 export default {
-    toObjData(excelData) {
+    toObjData(excelData,monitorYear) {
         return excelData.map(item => {
-            const monitorStartTime = new Date();
-            monitorStartTime.setFullYear(item[4]);
-            monitorStartTime.setMonth(item[5] - 1);
-            monitorStartTime.setDate(item[6]);
-            monitorStartTime.setHours(item[7]);
-            monitorStartTime.setMinutes(item[8]);
-
-            const monitorEndTime = new Date();
-            monitorEndTime.setFullYear(item[9]);
-            monitorEndTime.setMonth(item[10] - 1);
-            monitorEndTime.setDate(item[11]);
-            monitorEndTime.setHours(item[12]);
-            monitorEndTime.setMinutes(item[13]);
-            let quarter = 1;
-            const month = item[10]
-            if (month < 4) {
-                quarter = 1
-            } else if (month < 7) {
-                quarter = 2
-            } else if (month < 10) {
-                quarter = 3
-            } else {
-                quarter = 4
-            }
+            const monitorTime = moment(monitorYear + "."+item[1],"Y.M.D");
+            const monitorStartTime  = moment(`${monitorYear}.${item[2]}.${item[3]} ${item[4]}:${item[5]}`,"Y.M.D H:m");
+            const monitorEndTime  = moment(`${monitorYear}.${item[6]}.${item[7]} ${item[8]}:${item[9]}`,"Y.M.D H:m");
             console.log(item);
             const row = {
-                regionCode: item[0],
-                city: item[1].includes("市")?item[1]:"南宁市",
-                area: item[1].includes("区")?item[1]:"",
-                county: item[1].includes("县")?item[1]:"",
-                place: item[2],
-                placeType: item[3],
-                precipitationType: item[14],
-                precipitation: item[15],
-                ph: item[16],
-                conductivity: item[17],
-                so42: item[18],
-                no3: item[19],
-                f: Number(item[20])?Number(item[20]):null,
-                cl: item[21],
-                nh4: item[22],
-                ca2: item[23],
-                mg2: item[24],
-                na: item[25],
-                k: Number(item[26])?Number(item[26]):null,
-                systemCode: item[27],
-                regionLevel: "市级",
-                monitorStartTime: monitorStartTime.getTime(),
-                monitorEndTime: monitorEndTime.getTime(),
-                monitorTime: monitorEndTime.getTime(),
-                quarter
+                city: "南宁市",
+                code: item[0],
+                precipitationType:item[10],
+                precipitation:item[11],
+                ph:item[12],
+                conductivity:item[13],
+                fluorine:item[14],
+                chlorine:item[15],
+                sulfateRadical:item[16],
+                nitrate:item[17],
+                na:item[18],
+                ammoniumRadical:item[19],
+                k:item[20],
+                mg:item[21],
+                ca:item[22],
+                monitorStartTime: monitorStartTime.valueOf(),
+                monitorEndTime: monitorEndTime.valueOf(),
+                monitorTime: monitorTime.valueOf(),
             }
             return row;
         })
 
     },
-    toPlaceData(excelData) {
-        return excelData.map(item => {
-            return {
-                place: item[0],
-                placeLng: item[1],
-                placeLat: item[2],
-                motorway: item[3],
-                motorwayType: item[4],
-                motorwayLevel: item[5],
-                refObj: item[6],
-                people: item[7],
-                station: item[8],
-                monitorInstrumentModel: item[9],
-                monitorInstrumentCode: item[10],
-                beforeMonitorValue: item[11],
-                afterMonitorValue: item[12],
-                soundPressureValue: item[13],
-                soundInstrumentModel: item[14],
-                soundInstrumentCode: item[15],
 
-            }
-        })
-
-    },
-    // 解析县级数据
-    toAreaObjData(excelData) {
-        return excelData.map(item => {
-            const monitorStartTime = new Date();
-            monitorStartTime.setFullYear(item[1]);
-            monitorStartTime.setMonth(item[14] - 1);
-            monitorStartTime.setDate(item[15]);
-            monitorStartTime.setHours(item[16]);
-            monitorStartTime.setMinutes(item[17]);
-            let quarter = 1;
-            const month = item[14]
-            if (month < 4) {
-                quarter = 1
-            } else if (month < 7) {
-                quarter = 2
-            } else if (month < 10) {
-                quarter = 3
-            } else {
-                quarter = 4
-            }
-            let timeSlot = "夜";
-            if (item[16] >= 6 && item[16] <= 22) {
-                timeSlot = "昼"
-            }
-            const row =  {
-                regionCode: item[0],
-                regionLevel: "县级",
-                monitorYear: item[1],
-                placeCode: item[2],
-                place: item[3],
-                placeLng: item[4],
-                placeLat: item[5],
-                road: item[6],
-                roadLength: item[7],
-                roadWidth: item[8],
-                motorway: item[9],
-                motorwayType: item[10],
-                motorwayLevel: item[11],
-                refObj: item[12],
-                people: item[13],
-                monitorMonth: item[14],
-                monitorDay: item[15],
-                monitorHour: item[16],
-                monitorMinute: item[17],
-                smallTrafficFlow: item[18],
-                largeTrafficFlow: item[19],
-                indexLeq: item[20],
-                indexL10: item[21],
-                indexL50: item[22],
-                indexL90: item[23],
-                indexLmax: item[24],
-                indexLmin: item[25],
-                indexSd: item[26],
-                station: item[27],
-                monitorInstrumentModel: item[28],
-                monitorInstrumentCode: item[29],
-                beforeMonitorValue: item[30],
-                afterMonitorValue: item[31],
-                soundPressureValue: item[32],
-                soundInstrumentModel: item[33],
-                soundInstrumentCode: item[34],
-                remark: item[35],
-                city: '南宁',
-                timeSlot,
-                monitorStartTime: monitorStartTime.getTime(),
-                quarter
-
-            }
-            if(row.indexL10 < row.indexL50 || row.indexL50 < row.indexL90){
-                throw new Error(row.place + "数值有误")
-            }
-            return row;
-        })
-    }
-}
+}

src/views/atmosphere/acid-rain/statistic/base.vue

@@ -250,8 +250,7 @@ export default {
     },
     /* 刷新表格 */
     reload() {
-      console.log(this.$route);
-      console.log(this.$router);
+
       this.$refs.table.reload({
         where: this.where,
       });

src/views/atmosphere/acid-rain/statistic/index.vue

@@ -2,7 +2,7 @@
   <div class="ele-body">
     <a-card :bordered="false">
       <a-tabs v-model:activeKey="activeKey">
-        <a-tab-pane key="base" tab="总览">
+        <a-tab-pane key="base" tab="数据总览">
           <base-statistic></base-statistic>
         </a-tab-pane>