From 0b48810f5c75b4dcf42f6fabc04ba0d671a651fc Mon Sep 17 00:00:00 2001
From: wx <645899409@qq.com>
Date: Wed, 5 Mar 2025 15:20:20 +0800
Subject: [PATCH] =?UTF-8?q?update=201.=E6=89=8B=E8=A1=A8=E7=9B=91=E6=B5=8B?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0=EF=BC=8C=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=BD=93=E5=A4=A9=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/body-d-right/oneR.vue          | 21 +++++++++-
 src/views/centralScreen/centralScreen.vue     |  2 +-
 src/views/centralScreen/centralScreenD.vue    |  2 +-
 .../centralScreen/centralScreenYinChuan.vue   | 42 ++++++++++++-------
 .../components/terminalAlarm.vue              | 27 ++++++++++--
 src/views/yinChuan/yinChuan.vue               |  2 +-
 6 files changed, 75 insertions(+), 21 deletions(-)

diff --git a/src/components/body-d-right/oneR.vue b/src/components/body-d-right/oneR.vue
index 107193a..814c593 100644
--- a/src/components/body-d-right/oneR.vue
+++ b/src/components/body-d-right/oneR.vue
@@ -91,6 +91,7 @@
     import { useTheme } from '/@/hooks/theme/useTheme.ts';
     import { message } from 'ant-design-vue';
     import { Row, Col } from 'ant-design-vue';
