update 调整银川大屏和西安大屏

src/views/index.vue

@@ -10,15 +10,15 @@
         <div class="body-d">
             <div class="body-d-left">
                 <one-l :setting="setting" :refreshState="refreshState" @handleClick="handlePhoneDialog" />
-                <two-l :refreshState="refreshState" />
-                <three-l :refreshState="refreshState" />
+                <two-l :key="tabState" :refreshState="refreshState" />
+                <three-l :key="tabState" :setting="setting" :refreshState="refreshState" />
             </div>
             <div class="body-d-middle">
                 <china-map />
             </div>
             <div class="body-d-right">
                 <one-r :setting="setting" :refreshState="refreshState" />
-                <two-r :refreshState="refreshState" />
+                <two-r :key="tabState" :setting="setting" :refreshState="refreshState" />
                 <three-r :key="refreshState" />
             </div>
         </div>
@@ -29,7 +29,7 @@
     </div>
 </template>
 <script setup lang="ts">
-    import { onUnmounted, ref, watch, nextTick } from 'vue';
+    import { onUnmounted, ref, watch, nextTick, onMounted } from 'vue';
     import OneL from '/@/components/body-d-left/oneL.vue';
     import TwoL from '/@/components/body-d-left/twoL.vue';
     import ThreeL from '/@/components/body-d-left/threeL.vue';
@@ -44,6 +44,7 @@
     import { useRefresh } from '/@/hooks/autoRefresh';
     import { DEFAULT_TIME } from '/@/hooks/autoRefresh/pageRefreshTime.ts';
     import { DataType, getSettings } from '/@/utils/settings.ts';
+    import { ServerDetailType } from '/@/components/body-d-left/bodyLeftHooks.ts';
     import PhoneDialog from '/@/views/components/phoneDialog/phoneDialog.vue';
 
     const { refreshState } = useRefresh(DEFAULT_TIME);
@@ -65,10 +66,22 @@
         dayTimeT.value = timeRight;
     }
 
+    onMounted(() => {
+        init();
+        document.addEventListener('visibilitychange', checkTabState);
+    });
     onUnmounted(() => {
         clearInterval(interval.value);
+        document.removeEventListener('visibilitychange', checkTabState);
     });
-    init();
+
+    const tabState = ref('');
+
+    //判断窗口是否处于激活状态，切换浏览器tab会导致部门echarts显示不正常
+    function checkTabState() {
+        tabState.value = document.hidden ? 'inactive' : 'active';
+    }
+
     // 健康监测工具报警
     const { socketData, setSocketData, closeSocket } = useSocket(basicPath);
     const employeeDialogRef = ref();
