update

src/components/secondaryScreen/screen-right/oneR.vue

@@ -21,12 +21,10 @@
         type: String,
     });
     const sleepChart = ref<HTMLElement>();
-    // onMounted(() => {
-    //     init();
-    // });
     watch(
         props,
         () => {
+            console.log(111111111111);
             init();
         },
         { immediate: true }

src/components/secondaryScreen/screen-right/threeR.vue

@@ -23,18 +23,23 @@
     </div>
 </template>
 <script lang="ts" setup>
-    import { onMounted, onUnmounted, ref } from 'vue';
+    import { onMounted, onUnmounted, ref, watch } from 'vue';
     import PublicTitle from '/@/components/publicTitle.vue';
     import { getMonitorList } from '/@/components/secondaryScreen/commonApi.ts';
     import { monitorColumns } from '/@/components/secondaryScreen/screen-right/screenRightHooks.ts';
     import $bus from '/@/utils/bus.ts';
     import { earlyWarning } from '/@/utils/busConstant.ts';
+    import { useRefresh } from '/@/hooks/autoRefresh';
 
+    const props = defineProps({
+        orgCode: String,
+        type: String,
+    });
     const tableHeight = ref(0);
     const dataSource = ref([]);
     const pagination = ref({
         current: 1,
-        pageSize: 10,
+        pageSize: 2,
         total: 0,
         onChange: pageChange,
     });
@@ -45,23 +50,31 @@
         $bus.emit(earlyWarning, record);
     }
 
-    onMounted(() => {
-        init(1);
-        setHeight();
-        window.addEventListener('resize', setHeight);
-        interval();
-    });
+    watch(
+        props,
+        () => {
+            init(1);
+            tableHeight.value == 0 && setHeight();
+            window.addEventListener('resize', setHeight);
+            timer.value && clearInterval(timer.value);
+            // interval();
+        },
+        { immediate: true }
+    );
+
     onUnmounted(() => {
         window.removeEventListener('resize', setHeight);
     });
 
     function setHeight() {
+        let dom = document.querySelector('.inner-screen');
+        if (!dom) return;
         tableHeight.value = document.querySelector('.inner-screen').getBoundingClientRect().height - 60;
     }
 
     async function init(page) {
         const { pageSize, current } = pagination.value;
-        const { code, result } = await getMonitorList({ pageSize, pageNo: page });
+        const { code, result } = await getMonitorList({ pageSize, pageNo: page, orgCode: props.orgCode });
         if (code == 200) {
             dataSource.value = result.records;
             pagination.value.total = result.total;
@@ -77,12 +90,16 @@
     }
 
     function interval() {
-        timer.value = setInterval(() => {
-            let page = pagination.value.current < pages.value ? pagination.value.current + 1 : 1;
-            init(page);
-        }, 10000);
+        console.log(55555);
+        // timer.value = setInterval(() => {
+        let page = pagination.value.current < pages.value ? pagination.value.current + 1 : 1;
+        init(page);
+        // }, 3000);
     }
 
+    const { refreshState } = useRefresh(3000, () => {
+        interval();
+    });
     onUnmounted(() => {
         clearInterval(timer.value);
     });

src/components/secondaryScreen/screen-right/twoR.vue

@@ -9,7 +9,7 @@
     </div>
 </template>
 <script setup lang="ts">
-    import { ref, unref, onMounted } from 'vue';
+    import { ref, unref, onMounted, watch } from 'vue';
     import * as echarts from 'echarts';
     import PublicTitle from '/@/components/publicTitle.vue';
     import { useSpin } from '/@/components/body-d-left/bodyLeftHooks.ts';
@@ -21,13 +21,16 @@
         orgCode: String,
         type: String,
     });
+    watch(
+        props,
+        () => {
+            init();
+        },
+        { immediate: true }
+    );
     const { setSpin, spinning } = useSpin();
     const healthChart = ref<HTMLElement>();
-
     const color = ref(['#B750BE', '#6C63F0', '#3AACFF', '#ED589D', '#FB466C']);
-    onMounted(() => {
-        init();
-    });
     const { stepData, total, setStep } = useStep();
 
     async function init() {

src/components/secondaryScreen/secondMap/secondMap.vue

@@ -53,7 +53,8 @@
     const { isShow, className, setIsShow } = useMoveClass();
 
     function init() {
-        Map.initMap({ el: 'mapContainer' });
+        let mapContainer = document.querySelector('.mapContainer');
+        mapContainer && Map.initMap({ el: 'mapContainer' });
         getMapList();
     }
 

src/components/secondaryScreen/secondMap/secondMapHooks.ts

@@ -12,6 +12,10 @@ export function useDepart() {
         getOptionData();
     });
 
+    function setOrgCode(val) {
+        orgCode.value = val;
+    }
+
     function setOption(data) {
         option.value = data;
         orgCode.value = data[0]?.orgCode;
@@ -26,6 +30,7 @@ export function useDepart() {
 
     return {
         orgCode,
+        setOrgCode,
         option,
         setOption,
         fieldNames,