update

1.更换部分模块接口

Dockerfile

@@ -3,7 +3,7 @@ MAINTAINER jeecgos@163.com
 VOLUME /tmp
 ENV LANG en_US.UTF-8
 
-ENV VITE_GLOB_API_URL https://api.xjygjk.com
+ENV VITE_GLOB_API_URL http://api-xj.tri.dt.io
 
 RUN echo "server {  \
                   #解决Router(mode: 'history')模式下，刷新路由地址不能找到页面的问题 \

DockerfileXj

@@ -1,21 +0,0 @@
-FROM nginx
-MAINTAINER jeecgos@163.com
-VOLUME /tmp
-ENV LANG en_US.UTF-8
-RUN echo "server {  \
-                  #解决Router(mode: 'history')模式下，刷新路由地址不能找到页面的问题 \
-                  location / { \
-                     root   /var/www/html/; \
-                      index  index.html index.htm; \
-                      if (!-e \$request_filename) { \
-                          rewrite ^(.*)\$ /index.html?s=\$1 last; \
-                          break; \
-                      } \
-                  } \
-                  access_log  /var/log/nginx/access.log ; \
-              } " > /etc/nginx/conf.d/default.conf \
-    &&  mkdir  -p  /var/www \
-    &&  mkdir -p /var/www/html
-
-ADD dist/ /var/www/html/
-EXPOSE 3101

package.json

