稳态电能质量分析时间修改
This commit is contained in:
@@ -7,7 +7,6 @@
|
||||
@selectChange="selectChange"
|
||||
datePicker
|
||||
v-if="fullscreen"
|
||||
:timeCacheFlag="false"
|
||||
:timeKeyList="['3']"
|
||||
></TableHeader>
|
||||
<el-calendar
|
||||
@@ -98,22 +97,8 @@ const tableStore: any = new TableStore({
|
||||
method: 'POST',
|
||||
showPage: false,
|
||||
column: [],
|
||||
// beforeSearchFun: () => {
|
||||
// if (!fullscreen.value && prop.timeValue && Array.isArray(prop.timeValue)) {
|
||||
// tableStore.table.params.searchBeginTime = prop.timeValue[0]
|
||||
// tableStore.table.params.searchEndTime = prop.timeValue[1]
|
||||
// }
|
||||
// },
|
||||
beforeSearchFun: () => {
|
||||
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]
|
||||
setTime()
|
||||
},
|
||||
loadCallback: () => {
|
||||
value.value = tableStore.table.params.searchBeginTime
|
||||
@@ -158,43 +143,33 @@ provide('tableStore', tableStore)
|
||||
|
||||
onMounted(() => {
|
||||
nextTick(() => {
|
||||
// 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,
|
||||
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(3)
|
||||
}
|
||||
}
|
||||
tableStore.index()
|
||||
})
|
||||
})
|
||||
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
|
||||
)
|
||||
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.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
|
||||
|
||||
Reference in New Issue
Block a user