diff --git a/gear-ui3/README.md b/gear-ui3/README.md index ea81f25..754dbc7 100644 --- a/gear-ui3/README.md +++ b/gear-ui3/README.md @@ -14,7 +14,7 @@ * 本仓库为前端技术栈 [Vue3](https://v3.cn.vuejs.org) + [Element Plus](https://element-plus.org/zh-CN) + [Vite](https://cn.vitejs.dev) 版本。 * 配套后端代码仓库地址[RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue) 或 [RuoYi-Vue-fast](https://gitcode.com/yangzongzhuan/RuoYi-Vue-fast) 版本。 * 前端技术栈([Vue2](https://cn.vuejs.org) + [Element](https://github.com/ElemeFE/element) + [Vue CLI](https://cli.vuejs.org/zh)),请移步[RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue/tree/master/ruoyi-ui)。 -* 阿里云折扣场:[点我进入](http://aly.ruoyi.vip),腾讯云秒杀场:[点我进入](http://txy.ruoyi.vip)   +* 阿里云折扣场:[点我进入](http://aly.),腾讯云秒杀场:[点我进入](http://txy.)   ## 前端运行 @@ -62,8 +62,8 @@ yarn dev - admin/admin123 - 陆陆续续收到一些打赏,为了更好的体验已用于演示服务器升级。谢谢各位小伙伴。 -演示地址:http://vue.ruoyi.vip -文档地址:http://doc.ruoyi.vip +演示地址:http://vue. +文档地址:http://doc. ## 演示图 diff --git a/gear-ui3/src/views/login.vue b/gear-ui3/src/views/login.vue index 371519e..57618ef 100644 --- a/gear-ui3/src/views/login.vue +++ b/gear-ui3/src/views/login.vue @@ -1,9 +1,9 @@ @@ -54,7 +54,7 @@ import Cookies from "js-cookie" import { encrypt, decrypt } from "@/utils/jsencrypt" import useUserStore from '@/store/modules/user' import useProductStore from '@/store/modules/product' -import RightImage from '@/assets/images/right.png' +// import RightImage from '@/assets/logo/logo.png' import { useDark } from "@vueuse/core" const isDark = useDark() @@ -164,8 +164,8 @@ getCookie() background-image: url('@/assets/images/back.jpg'); /* 亮色主题变量 */ - --color-bg-primary: #f5f7fa; - --color-bg-form: #ffffff; + --color-bg-primary: #f5f7fa90; + --color-bg-form: #f5f7fa90; --color-bg-input: #f0f2f5; --color-border-input: #dcdfe6; --color-text-primary: #303133; @@ -198,8 +198,9 @@ getCookie() justify-content: center; align-items: center; box-sizing: border-box; - width: 60%; + width: 30%; border-radius: 6px; + backdrop-filter: blur(10px); background: var(--color-bg-form); padding: 25px; box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); @@ -220,7 +221,7 @@ getCookie() z-index: 1; flex: 3; border-radius: 6px; - background: var(--color-bg-form); + // background: var(--color-bg-form); padding: 25px; // box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); @@ -248,6 +249,7 @@ getCookie() .login-right { display: flex; padding: 30px; + height: 55vh; flex: 4; } diff --git a/gear-ui3/src/views/register.vue b/gear-ui3/src/views/register.vue index badd966..f06f24c 100644 --- a/gear-ui3/src/views/register.vue +++ b/gear-ui3/src/views/register.vue @@ -70,7 +70,7 @@ diff --git a/gear-ui3/src/views/system/role/index.vue b/gear-ui3/src/views/system/role/index.vue index 651d837..3a65367 100644 --- a/gear-ui3/src/views/system/role/index.vue +++ b/gear-ui3/src/views/system/role/index.vue @@ -435,7 +435,7 @@ function handleUpdate(row) { open.value = true nextTick(() => { roleMenu.then((res) => { - let checkedKeys = res.checkedKeys + let checkedKeys = res.data.checkedKeys checkedKeys.forEach((v) => { nextTick(() => { menuRef.value.setChecked(v, true, false) @@ -450,7 +450,7 @@ function handleUpdate(row) { /** 根据角色ID查询菜单树结构 */ function getRoleMenuTreeselect(roleId) { return roleMenuTreeselect(roleId).then(response => { - menuOptions.value = response.menus + menuOptions.value = response.data.menus return response }) } @@ -458,7 +458,7 @@ function getRoleMenuTreeselect(roleId) { /** 根据角色ID查询部门树结构 */ function getDeptTree(roleId) { return deptTreeSelect(roleId).then(response => { - deptOptions.value = response.depts + deptOptions.value = response.data.depts return response }) } @@ -553,7 +553,7 @@ function handleDataScope(row) { deptTreeSelect.then(res => { nextTick(() => { if (deptRef.value) { - deptRef.value.setCheckedKeys(res.checkedKeys) + deptRef.value.setCheckedKeys(res.data.checkedKeys) } }) }) diff --git a/gear-ui3/vite.config.js b/gear-ui3/vite.config.js index c466c9a..2e38da5 100644 --- a/gear-ui3/vite.config.js +++ b/gear-ui3/vite.config.js @@ -11,7 +11,7 @@ export default defineConfig(({ mode, command }) => { return { // 部署生产环境和开发环境下的URL。 // 默认情况下,vite 会假设你的应用是被部署在一个域名的根路径上 - // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上,你就需要用这个选项指定这个子路径。例如,如果你的应用被部署在 https://www.ruoyi.vip/admin/,则设置 baseUrl 为 /admin/。 + // 例如 https://www./。如果应用被部署在一个子路径上,你就需要用这个选项指定这个子路径。例如,如果你的应用被部署在 https://www./admin/,则设置 baseUrl 为 /admin/。 base: VITE_APP_ENV === 'production' ? '/' : '/', plugins: createVitePlugins(env, command === 'build'), resolve: { diff --git a/gear-ui3/vite/plugins/compression.js b/gear-ui3/vite/plugins/compression.js index e90aaec..e92311a 100644 --- a/gear-ui3/vite/plugins/compression.js +++ b/gear-ui3/vite/plugins/compression.js @@ -6,7 +6,7 @@ export default function createCompression(env) { if (VITE_BUILD_COMPRESS) { const compressList = VITE_BUILD_COMPRESS.split(',') if (compressList.includes('gzip')) { - // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件 + // http://doc./ruoyi-vue/other/faq.html#使用gzip解压缩静态文件 plugin.push( compression({ ext: '.gz',