From 3accaf3079b4c850060a250e794d0c475aafcf3a Mon Sep 17 00:00:00 2001
From: stt <email>
Date: Thu, 4 Dec 2025 10:30:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E4=B8=8B=E6=8B=89=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cockpit/indicatorDetails/index.vue        | 23 +++++++---
 .../cockpit/indicatorFittingChart/index.vue   |  8 +++-
 .../listOfMainMonitoringPoints/index.vue      | 43 +++++++++++++++++--
 src/components/form/datePicker/index.vue      | 18 +++++++-
 src/components/table/header/index.vue         |  5 ++-
 5 files changed, 84 insertions(+), 13 deletions(-)

diff --git a/src/components/cockpit/indicatorDetails/index.vue b/src/components/cockpit/indicatorDetails/index.vue
index 04b1217..061cb87 100644
--- a/src/components/cockpit/indicatorDetails/index.vue
+++ b/src/components/cockpit/indicatorDetails/index.vue
@@ -8,6 +8,7 @@
             datePicker
             v-if="fullscreen"
             :timeCacheFlag="false"
+            :timeKeyList="['3']"
         ></TableHeader>
         <el-calendar
             v-model="value"
@@ -104,7 +105,13 @@ const tableStore: any = new TableStore({
     //     }
     // },
     beforeSearchFun: () => {
-        const time = getTime(prop.interval ?? 0, prop.timeKey, prop.timeValue)
+        const time = getTime(
+            prop.interval ?? 0,
+            prop.timeKey,
+            tableStore.table.params.searchBeginTime && tableStore.table.params.searchEndTime
+                ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+                : prop.timeValue
+        )
         tableStore.table.params.searchBeginTime = time[0]
         tableStore.table.params.searchEndTime = time[1]
     },
@@ -151,12 +158,18 @@ provide('tableStore', tableStore)
 
 onMounted(() => {
     nextTick(() => {
-        if (TableHeaderRef.value && typeof TableHeaderRef.value.setDatePicker === 'function') {
-            TableHeaderRef.value.setDatePicker([{ label: '月份', value: 3 }])
-        }
+        // if (TableHeaderRef.value && typeof TableHeaderRef.value.setDatePicker === 'function') {
+        //     TableHeaderRef.value.setDatePicker([{ label: '月份', value: 3 }])
+        // }
         if (fullscreen.value) {
             if (prop.interval == 3) {
-                const time = getTime(prop.interval ?? 0, prop.timeKey, prop.timeValue)
+                const time = getTime(
+                    prop.interval ?? 0,
+                    prop.timeKey,
+                    tableStore.table.params.searchBeginTime && tableStore.table.params.searchEndTime
+                        ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+                        : prop.timeValue
+                )
                 tableStore.table.params.searchBeginTime = time[0]
                 tableStore.table.params.searchEndTime = time[1]
                 TableHeaderRef.value.setTimeInterval(prop.timeValue)
diff --git a/src/components/cockpit/indicatorFittingChart/index.vue b/src/components/cockpit/indicatorFittingChart/index.vue
index 7ab1382..91a0619 100644
--- a/src/components/cockpit/indicatorFittingChart/index.vue
+++ b/src/components/cockpit/indicatorFittingChart/index.vue
@@ -107,7 +107,13 @@ const tableStore: any = new TableStore({
         // tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
         // tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
 
-        const time = getTime(prop.interval ?? 0, prop.timeKey, prop.timeValue)
+        const time = getTime(
+            prop.interval ?? 0,
+            prop.timeKey,
+            tableStore.table.params.searchBeginTime && tableStore.table.params.searchEndTime
+                ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+                : prop.timeValue
+        )
         tableStore.table.params.searchBeginTime = time[0]
         tableStore.table.params.searchEndTime = time[1]
     },
diff --git a/src/components/cockpit/listOfMainMonitoringPoints/index.vue b/src/components/cockpit/listOfMainMonitoringPoints/index.vue
index 851f734..5c174a7 100644
--- a/src/components/cockpit/listOfMainMonitoringPoints/index.vue
+++ b/src/components/cockpit/listOfMainMonitoringPoints/index.vue
@@ -1,7 +1,13 @@
 <template>
     <div>
         <!--指标拟合图 -->
-        <TableHeader datePicker @selectChange="selectChange" v-if="fullscreen">
+        <TableHeader
+            datePicker
+            @selectChange="selectChange"
+            v-if="fullscreen"
+            ref="TableHeaderRef"
+            :timeKeyList="['4', '5']"
+        >
             <template v-slot:select>
                 <el-form-item label="监测点">
                     <el-select v-model="tableStore.table.params.lineId" placeholder="请选择监测点" clearable>
@@ -75,6 +81,7 @@ import { useConfig } from '@/stores/config'
 import { cslineList, fittingData } from '@/api/harmonic-boot/cockpit/cockpit'
 import { queryByCode, queryCsDictTree } from '@/api/system-boot/dictTree'
 import { ElMessage } from 'element-plus'
+import { getTime } from '@/utils/formatTime'
 
 const prop = defineProps({
     w: { type: [String, Number] },
@@ -82,9 +89,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 config = useConfig()
 
 const lineList: any = ref()
@@ -269,8 +279,17 @@ const tableStore: any = new TableStore({
     column: [],
     beforeSearchFun: () => {
         // 设置时间参数
-        tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
-        tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+        // tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
+        // tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
+        const time = getTime(
+            prop.interval ?? 0,
+            prop.timeKey,
+            tableStore.table.params.searchBeginTime && tableStore.table.params.searchEndTime
+                ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+                : prop.timeValue
+        )
+        tableStore.table.params.searchBeginTime = time[0]
+        tableStore.table.params.searchEndTime = time[1]
 
         // 只有当 lineList 已加载且有数据时才设置默认 lineId
         if (!tableStore.table.params.lineId && lineList.value && lineList.value.length > 0) {
@@ -373,6 +392,22 @@ watch(
 )
 
 onMounted(() => {
+    if (fullscreen.value) {
+        if (prop.interval == 4 || prop.interval == 5) {
+            const time = getTime(
+                prop.interval ?? 0,
+                prop.timeKey,
+                tableStore.table.params.searchBeginTime && tableStore.table.params.searchEndTime
+                    ? [tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime]
+                    : prop.timeValue
+            )
+            tableStore.table.params.searchBeginTime = time[0]
+            tableStore.table.params.searchEndTime = time[1]
+            TableHeaderRef.value.setTimeInterval(prop.timeValue)
+        } else {
+            TableHeaderRef.value.setInterval(5)
+        }
+    }
     initLineList().then(() => {
         initCode()
     })
diff --git a/src/components/form/datePicker/index.vue b/src/components/form/datePicker/index.vue
index 032bee7..3c251fd 100644
--- a/src/components/form/datePicker/index.vue
+++ b/src/components/form/datePicker/index.vue
@@ -5,7 +5,7 @@
             style="min-width: 90px; width: 90px; margin-right: 10px"
             @change="timeChange"
         >
-            <el-option v-for="item in timeOptions" :key="item.value" :label="item.label" :value="item.value" />
+            <el-option v-for="item in filteredTimeOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
         <el-date-picker
             v-model.trim="timeValue"
@@ -35,13 +35,15 @@ interface Props {
     theCurrentTime?: boolean
     initialInterval?: number
     initialTimeValue?: any
+    timeKeyList?: string[]  //日期下拉
 }
 
 const props = withDefaults(defineProps<Props>(), {
     nextFlag: false,
     theCurrentTime: true,
     initialInterval: 3,
-    initialTimeValue: undefined
+    initialTimeValue: undefined,
+    timeKeyList: () => []
 })
 
 const emit = defineEmits(['change'])
@@ -89,6 +91,18 @@ const shortcuts = [
         }
     }
 ]
+
+// 计算过滤后的 timeOptions
+const filteredTimeOptions = computed(() => {
+    if (!props.timeKeyList || props.timeKeyList.length === 0) {
+        return timeOptions.value
+    }
+    
+    return timeOptions.value.filter((option: any) => 
+        props.timeKeyList.includes(option.value.toString())
+    )
+})
+
 onMounted(() => {
     // 使用传入的初始值
     if (props.initialInterval !== undefined) {
diff --git a/src/components/table/header/index.vue b/src/components/table/header/index.vue
index 33184a8..ff79b7e 100644
--- a/src/components/table/header/index.vue
+++ b/src/components/table/header/index.vue
@@ -15,6 +15,7 @@
                         :nextFlag="nextFlag"
                         :theCurrentTime="theCurrentTime"
                         @change="handleDatePickerChange"
+                        :timeKeyList="props.timeKeyList"
                     ></DatePicker>
                 </el-form-item>
 
@@ -89,6 +90,7 @@ interface Props {
     showReset?: boolean //是否显示重置
     showExport?: boolean //导出控制
     timeCacheFlag?: boolean //是否取缓存时间
+    timeKeyList?: Array<string> //日期下拉列表
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -99,7 +101,8 @@ const props = withDefaults(defineProps<Props>(), {
     theCurrentTime: true,
     showReset: true,
     showExport: false,
-    timeCacheFlag: true
+    timeCacheFlag: true,
+    timeKeyList: () => [] // 修改为箭头函数返回空数组
 })
 
 // 处理 DatePicker 值变化事件