From aa1d539a49085632301f7299e63e0949c95df826 Mon Sep 17 00:00:00 2001
From: renpy <peiyu_ren@163.com>
Date: Wed, 5 Jul 2023 15:14:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/detail.vue                            | 2 +-
 .../imsData/radionuclide/particulate/blankphd.vue          | 1 -
 .../statistics/imsData/radionuclide/particulate/sphdp.vue  | 6 +++---
 src/views/statistics/list.vue                              | 7 ++-----
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/views/statistics/detail.vue b/src/views/statistics/detail.vue
index 80f9326..5485aa7 100644
--- a/src/views/statistics/detail.vue
+++ b/src/views/statistics/detail.vue
@@ -167,7 +167,7 @@ export default {
         type: Object,
         default: ()=>{}
       },
-  },
+    },
     watch: {
       allData: {
         handler(val) {
diff --git a/src/views/statistics/imsData/radionuclide/particulate/blankphd.vue b/src/views/statistics/imsData/radionuclide/particulate/blankphd.vue
index c316c2b..314f982 100644
--- a/src/views/statistics/imsData/radionuclide/particulate/blankphd.vue
+++ b/src/views/statistics/imsData/radionuclide/particulate/blankphd.vue
@@ -20,7 +20,6 @@
         @change="handleTableChange"
         @detail="handleDetail"
         :selectedRowKeys.sync="selectedRowKeys"
-        :scroll="{ x: true, y: 'calc(100vh - 410px)' }"
       >
         <template slot="index" slot-scope="{ index }">
           {{ index + 1 }}
diff --git a/src/views/statistics/imsData/radionuclide/particulate/sphdp.vue b/src/views/statistics/imsData/radionuclide/particulate/sphdp.vue
index 0830871..3b17826 100644
--- a/src/views/statistics/imsData/radionuclide/particulate/sphdp.vue
+++ b/src/views/statistics/imsData/radionuclide/particulate/sphdp.vue
@@ -48,13 +48,13 @@ const columns = [
   {
     title: 'COLLECTION START TIME',
     align: 'left',
-    dataIndex: 'collectionStart',
+    dataIndex: 'collectStart',
   },
   {
     title: 'COLLECTION STOP TIME',
     align: 'left',
-    dataIndex: 'collectionStop',
-  },
+    dataIndex: 'collectStop',
+  }
 ]
 export default {
   components: {
diff --git a/src/views/statistics/list.vue b/src/views/statistics/list.vue
index 99d7221..fbb8a61 100644
--- a/src/views/statistics/list.vue
+++ b/src/views/statistics/list.vue
@@ -19,7 +19,6 @@
         @change="handleTableChange"
         @detail="handleDetail"
         :selectedRowKeys.sync="selectedRowKeys"
-        :scroll="{ x: true, y: 'calc(100vh - 410px)' }"
       >
         <template slot="index" slot-scope="{ index }">
           {{ index + 1 }}
@@ -178,9 +177,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',
@@ -195,9 +193,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',