From 91abcfd78db9eb47eddc1e78ce36137e16a66009 Mon Sep 17 00:00:00 2001
From: xf <xiangfu0507@163.com>
Date: Wed, 9 Jul 2025 15:10:30 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/request.ts                            |  16 ++
 src/assets/indexSun/nomal.png                 | Bin 0 -> 2321 bytes
 src/assets/mapUtils/map.ts                    |   3 +
 src/components/body-d-left/left.api.ts        |   3 +
 src/components/item-d/pieCharts.ts            |  21 +--
 src/components/secondaryScreen/commonApi.ts   |   2 +
 .../secondaryScreen/screen-right/threeR.vue   |  16 +-
 .../components/basicTable/BasicTable.vue      |   1 +
 .../secondaryScreen/secondMap/secondMap.vue   |  15 +-
 src/router/index.ts                           |   1 -
 src/utils/settings.ts                         |  59 ++++++-
 src/views/components/earlyWarningDialog.vue   |   6 +-
 src/views/index.api.ts                        |   9 +-
 src/views/indexSon.vue                        |  45 ++++--
 src/views/indexSun.vue                        |  37 ++++-
 src/views/indexSun/centerMap.vue              |  26 +--
 src/views/indexSun/indexModal.vue             |  54 +++++--
 src/views/indexSun/indexSun.api.ts            |   2 +
 src/views/indexSun/indexSun.ts                | 148 ++++++++++++++++--
 src/views/indexSun/threeNewL.vue              |  16 +-
 src/views/indexSun/threeR.vue                 |  14 +-
 src/views/indexSun/twoR.vue                   |   2 +-
 22 files changed, 418 insertions(+), 78 deletions(-)
 create mode 100644 src/assets/indexSun/nomal.png

diff --git a/src/api/request.ts b/src/api/request.ts
index a074cde..96f1a24 100644
--- a/src/api/request.ts
+++ b/src/api/request.ts
@@ -64,6 +64,22 @@ export const get = (url, params = {}) => {
             });
     });
 };
