diff --git a/.env.development b/.env.development index e2c0c6c..973d9d4 100644 --- a/.env.development +++ b/.env.development @@ -5,5 +5,7 @@ VITE_GLOB_API_URL=http://cqyt.dev.yg.dt.io #应急求助-websocket VITE_GLOB_API_YIN_JI=ws://cqyt.dev.yg.dt.io/health-watch/websocket/watchMonitor +#VITE_GLOB_API_YIN_JI=ws://192.168.1.3:7098/websocket/watchMonitor #健康监测工具报警-websocket VITE_GLOB_API_JIAN_CE=ws://cqyt.dev.yg.dt.io/health-emergency/websocket/emergency +#VITE_GLOB_API_JIAN_CE=ws://192.168.1.3:7011/websocket/emergency diff --git a/package.json b/package.json index 3f6bfda..f88ea57 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", "@iamzzg/data-view": "^2.10.0", + "autoprefixer": "^10.4.16", "axios": "^1.6.2", "dayjs": "^1.11.10", "jsencrypt": "^3.3.2", @@ -22,6 +23,10 @@ "mitt": "^3.0.1", "path": "^0.12.7", "pinia": "^2.1.7", + "postcss": "^8.4.32", + "postcss-loader": "^7.3.3", + "postcss-plugin-px2rem": "^0.8.1", + "postcss-px2rem": "^0.3.0", "prettier": "^3.1.0", "qs": "^6.11.2", "vue-router": "^4.2.5", diff --git a/src/api/dictCode.ts b/src/api/dictCode.ts index 8ec3c1e..3cda66a 100644 --- a/src/api/dictCode.ts +++ b/src/api/dictCode.ts @@ -4,6 +4,7 @@ enum Api { code = '/sys/dictItem/list', } +//锻炼字典 export const getCodeInfo = (params: any) => get(Api.code, { pageNo: 1, @@ -11,3 +12,4 @@ export const getCodeInfo = (params: any) => dictId: '1722171687208849409', ...params, }); +export const montionFieldNames = { label: 'itemText', value: 'itemValue' }; \ No newline at end of file diff --git a/src/assets/mapUtils/commonFun.ts b/src/assets/mapUtils/commonFun.ts index 72a4659..9cf4d99 100644 --- a/src/assets/mapUtils/commonFun.ts +++ b/src/assets/mapUtils/commonFun.ts @@ -31,7 +31,7 @@ export function typeToIcon(type: string) { if (type == '3') { return createIcon({ icon: mapIcon2, iconSize, imageSize }); } - if (type == '4') { + if (type == '5') { return createIcon({ icon: mapIcon3, iconSize, imageSize }); } if (type == '6') { diff --git a/src/components/body-d-right/bodyRightHooks.ts b/src/components/body-d-right/bodyRightHooks.ts index c284201..aa88cb0 100644 --- a/src/components/body-d-right/bodyRightHooks.ts +++ b/src/components/body-d-right/bodyRightHooks.ts @@ -1,4 +1,5 @@ import { computed, ref } from 'vue'; +import { visibleChartLabel } from '/@/utils/utils.ts'; // 列表字段 export const columns = [ { @@ -95,6 +96,7 @@ export function useHealth() { } export function ringOption(chartData, total) { + const data = visibleChartLabel(chartData); return { title: { text: '总人数', @@ -147,7 +149,7 @@ export function ringOption(chartData, total) { labelLine: { show: false, }, - data: chartData, + data: data, }, ], }; diff --git a/src/components/body-d-right/oneR.vue b/src/components/body-d-right/oneR.vue index f371e73..3f315f8 100644 --- a/src/components/body-d-right/oneR.vue +++ b/src/components/body-d-right/oneR.vue @@ -6,8 +6,7 @@
- +
{{ item?.realName }} {{ item?.eventType_dictText }} @@ -59,225 +58,224 @@
\ No newline at end of file diff --git a/src/components/chinaMap/chinaHooks.ts b/src/components/chinaMap/chinaHooks.ts index e3a515b..c813680 100644 --- a/src/components/chinaMap/chinaHooks.ts +++ b/src/components/chinaMap/chinaHooks.ts @@ -5,8 +5,8 @@ export enum TabType { youTianYiYuan = '1', //油田医院 heZuoYiYuan = '2', //合作医院 yiLiaoDian = '3', //医疗点 - jiuHuChe = '4', //救护车 - zhiShengJi = '5', //直升机 + jiuHuChe = '5', //救护车 + zhiShengJi = '4', //直升机 diFangYiYuan = '6', //地方医院 } @@ -105,12 +105,12 @@ export function mapApiSwitch(type, params: any) { lon: 108, //经度 }; // 全部 油田 医疗点 合作医院 - if ([TabType.all, TabType.youTianYiYuan, TabType.yiLiaoDian, TabType.heZuoYiYuan].includes(type)) { + if ([TabType.all, TabType.youTianYiYuan, TabType.yiLiaoDian, TabType.heZuoYiYuan, TabType.jiuHuChe, TabType.jiuHuChe].includes(type)) { return getAllList({ ...basicParams, ...params }); } - if ([TabType.jiuHuChe].includes(type)) { - return getAmbulanceList({}); - } + // if ([TabType.jiuHuChe].includes(type)) { + // return getAmbulanceList({}); + // } } export const mapIcon1 = new URL('/@/assets/img/mapIcon1.png', import.meta.url).href; diff --git a/src/components/chinaMap/chinaMap.vue b/src/components/chinaMap/chinaMap.vue index a825dd5..3d4414f 100644 --- a/src/components/chinaMap/chinaMap.vue +++ b/src/components/chinaMap/chinaMap.vue @@ -87,7 +87,6 @@ if (TabType.diFangYiYuan == item.type) { Map.clearActiveHospital(); Map.map.on('moveend', logMapinfo); - // debugger; return; } if (TabType.zhiShengJi == item.type) { @@ -116,25 +115,26 @@ async function getMapData(type, params = {}) { try { const { code, result } = await mapApiSwitch(type, params); - if (code == 200 && Array.isArray(result) && result.length > 0) { - Map.createOverlay(result, { - content: (val) => { - return `
`; - }, - }); + }, + }); + } else { + Map.removeOverlayGroup(); + } } } catch (e) { - console.log('error------------------------------'); console.warn(e); } - 1; - // console.log('--->data', result); } const footerData = ref({ @@ -241,6 +241,7 @@ display: flex; flex-wrap: wrap; justify-content: space-between; + font-size: 16px; .tab { width: calc(100% / 8); diff --git a/src/components/item-d/item-d.vue b/src/components/item-d/item-d.vue index 4ba19b4..34d552e 100644 --- a/src/components/item-d/item-d.vue +++ b/src/components/item-d/item-d.vue @@ -6,7 +6,7 @@
-
+
总人数
{{ userCount }}
@@ -48,6 +48,9 @@ () => props.data, () => { init(); + }, + { + deep: true, } ); @@ -57,7 +60,7 @@ function initChart(chartData, total, color) { let myChart = echarts.init(healthChart.value); - let options = circleRing(chartData, total, color, '{d}%'); + let options = circleRing(chartData, total, color); myChart.setOption(options); window.addEventListener('resize', () => { myChart.resize(); diff --git a/src/components/item-d/pieCharts.ts b/src/components/item-d/pieCharts.ts index 1e6e7c1..9d3a4ff 100644 --- a/src/components/item-d/pieCharts.ts +++ b/src/components/item-d/pieCharts.ts @@ -1,3 +1,6 @@ +// 步数 +import {visibleChartLabel} from "/@/utils/utils.ts"; + export function screenPie(chartData, total, color, formatter) { return { color: color, @@ -11,7 +14,7 @@ export function screenPie(chartData, total, color, formatter) { borderColor: '#1b7ef2', }, legend: { - left: '74%', + left: '72%', top: 'center', orient: 'vertical', icon: 'circle', @@ -24,22 +27,19 @@ export function screenPie(chartData, total, color, formatter) { series: [ { type: 'pie', - // radius: ['50%', '86%'], - // center: ['42%', '55%'], radius: ['50%', '76%'], - center: ['42%', '49%'], + center: ['40%', '49%'], avoidLabelOverlap: false, label: { show: true, position: 'outside', - formatter: formatter, color: '#ffffff', fontSize: 14, }, labelLine: { show: true, length: 6, - length2: 20, + length2: 10, minTurnAngle: 120, }, data: chartData, @@ -49,7 +49,8 @@ export function screenPie(chartData, total, color, formatter) { } //左侧圆 -export function circleRing(chartData, total, color, formatter) { +export function circleRing(chartData, total, color) { + const data = visibleChartLabel(chartData) return { color: color, tooltip: { @@ -81,14 +82,14 @@ export function circleRing(chartData, total, color, formatter) { label: { show: true, position: 'inner', - formatter: formatter, + formatter: '{d}%', color: '#ffffff', fontSize: 14, }, labelLine: { show: false, }, - data: chartData, + data: data, }, ], }; diff --git a/src/components/publicTitle.vue b/src/components/publicTitle.vue index dd23dff..da6b60f 100644 --- a/src/components/publicTitle.vue +++ b/src/components/publicTitle.vue @@ -58,7 +58,7 @@ } .tips { - font-size: 13px; + font-size: 16px; padding-right: 10px; font-weight: normal; } diff --git a/src/components/secondaryScreen/screen-left/screenLeft.vue b/src/components/secondaryScreen/screen-left/screenLeft.vue index 0b20823..e9b33a1 100644 --- a/src/components/secondaryScreen/screen-left/screenLeft.vue +++ b/src/components/secondaryScreen/screen-left/screenLeft.vue @@ -1,6 +1,6 @@ @@ -9,7 +9,9 @@ import { cloneDeep } from 'lodash-es'; import ItemD from '/@/components/item-d/item-d.vue'; import { getWatchDataByOrgCode } from '/@/components/secondaryScreen/commonApi.ts'; + import { useSpin } from '/@/components/body-d-left/bodyLeftHooks.ts'; + const { spinning, setSpin } = useSpin(); const dataList = ref([ { title: '心率', @@ -51,7 +53,7 @@ { title: '体温', data: [ - { name: '37.2', value: 0, key: 'normalCountCount' }, + { name: '<37.2', value: 0, key: 'normalCount' }, { name: '37.2-38', value: 0, key: 'warnCount' }, { name: '>38', value: 0, key: 'riskCount' }, ], @@ -73,6 +75,7 @@ async function init() { const { code, result } = await getWatchDataByOrgCode(props); + // debugger; if (code == 200) { let data = cloneDeep(dataList.value); data.forEach((item) => { @@ -82,7 +85,9 @@ val.value = resData[val.key]; }); }); + dataList.value = data; + setSpin(!spinning.value); } } diff --git a/src/components/secondaryScreen/screen-right/oneR.vue b/src/components/secondaryScreen/screen-right/oneR.vue index 977b4f6..d67afd2 100644 --- a/src/components/secondaryScreen/screen-right/oneR.vue +++ b/src/components/secondaryScreen/screen-right/oneR.vue @@ -24,7 +24,6 @@ watch( props, () => { - console.log(111111111111); init(); }, { immediate: true } diff --git a/src/components/secondaryScreen/screen-right/screenRightHooks.ts b/src/components/secondaryScreen/screen-right/screenRightHooks.ts index 7b80c2b..a81a7fb 100644 --- a/src/components/secondaryScreen/screen-right/screenRightHooks.ts +++ b/src/components/secondaryScreen/screen-right/screenRightHooks.ts @@ -69,7 +69,7 @@ export function sleepCharts({ time, short, long, awake, type }) { height: 40, itemHeight: 14, top: -5, - left: '55%', + left: '52%', }, color: ['#14B3F8', '#6D7BEB', '#5451DC'], xAxis: { diff --git a/src/components/secondaryScreen/screen-right/threeR.vue b/src/components/secondaryScreen/screen-right/threeR.vue index df43d40..3359da1 100644 --- a/src/components/secondaryScreen/screen-right/threeR.vue +++ b/src/components/secondaryScreen/screen-right/threeR.vue @@ -23,7 +23,7 @@
- + \ No newline at end of file diff --git a/src/components/secondaryScreen/secondMap/components/userInfoModal/stepNumber.vue b/src/components/secondaryScreen/secondMap/components/userInfoModal/stepNumber.vue index 0f1881c..5991081 100644 --- a/src/components/secondaryScreen/secondMap/components/userInfoModal/stepNumber.vue +++ b/src/components/secondaryScreen/secondMap/components/userInfoModal/stepNumber.vue @@ -59,7 +59,8 @@ function tableReload() { apiParams.value = { - ...getParams(), + flag: 0, + userId: props.userId, pageSize: 10, pageNo: 1, }; @@ -89,8 +90,6 @@ nextTick(() => { initEchart('0'); }); - } else { - tableReload(); } } @@ -123,7 +122,11 @@ backgroundColor: 'rgba(50,50,50,0.7)', borderColor: '#1b7ef2', }, - legend: {}, + legend: { + textStyle: { + color: '#fff', + }, + }, xAxis: { type: 'category', boundaryGap: true, diff --git a/src/components/secondaryScreen/secondMap/components/userInfoModal/temperature.vue b/src/components/secondaryScreen/secondMap/components/userInfoModal/temperature.vue index fddddf5..edf5f0c 100644 --- a/src/components/secondaryScreen/secondMap/components/userInfoModal/temperature.vue +++ b/src/components/secondaryScreen/secondMap/components/userInfoModal/temperature.vue @@ -56,7 +56,8 @@ function tableReload() { apiParams.value = { - ...getParams(), + flag: 0, + userId: props.userId, pageSize: 10, pageNo: 1, }; @@ -86,8 +87,6 @@ nextTick(() => { initEchart('0'); }); - } else { - tableReload(); } } @@ -201,4 +200,4 @@ initEchart('0'); }); - + \ No newline at end of file diff --git a/src/components/secondaryScreen/secondMap/components/userInfoModal/userInfoModal.less b/src/components/secondaryScreen/secondMap/components/userInfoModal/userInfoModal.less index 7be520c..160c92d 100644 --- a/src/components/secondaryScreen/secondMap/components/userInfoModal/userInfoModal.less +++ b/src/components/secondaryScreen/secondMap/components/userInfoModal/userInfoModal.less @@ -21,13 +21,19 @@ } } +.fff { + color: #fff; +} + :deep(.ant-radio-button-checked) { background-color: #1B7EF2 !important; border-color: #1B7EF2 !important; } + :deep(.ant-radio-button-wrapper-checked) { border-color: #1B7EF2 !important; } + :deep(.ant-radio-button-wrapper) { background-color: #d8dce5 !important; border-color: #d8dce5 !important; diff --git a/src/components/secondaryScreen/secondMap/components/watchListDialog.vue b/src/components/secondaryScreen/secondMap/components/watchListDialog.vue index bd689cf..a74fd3a 100644 --- a/src/components/secondaryScreen/secondMap/components/watchListDialog.vue +++ b/src/components/secondaryScreen/secondMap/components/watchListDialog.vue @@ -29,6 +29,8 @@ import UserInfoModal from '/@/components/secondaryScreen/secondMap/components/userInfoModal/userInfoModal.vue'; import { columns } from '/@/components/secondaryScreen/secondMap/secondMapHooks.ts'; import { getUserListByDeptId } from '/@/components/secondaryScreen/secondMap/secondMapApi.ts'; + + const emit = defineEmits(['close']); //分页相关 const current = ref(1); const pageSize = ref(10); @@ -61,6 +63,7 @@ function closeModal() { visible.value = false; + emit('close'); } async function getRecords(id: string) { @@ -76,7 +79,6 @@ const userInfoModal = ref(); function openUserInfoModal(item) { - console.log('item', item); const data = { ...item, username: item?.realName, diff --git a/src/components/secondaryScreen/secondMap/secondMap.vue b/src/components/secondaryScreen/secondMap/secondMap.vue index a60c111..c5f0b8b 100644 --- a/src/components/secondaryScreen/secondMap/secondMap.vue +++ b/src/components/secondaryScreen/secondMap/secondMap.vue @@ -9,32 +9,32 @@
-
+
{{ item?.name }}
-
{{ item?.value }}
+
{{ item?.value }}
- +