From 2562d7098d24b7044319b1fa04d6bf43f984f804 Mon Sep 17 00:00:00 2001
From: renpy <peiyu_ren@163.com>
Date: Wed, 5 Jul 2023 11:51:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95=E5=B1=82?=
 =?UTF-8?q?=E7=BA=A7=E7=BB=93=E6=9E=84=EF=BC=8C=E5=8F=8A=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/RouteView.vue            |  1 +
 .../radionuclide/particulate}/blankphd.vue    | 24 +++++++------------
 .../radionuclide/particulate}/calibphd.vue    | 11 ++-------
 .../radionuclide/particulate}/detbkphd.vue    | 10 ++------
 .../radionuclide/particulate}/qcphd.vue       | 10 ++------
 .../radionuclide/particulate}/sphdf.vue       | 18 +++++---------
 .../radionuclide/particulate}/sphdp.vue       | 18 +++++---------
 7 files changed, 28 insertions(+), 64 deletions(-)
 rename src/views/statistics/{ => imsData/radionuclide/particulate}/blankphd.vue (93%)
 rename src/views/statistics/{ => imsData/radionuclide/particulate}/calibphd.vue (90%)
 rename src/views/statistics/{ => imsData/radionuclide/particulate}/detbkphd.vue (90%)
 rename src/views/statistics/{ => imsData/radionuclide/particulate}/qcphd.vue (90%)
 rename src/views/statistics/{ => imsData/radionuclide/particulate}/sphdf.vue (83%)
 rename src/views/statistics/{ => imsData/radionuclide/particulate}/sphdp.vue (83%)

diff --git a/src/views/statistics/RouteView.vue b/src/views/statistics/RouteView.vue
index 651cb49..9afefb9 100644
--- a/src/views/statistics/RouteView.vue
+++ b/src/views/statistics/RouteView.vue
@@ -101,6 +101,7 @@ export default {
         this.menus = f.children
       }
     })
+    console.log("路由信息",this.menus);
     this.initDefaultKeys(this.menus[0])
     // 将从缓存中取出openKeys
     const openKeys = window.sessionStorage.getItem('openKeys')
diff --git a/src/views/statistics/blankphd.vue b/src/views/statistics/imsData/radionuclide/particulate/blankphd.vue
similarity index 93%
rename from src/views/statistics/blankphd.vue
rename to src/views/statistics/imsData/radionuclide/particulate/blankphd.vue
index 7adee63..e98a55c 100644
--- a/src/views/statistics/blankphd.vue
+++ b/src/views/statistics/imsData/radionuclide/particulate/blankphd.vue
@@ -5,7 +5,7 @@
       <search-form :items="formItems" v-model="queryParam" @search="searchQueryData">
         <a-space style="float: right" class="btn-group" slot="additional">
           <a-button @click="handleEdit" type="primary">
-            <img src="@/assets/images/global/edit.png" alt="" />
+            <img class="icon-edit" src="@/assets/images/global/edit.png" alt="" />
             Excel
           </a-button>
         </a-space>
