区域导入导出

src/api/ecology/zone-sound.js

@@ -52,6 +52,9 @@ const pageZoneNoiseStatisticUrl = '/sound/zone/noise/statistic';
 const getHistoryyears = function () {
     return axios.get("/sound/zone/noise/history-year")
 }
+const getColumnOptions = function(column){
+    return axios.get("/sound/zone/noise/options",{params:{column}})
+}
 export {
     pageBillUrl,
     saveZoneNoiseBill,
@@ -66,6 +69,7 @@ export {
     updateZoneNoise,
     removeBatchZoneNoise,
     pageZoneNoiseStatisticUrl,
-    getHistoryyears
+    getHistoryyears,
+    getColumnOptions
   
 }

src/views/sound/function/collect/noise.vue

@@ -47,7 +47,7 @@
       </a-form>
       <a-modal
         v-model:visible="showEdit"
-        :title="form.functionNoiseId !== undefined ? '修改用户' : '添加用户'"
+        :title="form.functionNoiseId !== undefined ? '修改记录' : '添加记录'"
         :confirm-loading="loading"
         :width="1000"
         :body-style="{ paddingBottom: '8px' }"

src/views/sound/function/statistic/base.vue

@@ -41,7 +41,7 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :lg="8" :md="12" :sm="24" :xs="24">
+          <!-- <a-col :lg="8" :md="12" :sm="24" :xs="24">
             <a-form-item label="城区">
               <a-select v-model:value="where.area" allowClear showSearch>
                 <a-select-option
@@ -51,7 +51,7 @@
                 >
               </a-select>
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
             <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
               <a-space>
@@ -93,7 +93,7 @@
 import XLSX from "xlsx";
 import { pageFunctionNoiseUrl, getColumnOptions } from "@/api/ecology/function-sound";
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
-// import moment from "moment";
+import moment from "moment";
 //   import utils from "./utils";
 export default {
   name: "StatisticSoundFunctionBase",
@@ -111,6 +111,9 @@ export default {
         {
           title: "监测时间",
           dataIndex: "monitorTime",
+          customRender:({text})=>{
+            return moment(text,"YYYY/MM/DD HH:mm:ss").format("YYYY-MM-DD HH:mm")
+          },
           sorter: true,
         },
         {

src/views/sound/function/statistic/leq-compare.vue

@@ -0,0 +1,102 @@
+<template>
+  <div class="">
+    <a-form :model="where" :rules="whereRules" :labelCol="{ offset: 1 }">
+      <a-row>
+        <a-col :lg="6" :md="12" :sm="24" :xs="24">
+          <a-form-item label="昼夜:">
+            <a-select
+              :options="timeSlotOptions"
+              v-model:value="where.timeSlot"
+              placeholder="昼夜"
+            >
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :lg="12" :md="12" :sm="24" :xs="24">
+          <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
+            <a-space>
+              <a-button type="primary" @click="reload">查询</a-button>
+              <a-button @click="reset">重置</a-button>
+              <a-button @click="exportFile">导出Excel</a-button>
+            </a-space>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+    <ele-pro-table
+      v-if="hisYears.length > 0"
+      ref="table"
+      row-key="id"
+      :datasource="url"
+      :columns="columns"
+      :where="where"
+      :needPage="false"
+      :initLoad="false"
+      :scroll="{ x: 'max-content' }"
+      :method="'POST'"
+      @done="(d) => (data = d.data)"
+    >
+      <template #toolbar> </template>
+    </ele-pro-table>
+  </div>
+</template>
+
+<script>
+// import _ from "lodash";
+import XLSX from "xlsx";
+import {
+  pageFunctionNoiseCompare,
+  getHistoryyears,
+} from "@/api/ecology/function-sound";
+export default {
+  name: "StatisticSoundFunctionCompare",
+  components: {},
+  data() {
+    const whereRules = {};
+    return {
+      url: pageFunctionNoiseCompare,
+      data: [],
+      where: {},
+      timeRange: [],
+      whereRules,
+      hisYears: [],
+      timeScope: [],
+      columns: [{ title: "年", dataIndex: "year" }],
+    };
+  },
+  mounted() {
+    getHistoryyears().then((res) => {
+      this.hisYears = res.data.data;
+      this.$nextTick(() => {
+        this.reload();
+      });
+    });
+  },
+  methods: {
+    /* 刷新表格 */
+    reload() {
+      this.$refs.table.reload({
+        where: this.where,
+      });
+    },
+    /* 重置搜索 */
+    reset() {
+      this.reload();
+    },
+    exportFile() {
+      const arr = [];
+      const th = this.columns.map((item) => item.title);
+      arr.push(th);
+      this.data.forEach((d) => {
+        const td = this.columns.map((item) => d[item.dataIndex]);
+        arr.push(td);
+      });
+      let sheet = XLSX.utils.aoa_to_sheet(arr);
+      this.$util.exportSheet(XLSX, sheet, new Date().getTime().toString());
+    },
+  },
+};
+</script>
+
+<style scoped>
+</style>

src/views/sound/road/collect/noise.vue

@@ -53,7 +53,7 @@
       </a-form>
       <a-modal
         v-model:visible="showEdit"
-        :title="form.roadNoiseId !== undefined ? '修改用户' : '添加用户'"
+        :title="form.roadNoiseId !== undefined ? '修改记录' : '添加记录'"
         :confirm-loading="loading"
         :width="1000"
         :body-style="{ paddingBottom: '8px' }"

src/views/sound/road/statistic/compare.vue

@@ -417,7 +417,7 @@ export default {
                 title: item + "年Leq",
                 dataIndex: item + "Leq",
                 customRender: ({ text }) => {
-                  const val = text ? Number(text).toFixed(2) : "";
+                  const val = text ? Number(text).toFixed(1) : "";
                   return val;
                 },
               });
@@ -427,7 +427,7 @@ export default {
                 title: item + "年SD",
                 dataIndex: item + "Sd",
                 customRender: ({ text }) => {
-                  const val = text ? Number(text).toFixed(2) : "";
+                  const val = text ? Number(text).toFixed(1) : "";
                   return val;
                 },
               });
@@ -437,7 +437,7 @@ export default {
                 title: item + "年L10",
                 dataIndex: item + "L10",
                 customRender: ({ text }) => {
-                  const val = text ? Number(text).toFixed(2) : "";
+                  const val = text ? Number(text).toFixed(1) : "";
                   return val;
                 },
               });
@@ -448,7 +448,7 @@ export default {
                 title: item + "年L50",
                 dataIndex: item + "L50",
                 customRender: ({ text }) => {
-                  const val = text ? Number(text).toFixed(2) : "";
+                  const val = text ? Number(text).toFixed(1) : "";
                   return val;
                 },
               });
@@ -458,7 +458,7 @@ export default {
                 title: item + "年L90",
                 dataIndex: item + "L90",
                 customRender: ({ text }) => {
-                  const val = text ? Number(text).toFixed(2) : "";
+                  const val = text ? Number(text).toFixed(1) : "";
                   return val;
                 },
               });
@@ -468,7 +468,7 @@ export default {
                 title: item + "年Lmin",
                 dataIndex: item + "Lmin",
                 customRender: ({ text }) => {
-                  const val = text ? Number(text).toFixed(2) : "";
+                  const val = text ? Number(text).toFixed(1) : "";
                   return val;
                 },
               });
@@ -478,7 +478,7 @@ export default {
                 title: item + "年Lmax",
                 dataIndex: item + "Lmax",
                 customRender: ({ text }) => {
-                  const val = text ? Number(text).toFixed(2) : "";
+                  const val = text ? Number(text).toFixed(1) : "";
                   return val;
                 },
               });

src/views/sound/zone/collect/index.vue

@@ -3,54 +3,58 @@
     <a-card style="width: 100%" :bordered="false">
       <template #title>
         <a-space>
-          <a-upload :before-upload="importFile" :showUploadList="false" accept=".xls,.xlsx,.csv">
+          <a-upload
-            <a-button>导入excel</a-button>
+            :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">
         <a-tab-pane tab="噪声信息" key="noise">
           <noise-bill ref="noise"></noise-bill>
         </a-tab-pane>
-        <!-- <a-tab-pane tab="其他信息" key="place">
-          <place-bill ref="place"></place-bill>
-        </a-tab-pane> -->
       </a-tabs>
     </a-card>
   </div>
 </template>
 
 <script>
-  import XLSX from 'xlsx';
+import XLSX from "xlsx";
 import utils from "./utils";
+import { Modal } from "ant-design-vue";
 import NoiseBill from "./noise-bill.vue";
-  // import PlaceBill from "./place-bill.vue";
+import { saveZoneNoiseBill } from "@/api/ecology/zone-sound";
-
-  import {
-    saveZoneNoiseBill,
-  } from "@/api/ecology/zone-sound";
-
 export default {
   name: "ZoneCollectIndex",
   components: {
     NoiseBill,
-      // PlaceBill
   },
   data() {
-
     return {
-        activeKey: 'noise'
+      activeKey: "noise",
-      }
+    };
   },
   methods: {
     /* 导入本地excel文件 */
-      importFile(file) {
+    importFileCity(file) {
-        try {
+      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'
+            type: "array",
           });
           //0.昼间数据 1.夜间数据 2.其他信息
           let sheetNames = workbook.SheetNames;
@@ -62,62 +66,179 @@
             header: 1,
           });
         
-            const reportDate = aoa[1][0].replace(/[^\d]+/g, "-")
+          const reportDate = aoa[1][0].replace(/[^\d]+/g, "-");
-            const reportDate2 = aoa2[1][0].replace(/[^\d]+/g, "-")
+          const reportDate2 = aoa2[1][0].replace(/[^\d]+/g, "-");
+
+          const zoneNoiseList = aoa.filter(
+            (item) => {
+              return item.length >= 26 && typeof item[0] == "number"}
+          );
+          const zoneNoiseList2 = aoa2.filter(
+            (item) => item.length >= 26 && typeof item[0] == "number"
+          );
          
-            const zoneNoiseList = aoa.filter(item => item.length == 26 && typeof item[0] == "number");
-            const zoneNoiseList2 = aoa2.filter(item => item.length == 26 && typeof item[0] == "number");
 
           // 解析成对象数组
+          const billName = aoa[0][0];
           const billData = utils.toObjData(zoneNoiseList);
+          const billName2 = aoa2[0][0];
           const billData2 = utils.toObjData(zoneNoiseList2);
+          if (
+            (!billData || billData.length == 0) &&
+            (!billData2 || billData2.length == 0)
+          ) {
+            hide()
+            Modal.error({
+              title: "导入失败",
+              content: "找不到数据",
+            });
+            return;
+          }
 
           const tasks = [];
           if (billData.length > 0) {
-              tasks.push(saveZoneNoiseBill({
+            tasks.push(
+              saveZoneNoiseBill({
                 reportTime: new Date(reportDate).getTime(),
-                billName: sheetNames[0] + reportDate,
+                billName: billName,
-                zoneNoiseList: billData
+                regionLevel: "市级",
-              }).then(res=>{
+                zoneNoiseList: billData,
-                if(res.data.code != 0){
+              })
-                  this.$message.error("表格格式有误，请检查后重新上传！");
+            );
-                }
-              }))
           }
 
           if (billData2.length > 0) {
-              tasks.push(saveZoneNoiseBill({
+            tasks.push(
+              saveZoneNoiseBill({
                 reportTime: new Date(reportDate2).getTime(),
-                billName: sheetNames[1] + reportDate2,
+                billName: billName2,
-                zoneNoiseList: billData2
+                regionLevel: "市级",
-              }).then(res=>{
+                zoneNoiseList: billData2,
-                if(res.data.code != 0){
+              })
-                  this.$message.error("表格格式有误，请检查后重新上传！");
+            );
           }
-              }))
-            }
-
 
           // 上传到服务器
 
-            Promise.all(tasks).then(() => {
+          Promise.all(tasks)
-              this.$refs.noise && this.$refs.noise.reload()
+            .then(() => {
-              this.$refs.place && this.$refs.place.reload()
+              Modal.success({
+                title: "导入成功",
+                content: `成功导入${billData.length + billData2.length}条数据`,
+              });
+              this.$refs.noise && this.$refs.noise.reload();
             })
-
+            .catch(() => {
+              Modal.error({
+                title: "导入失败",
+                content: "数据上传出错",
+              });
+            })
+            .finally(() => {
+              hide();
+            });
+        } catch (error) {
+          hide();
+          Modal.error({
+            title: "导入失败",
+            content: error.message,
+          });
+        }
         // console.log(billData);
-
       };
       reader.readAsArrayBuffer(file);
-        } catch (error) {
+
-          this.$message.error("表格格式有误，请检查后重新上传！");
-        }
       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 zoneNoiseList = aoa.filter(
+            (item) => {
+
+              return item.length >= 35 && item[0] != "行政区划代码"
             }
+          );
+
+          // 解析成对象数组
+          const billName = aoa[0][0];
+          const billData = utils.toAreaObjData(zoneNoiseList);
+
+          if (!billData || billData.length == 0) {
+            hide();
+            Modal.error({
+              title: "导入失败",
+              content: "找不到可用数据",
+            });
+
+            return;
           }
