From fc5edb7578655a25387b39f4b3585016c4491790 Mon Sep 17 00:00:00 2001 From: zhouyulong <2974461645@qq.com> Date: Thu, 12 Feb 2026 15:03:34 +0800 Subject: [PATCH] 1 --- .env.development | 4 +- .env.production | 4 +- .env.staging | 4 +- .github/FUNDING.yml | 2 +- LICENSE | 2 +- README.md | 24 +- package.json | 10 +- src/api/system/user.js | 2 +- src/assets/styles/index.scss | 2 +- src/assets/styles/ruoyi.scss | 308 ----- src/components/FileUpload/index.vue | 402 +++--- src/components/HeaderSearch/index.vue | 375 +++--- src/components/ImageUpload/index.vue | 404 +++--- src/components/RuoYi/Doc/index.vue | 8 +- src/components/RuoYi/Git/index.vue | 10 +- src/directive/common/copyText.js | 2 +- src/directive/permission/hasPermi.js | 8 +- src/directive/permission/hasRole.js | 8 +- src/layout/components/Navbar.vue | 389 +++--- src/layout/components/Sidebar/SidebarItem.vue | 136 +- src/layout/components/TagsView/index.vue | 566 ++++---- src/main.js | 2 +- src/plugins/download.js | 2 +- src/router/index.js | 4 +- src/settings.js | 4 +- src/utils/index.js | 18 +- src/utils/request.js | 72 +- src/utils/ruoyi.js | 228 ---- src/views/index.vue | 1160 +---------------- src/views/monitor/job/index.vue | 508 ++++---- src/views/tool/gen/editTable.vue | 171 ++- src/views/tool/gen/genInfoForm.vue | 165 +-- src/views/tool/gen/index.vue | 398 +++--- vite.config.js | 11 +- vite/plugins/compression.js | 2 +- 35 files changed, 1771 insertions(+), 3644 deletions(-) delete mode 100644 src/assets/styles/ruoyi.scss delete mode 100644 src/utils/ruoyi.js diff --git a/.env.development b/.env.development index 2744ed2..95bd025 100644 --- a/.env.development +++ b/.env.development @@ -1,8 +1,8 @@ # 页面标题 -VITE_APP_TITLE = 若依管理系统 +VITE_APP_TITLE = 美美学堂管理系统 # 开发环境配置 VITE_APP_ENV = 'development' -# 若依管理系统/开发环境 +# 美美学堂管理系统/开发环境 VITE_APP_BASE_API = '/dev-api' diff --git a/.env.production b/.env.production index d857bba..ed9869b 100644 --- a/.env.production +++ b/.env.production @@ -1,10 +1,10 @@ # 页面标题 -VITE_APP_TITLE = 若依管理系统 +VITE_APP_TITLE = 美美学堂管理系统 # 生产环境配置 VITE_APP_ENV = 'production' -# 若依管理系统/生产环境 +# 美美学堂管理系统/生产环境 VITE_APP_BASE_API = '/prod-api' # 是否在打包时开启压缩，支持 gzip 和 brotli diff --git a/.env.staging b/.env.staging index fa7c357..0427656 100644 --- a/.env.staging +++ b/.env.staging @@ -1,10 +1,10 @@ # 页面标题 -VITE_APP_TITLE = 若依管理系统 +VITE_APP_TITLE = 美美学堂管理系统 # 生产环境配置 VITE_APP_ENV = 'staging' -# 若依管理系统/生产环境 +# 美美学堂管理系统/生产环境 VITE_APP_BASE_API = '/stage-api' # 是否在打包时开启压缩，支持 gzip 和 brotli diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index fbcab77..298a79f 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1 @@ -custom: http://doc.ruoyi.vip/ruoyi-vue/other/donate.html +custom: http://doc.mmxt.vip/mmxt-vue/other/donate.html diff --git a/LICENSE b/LICENSE index 8564f29..6967c06 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2018 RuoYi +Copyright (c) 2018 mmxt Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/README.md b/README.md index 860323c..7d8633c 100644 --- a/README.md +++ b/README.md @@ -1,29 +1,29 @@

logo

-

RuoYi v3.9.1

+

mmxt v3.9.1

基于SpringBoot+Vue3前后端分离的Java快速开发框架

- - - + + +