@@ -35,7 +35,6 @@ const columns = [
   {
     title: 'NO',
     align: 'left',
-    width: 50,
     scopedSlots: {
       customRender: 'index',
     },
@@ -58,37 +57,32 @@ const columns = [
     title: 'STATION',
     align: 'left',
     dataIndex: 'stationName',
-    width: 130,
   },
   {
     title: 'DETECTOR CODE',
     align: 'left',
-    width: 100,
     dataIndex: 'siteDetCode',
   },
   {
     title: 'SPECTRAL QUALIFIER',
     align: 'left',
-    width: 100,
     dataIndex: 'spectralQualifie',
   },
   {
     title: 'ACQUISITION START TIME',
     align: 'left',
-    width: 100,
     dataIndex: 'acquisitionStart',
   },
   {
     title: 'ACQUISITION STOP TIME',
     align: 'left',
-    width: 120,
     dataIndex: 'acquisitionStop',
   },
 ]
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import { getAction } from '../../api/manage'
-import dateFormat from '../../components/jeecg/JEasyCron/format-date'
-import Detail from "./detail.vue"
+import { getAction } from '../../../../../api/manage'
+import dateFormat from '../../../../../components/jeecg/JEasyCron/format-date'
+import Detail from "../../../detail.vue"
 export default {
   name: 'menuTree',
   mixins: [JeecgListMixin],
@@ -248,9 +242,8 @@ export default {
           type: 'custom-date-picker',
           name: 'startTime',
           props: {
-            showTime: { format: 'HH:mm' },
             format: 'YYYY-MM-DD',
-            valueFormat: 'YYYY-MM-DD:ss',
+            valueFormat: 'YYYY-MM-DD',
             style: {
               minWidth: 'auto',
               width: '200px',
@@ -265,9 +258,8 @@ export default {
           type: 'custom-date-picker',
           name: 'endTime',
           props: {
-            showTime: { format: 'HH:mm' },
             format: 'YYYY-MM-DD',
-            valueFormat: 'YYYY-MM-DD:ss',
+            valueFormat: 'YYYY-MM-DD',
             style: {
               minWidth: 'auto',
               width: '200px',
@@ -283,6 +275,8 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-
+.icon-edit{
+  margin-right: 10px;
+}
 </style>
   
\ No newline at end of file
diff --git a/src/views/statistics/calibphd.vue b/src/views/statistics/imsData/radionuclide/particulate/calibphd.vue
similarity index 90%
rename from src/views/statistics/calibphd.vue
rename to src/views/statistics/imsData/radionuclide/particulate/calibphd.vue
index fd285d3..de74a3d 100644
--- a/src/views/statistics/calibphd.vue
+++ b/src/views/statistics/imsData/radionuclide/particulate/calibphd.vue
@@ -5,14 +5,13 @@
 </template>
 
 <script>
-import List from "./list.vue"
-import { getAction } from '../../api/manage'
+import List from "../../../list.vue"
+import { getAction } from '../../../../../api/manage'
 
 const columns = [
   {
     title: 'NO',
     align: 'left',
-    width: 50,
     scopedSlots: {
       customRender: 'index',
     },
@@ -35,36 +34,30 @@ const columns = [
     title: 'STATION',
     align: 'left',
     dataIndex: 'stationName',
-    width: 130,
   },
   {
     title: 'DETECTOR CODE',
     align: 'left',
-    width: 100,
     dataIndex: 'siteDetCode',
   },
   {
     title: 'SPECTRAL QUALIFIER',
     align: 'left',
-    width: 100,
     dataIndex: 'spectralQualifie',
   },
   {
     title: 'ACQUISITION START TIME',
     align: 'left',
-    width: 100,
     dataIndex: 'acquisitionStart',
   },
   {
     title: 'ACQUISITION STOP TIME',
     align: 'left',
-    width: 120,
     dataIndex: 'acquisitionStop',
   },
   {
     title: 'CALIB REPORTS',
     align: 'left',
-    width: 120,
     dataIndex: 'calibReports',
   },
 ]
diff --git a/src/views/statistics/detbkphd.vue b/src/views/statistics/imsData/radionuclide/particulate/detbkphd.vue
similarity index 90%
rename from src/views/statistics/detbkphd.vue
rename to src/views/statistics/imsData/radionuclide/particulate/detbkphd.vue
index b5f21f1..4897fb4 100644
--- a/src/views/statistics/detbkphd.vue
+++ b/src/views/statistics/imsData/radionuclide/particulate/detbkphd.vue
@@ -5,14 +5,13 @@
 </template>
 
 <script>
-import List from "./list.vue"
-import { getAction } from '../../api/manage'
+import List from "../../../list.vue"
+import { getAction } from '../../../../../api/manage'
 
 const columns = [
   {
     title: 'NO',
     align: 'left',
-    width: 50,
     scopedSlots: {
       customRender: 'index',
     },
@@ -35,30 +34,25 @@ const columns = [
     title: 'STATION',
     align: 'left',
     dataIndex: 'stationName',
-    width: 130,
   },
   {
     title: 'DETECTOR CODE',
     align: 'left',
-    width: 100,
     dataIndex: 'siteDetCode',
   },
   {
     title: 'SPECTRAL QUALIFIER',
     align: 'left',
-    width: 100,
     dataIndex: 'spectralQualifie',
   },
   {
     title: 'ACQUISITION START TIME',
     align: 'left',
-    width: 100,
     dataIndex: 'acquisitionStart',
   },
   {
     title: 'ACQUISITION STOP TIME',
     align: 'left',
-    width: 120,
     dataIndex: 'acquisitionStop',
   },
 ]
diff --git a/src/views/statistics/qcphd.vue b/src/views/statistics/imsData/radionuclide/particulate/qcphd.vue
similarity index 90%
rename from src/views/statistics/qcphd.vue
rename to src/views/statistics/imsData/radionuclide/particulate/qcphd.vue
index 44e9df1..0aae77b 100644
--- a/src/views/statistics/qcphd.vue
+++ b/src/views/statistics/imsData/radionuclide/particulate/qcphd.vue
@@ -5,14 +5,13 @@
 </template>
 
 <script>
-import List from "./list.vue"
-import { getAction } from '../../api/manage'
+import List from "../../../list.vue"
+import { getAction } from '../../../../../api/manage'
 
 const columns = [
   {
     title: 'NO',
     align: 'left',
-    width: 50,
     scopedSlots: {
       customRender: 'index',
     },
@@ -35,30 +34,25 @@ const columns = [
     title: 'STATION',
     align: 'left',
     dataIndex: 'stationName',
-    width: 130,
   },
   {
     title: 'DETECTOR CODE',
     align: 'left',
-    width: 100,
     dataIndex: 'siteDetCode',
   },
   {
     title: 'SPECTRAL QUALIFIER',
     align: 'left',
-    width: 100,
     dataIndex: 'spectralQualifie',
   },
   {
     title: 'ACQUISITION START TIME',
     align: 'left',
-    width: 100,
     dataIndex: 'acquisitionStart',
   },
   {
     title: 'ACQUISITION STOP TIME',
     align: 'left',
-    width: 120,
     dataIndex: 'acquisitionStop',
   },
 ]
diff --git a/src/views/statistics/sphdf.vue b/src/views/statistics/imsData/radionuclide/particulate/sphdf.vue
similarity index 83%
rename from src/views/statistics/sphdf.vue
rename to src/views/statistics/imsData/radionuclide/particulate/sphdf.vue
index 8ddc248..53f1240 100644
--- a/src/views/statistics/sphdf.vue
+++ b/src/views/statistics/imsData/radionuclide/particulate/sphdf.vue
@@ -5,14 +5,13 @@
 </template>
 
 <script>
-import List from "./list.vue"
-import { getAction } from '../../api/manage'
+import List from "../../../list.vue"
+import { getAction } from '../../../../../api/manage'
 
 const columns = [
   {
     title: 'NO',
     align: 'left',
-    width: 50,
     scopedSlots: {
       customRender: 'index',
     },
@@ -35,31 +34,26 @@ const columns = [
     title: 'STATION',
     align: 'left',
     dataIndex: 'stationName',
-    width: 130,
   },
   {
     title: 'DETECTOR CODE',
     align: 'left',
-    width: 100,
     dataIndex: 'siteDetCode',
   },
   {
     title: 'SPECTRAL QUALIFIER',
     align: 'left',
-    width: 100,
     dataIndex: 'spectralQualifie',
   },
   {
-    title: 'ACQUISITION START TIME',
+    title: 'COLLECTION START TIME',
     align: 'left',
-    width: 100,
-    dataIndex: 'acquisitionStart',
+    dataIndex: 'collectStart',
   },
   {
-    title: 'ACQUISITION STOP TIME',
+    title: 'COLLECTION STOP TIME',
     align: 'left',
-    width: 120,
-    dataIndex: 'acquisitionStop',
+    dataIndex: 'collectStop',
   },
 ]
 export default {
diff --git a/src/views/statistics/sphdp.vue b/src/views/statistics/imsData/radionuclide/particulate/sphdp.vue
similarity index 83%
rename from src/views/statistics/sphdp.vue
rename to src/views/statistics/imsData/radionuclide/particulate/sphdp.vue
index f6f1706..5f97480 100644
--- a/src/views/statistics/sphdp.vue
+++ b/src/views/statistics/imsData/radionuclide/particulate/sphdp.vue
@@ -5,14 +5,13 @@
 </template>
 
 <script>
-import List from "./list.vue"
-import { getAction } from '../../api/manage'
+import List from "../../../list.vue"
+import { getAction } from '../../../../../api/manage'
 
 const columns = [
   {
     title: 'NO',
     align: 'left',
-    width: 50,
     scopedSlots: {
       customRender: 'index',
     },
@@ -35,31 +34,26 @@ const columns = [
     title: 'STATION',
     align: 'left',
     dataIndex: 'stationName',
-    width: 130,
   },
   {
     title: 'DETECTOR CODE',
     align: 'left',
-    width: 100,
     dataIndex: 'siteDetCode',
   },
   {
     title: 'SPECTRAL QUALIFIER',
     align: 'left',
-    width: 100,
     dataIndex: 'spectralQualifie',
   },
   {
-    title: 'ACQUISITION START TIME',
+    title: 'COLLECTION START TIME',
     align: 'left',
-    width: 100,
-    dataIndex: 'acquisitionStart',
+    dataIndex: 'collectionStart',
   },
   {
-    title: 'ACQUISITION STOP TIME',
+    title: 'COLLECTION STOP TIME',
     align: 'left',
-    width: 120,
-    dataIndex: 'acquisitionStop',
+    dataIndex: 'collectionStop',
   },
 ]
 export default {