From aa71fd5c7eb5e5f4c1d253c8e024d95111d3f7a6 Mon Sep 17 00:00:00 2001
From: xf <xiangfu0507@163.com>
Date: Sun, 6 Jul 2025 18:03:41 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E6=96=B0=E7=96=86=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/settings.ts              |  8 ++--
 src/views/indexSun.vue             |  1 +
 src/views/indexSun/indexModal.vue  | 14 ++++---
 src/views/indexSun/indexSun.api.ts | 10 ++++-
 src/views/indexSun/indexSun.ts     | 38 ++++++++++++++++++-
 src/views/indexSun/oneR.vue        | 19 ++++++++--
 src/views/indexSun/threeNewL.vue   | 16 +++++++-
 src/views/indexSun/threeR.vue      | 24 ++++++++----
 src/views/indexSun/twoR.vue        | 60 ++++++++++++++++++++----------
 9 files changed, 146 insertions(+), 44 deletions(-)

diff --git a/src/utils/settings.ts b/src/utils/settings.ts
index 3ccf1a0..0cdd6b3 100644
--- a/src/utils/settings.ts
+++ b/src/utils/settings.ts
@@ -19,6 +19,10 @@ export enum SexType {
 }
 
 export const sexTypeList = [
+    {
+        label: '全部',
+        value: SexType.all,
+    },
     {
         label: '男',
         value: SexType.male,
@@ -27,10 +31,6 @@ export const sexTypeList = [
         label: '女',
         value: SexType.female,
     },
-    {
-        label: '全部',
-        value: SexType.all,
-    },
 ];
 
 export interface Settings {
diff --git a/src/views/indexSun.vue b/src/views/indexSun.vue
index ce9aa9c..e2b88f4 100644
--- a/src/views/indexSun.vue
+++ b/src/views/indexSun.vue
@@ -86,6 +86,7 @@
     function handleTwoLClick() {
         indexModalTitle.value = '主诉分类详情';
         indexColumn.value = columns[1];
+        firstFormOne.value = fromLists[1];
         nextTick(() => {
             indexModalRef.value.openDialog();
         });
diff --git a/src/views/indexSun/indexModal.vue b/src/views/indexSun/indexModal.vue
index e88fb3a..2470430 100644
--- a/src/views/indexSun/indexModal.vue
+++ b/src/views/indexSun/indexModal.vue
@@ -6,6 +6,12 @@
                     <slot name="searchFirst"></slot>
                     <a-form-item v-for="(item, index) in firstForm" :label="item.label" :key="index">
                         <a-input :placeholder="item.placeholder" v-if="item.type == 'input'" v-model:value="formRecord[item.field]" />
+                        <a-select
+                            v-if="item.type == 'select'"
+                            :placeholder="item.placeholder"
+                            v-model:value="formRecord[item.field]"
+                            :options="item.options"
+                        />
                     </a-form-item>
                     <a-form-item label="单位">
                         <a-select placeholder="选择单位" v-model:value="orgCode" :options="option" :field-names="fieldNames" />
@@ -14,12 +20,10 @@
                         <a-select placeholder="选择单位" @focus="changeDept" v-model:value="orgCode" :options="option" :field-names="fieldNames" />
                     </a-form-item>
                     <slot name="searchSecond"></slot>
-                    <a-form-item label="性别">
-                        <a-select v-model:value="formRecord.sex" placeholder="请选择" :options="sexTypeList" />
-                    </a-form-item>
                 </Form>
                 <div class="form-btn">
                     <a-button @click="handleClicksearch">搜索</a-button>
+                    <a-button @click="handleClicksearch" style="margin-left: 10px">重置</a-button>
                 </div>
             </div>
             <BasicTable ref="registerTable" class="table-container" :key="visible" :columns="column" :apiParams="formState" />
@@ -66,7 +70,7 @@
     }
     const formItemLayout = {
         labelCol: {
-            style: { width: '60px' },
+            style: { width: '80px' },
             ...props.labelCol,
         },
         wrapperCol: {
@@ -82,7 +86,7 @@
     function getField() {
         let result = {};
         props.firstForm.map((item) => {
-            result[item.field] = '';
+            result[item.field] = item.defaultValue || '';
         });
         formRecord.value = {
             ...formRecord.value,
diff --git a/src/views/indexSun/indexSun.api.ts b/src/views/indexSun/indexSun.api.ts
index e783807..a4ba47e 100644
--- a/src/views/indexSun/indexSun.api.ts
+++ b/src/views/indexSun/indexSun.api.ts
@@ -1,7 +1,15 @@
-import { post } from '/@/api/request.ts';
+import { post, get } from '/@/api/request.ts';
 
 enum Api {
     statisticsNew = '/health-emergency/emergency/LargeScreenNew/statisticsNew',
+    threeL = '/health-emergency/emergency/LargeScreenNew/medicalPeopleNumStatistics',
+    oneR = '/health-watch/watch/watchMonitorData/getMonitorList',
+    threeR = '/health-emergency/emergency/LargeScreenNew/medicalAbnormalStatistics',
+    twoR = '/health-emergency/emergency/LargeScreenNew/healthSign',
 }
 
 export const statisticsNewApi = (params) => post(Api.statisticsNew, params);
+export const threeLApi = (params) => post(Api.threeL, params);
+export const oneRApi = (params) => get(Api.oneR, params);
+export const threeRApi = (params) => post(Api.threeR, params);
+export const twoRApi = (params) => post(Api.twoR, params);
diff --git a/src/views/indexSun/indexSun.ts b/src/views/indexSun/indexSun.ts
index 6b0401f..6f65969 100644
--- a/src/views/indexSun/indexSun.ts
+++ b/src/views/indexSun/indexSun.ts
@@ -1,5 +1,6 @@
 import * as echarts from 'echarts';
 import { legend1, legend2, legend3, legend4, legend5 } from '/@/components/xianMap/xianMapHooks.ts';
+import { SexType, sexTypeList } from '/@/utils/settings.ts';
 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;
@@ -222,9 +223,44 @@ const fromList = [
         field: 'realName',
         type: 'input',
         placeholder: '请输入姓名',
+        defaultValue: '',
+    },
+    {
+        label: '性别',
+        field: 'sex',
+        type: 'select',
+        placeholder: '请选择性别',
+        options: sexTypeList,
+        defaultValue: SexType.all,
+    },
+];
+
+const fromList2 = [
+    {
+        label: '救助人',
+        field: 'realName',
+        type: 'input',
+        placeholder: '请输入',
+        defaultValue: '',
+    },
+    {
+        label: '性别',
+        field: 'sex',
+        type: 'select',
+        placeholder: '请选择性别',
+        options: sexTypeList,
+        defaultValue: SexType.all,
+    },
+    {
+        label: '救助方式',
+        field: 'sex',
+        type: 'select',
+        placeholder: '请选择性别',
+        options: sexTypeList,
+        defaultValue: SexType.all,
     },
 ];
 
 export const columns = [columns1, columns2];
 
-export const fromLists = [fromList];
+export const fromLists = [fromList, fromList2];
diff --git a/src/views/indexSun/oneR.vue b/src/views/indexSun/oneR.vue
index 88eeb45..d307d3b 100644
--- a/src/views/indexSun/oneR.vue
+++ b/src/views/indexSun/oneR.vue
@@ -9,9 +9,9 @@
                 <template v-if="scrollList.length > 0">
                     <vue3-seamless-scroll :list="scrollList" class="scroll" :hover="true" :copyNum="3" :limitScrollNum="5" v-bind="{ step: 0.2 }">
                         <div class="item-d" v-for="(item, index) in scrollList" :key="index">
-                            <div>张二雷{{ index }}</div>
-                            <div style="color: #f6ff00">压力异常(82)</div>
-                            <div>2025-10-26 22:29:58</div>
+                            <div>{{ item.realName }}</div>
+                            <div style="color: #f6ff00">{{ item.eventType_dictText }}({{ item.dataValue }})</div>
+                            <div>{{ item.warnTime }}</div>
                             <div class="item-d-img">
                                 <img :src="pointPng" alt="" />
                                 <img :src="addressPng" alt="" />
@@ -34,10 +34,21 @@
     import { ref, onMounted } from 'vue';
     import pointPng from '/@/assets/indexSun/point.png';
     import addressPng from '/@/assets/indexSun/address.png';
+    import { oneRApi } from '/@/views/indexSun/indexSun.api.ts';
     const loading = ref(true);
-    const scrollList = ref<any[]>([{}, {}, {}, {}, {}, {}, {}, {}]);
+    const scrollList = ref<any[]>([]);
 
     const emit = defineEmits(['handleView']);
+    onMounted(() => {
+        getList();
+    });
+    function getList() {
+        oneRApi({}).then((res) => {
+            if (res.code == 200) {
+                scrollList.value = res.result.records;
+            }
+        });
+    }
     function handleView() {
         emit('handleView');
     }
diff --git a/src/views/indexSun/threeNewL.vue b/src/views/indexSun/threeNewL.vue
index f9011d6..36b9d96 100644
--- a/src/views/indexSun/threeNewL.vue
+++ b/src/views/indexSun/threeNewL.vue
@@ -31,9 +31,21 @@
 <script setup lang="ts">
     import { Vue3SeamlessScroll } from 'vue3-seamless-scroll';
     import { Empty } from 'ant-design-vue';
-    import { ref } from 'vue';
+    import { onMounted, ref } from 'vue';
     import hospitalPng from '/@/assets/indexSun/hospital.png';
-    const scrollList = ref<any[]>([{}, {}, {}, {}, {}, {}, {}, {}]);
+    import { threeLApi } from '/@/views/indexSun/indexSun.api.ts';
+    const scrollList = ref<any[]>([]);
+    onMounted(() => {
+        getList();
+    });
+    function getList() {
+        threeLApi({}).then((res) => {
+            if (res.code == 200) {
+                console.log(res.result);
+                scrollList.value = res.result;
+            }
+        });
+    }
 </script>
 <style lang="less" scoped>
     .three-new-l {
diff --git a/src/views/indexSun/threeR.vue b/src/views/indexSun/threeR.vue
index b09e52b..e6e6349 100644
--- a/src/views/indexSun/threeR.vue
+++ b/src/views/indexSun/threeR.vue
@@ -7,12 +7,12 @@
         <div class="content">
             <div class="content-item">
                 <template v-if="scrollList.length > 0">
-                    <vue3-seamless-scroll :list="scrollList" class="scroll" :hover="true" :copyNum="3" :limitScrollNum="4" v-bind="{ step: 0.2 }">
-                        <div class="item-d" v-for="(item, index) in scrollList" :key="index">
-                            <div>体检总人数</div>
-                            <div style="font-weight: bold">18000人</div>
-                        </div>
-                    </vue3-seamless-scroll>
+                    <!--                    <vue3-seamless-scroll :list="scrollList" class="scroll" :hover="true" :copyNum="3" :limitScrollNum="4" v-bind="{ step: 0.2 }">-->
+                    <div class="item-d" v-for="(item, index) in scrollList" :key="index">
+                        <div>体检总人数</div>
+                        <div style="font-weight: bold">18000人</div>
+                    </div>
+                    <!--                    </vue3-seamless-scroll>-->
                 </template>
                 <template v-else>
                     <div style="height: 100%; width: 100%; display: flex; align-items: center; justify-content: center">
@@ -25,9 +25,17 @@
 </template>
 <script setup lang="ts">
     import { Vue3SeamlessScroll } from 'vue3-seamless-scroll';
-    const scrollList = ref<any[]>([{}, {}, {}, {}, {}, {}, {}, {}]);
     import { Empty } from 'ant-design-vue';
-    import { ref } from 'vue';
+    import { ref, onMounted } from 'vue';
+    import { threeRApi } from '/@/views/indexSun/indexSun.api.ts';
+    const scrollList = ref<any[]>([]);
+    onMounted(() => {
+        threeRApi({}).then((res) => {
+            if (res.code == 200) {
+                scrollList.value = res.result;
+            }
+        });
+    });
 </script>
 <style lang="less" scoped>
     .three-r-box {
diff --git a/src/views/indexSun/twoR.vue b/src/views/indexSun/twoR.vue
index d4560ac..6e9e0b3 100644
--- a/src/views/indexSun/twoR.vue
+++ b/src/views/indexSun/twoR.vue
@@ -16,21 +16,23 @@
                     <div class="content-item-clock">
                         <div>
                             <span class="clock-text">今日打卡人数：</span>
-                            <span class="clock-num1">86人</span>
+                            <span class="clock-num1">{{ twoRList?.weightLossCountDay ? twoRList?.weightLossCountDay : '--' }}人</span>
                         </div>
                         <div>
                             <span class="clock-text">异常人数：</span>
-                            <span class="clock-num2">86人</span>
+                            <span class="clock-num2">{{ twoRList?.weightLossAbnormalCountDay ? twoRList?.weightLossAbnormalCountDay : '--' }}人</span>
                         </div>
                     </div>
                     <div class="content-item-clock" style="margin-bottom: 0">
                         <div>
-                            <span class="clock-text">今日打卡人数：</span>
-                            <span class="clock-num1">86人</span>
+                            <span class="clock-text">本月打卡人数：</span>
+                            <span class="clock-num1">{{ twoRList?.weightLossCountMonth ? twoRList?.weightLossCountMonth : '--' }}人</span>
                         </div>
                         <div>
                             <span class="clock-text">异常人数：</span>
-                            <span class="clock-num2">86人</span>
+                            <span class="clock-num2"
+                                >{{ twoRList?.weightLossAbnormalCountMonth ? twoRList?.weightLossAbnormalCountMonth : '--' }}人</span
+                            >
                         </div>
                     </div>
                 </div>
@@ -39,28 +41,30 @@
                 <div class="content-item-info">
                     <div class="content-item-name" style="font-size: 16px">
                         <div class="content-item-img">
-                            <img :src="WeightPng" alt="" />
+                            <img :src="FatPng" alt="" />
                         </div>
-                        减重打卡
+                        血糖打卡
                     </div>
                     <div class="content-item-clock">
                         <div>
                             <span class="clock-text">今日打卡人数：</span>
-                            <span class="clock-num1">86人</span>
+                            <span class="clock-num1">{{ twoRList?.bloodSugarCountDay ? twoRList?.bloodSugarCountDay : '--' }}人</span>
                         </div>
                         <div>
                             <span class="clock-text">异常人数：</span>
-                            <span class="clock-num2">86人</span>
+                            <span class="clock-num2">{{ twoRList?.bloodSugarAbnormalCountDay ? twoRList?.bloodSugarAbnormalCountDay : '--' }}人</span>
                         </div>
                     </div>
                     <div class="content-item-clock" style="margin-bottom: 0">
                         <div>
-                            <span class="clock-text">今日打卡人数：</span>
-                            <span class="clock-num1">86人</span>
+                            <span class="clock-text">本月打卡人数：</span>
+                            <span class="clock-num1">{{ twoRList?.bloodSugarCountMonth ? twoRList?.bloodSugarCountMonth : '--' }}人</span>
                         </div>
                         <div>
                             <span class="clock-text">异常人数：</span>
-                            <span class="clock-num2">86人</span>
+                            <span class="clock-num2"
+                                >{{ twoRList?.bloodSugarAbnormalCountMonth ? twoRList?.bloodSugarAbnormalCountMonth : '--' }}人</span
+                            >
                         </div>
                     </div>
                 </div>
@@ -69,28 +73,32 @@
                 <div class="content-item-info">
                     <div class="content-item-name" style="font-size: 16px">
                         <div class="content-item-img">
-                            <img :src="WeightPng" alt="" />
+                            <img :src="BloodPng" alt="" />
                         </div>
-                        减重打卡
+                        血压打卡
                     </div>
                     <div class="content-item-clock">
                         <div>
                             <span class="clock-text">今日打卡人数：</span>
-                            <span class="clock-num1">12386人</span>
+                            <span class="clock-num1">{{ twoRList?.bloodPressureCountDay ? twoRList?.bloodPressureCountDay : '--' }}人</span>
                         </div>
                         <div>
                             <span class="clock-text">异常人数：</span>
-                            <span class="clock-num2">86人</span>
+                            <span class="clock-num2"
+                                >{{ twoRList?.bloodPressureAbnormalCountDay ? twoRList?.bloodPressureAbnormalCountDay : '--' }}人</span
+                            >
                         </div>
                     </div>
                     <div class="content-item-clock" style="margin-bottom: 0">
                         <div>
-                            <span class="clock-text">今日打卡人数：</span>
-                            <span class="clock-num1">86人</span>
+                            <span class="clock-text">本月打卡人数：</span>
+                            <span class="clock-num1">{{ twoRList?.bloodPressureCountMonth ? twoRList?.bloodPressureCountMonth : '--' }}人</span>
                         </div>
                         <div>
                             <span class="clock-text">异常人数：</span>
-                            <span class="clock-num2">86人</span>
+                            <span class="clock-num2"
+                                >{{ twoRList?.bloodPressureAbnormalCountMonth ? twoRList?.bloodPressureAbnormalCountMonth : '--' }}人</span
+                            >
                         </div>
                     </div>
                 </div>
@@ -102,6 +110,19 @@
     import WeightPng from '/@/assets/indexSun/weightClock.png';
     import FatPng from '/@/assets/indexSun/fatClock.png';
     import BloodPng from '/@/assets/indexSun/bloodClock.png';
+    import { onMounted, ref } from 'vue';
+    import { twoRApi } from '/@/views/indexSun/indexSun.api.ts';
+    const twoRList = ref();
+    onMounted(() => {
+        getList();
+    });
+    function getList() {
+        twoRApi({}).then((res) => {
+            if (res.code == 200) {
+                twoRList.value = res.result;
+            }
+        });
+    }
 </script>
 <style lang="less" scoped>
     .two-r-box {
@@ -173,6 +194,7 @@
                         .clock-num1,
                         .clock-num2 {
                             font-size: 16px;
+                            cursor: pointer;
                         }
                         .clock-num1 {
                             color: #22e8ff;