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 0000000..fe16b5a Binary files /dev/null and b/public/favicon.ico differ diff --git a/src/components/table/column/index.vue b/src/components/table/column/index.vue index d9f43d6..4570c32 100644 --- a/src/components/table/column/index.vue +++ b/src/components/table/column/index.vue @@ -1,7 +1,8 @@ -