+
+          if (billData.length > 0) {
+            // 上传到服务器
+            saveZoneNoiseBill({
+              reportTime: new Date(reportDate).getTime(),
+              billName: billName,
+              regionLevel: "县级",
+              zoneNoiseList: billData,
+            })
+              .then((res) => {
+                if (res.data.code == 0) {
+                  Modal.success({
+                    title: "导入成功",
+                    content: `成功导入${
+                      billData.length
+                    }条数据`,
+                  });
+                  this.$refs.noise && this.$refs.noise.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;
+    },
+  },
+};
 </script>
 
 <style scoped lang="less">
-
 </style>

src/views/sound/zone/collect/noise-bill.vue

@@ -7,6 +7,12 @@
 
           <!-- 搜索表单 -->
           <a-form layout="inline" :model="where" :labelCol="{ offset: 1}">
+            <a-form-item label="区域等级:">
+              <a-select v-model:value="where.regionLevel" allowClear placeholder="未选择">
+                <a-select-option :value="'市级'">市级</a-select-option>
+                <a-select-option :value="'县级'">县级</a-select-option>
+              </a-select>
+            </a-form-item>
             <a-form-item label="审核状态:">
               <a-select v-model:value="where.checked" allowClear placeholder="未选择">
                 <a-select-option :value="1">已审核</a-select-option>
@@ -97,6 +103,7 @@
     CheckOutlined,
     EditOutlined
   } from '@ant-design/icons-vue';
+  import { Modal } from 'ant-design-vue';
   import {
     pageBillUrl,
     // saveZoneNoiseBill,
@@ -137,6 +144,11 @@
             },
 
           },
+          {
+            title: '区域等级',
+            dataIndex: 'regionLevel',
+            sorter: true,
+          },
           {
             title: '条目',
             dataIndex: 'recordSize',
@@ -166,11 +178,6 @@
             customRender: ({
               text
             }) => this.$util.toDateString(text)
-          },
-           {
-            title: '创建人',
-            dataIndex: 'username',
-            sorter: true
           },
           {
             title: '审核状态',
@@ -180,6 +187,12 @@
               customRender: 'checked',
             },
 
+          },
+          {
+            title: '创建人',
+            dataIndex: 'username',
+            sorter: true,
+
           },
           // {
           //   title: '更新时间',
@@ -248,9 +261,15 @@
         }).then(res => {
           if (res.data.code == 0) {
             record.checked = checked
-            this.$message.success(res.data.msg);
+            Modal.success({
+              title: "提示",
+              content: checked?"审核成功":"撤回成功"
+            });
           } else {
-            this.$message.error(res.data.msg);
+            Modal.error({
+              title: "提示",
+              content: res.data.msg
+            });
           }
         }).catch((e) => {
           this.$message.error(e.message);

src/views/sound/zone/collect/noise.vue

@@ -2,22 +2,32 @@
   <div class="ele-body">
     <a-card :bordered="false">
       <!-- 搜索表单 -->
-      <a-form :model="where" :label-col="{md: {span: 6}, sm: {span: 24}}"
+      <a-form
-        :wrapper-col="{md: {span: 18}, sm: {span: 24}}">
+        :model="where"
+        :label-col="{ md: { span: 6 }, sm: { span: 24 } }"
+        :wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }"
+      >
         <a-row>
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
             <a-form-item label="测点名称:">
-              <a-input v-model:value.trim="where.place" placeholder="请输入测点名称" allow-clear />
+              <a-select v-model:value="where.place" allowClear showSearch>
-            </a-form-item>
+                <a-select-option
-          </a-col>
+                  v-for="(item) in palceOptions"
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
+                  :key="item.value"
-            <a-form-item label="路段:">
+                  >{{ item.label }}</a-select-option
-              <a-input v-model:value.trim="where.zone" placeholder="请输入路段名称" allow-clear />
+                >
+              </a-select>
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
             <a-form-item label="城区">
-              <a-input v-model:value.trim="where.area" placeholder="请输入城区名称" allow-clear />
+              <a-select v-model:value="where.area" allowClear showSearch>
+                <a-select-option
+                  v-for="(item) in areaOptions"
+                  :key="item.value"
+                  >{{ item.label }}</a-select-option
+                >
+              </a-select>
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
@@ -30,147 +40,287 @@
           </a-col>
         </a-row>
       </a-form>
-      <a-modal v-model:visible="showEdit" :title="form.zoneNoiseId!==undefined?'修改用户':'添加用户'" :confirm-loading="loading"
+      <a-modal
-        :width="1000" :body-style="{paddingBottom: '8px'}" @ok="save">
+        v-model:visible="showEdit"
-        <a-form ref="form" :model="form" :rules="rules" :label-col="{md: {span: 8}, sm: {span: 24}}"
+        :title="form.zoneNoiseId !== undefined ? '修改记录' : '添加记录'"
-          :wrapper-col="{md: {span: 16}, sm: {span: 24}}">
+        :confirm-loading="loading"
+        :width="1000"
+        :body-style="{ paddingBottom: '8px' }"
+        @ok="save"
+      >
+        <a-form
+          ref="form"
+          :model="form"
+          :rules="rules"
+          :label-col="{ md: { span: 6 }, sm: { span: 24 } }"
+          :wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }"
+        >
           <a-row>
             <a-col :md="12" :sm="24">
               <a-form-item label="日期" name="monitorDate">
-                <a-date-picker v-model:value="form.monitorDate" :locale="locale" />
+                <a-date-picker
+                  v-model:value="form.monitorDate"
+                  :locale="locale"
+                />
               </a-form-item>
             </a-col>
             <a-col :md="12" :sm="24">
               <a-form-item label="时间" name="monitorTime">
-                <a-time-picker v-model:value="form.monitorTime" format="HH:mm" />
+                <a-time-picker
+                  v-model:value="form.monitorTime"
+                  format="HH:mm"
+                />
               </a-form-item>
             </a-col>
             <a-col :md="12" :sm="24">
               <a-form-item label="测点名称" name="place">
-                <a-input v-model:value="form.place" placeholder="请输入测点名称" allow-clear />
+                <a-input
-              </a-form-item>
+                  v-model:value="form.place"
-            </a-col>
+                  placeholder="请输入测点名称"
-             <a-col :md="12" :sm="24">
+                  allow-clear
-              <a-form-item label="网格点号" name="gridNo">
+                />
-               <a-input v-model:value="form.gridNo" placeholder="请输入测点名称" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="网格长度" name="gridLength">
-                <a-input v-model:value="form.gridLength" placeholder="请输入网格长度" allow-clear />
-              </a-form-item>
-            </a-col>
-             <a-col :md="12" :sm="24">
-              <a-form-item label="网格宽度" name="gridWidth">
-                <a-input v-model:value="form.gridWidth" placeholder="请输入网格宽度" allow-clear />
-              </a-form-item>
-            </a-col>
-
-            <a-col :md="12" :sm="24">
-              <a-form-item label="主要声源" name="source">
-                <a-input v-model:value="form.source" placeholder="请输入测点名称" allow-clear />
               </a-form-item>
             </a-col>
             <a-col :md="12" :sm="24">
               <a-form-item label="所属城区" name="area">
-                <a-input v-model:value="form.area" placeholder="请输入点号" allow-clear />
+                <a-input
+                  v-model:value="form.area"
+                  placeholder="请输入城区"
+                  allow-clear
+                />
               </a-form-item>
             </a-col>
+            <a-col :md="12" :sm="24">
+              <a-form-item label="网格长" name="zoneLength">
+                <a-input
+                  v-model:value="form.gridLength"
+                  placeholder="请输入网格长（米）"
+                  allow-clear
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :md="12" :sm="24">
+              <a-form-item label="网格宽" name="zoneWidth">
+                <a-input
+                  v-model:value="form.gridWidth"
+                  placeholder="请输入网格宽（米）"
+                  allow-clear
+                />
+              </a-form-item>
+            </a-col>
+            
             <a-col :md="12" :sm="24">
               <a-form-item label="LeqdB(A)" name="indexLeq">
-                <a-input type="number" v-model:value="form.indexLeq" placeholder="请输入LeqdB(A)" allow-clear />
+                <a-input
+                  type="number"
+                  v-model:value="form.indexLeq"
+                  placeholder="请输入LeqdB(A)"
+                  allow-clear
+                />
               </a-form-item>
             </a-col>
             <a-col :md="12" :sm="24">
               <a-form-item label="SDdB(A)" name="indexSd">
-                <a-input type="number" v-model:value="form.indexSd" placeholder="请输入大SDdB(A)" allow-clear />
+                <a-input
+                  type="number"
+                  v-model:value="form.indexSd"
+                  placeholder="请输入大SDdB(A)"
+                  allow-clear
+                />
               </a-form-item>
             </a-col>
             <a-col :md="12" :sm="24">
               <a-form-item label="L10dB(A)" name="indexL10">
-                <a-input type="number" v-model:value="form.indexL10" placeholder="请输入L10dB(A)" allow-clear />
+                <a-input
+                  type="number"
+                  v-model:value="form.indexL10"
+                  placeholder="请输入L10dB(A)"
+                  allow-clear
+                />
               </a-form-item>
             </a-col>
             <a-col :md="12" :sm="24">
               <a-form-item label="L50dB(A)" name="indexL50">
-                <a-input type="number" v-model:value="form.indexL50" placeholder="请输入L50dB(A)" allow-clear />
+                <a-input
+                  type="number"
+                  v-model:value="form.indexL50"
+                  placeholder="请输入L50dB(A)"
+                  allow-clear
+                />
               </a-form-item>
             </a-col>
             <a-col :md="12" :sm="24">
               <a-form-item label="L90dB(A)" name="indexL90">
-                <a-input type="number" v-model:value="form.indexL90" placeholder="请输入L90dB(A)" allow-clear />
+                <a-input
+                  type="number"
+                  v-model:value="form.indexL90"
+                  placeholder="请输入L90dB(A)"
+                  allow-clear
+                />
               </a-form-item>
             </a-col>
             <a-col :md="12" :sm="24">
               <a-form-item label="LmindB(A)" name="indexLmin">
-                <a-input type="number" v-model:value="form.indexLmin" placeholder="请输入LmindB(A)" allow-clear />
+                <a-input
+                  type="number"
+                  v-model:value="form.indexLmin"
+                  placeholder="请输入LmindB(A)"
+                  allow-clear
+                />
               </a-form-item>
             </a-col>
             <a-col :md="12" :sm="24">
               <a-form-item label="LmaxdB(A)" name="indexLmax">
-                <a-input type="number" v-model:value="form.indexLmax" placeholder="请输入LmaxdB(A)" allow-clear />
+                <a-input
+                  type="number"
+                  v-model:value="form.indexLmax"
+                  placeholder="请输入LmaxdB(A)"
+                  allow-clear
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :md="12" :sm="24">
+              <a-form-item label="监测站名" name="station">
+                <a-input
+                  v-model:value="form.station"
+                  placeholder="请输入监测站名"
+                  allow-clear
+                />
               </a-form-item>
             </a-col>
-           
             <a-col :md="12" :sm="24">
               <a-form-item label="监测仪器型号" name="monitorInstrumentModel">
-                <a-input v-model:value="form.monitorInstrumentModel" placeholder="请输入监测仪器型号" allow-clear />
+                <a-input
+                  v-model:value="form.monitorInstrumentModel"
+                  placeholder="请输入监测仪器型号"
+                  allow-clear
+                />
               </a-form-item>
             </a-col>
             <a-col :md="12" :sm="24">
               <a-form-item label="监测仪器编号" name="monitorInstrumentCode">
-                <a-input v-model:value="form.monitorInstrumentCode" placeholder="请输入监测仪器编号" allow-clear />
+                <a-input
+                  v-model:value="form.monitorInstrumentCode"
+                  placeholder="请输入监测仪器编号"
+                  allow-clear
+                />
               </a-form-item>
             </a-col>
             <a-col :md="12" :sm="24">
               <a-form-item label="监测前校准值" name="beforeMonitorValue">
-                <a-input v-model:value="form.beforeMonitorValue" placeholder="请输入监测前校准值" allow-clear />
+                <a-input
+                  v-model:value="form.beforeMonitorValue"
+                  placeholder="请输入监测前校准值"
+                  allow-clear
+                />
               </a-form-item>
             </a-col>
             <a-col :md="12" :sm="24">
               <a-form-item label="监测后校准值" name="afterMonitorValue">
-                <a-input v-model:value="form.afterMonitorValue" placeholder="请输入监测后校准值" allow-clear />
+                <a-input
+                  v-model:value="form.afterMonitorValue"
+                  placeholder="请输入监测后校准值"
+                  allow-clear
+                />
               </a-form-item>
             </a-col>
             <a-col :md="12" :sm="24">
               <a-form-item label="声校准器测量声压值" name="soundPressureValue">
-                <a-input v-model:value="form.soundPressureValue" placeholder="请输入声校准器测量声压值" allow-clear />
+                <a-input
+                  v-model:value="form.soundPressureValue"
+                  placeholder="请输入声校准器测量声压值"
+                  allow-clear
+                />
               </a-form-item>
             </a-col>
             <a-col :md="12" :sm="24">
               <a-form-item label="声校准仪器型号" name="soundInstrumentModel">
-                <a-input v-model:value="form.soundInstrumentModel" placeholder="请输入声校准仪器型号" allow-clear />
+                <a-input
+                  v-model:value="form.soundInstrumentModel"
+                  placeholder="请输入声校准仪器型号"
+                  allow-clear
+                />
               </a-form-item>
             </a-col>
             <a-col :md="12" :sm="24">
               <a-form-item label="声校准仪器编号" name="soundInstrumentCode">
-                <a-input v-model:value="form.soundInstrumentCode" placeholder="请输入点号" allow-clear />
+                <a-input
+                  v-model:value="form.soundInstrumentCode"
+                  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
+                />
               </a-form-item>
             </a-col>
           </a-row>
-
         </a-form>
-
       </a-modal>
       <!-- 表格 -->
