From d614f10bb5e6c650e2864587aa9c47d4f8c3a276 Mon Sep 17 00:00:00 2001 From: zk Date: Thu, 14 Dec 2023 09:23:58 +0800 Subject: [PATCH] update --- .env.development | 4 +- src/App.vue | 15 +- src/assets/less/amap-item.less | 2 +- src/assets/less/index.less | 27 ++ src/assets/mapUtils/map.ts | 23 +- src/assets/ts/antd.ts | 4 +- src/components/body-d-right/right.api.ts | 1 - src/components/dialog/Dialog.vue | 3 +- src/components/item-d/pieCharts.ts | 22 +- src/components/secondaryScreen/commonApi.ts | 19 +- .../screen-left/screenLeft.vue | 119 ++++--- .../screen-left/screenLeftHooks.api.ts | 0 .../secondaryScreen/screen-right/oneR.vue | 57 ++- .../screen-right/screenRightHooks.ts | 147 +++++--- .../secondaryScreen/screen-right/threeR.vue | 320 +++++++++-------- .../secondaryScreen/screen-right/twoR.vue | 98 ++--- .../secondMap/components/watchListDialog.vue | 7 +- .../secondaryScreen/secondMap/secondMap.vue | 109 +++--- .../secondaryScreen/secondMap/secondMapApi.ts | 4 +- .../secondMap/secondMapHooks.ts | 40 ++- src/utils/busConstant.ts | 2 + src/utils/utils.ts | 12 + src/views/index.api.ts | 6 +- src/views/indexSon.vue | 336 +++++++++--------- vite.config.ts | 7 + 25 files changed, 826 insertions(+), 558 deletions(-) delete mode 100644 src/components/secondaryScreen/screen-left/screenLeftHooks.api.ts create mode 100644 src/utils/busConstant.ts diff --git a/.env.development b/.env.development index dbaefa2..772a175 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ # 王昊地址 -#VITE_GLOB_API_URL=http://192.168.1.6 +VITE_GLOB_API_URL=http://192.168.1.6 #开发环境 -VITE_GLOB_API_URL=http://cqyt.dev.yg.dt.io \ No newline at end of file +#VITE_GLOB_API_URL=http://cqyt.dev.yg.dt.io \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index 8142110..2bbaeb0 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,6 +1,15 @@ - + - + \ No newline at end of file diff --git a/src/assets/less/amap-item.less b/src/assets/less/amap-item.less index e8aee68..73eadee 100644 --- a/src/assets/less/amap-item.less +++ b/src/assets/less/amap-item.less @@ -30,7 +30,7 @@ .alarm-content { background-color: #263d5e; - color: red; + color: #fff; font-size: 14px; padding: 7px 10px; border: 1px solid #1b7ef2; diff --git a/src/assets/less/index.less b/src/assets/less/index.less index c4218c2..115b64d 100644 --- a/src/assets/less/index.less +++ b/src/assets/less/index.less @@ -63,6 +63,11 @@ white-space: nowrap; } +.ant-modal-mask { + background-color: rgba(0, 0, 0, 0.65) !important; +} + +// 下拉框样式-start .ant-select-dropdown { background-color: #00152b !important; border-right: 1px solid #1b7ef2; @@ -108,6 +113,28 @@ background-color: #002e64 !important; } +// 下拉框样式-end + +// 级联选择器样式-start +.ant-cascader-menu-item { + color: #1b7ef2 !important; +} + +.ant-cascader-menu-item:hover { + background-color: #002e64 !important; +} + +.ant-cascader-menu-item-active { + color: #fff !important; + background-color: #002e64 !important; +} + +.ant-cascader-menu-item-expand .ant-cascader-menu-item-expand-icon, .ant-cascader-menu-item-loading-icon { + color: #1b7ef2 !important; +} + +// 级联选择器样式-end + //直升机 .helicopter { width: 60px; diff --git a/src/assets/mapUtils/map.ts b/src/assets/mapUtils/map.ts index ade6017..bb1f742 100644 --- a/src/assets/mapUtils/map.ts +++ b/src/assets/mapUtils/map.ts @@ -41,11 +41,11 @@ export const Map = { * @desc 中国外层边界线 */, drawOutLine() { - let geojson = new AMap.GeoJSON({ + let geoJson = new AMap.GeoJSON({ geoJSON: china, - getPolygon: function (geojson, lnglats) { + getPolygon: function (geoJson, lngLats) { return new AMap.Polyline({ - path: lnglats[0], + path: lngLats[0], strokeColor: '#6ccffe', strokeWeight: 3, lineJoin: 'round', //折线拐点的绘制样式 @@ -55,22 +55,22 @@ export const Map = { }); }, }); - this.map.add(geojson); + this.map.add(geoJson); } /** * @desc 中国内层边界线 */, drawInnerLine() { - let geojson = new AMap.GeoJSON({ + let geoJson = new AMap.GeoJSON({ geoJSON: chinaInner, - getPolygon: function (geojson, lnglats) { + getPolygon: function (geoJson, lngLats) { return new AMap.Polyline({ - path: lnglats[0], + path: lngLats[0], strokeColor: '#359de5', strokeWeight: 1, }); }, }); - this.map.add(geojson); + this.map.add(geoJson); }, // 清空当前地图上除了边界线的覆盖物 removeOverlayGroup() { this.clearAircraft(); @@ -92,7 +92,10 @@ export const Map = { this.removeOverlayGroup(); this.overlayGroup = new AMap.OverlayGroup(); for (let i = 0; i < result.length; i++) { - let { type, lon, lat } = result[i]; + let { type, lon, lat, lng } = result[i]; + if (lng) { + lon = lng; + } if (!lon || !lat || !type) { continue; } @@ -231,7 +234,7 @@ export const Map = { label: { content: `
${option?.realName},${option?.eventType_dictText}
-
`, + `, offset: new AMap.Pixel(0, -9), direction: 'top', }, diff --git a/src/assets/ts/antd.ts b/src/assets/ts/antd.ts index 6ef4532..9a78e64 100644 --- a/src/assets/ts/antd.ts +++ b/src/assets/ts/antd.ts @@ -1,6 +1,6 @@ import type { App } from 'vue'; -import { Form, Input, Button, Radio, Modal, Table, Select, Spin } from 'ant-design-vue'; +import { Form, Input, Button, Radio, Modal, Table, Select, Cascader, Spin, ConfigProvider } from 'ant-design-vue'; export default function registerGlobComp(app: App) { - app.use(Button).use(Form).use(Input).use(Radio).use(Modal).use(Table).use(Select).use(Spin); + app.use(Button).use(Form).use(Input).use(Radio).use(Modal).use(Table).use(Select).use(Cascader).use(Spin).use(ConfigProvider); } \ No newline at end of file diff --git a/src/components/body-d-right/right.api.ts b/src/components/body-d-right/right.api.ts index c0a5da8..b089d65 100644 --- a/src/components/body-d-right/right.api.ts +++ b/src/components/body-d-right/right.api.ts @@ -6,7 +6,6 @@ export enum Api { } //健康终端报警 - export const getMonitorList = (params: any) => get(Api.getMonitorList, params); //长庆油田大病人数 export const getHealthDataList = (params: any) => get(Api.getHealthDataList, params); \ No newline at end of file diff --git a/src/components/dialog/Dialog.vue b/src/components/dialog/Dialog.vue index cc9f755..824e699 100644 --- a/src/components/dialog/Dialog.vue +++ b/src/components/dialog/Dialog.vue @@ -35,7 +35,6 @@ width: 100%; height: 40px; background: url('../../assets/images/dialog.png') no-repeat; - background: rgba(0, 0, 0, 0.6); background-size: 100% 100%; color: #ffffff !important; padding-left: 2%; @@ -59,6 +58,8 @@ .ant-modal-close-x, .anticon { color: #999999 !important; + height: 40px; + line-height: 40px; } .ant-modal-footer { diff --git a/src/components/item-d/pieCharts.ts b/src/components/item-d/pieCharts.ts index 895109d..bdccacd 100644 --- a/src/components/item-d/pieCharts.ts +++ b/src/components/item-d/pieCharts.ts @@ -2,20 +2,36 @@ export function screenPie(chartData, total, color, formatter) { return { title: { text: '总人数', - subtext: total + '', - x: '38%', - y: '42%', textStyle: { fontSize: 14, color: '#ffffff', fontWeight: 'normal', + align: 'center', }, + subtext: total + '', + x: '38%', + y: '42%', subtextStyle: { color: '#ffffff', fontSize: 24, fontWeight: 'bold', }, }, + // graphic: [ + // { + // //环形图中间添加文字 + // type: 'text', //通过不同top值可以设置上下显示 + // left: 'center', + // top: 'center', + // style: { + // text: 45465456, + // textAlign: 'center', + // fill: '#1E7CE8', //文字的颜色 + // fontSize: 20, + // lineHeight: 20, + // }, + // }, + // ], color: color, tooltip: { trigger: 'item', diff --git a/src/components/secondaryScreen/commonApi.ts b/src/components/secondaryScreen/commonApi.ts index 5d2100c..f2a0d00 100644 --- a/src/components/secondaryScreen/commonApi.ts +++ b/src/components/secondaryScreen/commonApi.ts @@ -1,7 +1,22 @@ -import { get } from '/@/api/request.ts'; +import { get, post } from '/@/api/request.ts'; export enum Api { depart = 'sys/sysDepart/allSecondaryDeparts', + getWatchDataByOrgCode = '/health-watch/watch/watchData/getWatchDataByOrgCode', + getMonitorList = '/health-watch/watch/watchMonitorData/getMonitorList', + sleepApi = '/health-watch/watch/watchData/getSleep', + stepApi = '/health-watch/watch/watchData/getSdc', } -export const allSecondaryDeparts = () => get(Api.depart); \ No newline at end of file +// 单位- +export const allSecondaryDeparts = () => get(Api.depart); + +//左側 +export const getWatchDataByOrgCode = (params) => post(Api.getWatchDataByOrgCode, params); + +//右-健康终端报警 +export const getMonitorList = (params: any) => get(Api.getMonitorList, params); +// 右-睡眠 +export const getSleep = (params: any) => post(Api.sleepApi, params); +// 右-步数 +export const getStep = (params: any) => post(Api.stepApi, params); diff --git a/src/components/secondaryScreen/screen-left/screenLeft.vue b/src/components/secondaryScreen/screen-left/screenLeft.vue index dd1d60c..6c0133e 100644 --- a/src/components/secondaryScreen/screen-left/screenLeft.vue +++ b/src/components/secondaryScreen/screen-left/screenLeft.vue @@ -1,58 +1,75 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/components/secondaryScreen/screen-left/screenLeftHooks.api.ts b/src/components/secondaryScreen/screen-left/screenLeftHooks.api.ts deleted file mode 100644 index e69de29..0000000 diff --git a/src/components/secondaryScreen/screen-right/oneR.vue b/src/components/secondaryScreen/screen-right/oneR.vue index abf0a08..e998b25 100644 --- a/src/components/secondaryScreen/screen-right/oneR.vue +++ b/src/components/secondaryScreen/screen-right/oneR.vue @@ -1,12 +1,9 @@ \ No newline at end of file diff --git a/vite.config.ts b/vite.config.ts index c4a7ecd..fe474ac 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -29,4 +29,11 @@ export default defineConfig({ host: true, https: false, }, + optimizeDeps: { + esbuildOptions: { + target: 'es2020', + }, + // @iconify/iconify: The dependency is dynamically and virtually loaded by @purge-icons/generated, so it needs to be specified explicitly + include: ['lodash-es', 'ant-design-vue/es/locale/zh_CN', 'ant-design-vue/es/locale/en_US'], + }, });