From bc15167485769b18c9f0547a883be2cf6b8d0f31 Mon Sep 17 00:00:00 2001 From: zk Date: Mon, 11 Dec 2023 10:19:17 +0800 Subject: [PATCH] update --- .../secondaryScreen/chinaMap/chinaHooks.ts | 152 -------- .../secondaryScreen/chinaMap/chinaMap.vue | 362 ------------------ .../secondaryScreen/secondMap/secondMap.vue | 53 +++ .../secondMapApi.ts} | 0 .../secondMap/secondMapHooks.ts | 15 + src/views/indexSon.vue | 4 +- 6 files changed, 70 insertions(+), 516 deletions(-) delete mode 100644 src/components/secondaryScreen/chinaMap/chinaHooks.ts delete mode 100644 src/components/secondaryScreen/chinaMap/chinaMap.vue create mode 100644 src/components/secondaryScreen/secondMap/secondMap.vue rename src/components/secondaryScreen/{chinaMap/chinaMapApi.ts => secondMap/secondMapApi.ts} (100%) create mode 100644 src/components/secondaryScreen/secondMap/secondMapHooks.ts diff --git a/src/components/secondaryScreen/chinaMap/chinaHooks.ts b/src/components/secondaryScreen/chinaMap/chinaHooks.ts deleted file mode 100644 index 372d3ca..0000000 --- a/src/components/secondaryScreen/chinaMap/chinaHooks.ts +++ /dev/null @@ -1,152 +0,0 @@ -import { getAllList, getAmbulanceList } from '/@/components/chinaMap/chinaMapApi.ts'; - -export enum TabType { - all = '', //所有资源 - youTianYiYuan = '1', //油田医院 - heZuoYiYuan = '2', //合作医院 - yiLiaoDian = '3', //医疗点 - jiuHuChe = '4', //救护车 - zhiShengJi = '5', //直升机 -} - -export const tabList = [ - { - name: '所有资源', - type: TabType.all, - }, - { - name: '油田医院', - type: TabType.youTianYiYuan, - }, - { - name: '医疗点', - type: TabType.yiLiaoDian, - }, - { - name: '救护车', - type: TabType.jiuHuChe, - }, - { - name: '合作医院', - type: TabType.heZuoYiYuan, - }, - { - name: '地方医院', - }, - { - name: '直升机', - type: TabType.zhiShengJi, - }, - { - name: '急救路线', - }, -]; - -export const helicopter = new URL('/@/assets/img/helicopter.png', import.meta.url).href; -export const mapbg = new URL('/@/assets/img/helicopter.png', import.meta.url).href; - -// 直升机位置数据 -export const aircraft = [ - { - category: 3, - lon: '108.861377', - lat: '34.35965', - img: helicopter, - name: '直升机', - }, - { - category: 3, - lon: '106.267358', - lat: '38.520079', - img: helicopter, - name: '直升机', - }, - { - category: 3, - lon: '109.505282', - lat: '36.579381', - img: helicopter, - name: '直升机', - }, - { - category: 3, - lon: '107.638372', - lat: '35.734218', - img: helicopter, - name: '直升机', - }, -]; - -export function mapApiSwitch(type, params: any) { - const basicParams = { - lat: 34, //纬度34 - lon: 108, //经度 - }; - // 全部 油田 医疗点 合作医院 - if ([TabType.all, TabType.youTianYiYuan, TabType.yiLiaoDian, TabType.heZuoYiYuan].includes(type)) { - return getAllList({ ...basicParams, ...params }); - } - if ([TabType.jiuHuChe].includes(type)) { - return getAmbulanceList({}); - } -} - -export const mapIcon1 = new URL('/@/assets/img/mapIcon1.png', import.meta.url).href; -export const mapIcon2 = new URL('/@/assets/img/mapIcon2.png', import.meta.url).href; -export const mapIcon3 = new URL('/@/assets/img/mapIcon3.png', import.meta.url).href; -export const mapIcon4 = new URL('/@/assets/img/mapIcon4.png', import.meta.url).href; -export const mapIcon5 = new URL('/@/assets/img/mapIcon5.png', import.meta.url).href; -export const mapIcon6 = new URL('/@/assets/img/mapIcon6.png', import.meta.url).href; - -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 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 const legend6 = new URL('/@/assets/img/legend6.png', import.meta.url).href; - -export const legendList = [ - { img: legend1, text: '油田医院' }, - { img: legend2, text: '医疗点' }, - { img: legend3, text: '救护车' }, - { img: legend4, text: '合作医院' }, - { img: legend5, text: '地方医院' }, - { img: legend6, text: '直升机' }, -]; - -/** - * @description 秒转小时 - * */ -export function convertSeconds(seconds: number) { - let hours = Math.floor(seconds / 3600); - let minutes = Math.floor((seconds % 3600) / 60); - let remainingSeconds = seconds % 60; - return { - hours: hours, - minutes: minutes, - seconds: remainingSeconds, - }; -} - -export function getTimeStr(time: number): string { - let str = ''; - const { hours, minutes } = convertSeconds(time); - if (hours) { - str += hours + '小时'; - } - if (minutes) { - str += minutes + '分钟'; - } - return str; -} - -export function convertMetersToKilometers(meters: number): number { - let kilometers = meters / 1000; - return Math.round(kilometers * 100) / 100; -} - -export function getKmStr(distance: number): string { - if (!distance) return ''; - let d = convertMetersToKilometers(distance); - return d >= 1 ? d + '公里' : d * 100 + '米'; -} \ No newline at end of file diff --git a/src/components/secondaryScreen/chinaMap/chinaMap.vue b/src/components/secondaryScreen/chinaMap/chinaMap.vue deleted file mode 100644 index b43bd82..0000000 --- a/src/components/secondaryScreen/chinaMap/chinaMap.vue +++ /dev/null @@ -1,362 +0,0 @@ - - - diff --git a/src/components/secondaryScreen/secondMap/secondMap.vue b/src/components/secondaryScreen/secondMap/secondMap.vue new file mode 100644 index 0000000..bb7f8c5 --- /dev/null +++ b/src/components/secondaryScreen/secondMap/secondMap.vue @@ -0,0 +1,53 @@ + + + \ No newline at end of file diff --git a/src/components/secondaryScreen/chinaMap/chinaMapApi.ts b/src/components/secondaryScreen/secondMap/secondMapApi.ts similarity index 100% rename from src/components/secondaryScreen/chinaMap/chinaMapApi.ts rename to src/components/secondaryScreen/secondMap/secondMapApi.ts diff --git a/src/components/secondaryScreen/secondMap/secondMapHooks.ts b/src/components/secondaryScreen/secondMap/secondMapHooks.ts new file mode 100644 index 0000000..a13656e --- /dev/null +++ b/src/components/secondaryScreen/secondMap/secondMapHooks.ts @@ -0,0 +1,15 @@ +// export const tabList = [ +// { +// name: '所有资源', +// type: TabType.all, +// }, +// { +// name: '油田医院', +// type: TabType.youTianYiYuan, +// }, +// { +// name: '医疗点', +// type: TabType.yiLiaoDian, +// }, +// ]; + diff --git a/src/views/indexSon.vue b/src/views/indexSon.vue index 6106336..c97a1c7 100644 --- a/src/views/indexSon.vue +++ b/src/views/indexSon.vue @@ -19,7 +19,7 @@
- +
@@ -36,7 +36,7 @@ import OneR from '/@/components/secondaryScreen/screen-right/oneR.vue'; import TwoR from '/@/components/secondaryScreen/screen-right/twoR.vue'; import ThreeR from '/@/components/secondaryScreen/screen-right/threeR.vue'; - import ChinaMap from '/@/components/secondaryScreen/chinaMap/chinaMap.vue'; + import SecondMap from '/@/components/secondaryScreen/secondMap/secondMap.vue'; import * as dayjs from 'dayjs'; import router from '/@/router'; import ItemD from '/@/components/item-d/item-d.vue';