From 2fac32d002bf2ac857d278039403dce830afe288 Mon Sep 17 00:00:00 2001
From: wx <645899409@qq.com>
Date: Tue, 11 Mar 2025 18:30:30 +0800
Subject: [PATCH] =?UTF-8?q?update=201.=E4=BF=AE=E6=94=B9=E5=BA=86=E9=98=B3?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/body-d-right/oneR.vue          | 12 +++----
 src/views/centralScreen/centralScreenD.vue    |  7 ++++-
 .../components/terminalAlarm.vue              | 31 +++++++++++++------
 3 files changed, 34 insertions(+), 16 deletions(-)

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<any>(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 @@
                 </div>
                 <div class="body-d-right body-d-right-s">
                     <!--健康终端报警-->
-                    <TerminalAlarm :refreshState="refreshState" :setting="setting" @emit-view-detail="handleEmployeeDialog" />
+                    <TerminalAlarm :refreshState="refreshState" :setting="setting" :set-inter="true" @emit-view-detail="handleEmployeeDialog" />
                     <!--员工队伍健康状况-->
                     <EmployeeHealth theme="dark" :refreshState="refreshState" :setting="setting" />
                     <!--体检数据-->
@@ -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 @@
         </public-title>
         <div class="inner">
             <vue3-seamless-scroll :list="scrollList" class="scroll" :hover="true" :limitScrollNum="4" v-bind="classOption">
-                <div class="item right-top-item" :class="themeType" v-for="(item, i) in scrollList" :key="i">
+                <div
+                    class="item right-top-item"
+                    :class="themeType"
+                    v-for="(item, i) in scrollList"
+                    :key="i"
+                    :style="{ padding: props.setInter ? '10px 0' : '3% 0' }"
+                >
                     <span class="fixed-width" :title="item?.realName">{{ item?.realName }}</span>
                     <span class="fixed-width" :title="item?.eventType_dictText">{{ item?.eventType_dictText }}</span>
                     <div class="time-icon">
@@ -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<any>(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));