diff --git a/src/components/body-d-right/oneR.vue b/src/components/body-d-right/oneR.vue index 814c593..b2f8d13 100644 --- a/src/components/body-d-right/oneR.vue +++ b/src/components/body-d-right/oneR.vue @@ -144,12 +144,12 @@ const interval = ref(null); const nowDate = ref(dayjs()); onMounted(() => { - interval.value = setInterval(() => { - if (dayjs(nowDate.value).diff(dayjs(), 'date') < 0) { - nowDate.value = dayjs(); - getScrollList(); - } - }, 1000); + // interval.value = setInterval(() => { + // if (dayjs(nowDate.value).diff(dayjs(), 'date') < 0) { + // nowDate.value = dayjs(); + // getScrollList(); + // } + // }, 1000); }); async function getScrollList() { diff --git a/src/views/centralScreen/centralScreenD.vue b/src/views/centralScreen/centralScreenD.vue index 8951fb1..a04e041 100644 --- a/src/views/centralScreen/centralScreenD.vue +++ b/src/views/centralScreen/centralScreenD.vue @@ -37,7 +37,7 @@
- + @@ -423,6 +423,11 @@ } } + .central-screen-body-left, + .body-d-right { + padding: 0 1.6rem; + } + .body-d-middle { display: flex; flex-direction: column; diff --git a/src/views/centralScreen/components/terminalAlarm.vue b/src/views/centralScreen/components/terminalAlarm.vue index 229420f..494e12e 100644 --- a/src/views/centralScreen/components/terminalAlarm.vue +++ b/src/views/centralScreen/components/terminalAlarm.vue @@ -7,7 +7,13 @@
-
+
{{ item?.realName }} {{ item?.eventType_dictText }}
@@ -95,6 +101,10 @@ const props = defineProps({ setting: Object, + setInter: { + type: Boolean, + default: () => false, + }, }); const { themeType } = useTheme(); const emit = defineEmits(['emit-view-detail']); @@ -144,16 +154,15 @@ const interval = ref(null); const nowDate = ref(dayjs()); onMounted(() => { - interval.value = setInterval(() => { - if (dayjs(nowDate.value).diff(dayjs(), 'date') < 0) { - nowDate.value = dayjs(); + if (props.setInter) { + interval.value = setInterval(() => { getScrollList(); - } - }, 1000); + }, 30000); + } }); onUnmounted(() => { - clearInterval(interval.value); + interval.value && clearInterval(interval.value); }); async function getScrollList() { @@ -165,12 +174,16 @@ } else { codeList = props.setting?.orgCode; } + // 如果为庆阳应急中心,需要拼上当天的日期 + let p = { + startDate: dayjs().format('YYYY-MM-DD'), + endDate: dayjs().format('YYYY-MM-DD'), + }; const { code, result } = await getMonitorList({ pageSize: 10, pageNo: 1, orgCodeList: codeList, - startDate: dayjs().format('YYYY-MM-DD'), - endDate: dayjs().format('YYYY-MM-DD'), + ...(props.setInter ? p : {}), }); if (code == 200) { setSession(RIGHT_KEY1_NEW, JSON.stringify(result.records));