diff --git a/src/assets/indexSun/address.png b/src/assets/indexSun/address.png new file mode 100644 index 0000000..52a90b9 Binary files /dev/null and b/src/assets/indexSun/address.png differ diff --git a/src/assets/indexSun/bg.png b/src/assets/indexSun/bg.png new file mode 100644 index 0000000..d0c4d82 Binary files /dev/null and b/src/assets/indexSun/bg.png differ diff --git a/src/assets/indexSun/bigBg.png b/src/assets/indexSun/bigBg.png new file mode 100644 index 0000000..ae8d490 Binary files /dev/null and b/src/assets/indexSun/bigBg.png differ diff --git a/src/assets/indexSun/footerBlue.png b/src/assets/indexSun/footerBlue.png new file mode 100644 index 0000000..a442c4b Binary files /dev/null and b/src/assets/indexSun/footerBlue.png differ diff --git a/src/assets/indexSun/footerGreen.png b/src/assets/indexSun/footerGreen.png new file mode 100644 index 0000000..04a07d4 Binary files /dev/null and b/src/assets/indexSun/footerGreen.png differ diff --git a/src/assets/indexSun/point.png b/src/assets/indexSun/point.png new file mode 100644 index 0000000..fd12ba2 Binary files /dev/null and b/src/assets/indexSun/point.png differ diff --git a/src/assets/less/index.less b/src/assets/less/index.less index dc4ada8..f62a6a6 100644 --- a/src/assets/less/index.less +++ b/src/assets/less/index.less @@ -8,7 +8,6 @@ html, body, #app { } .type-time { - padding-top: 3%; font-size: 16px; display: flex; justify-content: right; diff --git a/src/assets/mapUtils/map.ts b/src/assets/mapUtils/map.ts index efbdf91..0931ebf 100644 --- a/src/assets/mapUtils/map.ts +++ b/src/assets/mapUtils/map.ts @@ -35,6 +35,7 @@ export const Map = { }).then((res) => { AMap = res; const { zoom, center, mapStyle } = { ...defaultOption, ...option }; + console.log(mapStyle, center, 'adjahdkjashkjd'); //基本地图加载 this.map = new AMap.Map(el, { resizeEnable: true, diff --git a/src/assets/mapUtils/mapConstant.ts b/src/assets/mapUtils/mapConstant.ts index 0a57b03..c49f5a8 100644 --- a/src/assets/mapUtils/mapConstant.ts +++ b/src/assets/mapUtils/mapConstant.ts @@ -1,7 +1,7 @@ // 地图默认配置 export const defaultOption = { - center: [108.660704, 36.386058], //地图中心点 - zoom: 6.5, //地图显示的缩放级别 + center: [87.627313, 43.826809], //地图中心点 + zoom: 11, //地图显示的缩放级别 mapStyle: 'darkblue', //地图样式 }; export const YinChuanOption = { diff --git a/src/components/body-d-left/bodyLeftHooks.ts b/src/components/body-d-left/bodyLeftHooks.ts index ba76e77..b339c9a 100644 --- a/src/components/body-d-left/bodyLeftHooks.ts +++ b/src/components/body-d-left/bodyLeftHooks.ts @@ -85,6 +85,21 @@ export const sexType = [ }, ]; +export const timeTabNew = [ + { + name: '本周', + value: '2', + }, + { + name: '本月', + value: '3', + }, + { + name: '本年', + value: '4', + }, +]; + export function useSpin() { const spinning = ref(true); diff --git a/src/components/body-d-left/oneL.vue b/src/components/body-d-left/oneL.vue index e494005..e3e3a31 100644 --- a/src/components/body-d-left/oneL.vue +++ b/src/components/body-d-left/oneL.vue @@ -1,12 +1,12 @@ @@ -27,7 +26,7 @@ import BasicTable from '/@/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue'; import { Form } from 'ant-design-vue'; import { SexType, sexTypeList } from '/@/utils/settings.ts'; - import { getPhoneList } from '/@/views/yinChuan/yinChuan.api.ts'; + // import { getPhoneList } from '/@/views/yinChuan/yinChuan.api.ts'; import { useTheme } from '/@/hooks/theme/useTheme.ts'; const props = defineProps({ diff --git a/src/views/index.vue b/src/views/index.vue index b370dd1..6973fa7 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -10,8 +10,8 @@
- - + +
@@ -91,7 +91,7 @@ openTestModal(); document.addEventListener('visibilitychange', checkTabState); //设置主题 - store.setThemeType(ThemeType.light); + store.setThemeType(ThemeType.dark); }); const { themeType } = useTheme(); onUnmounted(() => { diff --git a/src/views/indexSun.vue b/src/views/indexSun.vue new file mode 100644 index 0000000..8b4cc33 --- /dev/null +++ b/src/views/indexSun.vue @@ -0,0 +1,145 @@ + + + diff --git a/src/views/indexSun/centerMap.vue b/src/views/indexSun/centerMap.vue new file mode 100644 index 0000000..4ed4652 --- /dev/null +++ b/src/views/indexSun/centerMap.vue @@ -0,0 +1,487 @@ + + + + diff --git a/src/views/indexSun/indexSun.ts b/src/views/indexSun/indexSun.ts new file mode 100644 index 0000000..2740953 --- /dev/null +++ b/src/views/indexSun/indexSun.ts @@ -0,0 +1,126 @@ +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 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: { + top: 40, + bottom: 40, + left: '60', + }, + xAxis: { + type: 'category', + data: dx, + axisTick: { + show: false, + lineStyle: { + color: 'rgba(101, 198, 231, .1)', + }, + }, + axisLabel: { + color: '#C9DAFF', + fontSize: 12, + }, + axisLine: { + lineStyle: { + color: '#65C6E7', // 设置轴线颜色为红色 + }, + }, + }, + yAxis: { + type: 'value', + name: '次数', + // nameLocation: 'end', // 将单位名称位置设置为起始位置 + // nameGap: 10, + // nameRotate: 0, // 设置旋转角度,0 表示水平 + nameTextStyle: { + fontSize: 12, + color: '#65C6E7', + left: 100, + }, + splitLine: { + show: true, + lineStyle: { + color: 'rgba(101, 198, 231, .1)', + width: 1, + type: 'solid', + }, + }, + interval: 25, // 步长 + min: 0, // 起始 - 设置y轴刻度的最小值 + max: 100, // 终止 - 设置y轴刻度的最大值 + axisLabel: { + color: '#65C6E7', + formatter: function (value, index) { + return value; + }, + }, + }, + series: [ + { + data: dy.map((item) => { + return { + value: item, + itemStyle: { + color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [ + { offset: 0, color: '#5ABFFF' }, + { offset: 0.2, color: 'rgba(30, 166, 253, .5)' }, + { offset: 0.5, color: 'rgba(30, 166, 253, .1)' }, + { offset: 0.8, color: 'rgba(30, 166, 253, .5)' }, + { offset: 1, color: '#5ABFFF' }, + ]), + borderColor: '#51caf5', // 黑色边框 + borderWidth: item ? 1 : 0, + }, + }; + }), + label: { + show: true, // 显示标签 + position: 'top', // 标签显示在柱子顶部 + color: '#51caf5', // 设置字体颜色 + fontSize: 12, // 设置字体大小 + }, + type: 'bar', + barWidth: 18, + }, + ], + }; +} +export enum TabType { + all = '', //所有资源 + youTianYiYuan = '1', //油田医院 + jianKangXiaoWu = '2', //健康小屋 + jiuHuChe = '5', //救护车 +} +export const tabList = [ + { + name: '所有资源', + type: TabType.all, + }, + { + name: '健康小屋', + type: TabType.jianKangXiaoWu, + }, + { + name: '油田医院', + type: TabType.youTianYiYuan, + }, + { + name: '救护车', + type: TabType.jiuHuChe, + }, + { + name: '急救路线', + }, +]; +export const legendList = [ + { 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' }, +]; diff --git a/src/views/indexSun/oneL.vue b/src/views/indexSun/oneL.vue new file mode 100644 index 0000000..d766550 --- /dev/null +++ b/src/views/indexSun/oneL.vue @@ -0,0 +1,227 @@ + + + diff --git a/src/views/indexSun/oneR.vue b/src/views/indexSun/oneR.vue new file mode 100644 index 0000000..43f0f65 --- /dev/null +++ b/src/views/indexSun/oneR.vue @@ -0,0 +1,97 @@ + + + diff --git a/src/views/indexSun/threeL.vue b/src/views/indexSun/threeL.vue new file mode 100644 index 0000000..084113e --- /dev/null +++ b/src/views/indexSun/threeL.vue @@ -0,0 +1,90 @@ + + + diff --git a/src/views/indexSun/twoL.vue b/src/views/indexSun/twoL.vue new file mode 100644 index 0000000..b5feb1e --- /dev/null +++ b/src/views/indexSun/twoL.vue @@ -0,0 +1,272 @@ + + +