Web/admin-govern
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
guanj
2025-12-04 15:25:22 +08:00
parent 43caddffa3
commit 2d0349c1b6
3 changed files with 69 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
src/components/cockpit/listOfMainMonitoringPoints/index.vue
View File

@@ -141,7 +141,6 @@ const echartList = ref()
const headerHeight = ref(57)
const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
headerHeight.value = height
if (datePickerValue && datePickerValue.timeValue) {
// 更新时间参数
tableStore.table.params.searchBeginTime = datePickerValue.timeValue[0]
@@ -265,6 +264,7 @@ const initCode = () => {
tableStore.table.params.power = powerList.value[0].id
tableStore.table.params.indicator = indicatorList.value[0].id
nextTick(() => {
// setTime()
tableStore.index()
})
})
@@ -278,18 +278,19 @@ const tableStore: any = new TableStore({
exportName: '主要监测点列表',
column: [],
beforeSearchFun: () => {
setTime()
// 设置时间参数
// 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]
// 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) {
@@ -392,41 +393,57 @@ 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)
}
}
// 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()
})
})
watch(
() => prop.timeKey,
val => {
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
)
console.log("🚀 ~ setTime ~ time:", 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]])
}
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()
}
// if (newVal && (!oldVal || newVal[0] !== oldVal[0] || newVal[1] !== oldVal[1])) {
tableStore.index()
// }
},
{
deep: true