+export const Dictget = (url, params = {}) => {
+    return new Promise((resolve, reject) => {
+        service
+            .get(url, { params: params })
+            .then((res) => {
+                if (res.status === 200) {
+                    resolve(res.data);
+                } else {
+                    reject(res.data);
+                }
+            })
+            .catch((err) => {
+                reject(err.data);
+            });
+    });
+};
 export const post = (url: string, params: any) =>
     new Promise((resolve, reject) => {
         service
diff --git a/src/assets/indexSun/nomal.png b/src/assets/indexSun/nomal.png
new file mode 100644
index 0000000000000000000000000000000000000000..892c623034dc8aef75980c310bfad231e324db87
GIT binary patch
literal 2321
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

literal 0
HcmV?d00001

diff --git a/src/assets/mapUtils/map.ts b/src/assets/mapUtils/map.ts
index c015698..78fcb51 100644
--- a/src/assets/mapUtils/map.ts
+++ b/src/assets/mapUtils/map.ts
@@ -152,6 +152,9 @@ export const Map = {
             if (latitude) {
                 lat = latitude;
             }
+            if (lng) {
+                lon = lng;
+            }
             if (!longitude || !latitude || !type) {
                 continue;
             }
diff --git a/src/components/body-d-left/left.api.ts b/src/components/body-d-left/left.api.ts
index 5cc1fb3..7707b0c 100644
--- a/src/components/body-d-left/left.api.ts
+++ b/src/components/body-d-left/left.api.ts
@@ -7,6 +7,8 @@ export enum Api {
     complaint = '/health-emergency/emergency/tblHelpCenter/sicknessTypeStatistic',
     orderDetail = '/health-emergency/emergency/order/list',
     listCustom = '/health-watch/watch/watchMonitorData/listCustom',
+
+    listCustomNew = 'health-watch/watch/watchMonitorData/largeScreen/listCustom',
 }
 
 //获取全部部门
@@ -21,3 +23,4 @@ export const getDetail = (params: any) => get(Api.getDetail, params);
 export const getOrderDetail = (params: any) => get(Api.orderDetail, params);
 //副屏预警查看详情
 export const getEarlyWarningDetail = (params: any) => get(Api.listCustom, params);
+export const getEarlyWarningDetailNew = (params: any) => get(Api.listCustomNew, params);
diff --git a/src/components/item-d/pieCharts.ts b/src/components/item-d/pieCharts.ts
index f1ff8c2..4c54418 100644
--- a/src/components/item-d/pieCharts.ts
+++ b/src/components/item-d/pieCharts.ts
@@ -1,8 +1,8 @@
 // 步数
-import {visibleChartLabel} from "/@/utils/utils.ts";
+import { visibleChartLabel } from '/@/utils/utils.ts';
 
 export function screenPie(chartData) {
-    const data = visibleChartLabel(chartData)
+    const data = visibleChartLabel(chartData);
     return {
         color: ['#B750BE', '#6C63F0', '#3AACFF', '#ED589D', '#FB466C'],
         tooltip: {
@@ -24,7 +24,7 @@ export function screenPie(chartData) {
                 color: '#ffffff',
                 fontSize: 16,
             },
-            selectedMode: false
+            selectedMode: false,
         },
         series: [
             {
@@ -35,13 +35,14 @@ export function screenPie(chartData) {
                 label: {
                     show: true,
                     position: 'outside',
+                    formatter: '{c}人次',
                     color: '#ffffff',
                     fontSize: 14,
                 },
                 labelLine: {
                     show: true,
                     length: 6,
-                    length2: 10,
+                    length2: 30,
                     minTurnAngle: 120,
                 },
                 data: data,
@@ -52,7 +53,7 @@ export function screenPie(chartData) {
 
 //左侧圆
 export function circleRing(chartData, total, color) {
-    const data = visibleChartLabel(chartData)
+    const data = visibleChartLabel(chartData);
     return {
         color: color,
         tooltip: {
@@ -74,7 +75,7 @@ export function circleRing(chartData, total, color) {
                 color: '#ffffff',
                 fontSize: 16,
             },
-            selectedMode: false
+            selectedMode: false,
         },
         series: [
             {
@@ -95,18 +96,18 @@ export function circleRing(chartData, total, color) {
                 label: {
                     show: true,
                     position: 'outside',
-                    formatter: '{d}%',
+                    formatter: '{d}%\n{c}人次',
                     color: '#ffffff',
                     fontSize: 14,
                 },
                 labelLine: {
                     show: true,
-                    length: 4,
-                    length2: 12,
+                    length: 6,
+                    length2: 30,
                     minTurnAngle: 120,
                 },
                 data: data,
             },
         ],
     };
-}
\ No newline at end of file
+}
diff --git a/src/components/secondaryScreen/commonApi.ts b/src/components/secondaryScreen/commonApi.ts
index 293512a..14b01cd 100644
--- a/src/components/secondaryScreen/commonApi.ts
+++ b/src/components/secondaryScreen/commonApi.ts
@@ -7,6 +7,7 @@ export enum Api {
     sleepApi = '/health-watch/watch/watchData/getSleep',
     stepApi = '/health-watch/watch/watchData/getSdc',
     listCustom = 'health-watch/watch/watchMonitorData/listCustom',
+    listCustomNew = 'health-watch/watch/watchMonitorData/largeScreen/listCustom',
 }
 
 // 单位-
@@ -24,3 +25,4 @@ export const getStep = (params: any) => post(Api.stepApi, params);
 
 //副屏-预警
 export const getCustom = (params: any) => get(Api.listCustom, params);
+export const getCustomNew = (params: any) => get(Api.listCustomNew, params);
diff --git a/src/components/secondaryScreen/screen-right/threeR.vue b/src/components/secondaryScreen/screen-right/threeR.vue
index 7a60c6f..cec5895 100644
--- a/src/components/secondaryScreen/screen-right/threeR.vue
+++ b/src/components/secondaryScreen/screen-right/threeR.vue
@@ -26,14 +26,14 @@
             </a-table>
         </div>
         <!--预警查看详情-->
-        <EarlyWarningDialog ref="earlyWarningRef" />
+        <EarlyWarningDialog ref="earlyWarningRef" :org-codes="orgCode" />
     </div>
 </template>
 <script lang="ts" setup>
     import { onUnmounted, ref, watch } from 'vue';
     import PublicTitle from '/@/components/publicTitle.vue';
     import EarlyWarningDialog from '/@/views/components/earlyWarningDialog.vue';
-    import { getCustom, getMonitorList } from '/@/components/secondaryScreen/commonApi.ts';
+    import { getCustom, getCustomNew, 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';
@@ -64,7 +64,7 @@
     function handlePoliceDetail(record) {
         $bus.emit(earlyWarning, record);
     }
-
+    const threeCodes = ref();
     watch(
         props,
         () => {
@@ -75,7 +75,12 @@
         },
         { immediate: true, deep: true }
     );
-
+    watch(
+        () => props.orgCode,
+        () => {
+            threeCodes.value = props.orgCode;
+        }
+    );
     onUnmounted(() => {
         window.removeEventListener('resize', setHeight);
     });
@@ -89,7 +94,8 @@
     async function init(page) {
         try {
             const { pageSize } = pagination.value;
-            const { code, result } = await getCustom({ pageSize, pageNo: page, orgCode: props.orgCode });
+            // const { code, result } = await getCustom({ pageSize, pageNo: page, orgCode: props.orgCode });
+            const { code, result } = await getCustomNew({ pageSize, pageNo: page, orgCodes: props.orgCode });
             if (code == 200) {
                 setSession(PAGE2_RIGHT3, JSON.stringify({ page, result }));
                 setValue(result, page);
diff --git a/src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue b/src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue
index 21d73f8..d05cbf5 100644
--- a/src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue
+++ b/src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue
@@ -31,6 +31,7 @@
             type: Function,
         },
         apiParams: {
+            type: Object,
             default: () => {},
         },
         afterFetch: {
diff --git a/src/components/secondaryScreen/secondMap/secondMap.vue b/src/components/secondaryScreen/secondMap/secondMap.vue
index eeb363c..64b5dd7 100644
--- a/src/components/secondaryScreen/secondMap/secondMap.vue
+++ b/src/components/secondaryScreen/secondMap/secondMap.vue
@@ -12,12 +12,21 @@
             <div v-show="isShow" :class="className" class="footer-data" style="--moveUp: 20px; --moveDown: -80px">
                 <div
                     v-for="item in footerList"
-                    :style="{ cursor: item.key == 'allotDeviceNum' ? 'pointer' : 'default' }"
+                    :style="{
+                        cursor: item.key == 'allotDeviceNum' ? 'pointer' : 'default',
+                    }"
                     class="col-item nowrap"
                     @click="openWatchList(item)"
                 >
                     <div class="col-text">{{ item?.name }}</div>
-                    <div :title="item.value" class="col-value nowrap">{{ item?.value }}</div>
+                    <div
+                        :title="item.value"
+                        class="col-value nowrap"
+                        :style="{
+                            color: item.key == 'allotDeviceNum' ? '#0098fa' : '#fff',
+                        }"
+                        >{{ item?.value }}</div
+                    >
                 </div>
             </div>
             <div
@@ -103,7 +112,7 @@
                     async (val) => {
                         let params = {
                             orgCodeLeaf: val.orgCode,
-                            orgCode: null,
+                            orgCode: props.orgCode,
                         };
                         const { code, result } = await footerApi(params);
                         if (code == 200) {
diff --git a/src/router/index.ts b/src/router/index.ts
index 4cbe54c..8774cea 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -50,7 +50,6 @@ const router: Router = createRouter({
 });
 
 router.beforeEach((to, from, next) => {
-    debugger;
     if (to.path !== '/login') {
         setCurrentPath(to.path);
     }
diff --git a/src/utils/settings.ts b/src/utils/settings.ts
index 737d2d0..e8857c6 100644
--- a/src/utils/settings.ts
+++ b/src/utils/settings.ts
@@ -63,7 +63,7 @@ export const initatorTypee = [
 export const normalTypeList = [
     {
         label: '全部',
-        value: '2',
+        value: '',
     },
     {
         label: '正常',
@@ -75,6 +75,63 @@ export const normalTypeList = [
     },
 ];
 
+export const checkTypeList = [
+    {
+        label: '全部',
+        value: '',
+    },
+    {
+        label: 'BMI',
+        value: '11',
+    },
+    {
+        label: '收缩压',
+        value: '21',
+    },
+    {
+        label: '舒张压',
+        value: '22',
+    },
+    {
+        label: '血糖',
+        value: '31',
+    },
+    {
+        label: '低密度脂蛋白',
+        value: '41',
+    },
+    {
+        label: '总胆固醇',
+        value: '42',
+    },
+    {
+        label: '甘油三酯',
+        value: '43',
+    },
+    {
+        label: '尿酸',
+        value: '51',
+    },
+    {
+        label: '同型半胱氨酸',
+        value: '61',
+    },
+];
+
+export const isTrueOfFalse = [
+    {
+        label: '全部',
+        value: '',
+    },
+    {
+        label: '是',
+        value: '1',
+    },
+    {
+        label: '否',
+        value: '0',
+    },
+];
 export interface Settings {
     dataType: string;
     orgCode?: string;
diff --git a/src/views/components/earlyWarningDialog.vue b/src/views/components/earlyWarningDialog.vue
index 2308910..c37c6a7 100644
--- a/src/views/components/earlyWarningDialog.vue
+++ b/src/views/components/earlyWarningDialog.vue
@@ -8,7 +8,8 @@
                 :class="[themeType]"
                 :key="visible"
                 :columns="columns"
-                :api="getEarlyWarningDetail"
+                :api-params="{ orgCodes: orgCodes }"
+                :api="getEarlyWarningDetailNew"
             ></BasicTable>
         </template>
     </Dialog>
@@ -16,7 +17,7 @@
 <script setup lang="ts">
     import Dialog from '/@/components/dialog/Dialog.vue';
     import { h, ref, watch } from 'vue';
-    import { getEarlyWarningDetail } from '/@/components/body-d-left/left.api.ts';
+    import { getEarlyWarningDetail, getEarlyWarningDetailNew } from '/@/components/body-d-left/left.api.ts';
     import BasicTable from '/@/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue';
     import { useDialog } from '/@/views/components/dialogHooks.ts';
     import { useTheme } from '/@/hooks/theme/useTheme.ts';
@@ -26,6 +27,7 @@
     const registerTable = ref(null);
     const props = defineProps({
         title: String,
+        orgCodes: String,
     });
     const { themeType } = useTheme();
     const columns = [
diff --git a/src/views/index.api.ts b/src/views/index.api.ts
index 9b348c5..48a93ed 100644
--- a/src/views/index.api.ts
+++ b/src/views/index.api.ts
@@ -1,8 +1,13 @@
-import { get } from '/@/api/request';
+import { get, Dictget } from '/@/api/request';
 
 export enum Api {
     organizationTree = '',
+    getDictByCode = '/sys/dict/getDictItems',
+    getDictByCode2 = '/sys/api/getDictItems',
 }
 
 // 组织机构tree
-export const getOrganizationTree = () => get(Api.organizationTree);
\ No newline at end of file
+export const getOrganizationTree = () => get(Api.organizationTree);
+
+export const getDictByCode = (params) => get(Api.getDictByCode + `/${params.code}`);
+export const getDictByCode2 = (params) => Dictget(Api.getDictByCode2, params);
diff --git a/src/views/indexSon.vue b/src/views/indexSon.vue
index deb67f3..514c82e 100644
--- a/src/views/indexSon.vue
+++ b/src/views/indexSon.vue
@@ -19,13 +19,7 @@
             <div class="body-d-middle">
                 <SecondMap :orgCode="orgCode" :type="type">
                     <template #rightForm>
-                        <a-select
-                            placeholder="选择单位"
-                            v-model:value="orgCode"
-                            class="type-select bg-000"
-                            :options="option"
-                            :field-names="fieldNames"
-                        />
+                        <a-select placeholder="选择单位" v-model:value="orgCode" class="type-select bg-000 select-dept" :options="option1" />
                         <a-select placeholder="选择时间范围" v-model:value="type" class="type-select bg-000" :options="timeRangeOption" />
                     </template>
                 </SecondMap>
@@ -56,7 +50,9 @@
     import { onUnmounted } from 'vue';
     import { useTheme } from '/@/hooks/theme/useTheme.ts';
     import { ThemeType } from '/@/utils/settings.ts';
+    import { allSecondaryDepartsApi } from '/@/views/indexSun/indexSun.api.ts';
 
+    const option1 = ref([{ label: '全部', value: '' }]);
     const { refreshState } = useRefresh(DEFAULT_TIME);
 
     const store = useUserStore();
@@ -66,18 +62,42 @@
     });
     const { themeType } = useTheme();
     const useStore = useUserStore();
-    const { orgCode, option, fieldNames, setOrgCode } = useDepart();
+    const orgCode = ref();
+    const { option, fieldNames, setOrgCode } = useDepart();
     onMounted(() => {
         const userInfo = useStore.getUserInfo;
-        let orgCode = userInfo?.secondDepart?.orgCode;
-        if (orgCode) {
+        let orgCodes = userInfo?.secondDepart?.orgCode;
+        if (orgCodes) {
             nextTick(() => {
-                setOrgCode(orgCode);
+                // orgCode.value = orgCodes;
+                orgCode.value = userInfo?.secondDepart?.orgCode;
+                setOrgCode(orgCodes);
             });
         }
         init();
         document.addEventListener('visibilitychange', checkTabState);
+        getSecondDepart();
     });
+    function getSecondDepart() {
+        allSecondaryDepartsApi({})
+            .then((res: any) => {
+                if (res.code === 200) {
+                    const op: any[] = res?.result
+                        ? res.result.map((it: any) => {
+                              return {
+                                  label: it.departName,
+                                  value: it.orgCode,
+                              };
+                          })
+                        : [];
+                    option1.value = option1.value.concat(op);
+                } else {
+                }
+            })
+            .catch((err) => {
+                console.log(err);
+            });
+    }
     onUnmounted(() => {
         document.removeEventListener('visibilitychange', checkTabState);
     });
@@ -218,6 +238,9 @@
                 color: #fff !important;
             }
         }
+        .select-dept {
+            width: 200px;
+        }
     }
 
     .bottom-d {
diff --git a/src/views/indexSun.vue b/src/views/indexSun.vue
index a284311..19cf3e6 100644
--- a/src/views/indexSun.vue
+++ b/src/views/indexSun.vue
@@ -25,6 +25,7 @@
                     :hospitalList="hospitalList"
                     @clear-hospital-list="clearHospitalList"
                     :show-rest-b="showRestB"
+                    @handle-detail="handleCenterMapClick"
                     @show-rest-b="
                         () => {
                             showRestB = false;
@@ -80,7 +81,16 @@
     import threeR from '/@/views/indexSun/threeR.vue';
     import CenterMap from '/@/views/indexSun/centerMap.vue';
     import { ServerDetailType } from '/@/components/body-d-left/bodyLeftHooks.ts';
-    import { columns, fromLists, threeRModalColumns, threeRModalFromList, towRcolumns, twoRform } from '/@/views/indexSun/indexSun.ts';
+    import {
+        centerMapColumns,
+        centerMapFromList,
+        columns,
+        fromLists,
+        threeRModalColumns,
+        threeRModalFromList,
+        towRcolumns,
+        twoRform,
+    } from '/@/views/indexSun/indexSun.ts';
     import { nextTick, onMounted, onUnmounted, ref, watch } from 'vue';
     import PhoneDialog from '/@/views/components/phoneDialog/phoneDialog.vue';
     import { DataType, getSettings } from '/@/utils/settings.ts';
@@ -96,7 +106,15 @@
     import { useUserStore } from '/@/store/modules/user.ts';
 
     const { getCenterInfo } = useUserStore();
-    import { oneLApi, threeRModalApi, twoLModalApi, twoRModal1Api, twoRModal2Api, twoRModal3Api } from '/@/views/indexSun/indexSun.api.ts';
+    import {
+        oneLApi,
+        roomDetailApi,
+        threeRModalApi,
+        twoLModalApi,
+        twoRModal1Api,
+        twoRModal2Api,
+        twoRModal3Api,
+    } from '/@/views/indexSun/indexSun.api.ts';
     import dayjs from 'dayjs';
     //0:处置 1:处理 2:呼入 3:全部
     const phoneType = ref('');
@@ -397,7 +415,20 @@
         }
         apiParams.value = params;
         modalApi.value = apiArr[data.type - 1];
-        firstFormOne.value = twoRform(data.normal == 2 ? '1' : '2');
+        firstFormOne.value = twoRform(data.normal == 2 ? '1' : '');
+        nextTick(() => {
+            indexModalRef.value.openDialog();
+        });
+    }
+    function handleCenterMapClick(res) {
+        console.log(res, 'centerres');
+        indexColumn.value = centerMapColumns;
+        firstFormOne.value = centerMapFromList;
+        const params = {
+            healthRoomId: res.id,
+        };
+        modalApi.value = roomDetailApi;
+        apiParams.value = params;
         nextTick(() => {
             indexModalRef.value.openDialog();
         });
diff --git a/src/views/indexSun/centerMap.vue b/src/views/indexSun/centerMap.vue
index f707ea5..6df1266 100644
--- a/src/views/indexSun/centerMap.vue
+++ b/src/views/indexSun/centerMap.vue
@@ -74,7 +74,7 @@
 </template>
 <script setup lang="ts">
     import { nextTick, onMounted, ref, watch } from 'vue';
-    import { infoContent, legendList, tabList } from '/@/views/indexSun/indexSun.ts';
+    import { infoContent, infoContent1, legendList, tabList } from '/@/views/indexSun/indexSun.ts';
     import { message } from 'ant-design-vue';
     import { innerLineLight, outerLineOption } from '/@/assets/mapUtils/mapConstant.ts';
     import { Map } from '/@/assets/mapUtils/map.ts';
@@ -122,7 +122,7 @@
     const panelTitle = ref();
     const level = ref(0);
     const routeList = ref([]);
-    const emits = defineEmits(['clearHospitalList', 'showRestB']);
+    const emits = defineEmits(['clearHospitalList', 'showRestB', 'handleDetail']);
 
     watch(
         () => props.showHospitalList,
@@ -150,7 +150,6 @@
         document.addEventListener('click', (e) => {
             let t = e.target.closest('.viewBtn');
             if (t) {
-                console.log(t.id);
                 if (t.id) {
                     handleClcikDetail(JSON.parse(t.id));
                 }
@@ -184,7 +183,9 @@
     function changeTab(item: any, i: number) {
         closeDrivingElement();
         currentIndex.value = i;
-        tab(item);
+        if (item.type) {
+            tab(item);
+        }
     }
 
     function tab(item: any) {
@@ -280,8 +281,12 @@
                             },
                         },
                         async (val) => {
-                            console.log(val);
-                            Map.createInfoModal({ option: val, content: infoContent(val) });
+                            if (val.type == '2') {
+                                Map.createInfoModal({ option: val, content: infoContent(val) });
+                            } else {
+                                Map.createInfoModal({ option: val, content: infoContent1(val) });
+                            }
+
                             // const viewBtn = document.getElementById(val.id);
                             // viewBtn.onclick = () => {
                             //     handleClcikDetail(val);
@@ -307,7 +312,7 @@
     }
 
     function handleClcikDetail(res) {
-        console.log(res);
+        emits('handleDetail', res);
     }
 
     function setTitle({ time, distance }) {
@@ -560,7 +565,10 @@
                 }
             }
         }
-
+        :deep(.modal-box-normal) {
+            width: 330px;
+            height: 110px;
+        }
         .hospital-list {
             position: absolute;
             bottom: 160px;
@@ -590,7 +598,7 @@
             z-index: 99;
             position: absolute;
             right: 0;
-            top: 54px;
+            top: 100px;
             width: 288px;
             padding: 9px 18px;
             min-height: 200px;
diff --git a/src/views/indexSun/indexModal.vue b/src/views/indexSun/indexModal.vue
index 9486753..63a9380 100644
--- a/src/views/indexSun/indexModal.vue
+++ b/src/views/indexSun/indexModal.vue
@@ -20,17 +20,17 @@
                         <a-select placeholder="选择部门" v-model:value="orgCode2" :options="option2" />
                     </a-form-item>
                     <slot name="searchSecond"></slot>
+                    <div class="form-btn">
+                        <a-button @click="handleClickReset" style="border-color: #00ccff">重置</a-button>
+                        <a-button
+                            @click="handleClicksearch"
+                            :loading="loading"
+                            style="margin-left: 10px; background: #00ccff; border-color: #00ccff; color: #ffffff"
+                        >
+                            搜索
+                        </a-button>
+                    </div>
                 </Form>
-                <div class="form-btn">
-                    <a-button @click="handleClickReset" style="border-color: #00ccff">重置</a-button>
-                    <a-button
-                        @click="handleClicksearch"
-                        :loading="loading"
-                        style="margin-left: 10px; background: #00ccff; border-color: #00ccff; color: #ffffff"
-                    >
-                        搜索
-                    </a-button>
-                </div>
             </div>
             <div class="top-bottom-center" v-if="twoROnly">
                 <div class="date-change">
@@ -134,6 +134,35 @@
         if (type == dataActity.value) return;
         dataActity.value = type;
         getField();
+        if (props.twoROnly) {
+            const twoRData = localStorage.getItem('twoRList');
+            const newData = JSON.parse(twoRData);
+            if (props.twoROnly.type == 1) {
+                if (type == 1) {
+                    normalNum.value = newData.weightLossCountDay;
+                    abnormalNum.value = newData.weightLossAbnormalCountDay;
+                } else {
+                    normalNum.value = newData.weightLossCountMonth;
+                    abnormalNum.value = newData.weightLossAbnormalCountMonth;
+                }
+            } else if (props.twoROnly.type == 2) {
+                if (type == 1) {
+                    normalNum.value = newData.bloodSugarCountDay;
+                    abnormalNum.value = newData.bloodSugarAbnormalCountDay;
+                } else {
+                    normalNum.value = newData.bloodSugarCountMonth;
+                    abnormalNum.value = newData.bloodSugarAbnormalCountMonth;
+                }
+            } else {
+                if (type == 1) {
+                    normalNum.value = newData.bloodPressureCountDay;
+                    abnormalNum.value = newData.bloodPressureAbnormalCountDay;
+                } else {
+                    normalNum.value = newData.bloodPressureCountMonth;
+                    abnormalNum.value = newData.bloodPressureAbnormalCountMonth;
+                }
+            }
+        }
         if (type == 1) {
             formState.value.inputDateBegin = dayjs().format('YYYY-MM-DD');
             formState.value.inputDateEnd = dayjs().format('YYYY-MM-DD');
@@ -212,7 +241,7 @@
                     abnormalNum.value = newData.weightLossAbnormalCountDay;
                 } else {
                     normalNum.value = newData.weightLossCountMonth;
-                    abnormalNum.value = newData.weightLossCountMonth;
+                    abnormalNum.value = newData.weightLossAbnormalCountMonth;
                 }
             } else if (props.twoROnly.type == 2) {
                 if (props.twoROnly.date == 1) {
@@ -270,6 +299,7 @@
         orgCode2.value = '';
         orgCode1.value = '';
         getField();
+        formRecord.value = {};
         formState.value = {
             ...formState.value,
             ...formRecord.value,
@@ -303,7 +333,7 @@
                 border-radius: 4px !important;
             }
             :deep(.ant-form) {
-                width: 80%;
+                width: 100%;
                 display: flex;
                 .ant-form-item {
                     flex: 1;
diff --git a/src/views/indexSun/indexSun.api.ts b/src/views/indexSun/indexSun.api.ts
index b985749..257313a 100644
--- a/src/views/indexSun/indexSun.api.ts
+++ b/src/views/indexSun/indexSun.api.ts
@@ -15,6 +15,7 @@ enum Api {
     twoRModal1 = '/health-emergency/emergency/LargeScreenNew/healthWeightLoss',
     twoRModal2 = '/health-emergency/emergency/LargeScreenNew/healthBloodSugar',
     twoRModal3 = '/health-emergency/emergency/LargeScreenNew/healthBloodPressure',
+    roomDetail = '/health-emergency/emergency/LargeScreenNew/healthRoomDetail',
     getSecondaryDepartment = '/sys/sysDepart/allSecondaryDeparts',
 }
 
@@ -31,6 +32,7 @@ export const threeRModalApi = (params) => post(Api.threeRModal, params);
 export const twoRModal1Api = (params) => post(Api.twoRModal1, params);
 export const twoRModal2Api = (params) => post(Api.twoRModal2, params);
 export const twoRModal3Api = (params) => post(Api.twoRModal3, params);
+export const roomDetailApi = (params) => post(Api.roomDetail, params);
 export const getSecondaryDepartmentList = () => get({ url: Api.getSecondaryDepartment });
 export const allSecondaryDepartsApi = (params) => get(Api.allSecondaryDeparts, params);
 export const getThreeDepartByOrgCodeApi = (params) => get(Api.getThreeDepartByOrgCode, params);
diff --git a/src/views/indexSun/indexSun.ts b/src/views/indexSun/indexSun.ts
index f9fb9e0..1fb6e16 100644
--- a/src/views/indexSun/indexSun.ts
+++ b/src/views/indexSun/indexSun.ts
@@ -1,9 +1,17 @@
 import * as echarts from 'echarts';
 import { legend1, legend2, legend3, legend4, legend5 } from '/@/components/xianMap/xianMapHooks.ts';
-import { initatorTypee, normalTypeList, SexType, sexTypeList, sexTypeListNew } from '/@/utils/settings.ts';
+import { checkTypeList, initatorTypee, isTrueOfFalse, normalTypeList, SexType, sexTypeList, sexTypeListNew } from '/@/utils/settings.ts';
+import { getDictByCode, getDictByCode2 } from '/@/views/index.api.ts';
+import { get } from '/@/api/request';
 export const legend1 = new URL('/@/assets/img/legend1.png', import.meta.url).href;
 export const legend2 = new URL('/@/assets/img/legend5.png', import.meta.url).href;
 export const legend3 = new URL('/@/assets/img/legend3.png', import.meta.url).href;
+
+async function getDict(code) {
+    return await getDictByCode2({ dictCode: code });
+}
+export const checkData = await getDict('xj_check_type');
+
 export function getClassCharts(dx, dy, m) {
     return {
         grid: {
@@ -129,7 +137,7 @@ export function infoContent(res) {
                 <span class="item-one">单位：</span>
                 <span class="item-two">${res.orgName ? res.orgName : '--'}</span>
             </div>
-            <div class="modal-item">
+            <div class="modal-item" >
                 <span class="item-one">关爱人数：</span>
                 <span class="item-two">${res.loveNum ? res.loveNum : '--'}</span>
             </div>
@@ -142,7 +150,19 @@ export function infoContent(res) {
         </div>
     </div> `;
 }
-
+export function infoContent1(res) {
+    return `
+        <div class="modal-box modal-box-normal">
+            <div class="modal-item">
+                <span class="item-one">单位：</span>
+                <span class="item-two">${res.orgName ? res.orgName : '--'}</span>
+            </div>
+            <div class="modal-item">
+                <span class="item-one">地点：</span>
+                <span class="item-two">${res.name ? res.name : '--'}</span>
+            </div>
+    </div> `;
+}
 const columns1 = [
     {
         title: '姓名',
@@ -320,6 +340,13 @@ export const threeRModalFromList = [
         placeholder: '请输入体检医院',
         defaultValue: '',
     },
+    {
+        label: '单位',
+        field: 'departName',
+        type: 'input',
+        placeholder: '请输入单位',
+        defaultValue: '',
+    },
 ];
 
 const towRcolumn1 = [
@@ -360,8 +387,8 @@ const towRcolumn1 = [
     },
     {
         title: 'BMI是否异常',
-        dataIndex: 'bmiException',
-        key: 'bmiException',
+        dataIndex: 'bmiFlag',
+        key: 'bmiFlag',
     },
     {
         title: '腰围(cm)',
@@ -370,8 +397,8 @@ const towRcolumn1 = [
     },
     {
         title: '填报日期',
-        dataIndex: 'createTime',
-        key: 'createTime',
+        dataIndex: 'inputDate',
+        key: 'inputDate',
     },
 ];
 const towRcolumn2 = [
@@ -397,13 +424,13 @@ const towRcolumn2 = [
     },
     {
         title: '血糖值(mmol/L)',
-        dataIndex: 'height',
-        key: 'height',
+        dataIndex: 'bsVal',
+        key: 'bsVal',
     },
     {
         title: '血糖是否异常',
-        dataIndex: 'weight',
-        key: 'weight',
+        dataIndex: 'bmiFlag',
+        key: 'bmiFlag',
     },
     {
         title: '腰围(cm)',
@@ -412,8 +439,8 @@ const towRcolumn2 = [
     },
     {
         title: '填报日期',
-        dataIndex: 'createTime',
-        key: 'createTime',
+        dataIndex: 'inputDate',
+        key: 'inputDate',
     },
 ];
 const towRcolumn3 = [
@@ -476,7 +503,7 @@ export function twoRform(type) {
             label: '异常标记',
             field: 'abFlag',
             type: 'select',
-            placeholder: '请选择性别',
+            placeholder: '请选择',
             options: normalTypeList,
             defaultValue: type,
         },
@@ -489,3 +516,96 @@ export function twoRform(type) {
     ];
 }
 export const towRcolumns = [towRcolumn1, towRcolumn2, towRcolumn3];
+
+export const centerMapColumns = [
+    {
+        title: '单位',
+        dataIndex: 'departName',
+        key: 'departName',
+    },
+    {
+        title: '姓名',
+        dataIndex: 'name',
+        key: 'name',
+    },
+    {
+        title: '检查日期',
+        dataIndex: 'checkInDate',
+        key: 'checkInDate',
+    },
+    {
+        title: '检查类型',
+        dataIndex: 'checkType',
+        key: 'checkType',
+        customRender: ({ text }) => {
+            console.log(text, checkData);
+            const dddd = checkData.filter((item) => item.value == text);
+            return dddd[0].label;
+        },
+    },
+    {
+        title: '去年检查值',
+        dataIndex: 'lastVal',
+        key: 'lastYearCheckVal',
+    },
+    {
+        title: '控降目标',
+        dataIndex: 'goalVal',
+        key: 'targetVal',
+    },
+    {
+        title: '本次测量值',
+        dataIndex: 'currentVal',
+        key: 'thisCheckVal',
+    },
+    {
+        title: '控降差值',
+        dataIndex: 'compareVal',
+        key: 'diffVal',
+    },
+    {
+        title: '是否成功控降',
+        dataIndex: 'successFlag',
+        key: 'successFlag',
+        customRender: ({ text }) => {
+            if (text == '1') {
+                return '是';
+            } else {
+                return '否';
+            }
+        },
+    },
+];
+
+export const centerMapFromList = [
+    {
+        label: '员工姓名',
+        field: 'name',
+        type: 'input',
+        placeholder: '请输入姓名',
+        defaultValue: '',
+    },
+    {
+        label: '检查类型',
+        field: 'checkType',
+        type: 'select',
+        placeholder: '请输入检查类型',
+        options: checkData,
+        defaultValue: '',
+    },
+    {
+        label: '是否成功控降',
+        field: 'successFlag',
+        type: 'select',
+        placeholder: '请输入是否成功控降',
+        options: isTrueOfFalse,
+        defaultValue: '',
+    },
+    {
+        label: '单位名称',
+        field: 'departName',
+        type: 'input',
+        placeholder: '请输入单位名称',
+        defaultValue: '',
+    },
+];
diff --git a/src/views/indexSun/threeNewL.vue b/src/views/indexSun/threeNewL.vue
index b63de1c..515dd8a 100644
--- a/src/views/indexSun/threeNewL.vue
+++ b/src/views/indexSun/threeNewL.vue
@@ -21,7 +21,7 @@
                 </template>
                 <template v-else>
                     <div style="height: 100%; width: 100%; display: flex; align-items: center; justify-content: center">
-                        <Empty :description="'暂无数据'" />
+                        <Empty :description="'暂无数据'" :image="nomalPng" />
                     </div>
                 </template>
             </div>
@@ -34,6 +34,7 @@
     import { onMounted, ref, watch } from 'vue';
     import hospitalPng from '/@/assets/indexSun/hospital.png';
     import { threeLApi } from '/@/views/indexSun/indexSun.api.ts';
+    import nomalPng from '/@/assets/indexSun/nomal.png';
     const scrollList = ref<any[]>([]);
     const props = defineProps({
         bKey: {
@@ -98,14 +99,23 @@
                     font-size: 14px;
                     letter-spacing: 0;
                     margin-bottom: 20px;
-                    cursor: pointer;
                     img {
                         display: inline-block;
                         width: 32px;
                         height: 32px;
-                        cursor: pointer;
                     }
                 }
+                :deep(.ant-empty-image) {
+                    height: auto;
+                    img {
+                        display: inline-block;
+                        width: 51px;
+                        height: 54px;
+                    }
+                }
+                :deep(.ant-empty-description) {
+                    color: #c9daff;
+                }
             }
         }
     }
diff --git a/src/views/indexSun/threeR.vue b/src/views/indexSun/threeR.vue
index 095614e..54904d8 100644
--- a/src/views/indexSun/threeR.vue
+++ b/src/views/indexSun/threeR.vue
@@ -34,7 +34,7 @@
                 </template>
                 <template v-else>
                     <div style="height: 100%; width: 100%; display: flex; align-items: center; justify-content: center">
-                        <Empty :description="'暂无数据'" />
+                        <Empty :description="'暂无数据'" :image="nomalPng" />
                     </div>
                 </template>
             </div>
@@ -44,6 +44,7 @@
 <script setup lang="ts">
     import { Empty } from 'ant-design-vue';
     import { ref, onMounted, watch } from 'vue';
+    import nomalPng from '/@/assets/indexSun/nomal.png';
     import { threeRApi } from '/@/views/indexSun/indexSun.api.ts';
     const scrollList = ref();
     const emit = defineEmits(['handleClick']);
@@ -116,6 +117,17 @@
                     color: #fff;
                     justify-content: space-between;
                 }
+                :deep(.ant-empty-image) {
+                    height: auto;
+                    img {
+                        display: inline-block;
+                        width: 51px;
+                        height: 54px;
+                    }
+                }
+                :deep(.ant-empty-description) {
+                    color: #c9daff;
+                }
             }
         }
     }
diff --git a/src/views/indexSun/twoR.vue b/src/views/indexSun/twoR.vue
index 8a2af86..1eb1aac 100644
--- a/src/views/indexSun/twoR.vue
+++ b/src/views/indexSun/twoR.vue
@@ -37,7 +37,7 @@
                         <div>
                             <span class="clock-text">异常人数：</span>
                             <span class="clock-num2" @click="handleClickNum1(1, 2, 2)"
-                                >{{ twoRList?.weightLossCountMonth ? twoRList?.weightLossAbnormalCountMonth : '--' }}人</span
+                                >{{ twoRList?.weightLossAbnormalCountMonth ? twoRList?.weightLossAbnormalCountMonth : '--' }}人</span
                             >
                         </div>
                     </div>