-      <ele-pro-table v-model:selection="selectionList" ref="table" row-key="zoneNoiseId" :datasource="url"
+      <ele-pro-table
-        :columns="columns" :where="where" :scroll="{x: 'max-content'}">
+        v-model:selection="selectionList"
+        ref="table"
+        row-key="zoneNoiseId"
+        :datasource="url"
+        :columns="columns"
+        :where="where"
+        :scroll="{ x: 'max-content' }"
+      >
         <template v-if="bill.checked != 1" #toolbar>
           <a-space>
             <a-button @click="openEdit" type="primary">新增</a-button>
-            <a-popconfirm :disabled="selectionList.length == 0" :title="`确认删除${selectionList.length}条数据吗?`"
+            <a-popconfirm
-              ok-text="Yes" cancel-text="No" @confirm="removeBatch">
+              :disabled="selectionList.length == 0"
-              <a-button :disabled="selectionList.length == 0" type="primary" ghost danger>删除</a-button>
+              :title="`确认删除${selectionList.length}条数据吗?`"
+              ok-text="Yes"
+              cancel-text="No"
+              @confirm="removeBatch"
+            >
+              <a-button
+                :disabled="selectionList.length == 0"
+                type="primary"
+                ghost
+                danger
+                >删除</a-button
+              >
             </a-popconfirm>
-
           </a-space>
         </template>
 
+        <template #Leq="{ text,record  }">
+          <a-tag v-if="(record.timeSlot == '昼' && text <= 68) || (record.timeSlot == '夜' && text <= 58)" color="green">{{text}}</a-tag>
+          <a-tag v-else-if="(record.timeSlot == '昼' && text > 68 && text <=70) || (record.timeSlot == '夜' && text > 58 && text <=60)" color="blue">{{text}}</a-tag>
+          <a-tag v-else-if="(record.timeSlot == '昼' && text > 70 && text <=72) || (record.timeSlot == '夜' && text > 60 && text <=62)" color="red">{{text}}</a-tag>
+          <a-tag v-else-if="(record.timeSlot == '昼' && text > 62 && text <=74) || (record.timeSlot == '夜' && text > 62 && text <=64)" color="red">{{text}}</a-tag>
+          <a-tag v-else-if="(record.timeSlot == '昼' && text > 74 ) || (record.timeSlot == '夜' && text > 64)" color="red">{{text}}</a-tag>
+          <template v-else color="#FFF">{{text}}</template>
+        </template>
+
         <template #action="{ record }">
           <a-space>
-            <a-button @click="openEdit(record)" type="primary" shape="round" size="small">修改</a-button>
+            <a-button
-            <a-popconfirm :title="`确认删除这条数据吗?`" ok-text="Yes" cancel-text="No" @confirm="remove(record)">
+              @click="openEdit(record)"
-              <a-button type="primary" danger shape="round" size="small">删除</a-button>
+              type="primary"
+              shape="round"
+              size="small"
+              >修改</a-button
+            >
+            <a-popconfirm
+              :title="`确认删除这条数据吗?`"
+              ok-text="Yes"
+              cancel-text="No"
+              @confirm="remove(record)"
+            >
+              <a-button type="primary" danger shape="round" size="small"
+                >删除</a-button
+              >
             </a-popconfirm>
           </a-space>
         </template>
@@ -181,25 +331,24 @@
 </template>
 
 <script>
-  import _ from "lodash"
+import _ from "lodash";
 import {
   pageZoneNoiseUrl,
   saveZoneNoise,
   removeZoneNoise,
   removeBatchZoneNoise,
   updateZoneNoise,
-    getZoneNoiseBill
+  getZoneNoiseBill,
+  getColumnOptions,
 } from "@/api/ecology/zone-sound";
-  import locale from 'ant-design-vue/es/date-picker/locale/zh_CN';
+import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
-  import moment from 'moment';
+import moment from "moment";
 //   import utils from "./utils";
 export default {
-    name: 'ZoneCollectNoise',
+  name: "ZoneCollectNoise",
   components: {},
   data() {
-      const {
+    const { billId } = this.$route.params;
-        billId
-      } = this.$route.params
 
     return {
       locale,
@@ -210,41 +359,46 @@
       // 表格列配置
       columns: [
         {
-            title: '监测日期',
+          title: "监测日期",
-            dataIndex: 'monitorTime',
+          dataIndex: "monitorTime",
-            sorter: true
+          sorter: true,
+          customRender: ({text})=> moment(text,"YYYY/MM/DD HH:mm:ss").format("YYYY-MM-DD HH:mm")
         },
         {
-            title: '测点名称',
+          title: "测点名称",
-            dataIndex: 'place',
+          dataIndex: "place",
-            sorter: true
+          sorter: true,
         },
         {
-            title: '网格长',
+          title: "所属城区",
-            dataIndex: 'gridLength',
+          dataIndex: "area",
-            sorter: true
+          sorter: true,
         },
         {
-            title: '网格宽',
+          title: "网格长（米）",
-            dataIndex: 'gridWidth',
+          dataIndex: "gridLength",
-            sorter: true
+          sorter: true,
         },
         {
-            title: '网格点号',
+          title: "网格宽（米）",
-            dataIndex: 'gridNo',
+          dataIndex: "gridWidth",
-            sorter: true
+          sorter: true,
         },
          {
-            title: '所属城区',
+          title: "网格点号",
-            dataIndex: 'area',
+          dataIndex: "gridNo",
-            sorter: true
+          sorter: true,
         },
         {
-            title: '主要声源',
+          title: "主要声源",
-            dataIndex: 'source',
+          dataIndex: "source",
-            sorter: true
+          sorter: true,
+        },
+        {
+          title: "时段",
+          dataIndex: "timeSlot",
+          sorter: true,
         },
-        
         //   {
         //     title: '月',
         //     dataIndex: 'monitorMonth',
@@ -266,100 +420,108 @@
         //     sorter: true
         //   },
         {
-            title: 'LeqdB(A)',
+          title: "LeqdB(A)",
-            dataIndex: 'indexLeq',
+          dataIndex: "indexLeq",
-            sorter: true
+          slots: {customRender: "Leq"},
+          sorter: true,
         },
         {
-            title: 'SDdB(A)',
+          title: "SDdB(A)",
-            dataIndex: 'indexSd',
+          dataIndex: "indexSd",
-            sorter: true
+          sorter: true,
         },
         {
-            title: 'L10dB(A)',
+          title: "L10dB(A)",
-            dataIndex: 'indexL10',
+          dataIndex: "indexL10",
-            sorter: true
+          sorter: true,
         },
         {
-            title: 'L50dB(A)',
+          title: "L50dB(A)",
-            dataIndex: 'indexL50',
+          dataIndex: "indexL50",
-            sorter: true
+          sorter: true,
         },
         {
-            title: 'L90dB(A)',
+          title: "L90dB(A)",
-            dataIndex: 'indexL90',
+          dataIndex: "indexL90",
-            sorter: true
+          sorter: true,
         },
         {
-            title: 'LmindB(A)',
+          title: "LmindB(A)",
-            dataIndex: 'indexLmin',
+          dataIndex: "indexLmin",
-            sorter: true
+          sorter: true,
         },
         {
-            title: 'LmaxdB(A)',
+          title: "LmaxdB(A)",
-            dataIndex: 'indexLmax',
+          dataIndex: "indexLmax",
-            sorter: true
+          sorter: true,
         },
         {
-            title: '监测站名',
+          title: "监测站名",
-            dataIndex: 'station',
+          dataIndex: "station",
-            sorter: true
+          sorter: true,
         },
         {
-            title: '监测仪器型号',
+          title: "监测仪器型号",
-            dataIndex: 'monitorInstrumentModel',
+          dataIndex: "monitorInstrumentModel",
-            sorter: true
+          sorter: true,
         },
         {
-            title: '监测仪器编号',
+          title: "监测仪器编号",
-            dataIndex: 'monitorInstrumentCode',
+          dataIndex: "monitorInstrumentCode",
-            sorter: true
+          sorter: true,
         },
         {
-            title: '监测前校准值',
+          title: "监测前校准值",
-            dataIndex: 'beforeMonitorValue',
+          dataIndex: "beforeMonitorValue",
-            sorter: true
+          sorter: true,
         },
         {
-            title: '监测后校准值',
+          title: "声校准器测量声压值",
-            dataIndex: 'afterMonitorValue',
+          dataIndex: "soundPressureValue",
-            sorter: true
+          sorter: true,
         },
         {
-            title: '声校准器测量声压值',
+          title: "声校准仪器型号",
-            dataIndex: 'soundPressureValue',
+          dataIndex: "soundInstrumentModel",
-            sorter: true
+          sorter: true,
         },
         {
-            title: '声校准仪器型号',
+          title: "声校准仪器编号",
-            dataIndex: 'soundInstrumentModel',
+          dataIndex: "soundInstrumentCode",
-            sorter: true
+          sorter: true,
         },
         {
-            title: '声校准仪器编号',
+          title: "区域等级",
-            dataIndex: 'soundInstrumentCode',
+          dataIndex: "regionLevel",
-            sorter: true
+          sorter: true,
         },
         {
-            title: '创建人',
+          title: "备注",
-            dataIndex: 'username',
+          dataIndex: "remark",
-            sorter: true
+          sorter: true,
         },
         {
-            title: '操作',
+          title: "创建人",
-            key: 'action',
+          dataIndex: "username",
+          sorter: true,
+        },
+        {
+          title: "操作",
+          key: "action",
           width: 150,
-            align: 'center',
+          align: "center",
-            fixed: 'right',
+          fixed: "right",
           slots: {
-              customRender: 'action'
+            customRender: "action",
-            }
+          },
-          }
+        },
       ],
       // 表格搜索条件
       zoneNoiseBillId: billId,
+      palceOptions: [],
+      areaOptions: [],
       where: {
-          zoneNoiseBillId: billId
+        zoneNoiseBillId: billId,
       },
       // 表格选中数据
       selectionList: [],
@@ -368,42 +530,59 @@
       // 表单数据
       form: {},
       loading: false,
-        rules: {}
+      rules: {},
-
     };
   },
   mounted() {
-      const {
+    const { billId } = this.$route.params;
-        billId
+    getZoneNoiseBill(billId).then((res) => {
-      } = this.$route.params
+      this.bill = res.data.data;
-      getZoneNoiseBill(billId).then(res=>{
-        this.bill = res.data.data
       if (res.data.data.checked == 1) {
-          this.columns.splice(this.columns.length-1,1)
+        this.columns.splice(this.columns.length - 1, 1);
       }
-      })
+    });
+    this.loadOptionData();
   },
   methods: {
+    /**获取下来框数据 */
+    loadOptionData() {
+      getColumnOptions("place").then((res) => {
+        this.palceOptions = res.data.data.map((item) => {
+          return {
+            label: item,
+            value: item,
+          };
+        });
+      });
+      getColumnOptions("area").then((res) => {
+        this.areaOptions = res.data.data.map((item) => {
+          return {
+            label: item,
+            value: item,
+          };
+        });
+      });
+    },
     /* 刷新表格 */
     reload() {
       console.log(this.$route);
       console.log(this.$router);
       this.$refs.table.reload({
-          where: this.where
+        where: this.where,
       });
     },
     /* 重置搜索 */
     reset() {
       this.where = {
-          zoneNoiseBillId: this.zoneNoiseBillId
+        zoneNoiseBillId: this.zoneNoiseBillId,
       };
       this.reload();
     },
     /* 显示编辑 */
     openEdit(record) {
-        const cloneRecord = _.cloneDeep(record)
+      const cloneRecord = _.cloneDeep(record);
       if (record && cloneRecord.monitorTime) {
-          console.log(moment(cloneRecord.monitorTime).format('YYYY MM DD'));
+        console.log(moment(cloneRecord.monitorTime).format("YYYY MM DD"));
         cloneRecord.monitorDate = moment(cloneRecord.monitorTime);
         cloneRecord.monitorTime = moment(cloneRecord.monitorTime);
       }
@@ -416,7 +595,7 @@
     },
 
     save() {
-        const hide = this.$message.loading('请求中..', 0);
+      const hide = this.$message.loading("请求中..", 0);
       const form = _.cloneDeep(this.form);
       const date = new Date();
       date.setFullYear(form.monitorDate.year());
@@ -430,9 +609,10 @@
       form.monitorDay = date.getDate();
       form.monitorHour = date.getHours();
       form.monitorMinute = date.getMinutes();
-        delete form['monitorDate']
+      delete form["monitorDate"];
       if (form.zoneNoiseId) {
-          updateZoneNoise(form).then(res => {
+        updateZoneNoise(form)
+          .then((res) => {
             if (res.data.code == 0) {
               this.showEdit = false;
               this.$message.success(res.data.msg);
@@ -440,15 +620,18 @@
             } else {
               this.$message.error(res.data.msg);
             }
-          }).catch((error)=>{
+          })
+          .catch((error) => {
             this.$message.error(error.message);
-          }).finally(()=>{
+          })
+          .finally(() => {
             console.log("finallyfinallyfinallyfinally");
             hide();
-          })
+          });
       } else {
         form.zoneNoiseBillId = this.zoneNoiseBillId;
-             saveZoneNoise(form).then(res => {
+        saveZoneNoise(form)
+          .then((res) => {
             if (res.data.code == 0) {
               this.showEdit = false;
               this.$message.success(res.data.msg);
@@ -456,49 +639,52 @@
             } else {
               this.$message.error(res.data.msg);
             }
-          }).catch((error)=>{
-              this.$message.error(error.message);
-          }).finally(()=>{
-              hide();
           })
+          .catch((error) => {
+            this.$message.error(error.message);
+          })
+          .finally(() => {
+            hide();
+          });
       }
-       
-
     },
     /* 删除单个 */
     remove(row) {
-        const hide = this.$message.loading('请求中..', 0);
+      const hide = this.$message.loading("请求中..", 0);
-        removeZoneNoise(row.zoneNoiseId).then(res => {
+      removeZoneNoise(row.zoneNoiseId)
+        .then((res) => {
           if (res.data.code === 0) {
             this.$message.success(res.data.msg);
             this.reload();
           } else {
             this.$message.error(res.data.msg);
           }
-        }).catch(e => {
+        })
+        .catch((e) => {
           this.$message.error(e.msg);
-        }).finally(() => hide());
+        })
+        .finally(() => hide());
     },
     removeBatch() {
-        const ids = this.selectionList.map(item => item.zoneNoiseId);
+      const ids = this.selectionList.map((item) => item.zoneNoiseId);
-        const hide = this.$message.loading('请求中..', 0);
+      const hide = this.$message.loading("请求中..", 0);
-        removeBatchZoneNoise(ids).then(res => {
+      removeBatchZoneNoise(ids)
+        .then((res) => {
           if (res.data.code === 0) {
             this.$message.success(res.data.msg);
             this.reload();
           } else {
             this.$message.error(res.data.msg);
           }
-        }).catch(e => {
+        })
-
+        .catch((e) => {
           this.$message.error(e.msg);
-        }).finally(() => hide());
+        })
+        .finally(() => hide());
     },
-
+  },
-    }
+};
-  }
 </script>
 
 <style scoped lang="less">
