From 900bbbada46907bf3fbccd05018305be86963f70 Mon Sep 17 00:00:00 2001 From: wangzenghua <1048523306@qq.com> Date: Wed, 23 Apr 2025 09:52:41 +0100 Subject: [PATCH 1/2] fix --- src/layouts/index.vue | 2 +- src/router/index.js | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/layouts/index.vue b/src/layouts/index.vue index 7b8b46c..98240ae 100644 --- a/src/layouts/index.vue +++ b/src/layouts/index.vue @@ -1,3 +1,3 @@ diff --git a/src/router/index.js b/src/router/index.js index f1228b3..772e805 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,5 +1,5 @@ import { createRouter, createWebHistory } from 'vue-router'; -// import Layout from '@/layouts/index.vue'; +import Layout from '@/layouts/index.vue'; import demoRouters from './modules/demo'; @@ -16,21 +16,21 @@ export const constantRoutes = [ // component: () => import('@/views/error/403.vue'), // hidden: true, // }, - // { - // path: '/', - // name: 'layout', - // component: Layout, - // redirect: '/home', - // meta: { title: '首页', icon: 'House' }, - // children: [ - // { - // path: '/home', - // component: () => import('@/views/home/index.vue'), - // name: 'home', - // meta: { title: '首页', icon: 'House' }, - // }, - // ], - // }, + { + path: '/', + name: 'layout', + component: Layout, + redirect: '/home', + meta: { title: '首页', icon: 'House' }, + children: [ + { + path: '/home', + component: () => import('@/views/home/index.vue'), + name: 'home', + meta: { title: '首页', icon: 'House' }, + }, + ], + }, ...demoRouters, ]; From 1790cf854e30163deae2b3d49bf46e24eda31b81 Mon Sep 17 00:00:00 2001 From: 13713575202 <1345916905@qq.com> Date: Wed, 23 Apr 2025 16:53:29 +0800 Subject: [PATCH 2/2] ... --- components.d.ts | 1 - yarn.lock | 12 ++++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/components.d.ts b/components.d.ts index f3e3bfb..7bae2f7 100644 --- a/components.d.ts +++ b/components.d.ts @@ -18,7 +18,6 @@ declare module 'vue' { CustomEchartPictorialBar: typeof import('./src/components/custom-echart-pictorial-bar/index.vue')['default'] CustomEchartPie: typeof import('./src/components/custom-echart-pie/index.vue')['default'] CustomEchartPie3d: typeof import('./src/components/custom-echart-pie-3d/index.vue')['default'] - CustomEchartPieCircle: typeof import('./src/components/custom-echart-pie-circle/index.vue')['default'] CustomEchartPieGauge: typeof import('./src/components/custom-echart-pie-gauge/index.vue')['default'] CustomEchartRadar: typeof import('./src/components/custom-echart-radar/index.vue')['default'] CustomEchartScatterBlister: typeof import('./src/components/custom-echart-scatter-blister/index.vue')['default'] diff --git a/yarn.lock b/yarn.lock index 5ff85fd..6ebffd4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6611,6 +6611,18 @@ vue-demi@*, vue-demi@^0.14.10: resolved "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz#afc78de3d6f9e11bf78c55e8510ee12814522f04" integrity sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg== +vue-demi@^0.13.11: + version "0.13.11" + resolved "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.13.11.tgz#7d90369bdae8974d87b1973564ad390182410d99" + integrity sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A== + +vue-echarts@^7.0.3: + version "7.0.3" + resolved "https://registry.npmmirror.com/vue-echarts/-/vue-echarts-7.0.3.tgz#bf79f7ee0144bbdc6aee5610e8443fed91f6abbe" + integrity sha512-/jSxNwOsw5+dYAUcwSfkLwKPuzTQ0Cepz1LxCOpj2QcHrrmUa/Ql0eQqMmc1rTPQVrh2JQ29n2dhq75ZcHvRDw== + dependencies: + vue-demi "^0.13.11" + vue-eslint-parser@^9.4.3: version "9.4.3" resolved "https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-9.4.3.tgz#9b04b22c71401f1e8bca9be7c3e3416a4bde76a8"