+    import dayjs from 'dayjs';
 
     const props = defineProps({
         setting: Object,
@@ -140,9 +141,27 @@
      * */
     const scrollList = ref([]);
 
+    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);
+    });
+
     async function getScrollList() {
+        console.log(dayjs());
         try {
-            const { code, result } = await getMonitorList({ pageSize: 10, pageNo: 1, orgCode: props.setting?.orgCode });
+            const { code, result } = await getMonitorList({
+                pageSize: 10,
+                pageNo: 1,
+                orgCode: props.setting?.orgCode,
+                startDate: dayjs().format('YYYY-MM-DD'),
+                endDate: dayjs().format('YYYY-MM-DD'),
+            });
             if (code == 200) {
                 setSession(RIGHT_KEY1, JSON.stringify(result.records));
                 scrollList.value = result.records;
diff --git a/src/views/centralScreen/centralScreen.vue b/src/views/centralScreen/centralScreen.vue
index e873bb4..8add11b 100644
--- a/src/views/centralScreen/centralScreen.vue
+++ b/src/views/centralScreen/centralScreen.vue
@@ -93,7 +93,7 @@
 
     const dayTimeO = ref();
     const dayTimeT = ref();
-    const interval = ref(1);
+    const interval = ref<any>(null);
     const title = ref(screenTitle ? screenTitle : '应急就医服务中心' + (simpleName || ''));
     const phone = ref(centerTel || '0951-6805199');
 
diff --git a/src/views/centralScreen/centralScreenD.vue b/src/views/centralScreen/centralScreenD.vue
index a7faf1d..8951fb1 100644
--- a/src/views/centralScreen/centralScreenD.vue
+++ b/src/views/centralScreen/centralScreenD.vue
@@ -93,7 +93,7 @@
 
     const dayTimeO = ref();
     const dayTimeT = ref();
-    const interval = ref(1);
+    const interval = ref<any>(null);
     const title = ref(screenTitle ? screenTitle : '应急就医服务中心' + (simpleName || ''));
     const phone = ref(centerTel || '0951-6805199');
 
diff --git a/src/views/centralScreen/centralScreenYinChuan.vue b/src/views/centralScreen/centralScreenYinChuan.vue
index 11fc194..80dd904 100644
--- a/src/views/centralScreen/centralScreenYinChuan.vue
+++ b/src/views/centralScreen/centralScreenYinChuan.vue
@@ -24,7 +24,6 @@
                     />
                     <!--一线医疗点每日工作动态-->
                     <DailyWorkTrends theme="dark" :refreshState="refreshState" class="daily-work-trends" />
-                    <EmergencyData @emergencyDataList="emergencyDataList" class="emergency-data" />
                 </div>
                 <div class="body-d-middle">
                     <CenterMap
@@ -40,9 +39,10 @@
                     <!--健康终端报警-->
                     <TerminalAlarm :refreshState="refreshState" :setting="setting" @emit-view-detail="handleEmployeeDialog" />
                     <!--员工队伍健康状况-->
-                    <EmployeeHealth theme="dark" :refreshState="refreshState" :setting="setting" />
-                    <!--体检数据-->
-                    <PhysicalExaminationData :key="tabState" :refreshState="refreshState" :setting="setting" />
+                    <!--                    <EmployeeHealth theme="dark" :refreshState="refreshState" :setting="setting" />-->
+                    <!--                    &lt;!&ndash;体检数据&ndash;&gt;-->
+                    <!--                    <PhysicalExaminationData :key="tabState" :refreshState="refreshState" :setting="setting" />-->
+                    <EmergencyData @emergencyDataList="emergencyDataList" class="emergency-data" />
                 </div>
             </div>
             <div class="bottom-d"></div>
@@ -95,7 +95,7 @@
 
     const dayTimeO = ref();
     const dayTimeT = ref();
-    const interval = ref(1);
+    const interval = ref<any>(null);
     const title = ref(screenTitle ? screenTitle : '应急就医服务中心' + (simpleName || ''));
     const phone = ref(centerTel || '0951-6805199');
 
@@ -405,23 +405,33 @@
         }
 
         .central-screen-body-left {
-            .service-details {
+            //.service-details {
+            //    height: calc(100% / 3);
+            //}
+            //
+            //.daily-work-trends {
+            //    height: calc(100% / 3);
+            //}
+            //
+            //.emergency-data {
+            //    height: calc(100% / 3);
+            //}
+            > :nth-child(1) {
+                width: 100%;
                 height: calc(100% / 3);
+                padding: 10px;
             }
-
-            .daily-work-trends {
-                height: calc(100% / 3);
-            }
-
-            .emergency-data {
-                height: calc(100% / 3);
+            > :nth-child(2) {
+                width: 100%;
+                height: calc(100% / 3 * 2);
+                padding: 10px;
             }
         }
 
         .body-d-right {
             > :nth-child(n) {
                 width: 100%;
-                height: calc(100% / 3);
+                height: calc(100% / 2);
                 padding: 10px;
             }
         }
@@ -437,4 +447,8 @@
         background: url('/@/assets/images/bottom-b.png') no-repeat;
         background-size: 100% 100%;
     }
+
+    :deep(.inner .scroll) {
+        height: 100% !important;
+    }
 </style>
diff --git a/src/views/centralScreen/components/terminalAlarm.vue b/src/views/centralScreen/components/terminalAlarm.vue
index 34a18b0..229420f 100644
--- a/src/views/centralScreen/components/terminalAlarm.vue
+++ b/src/views/centralScreen/components/terminalAlarm.vue
@@ -79,7 +79,7 @@
     </div>
 </template>
 <script setup lang="ts">
-    import { onMounted, ref } from 'vue';
+    import { onMounted, onUnmounted, ref, watch } from 'vue';
     import { useRouter } from 'vue-router';
     import PublicTitle from '/@/components/publicTitle.vue';
     import Dialog from '/@/components/dialog/Dialog.vue';
@@ -91,6 +91,7 @@
     import { useTheme } from '/@/hooks/theme/useTheme.ts';
     import { Col, message, Row } from 'ant-design-vue';
     import { useUserStore } from '/@/store/modules/user.ts';
+    import dayjs from 'dayjs';
 
     const props = defineProps({
         setting: Object,
@@ -134,13 +135,27 @@
         openInfor.value = false;
         classOption.value.step = 0.3;
     }
-
     /**
      * @desc 终端报警
      * */
     const scrollList = ref([]);
     const userStore = useUserStore();
 
+    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);
+    });
+
+    onUnmounted(() => {
+        clearInterval(interval.value);
+    });
+
     async function getScrollList() {
         try {
             let orgCodeList = userStore.getCenterInfo?.serviceScope;
@@ -150,7 +165,13 @@
             } else {
                 codeList = props.setting?.orgCode;
             }
-            const { code, result } = await getMonitorList({ pageSize: 10, pageNo: 1, orgCodeList: codeList });
+            const { code, result } = await getMonitorList({
+                pageSize: 10,
+                pageNo: 1,
+                orgCodeList: codeList,
+                startDate: dayjs().format('YYYY-MM-DD'),
+                endDate: dayjs().format('YYYY-MM-DD'),
+            });
             if (code == 200) {
                 setSession(RIGHT_KEY1_NEW, JSON.stringify(result.records));
                 scrollList.value = result.records;
diff --git a/src/views/yinChuan/yinChuan.vue b/src/views/yinChuan/yinChuan.vue
index b5555bf..deb41e4 100644
--- a/src/views/yinChuan/yinChuan.vue
+++ b/src/views/yinChuan/yinChuan.vue
@@ -106,7 +106,7 @@
     const { refreshState } = useRefresh(DEFAULT_TIME);
     const dayTimeO = ref();
     const dayTimeT = ref();
-    const interval = ref(1);
+    const interval = ref<any>(null);
 
     function init() {
         getTime();