-  
 </style>

src/views/sound/zone/collect/place-bill.vue

@@ -1,366 +0,0 @@
-<template>
-  <div>
-    <!-- 表格 -->
-    <ele-pro-table v-model:selection="selectionList" ref="table" row-key="zonePlaceBillId" :datasource="url"
-      :columns="columns" :where="where" :scroll="{x: 'max-content'}">
-      <template #toolbar>
-
-        <!-- 搜索表单 -->
-        <a-form layout="inline" :model="where" :labelCol="{ offset: 1}">
-          <a-form-item label="审核状态:">
-            <a-select v-model:value="where.checked" allowClear placeholder="未选择">
-              <a-select-option :value="1">已审核</a-select-option>
-              <a-select-option :value="0">未审核</a-select-option>
-            </a-select>
-          </a-form-item>
-
-          <a-form-item label="表格名称:">
-            <a-input v-model:value.trim="where.billName" placeholder="请输入" allow-clear />
-          </a-form-item>
-
-          <a-form-item label="上报时间:">
-            <a-range-picker separator="~" v-model:value="reportTimeScope" />
-          </a-form-item>
-
-          <a-form-item class="ele-text-right" :wrapper-col="{span: 24}">
-            <a-space>
-              <a-button type="primary" @click="reload">查询</a-button>
-              <a-button @click="reset">重置</a-button>
-            </a-space>
-          </a-form-item>
-        </a-form>
-      </template>
-      <template #toolkit>
-        <a-popconfirm :disabled="selectionList.length == 0" :title="`确认删除${selectionList.length}条数据吗?`" ok-text="Yes"
-          cancel-text="No" @confirm="removeBatch">
-          <a-button :disabled="selectionList.length == 0" type="primary" ghost danger>批量删除</a-button>
-        </a-popconfirm>
-      </template>
-      <template #billName="{ text, record }">
-        <div class="editable-cell">
-          <div v-if="editableData[record.zonePlaceBillId]" class="editable-cell-input-wrapper">
-            <a-input v-model:value="editableData[record.zonePlaceBillId].billName" @pressEnter="save(record)" />
-            <check-outlined class="editable-cell-icon-check" @click="save(record)" />
-          </div>
-          <div v-else class="editable-cell-text-wrapper">
-            {{ text || ' ' }}
-            <edit-outlined class="editable-cell-icon" @click="edit(record)" />
-          </div>
-        </div>
-      </template>
-      <template #reportTime="{ text, record }">
-        <div class="editable-cell">
-          <div v-if="editableData[record.zonePlaceBillId]" class="editable-cell-input-wrapper">
-            <a-date-picker v-model:value="editableData[record.zonePlaceBillId].reportTime"></a-date-picker>
-            <!-- <a-input v-model:value="editableData[record.zonePlaceBillId].reportTime" @pressEnter="save(record)" /> -->
-            <check-outlined class="editable-cell-icon-check" @click="save(record)" />
-          </div>
-          <div v-else class="editable-cell-text-wrapper">
-            {{ $util.toDateString(text,'yyyy-MM-dd') || ' ' }}
-            <edit-outlined class="editable-cell-icon" @click="edit(record)" />
-          </div>
-        </div>
-      </template>
-      <template #checked="{text}">
-        <span>
-          <a-tag v-if="text" color="green">已审核</a-tag>
-          <a-tag v-else color="orange">未审核</a-tag>
-        </span>
-      </template>
-
-      <template #action="{ record }">
-        <a-space>
-          <a-button @click="detail(record)" shape="round" size="small">查看</a-button>
-          <span v-hasPermi="['ecology:sound:verify']">
-            <a-popconfirm v-if="record.checked != 1" :title="`审核通过后将无法修改，确认？`" ok-text="Yes" cancel-text="No"
-              @confirm="verify(record,1)">
-              <a-button type="primary" shape="round" size="small">审核</a-button>
-            </a-popconfirm>
-            <a-popconfirm v-else :title="`撤回重新编辑，确认？`" ok-text="Yes" cancel-text="No" @confirm="verify(record,0)">
-              <a-button type="dashed" shape="round" size="small">撤回</a-button>
-            </a-popconfirm>
-          </span>
-          <a-popconfirm :title="`确认删除${record.billName}吗?`" ok-text="Yes" cancel-text="No" @confirm="remove(record)">
-            <a-button type="primary" danger shape="round" size="small">删除</a-button>
-          </a-popconfirm>
-        </a-space>
-      </template>
-    </ele-pro-table>
-  </div>
-</template>
-
-<script>
-  import _ from "lodash"
-  import {
-    CheckOutlined,
-    EditOutlined
-  } from '@ant-design/icons-vue';
-  import {
-    pageBillUrl,
-    removeZonePlaceBill,
-    removeBatchZonePlaceBill,
-    updateZonePlaceBill,
-    verifyZonePlaceBill
-  } from "@/api/ecology/zone-place";
-  import moment from "moment";
-  export default {
-    name: 'ZoneCollectPlaceBill',
-    components: {
-      CheckOutlined,
-      EditOutlined
-    },
-    data() {
-
-      return {
-        // 表格数据接口
-        url: pageBillUrl,
-        selection: [],
-        // 表格列配置
-        columns: [{
-            key: 'index',
-            dataIndex: 'index',
-            width: 48,
-            align: 'center',
-            customRender: ({
-              index
-            }) => index + 1
-          },
-          {
-            title: '表格名称',
-            dataIndex: 'billName',
-            sorter: true,
-            slots: {
-              customRender: 'billName',
-            },
-
-          },
-          {
-            title: '条目',
-            dataIndex: 'recordSize',
-            sorter: true,
-
-          },
-          // {
-          //   title: '菜单名称',
-          //   dataIndex: 'title',
-          //   sorter: true
-          // },
-          {
-            title: '上报时间',
-            dataIndex: 'reportTime',
-            sorter: true,
-            slots: {
-              customRender: 'reportTime',
-            },
-            // customRender: ({
-            //   text
-            // }) => this.$util.toDateString(text)
-          },
-          {
-            title: '导入时间',
-            dataIndex: 'createTime',
-            sorter: true,
-            customRender: ({
-              text
-            }) => this.$util.toDateString(text)
-          },
-          {
-            title: '审核状态',
-            dataIndex: 'checked',
-            sorter: true,
-            slots: {
-              customRender: 'checked',
-            },
-
-          },
-          // {
-          //   title: '更新时间',
-          //   dataIndex: 'updateTime',
-          //   sorter: true,
-          //   customRender: ({
-          //     text
-          //   }) => this.$util.toDateString(text)
-          // },
-          {
-            title: '操作',
-            key: 'action',
-            width: 150,
-            align: 'center',
-            slots: {
-              customRender: 'action'
-            }
-          }
-        ],
-        // 表格搜索条件
-        where: {},
-        reportTimeScope: [],
-        // 表格选中数据
-        selectionList: [],
-        editableData: {},
-        // 当前编辑数据
-        current: null,
-      };
-    },
-    methods: {
-
-
-      /* 刷新表格 */
-      reload() {
-        this.where.reportTimeStart = null;
-        this.where.reportTimeEnd = null;
-        if (this.reportTimeScope && this.reportTimeScope.length == 2) {
-          this.where.reportTimeStart = this.reportTimeScope[0].format("Y-M-D H:m:s")
-          this.where.reportTimeEnd = this.reportTimeScope[1].format("Y-M-D H:m:s")
-        }
-        this.$refs.table.reload({
-          where: this.where
-        });
-      },
-      /* 重置搜索 */
-      reset() {
-        this.where = {};
-        this.reportTimeScope = [];
-        this.reload();
-      },
-      detail(record) {
-        this.$router.replace({
-          path: "/sound/zone/collect/place/" + record.zonePlaceBillId
-        })
-      },
-      edit(record) {
-        this.editableData[record.zonePlaceBillId] = _.cloneDeep(record);
-        this.editableData[record.zonePlaceBillId].reportTime = moment(this.editableData[record.zonePlaceBillId]
-          .reportTime)
-      },
-      verify(record, checked) {
-        const hide = this.$message.loading('请求中..', 0);
-        verifyZonePlaceBill({
-          zonePlaceBillId: record.zonePlaceBillId,
-          checked
-        }).then(res => {
-          if (res.data.code == 0) {
-            record.checked = checked
-            this.$message.success(res.data.msg);
-          } else {
-            this.$message.error(res.data.msg);
-          }
-        }).catch((e) => {
-          this.$message.error(e.message);
-        }).finally(() => {
-          hide();
-        })
-      },
-      save(record) {
-
-        let {
-          zonePlaceBillId,
-          billName,
-          reportTime
-        } = this.editableData[record.zonePlaceBillId];
-        if (!zonePlaceBillId || !reportTime) {
-          this.$message.error('请填写完整信息再提交')
-          return
-        }
-        const hide = this.$message.loading('请求中..', 0);
-        reportTime = reportTime.format("x")
-        reportTime = Number(reportTime)
-        updateZonePlaceBill({
-          zonePlaceBillId,
-          billName,
-          reportTime
-        }).then(res => {
-          if (res.data.code == 0) {
-            this.$message.success(res.data.msg);
-            record.billName = billName;
-            record.reportTime = reportTime
-          } else {
-            this.$message.error(res.data.msg);
-          }
-        }).catch(e => {
-          console.log(e);
-          this.$message.error(e.message);
-        }).finally(() => {
-          delete this.editableData[record.zonePlaceBillId]
-          hide()
-        })
-
-      },
-      /* 删除单个 */
-      remove(row) {
-        const hide = this.$message.loading('请求中..', 0);
-        removeZonePlaceBill(row.zonePlaceBillId).then(res => {
-          if (res.data.code === 0) {
-            this.$message.success(res.data.msg);
-            this.reload();
-          } else {
-            this.$message.error(res.data.msg);
-          }
-        }).catch(e => {
-          this.$message.error(e.msg);
-        }).finally(() => hide());
-      },
-      // 批量删除
-      removeBatch() {
-        const ids = this.selectionList.map(item => item.zonePlaceBillId);
-        const hide = this.$message.loading('请求中..', 0);
-        removeBatchZonePlaceBill(ids).then(res => {
-          if (res.data.code === 0) {
-            this.$message.success(res.data.msg);
-            this.reload();
-          } else {
-            this.$message.error(res.data.msg);
-          }
-        }).catch(e => {
-
-          this.$message.error(e.msg);
-        }).finally(() => hide());
-      },
-
-    }
-  }
-</script>
-
-<style lang="less">
-  .editable-cell {
-    position: relative;
-
-    .editable-cell-input-wrapper,
-    .editable-cell-text-wrapper {
-      padding-right: 24px;
-    }
-
-    .editable-cell-text-wrapper {
-      padding: 5px 24px 5px 5px;
-    }
-
-    .editable-cell-icon,
-    .editable-cell-icon-check {
-      position: absolute;
-      right: 0;
-      width: 20px;
-      cursor: pointer;
-    }
-
-    .editable-cell-icon {
-      margin-top: 4px;
-      display: none;
-    }
-
-    .editable-cell-icon-check {
-      line-height: 28px;
-    }
-
-    .editable-cell-icon:hover,
-    .editable-cell-icon-check:hover {
-      color: #108ee9;
-    }
-
-    .editable-add-btn {
-      margin-bottom: 8px;
-    }
-  }
-
-  .editable-cell:hover .editable-cell-icon {
-    display: inline-block;
-  }
-</style>

src/views/sound/zone/collect/place.vue

