diff --git a/package.json b/package.json index ca2b781..0ace794 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "crypto-js": "^4.2.0", "echarts": "^5.4.3", "echarts4": "npm:echarts@^4.9.0", - "element-plus": "^2.4.4", + "element-plus": "^2.5.3", "html2canvas": "^1.4.1", "jquery": "^3.7.1", "lodash-es": "^4.17.21", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2885af5..f5ec120 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -29,8 +29,8 @@ dependencies: specifier: npm:echarts@^4.9.0 version: /echarts@4.9.0 element-plus: - specifier: ^2.4.4 - version: 2.4.4(vue@3.3.13) + specifier: ^2.5.3 + version: 2.5.3(vue@3.3.13) html2canvas: specifier: ^1.4.1 version: 1.4.1 @@ -401,7 +401,7 @@ packages: to-fast-properties: 2.0.0 /@ctrl/tinycolor@3.6.1: - resolution: {integrity: sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA==, tarball: https://registry.npmmirror.com/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz} + resolution: {integrity: sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA==} engines: {node: '>=10'} dev: false @@ -598,20 +598,20 @@ packages: optional: true /@floating-ui/core@1.5.2: - resolution: {integrity: sha512-Ii3MrfY/GAIN3OhXNzpCKaLxHQfJF9qvwq/kEJYdqDxeIHa01K8sldugal6TmeeXl+WMvhv9cnVzUTaFFJF09A==, tarball: https://registry.npmmirror.com/@floating-ui/core/-/core-1.5.2.tgz} + resolution: {integrity: sha512-Ii3MrfY/GAIN3OhXNzpCKaLxHQfJF9qvwq/kEJYdqDxeIHa01K8sldugal6TmeeXl+WMvhv9cnVzUTaFFJF09A==} dependencies: '@floating-ui/utils': 0.1.6 dev: false /@floating-ui/dom@1.5.3: - resolution: {integrity: sha512-ClAbQnEqJAKCJOEbbLo5IUlZHkNszqhuxS4fHAVxRPXPya6Ysf2G8KypnYcOTpx6I8xcgF9bbHb6g/2KpbV8qA==, tarball: https://registry.npmmirror.com/@floating-ui/dom/-/dom-1.5.3.tgz} + resolution: {integrity: sha512-ClAbQnEqJAKCJOEbbLo5IUlZHkNszqhuxS4fHAVxRPXPya6Ysf2G8KypnYcOTpx6I8xcgF9bbHb6g/2KpbV8qA==} dependencies: '@floating-ui/core': 1.5.2 '@floating-ui/utils': 0.1.6 dev: false /@floating-ui/utils@0.1.6: - resolution: {integrity: sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A==, tarball: https://registry.npmmirror.com/@floating-ui/utils/-/utils-0.1.6.tgz} + resolution: {integrity: sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A==} dev: false /@fortawesome/fontawesome-free@6.5.1: @@ -870,7 +870,7 @@ packages: undici-types: 5.26.5 /@types/web-bluetooth@0.0.16: - resolution: {integrity: sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==, tarball: https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz} + resolution: {integrity: sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==} dev: false /@types/web-bluetooth@0.0.20: @@ -1093,7 +1093,7 @@ packages: dev: false /@vueuse/core@9.13.0(vue@3.3.13): - resolution: {integrity: sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==, tarball: https://registry.npmmirror.com/@vueuse/core/-/core-9.13.0.tgz} + resolution: {integrity: sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==} dependencies: '@types/web-bluetooth': 0.0.16 '@vueuse/metadata': 9.13.0 @@ -1109,7 +1109,7 @@ packages: dev: false /@vueuse/metadata@9.13.0: - resolution: {integrity: sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==, tarball: https://registry.npmmirror.com/@vueuse/metadata/-/metadata-9.13.0.tgz} + resolution: {integrity: sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==} dev: false /@vueuse/shared@10.7.0(vue@3.3.13): @@ -1122,7 +1122,7 @@ packages: dev: false /@vueuse/shared@9.13.0(vue@3.3.13): - resolution: {integrity: sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==, tarball: https://registry.npmmirror.com/@vueuse/shared/-/shared-9.13.0.tgz} + resolution: {integrity: sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==} dependencies: vue-demi: 0.14.6(vue@3.3.13) transitivePeerDependencies: @@ -1346,7 +1346,7 @@ packages: dev: false /async-validator@4.2.5: - resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==, tarball: https://registry.npmmirror.com/async-validator/-/async-validator-4.2.5.tgz} + resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==} dev: false /asynckit@0.4.0: @@ -1490,7 +1490,7 @@ packages: dev: false /dayjs@1.11.10: - resolution: {integrity: sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==, tarball: https://registry.npmmirror.com/dayjs/-/dayjs-1.11.10.tgz} + resolution: {integrity: sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==} dev: false /de-indent@1.0.2: @@ -1539,8 +1539,8 @@ packages: resolution: {integrity: sha512-1n7zWYh8eS0L9Uy+GskE0lkBUNK83cXTVJI0pU3mGprFsbfSdAc15VTFbo+A+Bq4pwstmL30AVcEU3Fo463lNg==} dev: true - /element-plus@2.4.4(vue@3.3.13): - resolution: {integrity: sha512-TlKubXJgxwhER0dw+8ULn9hr9kZjraV4R6Q/eidwWUwCKxwXYPBGmMKsZ/85tlxlhMYbcLZd/YZh6G3QkHX4fg==, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.4.4.tgz} + /element-plus@2.5.3(vue@3.3.13): + resolution: {integrity: sha512-wmtstxaMkD6UinIgD+45CjrhbRh4u0vt+/GgxfPeMLt5pDpIVwZFjkUaVcWqqxcxd5a80HP3XlDF74fW7wim9A==} peerDependencies: vue: ^3.2.0 dependencies: @@ -1625,7 +1625,7 @@ packages: dev: true /escape-html@1.0.3: - resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==, tarball: https://registry.npmmirror.com/escape-html/-/escape-html-1.0.3.tgz} + resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==} dev: false /escape-string-regexp@1.0.5: @@ -1855,7 +1855,7 @@ packages: 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==, tarball: https://registry.npmmirror.com/lodash-unified/-/lodash-unified-1.0.3.tgz} + resolution: {integrity: sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==} peerDependencies: '@types/lodash-es': '*' lodash: '*' @@ -1921,7 +1921,7 @@ packages: '@jridgewell/sourcemap-codec': 1.4.15 /memoize-one@6.0.0: - resolution: {integrity: sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==, tarball: https://registry.npmmirror.com/memoize-one/-/memoize-one-6.0.0.tgz} + resolution: {integrity: sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==} dev: false /mime-db@1.52.0: @@ -1980,7 +1980,7 @@ packages: engines: {node: '>=0.10.0'} /normalize-wheel-es@1.2.0: - resolution: {integrity: sha512-Wj7+EJQ8mSuXr2iWfnujrimU35R2W4FAErEyTmJoJ7ucwTn2hOUSsRehMb5RSYkxXGTM7Y9QpvPmp++w5ftoJw==, tarball: https://registry.npmmirror.com/normalize-wheel-es/-/normalize-wheel-es-1.2.0.tgz} + resolution: {integrity: sha512-Wj7+EJQ8mSuXr2iWfnujrimU35R2W4FAErEyTmJoJ7ucwTn2hOUSsRehMb5RSYkxXGTM7Y9QpvPmp++w5ftoJw==} dev: false /nprogress@0.2.0: @@ -2261,7 +2261,7 @@ packages: /use-element-plus-theme@0.0.5(@types/node@20.10.5)(typescript@5.3.3)(vite@5.0.10): resolution: {integrity: sha512-YktH5VbVqsT/lYTxx60KeqS5AZgDMEdDChsI2NxxcVkCOOgmkrM/yQVxxItWYhTJti3YxodM5SM89Vv1timIsA==} dependencies: - element-plus: 2.4.4(vue@3.3.13) + element-plus: 2.5.3(vue@3.3.13) vite-plugin-dts: 3.7.0(@types/node@20.10.5)(typescript@5.3.3)(vite@5.0.10) vue: 3.3.13(typescript@5.3.3) transitivePeerDependencies: diff --git a/src/styles/app.scss b/src/styles/app.scss index f8e832d..42edaf2 100644 --- a/src/styles/app.scss +++ b/src/styles/app.scss @@ -312,4 +312,21 @@ body, padding: 13px 15px; align-items: center; border: 1px solid var(--el-border-color); + .title { + flex: 1; + font-weight: 700; + } + .el-form-item { + margin-bottom: 0 !important; + } +} + +.child-router { + position: absolute; + top: 0; + left: 0; + height: 100%; + width: 100%; + background: #fff; + z-index: 2; } diff --git a/src/styles/element.scss b/src/styles/element.scss index 97ea20c..c10dd43 100644 --- a/src/styles/element.scss +++ b/src/styles/element.scss @@ -1,123 +1,131 @@ /* 修复 Chrome 浏览器输入框内选中字符行高异常的bug-s */ .el-input .el-input__inner { - height: 30px; - line-height: calc(var(--el-input-height, 40px) - 4px); + height: 30px; + line-height: calc(var(--el-input-height, 40px) - 4px); } /* 修复 Chrome 浏览器输入框内选中字符行高异常的bug-e */ .datetime-picker { - height: 32px; - padding-top: 0; - padding-bottom: 0; + height: 32px; + padding-top: 0; + padding-bottom: 0; } .el-divider__text.is-center { - transform: translateX(-50%) translateY(-62%); + transform: translateX(-50%) translateY(-62%); } .el-menu { - user-select: none; + user-select: none; - .el-menu-item:hover, - .el-sub-menu__title:hover { - background-color: var(--el-menu-hover-color) !important; - color: var(--el-menu-active-color) !important; + .el-menu-item:hover, + .el-sub-menu__title:hover { + background-color: var(--el-menu-hover-color) !important; + color: var(--el-menu-active-color) !important; - .icon { - color: var(--el-menu-active-color) !important; + .icon { + color: var(--el-menu-active-color) !important; + } } - } } .el-dialog__header { - background: var(--el-color-primary); - margin-right: 0; + background: var(--el-color-primary); + margin-right: 0; - .el-dialog__headerbtn { - .el-icon { - color: var(--el-color-white); + .el-dialog__headerbtn { + .el-icon { + color: var(--el-color-white); + } } - } - .el-dialog__title { - color: var(--el-color-white); - } + .el-dialog__title { + color: var(--el-color-white); + } } .el-table { - --el-table-border-color: var(--ba-border-color); + --el-table-border-color: var(--ba-border-color); } .el-card { - border: none; + border: none; } .el-card__header { - border-bottom: 1px solid var(--el-border-color-extra-light); + border-bottom: 1px solid var(--el-border-color-extra-light); } .el-textarea__inner { - padding: 5px 11px; + padding: 5px 11px; } .el-dialog__body { - padding: 10px; + padding: 10px; } /* dialog滚动条-s */ .el-overlay-dialog, .el-tabs__content, .ba-scroll-style { - scrollbar-width: none; + scrollbar-width: none; - &::-webkit-scrollbar { - width: 5px; - height: 5px; - } - - &::-webkit-scrollbar-thumb { - background: #eaeaea; - border-radius: var(--el-border-radius-base); - box-shadow: none; - -webkit-box-shadow: none; - } - - &:hover { - &::-webkit-scrollbar-thumb:hover { - background: #c8c9cc; + &::-webkit-scrollbar { + width: 5px; + height: 5px; + } + + &::-webkit-scrollbar-thumb { + background: #eaeaea; + border-radius: var(--el-border-radius-base); + box-shadow: none; + -webkit-box-shadow: none; + } + + &:hover { + &::-webkit-scrollbar-thumb:hover { + background: #c8c9cc; + } } - } } /* dialog滚动条-e */ /* 小屏设备 el-radio-group 样式优化-s */ .ba-input-item-radio { - margin-bottom: 10px; + margin-bottom: 10px; - .el-radio-group { - .el-radio { - margin-bottom: 8px; + .el-radio-group { + .el-radio { + margin-bottom: 8px; + } } - } } /* 小屏设备 el-radio-group 样式调整-e */ .el-tabs--card > .el-tabs__header .el-tabs__item.is-active { - background: var(--el-color-primary); - color: var(--el-color-white); + background: var(--el-color-primary); + color: var(--el-color-white); } .el-tabs__header { - margin-bottom: 0; + margin-bottom: 0; } .el-form--inline .el-form-item { - margin-bottom: 10px; + margin-bottom: 10px; } -.el-tabs--border-card>.el-tabs__content{ - padding: 10px; -} \ No newline at end of file +.el-tabs--border-card > .el-tabs__content { + padding: 10px; +} + +.el-page-header__header { + line-height: 32px; + .el-page-header__content { + font-size: 14px; + font-weight: 700; + } +} diff --git a/src/views/auth/audit/index.vue b/src/views/auth/audit/index.vue index ecce945..f9a7b5d 100644 --- a/src/views/auth/audit/index.vue +++ b/src/views/auth/audit/index.vue @@ -1,7 +1,7 @@