From c2a2a4afd6881034c2532686d2b8e6fda0085017 Mon Sep 17 00:00:00 2001
From: stt <email>
Date: Thu, 4 Dec 2025 19:47:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A8=B3=E6=80=81=E7=94=B5=E8=83=BD=E8=B4=A8?=
 =?UTF-8?q?=E9=87=8F=E5=88=86=E6=9E=90=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cockpit/exceedanceLevel/index.vue         | 45 ++++++++++++-----
 .../cockpit/indicatorDistribution/index.vue   | 50 ++++++++++++-------
 .../cockpit/overLimitStatistics/index.vue     | 45 ++++++++++++-----
 3 files changed, 99 insertions(+), 41 deletions(-)

diff --git a/src/components/cockpit/exceedanceLevel/index.vue b/src/components/cockpit/exceedanceLevel/index.vue
index 883cc1c..4ead812 100644
--- a/src/components/cockpit/exceedanceLevel/index.vue
+++ b/src/components/cockpit/exceedanceLevel/index.vue
@@ -1,7 +1,13 @@
 <template>
     <div>
         <!--指标越限程度 -->
-        <TableHeader :showReset="false" @selectChange="selectChange" datePicker v-if="fullscreen"></TableHeader>
+        <TableHeader
+            ref="TableHeaderRef"
+            :showReset="false"
+            @selectChange="selectChange"
+            datePicker
+            v-if="fullscreen"
+        ></TableHeader>
         <my-echart
             class="tall"
             :options="echartList"
@@ -25,8 +31,7 @@ import TableHeader from '@/components/table/header/index.vue'
 import MyEchart from '@/components/echarts/MyEchart.vue'
 import { getTimeOfTheMonth } from '@/utils/formatTime'
 import DailyTrendChart from '@/components/cockpit/exceedanceLevel/components/dailyTrendChart.vue'
