+
@@ -196,4 +196,7 @@ export default {
.sc-select-filter__no-data {
color: #999;
}
+.sc-select-filter__item-w100p {
+ width: 100%;
+}
\ No newline at end of file
diff --git a/src/frontend/admin/src/components/scStatistic/index.vue b/src/frontend/admin/src/components/scStatistic/index.vue
index 1fdce0a7..d8ae4a27 100644
--- a/src/frontend/admin/src/components/scStatistic/index.vue
+++ b/src/frontend/admin/src/components/scStatistic/index.vue
@@ -31,6 +31,9 @@
{{ suffix }}
+
+
+
@@ -102,4 +105,8 @@ export default {
.dark .sc-statistic-content {
color: #c0c0c0;
}
+
+.sc-statistic-icon {
+ float: right;
+}
\ No newline at end of file
diff --git a/src/frontend/admin/src/components/scTable/fieldFilter.vue b/src/frontend/admin/src/components/scTable/fieldFilter.vue
index ef77ca19..18590055 100644
--- a/src/frontend/admin/src/components/scTable/fieldFilter.vue
+++ b/src/frontend/admin/src/components/scTable/fieldFilter.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/src/frontend/admin/src/global.js b/src/frontend/admin/src/global.js
index e3291ce4..8fca9773 100644
--- a/src/frontend/admin/src/global.js
+++ b/src/frontend/admin/src/global.js
@@ -51,6 +51,7 @@ import naColAvatar from '@/components/naColAvatar'
import naColId from '@/components/naColId/index.vue'
import naColIndicator from '@/components/naColIndicator/index.vue'
import naColOperation from '@/components/naColOperation'
+import naColTag from '@/components/naColTag/index.vue'
import naColTags from '@/components/naColTags/index.vue'
import naColTime from '@/components/naColTime/index.vue'
import naColUser from '@/components/naColUser/index.vue'
@@ -93,6 +94,7 @@ export default {
app.component('naColId', naColId)
app.component('naColIndicator', naColIndicator)
app.component('naColOperation', naColOperation)
+ app.component('naColTag', naColTag)
app.component('naColTags', naColTags)
app.component('naColTime', naColTime)
app.component('naColUser', naColUser)
diff --git a/src/frontend/admin/src/locales/lang/en.js b/src/frontend/admin/src/locales/lang/en.js
index d110350e..93184c8a 100644
--- a/src/frontend/admin/src/locales/lang/en.js
+++ b/src/frontend/admin/src/locales/lang/en.js
@@ -466,7 +466,6 @@ export default {
用户列表: 'User list',
是: 'Yes',
否: 'No',
- 资源复用: 'Resource reuse',
手机: 'Mobile',
'您已退出登录或无权限访问当前资源,请重新登录后再操作':
'You have logged out or do not have permission to access the current resource, please log in again before operating',
diff --git a/src/frontend/admin/src/locales/lang/zh-cn.js b/src/frontend/admin/src/locales/lang/zh-cn.js
index ab9ebf6c..5eb39c17 100644
--- a/src/frontend/admin/src/locales/lang/zh-cn.js
+++ b/src/frontend/admin/src/locales/lang/zh-cn.js
@@ -464,7 +464,6 @@ export default {
用户列表: '用户列表',
是: '是',
否: '否',
- 资源复用: '资源复用',
手机: '手机',
'您已退出登录或无权限访问当前资源,请重新登录后再操作': '您已退出登录或无权限访问当前资源,请重新登录后再操作',
访问受限: '访问受限',
diff --git a/src/frontend/admin/src/style/dark.scss b/src/frontend/admin/src/style/dark.scss
index 278d3531..3bb9b04f 100644
--- a/src/frontend/admin/src/style/dark.scss
+++ b/src/frontend/admin/src/style/dark.scss
@@ -1,4 +1,4 @@
-@import 'element-plus/theme-chalk/src/dark/css-vars.scss';
+@use 'element-plus/theme-chalk/src/dark/css-vars.scss' as *;
html.dark {
//变量
diff --git a/src/frontend/admin/src/style/fix.scss b/src/frontend/admin/src/style/fix.scss
index 054f34a6..e5458286 100644
--- a/src/frontend/admin/src/style/fix.scss
+++ b/src/frontend/admin/src/style/fix.scss
@@ -293,6 +293,32 @@
.el-dialog__body {
flex: 1;
+
+ > * {
+ height: 100%;
+ }
+
+ .el-tabs,
+ .el-tab-pane,
+ .el-form {
+ height: 100%;
+ }
+
+ .el-tabs__content,
+ .el-tabs__content > * {
+ height: 100%;
+ }
+
+ .el-tab-pane {
+ overflow-y: scroll;
+ overflow-x: hidden;
+ scrollbar-width: none;
+
+ &::-webkit-scrollbar {
+ width: 0; /* 隐藏纵向滚动条 */
+ background: transparent; /* 隐藏背景 */
+ }
+ }
}
}
diff --git a/src/frontend/admin/src/style/style.scss b/src/frontend/admin/src/style/style.scss
index 8ca490da..e4251462 100644
--- a/src/frontend/admin/src/style/style.scss
+++ b/src/frontend/admin/src/style/style.scss
@@ -1,5 +1,5 @@
-@import 'app.scss';
-@import 'fix.scss';
-@import 'pages.scss';
-@import 'media.scss';
-@import 'dark.scss';
\ No newline at end of file
+@use 'app.scss' as *;
+@use 'fix.scss' as *;
+@use 'pages.scss' as *;
+@use 'media.scss' as *;
+@use 'dark.scss' as *;
\ No newline at end of file
diff --git a/src/frontend/admin/src/views/home/widgets/components/components/chart-bar.vue b/src/frontend/admin/src/views/home/widgets/components/components/chart-bar.vue
index 01c8034a..2310ff7d 100644
--- a/src/frontend/admin/src/views/home/widgets/components/components/chart-bar.vue
+++ b/src/frontend/admin/src/views/home/widgets/components/components/chart-bar.vue
@@ -43,7 +43,7 @@ export default {
}),
)
this.loading = false
- this.option.xAxis.data = res[0].data.map((x) => {
+ this.option.xAxis.data = res[res.length - 1].data.map((x) => {
return x.timestamp
})
let i = 0
diff --git a/src/frontend/admin/src/views/profile/account/set-email.vue b/src/frontend/admin/src/views/profile/account/set-email.vue
index 23718f07..4f7000b1 100644
--- a/src/frontend/admin/src/views/profile/account/set-email.vue
+++ b/src/frontend/admin/src/views/profile/account/set-email.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/src/frontend/admin/src/views/profile/account/set-mobile.vue b/src/frontend/admin/src/views/profile/account/set-mobile.vue
index 5a68f975..46d74da3 100644
--- a/src/frontend/admin/src/views/profile/account/set-mobile.vue
+++ b/src/frontend/admin/src/views/profile/account/set-mobile.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/src/frontend/admin/src/views/profile/account/set-password.vue b/src/frontend/admin/src/views/profile/account/set-password.vue
index a9570ffb..fdaeb7e0 100644
--- a/src/frontend/admin/src/views/profile/account/set-password.vue
+++ b/src/frontend/admin/src/views/profile/account/set-password.vue
@@ -1,5 +1,5 @@
-
+
-
+
diff --git a/src/frontend/admin/src/views/sys/config/save.vue b/src/frontend/admin/src/views/sys/config/save.vue
index 1cc86d89..c3e5dc1b 100644
--- a/src/frontend/admin/src/views/sys/config/save.vue
+++ b/src/frontend/admin/src/views/sys/config/save.vue
@@ -25,7 +25,6 @@
-
diff --git a/src/frontend/admin/src/views/sys/dic/list/save.vue b/src/frontend/admin/src/views/sys/dic/list/save.vue
index b8e4aaf2..e7aa52ed 100644
--- a/src/frontend/admin/src/views/sys/dic/list/save.vue
+++ b/src/frontend/admin/src/views/sys/dic/list/save.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/src/frontend/admin/src/views/sys/dic/list/savebatch.vue b/src/frontend/admin/src/views/sys/dic/list/savebatch.vue
index 7446c4df..62dda5e2 100644
--- a/src/frontend/admin/src/views/sys/dic/list/savebatch.vue
+++ b/src/frontend/admin/src/views/sys/dic/list/savebatch.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/src/frontend/admin/src/views/sys/dic/save.vue b/src/frontend/admin/src/views/sys/dic/save.vue
index 0deaefb6..ab4f1b7d 100644
--- a/src/frontend/admin/src/views/sys/dic/save.vue
+++ b/src/frontend/admin/src/views/sys/dic/save.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/src/frontend/admin/src/views/sys/user/save.vue b/src/frontend/admin/src/views/sys/user/save.vue
index 5f7726a0..fd3b0bd5 100644
--- a/src/frontend/admin/src/views/sys/user/save.vue
+++ b/src/frontend/admin/src/views/sys/user/save.vue
@@ -7,13 +7,13 @@
destroy-on-close
full-screen>
+ ref="dialogForm"
+ style="height: 100%">