diff --git a/.env.development b/.env.development index 3d8bcdb..5ef7432 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,7 @@ # 王昊地址 -#VITE_GLOB_API_URL=http://192.168.1.27 +#VITE_GLOB_API_URL=http://192.168.1.98 #开发环境 -VITE_GLOB_API_URL=http://cqyt.dev.yg.dt.io +VITE_GLOB_API_URL=https://xjgateway.mcrm.vip:8888 #VITE_GLOB_API_URL=https://api.cqygjk.com #健康监测工具报警-websocket #VITE_GLOB_API_YIN_JI=ws://cqyt.dev.yg.dt.io/health-watch/websocket/watchMonitor diff --git a/src/assets/images/info-modal.png b/src/assets/images/info-modal.png index 2be6ce4..d7b31ef 100644 Binary files a/src/assets/images/info-modal.png and b/src/assets/images/info-modal.png differ diff --git a/src/assets/indexSun/bloodClock.png b/src/assets/indexSun/bloodClock.png new file mode 100644 index 0000000..c1b164a Binary files /dev/null and b/src/assets/indexSun/bloodClock.png differ diff --git a/src/assets/indexSun/fatClock.png b/src/assets/indexSun/fatClock.png new file mode 100644 index 0000000..d03512f Binary files /dev/null and b/src/assets/indexSun/fatClock.png differ diff --git a/src/assets/indexSun/hospital.png b/src/assets/indexSun/hospital.png new file mode 100644 index 0000000..1b0f80e Binary files /dev/null and b/src/assets/indexSun/hospital.png differ diff --git a/src/assets/indexSun/today.png b/src/assets/indexSun/today.png new file mode 100644 index 0000000..48238f7 Binary files /dev/null and b/src/assets/indexSun/today.png differ diff --git a/src/assets/indexSun/weightClock.png b/src/assets/indexSun/weightClock.png new file mode 100644 index 0000000..03c91b3 Binary files /dev/null and b/src/assets/indexSun/weightClock.png differ diff --git a/src/assets/less/index.less b/src/assets/less/index.less index f62a6a6..14309ed 100644 --- a/src/assets/less/index.less +++ b/src/assets/less/index.less @@ -115,8 +115,9 @@ html, body, #app { // 下拉框样式-start .ant-select { - color: var(--antSelectFontColor) !important; - background-color: var(--antSelectBg); + color: #fff !important; + background-color: #082147 !important; + border-radius: 4px !important; } .ant-select-dropdown { @@ -126,14 +127,15 @@ html, body, #app { } .ant-select-item { - color: #1b7ef2 !important; + color: #fff !important; } //框背景色 .ant-select:not(.ant-select-customize-input) .ant-select-selector { color: var(--antSelectFontColor) !important; background-color: transparent !important; - border: 1px solid var(--antSelectDropdownBorderColor) !important; + border: 1px solid transparent !important; + border-radius: 4px !important; } .ant-select-item-option-selected { @@ -213,7 +215,7 @@ html, body, #app { .ant-modal-title { color: #576BAD !important; - background: url('/@/assets/images/dialog-light.png') no-repeat; + //background: url('/@/assets/images/dialog-light.png') no-repeat; background-size: 100% 100%; } } @@ -229,8 +231,10 @@ html, body, #app { .ant-modal-title { color: #ffffff !important; - background: url('/@/assets/images/dialog.png') no-repeat; - background-size: 100% 100%; + //background: url('/@/assets/images/dialog.png') no-repeat; + //background-size: 100% 100%; + background: #082147; + border: 1px solid #00CCFF; } } diff --git a/src/assets/mapUtils/commonFun.ts b/src/assets/mapUtils/commonFun.ts index 2177592..10c401d 100644 --- a/src/assets/mapUtils/commonFun.ts +++ b/src/assets/mapUtils/commonFun.ts @@ -1,4 +1,4 @@ -import { mapIcon1, mapIcon2, mapIcon3, mapIcon4, mapIcon7 } from '/@/components/chinaMap/chinaHooks.ts'; +import { mapIcon1, mapIcon2, mapIcon3, mapIcon4, mapIcon5, mapIcon7 } from '/@/components/chinaMap/chinaHooks.ts'; import { watchIcon } from '/@/components/secondaryScreen/secondMap/secondMapHooks.ts'; import * as turf from '@turf/turf'; @@ -27,7 +27,7 @@ export function typeToIcon(type: string, centerResource: boolean) { return createIcon({ icon: mapIcon1, iconSize, imageSize }); } if (type == '2') { - return createIcon({ icon: mapIcon4, iconSize, imageSize }); + return createIcon({ icon: mapIcon5, iconSize, imageSize }); } //关联医疗点 if (type == '3' && centerResource) { @@ -69,14 +69,17 @@ export function createCircle(option) { export function getLonLat(result = []) { let arr = []; for (let i = 0; i < result.length; i++) { - let { lon, lat, lng } = result[i]; - if (lng) { - lon = lng; + let { lon, lat, lng, longitude, latitude } = result[i]; + if (longitude) { + lon = longitude; } - if (!lon || !lat) { + if (latitude) { + lat = latitude; + } + if (!longitude || !latitude) { continue; } - let point = turf.point([lon, lat]); + let point = turf.point([lon * 1, lat * 1]); arr.push(point); } return arr; diff --git a/src/assets/mapUtils/map.ts b/src/assets/mapUtils/map.ts index efbdf91..c015698 100644 --- a/src/assets/mapUtils/map.ts +++ b/src/assets/mapUtils/map.ts @@ -144,11 +144,15 @@ export const Map = { this.setZoomCenter(center, zoom); } for (let i = 0; i < result.length; i++) { - let { type, lon, lat, lng, centerResource } = result[i]; - if (lng) { - lon = lng; + let { type, lon, lat, longitude, latitude, lng, centerResource } = result[i]; + + if (longitude) { + lon = longitude; } - if (!lon || !lat || !type) { + if (latitude) { + lat = latitude; + } + if (!longitude || !latitude || !type) { continue; } // 创建一个 Icon @@ -310,10 +314,10 @@ export const Map = { * * */ createInfoModal({ option, content }) { - let { lat, lng } = option; + let { latitude, longitude } = option; this.infoWindow = new AMap.InfoWindow({ - position: [lng, lat], - offset: new AMap.Pixel(-5, -25), + position: [longitude, latitude], + offset: new AMap.Pixel(-8, -25), content: content, closeWhenClickMap: true, }); diff --git a/src/assets/theme/theme.css b/src/assets/theme/theme.css index aeffd2a..1931255 100644 --- a/src/assets/theme/theme.css +++ b/src/assets/theme/theme.css @@ -4,12 +4,12 @@ --antSelectDropdownBorderColor: #1b7ef2; --antSelectItemActive: #002e64; --antSelectFontColor: #fff; - --antSelectBg: #000; + --antSelectBg: #082147; /*服务详情数据*/ --typeTimeSelectColor: #45a2ff; --typeTimeUnSelectColor: #a3a4a4; /*表格 */ - --tableHeadBg: rgba(35, 132, 221, 0.5); + --tableHeadBg: #073063; --tableFontColor: #fff; --tableRowBg: #00152b; --tableRowBorder: #2384dd; diff --git a/src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue b/src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue index 315eeef..116be94 100644 --- a/src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue +++ b/src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue @@ -15,7 +15,6 @@ - @@ -113,8 +112,8 @@ diff --git a/src/views/indexSun/indexModal.vue b/src/views/indexSun/indexModal.vue new file mode 100644 index 0000000..e88fb3a --- /dev/null +++ b/src/views/indexSun/indexModal.vue @@ -0,0 +1,149 @@ + + + diff --git a/src/views/indexSun/indexSun.api.ts b/src/views/indexSun/indexSun.api.ts new file mode 100644 index 0000000..e783807 --- /dev/null +++ b/src/views/indexSun/indexSun.api.ts @@ -0,0 +1,7 @@ +import { post } from '/@/api/request.ts'; + +enum Api { + statisticsNew = '/health-emergency/emergency/LargeScreenNew/statisticsNew', +} + +export const statisticsNewApi = (params) => post(Api.statisticsNew, params); diff --git a/src/views/indexSun/indexSun.ts b/src/views/indexSun/indexSun.ts index 2740953..6b0401f 100644 --- a/src/views/indexSun/indexSun.ts +++ b/src/views/indexSun/indexSun.ts @@ -1,10 +1,8 @@ import * as echarts from 'echarts'; import { legend1, legend2, legend3, legend4, legend5 } from '/@/components/xianMap/xianMapHooks.ts'; export const legend1 = new URL('/@/assets/img/legend1.png', import.meta.url).href; -export const legend2 = new URL('/@/assets/img/legend2.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; -export const legend4 = new URL('/@/assets/img/legend4.png', import.meta.url).href; -export const legend5 = new URL('/@/assets/img/legend5.png', import.meta.url).href; export function getClassCharts(dx, dy) { return { grid: { @@ -118,9 +116,115 @@ export const tabList = [ }, ]; export const legendList = [ + { img: legend2, text: '健康小屋', color: '#1BEFF6' }, { img: legend1, text: '油田医院', color: '#D86AF7' }, - { img: legend2, text: '医疗点', color: '#39D78B' }, { img: legend3, text: '救护车', color: '#EE7E31' }, - { img: legend4, text: '合作医院', color: '#3BAAFA' }, - { img: legend5, text: '地方医院', color: '#1BEFF6' }, ]; + +export function infoContent(res) { + return ` +
+
+ 单位： + ${res.orgName ? res.orgName : '--'} +
+
+ 关爱人数： + ${res.loveNum ? res.loveNum : '--'} +
+
+ 地点： + ${res.name ? res.name : '--'} +
+
+
查看详情
+
+
`; +} + +const columns1 = [ + { + title: '姓名', + dataIndex: 'realName', + key: 'realName', + }, + { + title: '单位', + dataIndex: 'departName', + key: 'departName', + ellipsis: true, + }, + { + title: '部门', + dataIndex: 'orgName', + key: 'orgName', + ellipsis: true, + }, + { + title: '性别', + dataIndex: 'sex_dictText', + key: 'sex_dictText', + width: 80, + }, + { + title: '时间', + dataIndex: 'time', + key: 'time', + }, + { + title: '电话', + dataIndex: 'phone', + key: 'phone', + }, +]; + +const columns2 = [ + { + title: '被救助人', + dataIndex: 'realName', + key: 'realName', + }, + { + title: '单位', + dataIndex: 'realName', + key: 'realName', + }, + { + title: '部门', + dataIndex: 'realName', + key: 'realName', + }, + { + title: '性别', + dataIndex: 'realName', + key: 'realName', + }, + { + title: '救助方式', + dataIndex: 'realName', + key: 'realName', + }, + { + title: '救助时间', + dataIndex: 'realName', + key: 'realName', + }, + { + title: '联系电话', + dataIndex: 'realName', + key: 'realName', + }, +]; + +const fromList = [ + { + label: '姓名', + field: 'realName', + type: 'input', + placeholder: '请输入姓名', + }, +]; + +export const columns = [columns1, columns2]; + +export const fromLists = [fromList]; diff --git a/src/views/indexSun/oneL.vue b/src/views/indexSun/oneL.vue index 2fdfcfb..1fe7e05 100644 --- a/src/views/indexSun/oneL.vue +++ b/src/views/indexSun/oneL.vue @@ -3,16 +3,16 @@
服务详情数据
-
+
本周
-
+
-
+
本月
-
+
@@ -23,25 +23,79 @@
-
+
{{ item?.name }} - {{ item?.value }}123 + {{ item?.value }}
diff --git a/src/views/indexSun/threeR.vue b/src/views/indexSun/threeR.vue new file mode 100644 index 0000000..b09e52b --- /dev/null +++ b/src/views/indexSun/threeR.vue @@ -0,0 +1,73 @@ + + + diff --git a/src/views/indexSun/twoL.vue b/src/views/indexSun/twoL.vue index d18aed0..17899c6 100644 --- a/src/views/indexSun/twoL.vue +++ b/src/views/indexSun/twoL.vue @@ -2,7 +2,7 @@
主诉分类 - 查看详情 + 查看详情
@@ -63,6 +63,13 @@ const dy = [46, 39, 18]; let option = getClassCharts(dx, dy); myChart.value.setOption(option); + window.addEventListener('resize', () => { + myChart.value.resize(); + }); + } + const emit = defineEmits(['handleView']); + function handleView() { + emit('handleView'); } diff --git a/src/views/sys/login.vue b/src/views/sys/login.vue index d07a3ec..ebb3bc6 100644 --- a/src/views/sys/login.vue +++ b/src/views/sys/login.vue @@ -191,7 +191,7 @@ try { let { code, result, message: msg } = await getAuth(); let centerInfo = {}; - if(route.path !== PageEnum.Q_SCREEN_LOGIN) { + if (route.path !== PageEnum.Q_SCREEN_LOGIN) { try { let { result } = await getEmergencyCenterApi(); centerInfo = result; @@ -220,7 +220,7 @@ //1如果有权限 2025-06-16补充判断，如果登陆路由为qLogin 青海登陆，则不走原有逻辑 //1.2若果是有两种权限 // debugger; - if(route.path === PageEnum.Q_SCREEN_LOGIN && flag4) { + if (route.path === PageEnum.Q_SCREEN_LOGIN && flag4) { goPath = PageEnum.Q_SCREEN; } else if (flag1 && flag2) { // 1.2.1 如果是登录地址是西安