@@ -1,390 +0,0 @@
-<template>
-  <div class="ele-body">
-    <a-card :bordered="false">
-      <!-- 搜索表单 -->
-      <a-form :model="where" :label-col="{md: {span: 6}, sm: {span: 24}}"
-        :wrapper-col="{md: {span: 18}, sm: {span: 24}}">
-        <a-row>
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item label="测点名称:">
-              <a-input v-model:value.trim="where.place" placeholder="请输入测点名称" allow-clear />
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item label="路段:">
-              <a-input v-model:value.trim="where.zone" placeholder="请输入路段名称" allow-clear />
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item label="城区">
-              <a-input v-model:value.trim="where.area" placeholder="请输入城区名称" allow-clear />
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item class="ele-text-right" :wrapper-col="{span: 24}">
-              <a-space>
-                <a-button type="primary" @click="reload">查询</a-button>
-                <a-button @click="reset">重置</a-button>
-              </a-space>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-      <a-modal v-model:visible="showEdit" :title="form.zonePlaceId!==undefined?'修改用户':'添加用户'" :confirm-loading="loading"
-        :width="1000" :body-style="{paddingBottom: '8px'}" @ok="save">
-        <a-form ref="form" :model="form" :rules="rules" :label-col="{md: {span: 6}, sm: {span: 24}}"
-          :wrapper-col="{md: {span: 18}, sm: {span: 24}}">
-          <a-row>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="测点名称" name="place">
-                <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="motorwayLevel">
-                <a-input v-model:value="form.motorwayLevel" placeholder="请输入道路等级" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="车道类别" name="motorwayType">
-                <a-input v-model:value="form.motorwayType" placeholder="请输入车道类别" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="机动车车道数" name="motorway">
-                <a-input v-model:value="form.motorway" placeholder="请输入机动车车道数" allow-clear />
-              </a-form-item>
-            </a-col>
-             <a-col :md="12" :sm="24">
-              <a-form-item label="测点参照物" name="refObj">
-                <a-input v-model:value="form.refObj" placeholder="请输入测点测点参照物" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="测点经度" name="placeLng">
-                <a-input type="number" v-model:value="form.placeLng" placeholder="请输入测点经度" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="测点纬度" name="placeLat">
-                <a-input type="number" v-model:value="form.placeLat" placeholder="请输入测点纬度" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="道路覆盖人口" name="people">
-                <a-input type="number" v-model:value="form.people" placeholder="请输入道路覆盖人口（万人）" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="监测站名" name="station">
-                <a-input v-model:value="form.station" placeholder="请输入监测站名" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="监测仪器型号" name="monitorInstrumentModel">
-                <a-input v-model:value="form.monitorInstrumentModel" placeholder="请输入监测仪器型号" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="监测仪器编号" name="monitorInstrumentCode">
-                <a-input v-model:value="form.monitorInstrumentCode" placeholder="请输入监测仪器编号" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="监测前校准值" name="beforeMonitorValue">
-                <a-input v-model:value="form.beforeMonitorValue" placeholder="请输入监测前校准值" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="监测后校准值" name="afterMonitorValue">
-                <a-input v-model:value="form.afterMonitorValue" placeholder="请输入监测后校准值" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="声校准器测量声压值" name="soundPressureValue">
-                <a-input v-model:value="form.soundPressureValue" placeholder="请输入声校准器测量声压值" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="声校准仪器型号" name="soundInstrumentModel">
-                <a-input v-model:value="form.soundInstrumentModel" placeholder="请输入声校准仪器型号" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="声校准仪器编号" name="soundInstrumentCode">
-                <a-input v-model:value="form.soundInstrumentCode" placeholder="请输入声校准仪器编号" allow-clear />
-              </a-form-item>
-            </a-col>
-          </a-row>
-
-        </a-form>
-
-      </a-modal>
-      <!-- 表格 -->
-      <ele-pro-table v-model:selection="selectionList" ref="table" row-key="zonePlaceId" :datasource="url"
-        :columns="columns" :where="where" :scroll="{x: 'max-content'}">
-        <template v-if="bill.checked !=  1" #toolbar>
-          <a-space>
-            <a-button @click="openEdit" type="primary">新增</a-button>
-            <a-popconfirm :disabled="selectionList.length == 0" :title="`确认删除${selectionList.length}条数据吗?`"
-              ok-text="Yes" cancel-text="No" @confirm="removeBatch">
-              <a-button :disabled="selectionList.length == 0" type="primary" ghost danger>删除</a-button>
-            </a-popconfirm>
-          </a-space>
-        </template>
-        <template #action="{ record }">
-          <a-space>
-            <a-button @click="openEdit(record)" type="primary" shape="round" size="small">修改</a-button>
-            <a-popconfirm :title="`确认删除这条数据吗?`" ok-text="Yes" cancel-text="No" @confirm="remove(record)">
-              <a-button type="primary" danger shape="round" size="small">删除</a-button>
-            </a-popconfirm>
-          </a-space>
-        </template>
-      </ele-pro-table>
-    </a-card>
-  </div>
-  <!-- 编辑弹窗 -->
-</template>
-
-<script>
-  import _ from "lodash"
-  import {
-    pageZonePlaceUrl,
-    saveZonePlace,
-    removeZonePlace,
-    removeBatchZonePlace,
-    updateZonePlace,
-    getZonePlaceBill
-  } from "@/api/ecology/zone-place";
-  import locale from 'ant-design-vue/es/date-picker/locale/zh_CN';
-  //   import utils from "./utils";
-  export default {
-    name: 'ZoneCollectPlace',
-    components: {},
-    data() {
-      const {
-        billId
-      } = this.$route.params
-      return {
-        locale,
-        bill:{},
-        // 表格数据接口
-        url: pageZonePlaceUrl,
-        selection: [],
-        // 表格列配置
-        columns: [
-      
-          {
-            title: '测点名称',
-            dataIndex: 'place',
-            sorter: true
-          },
-          {
-            title: '测点经度',
-            dataIndex: 'placeLng',
-            sorter: true
-          },
-          {
-            title: '测点纬度',
-            dataIndex: 'placeLat',
-            sorter: true
-          },
-           {
-            title: '机动车车道数',
-            dataIndex: 'motorway',
-            sorter: true
-          },
-          {
-            title: '车道类别',
-            dataIndex: 'motorwayType',
-            sorter: true
-          },
-           {
-            title: '道路等级',
-            dataIndex: 'motorwayLevel',
-            sorter: true
-          },
-          {
-            title: '测点参照物',
-            dataIndex: 'refObj',
-            sorter: true
-          },
-           {
-            title: '道路覆盖人口（万人）',
-            dataIndex: 'people',
-            sorter: true
-          },
-           {
-            title: '监测站名',
-            dataIndex: 'station',
-            sorter: true
-          },
-           {
-            title: '监测仪器型号',
-            dataIndex: 'monitorInstrumentModel',
-            sorter: true
-          },
-           {
-            title: '监测仪器编号',
-            dataIndex: 'monitorInstrumentCode',
-            sorter: true
-          },
-           {
-            title: '监测前校准值',
-            dataIndex: 'beforeMonitorValue',
-            sorter: true
-          },
-           {
-            title: '声校准器测量声压值',
-            dataIndex: 'soundPressureValue',
-            sorter: true
-          },
-           {
-            title: '声校准仪器型号',
-            dataIndex: 'soundInstrumentModel',
-            sorter: true
-          },
-           {
-            title: '声校准仪器编号',
-            dataIndex: 'soundInstrumentCode',
-            sorter: true
-          },
-          {
-            title: '操作',
-            key: 'action',
-            width: 150,
-            align: 'center',
-            fixed: 'right',
-            slots: {
-              customRender: 'action'
-            }
-          }
-        ],
-        // 表格搜索条件
-        zonePlaceBillId: billId,
-        where: {
-          zonePlaceBillId: billId
-        },
-        // 表格选中数据
-        selectionList: [],
-        // 是否显示编辑弹窗
-        showEdit: false,
-        // 表单数据
-        form: {},
-        loading: false,
-        rules: {}
-
-      };
-    },
-    mounted(){
-    
-      getZonePlaceBill(this.zonePlaceBillId).then(res=>{
-        this.bill = res.data.data
-        if(res.data.data.checked == 1){
-          this.columns.splice(this.columns.length-1,1)
-        }
-      })
-    },
-    methods: {
-      /* 刷新表格 */
-      reload() {
-        console.log(this.$route);
-        console.log(this.$router);
-        this.$refs.table.reload({
-          where: this.where
-        });
-      },
-      /* 重置搜索 */
-      reset() {
-        this.where = {
-          zonePlaceBillId: this.zonePlaceBillId
-        };
-        this.reload();
-      },
-      /* 显示编辑 */
-      openEdit(record) {
-        const cloneRecord = _.cloneDeep(record)
-        // cloneRecord.mi
-        this.form = Object.assign({}, cloneRecord);
-        this.showEdit = true;
-        this.$nextTick(() => {
-          this.$refs.form.clearValidate(); // 清除表单验证信息
-        });
-      },
-    
-      save() {
-        const hide = this.$message.loading('请求中..', 0);
-        const form = _.cloneDeep(this.form);
-        delete form['monitorDate']
-        if (form.zonePlaceId) {
-          updateZonePlace(form).then(res => {
-            if (res.data.code == 0) {
-            this.showEdit = false;
-              this.$message.success(res.data.msg);
-              this.reload();
-            } else {
-              this.$message.error(res.data.msg);
-            }
-          }).catch((error)=>{
-              this.$message.error(error.message);
-          }).finally(()=>{
-              console.log("finallyfinallyfinallyfinally");
-              hide();
-          })
-        }else{
-            form.zonePlaceBillId = this.zonePlaceBillId;
-             saveZonePlace(form).then(res => {
-            if (res.data.code == 0) {
-                this.showEdit = false;
-              this.$message.success(res.data.msg);
-              this.reload();
-            } else {
-              this.$message.error(res.data.msg);
-            }
-          }).catch((error)=>{
-              this.$message.error(error.message);
-          }).finally(()=>{
-              hide();
-          })
-        }
-       
-
-      },
-      /* 删除单个 */
-      remove(row) {
-        const hide = this.$message.loading('请求中..', 0);
-        console.log(row);
-        removeZonePlace(row.zonePlaceId).then(res => {
-          if (res.data.code === 0) {
-            this.$message.success(res.data.msg);
-            this.reload();
-          } else {
-            this.$message.error(res.data.msg);
-          }
-        }).catch(e => {
-          this.$message.error(e.msg);
-        }).finally(() => hide());
-      },
-      removeBatch() {
-        const ids = this.selectionList.map(item => item.zonePlaceId);
-        const hide = this.$message.loading('请求中..', 0);
-        removeBatchZonePlace(ids).then(res => {
-          if (res.data.code === 0) {
-            this.$message.success(res.data.msg);
-            this.reload();
-          } else {
-            this.$message.error(res.data.msg);
-          }
-        }).catch(e => {
-
-          this.$message.error(e.msg);
-        }).finally(() => hide());
-      },
-
-    }
-  }
-</script>
-
-<style scoped lang="less">
-  
-</style>

src/views/sound/zone/collect/utils.js

@@ -3,25 +3,34 @@ export default {
         return excelData.map(item => {
             const monitorTime = new Date();
             monitorTime.setFullYear(item[0]);
-            monitorTime.setMonth(item[10]-1);
+            monitorTime.setMonth(item[7] - 1);
-            monitorTime.setDate(item[11]);
+            monitorTime.setDate(item[8]);
-            monitorTime.setHours(item[12]);
+            monitorTime.setHours(item[9]);
-            monitorTime.setMinutes(item[13]);
+            monitorTime.setMinutes(item[10]);
-            return {
+            let quarter = 1;
+            const month = item[7]
+            if (month < 4) {
+                quarter = 1
+            } else if (month < 7) {
+                quarter = 2
+            } else if (month < 10) {
+                quarter = 3
+            } else {
+                quarter = 4
+            }
+            const row = {
+                regionCode: "450100",
                 monitorYear: item[0],
                 gridLength: item[1],
                 gridWidth: item[2],
                 place: item[3],
                 gridNo: item[4],
-                city: '南宁',
                 area: item[5],
                 source: item[6],
                 monitorMonth: item[7],
                 monitorDay: item[8],
                 monitorHour: item[9],
                 monitorMinute: item[10],
-               
-                monitorTime: monitorTime.getTime(),
                 indexLeq: item[11],
                 indexSd: item[12],
                 indexL10: item[13],
@@ -37,8 +46,21 @@ export default {
                 soundPressureValue: item[23],
                 soundInstrumentModel: item[24],
                 soundInstrumentCode: item[25],
-      
+                city: '南宁',
+                regionLevel: "市级",
+                monitorTime: monitorTime.getTime(),
+                quarter
             }
+
+            if (row.monitorHour >= 6 && row.monitorHour < 22) {
+                row.timeSlot = "昼"
+            }else{
+                row.timeSlot = "夜"
+            }
+            if (row.indexL10 < row.indexL50 || row.indexL50 < row.indexL90) {
+                throw new Error(row.place + "数值有误")
+            }
+            return row;
         })
 
     },
@@ -65,5 +87,79 @@ export default {
             }
         })
 
+    },
+    // 解析县级数据
+    toAreaObjData(excelData) {
+        return excelData.map(item => {
+            const monitorTime = new Date();
+            monitorTime.setFullYear(item[1]);
+            monitorTime.setMonth(item[14] - 1);
+            monitorTime.setDate(item[15]);
+            monitorTime.setHours(item[16]);
+            monitorTime.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,
+                monitorTime: monitorTime.getTime(),
+                quarter
+
+            }
+            if(row.indexL10 < row.indexL50 || row.indexL50 < row.indexL90){
+                throw new Error(row.place + "数值有误")
+            }
+            return row;
+        })
     }
 }

src/views/sound/zone/statistic/average.vue

@@ -1,20 +1,26 @@
 <template>
   <div class="">
-      <ele-pro-table ref="table" row-key="id" :datasource="url" :columns="columns" :where="where" :needPage="false"
+    <ele-pro-table
-        @done="(d)=>data = d.data" :scroll="{x: 'max-content'}">
+      ref="table"
+      row-key="id"
+      :datasource="url"
+      :columns="columns"
+      :where="where"
+      :needPage="false"
+      @done="(d) => (data = d.data)"
+      :scroll="{ x: 'max-content' }"
+    >
       <template #toolbar>
         <!-- 搜索表单 -->
         <a-form :model="where" layout="inline" :labelCol="{ offset: 1 }">
           <a-row>
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item label="统计模块:">
-              <a-select :options="modelOptions" v-model:value="where.model" placeholder="统计模块">
-              </a-select>
-            </a-form-item>
-          </a-col>
             <a-col :lg="6" :md="12" :sm="24" :xs="24">
               <a-form-item label="昼夜:">
