From b456881e6e6707273927e13604a3418cdeeb3875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= Date: Wed, 27 Dec 2023 15:06:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 2 +- package.json | 6 ++- pnpm-lock.yaml | 25 +++++++++ public/favicon.ico | Bin 0 -> 6791 bytes src/components/table/column/index.vue | 7 +-- src/components/table/index.vue | 14 ++--- src/layouts/admin/components/logo.vue | 24 ++++----- .../admin/components/navBar/classic.vue | 1 + src/layouts/admin/components/navMenus.vue | 3 ++ src/layouts/admin/index.vue | 33 ++++-------- src/layouts/admin/router-view/main.vue | 4 +- src/main.ts | 3 ++ src/utils/request.ts | 2 +- src/utils/tableStore.ts | 2 + src/views/auth/menu/index.vue | 51 ++++++++++++------ src/views/auth/role.vue | 2 +- types/table.d.ts | 10 ++-- 17 files changed, 115 insertions(+), 74 deletions(-) create mode 100644 public/favicon.ico diff --git a/index.html b/index.html index fe39bda..5d4f292 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + 电能质量数据监测云平台 diff --git a/package.json b/package.json index 0614b76..e8509e3 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "type": "module", "scripts": { "dev": "vite", - "build": "vue-tsc && vite build", + "build": "vite build", "preview": "vite preview" }, "dependencies": { @@ -22,7 +22,9 @@ "pinia-plugin-persistedstate": "^3.2.1", "screenfull": "^6.0.2", "vue": "^3.3.11", - "vue-router": "4" + "vue-router": "4", + "vxe-table": "^4.5.17", + "xe-utils": "^3.5.14" }, "devDependencies": { "@types/lodash-es": "^4.17.12", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7eea217..b274faa 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -43,6 +43,12 @@ dependencies: vue-router: specifier: '4' version: 4.2.5(vue@3.3.13) + vxe-table: + specifier: ^4.5.17 + version: 4.5.17(vue@3.3.13)(xe-utils@3.5.14) + xe-utils: + specifier: ^3.5.14 + version: 3.5.14 devDependencies: '@types/lodash-es': @@ -738,6 +744,10 @@ packages: engines: {node: '>=0.4.0'} dev: false + /dom-zindex@1.0.1: + resolution: {integrity: sha512-M/MERVDZ8hguvjl6MAlLWSLYLS7PzEyXaTb5gEeJ+SF+e9iUC0sdvlzqe91MMDHBoy+nqw7wKcUOrDSyvMCrRg==} + dev: false + /echarts@5.4.3: resolution: {integrity: sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.3.tgz} dependencies: @@ -1188,6 +1198,21 @@ packages: '@vue/shared': 3.3.13 typescript: 5.3.3 + /vxe-table@4.5.17(vue@3.3.13)(xe-utils@3.5.14): + resolution: {integrity: sha512-HcXxI0kMiW90NikPeB/pqkAsm/pQi7OKKBaINojE1pSWWT2MPcs472zVBCEzIqh4aprhhC62lfH6hYzM6c5QWw==} + peerDependencies: + vue: ^3.2.28 + xe-utils: ^3.5.0 + dependencies: + dom-zindex: 1.0.1 + vue: 3.3.13(typescript@5.3.3) + xe-utils: 3.5.14 + dev: false + + /xe-utils@3.5.14: + resolution: {integrity: sha512-Xq6mS8dWwHBQsQUEBXcZYSaBV0KnNLoVWd0vRRDI3nKpbNxfs/LSCK0W21g1edLFnXYfKqg7hh5dakr3RtYY0A==} + dev: false + /yallist@4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==, tarball: https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz} dev: true diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..fe16b5adb805be552e37da2e99cd37b95b7dd0e3 GIT binary patch literal 6791 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 +