From 530589f47eadc4cccbfbd932a9566cc93b6807f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com>
Date: Sat, 11 May 2024 09:41:55 +0800
Subject: [PATCH] =?UTF-8?q?CN-1658=20fix:=20=E6=A0=B9=E6=8D=AE=E7=8E=B0?=
 =?UTF-8?q?=E6=9C=89=E6=97=B6=E5=8C=BA=E8=B0=83=E6=95=B4report=E6=89=80?=
 =?UTF-8?q?=E9=80=89=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/rightBox/report/ReportBox.vue | 28 +++++++++++++++-----
 src/components/table/report/ReportTable.vue  |  1 +
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/components/rightBox/report/ReportBox.vue b/src/components/rightBox/report/ReportBox.vue
index d0f26399..bebacbb3 100644
--- a/src/components/rightBox/report/ReportBox.vue
+++ b/src/components/rightBox/report/ReportBox.vue
@@ -179,6 +179,7 @@
                     :format="dateFormat"
                     prefix-icon=""
                     type="datetime"
+                    @change="onChangeSchedulerStart"
                     placeholder=" "
                 />
               </div>
@@ -193,6 +194,7 @@
                     :format="dateFormat"
                     prefix-icon=""
                     type="datetime"
+                    @change="onChangeSchedulerEnd"
                     placeholder=" "
                 />
               </div>
@@ -263,7 +265,7 @@ import { storageKey, report } from '@/utils/constants'
 import { api } from '@/utils/api'
 import _ from 'lodash'
 import axios from 'axios'
-import { dateFormat, getMillisecond } from '@/utils/date-util'
+import { dateFormat, getMillisecond, millTimestampDiffFromTz } from '@/utils/date-util'
 import { ref, getCurrentInstance } from 'vue'
 import i18n from '@/i18n'
 export default {
@@ -279,10 +281,10 @@ export default {
     const startTime = ref('')
     const endTime = ref('')
     function endTimeChange (val) {
-      endTime.value = val
+      endTime.value = val + millTimestampDiffFromTz()
     }
     function startTimeChang (val) {
-      startTime.value = val
+      startTime.value = val + millTimestampDiffFromTz()
     }
     const endDisabledDate = (time) => {
       if (time.getTime() > new Date()) {
@@ -352,12 +354,24 @@ export default {
         { validator: paramValidator, message: i18n.global.t('validate.required'), trigger: 'blur' }
       ]
     }
+    const mySchedulerStart = ref('')
+    const mySchedulerEnd = ref('')
+    const onChangeSchedulerStart = (val) => {
+      mySchedulerStart.value = getMillisecond(val) + millTimestampDiffFromTz()
+    }
+    const onChangeSchedulerEnd = (val) => {
+      mySchedulerEnd.value = getMillisecond(val) + millTimestampDiffFromTz()
+    }
     return {
       endDisabledDate,
       startDisabledDate,
       startTimeChang,
       endTimeChange,
-      rules
+      rules,
+      mySchedulerStart,
+      mySchedulerEnd,
+      onChangeSchedulerStart,
+      onChangeSchedulerEnd
     }
   },
   data () {
@@ -624,10 +638,12 @@ export default {
             }
           }
           if (this.editObject.schedulerStart) {
-            schedulerStart = getMillisecond(this.editObject.schedulerStart)
+            // schedulerStart = getMillisecond(this.editObject.schedulerStart)
+            schedulerStart = this.mySchedulerStart
           }
           if (this.editObject.schedulerEnd) {
-            schedulerEnd = getMillisecond(this.editObject.schedulerEnd)
+            // schedulerEnd = getMillisecond(this.editObject.schedulerEnd)
+            schedulerEnd = this.mySchedulerEnd
           }
 
           const copyObject = _.cloneDeep(this.editObject)
diff --git a/src/components/table/report/ReportTable.vue b/src/components/table/report/ReportTable.vue
index 9f9447d2..e3fe974b 100644
--- a/src/components/table/report/ReportTable.vue
+++ b/src/components/table/report/ReportTable.vue
@@ -613,6 +613,7 @@ export default {
       }
       const param = {
         tempId: row.id,
+        // todo 此处时间需要改，后续再确定
         startTime: dateFormatToUTC(this.timeRange[0]),
         endTime: dateFormatToUTC(this.timeRange[1]),
         ...this.pageObj