## 平台简介 * 本仓库为前端技术栈 [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)   +* 配套后端代码仓库地址[mmxt-Vue](https://gitee.com/y_project/mmxt-Vue) 或 [mmxt-Vue-fast](https://gitcode.com/yangzongzhuan/mmxt-Vue-fast) 版本。 +* 前端技术栈（[Vue2](https://cn.vuejs.org) + [Element](https://github.com/ElemeFE/element) + [Vue CLI](https://cli.vuejs.org/zh)），请移步[mmxt-Vue](https://gitee.com/y_project/mmxt-Vue/tree/master/mmxt-ui)。 +* 阿里云折扣场：[点我进入](http://aly.mmxt.vip)，腾讯云秒杀场：[点我进入](http://txy.mmxt.vip)   ## 前端运行 ```bash # 克隆项目 -git clone https://github.com/yangzongzhuan/RuoYi-Vue3.git +git clone https://github.com/yangzongzhuan/mmxt-Vue3.git # 进入项目目录 -cd RuoYi-Vue3 +cd mmxt-Vue3 # 安装依赖 yarn --registry=https://registry.npmmirror.com @@ -62,8 +62,8 @@ yarn dev - admin/admin123 - 陆陆续续收到一些打赏，为了更好的体验已用于演示服务器升级。谢谢各位小伙伴。 -演示地址：http://vue.ruoyi.vip -文档地址：http://doc.ruoyi.vip +演示地址：http://vue.mmxt.vip +文档地址：http://doc.mmxt.vip ## 演示图 @@ -103,6 +103,6 @@ yarn dev -## 若依前后端分离交流群 +## 美美学堂前后端分离交流群 QQ群： [![加入QQ群](https://img.shields.io/badge/已满-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![加入QQ群](https://img.shields.io/badge/已满-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![加入QQ群](https://img.shields.io/badge/已满-180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [![加入QQ群](https://img.shields.io/badge/已满-104180207-blue.svg)](https://jq.qq.com/?_wv=1027&k=51G72yr) [![加入QQ群](https://img.shields.io/badge/已满-186866453-blue.svg)](https://jq.qq.com/?_wv=1027&k=VvjN2nvu) [![加入QQ群](https://img.shields.io/badge/已满-201396349-blue.svg)](https://jq.qq.com/?_wv=1027&k=5vYAqA05) [![加入QQ群](https://img.shields.io/badge/已满-101456076-blue.svg)](https://jq.qq.com/?_wv=1027&k=kOIINEb5) [![加入QQ群](https://img.shields.io/badge/已满-101539465-blue.svg)](https://jq.qq.com/?_wv=1027&k=UKtX5jhs) [![加入QQ群](https://img.shields.io/badge/已满-264312783-blue.svg)](https://jq.qq.com/?_wv=1027&k=EI9an8lJ) [![加入QQ群](https://img.shields.io/badge/已满-167385320-blue.svg)](https://jq.qq.com/?_wv=1027&k=SWCtLnMz) [![加入QQ群](https://img.shields.io/badge/已满-104748341-blue.svg)](https://jq.qq.com/?_wv=1027&k=96Dkdq0k) [![加入QQ群](https://img.shields.io/badge/已满-160110482-blue.svg)](https://jq.qq.com/?_wv=1027&k=0fsNiYZt) [![加入QQ群](https://img.shields.io/badge/已满-170801498-blue.svg)](https://jq.qq.com/?_wv=1027&k=7xw4xUG1) [![加入QQ群](https://img.shields.io/badge/已满-108482800-blue.svg)](https://jq.qq.com/?_wv=1027&k=eCx8eyoJ) [![加入QQ群](https://img.shields.io/badge/已满-101046199-blue.svg)](https://jq.qq.com/?_wv=1027&k=SpyH2875) [![加入QQ群](https://img.shields.io/badge/已满-136919097-blue.svg)](https://jq.qq.com/?_wv=1027&k=tKEt51dz) [![加入QQ群](https://img.shields.io/badge/已满-143961921-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=0vBbSb0ztbBgVtn3kJS-Q4HUNYwip89G&authKey=8irq5PhutrZmWIvsUsklBxhj57l%2F1nOZqjzigkXZVoZE451GG4JHPOqW7AW6cf0T&noverify=0&group_code=143961921) [![加入QQ群](https://img.shields.io/badge/已满-174951577-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=ZFAPAbp09S2ltvwrJzp7wGlbopsc0rwi&authKey=HB2cxpxP2yspk%2Bo3WKTBfktRCccVkU26cgi5B16u0KcAYrVu7sBaE7XSEqmMdFQp&noverify=0&group_code=174951577) [![加入QQ群](https://img.shields.io/badge/已满-161281055-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=Fn2aF5IHpwsy8j6VlalNJK6qbwFLFHat&authKey=uyIT%2B97x2AXj3odyXpsSpVaPMC%2Bidw0LxG5MAtEqlrcBcWJUA%2FeS43rsF1Tg7IRJ&noverify=0&group_code=161281055) [![加入QQ群](https://img.shields.io/badge/已满-138988063-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=XIzkm_mV2xTsUtFxo63bmicYoDBA6Ifm&authKey=dDW%2F4qsmw3x9govoZY9w%2FoWAoC4wbHqGal%2BbqLzoS6VBarU8EBptIgPKN%2FviyC8j&noverify=0&group_code=138988063) [![加入QQ群](https://img.shields.io/badge/已满-151450850-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=DkugnCg68PevlycJSKSwjhFqfIgrWWwR&authKey=pR1Pa5lPIeGF%2FFtIk6d%2FGB5qFi0EdvyErtpQXULzo03zbhopBHLWcuqdpwY241R%2F&noverify=0&group_code=151450850) [![加入QQ群](https://img.shields.io/badge/已满-224622315-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=F58bgRa-Dp-rsQJThiJqIYv8t4-lWfXh&authKey=UmUs4CVG5OPA1whvsa4uSespOvyd8%2FAr9olEGaWAfdLmfKQk%2FVBp2YU3u2xXXt76&noverify=0&group_code=224622315) [![加入QQ群](https://img.shields.io/badge/已满-287842588-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=Nxb2EQ5qozWa218Wbs7zgBnjLSNk_tVT&authKey=obBKXj6SBKgrFTJZx0AqQnIYbNOvBB2kmgwWvGhzxR67RoRr84%2Bus5OadzMcdJl5&noverify=0&group_code=287842588) [![加入QQ群](https://img.shields.io/badge/已满-187944233-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=numtK1M_I4eVd2Gvg8qtbuL8JgX42qNh&authKey=giV9XWMaFZTY%2FqPlmWbkB9g3fi0Ev5CwEtT9Tgei0oUlFFCQLDp4ozWRiVIzubIm&noverify=0&group_code=187944233) [![加入QQ群](https://img.shields.io/badge/已满-228578329-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=G6r5KGCaa3pqdbUSXNIgYloyb8e0_L0D&authKey=4w8tF1eGW7%2FedWn%2FHAypQksdrML%2BDHolQSx7094Agm7Luakj9EbfPnSTxSi2T1LQ&noverify=0&group_code=228578329) [![加入QQ群](https://img.shields.io/badge/已满-191164766-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=GsOo-OLz53J8y_9TPoO6XXSGNRTgbFxA&authKey=R7Uy%2Feq%2BZsoKNqHvRKhiXpypW7DAogoWapOawUGHokJSBIBIre2%2FoiAZeZBSLuBc&noverify=0&group_code=191164766) [![加入QQ群](https://img.shields.io/badge/174569686-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=PmYavuzsOthVqfdAPbo4uAeIbu7Ttjgc&authKey=p52l8%2FXa4PS1JcEmS3VccKSwOPJUZ1ZfQ69MEKzbrooNUljRtlKjvsXf04bxNp3G&noverify=0&group_code=174569686) 点击按钮入群。 \ No newline at end of file diff --git a/package.json b/package.json index 9e3db11..ca1428b 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { - "name": "ruoyi", + "name": "mmxt", "version": "3.9.1", - "description": "若依管理系统", - "author": "若依", + "description": "美美学堂管理系统", + "author": "美美学堂", "license": "MIT", "type": "module", "scripts": { @@ -13,7 +13,7 @@ }, "repository": { "type": "git", - "url": "https://gitee.com/y_project/RuoYi-Vue.git" + "url": "https://gitee.com/y_project/mmxt-Vue.git" }, "dependencies": { "@element-plus/icons-vue": "2.3.1", @@ -48,4 +48,4 @@ "overrides": { "quill": "2.0.2" } -} +} \ No newline at end of file diff --git a/src/api/system/user.js b/src/api/system/user.js index 2da13d4..428c841 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -1,5 +1,5 @@ import request from '@/utils/request' -import { parseStrEmpty } from "@/utils/ruoyi"; +import { parseStrEmpty } from "@/utils/mmxt"; // 查询用户列表 export function listUser(query) { diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index a859a75..617975b 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -3,7 +3,7 @@ @use './element-ui.scss'; @use './sidebar.scss'; @use './btn.scss'; -@use './ruoyi.scss'; +@use './mmxt.scss'; body { height: 100%; diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss deleted file mode 100644 index e654697..0000000 --- a/src/assets/styles/ruoyi.scss +++ /dev/null @@ -1,308 +0,0 @@ -/** - * 通用css样式布局处理 - * Copyright (c) 2019 ruoyi - */ - -/** 基础通用 **/ -.pt5 { - padding-top: 5px; -} -.pr5 { - padding-right: 5px; -} -.pb5 { - padding-bottom: 5px; -} -.mt5 { - margin-top: 5px; -} -.mr5 { - margin-right: 5px; -} -.mb5 { - margin-bottom: 5px; -} -.mb8 { - margin-bottom: 8px; -} -.ml5 { - margin-left: 5px; -} -.mt10 { - margin-top: 10px; -} -.mr10 { - margin-right: 10px; -} -.mb10 { - margin-bottom: 10px; -} -.ml10 { - margin-left: 10px; -} -.mt20 { - margin-top: 20px; -} -.mr20 { - margin-right: 20px; -} -.mb20 { - margin-bottom: 20px; -} -.ml20 { - margin-left: 20px; -} - -.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 { - font-family: inherit; - font-weight: 500; - line-height: 1.1; - color: inherit; -} - -.el-form--inline { - .el-form-item { - .el-input, .el-cascader, .el-select, .el-autocomplete { - width: 200px; - } - } -} - -.el-form .el-form-item__label { - font-weight: 700; -} -.el-dialog:not(.is-fullscreen) { - margin-top: 6vh !important; -} - -.el-dialog.scrollbar .el-dialog__body { - overflow: auto; - overflow-x: hidden; - max-height: 70vh; - padding: 10px 20px 0; -} - -.el-table { - .el-table__header-wrapper, .el-table__fixed-header-wrapper { - th { - word-break: break-word; - background-color: #f8f8f9 !important; - color: #515a6e; - height: 40px !important; - font-size: 13px; - } - } - .el-table__body-wrapper { - .el-button [class*="el-icon-"] + span { - margin-left: 1px; - } - } -} - -/** 表单布局 **/ -.form-header { - font-size:15px; - color:#6379bb; - border-bottom:1px solid #ddd; - margin:8px 10px 25px 10px; - padding-bottom:5px -} - -/** 表格布局 **/ -.pagination-container { - display: flex; - justify-content: flex-end; - margin-top: 20px; - background-color: transparent !important; -} - -/* 弹窗中的分页器 */ -.el-dialog .pagination-container { - position: static !important; - margin: 10px 0 0 0; - padding: 0 !important; - - .el-pagination { - position: static; - } -} - -/* 移动端适配 */ -@media (max-width: 768px) { - .pagination-container { - .el-pagination { - > .el-pagination__jump { - display: none !important; - } - > .el-pagination__sizes { - display: none !important; - } - } - } -} - -/* tree border */ -.tree-border { - margin-top: 5px; - border: 1px solid var(--el-border-color-light, #e5e6e7); - background: var(--el-bg-color, #FFFFFF) none; - border-radius:4px; - width: 100%; -} - -.el-table .fixed-width .el-button--small { - padding-left: 0; - padding-right: 0; - width: inherit; -} - -/* horizontal el menu */ -.el-menu--horizontal .el-menu-item .svg-icon + span, -.el-menu--horizontal .el-sub-menu__title .svg-icon + span { - margin-left: 3px; -} - -.el-menu--horizontal .el-menu--popup { - min-width: 120px !important; -} - -/** 表格更多操作下拉样式 */ -.el-table .el-dropdown-link { - cursor: pointer; - color: #409EFF; - margin-left: 10px; -} - -.el-table .el-dropdown, .el-icon-arrow-down { - font-size: 12px; -} - -.el-tree-node__content > .el-checkbox { - margin-right: 8px; -} - -.list-group-striped > .list-group-item { - border-left: 0; - border-right: 0; - border-radius: 0; - padding-left: 0; - padding-right: 0; -} - -.list-group { - padding-left: 0px; - list-style: none; -} - -.list-group-item { - border-bottom: 1px solid #e7eaec; - border-top: 1px solid #e7eaec; - margin-bottom: -1px; - padding: 11px 0px; - font-size: 13px; -} - -.pull-right { - float: right !important; -} - -.el-card__header { - padding: 14px 15px 7px !important; - min-height: 40px; -} - -.el-card__body { - padding: 15px 20px 20px 20px !important; -} - -.card-box { - margin-bottom: 10px; -} - -/* button color */ -.el-button--cyan.is-active, -.el-button--cyan:active { - background: #20B2AA; - border-color: #20B2AA; - color: #FFFFFF; -} - -.el-button--cyan:focus, -.el-button--cyan:hover { - background: #48D1CC; - border-color: #48D1CC; - color: #FFFFFF; -} - -.el-button--cyan { - background-color: #20B2AA; - border-color: #20B2AA; - color: #FFFFFF; -} - -/* text color */ -.text-navy { - color: #1ab394; -} - -.text-primary { - color: inherit; -} - -.text-success { - color: #1c84c6; -} - -.text-info { - color: #23c6c8; -} - -.text-warning { - color: #f8ac59; -} - -.text-danger { - color: #ed5565; -} - -.text-muted { - color: #888888; -} - -/* image */ -.img-circle { - border-radius: 50%; -} - -.img-lg { - width: 120px; - height: 120px; -} - -.avatar-upload-preview { - position: absolute; - top: 50%; - transform: translate(50%, -50%); - width: 200px; - height: 200px; - border-radius: 50%; - box-shadow: 0 0 4px #ccc; - overflow: hidden; -} - -/* 拖拽列样式 */ -.sortable-ghost{ - opacity: .8; - color: #fff!important; - background: #42b983!important; -} - -/* 表格右侧工具栏样式 */ -.top-right-btn { - margin-left: auto; -} - -/* 分割面板样式 */ -.splitpanes.default-theme .splitpanes__pane { - background-color: var(--splitpanes-default-bg) !important; -} diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index b7f7d17..e7a4690 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -1,21 +1,8 @@ + .file-upload-darg { + opacity: 0.5; + background: #c8ebfb; + } + + .upload-file-uploader { + margin-bottom: 5px; + } + + .upload-file-list .el-upload-list__item { + border: 1px solid #e4e7ed; + line-height: 2; + margin-bottom: 10px; + position: relative; + transition: none !important; + } + + .upload-file-list .ele-upload-list__item-content { + display: flex; + justify-content: space-between; + align-items: center; + color: inherit; + } + + .ele-upload-list__item-content-action .el-link { + margin-right: 10px; + } + \ No newline at end of file diff --git a/src/components/HeaderSearch/index.vue b/src/components/HeaderSearch/index.vue index d325951..6522fc9 100644 --- a/src/components/HeaderSearch/index.vue +++ b/src/components/HeaderSearch/index.vue @@ -1,30 +1,16 @@ + \ No newline at end of file diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue index 3929896..849fa93 100644 --- a/src/components/ImageUpload/index.vue +++ b/src/components/ImageUpload/index.vue @@ -1,25 +1,13 @@ \ No newline at end of file diff --git a/src/components/RuoYi/Doc/index.vue b/src/components/RuoYi/Doc/index.vue index 91aebe0..9ae9aee 100644 --- a/src/components/RuoYi/Doc/index.vue +++ b/src/components/RuoYi/Doc/index.vue @@ -5,9 +5,9 @@ \ No newline at end of file diff --git a/src/components/RuoYi/Git/index.vue b/src/components/RuoYi/Git/index.vue index 96fdea7..809c9e0 100644 --- a/src/components/RuoYi/Git/index.vue +++ b/src/components/RuoYi/Git/index.vue @@ -5,9 +5,9 @@ + function goto() { + window.open(url.value) + } + \ No newline at end of file diff --git a/src/directive/common/copyText.js b/src/directive/common/copyText.js index fcc3f56..0b863c9 100644 --- a/src/directive/common/copyText.js +++ b/src/directive/common/copyText.js @@ -1,6 +1,6 @@ /** * v-copyText 复制文本内容 -* Copyright (c) 2022 ruoyi +* Copyright (c) 2022 mmxt */ export default { beforeMount(el, { value, arg }) { diff --git a/src/directive/permission/hasPermi.js b/src/directive/permission/hasPermi.js index 1efd397..f914bc7 100644 --- a/src/directive/permission/hasPermi.js +++ b/src/directive/permission/hasPermi.js @@ -1,7 +1,7 @@ - /** - * v-hasPermi 操作权限处理 - * Copyright (c) 2019 ruoyi - */ +/** +* v-hasPermi 操作权限处理 +* Copyright (c) 2019 mmxt +*/ import useUserStore from '@/store/modules/user' export default { diff --git a/src/directive/permission/hasRole.js b/src/directive/permission/hasRole.js index 18452be..b712cfc 100644 --- a/src/directive/permission/hasRole.js +++ b/src/directive/permission/hasRole.js @@ -1,7 +1,7 @@ - /** - * v-hasRole 角色权限处理 - * Copyright (c) 2019 ruoyi - */ +/** +* v-hasRole 角色权限处理 +* Copyright (c) 2019 mmxt +*/ import useUserStore from '@/store/modules/user' export default { diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index c5d03af..8c01a69 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -1,6 +1,7 @@ + getList() + \ No newline at end of file diff --git a/src/views/tool/gen/editTable.vue b/src/views/tool/gen/editTable.vue index f0a832c..a8197fd 100644 --- a/src/views/tool/gen/editTable.vue +++ b/src/views/tool/gen/editTable.vue @@ -6,19 +6,15 @@ - - + + - + + \ No newline at end of file diff --git a/src/views/tool/gen/genInfoForm.vue b/src/views/tool/gen/genInfoForm.vue index b416a89..e0d21fb 100644 --- a/src/views/tool/gen/genInfoForm.vue +++ b/src/views/tool/gen/genInfoForm.vue @@ -26,7 +26,7 @@ @@ -91,14 +91,9 @@ - + @@ -128,7 +123,7 @@ - + - + @@ -159,12 +150,8 @@ - + @@ -177,12 +164,8 @@ - + @@ -201,12 +184,8 @@ - + @@ -219,12 +198,8 @@ - + @@ -235,71 +210,71 @@ + watch(() => props.info.subTableName, val => { + setSubTableColumns(val) + }) + + watch(() => props.info.tplWebType, val => { + if (val === '') { + props.info.tplWebType = "element-plus" + } + }) + \ No newline at end of file diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue index 823a850..d7596c2 100644 --- a/src/views/tool/gen/index.vue +++ b/src/views/tool/gen/index.vue @@ -2,32 +2,16 @@
- + - + - + 搜索 @@ -37,57 +21,29 @@ - 生成 + 生成 - 创建 + 创建 - 导入 + 导入 - 修改 + 修改 - 删除 + 删除 - + + /** 删除按钮操作 */ + function handleDelete(row) { + const tableIds = row.tableId || ids.value + proxy.$modal.confirm('是否确认删除表编号为"' + tableIds + '"的数据项？').then(function () { + return delTable(tableIds) + }).then(() => { + getList() + proxy.$modal.msgSuccess("删除成功") + }).catch(() => { }) + } + + getList() + \ No newline at end of file diff --git a/vite.config.js b/vite.config.js index 13d1fcb..da86e42 100644 --- a/vite.config.js +++ b/vite.config.js @@ -2,7 +2,8 @@ import { defineConfig, loadEnv } from 'vite' import path from 'path' import createVitePlugins from './vite/plugins' -const baseUrl = 'http://localhost:8080' // 后端接口 +const baseUrl = 'http://192.168.0.107:9020' // 后端接口 +// const baseUrl = 'https://mmxt.arts-press.com/admin' // 后端接口 // https://vitejs.dev/config/ export default defineConfig(({ mode, command }) => { @@ -11,8 +12,8 @@ export default defineConfig(({ mode, command }) => { return { // 部署生产环境和开发环境下的URL。 // 默认情况下，vite 会假设你的应用是被部署在一个域名的根路径上 - // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。 - base: VITE_APP_ENV === 'production' ? '/' : '/', + // 例如 https://www.mmxt.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.mmxt.vip/admin/，则设置 baseUrl 为 /admin/。 + base: VITE_APP_ENV === 'production' ? './' : '/', plugins: createVitePlugins(env, command === 'build'), resolve: { // https://cn.vitejs.dev/config/#resolve-alias @@ -52,8 +53,8 @@ export default defineConfig(({ mode, command }) => { changeOrigin: true, rewrite: (p) => p.replace(/^\/dev-api/, '') }, - // springdoc proxy - '^/v3/api-docs/(.*)': { + // springdoc proxy + '^/v3/api-docs/(.*)': { target: baseUrl, changeOrigin: true, } diff --git a/vite/plugins/compression.js b/vite/plugins/compression.js index 9767308..04c34f9 100644 --- a/vite/plugins/compression.js +++ b/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.mmxt.vip/mmxt-vue/other/faq.html#使用gzip解压缩静态文件 plugin.push( compression({ ext: '.gz',