diff --git a/.env.development b/.env.development index 9906167..205308e 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VITE_APP_TITLE = 智汇管理系统11 +VITE_APP_TITLE = 智汇管理系统 # 开发环境配置 VITE_APP_ENV = 'development' diff --git a/package.json b/package.json index aac205f..d89e890 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "ruoyi", "version": "3.9.1", "description": "智汇管理系统", - "author": "若依", + "author": "智汇管理系统", "license": "MIT", "type": "module", "scripts": { diff --git a/public/favicon.ico b/public/favicon.ico index e263760..cfbd233 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/assets/images/loginBg.jpg b/src/assets/images/loginBg.jpg new file mode 100644 index 0000000..4253b50 Binary files /dev/null and b/src/assets/images/loginBg.jpg differ diff --git a/src/assets/logo/logo.jpg b/src/assets/logo/logo.jpg new file mode 100644 index 0000000..cfbd233 Binary files /dev/null and b/src/assets/logo/logo.jpg differ diff --git a/src/components/TopNav/index.vue b/src/components/TopNav/index.vue index eed37b9..97ad7cc 100644 --- a/src/components/TopNav/index.vue +++ b/src/components/TopNav/index.vue @@ -174,7 +174,7 @@ onMounted(() => { float: left; height: 50px !important; line-height: 50px !important; - color: #999093 !important; + color: #999093 ; padding: 0 5px !important; margin: 0 10px !important; } diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index 05387bc..830ba76 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -14,7 +14,7 @@ + + + diff --git a/src/views/index.vue b/src/views/index.vue index de32806..4c1ac56 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -1,1168 +1,10 @@ - diff --git a/src/views/login.vue b/src/views/login.vue index 9d491ad..df147fd 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -171,21 +171,27 @@ getCookie() justify-content: center; align-items: center; height: 100%; - background-image: url("../assets/images/login-background.jpg"); + background-image: url("../assets/images/loginBg.jpg"); background-size: cover; } .title { margin: 0px auto 30px auto; text-align: center; - color: #707070; + color: #1b222f; + font-weight:500; + font-size:18px; } .login-form { + padding: 24px; border-radius: 6px; background: #ffffff; width: 400px; padding: 25px 25px 5px 25px; z-index: 1; + .el-button:hover{ + background-color: RGB(0, 145, 145); + } .el-input { height: 40px; input { @@ -223,6 +229,8 @@ getCookie() font-family: Arial; font-size: 12px; letter-spacing: 1px; + + } .login-code-img { height: 40px; diff --git a/src/views/login_bf.vue b/src/views/login_bf.vue new file mode 100644 index 0000000..b343c00 --- /dev/null +++ b/src/views/login_bf.vue @@ -0,0 +1,268 @@ + + + + + diff --git a/src/views/tool/build/index.vue b/src/views/tool/build/index.vue index e630740..0c77ceb 100644 --- a/src/views/tool/build/index.vue +++ b/src/views/tool/build/index.vue @@ -99,7 +99,7 @@ import draggable from "vuedraggable/dist/vuedraggable.common" import ClipboardJS from 'clipboard' import beautifier from 'js-beautify' -import logo from '@/assets/logo/logo.png' +import logo from '@/assets/logo/logo.jpg' import { inputComponents, selectComponents, layoutComponents, formConf as formConfData } from '@/utils/generator/config' import { beautifierConf } from '@/utils/index' import drawingDefalut from '@/utils/generator/drawingDefalut' diff --git a/src/views/worn/type/index.vue b/src/views/worn/type/index.vue index d9e3898..b4fc603 100644 --- a/src/views/worn/type/index.vue +++ b/src/views/worn/type/index.vue @@ -110,7 +110,7 @@ import { listType, getType, delType, addType, updateType } from "@/api/worn/type" const { proxy } = getCurrentInstance() -const { queryParams, form, rules } = toRefs(data) + const open = ref(false) const loading = ref(true) @@ -141,7 +141,7 @@ const data = reactive({ ], } }) - +const { queryParams, form, rules } = toRefs(data) /** 查询废旧系统物料类型(支持父子级树结构)列表 */ function getList() { loading.value = true diff --git a/src/views/worn/unit/index.vue b/src/views/worn/unit/index.vue index ebce6c6..8fee5c9 100644 --- a/src/views/worn/unit/index.vue +++ b/src/views/worn/unit/index.vue @@ -82,7 +82,7 @@ import { listUnit, getUnit, delUnit, addUnit, updateUnit } from "@/api/worn/unit" const { proxy } = getCurrentInstance() -const { queryParams, form, rules } = toRefs(data) + const open = ref(false) const loading = ref(true) @@ -112,7 +112,7 @@ const data = reactive({ ], } }) - +const { queryParams, form, rules } = toRefs(data) /** 查询物料单位列表 */ function getList() { loading.value = true