时间取值修改

src/components/cockpit/transientDetails/index.vue

@@ -2,7 +2,13 @@
     <div>
         <!--暂态事件明细 -->
         <TableHeader :showReset="false" @selectChange="selectChange" datePicker v-if="fullscreen"></TableHeader>
-        <el-calendar v-model="value" :style="{ height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px  )`, overflow: 'auto' }">
+        <el-calendar
+            v-model="value"
+            :style="{
+                height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px  )`,
+                overflow: 'auto'
+            }"
+        >
             <template #date-cell="{ data }">
                 <div style="height: 100%; padding: 8px" :style="{ background: setBackground(data.day) }">
                     <p :class="data.isSelected ? 'is-selected' : ''">
@@ -27,7 +33,7 @@
                             :style="{ height: `calc(${prop.height} / 5 - 47px)`, overflow: 'auto' }"
                             v-for="item in list?.filter(item => item.time == data.day)"
                         >
-                            <div  @click="descentClick">电压暂降:{{ item.type || '' }}</div>
+                            <div @click="descentClick">电压暂降:{{ item.type || '' }}</div>
                             <div>电压中断:{{ item.type1 || '' }}</div>
                             <div>电压暂升:{{ item.type2 || '' }}</div>
                         </div>
@@ -36,7 +42,7 @@
             </template>
         </el-calendar>
         <!-- 暂态事件列表  -->
-        <TransientList ref="transientListRef"  />
+        <TransientList ref="transientListRef" />
     </div>
 </template>
 <script setup lang="ts">
@@ -50,11 +56,11 @@ import { useRoute } from 'vue-router'
 import { useTimeCacheStore } from '@/stores/timeCache'
 
 const prop = defineProps({
-    w: { type:  [String, Number]},
-    h: { type:  [String, Number]},
-    width: { type:  [String, Number]},
-    height: { type:  [String, Number]},
-    timeKey: { type:  [String, Number]},
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+    timeKey: { type: [String, Number] },
     timeValue: { type: Object }
 })
 
@@ -66,11 +72,10 @@ const timeCacheStore = useTimeCacheStore()
 const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
     headerHeight.value = height
 
-    // 如果有传入 datePicker 的值
-    if (datePickerValue) {
-        // 更新表格参数
-        tableStore.table.params.searchBeginTime = datePickerValue.timeValue?.[0]
-        tableStore.table.params.searchEndTime = datePickerValue.timeValue?.[1]
+    if (datePickerValue && datePickerValue.timeValue) {
+        // 更新时间参数
+        tableStore.table.params.searchBeginTime = datePickerValue.timeValue[0]
+        tableStore.table.params.searchEndTime = datePickerValue.timeValue[1]
     }
 }
 
@@ -142,30 +147,17 @@ const tableStore: any = new TableStore({
     showPage: false,
 
     column: [],
-     beforeSearchFun: () => {
-        // 尝试从缓存获取时间值
-        let beginTime, endTime
 
-        if (fullscreen.value) {
-            const cached = timeCacheStore.getCache(route.path)
-            if (cached && cached.timeValue) {
-                beginTime = cached.timeValue[0]
-                endTime = cached.timeValue[1]
-            }
-        }
-
-        // 如果缓存中没有则使用默认值
-        tableStore.table.params.searchBeginTime = beginTime || prop.timeValue?.[0] || getTimeOfTheMonth(prop.timeKey)[0]
-
-        tableStore.table.params.searchEndTime = endTime || prop.timeValue?.[1] || getTimeOfTheMonth(prop.timeKey)[1]
+    beforeSearchFun: () => {
+        tableStore.table.params.searchBeginTime = tableStore.table.params.searchBeginTime || prop.timeValue?.[0]
+        tableStore.table.params.searchEndTime = tableStore.table.params.searchEndTime || prop.timeValue?.[1]
     },
+
     loadCallback: () => {
         tableStore.table.data = []
     }
 })
 
-const tableRef = ref([])
-
 const setBackground = (value: string) => {
     let data = []
     data = list.value?.filter(item => item.time == value)
@@ -179,8 +171,6 @@ const setBackground = (value: string) => {
     return '#fff'
 }
 
-provide('tableRef', tableRef)
-
 provide('tableStore', tableStore)
 
 onMounted(() => {
@@ -193,12 +183,17 @@ watch(
     }
 )
 watch(
-    () => prop.timeValue, // 监听的目标（函数形式避免直接传递 props 导致的警告）
+    () => prop.timeValue,
     (newVal, oldVal) => {
-        tableStore.index()
+        // 当外部时间值变化时，更新表格的时间参数
+        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()
+        }
     },
     {
-        deep: true // 若 timeValue 是对象/数组，需开启深度监听
+        deep: true
     }
 )
 
@@ -206,8 +201,6 @@ watch(
 const descentClick = () => {
     transientListRef.value.open()
 }
-
-
 </script>
 <style lang="scss" scoped>
 :deep(.el-calendar) {