From 347d17a146d06fd2da63d45436e5d80d7fdd2be2 Mon Sep 17 00:00:00 2001 From: lzq <2495532633@qq.com> Date: Fri, 30 Jan 2026 10:12:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=EF=BC=8C=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=AE=BD=E5=BA=A6=EF=BC=8C=E6=A0=87=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 1 + .env.development | 2 ++ .env.production | 2 ++ .env.test | 1 + src/assets/stylus/dialog.styl | 9 ++++++ src/assets/stylus/index.styl | 9 ++++++ src/common/index.ts | 1 + src/components/uploader/Uploader.vue | 8 +++-- src/dts/components.d.ts | 3 +- src/dts/vite-env.d.ts | 1 + src/pages/a-frame/AAside.tsx | 3 +- src/pages/a-frame/PasswdPanel.vue | 1 - src/pages/a-frame/UserInfoPanel.vue | 1 - src/pages/gds/goods/GoodsForm.vue | 34 ++++++++++++---------- src/pages/login/Login.vue | 4 +-- src/pages/mfg/craft/CraftForm.vue | 2 +- src/pages/order/book/BookForm.vue | 2 +- src/pages/sys/dict/DictForm.vue | 5 +--- src/pages/sys/dict/DictItemForm.vue | 2 +- src/pages/sys/endpoint/EndpointForm.vue | 2 +- src/pages/sys/gen/db-table/CodePreview.vue | 2 +- src/pages/sys/gen/tpl/TplForm.vue | 2 +- src/pages/sys/menus/MenuForm.vue | 2 +- src/pages/sys/role/RoleForm.vue | 2 +- src/pages/sys/task/TaskForm.vue | 2 +- src/pages/sys/user/UserForm.vue | 2 +- 26 files changed, 67 insertions(+), 38 deletions(-) diff --git a/.env b/.env index 86b793c..ed9611f 100644 --- a/.env +++ b/.env @@ -1,5 +1,6 @@ # 应用名称 VITE_APP_NAME=再昇云 +VITE_APP_TITLE=再昇云 # 当前应用基础地址 VITE_APP_BASE_URL=/ diff --git a/.env.development b/.env.development index c09f1ad..439380f 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,7 @@ # 应用名称 VITE_APP_NAME=（开发环境）再昇云收运处平台 +VITE_APP_TITLE=再昇云 + # 后台服务地址 VITE_HTTP_PROXY_TARGET=http://localhost:10086 diff --git a/.env.production b/.env.production index f55e03d..5f3e3d1 100644 --- a/.env.production +++ b/.env.production @@ -1,6 +1,8 @@ # 应用名称 VITE_APP_NAME=再昇云 +VITE_APP_TITLE=再昇云 + # 当前应用基础地址 VITE_APP_BASE_URL=/ diff --git a/.env.test b/.env.test index 7c95c5d..04bb5f8 100644 --- a/.env.test +++ b/.env.test @@ -1,5 +1,6 @@ # 应用名称 VITE_APP_NAME=（测试环境）再昇云收运处平台 +VITE_APP_TITLE=再昇云 # 当前应用基础地址 VITE_APP_BASE_URL=/ diff --git a/src/assets/stylus/dialog.styl b/src/assets/stylus/dialog.styl index 311f60e..0ae2ac7 100644 --- a/src/assets/stylus/dialog.styl +++ b/src/assets/stylus/dialog.styl @@ -36,6 +36,15 @@ width 100% } + + .draggable-dialog > .el-dialog__header { + border-bottom: 1px solid #EAEBF1; + } + + .draggable-dialog > .el-dialog__footer { + border-top: 1px solid #EAEBF1; + } + .el-dialog__body { height calc(100% - 88px) !important box-sizing border-box !important diff --git a/src/assets/stylus/index.styl b/src/assets/stylus/index.styl index d5efabf..94a1c88 100644 --- a/src/assets/stylus/index.styl +++ b/src/assets/stylus/index.styl @@ -84,3 +84,12 @@ display none !important; opacity 0 !important; } + + +.el-radio-group { + gap 10px + + .el-radio { + margin 0 !important + } +} diff --git a/src/common/index.ts b/src/common/index.ts index 5eea3b7..aacaee8 100644 --- a/src/common/index.ts +++ b/src/common/index.ts @@ -7,6 +7,7 @@ export const appBaseUrl = import.meta.env.VITE_APP_BASE_URL * 应用名称 */ export const appName = import.meta.env.VITE_APP_NAME +export const appTitle = import.meta.env.VITE_APP_TITLE /** * 服务器基础地址 diff --git a/src/components/uploader/Uploader.vue b/src/components/uploader/Uploader.vue index 2890feb..af54f5b 100644 --- a/src/components/uploader/Uploader.vue +++ b/src/components/uploader/Uploader.vue @@ -138,8 +138,12 @@ defineExpose({ :deep(.el-upload) { background-color white - width: 100%; - height: 100%; + + &.el-upload--picture-card { + width: 100% !important; + height: 100% !important; + } + &.el-upload--text, &.el-upload--picture, diff --git a/src/dts/components.d.ts b/src/dts/components.d.ts index 3395536..9c8065c 100644 --- a/src/dts/components.d.ts +++ b/src/dts/components.d.ts @@ -5,7 +5,6 @@ // ------ // Generated by unplugin-vue-components // Read more: https://github.com/vuejs/core/pull/3399 -import { GlobalComponents } from 'vue' export {} @@ -110,4 +109,4 @@ declare global { const ElUpload: typeof import('element-plus/es')['ElUpload'] const RouterLink: typeof import('vue-router')['RouterLink'] const RouterView: typeof import('vue-router')['RouterView'] -} \ No newline at end of file +} diff --git a/src/dts/vite-env.d.ts b/src/dts/vite-env.d.ts index d2d83af..2623bff 100644 --- a/src/dts/vite-env.d.ts +++ b/src/dts/vite-env.d.ts @@ -5,6 +5,7 @@ interface ImportMetaEnv { readonly VITE_APP_NAME: string + readonly VITE_APP_TITLE: string readonly VITE_APP_BASE_URL: string readonly VITE_HTTP_SERVER_BASE_URL: string readonly VITE_HTTP_PROXY_TARGET: string diff --git a/src/pages/a-frame/AAside.tsx b/src/pages/a-frame/AAside.tsx index f394f72..f1eaded 100644 --- a/src/pages/a-frame/AAside.tsx +++ b/src/pages/a-frame/AAside.tsx @@ -17,6 +17,7 @@ import { computed } from 'vue' import Nav from '@/common/router/nav.ts' import logo from '@/assets/images/zsy.png' import { useAppPageStore } from '@/common/app/app-page-store.ts' +import { appTitle } from '@/common' export interface Menu extends G.TreeNode { // Id @@ -119,7 +120,7 @@ export default defineComponent(
Nav.open('home')}> -
再昇云
+
{appTitle}
diff --git a/src/pages/a-frame/PasswdPanel.vue b/src/pages/a-frame/PasswdPanel.vue index 9a0c224..0f41ec9 100644 --- a/src/pages/a-frame/PasswdPanel.vue +++ b/src/pages/a-frame/PasswdPanel.vue @@ -91,7 +91,6 @@ defineExpose({ :model="pwdFormData" :rules="rules" class="pwd-form" - label-width="auto" status-icon @submit.prevent="submitHandler" > diff --git a/src/pages/a-frame/UserInfoPanel.vue b/src/pages/a-frame/UserInfoPanel.vue index 63931ea..b244c83 100644 --- a/src/pages/a-frame/UserInfoPanel.vue +++ b/src/pages/a-frame/UserInfoPanel.vue @@ -78,7 +78,6 @@ defineExpose({ :model="userInfoForm" :rules="rules" class="user-info-form" - label-width="auto" status-icon @submit.prevent="submitHandler" > diff --git a/src/pages/gds/goods/GoodsForm.vue b/src/pages/gds/goods/GoodsForm.vue index aaaed66..31e0dba 100644 --- a/src/pages/gds/goods/GoodsForm.vue +++ b/src/pages/gds/goods/GoodsForm.vue @@ -23,15 +23,15 @@ - - - - {{ it.txt }} + + + + + + + + + - + - + + + - - + + - - - - - + + @@ -155,7 +159,6 @@ defineExpose({ .form-items { grid-template-columns: 1fr 1fr; grid-template-areas: "picture ." \ - "picture ." \ "picture ."; :deep(.el-form-item) { @@ -169,7 +172,8 @@ defineExpose({ } } - &:last-child:nth-child(2n+1) { + + &:last-child:nth-child(2n) { grid-column: span 2; width: 100%; } diff --git a/src/pages/login/Login.vue b/src/pages/login/Login.vue index b540356..b3dc32f 100644 --- a/src/pages/login/Login.vue +++ b/src/pages/login/Login.vue @@ -1,5 +1,4 @@