diff --git a/web/src/assets/css/image-dall.scss b/web/src/assets/css/image-dall.scss index 56d4c410..c15676eb 100644 --- a/web/src/assets/css/image-dall.scss +++ b/web/src/assets/css/image-dall.scss @@ -1,3 +1,5 @@ +@use 'waterfall-list.scss' as *; + .page-dall { // background-color: #282c34; @@ -211,7 +213,6 @@ } // 任务列表 - @import 'waterfall-list.scss'; } .no-more-data { diff --git a/web/src/assets/css/image-mj.scss b/web/src/assets/css/image-mj.scss index 20e98567..4050aad7 100644 --- a/web/src/assets/css/image-mj.scss +++ b/web/src/assets/css/image-mj.scss @@ -1,3 +1,5 @@ +@use 'running-job-list.scss' as *; + .page-mj { // background-color: #282c34; height: 100%; @@ -323,7 +325,6 @@ .job-list-box { // 任务列表 - @import 'running-job-list.scss'; .finish-job-list { #waterfall { diff --git a/web/src/assets/css/image-sd.scss b/web/src/assets/css/image-sd.scss index fbe026a5..e101b3f0 100644 --- a/web/src/assets/css/image-sd.scss +++ b/web/src/assets/css/image-sd.scss @@ -1,3 +1,6 @@ +@use 'waterfall-list.scss' as *; +@use 'sd-task-dialog.scss' as *; + .page-sd { // background-color: #282c34; @@ -212,7 +215,6 @@ } // 任务列表 - @import 'waterfall-list.scss'; } .no-more-data { @@ -222,8 +224,6 @@ } } - @import 'sd-task-dialog.scss'; - .mj-list-item-prompt { .el-icon { margin-left: 10px; diff --git a/web/src/assets/css/images-wall.scss b/web/src/assets/css/images-wall.scss index 701ba1d2..47bb9cba 100644 --- a/web/src/assets/css/images-wall.scss +++ b/web/src/assets/css/images-wall.scss @@ -1,3 +1,5 @@ +@use 'sd-task-dialog.scss' as *; + @keyframes expandUp { 0% { transform: scaleY(0); @@ -79,7 +81,8 @@ } .iconfont { } - .el-icon, .iconfont { + .el-icon, + .iconfont { top: 2px; cursor: pointer; color: #fff !important; @@ -123,6 +126,4 @@ } } } - - @use "sd-task-dialog.scss" as *; -} \ No newline at end of file +} diff --git a/web/src/assets/css/mobile/chat-list.scss b/web/src/assets/css/mobile/chat-list.scss index 80f2dc9d..10428bfd 100644 --- a/web/src/assets/css/mobile/chat-list.scss +++ b/web/src/assets/css/mobile/chat-list.scss @@ -1,3 +1,5 @@ +@use 'model-select.scss' as *; + .mobile-chat-list { .content { padding-top: 46px; @@ -32,5 +34,3 @@ } } } - -@use "model-select.scss" as *; \ No newline at end of file diff --git a/web/src/assets/css/mobile/chat-session.scss b/web/src/assets/css/mobile/chat-session.scss index 4731d2b2..bea42876 100644 --- a/web/src/assets/css/mobile/chat-session.scss +++ b/web/src/assets/css/mobile/chat-session.scss @@ -1,3 +1,5 @@ +@use 'model-select.scss' as *; + .mobile-chat { .van-nav-bar { position: static; @@ -84,5 +86,3 @@ // } // } // } - -@use "model-select.scss" as *; \ No newline at end of file diff --git a/web/src/assets/css/waterfall-list.scss b/web/src/assets/css/waterfall-list.scss index 925a83c2..c3739756 100644 --- a/web/src/assets/css/waterfall-list.scss +++ b/web/src/assets/css/waterfall-list.scss @@ -1,6 +1,6 @@ -.job-list-box { - @import 'running-job-list.scss'; +@use 'running-job-list.scss' as *; +.job-list-box { .finish-job-list { #waterfall { display: flex; diff --git a/web/src/views/ChatPlus.vue b/web/src/views/ChatPlus.vue index 2ab02a44..625003c8 100644 --- a/web/src/views/ChatPlus.vue +++ b/web/src/views/ChatPlus.vue @@ -361,32 +361,8 @@ - - - - - - - - 我知道了,不再显示 - - - - - - { - try { - notice.value = md.render(res.data['content']) - const oldNotice = localStorage.getItem(noticeKey.value) - // 如果公告有更新,则显示公告 - if (oldNotice !== notice.value && notice.value.length > 10) { - showNotice.value = true - } - } catch (e) { - console.warn(e) - } - }) - .catch((e) => { - ElMessage.error('获取系统配置失败:' + e.message) - }) - // 获取工具函数 httpGet('/api/function/list') .then((res) => { @@ -1318,11 +1267,6 @@ const getModelValue = (model_id) => { return '' } -const notShow = () => { - localStorage.setItem(noticeKey.value, notice.value) - showNotice.value = false -} - const files = ref([]) // 插入文件 const insertFile = (file) => { @@ -1367,33 +1311,7 @@ const realtimeChat = () => { + + diff --git a/web/src/views/Jimeng.vue b/web/src/views/Jimeng.vue index e22e6b21..6fba227f 100644 --- a/web/src/views/Jimeng.vue +++ b/web/src/views/Jimeng.vue @@ -529,7 +529,7 @@ - + { } - diff --git a/web/src/views/admin/Functions.vue b/web/src/views/admin/Functions.vue index 4ba91f7a..df3529f4 100644 --- a/web/src/views/admin/Functions.vue +++ b/web/src/views/admin/Functions.vue @@ -10,17 +10,19 @@ {{ scope.row.name }} - - + + - + - 编辑 + 编辑 删除 @@ -31,34 +33,18 @@ - + - + - + - + @@ -66,10 +52,7 @@ - + @@ -81,17 +64,14 @@ - + - + @@ -99,7 +79,13 @@ - + @@ -108,7 +94,7 @@ - + 增加参数 @@ -118,25 +104,21 @@ - + 生成Token @@ -144,27 +126,26 @@ - + - - 取消 - 保存 - + + 取消 + 保存 + - \ No newline at end of file + diff --git a/web/src/views/admin/Home.vue b/web/src/views/admin/Home.vue index 13c76f9a..a78953cf 100644 --- a/web/src/views/admin/Home.vue +++ b/web/src/views/admin/Home.vue @@ -52,6 +52,6 @@ watch( ) - diff --git a/web/src/views/admin/Login.vue b/web/src/views/admin/Login.vue index a518a723..7c5f2e70 100644 --- a/web/src/views/admin/Login.vue +++ b/web/src/views/admin/Login.vue @@ -123,107 +123,108 @@ const doLogin = function (verifyData) { } - diff --git a/web/src/views/admin/Manager.vue b/web/src/views/admin/Manager.vue index c539a64d..3bab6da8 100644 --- a/web/src/views/admin/Manager.vue +++ b/web/src/views/admin/Manager.vue @@ -1,14 +1,13 @@ - 新增 - - - + + + @@ -17,7 +16,7 @@ - + @@ -28,7 +27,9 @@ - 重置密码 + 重置密码 删除 @@ -39,64 +40,62 @@ - + - + - + - + - - 取消 - 提交 - + + 取消 + 提交 + - \ No newline at end of file + diff --git a/web/src/views/admin/Menu.vue b/web/src/views/admin/Menu.vue index 5aa90bd4..53f9b4e2 100644 --- a/web/src/views/admin/Menu.vue +++ b/web/src/views/admin/Menu.vue @@ -252,29 +252,28 @@ const uploadImg = (file) => { } - diff --git a/web/src/views/admin/PowerLog.vue b/web/src/views/admin/PowerLog.vue index 6f08be2b..7ee7c9a5 100644 --- a/web/src/views/admin/PowerLog.vue +++ b/web/src/views/admin/PowerLog.vue @@ -1,9 +1,27 @@ - - - + + + @@ -46,7 +64,7 @@ - {{ dateFormat(scope.row["created_at"]) }} + {{ dateFormat(scope.row['created_at']) }} @@ -70,86 +88,86 @@ - diff --git a/web/src/views/admin/Product.vue b/web/src/views/admin/Product.vue index 96c0f719..2eb87fd4 100644 --- a/web/src/views/admin/Product.vue +++ b/web/src/views/admin/Product.vue @@ -1,12 +1,11 @@ - 新增 - + @@ -15,19 +14,19 @@ - - + + 长期有效 {{ scope.row.days }} - - + + - + @@ -50,83 +49,81 @@ - + - + - + - + - + - + - + - - 取消 - 提交 - + + 取消 + 提交 + - \ No newline at end of file + diff --git a/web/src/views/admin/Redeem.vue b/web/src/views/admin/Redeem.vue index 794ba937..6628ba89 100644 --- a/web/src/views/admin/Redeem.vue +++ b/web/src/views/admin/Redeem.vue @@ -2,16 +2,33 @@ - - + + 搜索 添加兑换码 - 导出 + 导出 + - + @@ -24,7 +41,7 @@ - {{ scope.row["username"] }} + {{ scope.row['username'] }} 未兑换 @@ -32,20 +49,26 @@ - {{ dateFormat(scope.row["created_at"]) }} + {{ dateFormat(scope.row['created_at']) }} - {{ dateFormat(scope.row["redeemed_at"]) }} + {{ + dateFormat(scope.row['redeemed_at']) + }} 未兑换 - + @@ -102,160 +125,160 @@ - diff --git a/web/src/views/admin/SysConfig.vue b/web/src/views/admin/SysConfig.vue index a747a9f5..a3f8e625 100644 --- a/web/src/views/admin/SysConfig.vue +++ b/web/src/views/admin/SysConfig.vue @@ -842,17 +842,17 @@ const onUploadImg = (files, callback) => { // } -