Commit d0036932 authored by hubaoshan's avatar hubaoshan

信息提示bug

parent 6b2598f7
<script setup> <script setup>
import {getCurrentInstance, onMounted, reactive, ref, watch} from 'vue' import {getCurrentInstance, nextTick, onMounted, reactive, ref, watch} from 'vue'
import ExtinguisherNewDataPage from './ExtinguisherNewDataPage.vue' // 导入组件 import ExtinguisherNewDataPage from './ExtinguisherNewDataPage.vue' // 导入组件
import ExtinguisherHistoryPage from './ExtinguisherHistoryPage.vue' // 导入组件 import ExtinguisherHistoryPage from './ExtinguisherHistoryPage.vue' // 导入组件
import ExtinguisherAlarmPage from './ExtinguisherAlarmPage.vue' // 导入组件 import ExtinguisherAlarmPage from './ExtinguisherAlarmPage.vue' // 导入组件
...@@ -223,29 +223,47 @@ const resetSearch = () => { ...@@ -223,29 +223,47 @@ const resetSearch = () => {
console.log('queryParams:',queryParams) console.log('queryParams:',queryParams)
// getData() // getData()
} }
let isErrorDisplayed = false;
watch( watch(
() => queryParams.endTime, () => queryParams.endTime,
() => { async () => {
if (queryParams.endTime && queryParams.beginTime && queryParams.endTime < queryParams.beginTime) { const beginTime = new Date(queryParams.beginTime).getTime();
const endTime = new Date(queryParams.endTime).getTime();
if (queryParams.beginTime && endTime < beginTime && !isErrorDisplayed) {
isErrorDisplayed = true; // 设置标志
ElMessage.error({ ElMessage.error({
message: '结束时间不能早于开始时间!' message: '结束时间不能早于开始时间!'
}) });
queryParams.beginTime = '';
queryParams.endTime = ''; queryParams.endTime = '';
await nextTick();
queryParams.endTime = '';
isErrorDisplayed = false; // 重置标志
} }
} }
) );
watch( watch(
() => queryParams.beginTime, () => queryParams.beginTime,
() => { async () => {
if (queryParams.endTime && queryParams.beginTime && queryParams.endTime < queryParams.beginTime) { const beginTime = new Date(queryParams.beginTime).getTime();
const endTime = new Date(queryParams.endTime).getTime();
if (queryParams.endTime && endTime < beginTime && !isErrorDisplayed) {
isErrorDisplayed = true; // 设置标志
ElMessage.error({ ElMessage.error({
message: '结束时间不能早于开始时间!' message: '结束时间不能早于开始时间!'
}) });
queryParams.beginTime = '';
queryParams.endTime = '';
await nextTick();
queryParams.beginTime = ''; queryParams.beginTime = '';
isErrorDisplayed = false; // 重置标志
} }
} }
) );
const loading = ref(true); const loading = ref(true);
getEnterprise(); getEnterprise();
......
<script setup> <script setup>
import {getCurrentInstance, onMounted, reactive, ref, watch} from 'vue' import {getCurrentInstance, nextTick, onMounted, reactive, ref, watch} from 'vue'
import MoveMonitorNewDataPage from './MoveMonitorNewDataPage.vue' // 导入组件 import MoveMonitorNewDataPage from './MoveMonitorNewDataPage.vue' // 导入组件
import MoveMonitorHistoryPage from './MoveMonitorHistoryPage.vue' // 导入组件 import MoveMonitorHistoryPage from './MoveMonitorHistoryPage.vue' // 导入组件
import MoveMonitorAlarmPage from './MoveMonitorAlarmPage.vue' // 导入组件 import MoveMonitorAlarmPage from './MoveMonitorAlarmPage.vue' // 导入组件
...@@ -342,29 +342,47 @@ watch( ...@@ -342,29 +342,47 @@ watch(
}, },
{ immediate: true } // 只在路径变化时触发 { immediate: true } // 只在路径变化时触发
) )
let isErrorDisplayed = false;
watch( watch(
() => queryParams.endTime, () => queryParams.endTime,
() => { async () => {
if (queryParams.endTime && queryParams.beginTime && queryParams.endTime < queryParams.beginTime) { const beginTime = new Date(queryParams.beginTime).getTime();
const endTime = new Date(queryParams.endTime).getTime();
if (queryParams.beginTime && endTime < beginTime && !isErrorDisplayed) {
isErrorDisplayed = true; // 设置标志
ElMessage.error({ ElMessage.error({
message: '结束时间不能早于开始时间!' message: '结束时间不能早于开始时间!'
}) });
queryParams.beginTime = '';
queryParams.endTime = ''; queryParams.endTime = '';
await nextTick();
queryParams.endTime = '';
isErrorDisplayed = false; // 重置标志
} }
} }
) );
watch( watch(
() => queryParams.beginTime, () => queryParams.beginTime,
() => { async () => {
if (queryParams.endTime && queryParams.beginTime && queryParams.endTime < queryParams.beginTime) { const beginTime = new Date(queryParams.beginTime).getTime();
const endTime = new Date(queryParams.endTime).getTime();
if (queryParams.endTime && endTime < beginTime && !isErrorDisplayed) {
isErrorDisplayed = true; // 设置标志
ElMessage.error({ ElMessage.error({
message: '结束时间不能早于开始时间!' message: '结束时间不能早于开始时间!'
}) });
queryParams.beginTime = '';
queryParams.endTime = '';
await nextTick();
queryParams.beginTime = ''; queryParams.beginTime = '';
isErrorDisplayed = false; // 重置标志
} }
} }
) );
</script> </script>
<template> <template>
<div class="app-content"> <div class="app-content">
......
<script setup> <script setup>
import {getCurrentInstance, onMounted, reactive, ref, watch} from 'vue' import {getCurrentInstance, nextTick, onMounted, reactive, ref, watch} from 'vue'
import PipelineTempNewDataPage from './PipelineTempNewDataPage.vue' // 导入组件 import PipelineTempNewDataPage from './PipelineTempNewDataPage.vue' // 导入组件
import PipelineTempHistoryPage from './PipelineTempHistoryPage.vue' // 导入组件 import PipelineTempHistoryPage from './PipelineTempHistoryPage.vue' // 导入组件
import PipelineTempAlarmPage from './PipelineTempAlarmPage.vue' // 导入组件 import PipelineTempAlarmPage from './PipelineTempAlarmPage.vue' // 导入组件
...@@ -367,29 +367,47 @@ watch( ...@@ -367,29 +367,47 @@ watch(
}, },
{ immediate: true } // 只在路径变化时触发 { immediate: true } // 只在路径变化时触发
) )
let isErrorDisplayed = false;
watch( watch(
() => queryParams.endTime, () => queryParams.endTime,
() => { async () => {
if (queryParams.endTime && queryParams.beginTime && queryParams.endTime < queryParams.beginTime) { const beginTime = new Date(queryParams.beginTime).getTime();
const endTime = new Date(queryParams.endTime).getTime();
if (queryParams.beginTime && endTime < beginTime && !isErrorDisplayed) {
isErrorDisplayed = true; // 设置标志
ElMessage.error({ ElMessage.error({
message: '结束时间不能早于开始时间!' message: '结束时间不能早于开始时间!'
}) });
queryParams.beginTime = '';
queryParams.endTime = ''; queryParams.endTime = '';
await nextTick();
queryParams.endTime = '';
isErrorDisplayed = false; // 重置标志
} }
} }
) );
watch( watch(
() => queryParams.beginTime, () => queryParams.beginTime,
() => { async () => {
if (queryParams.endTime && queryParams.beginTime && queryParams.endTime < queryParams.beginTime) { const beginTime = new Date(queryParams.beginTime).getTime();
const endTime = new Date(queryParams.endTime).getTime();
if (queryParams.endTime && endTime < beginTime && !isErrorDisplayed) {
isErrorDisplayed = true; // 设置标志
ElMessage.error({ ElMessage.error({
message: '结束时间不能早于开始时间!' message: '结束时间不能早于开始时间!'
}) });
queryParams.beginTime = '';
queryParams.endTime = '';
await nextTick();
queryParams.beginTime = ''; queryParams.beginTime = '';
isErrorDisplayed = false; // 重置标志
} }
} }
) );
</script> </script>
<template> <template>
<div class="app-content"> <div class="app-content">
......
<script setup> <script setup>
import {getCurrentInstance, onMounted, reactive, ref, watch} from 'vue' import {getCurrentInstance, nextTick, onMounted, reactive, ref, watch} from 'vue'
import RecyclePumpNewDataPage from './RecyclePumpNewDataPage.vue' // 导入组件 import RecyclePumpNewDataPage from './RecyclePumpNewDataPage.vue' // 导入组件
import RecyclePumpHistoryPage from './RecyclePumpHistoryPage.vue' // 导入组件 import RecyclePumpHistoryPage from './RecyclePumpHistoryPage.vue' // 导入组件
import RecyclePumpAlarmPage from './RecyclePumpAlarmPage.vue' // 导入组件 import RecyclePumpAlarmPage from './RecyclePumpAlarmPage.vue' // 导入组件
...@@ -336,29 +336,47 @@ function getSupplys(){ ...@@ -336,29 +336,47 @@ function getSupplys(){
// stationId.value.push(options[0].children[0].children[0].value); // stationId.value.push(options[0].children[0].children[0].value);
} }
getSupplys(); getSupplys();
let isErrorDisplayed = false;
watch( watch(
() => queryParams.endTime, () => queryParams.endTime,
() => { async () => {
if (queryParams.endTime && queryParams.beginTime && queryParams.endTime < queryParams.beginTime) { const beginTime = new Date(queryParams.beginTime).getTime();
const endTime = new Date(queryParams.endTime).getTime();
if (queryParams.beginTime && endTime < beginTime && !isErrorDisplayed) {
isErrorDisplayed = true; // 设置标志
ElMessage.error({ ElMessage.error({
message: '结束时间不能早于开始时间!' message: '结束时间不能早于开始时间!'
}) });
queryParams.beginTime = '';
queryParams.endTime = ''; queryParams.endTime = '';
await nextTick();
queryParams.endTime = '';
isErrorDisplayed = false; // 重置标志
} }
} }
) );
watch( watch(
() => queryParams.beginTime, () => queryParams.beginTime,
() => { async () => {
if (queryParams.endTime && queryParams.beginTime && queryParams.endTime < queryParams.beginTime) { const beginTime = new Date(queryParams.beginTime).getTime();
const endTime = new Date(queryParams.endTime).getTime();
if (queryParams.endTime && endTime < beginTime && !isErrorDisplayed) {
isErrorDisplayed = true; // 设置标志
ElMessage.error({ ElMessage.error({
message: '结束时间不能早于开始时间!' message: '结束时间不能早于开始时间!'
}) });
queryParams.beginTime = '';
queryParams.endTime = '';
await nextTick();
queryParams.beginTime = ''; queryParams.beginTime = '';
isErrorDisplayed = false; // 重置标志
} }
} }
) );
</script> </script>
<template> <template>
<div class="app-content"> <div class="app-content">
......
<script setup> <script setup>
import {getCurrentInstance, onMounted, reactive, ref, watch} from 'vue' import {getCurrentInstance, nextTick, onMounted, reactive, ref, watch} from 'vue'
import TransTempNewDataPage from './TransTempNewDataPage.vue' // 导入组件 import TransTempNewDataPage from './TransTempNewDataPage.vue' // 导入组件
import TransTempHistoryPage from './TransTempHistoryPage.vue' // 导入组件 import TransTempHistoryPage from './TransTempHistoryPage.vue' // 导入组件
import TransTempAlarmPage from './TransTempAlarmPage.vue' // 导入组件 import TransTempAlarmPage from './TransTempAlarmPage.vue' // 导入组件
...@@ -349,29 +349,47 @@ watch( ...@@ -349,29 +349,47 @@ watch(
}, },
{immediate: true} // 只在路径变化时触发 {immediate: true} // 只在路径变化时触发
) )
let isErrorDisplayed = false;
watch( watch(
() => queryParams.endTime, () => queryParams.endTime,
() => { async () => {
if (queryParams.endTime && queryParams.beginTime && queryParams.endTime < queryParams.beginTime) { const beginTime = new Date(queryParams.beginTime).getTime();
const endTime = new Date(queryParams.endTime).getTime();
if (queryParams.beginTime && endTime < beginTime && !isErrorDisplayed) {
isErrorDisplayed = true; // 设置标志
ElMessage.error({ ElMessage.error({
message: '结束时间不能早于开始时间!' message: '结束时间不能早于开始时间!'
}) });
queryParams.beginTime = '';
queryParams.endTime = ''; queryParams.endTime = '';
await nextTick();
queryParams.endTime = '';
isErrorDisplayed = false; // 重置标志
} }
} }
) );
watch( watch(
() => queryParams.beginTime, () => queryParams.beginTime,
() => { async () => {
if (queryParams.endTime && queryParams.beginTime && queryParams.endTime < queryParams.beginTime) { const beginTime = new Date(queryParams.beginTime).getTime();
const endTime = new Date(queryParams.endTime).getTime();
if (queryParams.endTime && endTime < beginTime && !isErrorDisplayed) {
isErrorDisplayed = true; // 设置标志
ElMessage.error({ ElMessage.error({
message: '结束时间不能早于开始时间!' message: '结束时间不能早于开始时间!'
}) });
queryParams.beginTime = '';
queryParams.endTime = '';
await nextTick();
queryParams.beginTime = ''; queryParams.beginTime = '';
isErrorDisplayed = false; // 重置标志
} }
} }
) );
</script> </script>
<template> <template>
<div class="app-content"> <div class="app-content">
......
...@@ -182,7 +182,7 @@ watch( ...@@ -182,7 +182,7 @@ watch(
if (queryParams.value.beginTime && endTime < beginTime && !isErrorDisplayed) { if (queryParams.value.beginTime && endTime < beginTime && !isErrorDisplayed) {
isErrorDisplayed = true; // 设置标志 isErrorDisplayed = true; // 设置标志
ElMessage.error({ ElMessage.error({
message: '结束时间不能早于开始时间1!' message: '结束时间不能早于开始时间!'
}); });
queryParams.value.beginTime = ''; queryParams.value.beginTime = '';
queryParams.value.endTime = ''; queryParams.value.endTime = '';
...@@ -202,7 +202,7 @@ watch( ...@@ -202,7 +202,7 @@ watch(
if (queryParams.value.endTime && endTime < beginTime && !isErrorDisplayed) { if (queryParams.value.endTime && endTime < beginTime && !isErrorDisplayed) {
isErrorDisplayed = true; // 设置标志 isErrorDisplayed = true; // 设置标志
ElMessage.error({ ElMessage.error({
message: '结束时间不能早于开始时间2!' message: '结束时间不能早于开始时间!'
}); });
queryParams.value.beginTime = ''; queryParams.value.beginTime = '';
queryParams.value.endTime = ''; queryParams.value.endTime = '';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment