diff --git a/Dockerfile b/Dockerfile index 703afe3..ef5651d 100644 --- a/Dockerfile +++ b/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')模式下，刷新路由地址不能找到页面的问题 \ diff --git a/DockerfileXj b/DockerfileXj deleted file mode 100644 index 36018e4..0000000 --- a/DockerfileXj +++ /dev/null @@ -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 diff --git a/package.json b/package.json index 190db07..0ef22c8 100644 --- a/package.json +++ b/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", diff --git a/src/enum/pageEnum.ts b/src/enum/pageEnum.ts index bff7ef9..2f7ee83 100644 --- a/src/enum/pageEnum.ts +++ b/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() { diff --git a/src/views/indexSun.vue b/src/views/indexSun.vue index a05df3f..e0f0ad6 100644 --- a/src/views/indexSun.vue +++ b/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', - // endDate: '2030-12-31', + startDate: '2000-01-01', + 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; diff --git a/src/views/indexSun/indexModal.vue b/src/views/indexSun/indexModal.vue index 47a15b5..2294334 100644 --- a/src/views/indexSun/indexModal.vue +++ b/src/views/indexSun/indexModal.vue @@ -280,11 +280,15 @@ }; } function handleClicksearch() { - formState.value = { - ...formState.value, - ...formRecord.value, - salvageUserDepart: orgCode2.value ? orgCode2.value : orgCode1.value ? orgCode1.value : '', - }; + try { + formState.value = { + ...formState.value, + ...formRecord.value, + salvageUserDepart: orgCode2.value ? orgCode2.value : orgCode1.value ? orgCode1.value : '', + }; + } catch (e) { + console.log(e); + } // registerTable.value.getRecords(); } diff --git a/src/views/indexSun/indexSun.api.ts b/src/views/indexSun/indexSun.api.ts index c1450df..3c0c177 100644 --- a/src/views/indexSun/indexSun.api.ts +++ b/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); diff --git a/src/views/indexSun/indexSun.ts b/src/views/indexSun/indexSun.ts index 129e82f..cdf3719 100644 --- a/src/views/indexSun/indexSun.ts +++ b/src/views/indexSun/indexSun.ts @@ -153,7 +153,7 @@ export function infoContent(res: any) {
地点： - ${res.name ? res.name : '--'} + ${res.address ? res.address : '--'}
查看详情
@@ -630,12 +630,12 @@ export const centerMapColumns = [ }, { title: '检查类型', - dataIndex: 'checkType', - key: 'checkType', - customRender: ({ text }) => { - const dddd = checkData.filter((item) => item.value == text); - return dddd[0].label; - }, + dataIndex: 'checkTypeName', + key: 'checkTypeName', + // customRender: ({ text }) => { + // const dddd = checkData.filter((item) => item.value == text) || []; + // return dddd.length > 0 ? dddd[0].label : ''; + // }, }, { title: '去年检查值', @@ -679,19 +679,19 @@ export const centerMapFromList = [ placeholder: '请输入姓名', defaultValue: '', }, - { - label: '检查类型', - field: 'checkType', - type: 'select', - placeholder: '请输入检查类型', - options: checkData, - defaultValue: '', - }, + // { + // label: '检查类型', + // field: 'checkType', + // type: 'select', + // placeholder: '请输入检查类型', + // options: checkData, + // 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: '', diff --git a/src/views/indexSun/oneRightNew.vue b/src/views/indexSun/oneRightNew.vue index 3457d14..f486489 100644 --- a/src/views/indexSun/oneRightNew.vue +++ b/src/views/indexSun/oneRightNew.vue @@ -91,10 +91,10 @@
BMI：
{{ archives?.bmi || '-' }}
-
尿酸：
{{ archives?.ua || '-' }}
+
尿酸：
{{ archives?.uricAcid || '-' }}
-
血同型半胱氨酸：
{{ archives?.hcy || '-' }}
+
血同型半胱氨酸：
{{ archives?.homocysteine || '-' }}
空腹葡萄糖：
{{ archives?.glu || '-' }}
@@ -102,10 +102,12 @@
血压：
-
目前收缩压监测值：
{{ archives?.sbp || '-' }}
+
目前收缩压监测值：
+
{{ archives?.systolicPressureCurrent || '-' }}
-
目前舒张压监测值：
{{ archives?.dbp || '-' }}
+
目前舒张压监测值：
+
{{ archives?.diastolicPressureCurrent || '-' }}
@@ -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) { diff --git a/src/views/indexSun/twoNewR.data.ts b/src/views/indexSun/twoNewR.data.ts index e3e1ef1..556970e 100644 --- a/src/views/indexSun/twoNewR.data.ts +++ b/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, }, ]; diff --git a/src/views/indexSun/twoNewR.vue b/src/views/indexSun/twoNewR.vue index 00cf034..f8b0c7f 100644 --- a/src/views/indexSun/twoNewR.vue +++ b/src/views/indexSun/twoNewR.vue @@ -27,16 +27,31 @@