From 4f1f45566038c11c09efd813ac04d46b4fa69912 Mon Sep 17 00:00:00 2001 From: wangys <3401275564@qq.com> Date: Mon, 8 Dec 2025 18:05:49 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- urbanLifelineWeb/package-lock.json | 6 +- .../packages/bidding/package.json | 3 +- .../packages/bidding/pnpm-lock.yaml | 5 +- .../packages/platform/package.json | 3 +- .../packages/platform/pnpm-lock.yaml | 5 +- .../packages/shared/package-lock.json | 2 +- urbanLifelineWeb/packages/shared/package.json | 4 +- .../packages/shared/pnpm-lock.yaml | 156 ++++++++++++++- .../src/components/base/button/Button.vue | 55 ----- .../components/base/button/ButtonExample.vue | 165 --------------- .../src/components/base/button/button.scss | 189 ------------------ .../shared/src/components/base/index.ts | 1 - .../src/components/fileupload/FileUpload.scss | 49 +---- .../src/components/fileupload/FileUpload.vue | 119 ++++++----- urbanLifelineWeb/packages/shared/src/main.ts | 7 +- .../packages/workcase/package.json | 3 +- .../packages/workcase/pnpm-lock.yaml | 5 +- 17 files changed, 256 insertions(+), 521 deletions(-) delete mode 100644 urbanLifelineWeb/packages/shared/src/components/base/button/Button.vue delete mode 100644 urbanLifelineWeb/packages/shared/src/components/base/button/ButtonExample.vue delete mode 100644 urbanLifelineWeb/packages/shared/src/components/base/button/button.scss diff --git a/urbanLifelineWeb/package-lock.json b/urbanLifelineWeb/package-lock.json index a4b48c2..572d709 100644 --- a/urbanLifelineWeb/package-lock.json +++ b/urbanLifelineWeb/package-lock.json @@ -4397,7 +4397,7 @@ "dependencies": { "@vueuse/core": "^11.3.0", "axios": "^1.7.9", - "element-plus": "^2.9.1", + "element-plus": "^2.12.0", "pinia": "^2.2.8", "vue": "^3.5.13", "vue-router": "^4.5.0" @@ -4417,7 +4417,7 @@ "dependencies": { "@vueuse/core": "^11.3.0", "axios": "^1.7.9", - "element-plus": "^2.9.1", + "element-plus": "^2.12.0", "pinia": "^2.2.8", "vue": "^3.5.13", "vue-router": "^4.5.0" @@ -6096,7 +6096,7 @@ "dependencies": { "@vueuse/core": "^11.3.0", "axios": "^1.7.9", - "element-plus": "^2.9.1", + "element-plus": "^2.12.0", "pinia": "^2.2.8", "vue": "^3.5.13", "vue-router": "^4.5.0" diff --git a/urbanLifelineWeb/packages/bidding/package.json b/urbanLifelineWeb/packages/bidding/package.json index 59703c9..9035ebc 100644 --- a/urbanLifelineWeb/packages/bidding/package.json +++ b/urbanLifelineWeb/packages/bidding/package.json @@ -12,7 +12,8 @@ "vue": "^3.5.13", "vue-router": "^4.5.0", "pinia": "^2.2.8", - "element-plus": "^2.9.1", + "element-plus": "^2.12.0", + "@element-plus/icons-vue": "^2.3.2", "@vueuse/core": "^11.3.0", "axios": "^1.7.9" }, diff --git a/urbanLifelineWeb/packages/bidding/pnpm-lock.yaml b/urbanLifelineWeb/packages/bidding/pnpm-lock.yaml index efd2126..6b03b24 100644 --- a/urbanLifelineWeb/packages/bidding/pnpm-lock.yaml +++ b/urbanLifelineWeb/packages/bidding/pnpm-lock.yaml @@ -5,6 +5,9 @@ settings: excludeLinksFromLockfile: false dependencies: + '@element-plus/icons-vue': + specifier: ^2.3.2 + version: 2.3.2(vue@3.5.25) '@vueuse/core': specifier: ^11.3.0 version: 11.3.0(vue@3.5.25) @@ -12,7 +15,7 @@ dependencies: specifier: ^1.7.9 version: 1.13.2 element-plus: - specifier: ^2.9.1 + specifier: ^2.12.0 version: 2.12.0(vue@3.5.25) pinia: specifier: ^2.2.8 diff --git a/urbanLifelineWeb/packages/platform/package.json b/urbanLifelineWeb/packages/platform/package.json index 88e58ad..2bc8f39 100644 --- a/urbanLifelineWeb/packages/platform/package.json +++ b/urbanLifelineWeb/packages/platform/package.json @@ -12,7 +12,8 @@ "vue": "^3.5.13", "vue-router": "^4.5.0", "pinia": "^2.2.8", - "element-plus": "^2.9.1", + "element-plus": "^2.12.0", + "@element-plus/icons-vue": "^2.3.2", "@vueuse/core": "^11.3.0", "axios": "^1.7.9" }, diff --git a/urbanLifelineWeb/packages/platform/pnpm-lock.yaml b/urbanLifelineWeb/packages/platform/pnpm-lock.yaml index efd2126..6b03b24 100644 --- a/urbanLifelineWeb/packages/platform/pnpm-lock.yaml +++ b/urbanLifelineWeb/packages/platform/pnpm-lock.yaml @@ -5,6 +5,9 @@ settings: excludeLinksFromLockfile: false dependencies: + '@element-plus/icons-vue': + specifier: ^2.3.2 + version: 2.3.2(vue@3.5.25) '@vueuse/core': specifier: ^11.3.0 version: 11.3.0(vue@3.5.25) @@ -12,7 +15,7 @@ dependencies: specifier: ^1.7.9 version: 1.13.2 element-plus: - specifier: ^2.9.1 + specifier: ^2.12.0 version: 2.12.0(vue@3.5.25) pinia: specifier: ^2.2.8 diff --git a/urbanLifelineWeb/packages/shared/package-lock.json b/urbanLifelineWeb/packages/shared/package-lock.json index 0ea7d61..ad0341e 100644 --- a/urbanLifelineWeb/packages/shared/package-lock.json +++ b/urbanLifelineWeb/packages/shared/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "dependencies": { "@vueuse/core": "^11.3.0", - "element-plus": "^2.9.1", + "element-plus": "^2.12.0", "pinia": "^2.2.8", "vue": "^3.5.13", "vue-router": "^4.5.0" diff --git a/urbanLifelineWeb/packages/shared/package.json b/urbanLifelineWeb/packages/shared/package.json index aec4354..7421b6d 100644 --- a/urbanLifelineWeb/packages/shared/package.json +++ b/urbanLifelineWeb/packages/shared/package.json @@ -14,7 +14,9 @@ "dependencies": { "vue": "^3.5.13", "ofetch": "^1.4.1", - "vue-router": "^4.2.0" + "vue-router": "^4.5.0", + "element-plus": "^2.12.0", + "@element-plus/icons-vue": "^2.3.2" }, "devDependencies": { "@types/node": "^20.10.0", diff --git a/urbanLifelineWeb/packages/shared/pnpm-lock.yaml b/urbanLifelineWeb/packages/shared/pnpm-lock.yaml index 0b42509..6c44f33 100644 --- a/urbanLifelineWeb/packages/shared/pnpm-lock.yaml +++ b/urbanLifelineWeb/packages/shared/pnpm-lock.yaml @@ -5,6 +5,12 @@ settings: excludeLinksFromLockfile: false dependencies: + '@element-plus/icons-vue': + specifier: ^2.3.2 + version: 2.3.2(vue@3.5.25) + element-plus: + specifier: ^2.12.0 + version: 2.12.0(vue@3.5.25) ofetch: specifier: ^1.4.1 version: 1.5.1 @@ -12,7 +18,7 @@ dependencies: specifier: ^3.5.13 version: 3.5.25(typescript@5.9.3) vue-router: - specifier: ^4.2.0 + specifier: ^4.5.0 version: 4.6.3(vue@3.5.25) devDependencies: @@ -304,6 +310,19 @@ packages: resolution: {integrity: sha512-ckS3+vyJb5qGpEYv/s1OebUHDi/xSNtfgw1wqKZo7MR9F2z+qXr0q5XagafAG/9O0QPVIUfST0smluYSTpYFkg==} dev: true + /@ctrl/tinycolor@3.6.1: + resolution: {integrity: sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA==} + engines: {node: '>=10'} + dev: false + + /@element-plus/icons-vue@2.3.2(vue@3.5.25): + resolution: {integrity: sha512-OzIuTaIfC8QXEPmJvB4Y4kw34rSXdCJzxcD1kFStBvr8bK6X1zQAYDo0CNMjojnfTqRQCJ0I7prlErcoRiET2A==} + peerDependencies: + vue: ^3.2.0 + dependencies: + vue: 3.5.25(typescript@5.9.3) + dev: false + /@esbuild/aix-ppc64@0.25.12: resolution: {integrity: sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==} engines: {node: '>=18'} @@ -538,6 +557,23 @@ packages: dev: true optional: true + /@floating-ui/core@1.7.3: + resolution: {integrity: sha512-sGnvb5dmrJaKEZ+LDIpguvdX3bDlEllmv4/ClQ9awcmCZrlx5jQyyMWFM5kBI+EyNOCDDiKk8il0zeuX3Zlg/w==} + dependencies: + '@floating-ui/utils': 0.2.10 + dev: false + + /@floating-ui/dom@1.7.4: + resolution: {integrity: sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==} + dependencies: + '@floating-ui/core': 1.7.3 + '@floating-ui/utils': 0.2.10 + dev: false + + /@floating-ui/utils@0.2.10: + resolution: {integrity: sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==} + dev: false + /@jridgewell/gen-mapping@0.3.13: resolution: {integrity: sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==} dependencies: @@ -915,16 +951,34 @@ packages: dev: true optional: true + /@sxzz/popperjs-es@2.11.7: + resolution: {integrity: sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==} + dev: false + /@types/estree@1.0.8: resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==} dev: true + /@types/lodash-es@4.17.12: + resolution: {integrity: sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==} + dependencies: + '@types/lodash': 4.17.21 + dev: false + + /@types/lodash@4.17.21: + resolution: {integrity: sha512-FOvQ0YPD5NOfPgMzJihoT+Za5pdkDJWcbpuj1DjaKZIr/gxodQjY/uWEFlTNqW2ugXHUiL8lRQgw63dzKHZdeQ==} + dev: false + /@types/node@20.19.25: resolution: {integrity: sha512-ZsJzA5thDQMSQO788d7IocwwQbI8B5OPzmqNvpf3NY/+MHDAS759Wo0gd2WQeXYt5AAAQjzcrTVC6SKCuYgoCQ==} dependencies: undici-types: 6.21.0 dev: true + /@types/web-bluetooth@0.0.16: + resolution: {integrity: sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==} + dev: false + /@vitejs/plugin-vue-jsx@4.2.0(vite@6.4.1)(vue@3.5.25): resolution: {integrity: sha512-DSTrmrdLp+0LDNF77fqrKfx7X0ErRbOcUAgJL/HbSesqQwoUvUQ4uYQqaex+rovqgGcoPqVk+AwUh3v9CuiYIw==} engines: {node: ^18.0.0 || >=20.0.0} @@ -1063,6 +1117,31 @@ packages: /@vue/shared@3.5.25: resolution: {integrity: sha512-AbOPdQQnAnzs58H2FrrDxYj/TJfmeS2jdfEEhgiKINy+bnOANmVizIEgq1r+C5zsbs6l1CCQxtcj71rwNQ4jWg==} + /@vueuse/core@9.13.0(vue@3.5.25): + resolution: {integrity: sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==} + dependencies: + '@types/web-bluetooth': 0.0.16 + '@vueuse/metadata': 9.13.0 + '@vueuse/shared': 9.13.0(vue@3.5.25) + vue-demi: 0.14.10(vue@3.5.25) + transitivePeerDependencies: + - '@vue/composition-api' + - vue + dev: false + + /@vueuse/metadata@9.13.0: + resolution: {integrity: sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==} + dev: false + + /@vueuse/shared@9.13.0(vue@3.5.25): + resolution: {integrity: sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==} + dependencies: + vue-demi: 0.14.10(vue@3.5.25) + transitivePeerDependencies: + - '@vue/composition-api' + - vue + dev: false + /ansi-styles@3.2.1: resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==} engines: {node: '>=4'} @@ -1096,6 +1175,10 @@ packages: engines: {node: '>= 0.4'} dev: true + /async-validator@4.2.5: + resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==} + dev: false + /available-typed-arrays@1.0.7: resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==} engines: {node: '>= 0.4'} @@ -1253,6 +1336,10 @@ packages: is-data-view: 1.0.2 dev: true + /dayjs@1.11.19: + resolution: {integrity: sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw==} + dev: false + /debug@4.4.3: resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==} engines: {node: '>=6.0'} @@ -1308,6 +1395,30 @@ packages: resolution: {integrity: sha512-kgWEglXvkEfMH7rxP5OSZZwnaDWT7J9EoZCujhnpLbfi0bbNtRkgdX2E3gt0Uer11c61qCYktB3hwkAS325sJg==} dev: true + /element-plus@2.12.0(vue@3.5.25): + resolution: {integrity: sha512-M9YLSn2np9OnqrSKWsiXvGe3qnF8pd94+TScsHj1aTMCD+nSEvucXermf807qNt6hOP040le0e5Aft7E9ZfHmA==} + peerDependencies: + vue: ^3.2.0 + dependencies: + '@ctrl/tinycolor': 3.6.1 + '@element-plus/icons-vue': 2.3.2(vue@3.5.25) + '@floating-ui/dom': 1.7.4 + '@popperjs/core': /@sxzz/popperjs-es@2.11.7 + '@types/lodash': 4.17.21 + '@types/lodash-es': 4.17.12 + '@vueuse/core': 9.13.0(vue@3.5.25) + async-validator: 4.2.5 + dayjs: 1.11.19 + lodash: 4.17.21 + lodash-es: 4.17.21 + lodash-unified: 1.0.3(@types/lodash-es@4.17.12)(lodash-es@4.17.21)(lodash@4.17.21) + memoize-one: 6.0.0 + normalize-wheel-es: 1.2.0 + vue: 3.5.25(typescript@5.9.3) + transitivePeerDependencies: + - '@vue/composition-api' + dev: false + /entities@4.5.0: resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==} engines: {node: '>=0.12'} @@ -1878,6 +1989,26 @@ packages: strip-bom: 3.0.0 dev: true + /lodash-es@4.17.21: + resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==} + dev: false + + /lodash-unified@1.0.3(@types/lodash-es@4.17.12)(lodash-es@4.17.21)(lodash@4.17.21): + resolution: {integrity: sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==} + peerDependencies: + '@types/lodash-es': '*' + lodash: '*' + lodash-es: '*' + dependencies: + '@types/lodash-es': 4.17.12 + lodash: 4.17.21 + lodash-es: 4.17.21 + dev: false + + /lodash@4.17.21: + resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} + dev: false + /lru-cache@5.1.1: resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==} dependencies: @@ -1901,6 +2032,10 @@ packages: engines: {node: '>= 0.4'} dev: true + /memoize-one@6.0.0: + resolution: {integrity: sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==} + dev: false + /memorystream@0.3.1: resolution: {integrity: sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==} engines: {node: '>= 0.10.0'} @@ -1958,6 +2093,10 @@ packages: validate-npm-package-license: 3.0.4 dev: true + /normalize-wheel-es@1.2.0: + resolution: {integrity: sha512-Wj7+EJQ8mSuXr2iWfnujrimU35R2W4FAErEyTmJoJ7ucwTn2hOUSsRehMb5RSYkxXGTM7Y9QpvPmp++w5ftoJw==} + dev: false + /npm-run-all@4.1.5: resolution: {integrity: sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==} engines: {node: '>= 4'} @@ -2796,6 +2935,21 @@ packages: fsevents: 2.3.3 dev: true + /vue-demi@0.14.10(vue@3.5.25): + resolution: {integrity: sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==} + engines: {node: '>=12'} + hasBin: true + requiresBuild: true + peerDependencies: + '@vue/composition-api': ^1.0.0-rc.1 + vue: ^3.0.0-0 || ^2.6.0 + peerDependenciesMeta: + '@vue/composition-api': + optional: true + dependencies: + vue: 3.5.25(typescript@5.9.3) + dev: false + /vue-router@4.6.3(vue@3.5.25): resolution: {integrity: sha512-ARBedLm9YlbvQomnmq91Os7ck6efydTSpRP3nuOKCvgJOHNrhRoJDSKtee8kcL1Vf7nz6U+PMBL+hTvR3bTVQg==} peerDependencies: diff --git a/urbanLifelineWeb/packages/shared/src/components/base/button/Button.vue b/urbanLifelineWeb/packages/shared/src/components/base/button/Button.vue deleted file mode 100644 index ab20b6a..0000000 --- a/urbanLifelineWeb/packages/shared/src/components/base/button/Button.vue +++ /dev/null @@ -1,55 +0,0 @@ - - - - diff --git a/urbanLifelineWeb/packages/shared/src/components/base/button/ButtonExample.vue b/urbanLifelineWeb/packages/shared/src/components/base/button/ButtonExample.vue deleted file mode 100644 index 0d5f5f6..0000000 --- a/urbanLifelineWeb/packages/shared/src/components/base/button/ButtonExample.vue +++ /dev/null @@ -1,165 +0,0 @@ - - - - \ No newline at end of file diff --git a/urbanLifelineWeb/packages/shared/src/components/base/button/button.scss b/urbanLifelineWeb/packages/shared/src/components/base/button/button.scss deleted file mode 100644 index c71cdcc..0000000 --- a/urbanLifelineWeb/packages/shared/src/components/base/button/button.scss +++ /dev/null @@ -1,189 +0,0 @@ -.btn { - display: inline-flex; - align-items: center; - justify-content: center; - gap: 8px; - border: none; - border-radius: 6px; - cursor: pointer; - font-weight: 500; - transition: all 0.2s ease; - text-decoration: none; - white-space: nowrap; - - &:focus { - outline: 2px solid rgba(59, 130, 246, 0.5); - outline-offset: 2px; - } - - // 尺寸 - &--small { - padding: 6px 12px; - font-size: 12px; - line-height: 1.4; - } - - &--medium { - padding: 8px 16px; - font-size: 14px; - line-height: 1.5; - } - - &--large { - padding: 12px 20px; - font-size: 16px; - line-height: 1.5; - } - - // 变体 - &--primary { - background-color: #3b82f6; - color: white; - - &:hover:not(.btn--disabled):not(.btn--loading) { - background-color: #2563eb; - } - } - - &--secondary { - background-color: #f1f5f9; - color: #475569; - border: 1px solid #e2e8f0; - - &:hover:not(.btn--disabled):not(.btn--loading) { - background-color: #e2e8f0; - } - } - - &--danger { - background-color: #ef4444; - color: white; - - &:hover:not(.btn--disabled):not(.btn--loading) { - background-color: #dc2626; - } - } - - &--success { - background-color: #10b981; - color: white; - - &:hover:not(.btn--disabled):not(.btn--loading) { - background-color: #059669; - } - } - - &--warning { - background-color: #f59e0b; - color: white; - - &:hover:not(.btn--disabled):not(.btn--loading) { - background-color: #d97706; - } - } - - // 渐变变体 - &--gradient-blue { - background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); - color: white; - border: none; - - &:hover:not(.btn--disabled):not(.btn--loading) { - background: linear-gradient(135deg, #5a6fd8 0%, #6a4190 100%); - transform: translateY(-1px); - box-shadow: 0 4px 12px rgba(102, 126, 234, 0.4); - } - } - - &--gradient-purple { - background: linear-gradient(135deg, #a8edea 0%, #fed6e3 100%); - color: #374151; - border: none; - - &:hover:not(.btn--disabled):not(.btn--loading) { - background: linear-gradient(135deg, #96e6e2 0%, #fcc4d1 100%); - transform: translateY(-1px); - box-shadow: 0 4px 12px rgba(168, 237, 234, 0.4); - } - } - - &--gradient-pink { - background: linear-gradient(135deg, #ff9a9e 0%, #fecfef 100%); - color: white; - border: none; - - &:hover:not(.btn--disabled):not(.btn--loading) { - background: linear-gradient(135deg, #ff888c 0%, #feb7dd 100%); - transform: translateY(-1px); - box-shadow: 0 4px 12px rgba(255, 154, 158, 0.4); - } - } - - &--gradient-orange { - background: linear-gradient(135deg, #ffecd2 0%, #fcb69f 100%); - color: #374151; - border: none; - - &:hover:not(.btn--disabled):not(.btn--loading) { - background: linear-gradient(135deg, #ffe4c0 0%, #fba88d 100%); - transform: translateY(-1px); - box-shadow: 0 4px 12px rgba(252, 182, 159, 0.4); - } - } - - &--gradient-green { - background: linear-gradient(135deg, #a8e6cf 0%, #dcedc1 100%); - color: #374151; - border: none; - - &:hover:not(.btn--disabled):not(.btn--loading) { - background: linear-gradient(135deg, #96dfbf 0%, #d0e6af 100%); - transform: translateY(-1px); - box-shadow: 0 4px 12px rgba(168, 230, 207, 0.4); - } - } - - &--gradient-blue-special { - background: linear-gradient(281.59deg, #162C8E 8.51%, #1D72D3 66.15%, #AEF1FF 100.83%); - color: white; - border: none; - - &:hover:not(.btn--disabled):not(.btn--loading) { - background: linear-gradient(281.59deg, #142558 8.51%, #1a64b8 66.15%, #9ce8f5 100.83%); - transform: translateY(-1px); - box-shadow: 0 4px 12px rgba(29, 114, 211, 0.4); - } - } - - // 状态 - &--disabled { - opacity: 0.5; - cursor: not-allowed; - } - - &--loading { - cursor: wait; - } - - // 加载动画 - &__spinner { - width: 16px; - height: 16px; - border: 2px solid transparent; - border-top: 2px solid currentColor; - border-radius: 50%; - animation: spin 1s linear infinite; - } - - &__content { - display: flex; - align-items: center; - gap: 8px; - } -} - -@keyframes spin { - to { - transform: rotate(360deg); - } -} \ No newline at end of file diff --git a/urbanLifelineWeb/packages/shared/src/components/base/index.ts b/urbanLifelineWeb/packages/shared/src/components/base/index.ts index f63d499..e69de29 100644 --- a/urbanLifelineWeb/packages/shared/src/components/base/index.ts +++ b/urbanLifelineWeb/packages/shared/src/components/base/index.ts @@ -1 +0,0 @@ -export { default as Button } from './button/Button.vue' \ No newline at end of file diff --git a/urbanLifelineWeb/packages/shared/src/components/fileupload/FileUpload.scss b/urbanLifelineWeb/packages/shared/src/components/fileupload/FileUpload.scss index 10c30e3..ec9b4d5 100644 --- a/urbanLifelineWeb/packages/shared/src/components/fileupload/FileUpload.scss +++ b/urbanLifelineWeb/packages/shared/src/components/fileupload/FileUpload.scss @@ -52,58 +52,21 @@ // 弹窗模式 &.dialog { - .overlay { - position: fixed; - top: 0; - left: 0; - right: 0; - bottom: 0; - background-color: rgba(0, 0, 0, 0.5); - display: flex; - align-items: center; - justify-content: center; - z-index: 1000; + .dialog-content { + padding: 0; } - .modal { - background: white; - border-radius: 12px; - padding: 24px; - width: 90%; - max-width: 500px; - max-height: 80vh; - overflow-y: auto; - box-shadow: 0 20px 25px -5px rgba(0, 0, 0, 0.1); - } - - .header { - display: flex; - justify-content: space-between; - align-items: center; - margin-bottom: 20px; - padding-bottom: 12px; - border-bottom: 1px solid #e2e8f0; - - h3 { - margin: 0; - font-size: 18px; - font-weight: 600; - color: #1e293b; - } - } - - .footer { + .dialog-footer { display: flex; gap: 12px; justify-content: flex-end; - margin-top: 20px; - padding-top: 20px; - border-top: 1px solid #e2e8f0; } } // 内容模式 - &.content {} + &.content { + display: block; + } // 通用容器 .container { diff --git a/urbanLifelineWeb/packages/shared/src/components/fileupload/FileUpload.vue b/urbanLifelineWeb/packages/shared/src/components/fileupload/FileUpload.vue index a8c7700..4072128 100644 --- a/urbanLifelineWeb/packages/shared/src/components/fileupload/FileUpload.vue +++ b/urbanLifelineWeb/packages/shared/src/components/fileupload/FileUpload.vue @@ -6,9 +6,9 @@ 封面图片
- +
@@ -35,64 +35,64 @@
- + -
-
-
-

{{ title || '文件上传' }}

- + +
+
+
+
+
+
+ 将文件拖到此处，或点击上传 +
+
{{ getUploadTip() }}
-
-
-
-
+ + + +
+
+
+ + {{ getFileTypeIcon(file) }}
-
- 将文件拖到此处，或点击上传 + +
+
{{ file.name }}
+
{{ formatFileSize(file.size) }}
-
{{ getUploadTip() }}
-
- - - -
-
-
- - {{ getFileTypeIcon(file) }} -
- -
-
{{ file.name }}
-
{{ formatFileSize(file.size) }}
-
- -
- -
+
+ + 删除 +
- -
- - -
-
+ + +
@@ -127,19 +127,19 @@
- +
- +
@@ -148,10 +148,10 @@ \ No newline at end of file diff --git a/urbanLifelineWeb/packages/shared/src/main.ts b/urbanLifelineWeb/packages/shared/src/main.ts index 3e79677..571164a 100644 --- a/urbanLifelineWeb/packages/shared/src/main.ts +++ b/urbanLifelineWeb/packages/shared/src/main.ts @@ -1,5 +1,10 @@ import { createApp } from 'vue' +import ElementPlus from 'element-plus' +import 'element-plus/dist/index.css' import App from './App.vue' import router from './router' -createApp(App).use(router).mount('#app') +const app = createApp(App) +app.use(ElementPlus) +app.use(router) +app.mount('#app') diff --git a/urbanLifelineWeb/packages/workcase/package.json b/urbanLifelineWeb/packages/workcase/package.json index cd3914d..f0f41a5 100644 --- a/urbanLifelineWeb/packages/workcase/package.json +++ b/urbanLifelineWeb/packages/workcase/package.json @@ -12,7 +12,8 @@ "vue": "^3.5.13", "vue-router": "^4.5.0", "pinia": "^2.2.8", - "element-plus": "^2.9.1", + "element-plus": "^2.8.6", + "@element-plus/icons-vue": "^2.3.2", "@vueuse/core": "^11.3.0", "axios": "^1.7.9" }, diff --git a/urbanLifelineWeb/packages/workcase/pnpm-lock.yaml b/urbanLifelineWeb/packages/workcase/pnpm-lock.yaml index efd2126..644bf91 100644 --- a/urbanLifelineWeb/packages/workcase/pnpm-lock.yaml +++ b/urbanLifelineWeb/packages/workcase/pnpm-lock.yaml @@ -5,6 +5,9 @@ settings: excludeLinksFromLockfile: false dependencies: + '@element-plus/icons-vue': + specifier: ^2.3.2 + version: 2.3.2(vue@3.5.25) '@vueuse/core': specifier: ^11.3.0 version: 11.3.0(vue@3.5.25) @@ -12,7 +15,7 @@ dependencies: specifier: ^1.7.9 version: 1.13.2 element-plus: - specifier: ^2.9.1 + specifier: ^2.8.6 version: 2.12.0(vue@3.5.25) pinia: specifier: ^2.2.8