@@ -6,6 +6,7 @@
   "scripts": {
     "dev": "vite --open",
     "pro": "vite --open --mode production",
+    "test": "vite --open --mode test",
     "build": "vite build",
     "build:dev": "vite build --mode dev",
     "build:test": "vite build --mode test",

src/enum/pageEnum.ts

@@ -54,7 +54,7 @@ export function toHomeByLogoutPath(nowPath: string) {
 
 //缓存退出时的页面路径
 export function setCurrentPath(nowPath) {
-    localStorage.setItem(LOGOUT_CURRENT_PATH, nowPath);
+    localStorage.setItem(LOGOUT_CURRENT_PATH, '/login');
 }
 
 export function getCurrentPath() {

src/views/indexSun.vue

@@ -152,6 +152,7 @@
         twoRModal2Api,
         twoRModal3Api,
         twoRNApi,
+        twoRNDetailApi,
     } from '/@/views/indexSun/indexSun.api.ts';
     import dayjs from 'dayjs';
     import ThreeLeftNew from '/@/views/indexSun/threeLeftNew.vue';
@@ -670,7 +671,7 @@
             centerId: centerId.value,
         };
         indexModalTitle.value = '重点关爱趋势预警';
-        modalApi.value = twoRNApi;
+        modalApi.value = twoRNDetailApi;
         apiParams.value = params;
         nextTick(() => {
             indexModalRef.value.openDialog();
@@ -681,8 +682,8 @@
         firstFormOne.value = [];
         const params = {
             centerId: centerId.value,
-            // startDate: '2000-01-01',
+            startDate: '2000-01-01',
-            // endDate: '2030-12-31',
+            endDate: '2030-12-31',
         };
         indexModalTitle.value = '今日应急';
         modalApi.value = todayEmergencyListApi;
@@ -709,7 +710,7 @@
         indexColumn.value = centerMapColumns;
         firstFormOne.value = centerMapFromList;
         const params = {
-            healthRoomId: res.id,
+            healthRoomId: res?.ayId,
         };
         indexModalTitle.value = '健康小屋详情';
         modalApi.value = roomDetailApi;

src/views/indexSun/indexModal.vue

@@ -280,11 +280,15 @@
         };
     }
     function handleClicksearch() {
-        formState.value = {
+        try {
-            ...formState.value,
+            formState.value = {
-            ...formRecord.value,
+                ...formState.value,
-            salvageUserDepart: orgCode2.value ? orgCode2.value : orgCode1.value ? orgCode1.value : '',
+                ...formRecord.value,
-        };
+                salvageUserDepart: orgCode2.value ? orgCode2.value : orgCode1.value ? orgCode1.value : '',
+            };
+        } catch (e) {
+            console.log(e);
+        }
         // registerTable.value.getRecords();
     }
 

src/views/indexSun/indexSun.api.ts

@@ -18,6 +18,8 @@ enum Api {
     roomDetail = '/health-emergency/emergency/LargeScreenNew/healthRoomDetail',
     getSecondaryDepartment = '/sys/sysDepart/allSecondaryDeparts',
     twoRN = '/health-emergency/emergency/LargeScreenNew/loveTrend',
+    twoRNDetail = '/health-emergency/emergency/LargeScreenNew/loveTrendDetail',
+    loveTrendByOne = '/health-emergency/emergency/LargeScreenNew/loveTrendByOne',
     nearResources = '/health-emergency/emergency/LargeScreenNew/nearResources',
     todayEmergencyList = '/health-emergency/emergency/LargeScreenNew/todayEmergencyList',
     healthArchives = '/health-emergency/emergency/LargeScreenNew/healthArchives',
@@ -35,6 +37,8 @@ export const oneRApi = (params: any) => get(Api.oneR, params);
 export const threeRApi = (params: any) => post(Api.threeR, params);
 export const twoRApi = (params: any) => post(Api.twoR, params);
 export const twoRNApi = (params: any) => get(Api.twoRN, params);
+export const twoRNDetailApi = (params: any) => get(Api.twoRNDetail, params);
+export const loveTrendByOneApi = (params: any) => get(Api.loveTrendByOne, params);
 export const nearResourcesApi = (params: any) => get(Api.nearResources, params);
 export const todayEmergencyListApi = (params: any) => post(Api.todayEmergencyList, params);
 export const healthArchivesApi = (params: any) => get(Api.healthArchives, params);

src/views/indexSun/indexSun.ts

@@ -153,7 +153,7 @@ export function infoContent(res: any) {
             </div>
             <div class="modal-item" style="margin: 0 0 5px 0;">
                 <span class="item-one">地点：</span>
-                <span class="item-two">${res.name ? res.name : '--'}</span>
+                <span class="item-two">${res.address ? res.address : '--'}</span>
             </div>
         <div class="modal-btn">
             <div class="view-btn viewBtn" id='${JSON.stringify(res)}'>查看详情</div>
@@ -630,12 +630,12 @@ export const centerMapColumns = [
     },
     {
         title: '检查类型',
-        dataIndex: 'checkType',
+        dataIndex: 'checkTypeName',
-        key: 'checkType',
+        key: 'checkTypeName',
-        customRender: ({ text }) => {
+        // customRender: ({ text }) => {
-            const dddd = checkData.filter((item) => item.value == text);
+        //     const dddd = checkData.filter((item) => item.value == text) || [];
-            return dddd[0].label;
+        //     return dddd.length > 0 ? dddd[0].label : '';
-        },
+        // },
     },
     {
         title: '去年检查值',
@@ -679,19 +679,19 @@ export const centerMapFromList = [
         placeholder: '请输入姓名',
         defaultValue: '',
     },
-    {
+    // {
-        label: '检查类型',
+    //     label: '检查类型',
-        field: 'checkType',
+    //     field: 'checkType',
-        type: 'select',
+    //     type: 'select',
-        placeholder: '请输入检查类型',
+    //     placeholder: '请输入检查类型',
-        options: checkData,
+    //     options: checkData,
-        defaultValue: '',
+    //     defaultValue: '',
-    },
+    // },
     {
         label: '是否成功控降',
         field: 'successFlag',
         type: 'select',
-        placeholder: '请输入是否成功控降',
+        placeholder: '请选择是否成功控降',
         options: isTrueOfFalse,
         defaultValue: '',
     },
@@ -720,18 +720,21 @@ export const twoRNewColumns = [
         dataIndex: 'sex',
         key: 'sex',
         width: 50,
+        customRender: ({ text }) => {
+            switch (text) {
+                case '1':
+                    return '女';
+                case '2':
+                    return '男';
+                default:
+                    return '';
+            }
+        },
     },
     {
         title: '年龄',
         dataIndex: 'age',
         key: 'age',
-        customRender: ({ text }) => {
-            if (text == '1') {
-                return '女';
-            } else {
-                return '男';
-            }
-        },
         width: 50,
     },
     {
@@ -825,7 +828,7 @@ export const twoRNewForm = [
     },
     {
         label: '单位',
-        field: 'orgName',
+        field: 'workUnit',
         type: 'input',
         placeholder: '请输入单位',
         defaultValue: '',

src/views/indexSun/oneRightNew.vue

@@ -91,10 +91,10 @@
                                 <div class="item-label">BMI：</div><div class="item-value">{{ archives?.bmi || '-' }}</div>
                             </div>
                             <div class="item-d">
-                                <div class="item-label">尿酸：</div><div class="item-value">{{ archives?.ua || '-' }}</div>
+                                <div class="item-label">尿酸：</div><div class="item-value">{{ archives?.uricAcid || '-' }}</div>
                             </div>
                             <div class="item-d">
-                                <div class="item-label">血同型半胱氨酸：</div><div class="item-value">{{ archives?.hcy || '-' }}</div>
+                                <div class="item-label">血同型半胱氨酸：</div><div class="item-value">{{ archives?.homocysteine || '-' }}</div>
                             </div>
                             <div class="item-d">
                                 <div class="item-label">空腹葡萄糖：</div><div class="item-value">{{ archives?.glu || '-' }}</div>
@@ -102,10 +102,12 @@
                             <div>
                                 <div style="color: #ffffff"> 血压：</div>
                                 <div class="son-item item-d">
-                                    <div class="item-label">目前收缩压监测值：</div><div class="item-value">{{ archives?.sbp || '-' }}</div>
+                                    <div class="item-label">目前收缩压监测值：</div>
+                                    <div class="item-value">{{ archives?.systolicPressureCurrent || '-' }}</div>
                                 </div>
                                 <div class="son-item item-d">
-                                    <div class="item-label">目前舒张压监测值：</div><div class="item-value">{{ archives?.dbp || '-' }}</div>
+                                    <div class="item-label">目前舒张压监测值：</div>
+                                    <div class="item-value">{{ archives?.diastolicPressureCurrent || '-' }}</div>
                                 </div>
                             </div>
                             <div>
@@ -192,7 +194,7 @@
     function handleArchives() {
         archives.value = {};
         openInfo.value = true;
-        healthArchivesApi({ userId: props.userData?.userId })
+        healthArchivesApi({ anYanUserId: props.userData?.anYanUserId, employeeNum: props.userData?.employeeNum })
             .then((res: any) => {
                 console.log(res);
                 if (res?.code === 200) {

src/views/indexSun/twoNewR.data.ts

@@ -1,3 +1,4 @@
+const w = '50px';
 export const list = [
     {
         label: '姓名',
@@ -87,12 +88,14 @@ export const list = [
         label: '目标',
         field: 'systolicPressureTarget',
         span: 8,
+        width: w,
         options: null,
     },
     {
         label: '目前',
         field: 'systolicPressureCurrent',
         span: 8,
+        width: w,
         options: null,
     },
     {
@@ -105,12 +108,14 @@ export const list = [
         label: '目标',
         field: 'diastolicPressureTarget',
         span: 8,
+        width: w,
         options: null,
     },
     {
         label: '目前',
         field: 'diastolicPressureCurrent',
         span: 8,
+        width: w,
         options: null,
     },
     {
@@ -138,12 +143,14 @@ export const list = [
         label: '目标',
         field: 'bloodSugarTarget',
         span: 8,
+        width: w,
         options: null,
     },
     {
         label: '目前',
         field: 'bloodSugarCurrent',
         span: 8,
+        width: w,
         options: null,
     },
     {
@@ -156,12 +163,14 @@ export const list = [
         label: '目标',
         field: 'ldlTarget',
         span: 8,
+        width: w,
         options: null,
     },
     {
         label: '目前',
         field: 'ldlCurrent',
         span: 8,
+        width: w,
         options: null,
     },
     {
@@ -174,12 +183,14 @@ export const list = [
         label: '目标',
         field: 'tcTarget',
         span: 8,
+        width: w,
         options: null,
     },
     {
         label: '目前',
         field: 'tcCurrent',
         span: 8,
+        width: w,
         options: null,
     },
     {
@@ -192,12 +203,14 @@ export const list = [
         label: '目标',
         field: 'tgTarget',
         span: 8,
+        width: w,
         options: null,
     },
     {
         label: '目前',
         field: 'tgCurrent',
         span: 8,
+        width: w,
         options: null,
     },
     {
@@ -210,12 +223,14 @@ export const list = [
         label: '目标',
         field: 'uricAcidTarget',
         span: 8,
+        width: w,
         options: null,
     },
     {
         label: '目前',
         field: 'uricAcidCurrent',
         span: 8,
+        width: w,
         options: null,
     },
     {
@@ -228,12 +243,14 @@ export const list = [
         label: '目标',
         field: 'homocysteineTarget',
         span: 8,
+        width: w,
         options: null,
     },
     {
         label: '目前',
         field: 'homocysteineCurrent',
         span: 8,
+        width: w,
         options: null,
     },
 ];

src/views/indexSun/twoNewR.vue

@@ -27,16 +27,31 @@
         </div>
         <Dialog :openVis="openInfor" width="40%" title="关爱人员详情" @close="handlePoliceClose">
             <template #container>
-                <div class="police-con" :class="[themeType]">
+                <div class="police-con" style="position: relative" :class="[themeType]">
+                    <div
+                        v-if="showSping"
+                        style="
+                            position: absolute;
+                            top: 0;
+                            left: 0;
+                            width: 100%;
+                            height: 100%;
+                            display: flex;
+                            align-items: center;
+                            justify-content: center;
+                        "
+                    >
+                        <a-spin tip="加载中..." style="z-index: 99" />
+                    </div>
                     <Row type="flex">
                         <Col v-for="(item, index) in filedList" :key="`filed-list-${index}`" :span="item.span">
                             <div class="col-d">
-                                <div style="width: 180px; text-align: right">{{ item.label }}：</div>
+                                <div style="text-align: right" :style="{ width: item?.width ? item?.width : '140px' }">{{ item.label }}：</div>
                                 <div style="flex: 1">
                                     <template v-if="!item.options">
                                         {{ userInfo?.[item.field] && userInfo?.[item.field] !== 0 ? userInfo?.[item.field] : '-' }}
                                     </template>
-                                    <template v-else> {{ getName(userInfo?.[item.field], item.options) }} </template>
+                                    <template v-else> {{ getName(userInfo?.[item.field], item.options) }}</template>
                                 </div>
                             </div>
                         </Col>
@@ -48,14 +63,13 @@
 </template>
 <script setup lang="ts">
     import { Vue3SeamlessScroll } from 'vue3-seamless-scroll';
-    import { Empty } from 'ant-design-vue';
+    import { Col, Empty, Row } from 'ant-design-vue';
-    import { ref, onMounted, watch, reactive } from 'vue';
+    import { reactive, ref, watch } from 'vue';
     import pointPng from '/@/assets/indexSun/point.png';
     import Dialog from '/@/components/dialog/Dialog.vue';
     import { useTheme } from '/@/hooks/theme/useTheme.ts';
-    import { twoRNApi } from '/@/views/indexSun/indexSun.api.ts';
+    import { loveTrendByOneApi, twoRNApi } from '/@/views/indexSun/indexSun.api.ts';
     import dayjs from 'dayjs';
-    import { Row, Col } from 'ant-design-vue';
     import { getName, list } from '/@/views/indexSun/twoNewR.data.ts';
 
     const { themeType } = useTheme();
@@ -65,6 +79,7 @@
     const userInfo = ref<any>({});
 
     const filedList = reactive(list);
+    const showSping = ref(false);
 
     const props = defineProps({
         bKey: {
@@ -78,31 +93,47 @@
     });
 
     const emit = defineEmits(['handleView', 'showReset']);
-    onMounted(() => {
+    // onMounted(() => {
-        getList();
+    //     getList();
-    });
+    // });
 
     watch(props, () => {
         getList();
     });
+
     function getList() {
         twoRNApi({ centerId: props.centerId })
             .then((res: any) => {
                 if (res.code === 200) {
-                    scrollList.value = res?.result?.records || [];
+                    scrollList.value = res?.result || [];
                 }
             })
             .catch((e: any) => {});
     }
+
     function handlePolice(item: any) {
-        userInfo.value = item;
+        debugger;
         openInfor.value = true;
-        step.value = 0;
+        showSping.value = true;
+        userInfo.value = {};
+        loveTrendByOneApi({ anYanUserId: item?.empId, idNo: item?.idNo })
+            .then((res: any) => {
+                if (res.code === 200) {
+                    userInfo.value = res?.result || {};
+                }
+                step.value = 0;
+                showSping.value = false;
+            })
+            .catch(() => {
+                showSping.value = false;
+            });
     }
+
     function handlePoliceClose() {
         openInfor.value = false;
         step.value = 0.2;
     }
+
     function handleView() {
         emit('handleView');
     }
@@ -113,6 +144,7 @@
         display: flex;
         flex-direction: column;
         letter-spacing: 0px;
+
         .title {
             height: 40px;
             border-radius: 14px 14px 0 0;
@@ -126,17 +158,21 @@
             align-items: center;
             justify-content: space-between;
             background: linear-gradient(to right, rgba(8, 75, 100, 0.5) 0%, rgba(255, 255, 255, 0) 100%);
+
             .look-view {
                 font-size: 14px;
                 cursor: pointer;
             }
         }
+
         .content {
             padding: 10px 20px;
             height: calc(100% - 40px);
+
             .content-item {
                 height: 100%;
                 overflow: hidden;
+
                 .item-d {
                     background: #09314d;
                     margin-bottom: 10px;
@@ -148,6 +184,7 @@
                     justify-content: space-between;
                     font-size: 14px;
                     cursor: pointer;
+
                     .item-d-img {
                         img {
                             display: inline-block;
@@ -182,6 +219,7 @@
             }
         }
     }
+
     .ant-row {
         margin-bottom: 10px;
     }