-              <a-select :options="timeSlotOptions" v-model:value="where.timeSlot" placeholder="昼夜">
+                <a-select
+                  :options="timeSlotOptions"
+                  v-model:value="where.timeSlot"
+                  placeholder="昼夜"
+                >
                 </a-select>
               </a-form-item>
             </a-col>
@@ -40,315 +46,139 @@
             
           </a-space> -->
       </template>
+      <template #Leq="{ text, record }">
+        <a-tag
+          v-if="
+            (where.timeSlot == '昼' && text <= 68) ||
+            (where.timeSlot == '夜' && text <= 58)
+          "
+          color="green"
+          >{{ text }}</a-tag
+        >
+        <a-tag
+          v-else-if="
+            (record.timeSlot == '昼' && text > 68 && text <= 70) ||
+            (record.timeSlot == '夜' && text > 58 && text <= 60)
+          "
+          color="blue"
+          >{{ text }}</a-tag
+        >
+        <a-tag
+          v-else-if="
+            (record.timeSlot == '昼' && text > 70 && text <= 72) ||
+            (record.timeSlot == '夜' && text > 60 && text <= 62)
+          "
+          color="red"
+          >{{ text }}</a-tag
+        >
+        <a-tag
+          v-else-if="
+            (record.timeSlot == '昼' && text > 62 && text <= 74) ||
+            (record.timeSlot == '夜' && text > 62 && text <= 64)
+          "
+          color="red"
+          >{{ text }}</a-tag
+        >
+        <a-tag
+          v-else-if="
+            (record.timeSlot == '昼' && text > 74) ||
+            (record.timeSlot == '夜' && text > 64)
+          "
+          color="red"
+          >{{ text }}</a-tag
+        >
+        <template v-else color="#FFF">{{ text }}</template>
+      </template>
     </ele-pro-table>
   </div>
 </template>
 
 <script>
 import _ from "lodash";
