diff --git a/components.d.ts b/components.d.ts index ad4a9b7..921970b 100644 --- a/components.d.ts +++ b/components.d.ts @@ -16,6 +16,8 @@ declare module 'vue' { CustomCarouselPicture: typeof import('./src/components/custom-carousel-picture/index.vue')['default'] CustomEchartBar: typeof import('./src/components/custom-echart-bar/index.vue')['default'] CustomEchartBubble: typeof import('./src/components/custom-echart-bubble/index.vue')['default'] + CustomEchartHyaline: typeof import('./src/components/custom-echart-hyaline/index.vue')['default'] + CustomEchartHyalineCake: typeof import('./src/components/custom-echart-hyaline-cake/index.vue')['default'] CustomEchartLine: typeof import('./src/components/custom-echart-line/index.vue')['default'] CustomEchartLineLine: typeof import('./src/components/custom-echart-line-line/index.vue')['default'] CustomEchartMaps: typeof import('./src/components/custom-echart-maps/index.vue')['default'] diff --git a/src/components/custom-echart-hyaline-cake/index.vue b/src/components/custom-echart-hyaline-cake/index.vue new file mode 100644 index 0000000..f0d2d69 --- /dev/null +++ b/src/components/custom-echart-hyaline-cake/index.vue @@ -0,0 +1,282 @@ + + diff --git a/src/components/index.js b/src/components/index.js index d6b1e00..5923fa1 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -20,6 +20,7 @@ import CustomEchartWordCloud from './custom-echart-word-cloud'; import customEchartScatterBlister from './custom-echart-scatter-blister'; import customEchartMaps from './custom-echart-maps'; import customScrollTitle from './custom-scroll-title'; +import customEchartHyalineCake from './custom-echart-hyaline-cake'; export { SvgIcon, @@ -44,4 +45,5 @@ export { customEchartScatterBlister, customEchartMaps, customScrollTitle, + customEchartHyalineCake, }; diff --git a/src/layouts/index.vue b/src/layouts/index.vue index 1c35e7b..9ad1828 100644 --- a/src/layouts/index.vue +++ b/src/layouts/index.vue @@ -57,12 +57,13 @@ onMounted(() => { url('@/assets/images/basic/containerBotBG.png') no-repeat bottom center; &-header { width: 100%; - height: 60px; - // margin-bottom: 60px; + margin-bottom: 16px; } &-main { flex: 1; - min-height: calc(100vh - 60px); + min-height: calc(100vh - 90px - 16px); + padding: 0 40px; + box-sizing: border-box; } .base-laytout-header { height: 90px; diff --git a/src/styles/style.scss b/src/styles/style.scss index 015508b..69ee739 100644 --- a/src/styles/style.scss +++ b/src/styles/style.scss @@ -5,7 +5,7 @@ position: relative; width: 100%; height: 100%; - font-family: Avenir, sans-serif; + font-family: JinBuTi, Sans, Avenir, sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; background-color: #000; diff --git a/src/views/land/components/LandAera.vue b/src/views/land/components/LandAera.vue index 0e42772..9f1ee21 100644 --- a/src/views/land/components/LandAera.vue +++ b/src/views/land/components/LandAera.vue @@ -60,7 +60,6 @@ watch( }; }); list.value.sort((a, b) => b.value - a.value); - console.log('list', list.value); }, { immediate: true, @@ -83,7 +82,6 @@ function handleAc(val) { } const _circleNum = computed(() => { let s = ((currNum.value / allNum.value) * 100).toFixed(1); - console.log('s----------', currNum.value, allNum.value, s); return s + '%'; }); diff --git a/src/views/land/components/cake.vue b/src/views/land/components/cake.vue new file mode 100644 index 0000000..6ad0481 --- /dev/null +++ b/src/views/land/components/cake.vue @@ -0,0 +1,44 @@ + + + + + diff --git a/src/views/land/components/landPlan.vue b/src/views/land/components/landPlan.vue index 0918cba..931a907 100644 --- a/src/views/land/components/landPlan.vue +++ b/src/views/land/components/landPlan.vue @@ -1,114 +1,106 @@ - - - diff --git a/src/views/land/index.vue b/src/views/land/index.vue index fe8a7be..0224983 100644 --- a/src/views/land/index.vue +++ b/src/views/land/index.vue @@ -64,7 +64,7 @@
@@ -80,6 +80,7 @@ import landCirculation from './components/landCirculation.vue'; import landPlan from './components/landPlan.vue'; import landPatrol from './components/landPatrol.vue'; import LandAera from './components/LandAera.vue'; +import cake from './components/cake.vue'; import { nextTick, ref } from 'vue'; const landPatrolRef = ref(null);