@@ -113,11 +126,11 @@
         nextTick(() => {
             //呼入电话
             if (key == 'gross') {
-                phoneType.value = '2';
+                phoneType.value = ServerDetailType['gross'];
             }
             //受理电话
             if (key == 'alerdyreceive') {
-                phoneType.value = '1';
+                phoneType.value = ServerDetailType['alerdyreceive'];
             }
             phoneDialogTitle.value = name;
             phoneDialogRef.value.openDialog();

src/views/yinChuan/componetns/employeeHealth/employeeHealth.vue

@@ -19,6 +19,9 @@
     import { caching, useSession } from '/@/hooks/autoRefresh/caching.ts';
     import { getTeamHealth } from '/@/views/yinChuan/yinChuan.api.ts';
 
+    const props = defineProps({
+        setting: Object,
+    });
     const { setSession, getSession } = useSession();
     const { TEAM_HEALTH } = caching;
     const list = ref([
@@ -63,7 +66,7 @@
 
     async function viewDetail() {
         try {
-            const { code, result } = await getTeamHealth({});
+            const { code, result } = await getTeamHealth({ dataType: props.setting?.dataType });
             if (code != 200) {
                 return;
             }

src/views/yinChuan/yinChuan.api.ts

@@ -3,7 +3,7 @@ import { get } from '/@/api/request';
 export enum Api {
     phoneList = '/health-emergency/emergency/tblUserHelp/phoneList',
     getWorkDaily = '/health-emergency/emergency/ycLargeScreen/medicalCenter',
-    getTeamHealth = '/health-emergency/emergency/ycLargeScreen/userHealthCenter',
+    getTeamHealth = '/health-archives/archives/groupUserA/getGroupUserAInfo',
 }
 
 // 呼入电话、受理电话

src/views/yinChuan/yinChuan.vue

@@ -10,30 +10,30 @@
         <div class="body-d">
             <div class="yichuan-body-left">
                 <!--服务详情数据-->
-                <ServiceDetails :setting="setting" class="service-details" :refreshState="refreshState" @handleClick="handlePhoneDialog" />
+                <ServiceDetails :refreshState="refreshState" :setting="setting" class="service-details" @handleClick="handlePhoneDialog" />
                 <!--一线医疗点每日工作动态-->
-                <DailyWorkTrends class="daily-work-trends" :refreshState="refreshState" />
+                <DailyWorkTrends :refreshState="refreshState" class="daily-work-trends" />
             </div>
             <div class="body-d-middle">
                 <china-map />
             </div>
             <div class="body-d-right">
                 <!--健康终端报警-->
-                <TerminalAlarm :setting="setting" :refreshState="refreshState" @emit-view-detail="handleEmployeeDialog" />
+                <TerminalAlarm :refreshState="refreshState" :setting="setting" @emit-view-detail="handleEmployeeDialog" />
                 <!--员工队伍健康状况-->
-                <EmployeeHealth :refreshState="refreshState" />
+                <EmployeeHealth :refreshState="refreshState" :setting="setting" />
                 <!--体检数据-->
-                <PhysicalExaminationData :setting="setting" :refreshState="refreshState" />
+                <PhysicalExaminationData :key="tabState" :refreshState="refreshState" :setting="setting" />
             </div>
         </div>
         <div class="bottom-d"></div>
         <EmployeeDialog ref="employeeDialogRef" :record="socketData" />
         <EmergencyDialog ref="emergencyDialogRef" :record="emergencyData" />
-        <PhoneDialog ref="phoneDialogRef" :title="phoneDialogTitle" :useForm="true" :setting="setting" :phoneType="phoneType" />
+        <PhoneDialog ref="phoneDialogRef" :phoneType="phoneType" :setting="setting" :title="phoneDialogTitle" :useForm="true" />
         <TerminalAlarmDialog ref="terminalAlarmDialogRef" :setting="setting" />
     </div>
 </template>
-<script setup lang="ts">
+<script lang="ts" setup>
     import { onUnmounted, ref, watch, nextTick, onMounted } from 'vue';
     import ServiceDetails from '/@/components/body-d-left/oneL.vue';
     import DailyWorkTrends from '/@/views/yinChuan/componetns/dailyWorkTrends/dailyWorkTrends.vue';
@@ -52,6 +52,7 @@
     // import { useUserStore } from '/@/store/modules/user.ts';
     import { useRoute } from 'vue-router';
     import { DataType, getSettings } from '/@/utils/settings.ts';
+    import { ServerDetailType } from '/@/components/body-d-left/bodyLeftHooks.ts';
 
     const route = useRoute();
     const setting = getSettings(DataType.yinChuan);
@@ -64,7 +65,20 @@
         // userStore.setUserInfo(data.userInfo);
         // console.log(useUserStore);
         // }
+        init();
+        document.addEventListener('visibilitychange', checkTabState);
     });
+    onUnmounted(() => {
+        clearInterval(interval.value);
+        document.removeEventListener('visibilitychange', checkTabState);
+    });
+    const tabState = ref('');
+
+    //判断窗口是否处于激活状态，切换浏览器tab会导致部门echarts显示不正常
+    function checkTabState() {
+        tabState.value = document.hidden ? 'inactive' : 'active';
+    }
+
     const { refreshState } = useRefresh(DEFAULT_TIME);
     const dayTimeO = ref();
     const dayTimeT = ref();
@@ -83,10 +97,6 @@
         dayTimeT.value = timeRight;
     }
 
-    onUnmounted(() => {
-        clearInterval(interval.value);
-    });
-    init();
     // 健康监测工具报警
     const { socketData, setSocketData, closeSocket } = useSocket(basicPath);
     const employeeDialogRef = ref();
@@ -130,16 +140,16 @@
         const { name, key } = item;
         //呼入电话
         if (key == 'gross') {
-            phoneType.value = '2';
+            phoneType.value = ServerDetailType['gross'];
+            //受理电话
+            if (key == 'alerdyreceive') {
+                phoneType.value = ServerDetailType['alerdyreceive'];
+            }
+            nextTick(() => {
+                phoneDialogTitle.value = name;
+                phoneDialogRef.value.openDialog();
+            });
         }
-        //受理电话
-        if (key == 'alerdyreceive') {
-            phoneType.value = '1';
-        }
-        nextTick(() => {
-            phoneDialogTitle.value = name;
-            phoneDialogRef.value.openDialog();
-        });
     }
 
     const terminalAlarmDialogRef = ref();