-import { useRoute } from 'vue-router'
-import { useTimeCacheStore } from '@/stores/timeCache'
+import { getTime } from '@/utils/formatTime'
 
 const prop = defineProps({
     w: { type: [String, Number] },
@@ -34,9 +39,12 @@ const prop = defineProps({
     width: { type: [String, Number] },
     height: { type: [String, Number] },
     timeKey: { type: [String, Number] },
-    timeValue: { type: Object }
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
 
+const TableHeaderRef = ref()
+
 const headerHeight = ref(57)
 
 const dialogTrendChart = ref(false)
@@ -146,8 +154,7 @@ const tableStore: any = new TableStore({
         }
     ],
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
-        tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+        setTime()
     },
     loadCallback: () => {
         // 定义 x 轴标签顺序
@@ -207,6 +214,25 @@ const cellClickEvent = ({ row, column }: any) => {
     }
 }
 
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
+
 onMounted(() => {
     tableStore.index()
 })
@@ -219,12 +245,7 @@ watch(
 watch(
     () => prop.timeValue,
     (newVal, oldVal) => {
-        // 当外部时间值变化时，更新表格的时间参数
-        if (newVal && (!oldVal || newVal[0] !== oldVal[0] || newVal[1] !== oldVal[1])) {
-            tableStore.table.params.searchBeginTime = newVal[0]
-            tableStore.table.params.searchEndTime = newVal[1]
-            tableStore.index()
-        }
+        tableStore.index()
     },
     {
         deep: true
diff --git a/src/components/cockpit/indicatorDistribution/index.vue b/src/components/cockpit/indicatorDistribution/index.vue
index 52079b3..756d1ca 100644
--- a/src/components/cockpit/indicatorDistribution/index.vue
+++ b/src/components/cockpit/indicatorDistribution/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <!--指标越限概率分布 -->
-        <TableHeader :showReset="false" @selectChange="selectChange" datePicker v-if="fullscreen">
+        <TableHeader :showReset="false" ref="TableHeaderRef" @selectChange="selectChange" datePicker v-if="fullscreen">
             <template v-slot:select>
                 <el-form-item label="监测点">
                     <el-select size="small" v-model="tableStore.table.params.lineId">
@@ -21,7 +21,7 @@
                 :options="echartList"
                 :style="{
                     width: prop.width,
-                    height: `calc(${prop.height} / 2 - ${headerHeight / 2}px + ${fullscreen ? 0 : 28}px )`,
+                    height: `calc(${prop.height} / 2 - ${headerHeight / 2}px + ${fullscreen ? 0 : 28}px )`
                 }"
             />
             <my-echart
@@ -41,6 +41,7 @@ import TableStore from '@/utils/tableStore'
 import TableHeader from '@/components/table/header/index.vue'
 import MyEchart from '@/components/echarts/MyEchart.vue'
 import { limitProbabilityData, cslineList } from '@/api/harmonic-boot/cockpit/cockpit'
+import { getTime } from '@/utils/formatTime'
 
 const prop = defineProps({
     w: { type: [String, Number] },
@@ -48,7 +49,8 @@ const prop = defineProps({
     width: { type: [String, Number] },
     height: { type: [String, Number] },
     timeKey: { type: [String, Number] },
-    timeValue: { type: Object }
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
 
 // const options = ref(JSON.parse(window.localStorage.getItem('lineIdList') || '[]'))
@@ -57,6 +59,8 @@ const lineList = ref()
 
 const headerHeight = ref(57)
 
+const TableHeaderRef = ref()
+
 const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
     headerHeight.value = height
 
@@ -187,9 +191,8 @@ const initProbabilityData = () => {
                         type: 'category',
                         name: '越限程度',
                         nameLocation: 'middle',
-                       nameGap: 50,
-                        data: ['0-20%', '20-40%', '40-60%', '60-80%', '80-100%'],
-                        
+                        nameGap: 50,
+                        data: ['0-20%', '20-40%', '40-60%', '60-80%', '80-100%']
                     },
                     yAxis3D: {
                         type: 'category',
@@ -197,7 +200,7 @@ const initProbabilityData = () => {
                         nameLocation: 'middle',
                         nameGap: 50,
                         data: yAxisData,
-                     
+
                         splitLine: {
                             lineStyle: {
                                 type: 'dashed',
@@ -210,8 +213,8 @@ const initProbabilityData = () => {
                         name: '越限次数',
                         nameLocation: 'middle',
                         nameGap: 30,
-                        minInterval: 10,
-                       
+                        minInterval: 10
+
                         // max: 100
                     },
                     grid3D: {
@@ -367,8 +370,7 @@ const tableStore: any = new TableStore({
     showPage: false,
     column: [],
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
-        tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+        setTime()
         // 只有当 lineList 已加载且有数据时才设置默认 lineId
         if (!tableStore.table.params.lineId && lineList.value && lineList.value.length > 0) {
             tableStore.table.params.lineId = lineList.value[0].lineId
@@ -420,6 +422,25 @@ provide('tableStore', tableStore)
 onMounted(() => {
     initLineList()
 })
+
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
 watch(
     () => prop.timeKey,
     val => {
@@ -429,12 +450,7 @@ watch(
 watch(
     () => prop.timeValue,
     (newVal, oldVal) => {
-        // 当外部时间值变化时，更新表格的时间参数
-        if (newVal && (!oldVal || newVal[0] !== oldVal[0] || newVal[1] !== oldVal[1])) {
-            tableStore.table.params.searchBeginTime = newVal[0]
-            tableStore.table.params.searchEndTime = newVal[1]
-            tableStore.index()
-        }
+        tableStore.index()
     },
     {
         deep: true
diff --git a/src/components/cockpit/overLimitStatistics/index.vue b/src/components/cockpit/overLimitStatistics/index.vue
index 614d85e..3898eb1 100644
--- a/src/components/cockpit/overLimitStatistics/index.vue
+++ b/src/components/cockpit/overLimitStatistics/index.vue
@@ -1,7 +1,13 @@
 <template>
     <div>
         <!--总体指标越限统计 -->
-        <TableHeader :showReset="false" @selectChange="selectChange" datePicker v-if="fullscreen"></TableHeader>
+        <TableHeader
+            :showReset="false"
+            ref="TableHeaderRef"
+            @selectChange="selectChange"
+            datePicker
+            v-if="fullscreen"
+        ></TableHeader>
         <my-echart
             class="tall"
             :options="echartList"
@@ -30,6 +36,7 @@ import OverLimitDetails from '@/components/cockpit/overLimitStatistics/component
 import { useRoute } from 'vue-router'
 import { useTimeCacheStore } from '@/stores/timeCache'
 import { totalLimitStatisticsData } from '@/api/harmonic-boot/cockpit/cockpit'
+import { getTime } from '@/utils/formatTime'
 
 const prop = defineProps({
     w: { type: [String, Number] },
@@ -37,13 +44,13 @@ const prop = defineProps({
     width: { type: [String, Number] },
     height: { type: [String, Number] },
     timeKey: { type: [String, Number] },
-    timeValue: { type: Object }
+    timeValue: { type: Object },
+    interval: { type: Number }
 })
 
 const headerHeight = ref(57)
 
-const route = useRoute()
-const timeCacheStore = useTimeCacheStore()
+const TableHeaderRef = ref()
 
 const echartList = ref({})
 
@@ -191,8 +198,7 @@ const tableStore: any = new TableStore({
         }
     ],
     beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
-        tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+        setTime()
     },
     loadCallback: () => {
         tableStore.table.height = `calc(${prop.height} - 80px)`
@@ -219,6 +225,26 @@ const cellClickEvent = ({ row, column }: any) => {
 onMounted(() => {
     tableStore.index()
 })
+
+const setTime = () => {
+    const time = getTime(
+        (TableHeaderRef.value?.datePickerRef.interval || prop.interval) ?? 0,
+        prop.timeKey,
+        fullscreen.value
+            ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+            : prop.timeValue
+    )
+
+    if (Array.isArray(time)) {
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
+        TableHeaderRef.value?.setInterval(time[2] - 0)
+        TableHeaderRef.value?.setTimeInterval([time[0], time[1]])
+    } else {
+        console.warn('获取时间失败，time 不是一个有效数组')
+    }
+}
+
 watch(
     () => prop.timeKey,
     val => {
@@ -229,12 +255,7 @@ watch(
 watch(
     () => prop.timeValue,
     (newVal, oldVal) => {
-        // 当外部时间值变化时，更新表格的时间参数
-        if (newVal && (!oldVal || newVal[0] !== oldVal[0] || newVal[1] !== oldVal[1])) {
-            tableStore.table.params.searchBeginTime = newVal[0]
-            tableStore.table.params.searchEndTime = newVal[1]
-            tableStore.index()
-        }
+         tableStore.index()
     },
     {
         deep: true