-  import XLSX from 'xlsx';
+import XLSX from "xlsx";
-  import {
+import { pageZoneNoiseStatisticUrl } from "@/api/ecology/zone-sound";
-    pageZoneNoiseStatisticUrl
+const columns = [
-  } from "@/api/ecology/zone-sound"
+  {
-  const columns = [{
+    title: "城区",
-      title: '测点',
+    dataIndex: "area",
-      dataIndex: 'place',
+  },
 
+  {
+    title: "市",
+    dataIndex: "city",
   },
   {
-      title: '路段',
+    title: "路长",
-      dataIndex: 'zone',
+    dataIndex: "zoneLength",
-
   },
   {
-      title: '城区',
+    title: "路宽",
-      dataIndex: 'area',
+    dataIndex: "zoneWidth",
   },
   {
-      title: '市',
+    title: "LeqdB(A)",
-      dataIndex: 'city',
+    dataIndex: "avgLeq",
-    },
+    slots: { customRender: "Leq" },
-    {
+    sorter: true,
-      title: '路长',
-      dataIndex: 'zoneLength',
-      customRender: ({
-        text
-      }) => Math.round(text)
-
-    },
-    {
-      title: '路宽',
-      dataIndex: 'zoneWidth',
-      customRender: ({
-        text
-      }) => Math.round(text)
-    },
-    {
-      title: '20分钟中小型车流量',
-      children: [{
-          title: '平均',
-          dataIndex: 'avgSmallTrafficFlow',
-          customRender: ({
-            text
-          }) => Math.round(text)
-        },
-        {
-          title: '最大',
-          dataIndex: 'maxSmallTrafficFlow',
-          customRender: ({
-            text
-          }) => Math.round(text)
-        },
-        {
-          title: '最小',
-          dataIndex: 'minSmallTrafficFlow',
-          customRender: ({
-            text
-          }) => Math.round(text)
-        },
-      ],
-    },
-    {
-      title: '20分钟大型车流量',
-      children: [{
-          title: '平均',
-          dataIndex: 'avgLargeTrafficFlow',
-          customRender: ({
-            text
-          }) => Math.round(text)
-        },
-        {
-          title: '最大',
-          dataIndex: 'maxLargeTrafficFlow',
-          customRender: ({
-            text
-          }) => Math.round(text)
-        },
-        {
-          title: '最小',
-          dataIndex: 'minLargeTrafficFlow',
-          customRender: ({
-            text
-          }) => Math.round(text)
-        },
-      ]
-    },
-    {
-      title: 'LeqdB(A)',
-      children: [{
-          title: '平均',
-          dataIndex: 'avgLeq',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-        {
-          title: '最大',
-          dataIndex: 'maxLeq',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-        {
-          title: '最小',
-          dataIndex: 'minLeq',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-      ]
   },
   {
     title: "SDdB(A)",
-      children: [{
+    dataIndex: "avgSD",
-          title: '平均',
-          dataIndex: 'avgSD',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-        {
-          title: '最大',
-          dataIndex: 'maxSD',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-        {
-          title: '最小',
-          dataIndex: 'minSD',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-      ]
   },
   {
     title: "L10dB(A)",
-      children: [
+    dataIndex: "avgL10",
-
-        {
-          title: '平均',
-          dataIndex: 'avgL10',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
   },
   {
-          title: '最大',
+    title: "L50dB(A)",
-          dataIndex: 'maxL10',
+    dataIndex: "avgL50",
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-        {
-          title: '最小',
-          dataIndex: 'minL10',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-      ]
-    }, {
-      title: 'L50dB(A)',
-      children: [{
-          title: '平均',
-          dataIndex: 'avgL50',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-        {
-          title: '最大',
-          dataIndex: 'maxL50',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-        {
-          title: '最小',
-          dataIndex: 'minL50',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-      ]
   },
   {
     title: "L90dB(A)",
-      children: [
+    dataIndex: "avgL90",
-
-        {
-          title: '平均',
-          dataIndex: 'avgL90',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
   },
-        {
+];
-          title: '最大',
-          dataIndex: 'maxL90',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-        {
-          title: '最小',
-          dataIndex: 'minL90',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-      ]
-    },
-    {
-      title: "LmindB(A)",
-      children: [{
-          title: '平均',
-          dataIndex: 'avgLmin',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-        {
-          title: '最大',
-          dataIndex: 'maxLmin',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-        {
-          title: '最小',
-          dataIndex: 'minLmin',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-      ]
-    }, {
-      title: 'LmaxdB(A)',
-      children: [{
-          title: '平均',
-          dataIndex: 'avgLmax',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-        {
-          title: '最大',
-          dataIndex: 'maxLmax',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-        {
-          title: '最小',
-          dataIndex: 'minLmax',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-      ]
-    },
-
-
-
-  ]
 export default {
-    name: 'StatisticSoundZoneAverage',
+  name: "StatisticSoundZoneAverage",
-    components: {
+  components: {},
-
-    },
   data() {
     return {
       url: pageZoneNoiseStatisticUrl,
       data: [],
       where: {
-          model: "place"
+        model: "area",
+        timeSlot: "昼"
       },
       timeScope: [],
       columns,
-        modelOptions: [{
+      modelOptions: [
+        {
           value: "place",
           label: "测点",
-        }, {
+        },
+        {
           value: "zone",
           label: "路段",
-        }, {
+        },
+        {
           value: "area",
           label: "城区",
-        },{
+        },
+        {
           value: "city",
-          label: "市"
+          label: "市",
-        }],
+        },
-        timeSlotOptions: [{
+      ],
+      timeSlotOptions: [
+        {
           value: "昼",
-          label: "昼"
+          label: "昼",
-        }, {
+        },
+        {
           value: "夜",
-          label: "夜"
+          label: "夜",
-        }]
+        },
-
+      ],
     };
   },
   methods: {
@@ -357,42 +187,60 @@
       this.$refs.table.reload({
         where: {
           model: this.where.model,
-            timeStart: this.timeScope.length == 2 ? this.timeScope[0].format("Y-M-D") : null,
+          timeStart:
-            timeEnd: this.timeScope.length == 2 ? this.timeScope[1].format("Y-M-D") : null,
+            this.timeScope.length == 2
-            timeSlot: this.where.timeSlot
+              ? this.timeScope[0].format("Y-M-D")
-          }
+              : null,
+          timeEnd:
+            this.timeScope.length == 2
+              ? this.timeScope[1].format("Y-M-D")
+              : null,
+          timeSlot: this.where.timeSlot,
+        },
       });
       let cloneColumns = _.cloneDeep(columns);
       if (this.where.model == "area") {
-          this.columns = cloneColumns.filter(item => {
+        this.columns = cloneColumns.filter((item) => {
           return item.dataIndex != "place" && item.dataIndex != "zone";
-          })
+        });
       } else if (this.where.model == "zone") {
-          this.columns = cloneColumns.filter(item => {
+        this.columns = cloneColumns.filter((item) => {
-            return item.dataIndex != "place"
+          return item.dataIndex != "place";
-          })
+        });
       } else if (this.where.model == "city") {
-        this.columns = cloneColumns.filter(item => {
+        this.columns = cloneColumns.filter((item) => {
-            return item.dataIndex != "place" && item.dataIndex != "zone"  && item.dataIndex != "area";
+          return (
-          })
+            item.dataIndex != "place" &&
+            item.dataIndex != "zone" &&
+            item.dataIndex != "area"
+          );
+        });
       }
     },
     /* 重置搜索 */
     reset() {
       this.where = {
-          model: "place",
+        model: "area",
-          timeSlot: "昼"
+        timeSlot: "昼",
       };
-        this.this.timeScope = []
+      this.this.timeScope = [];
 
       this.reload();
     },
     exportFile() {
       let array = [
-          ['测点', '路段', '城区', '路长', '路宽', '平均Leq', '平均SD']
+        ["测点", "路段", "城区", "路长", "路宽", "平均Leq", "平均SD"],
       ];
-        this.data.forEach(d => {
+      this.data.forEach((d) => {
-          array.push([d.place, d.zone, d.area, d.zoneLength, d.zoneWidth, d.avgLeq, d.avgSD]);
+        array.push([
+          d.place,
+          d.zone,
+          d.area,
+          d.zoneLength,
+          d.zoneWidth,
+          d.avgLeq,
+          d.avgSD,
+        ]);
       });
       let sheet = XLSX.utils.aoa_to_sheet(array);
       // sheet['!merges'] = [
@@ -400,13 +248,11 @@
       //   {s: {r: 0, c: 0}, e: {r: 1, c: 0}},  // 合并第0行第0列到第1行第0列
       //   {s: {r: 0, c: 6}, e: {r: 1, c: 6}}  // 合并第0行第6列到第1行第6列
       // ];
-        this.$util.exportSheet(XLSX, sheet, '道路交通噪声统计表');
+      this.$util.exportSheet(XLSX, sheet, "道路交通噪声统计表");
-      }
+    },
-    }
+  },
-
+};
-  }
 </script>
 
 <style scoped>
-
 </style>

src/views/sound/zone/statistic/base.vue

@@ -2,22 +2,44 @@
   <div class="ele-body">
     <a-card :bordered="false">
       <!-- 搜索表单 -->
-      <a-form :model="where" :label-col="{md: {span: 6}, sm: {span: 24}}"
+      <a-form
-        :wrapper-col="{md: {span: 18}, sm: {span: 24}}">
+        :model="where"
+        :label-col="{ md: { span: 6 }, sm: { span: 24 } }"
+        :wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }"
+      >
         <a-row>
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item label="测点名称:">
+            <a-form-item label="区域等级:">
-              <a-input v-model:value.trim="where.place" placeholder="请输入测点名称" allow-clear />
+              <a-select v-model:value="where.regionLevel" allowClear showSearch>
+                <a-select-option
+                  v-for="(item) in regionLevelOptions"
+                  :key="item.value"
+                  >{{ item.label }}</a-select-option
+                >
+              </a-select>
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item label="路段:">
+            <a-form-item label="测点名称:">
-              <a-input v-model:value.trim="where.zone" placeholder="请输入路段名称" allow-clear />
+              <a-select v-model:value="where.place" allowClear showSearch>
+                <a-select-option
+                  v-for="(item) in palceOptions"
+                  :key="item.value"
+                  >{{ item.label }}</a-select-option
+                >
+              </a-select>
             </a-form-item>
           </a-col>
+        
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
             <a-form-item label="城区">
-              <a-input v-model:value.trim="where.area" placeholder="请输入城区名称" allow-clear />
+              <a-select v-model:value="where.area" allowClear showSearch>
+                <a-select-option
+                  v-for="(item) in areaOptions"
+                  :key="item.value"
+                  >{{ item.label }}</a-select-option
+                >
+              </a-select>
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
@@ -25,122 +47,31 @@
               <a-space>
                 <a-button type="primary" @click="reload">查询</a-button>
                 <a-button @click="reset">重置</a-button>
+                <a-button @click="exportFile">导出Excel</a-button>
               </a-space>
             </a-form-item>
           </a-col>
         </a-row>
       </a-form>
-      <a-modal v-model:visible="showEdit" :title="form.zoneNoiseId!==undefined?'修改用户':'添加用户'" :confirm-loading="loading"
-        :width="1000" :body-style="{paddingBottom: '8px'}" @ok="save">
-        <a-form ref="form" :model="form" :rules="rules" :label-col="{md: {span: 6}, sm: {span: 24}}"
-          :wrapper-col="{md: {span: 18}, sm: {span: 24}}">
-          <a-row>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="日期" name="monitorDate">
-                <a-date-picker v-model:value="form.monitorDate" :locale="locale" />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="时间" name="monitorTime">
-                <a-time-picker v-model:value="form.monitorTime" format="HH:mm" />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="时段" name="timeSlot">
-                <a-select v-model:value="form.timeSlot">
-                  <a-select-option value="昼">昼</a-select-option>
-                  <a-select-option value="夜">夜</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-
-            <a-col :md="12" :sm="24">
-              <a-form-item label="测点名称" name="place">
-                <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="placeCode">
-                <a-input v-model:value="form.placeCode" placeholder="请输入点号" allow-clear />
-              </a-form-item>
-            </a-col>
-
-            <a-col :md="12" :sm="24">
-              <a-form-item label="所属路段" name="zone">
-                <a-input v-model:value="form.zone" placeholder="请输入测点名称" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="所属城区" name="area">
-                <a-input v-model:value="form.area" placeholder="请输入点号" allow-clear />
-              </a-form-item>
-            </a-col>
-
-            <a-col :md="12" :sm="24">
-              <a-form-item label="路长" name="zoneLength">
-                <a-input v-model:value="form.zoneLength" placeholder="请输入路长（米）" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="总路宽" name="zoneWidth">
-                <a-input v-model:value="form.zoneWidth" placeholder="请输入总路宽（米）" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="中小型车流量" name="smallTrafficFlow">
-                <a-input type="number" v-model:value="form.smallTrafficFlow" placeholder="请输入中小型车流量（辆/20分钟）"
-                  allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="大型车流量" name="largeTrafficFlow">
-                <a-input type="number" v-model:value="form.largeTrafficFlow" placeholder="请输入大型车流量（辆/20分钟）"
-                  allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="LeqdB(A)" name="indexLeq">
-                <a-input type="number" v-model:value="form.indexLeq" placeholder="请输入LeqdB(A)" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="SDdB(A)" name="indexSd">
-                <a-input type="number" v-model:value="form.indexSd" placeholder="请输入大SDdB(A)" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="L10dB(A)" name="indexL10">
-                <a-input type="number" v-model:value="form.indexL10" placeholder="请输入L10dB(A)" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="L50dB(A)" name="indexL50">
-                <a-input type="number" v-model:value="form.indexL50" placeholder="请输入L50dB(A)" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="L90dB(A)" name="indexL90">
-                <a-input type="number" v-model:value="form.indexL90" placeholder="请输入L90dB(A)" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="LmindB(A)" name="indexLmin">
-                <a-input type="number" v-model:value="form.indexLmin" placeholder="请输入LmindB(A)" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="LmaxdB(A)" name="indexLmax">
-                <a-input type="number" v-model:value="form.indexLmax" placeholder="请输入LmaxdB(A)" allow-clear />
-              </a-form-item>
-            </a-col>
-          </a-row>
-
-        </a-form>
-
-      </a-modal>
       <!-- 表格 -->
-      <ele-pro-table v-model:selection="selectionList" ref="table" row-key="zoneNoiseId" :datasource="url"
+      <ele-pro-table
-        :columns="columns" :where="where" :scroll="{x: 'max-content'}">
+        v-model:selection="selectionList"
+        ref="table"
+        row-key="zoneNoiseId"
+        :datasource="url"
+        :columns="columns"
+        :where="where"
+        :scroll="{ x: 'max-content' }"
+        @done="(d) => (data = d.data)"
+      >
+        <template #Leq="{ text,record  }">
+          <a-tag v-if="(record.timeSlot == '昼' && text <= 68) || (record.timeSlot == '夜' && text <= 58)" color="green">{{text}}</a-tag>
+          <a-tag v-else-if="(record.timeSlot == '昼' && text > 68 && text <=70) || (record.timeSlot == '夜' && text > 58 && text <=60)" color="blue">{{text}}</a-tag>
+          <a-tag v-else-if="(record.timeSlot == '昼' && text > 70 && text <=72) || (record.timeSlot == '夜' && text > 60 && text <=62)" color="red">{{text}}</a-tag>
+          <a-tag v-else-if="(record.timeSlot == '昼' && text > 62 && text <=74) || (record.timeSlot == '夜' && text > 62 && text <=64)" color="red">{{text}}</a-tag>
+          <a-tag v-else-if="(record.timeSlot == '昼' && text > 74 ) || (record.timeSlot == '夜' && text > 64)" color="red">{{text}}</a-tag>
+          <template v-else color="#FFF">{{text}}</template>
+        </template>
       </ele-pro-table>
     </a-card>
   </div>
@@ -148,23 +79,18 @@
 </template>
 
 <script>
-  import _ from "lodash"
+// import _ from "lodash";
-  import {
+import XLSX from "xlsx";
-    pageZoneNoiseUrl,
+import { pageZoneNoiseUrl, getColumnOptions } from "@/api/ecology/zone-sound";
-    saveZoneNoise,
+import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
-    removeZoneNoise,
+import moment from "moment";
-    removeBatchZoneNoise,
-    updateZoneNoise,
-  } from "@/api/ecology/zone-sound";
-  import locale from 'ant-design-vue/es/date-picker/locale/zh_CN';
-  import moment from 'moment';
 //   import utils from "./utils";
 export default {
-    name: 'StatisticSoundZoneBase',
+  name: "StatisticSoundZoneBase",
   components: {},
   data() {
-    
     return {
+      data: [],
       locale,
       bill: {},
       // 表格数据接口
@@ -173,54 +99,45 @@
       // 表格列配置
        columns: [
         {
-            title: '监测日期',
+          title: "监测日期",
-            dataIndex: 'monitorTime',
+          dataIndex: "monitorTime",
-            sorter: true
+          sorter: true,
+          customRender: ({text})=> moment(text,"YYYY/MM/DD HH:mm:ss").format("YYYY-MM-DD HH:mm")
         },
         {
-            title: '测点名称',
+          title: "测点名称",
-            dataIndex: 'place',
+          dataIndex: "place",
-            sorter: true
+          sorter: true,
         },
         {
-            title: '点号',
+          title: "所属城区",
-            dataIndex: 'placeCode',
+          dataIndex: "area",
-            sorter: true
+          sorter: true,
         },
         {
-            title: '所属路段',
+          title: "网格长（米）",
-            dataIndex: 'zone',
+          dataIndex: "gridLength",
-            sorter: true
+          sorter: true,
         },
         {
-            title: '所属城区',
+          title: "网格宽（米）",
-            dataIndex: 'area',
+          dataIndex: "gridWidth",
-            sorter: true
+          sorter: true,
         },
          {
-            title: '路长',
+          title: "网格点号",
-            dataIndex: 'zoneLength',
+          dataIndex: "gridNo",
-            sorter: true
+          sorter: true,
         },
         {
-            title: '路宽',
+          title: "主要声源",
-            dataIndex: 'zoneWidth',
+          dataIndex: "source",
-            sorter: true
+          sorter: true,
         },
         {
-            title: '中小型车流量（辆/20分钟）',
+          title: "时段",
-            dataIndex: 'smallTrafficFlow',
+          dataIndex: "timeSlot",
-            sorter: true
+          sorter: true,
-          },
-          {
-            title: '大型车流量（辆/20分钟）',
-            dataIndex: 'largeTrafficFlow',
-            sorter: true
-          },
-          {
-            title: '时段',
-            dataIndex: 'timeSlot',
-            sorter: true
         },
         //   {
         //     title: '月',
@@ -243,180 +160,318 @@
         //     sorter: true
         //   },
         {
-            title: 'LeqdB(A)',
+          title: "LeqdB(A)",
-            dataIndex: 'indexLeq',
+          dataIndex: "indexLeq",
-            sorter: true
+          slots: {customRender: "Leq"},
+          sorter: true,
         },
         {
-            title: 'SDdB(A)',
+          title: "SDdB(A)",
-            dataIndex: 'indexSd',
+          dataIndex: "indexSd",
-            sorter: true
+          sorter: true,
         },
         {
-            title: 'L10dB(A)',
+          title: "L10dB(A)",
-            dataIndex: 'indexL10',
+          dataIndex: "indexL10",
-            sorter: true
+          sorter: true,
         },
         {
-            title: 'L50dB(A)',
+          title: "L50dB(A)",
-            dataIndex: 'indexL50',
+          dataIndex: "indexL50",
-            sorter: true
+          sorter: true,
         },
         {
-            title: 'L90dB(A)',
+          title: "L90dB(A)",
-            dataIndex: 'indexL90',
+          dataIndex: "indexL90",
-            sorter: true
+          sorter: true,
         },
         {
-            title: 'LmindB(A)',
+          title: "LmindB(A)",
-            dataIndex: 'indexLmin',
+          dataIndex: "indexLmin",
-            sorter: true
+          sorter: true,
         },
         {
-            title: 'LmaxdB(A)',
+          title: "LmaxdB(A)",
-            dataIndex: 'indexLmax',
+          dataIndex: "indexLmax",
-            sorter: true
+          sorter: true,
         },
         {
-            title: '创建人',
+          title: "监测站名",
-            dataIndex: 'username',
+          dataIndex: "station",
-            sorter: true
+          sorter: true,
+        },
+        {
+          title: "监测仪器型号",
+          dataIndex: "monitorInstrumentModel",
+          sorter: true,
+        },
+        {
+          title: "监测仪器编号",
+          dataIndex: "monitorInstrumentCode",
+          sorter: true,
+        },
+        {
+          title: "监测前校准值",
+          dataIndex: "beforeMonitorValue",
+          sorter: true,
+        },
+        {
+          title: "声校准器测量声压值",
+          dataIndex: "soundPressureValue",
+          sorter: true,
+        },
+        {
+          title: "声校准仪器型号",
+          dataIndex: "soundInstrumentModel",
+          sorter: true,
+        },
+        {
+          title: "声校准仪器编号",
+          dataIndex: "soundInstrumentCode",
+          sorter: true,
+        },
+        {
+          title: "区域等级",
+          dataIndex: "regionLevel",
+          sorter: true,
+        },
+        {
+          title: "备注",
+          dataIndex: "remark",
+          sorter: true,
+        },
+        {
+          title: "创建人",
+          dataIndex: "username",
+          sorter: true,
         },
       ],
+      palceOptions: [],
+      areaOptions: [],
+      regionLevelOptions: [],
       // 表格搜索条件
       where: {
-          checked: 1
+        checked: 1,
       },
       // 表格选中数据
       selectionList: [],
-        // 是否显示编辑弹窗
-        showEdit: false,
-        // 表单数据
-        form: {},
-        loading: false,
-        rules: {}
-
     };
   },
   mounted() {
-    
+    this.loadOptionData();
   },
   methods: {
+    /**获取下来框数据 */
+    loadOptionData() {
+      getColumnOptions("place").then((res) => {
+        this.palceOptions = res.data.data.map((item) => {
+          return {
+            label: item,
+            value: item,
+          };
+        });
+      });
+      getColumnOptions("area").then((res) => {
+        this.areaOptions = res.data.data.map((item) => {
+          return {
+            label: item,
+            value: item,
+          };
+        });
+      });
+      getColumnOptions("region_level").then((res) => {
+        this.regionLevelOptions = res.data.data.map((item) => {
+          return {
+            label: item,
+            value: item,
+          };
+        });
+      });
+    },
     /* 刷新表格 */
     reload() {
       console.log(this.$route);
       console.log(this.$router);
       this.$refs.table.reload({
-          where: this.where
+        where: this.where,
       });
     },
     /* 重置搜索 */
     reset() {
       this.where = {
-           checked: 1
+        checked: 1,
       };
       this.reload();
     },
-      /* 显示编辑 */
+    exportFile() {
-      openEdit(record) {
+     const columns = [
-        const cloneRecord = _.cloneDeep(record)
+         {
-        if (record && cloneRecord.monitorTime) {
+          title: "行政区划代码",
-          console.log(moment(cloneRecord.monitorTime).format('YYYY MM DD'));
+          dataIndex: "regionCode",
-          cloneRecord.monitorDate = moment(cloneRecord.monitorTime);
+          sorter: true,
-          cloneRecord.monitorTime = moment(cloneRecord.monitorTime);
+        },
-        }
+        {
-        // cloneRecord.mi
+          title: "监测年度",
-        this.form = Object.assign({}, cloneRecord);
+          dataIndex: "monitorYear",
-        this.showEdit = true;
+          sorter: true,
-        this.$nextTick(() => {
+        },
-          this.$refs.form.clearValidate(); // 清除表单验证信息
+        {
+          title: "点位编码",
+          dataIndex: "placeCode",
+          sorter: true,
+        },
+        {
+          title: "测点名称",
+          dataIndex: "place",
+          sorter: true,
+        },
+        {
+          title: "测点经度",
+          dataIndex: "placeLng",
+          sorter: true,
+        },
+        {
+          title: "测点纬度",
+          dataIndex: "placeLat",
+          sorter: true,
+        },
+       
+        {
+          title: "测点参照物",
+          dataIndex: "refObj",
+          sorter: true,
+        },
+         {
+          title: "网格边长",
+          dataIndex: "gridLength",
+          sorter: true,
+        },
+        {
+          title: "网格覆盖人口（万）",
+          dataIndex: "people",
+          sorter: true,
+        },
+         {
+          title: "功能区代码",
+          dataIndex: "functionCode",
+          sorter: true,
+        },
+        {
+          title: "月",
+          dataIndex: "monitorMonth",
+          sorter: true,
+        },
+        {
+          title: "日",
+          dataIndex: "monitorDay",
+          sorter: true,
+        },
+        {
+          title: "时",
+          dataIndex: "monitorHour",
+          sorter: true,
+        },
+        {
+          title: "分",
+          dataIndex: "monitorMinute",
+          sorter: true,
+        },
+       
+        {
+          title: "Leq",
+          dataIndex: "indexLeq",
+          sorter: true,
+        },
+        
+        {
+          title: "L10",
+          dataIndex: "indexL10",
+          sorter: true,
+        },
+        {
+          title: "L50",
+          dataIndex: "indexL50",
+          sorter: true,
+        },
+        {
+          title: "L90",
+          dataIndex: "indexL90",
+          sorter: true,
+        },
+        {
+          title: "最大值",
+          dataIndex: "indexLmax",
+          sorter: true,
+        },
+         {
+          title: "最小值",
+          dataIndex: "indexLmin",
+          sorter: true,
+        },
+       {
+          title: "标准差(SD)",
+          dataIndex: "indexSd",
+          sorter: true,
+        },
+        {
+          title: "监测站名",
+          dataIndex: "station",
+          sorter: true,
+        },
+        {
+          title: "监测仪器型号",
+          dataIndex: "monitorInstrumentModel",
+          sorter: true,
+        },
+        {
+          title: "监测仪器编号",
+          dataIndex: "monitorInstrumentCode",
+          sorter: true,
+        },
+        {
+          title: "监测前校准值",
+          dataIndex: "beforeMonitorValue",
+          sorter: true,
+        },
+        {
+          title: "声校准器测量声压值",
+          dataIndex: "soundPressureValue",
+          sorter: true,
+        },
+        {
+          title: "声校准仪器型号",
+          dataIndex: "soundInstrumentModel",
+          sorter: true,
+        },
+        {
+          title: "声校准仪器编号",
+          dataIndex: "soundInstrumentCode",
+          sorter: true,
+        },
+        {
+          title: "区域等级",
+          dataIndex: "regionLevel",
+          sorter: true,
+        },
+         {
+          title: "备注",
+          dataIndex: "remark",
+          sorter: true,
+        },
+      ];
+      const arr = [];
+      const th = columns.map((item) => item.title);
+      arr.push(th);
+      this.data.forEach((d) => {
+        const td = columns.map((item) => d[item.dataIndex]);
+        arr.push(td);
       });
+      let sheet = XLSX.utils.aoa_to_sheet(arr);
+      this.$util.exportSheet(XLSX, sheet, new Date().getTime().toString());
     },
-    
-      save() {
-        const hide = this.$message.loading('请求中..', 0);
-        const form = _.cloneDeep(this.form);
-        const date = new Date();
-        date.setFullYear(form.monitorDate.year());
-        date.setMonth(form.monitorDate.month());
-        date.setDate(form.monitorDate.date());
-        date.setHours(form.monitorTime.hour());
-        date.setMinutes(form.monitorTime.minutes());
-        form.monitorTime = date.getTime();
-        form.monitorYear = date.getFullYear();
-        form.monitorMonth = date.getMonth() + 1;
-        form.monitorDay = date.getDate();
-        form.monitorHour = date.getHours();
-        form.monitorMinute = date.getMinutes();
-        delete form['monitorDate']
-        if (form.zoneNoiseId) {
-          updateZoneNoise(form).then(res => {
-            if (res.data.code == 0) {
-            this.showEdit = false;
-              this.$message.success(res.data.msg);
-              this.reload();
-            } else {
-              this.$message.error(res.data.msg);
-            }
-          }).catch((error)=>{
-              this.$message.error(error.message);
-          }).finally(()=>{
-              console.log("finallyfinallyfinallyfinally");
-              hide();
-          })
-        }else{
-            form.zoneNoiseBillId = this.zoneNoiseBillId;
-             saveZoneNoise(form).then(res => {
-            if (res.data.code == 0) {
-                this.showEdit = false;
-              this.$message.success(res.data.msg);
-              this.reload();
-            } else {
-              this.$message.error(res.data.msg);
-            }
-          }).catch((error)=>{
-              this.$message.error(error.message);
-          }).finally(()=>{
-              hide();
-          })
-        }
-       
-
   },
-      /* 删除单个 */
+};
-      remove(row) {
-        const hide = this.$message.loading('请求中..', 0);
-        removeZoneNoise(row.zoneNoiseId).then(res => {
-          if (res.data.code === 0) {
-            this.$message.success(res.data.msg);
-            this.reload();
-          } else {
-            this.$message.error(res.data.msg);
-          }
-        }).catch(e => {
-          this.$message.error(e.msg);
-        }).finally(() => hide());
-      },
-      removeBatch() {
-        const ids = this.selectionList.map(item => item.zoneNoiseId);
-        const hide = this.$message.loading('请求中..', 0);
-        removeBatchZoneNoise(ids).then(res => {
-          if (res.data.code === 0) {
-            this.$message.success(res.data.msg);
-            this.reload();
-          } else {
-            this.$message.error(res.data.msg);
-          }
-        }).catch(e => {
-
-          this.$message.error(e.msg);
-        }).finally(() => hide());
-      },
-
-    }
-  }
 </script>
 
 <style scoped lang="less">
-  
 </style>

src/views/sound/zone/statistic/compare.vue

@@ -2,7 +2,7 @@
   <div class="">
     <a-form :model="where" :rules="whereRules" :labelCol="{ offset: 1 }">
       <a-row>
-        <a-col :lg="6" :md="12" :sm="24" :xs="24">
+        <!-- <a-col :lg="6" :md="12" :sm="24" :xs="24">
           <a-form-item label="统计模块:">
             <a-select
               :options="groupModelOptions"
@@ -11,7 +11,7 @@
             >
             </a-select>
           </a-form-item>
-        </a-col>
+        </a-col> -->
         <a-col :lg="6" :md="12" :sm="24" :xs="24">
           <a-form-item label="时间细度:">
             <a-select
@@ -169,6 +169,7 @@ export default {
         reportTimeScope: [],
         valueType: ["index_Leq"],
         timeRange: [],
+        regionLevel: "市级"
       },
       timeRange: [],
       whereRules,
@@ -223,7 +224,12 @@ export default {
     /* 重置搜索 */
     reset() {
       this.where = {
-        model: "place",
+        groupModel: "area",
+        groupTimeLength: "monitor_year",
+        reportTimeScope: [],
+        valueType: ["index_Leq"],
+        timeRange: [],
+        regionLevel: "市级"
       };
       this.this.timeScope = [];
       this.reload();
@@ -261,123 +267,149 @@ export default {
 
       this.hisYears.forEach((item) => {
         if (
-          (!this.where.timeRange[0] ||
+          (!this.where.timeRange[0] || this.where.timeRange[0] <= item) &&
-          this.where.timeRange[0] <= item) &&
+          (!this.where.timeRange[1] || this.where.timeRange[1] >= item)
-          (!this.where.timeRange[1] ||
-          this.where.timeRange[1] >= item)
         ) {
           if (this.where.groupTimeLength == "quarter") {
             columns.push({
               title: item + "年第一季度Leq",
               dataIndex: item + "1" + "Leq",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
             });
             columns.push({
               title: item + "年第二季度Leq",
               dataIndex: item + "2" + "Leq",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
             });
             columns.push({
               title: item + "年第三季度Leq",
               dataIndex: item + "3" + "Leq",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
             });
             columns.push({
               title: item + "年第四季度Leq",
               dataIndex: item + "4" + "Leq",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
             });
             columns.push({
               title: item + "年第一季度SD",
               dataIndex: item + "1" + "Sd",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
             });
             columns.push({
               title: item + "年第二季度SD",
               dataIndex: item + "2" + "Sd",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
             });
             columns.push({
               title: item + "年第三季度SD",
               dataIndex: item + "3" + "Sd",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
             });
             columns.push({
               title: item + "年第四季度SD",
               dataIndex: item + "4" + "Sd",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
             });
             columns.push({
               title: item + "年第一季度L10",
               dataIndex: item + "1" + "L10",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
             });
             columns.push({
               title: item + "年第二季度L10",
               dataIndex: item + "2" + "L10",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
             });
             columns.push({
               title: item + "年第三季度L10",
               dataIndex: item + "3" + "L10",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
             });
             columns.push({
               title: item + "年第四季度L10",
               dataIndex: item + "4" + "L10",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
             });
             columns.push({
               title: item + "年第一季度L50",
               dataIndex: item + "1" + "L50",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
             });
             columns.push({
               title: item + "年第二季度L50",
               dataIndex: item + "2" + "L50",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
             });
             columns.push({
               title: item + "年第三季度L50",
               dataIndex: item + "3" + "L50",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
             });
             columns.push({
               title: item + "年第四季度L50",
               dataIndex: item + "4" + "L50",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
             });
             columns.push({
               title: item + "年第一季度L90",
               dataIndex: item + "1" + "L90",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
             });
             columns.push({
               title: item + "年第二季度L90",
               dataIndex: item + "2" + "L90",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
             });
             columns.push({
               title: item + "年第三季度L90",
               dataIndex: item + "3" + "L90",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
             });
             columns.push({
               title: item + "年第四季度L90",
               dataIndex: item + "4" + "L90",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
             });
             columns.push({
               title: item + "年第一季度Lmin",
               dataIndex: item + "1" + "Lmin",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
             });
             columns.push({
               title: item + "年第二季度Lmin",
               dataIndex: item + "2" + "Lmin",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
             });
             columns.push({
               title: item + "年第三季度Lmin",
               dataIndex: item + "3" + "Lmin",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
             });
             columns.push({
               title: item + "年第四季度Lmin",
               dataIndex: item + "4" + "Lmin",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
             });
             columns.push({
               title: item + "年第一季度Lmax",
               dataIndex: item + "1" + "Lmax",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
             });
             columns.push({
               title: item + "年第二季度Lmax",
               dataIndex: item + "2" + "Lmax",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
             });
             columns.push({
               title: item + "年第三季度Lmax",
               dataIndex: item + "3" + "Lmax",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
             });
             columns.push({
               title: item + "年第四季度Lmax",
               dataIndex: item + "4" + "Lmax",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
             });
           } else {
             if (this.where.valueType.includes("index_Leq")) {
@@ -385,7 +417,7 @@ export default {
                 title: item + "年Leq",
                 dataIndex: item + "Leq",
                 customRender: ({ text }) => {
-                  const val = text ? Number(text).toFixed(2) : "";
+                  const val = text ? Number(text).toFixed(1) : "";
                   return val;
                 },
               });
@@ -395,7 +427,7 @@ export default {
                 title: item + "年SD",
                 dataIndex: item + "Sd",
                 customRender: ({ text }) => {
-                  const val = text ? Number(text).toFixed(2) : "";
+                  const val = text ? Number(text).toFixed(1) : "";
                   return val;
                 },
               });
@@ -405,7 +437,7 @@ export default {
                 title: item + "年L10",
                 dataIndex: item + "L10",
                 customRender: ({ text }) => {
-                  const val = text ? Number(text).toFixed(2) : "";
+                  const val = text ? Number(text).toFixed(1) : "";
                   return val;
                 },
               });
@@ -416,7 +448,7 @@ export default {
                 title: item + "年L50",
                 dataIndex: item + "L50",
                 customRender: ({ text }) => {
-                  const val = text ? Number(text).toFixed(2) : "";
+                  const val = text ? Number(text).toFixed(1) : "";
                   return val;
                 },
               });
@@ -426,7 +458,7 @@ export default {
                 title: item + "年L90",
                 dataIndex: item + "L90",
                 customRender: ({ text }) => {
-                  const val = text ? Number(text).toFixed(2) : "";
+                  const val = text ? Number(text).toFixed(1) : "";
                   return val;
                 },
               });
@@ -436,7 +468,7 @@ export default {
                 title: item + "年Lmin",
                 dataIndex: item + "Lmin",
                 customRender: ({ text }) => {
-                  const val = text ? Number(text).toFixed(2) : "";
+                  const val = text ? Number(text).toFixed(1) : "";
                   return val;
                 },
               });
@@ -446,7 +478,7 @@ export default {
                 title: item + "年Lmax",
                 dataIndex: item + "Lmax",
                 customRender: ({ text }) => {
-                  const val = text ? Number(text).toFixed(2) : "";
+                  const val = text ? Number(text).toFixed(1) : "";
                   return val;
                 },
               });

src/views/sound/zone/statistic/index.vue

@@ -40,7 +40,7 @@
     },
     data() {
       return {
-        activeKey: 'year-compare'
+        activeKey: 'base'
       };
         
     },

src/views/system/organization/org-user-edit.vue

@@ -4,7 +4,7 @@
     :width="680"
     :visible="visible"
     :confirm-loading="loading"
-    :title="isUpdate?'修改用户':'新建用户'"
+    :title="isUpdate?'修改记录':'新建用户'"
     :body-style="{paddingBottom: '8px'}"
     @update:visible="updateVisible"
     @ok="save">

src/views/system/organization/org-user-list.vue

@@ -177,7 +177,7 @@ export default {
         this.$message.error(e.message);
       });
     },
-    /* 修改用户状态 */
+    /* 修改记录状态 */
     changeState(checked, row) {
       let params = new FormData();
       params.append('state', checked ? 0 : 1);

src/views/system/user/index.vue

@@ -298,7 +298,7 @@ export default {
         }
       });
     },
-    /* 修改用户状态 */
+    /* 修改记录状态 */
     editState(checked, row) {
       let params = new FormData();
       params.append('state', checked ? 0 : 1);

src/views/system/user/user-edit.vue

@@ -4,7 +4,7 @@
     :width="680"
     :visible="visible"
     :confirm-loading="loading"
-    :title="isUpdate?'修改用户':'新建用户'"
+    :title="isUpdate?'修改记录':'新建用户'"
     :body-style="{paddingBottom: '8px'}"
     @update:visible="updateVisible"
     @ok="save">