From 6e0f6c08f0a1bf4c984582e0480901cf6a5554a2 Mon Sep 17 00:00:00 2001 From: piexlmax Date: Fri, 10 Dec 2021 19:07:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7element=E7=89=88=E6=9C=AC=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9icon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/source/system/menu.go | 38 +- web/package.json | 3 +- web/src/components/chooseImg/index.vue | 2 +- web/src/core/config.js | 89 +- web/src/core/global.js | 10 + web/src/main.js | 1 + web/src/style/main.scss | 93 +- web/src/style/newLogin.scss | 4 + web/src/view/dashboard/index.vue | 31 +- .../view/example/breakpoint/breakpoint.vue | 4 +- web/src/view/example/customer/customer.vue | 6 +- web/src/view/example/excel/excel.vue | 6 +- web/src/view/example/upload/upload.vue | 4 +- web/src/view/iconList/index.vue | 379 ----- web/src/view/init/index.vue | 2 +- .../aside/asideComponent/asyncSubmenu.vue | 4 +- .../layout/aside/asideComponent/menuItem.vue | 11 +- web/src/view/layout/index.vue | 17 +- web/src/view/layout/screenfull/index.vue | 4 +- web/src/view/layout/search/search.vue | 18 +- web/src/view/layout/setting/index.vue | 10 +- web/src/view/login/index.vue | 19 +- web/src/view/person/person.vue | 38 +- web/src/view/superAdmin/api/api.vue | 12 +- .../view/superAdmin/authority/authority.vue | 12 +- .../superAdmin/dictionary/sysDictionary.vue | 12 +- .../dictionary/sysDictionaryDetail.vue | 10 +- web/src/view/superAdmin/menu/icon.vue | 1418 +++++++++++++---- web/src/view/superAdmin/menu/menu.vue | 27 +- .../operation/sysOperationRecord.vue | 16 +- web/src/view/superAdmin/user/user.vue | 20 +- web/src/view/systemTools/autoCode/index.vue | 8 +- .../view/systemTools/autoCodeAdmin/index.vue | 2 +- 33 files changed, 1404 insertions(+), 926 deletions(-) delete mode 100644 web/src/view/iconList/index.vue diff --git a/server/source/system/menu.go b/server/source/system/menu.go index 25f0cc90..a3e7f794 100644 --- a/server/source/system/menu.go +++ b/server/source/system/menu.go @@ -17,31 +17,31 @@ func (m *menu) TableName() string { func (m *menu) Initialize() error { entities := []system.SysBaseMenu{ - {MenuLevel: 0, Hidden: false, ParentId: "0", Path: "dashboard", Name: "dashboard", Component: "view/dashboard/index.vue", Sort: 1, Meta: system.Meta{Title: "仪表盘", Icon: "setting"}}, - {MenuLevel: 0, Hidden: false, ParentId: "0", Path: "about", Name: "about", Component: "view/about/index.vue", Sort: 7, Meta: system.Meta{Title: "关于我们", Icon: "info"}}, - {MenuLevel: 0, Hidden: false, ParentId: "0", Path: "admin", Name: "superAdmin", Component: "view/superAdmin/index.vue", Sort: 3, Meta: system.Meta{Title: "超级管理员", Icon: "user-solid"}}, - {MenuLevel: 0, Hidden: false, ParentId: "3", Path: "authority", Name: "authority", Component: "view/superAdmin/authority/authority.vue", Sort: 1, Meta: system.Meta{Title: "角色管理", Icon: "s-custom"}}, - {MenuLevel: 0, Hidden: false, ParentId: "3", Path: "menu", Name: "menu", Component: "view/superAdmin/menu/menu.vue", Sort: 2, Meta: system.Meta{Title: "菜单管理", Icon: "s-order", KeepAlive: true}}, - {MenuLevel: 0, Hidden: false, ParentId: "3", Path: "api", Name: "api", Component: "view/superAdmin/api/api.vue", Sort: 3, Meta: system.Meta{Title: "api管理", Icon: "s-platform", KeepAlive: true}}, + {MenuLevel: 0, Hidden: false, ParentId: "0", Path: "dashboard", Name: "dashboard", Component: "view/dashboard/index.vue", Sort: 1, Meta: system.Meta{Title: "仪表盘", Icon: "odometer"}}, + {MenuLevel: 0, Hidden: false, ParentId: "0", Path: "about", Name: "about", Component: "view/about/index.vue", Sort: 7, Meta: system.Meta{Title: "关于我们", Icon: "info-filled"}}, + {MenuLevel: 0, Hidden: false, ParentId: "0", Path: "admin", Name: "superAdmin", Component: "view/superAdmin/index.vue", Sort: 3, Meta: system.Meta{Title: "超级管理员", Icon: "user"}}, + {MenuLevel: 0, Hidden: false, ParentId: "3", Path: "authority", Name: "authority", Component: "view/superAdmin/authority/authority.vue", Sort: 1, Meta: system.Meta{Title: "角色管理", Icon: "avatar"}}, + {MenuLevel: 0, Hidden: false, ParentId: "3", Path: "menu", Name: "menu", Component: "view/superAdmin/menu/menu.vue", Sort: 2, Meta: system.Meta{Title: "菜单管理", Icon: "tickets", KeepAlive: true}}, + {MenuLevel: 0, Hidden: false, ParentId: "3", Path: "api", Name: "api", Component: "view/superAdmin/api/api.vue", Sort: 3, Meta: system.Meta{Title: "api管理", Icon: "platform", KeepAlive: true}}, {MenuLevel: 0, Hidden: false, ParentId: "3", Path: "user", Name: "user", Component: "view/superAdmin/user/user.vue", Sort: 4, Meta: system.Meta{Title: "用户管理", Icon: "coordinate"}}, - {MenuLevel: 0, Hidden: true, ParentId: "0", Path: "person", Name: "person", Component: "view/person/person.vue", Sort: 4, Meta: system.Meta{Title: "个人信息", Icon: "message-solid"}}, - {MenuLevel: 0, Hidden: false, ParentId: "0", Path: "example", Name: "example", Component: "view/example/index.vue", Sort: 6, Meta: system.Meta{Title: "示例文件", Icon: "s-management"}}, - {MenuLevel: 0, Hidden: false, ParentId: "9", Path: "excel", Name: "excel", Component: "view/example/excel/excel.vue", Sort: 4, Meta: system.Meta{Title: "excel导入导出", Icon: "s-marketing"}}, + {MenuLevel: 0, Hidden: true, ParentId: "0", Path: "person", Name: "person", Component: "view/person/person.vue", Sort: 4, Meta: system.Meta{Title: "个人信息", Icon: "message"}}, + {MenuLevel: 0, Hidden: false, ParentId: "0", Path: "example", Name: "example", Component: "view/example/index.vue", Sort: 6, Meta: system.Meta{Title: "示例文件", Icon: "management"}}, + {MenuLevel: 0, Hidden: false, ParentId: "9", Path: "excel", Name: "excel", Component: "view/example/excel/excel.vue", Sort: 4, Meta: system.Meta{Title: "excel导入导出", Icon: "takeaway-box"}}, {MenuLevel: 0, Hidden: false, ParentId: "9", Path: "upload", Name: "upload", Component: "view/example/upload/upload.vue", Sort: 5, Meta: system.Meta{Title: "媒体库（上传下载）", Icon: "upload"}}, - {MenuLevel: 0, Hidden: false, ParentId: "9", Path: "breakpoint", Name: "breakpoint", Component: "view/example/breakpoint/breakpoint.vue", Sort: 6, Meta: system.Meta{Title: "断点续传", Icon: "upload"}}, - {MenuLevel: 0, Hidden: false, ParentId: "9", Path: "customer", Name: "customer", Component: "view/example/customer/customer.vue", Sort: 7, Meta: system.Meta{Title: "客户列表（资源示例）", Icon: "s-custom"}}, - {MenuLevel: 0, Hidden: false, ParentId: "0", Path: "systemTools", Name: "systemTools", Component: "view/systemTools/index.vue", Sort: 5, Meta: system.Meta{Title: "系统工具", Icon: "s-cooperation"}}, + {MenuLevel: 0, Hidden: false, ParentId: "9", Path: "breakpoint", Name: "breakpoint", Component: "view/example/breakpoint/breakpoint.vue", Sort: 6, Meta: system.Meta{Title: "断点续传", Icon: "upload-filled"}}, + {MenuLevel: 0, Hidden: false, ParentId: "9", Path: "customer", Name: "customer", Component: "view/example/customer/customer.vue", Sort: 7, Meta: system.Meta{Title: "客户列表（资源示例）", Icon: "avatar"}}, + {MenuLevel: 0, Hidden: false, ParentId: "0", Path: "systemTools", Name: "systemTools", Component: "view/systemTools/index.vue", Sort: 5, Meta: system.Meta{Title: "系统工具", Icon: "tools"}}, {MenuLevel: 0, Hidden: false, ParentId: "14", Path: "autoCode", Name: "autoCode", Component: "view/systemTools/autoCode/index.vue", Sort: 1, Meta: system.Meta{Title: "代码生成器", Icon: "cpu", KeepAlive: true}}, {MenuLevel: 0, Hidden: false, ParentId: "14", Path: "formCreate", Name: "formCreate", Component: "view/systemTools/formCreate/index.vue", Sort: 2, Meta: system.Meta{Title: "表单生成器", Icon: "magic-stick", KeepAlive: true}}, - {MenuLevel: 0, Hidden: false, ParentId: "14", Path: "system", Name: "system", Component: "view/systemTools/system/system.vue", Sort: 3, Meta: system.Meta{Title: "系统配置", Icon: "s-operation"}}, - {MenuLevel: 0, Hidden: false, ParentId: "3", Path: "dictionary", Name: "dictionary", Component: "view/superAdmin/dictionary/sysDictionary.vue", Sort: 5, Meta: system.Meta{Title: "字典管理", Icon: "notebook-2"}}, - {MenuLevel: 0, Hidden: true, ParentId: "3", Path: "dictionaryDetail/:id", Name: "dictionaryDetail", Component: "view/superAdmin/dictionary/sysDictionaryDetail.vue", Sort: 1, Meta: system.Meta{Title: "字典详情", Icon: "s-order"}}, - {MenuLevel: 0, Hidden: false, ParentId: "3", Path: "operation", Name: "operation", Component: "view/superAdmin/operation/sysOperationRecord.vue", Sort: 6, Meta: system.Meta{Title: "操作历史", Icon: "time"}}, + {MenuLevel: 0, Hidden: false, ParentId: "14", Path: "system", Name: "system", Component: "view/systemTools/system/system.vue", Sort: 3, Meta: system.Meta{Title: "系统配置", Icon: "operation"}}, + {MenuLevel: 0, Hidden: false, ParentId: "3", Path: "dictionary", Name: "dictionary", Component: "view/superAdmin/dictionary/sysDictionary.vue", Sort: 5, Meta: system.Meta{Title: "字典管理", Icon: "notebook"}}, + {MenuLevel: 0, Hidden: true, ParentId: "3", Path: "dictionaryDetail/:id", Name: "dictionaryDetail", Component: "view/superAdmin/dictionary/sysDictionaryDetail.vue", Sort: 1, Meta: system.Meta{Title: "字典详情", Icon: "order"}}, + {MenuLevel: 0, Hidden: false, ParentId: "3", Path: "operation", Name: "operation", Component: "view/superAdmin/operation/sysOperationRecord.vue", Sort: 6, Meta: system.Meta{Title: "操作历史", Icon: "pie-chart"}}, {MenuLevel: 0, Hidden: false, ParentId: "9", Path: "simpleUploader", Name: "simpleUploader", Component: "view/example/simpleUploader/simpleUploader", Sort: 6, Meta: system.Meta{Title: "断点续传（插件版）", Icon: "upload"}}, - {MenuLevel: 0, Hidden: false, ParentId: "0", Path: "https://www.gin-vue-admin.com", Name: "https://www.gin-vue-admin.com", Component: "/", Sort: 0, Meta: system.Meta{Title: "官方网站", Icon: "s-home"}}, + {MenuLevel: 0, Hidden: false, ParentId: "0", Path: "https://www.gin-vue-admin.com", Name: "https://www.gin-vue-admin.com", Component: "/", Sort: 0, Meta: system.Meta{Title: "官方网站", Icon: "home-filled"}}, {MenuLevel: 0, Hidden: false, ParentId: "0", Path: "state", Name: "state", Component: "view/system/state.vue", Sort: 6, Meta: system.Meta{Title: "服务器状态", Icon: "cloudy"}}, - {MenuLevel: 0, Hidden: false, ParentId: "14", Path: "autoCodeAdmin", Name: "autoCodeAdmin", Component: "view/systemTools/autoCodeAdmin/index.vue", Sort: 1, Meta: system.Meta{Title: "自动化代码管理", Icon: "s-finance"}}, - {MenuLevel: 0, Hidden: true, ParentId: "14", Path: "autoCodeEdit/:id", Name: "autoCodeEdit", Component: "view/systemTools/autoCode/index.vue", Sort: 0, Meta: system.Meta{Title: "自动化代码（复用）", Icon: "s-finance"}}, + {MenuLevel: 0, Hidden: false, ParentId: "14", Path: "autoCodeAdmin", Name: "autoCodeAdmin", Component: "view/systemTools/autoCodeAdmin/index.vue", Sort: 1, Meta: system.Meta{Title: "自动化代码管理", Icon: "magic-stick"}}, + {MenuLevel: 0, Hidden: true, ParentId: "14", Path: "autoCodeEdit/:id", Name: "autoCodeEdit", Component: "view/systemTools/autoCode/index.vue", Sort: 0, Meta: system.Meta{Title: "自动化代码（复用）", Icon: "magic-stick"}}, } if err := global.GVA_DB.Create(&entities).Error; err != nil { // 创建 model.User 初始化数据 return errors.Wrap(err, m.TableName()+"表数据初始化失败!") diff --git a/web/package.json b/web/package.json index 1deee87f..09ba876f 100644 --- a/web/package.json +++ b/web/package.json @@ -10,10 +10,11 @@ "fix-memory-limit": "cross-env LIMIT=4096 increase-memory-limit" }, "dependencies": { + "@element-plus/icons": "0.0.11", "axios": "^0.19.2", "core-js": "^3.6.5", "echarts": "4.9.0", - "element-plus": "^1.1.0-beta.8", + "element-plus": "^1.2.0-beta.5", "highlight.js": "^10.6.0", "marked": "^2.0.0", "mitt": "^3.0.0", diff --git a/web/src/components/chooseImg/index.vue b/web/src/components/chooseImg/index.vue index bb57996f..cf44a757 100644 --- a/web/src/components/chooseImg/index.vue +++ b/web/src/components/chooseImg/index.vue @@ -10,7 +10,7 @@ > diff --git a/web/src/core/config.js b/web/src/core/config.js index a4f55476..bb398987 100644 --- a/web/src/core/config.js +++ b/web/src/core/config.js @@ -3,54 +3,51 @@ */ const config = { - appName: 'Gin-Vue-Admin', - appLogo: 'https://www.gin-vue-admin.com/img/logo.png', - showViteLogo: true + appName: 'Gin-Vue-Admin', + appLogo: 'https://www.gin-vue-admin.com/img/logo.png', + showViteLogo: true } - export const viteLogo = (env) => { - if (config.showViteLogo) { - const chalk = require('chalk') - console.log( - chalk.green( - `> 欢迎使用Gin-Vue-Admin，开源地址：https://github.com/flipped-aurora/gin-vue-admin` - ) - ) - console.log( - chalk.green( - `> 当前版本:V2.4.6 Apache` - ) - ) - console.log( - chalk.green( - `> 加群方式:微信：shouzi_1994 QQ群：622360840` - ) - ) - console.log( - chalk.green( - `> 默认自动化文档地址:http://127.0.0.1:${env.VITE_SERVER_PORT}/swagger/index.html` - ) - ) - console.log( - chalk.green( - `> 默认自动化文档地址:http://127.0.0.1:${env.VITE_SERVER_PORT}/swagger/index.html` - ) - ) - console.log( - chalk.green( - `> 默认前端文件运行地址:http://127.0.0.1:${env.VITE_CLI_PORT}` - ) - ) - console.log( - chalk.green( - `> 如果项目让您获得了收益，希望您能请团队喝杯可乐:https://www.github.com/flipped-aurora/gin-vue-admin/server.com/docs/coffee` - ) - ) - console.log('\n') - } + if (config.showViteLogo) { + const chalk = require('chalk') + console.log( + chalk.green( + `> 欢迎使用Gin-Vue-Admin，开源地址：https://github.com/flipped-aurora/gin-vue-admin` + ) + ) + console.log( + chalk.green( + `> 当前版本:V2.4.6 Apache` + ) + ) + console.log( + chalk.green( + `> 加群方式:微信：shouzi_1994 QQ群：622360840` + ) + ) + console.log( + chalk.green( + `> 默认自动化文档地址:http://127.0.0.1:${env.VITE_SERVER_PORT}/swagger/index.html` + ) + ) + console.log( + chalk.green( + `> 默认自动化文档地址:http://127.0.0.1:${env.VITE_SERVER_PORT}/swagger/index.html` + ) + ) + console.log( + chalk.green( + `> 默认前端文件运行地址:http://127.0.0.1:${env.VITE_CLI_PORT}` + ) + ) + console.log( + chalk.green( + `> 如果项目让您获得了收益，希望您能请团队喝杯可乐:https://www.github.com/flipped-aurora/gin-vue-admin/server.com/docs/coffee` + ) + ) + console.log('\n') + } } - - -export default config \ No newline at end of file +export default config diff --git a/web/src/core/global.js b/web/src/core/global.js index 988fd2d3..f74f4fd4 100644 --- a/web/src/core/global.js +++ b/web/src/core/global.js @@ -1,11 +1,21 @@ import config from './config' import { emitter } from '@/utils/bus.js' +// 统一导入el-icon图标 +import * as ElIconModules from '@element-plus/icons' +// 导入转换图标名称的函数 + const closeThisPage = () => { emitter.emit('closeThisPage') } export const register = (app) => { + // 统一注册el-icon图标 + for (const iconName in ElIconModules) { + app.component(iconName, ElIconModules[iconName]) + } + app.config.globalProperties.$GIN_VUE_ADMIN = config app.config.globalProperties.$CloseThisPage = closeThisPage } + diff --git a/web/src/main.js b/web/src/main.js index 503be9e7..899646bb 100644 --- a/web/src/main.js +++ b/web/src/main.js @@ -16,6 +16,7 @@ import { store } from '@/store/index' import App from './App.vue' const app = createApp(App) app.config.productionTip = false + app.use(run) .use(auth) .use(store) diff --git a/web/src/style/main.scss b/web/src/style/main.scss index eadd9d98..9c63ee59 100644 --- a/web/src/style/main.scss +++ b/web/src/style/main.scss @@ -847,7 +847,6 @@ li { } } -// edit_container .edit_container { background-color: $white-bg; padding: 15px; @@ -858,95 +857,12 @@ li { .edit { background-color: $white-bg; - padding: 15px; .el-button { margin: 15px 0; } } -// .el-menu .el-menu--inline { -// background: #2c3b41; -// } -// .el-sub-menu .el-sub-menu { -// background-color: #000408 !important; -// } -// .aside .el-scrollbar .el-scrollbar__view .el-sub-menu__title:hover { -// background-color: $bg-aside !important; -// } -// .el-menu--vertical { -// .el-menu { -// margin-left: -8px; -// background-color: rgb(48, 65, 86); -// .el-menu-item { -// background-color: rgb(48, 65, 86); -// } -// .el-menu-item:focus, -// .el-menu-item:hover { -// background-color: #263445; -// color: #fff; -// } -// } -// } -// 导航***** -// add 5.13 .el-container { - // .admin-box { - // padding: 15px; - // margin: 115px 15px 20px; - // border-radius: 2px; - // .button-box { - // border: none; - // padding: 0 0 10px 0px; - // } - // .el-table--border { - // border-radius: 4px; - // margin-bottom: 15px; - // } - // .el-table { - // thead { - // color: $color-table-thead; - // } - // th { - // padding: 5px 0; - // .cell { - // min-height: 34px; - // line-height: 34px; - // } - // } - // td { - // padding: 8px 0; - // } - // td, - // th.is-leaf { - // border-bottom: 1px solid #e8e8e8; - // } - // } - // .el-pagination { - // padding: 20px 0 0 0; - // } - // .upload-demo, - // .upload { - // padding: 0; - // } - // .system { - // padding: 0; - // } - // .el-form.el-form--inline { - // .el-form-item:last-child { - // margin-bottom: 0; - // } - // } - // .edit_container, - // .edit { - // padding: 0; - // } - // } - // .admin-box:after, - // .admin-box:before { - // content: ""; - // display: block; - // clear: both; - // } .tips { margin-top: 10px; font-size: 14px; @@ -956,11 +872,6 @@ li { } .el-container.layout-cont { - // .header-cont, - // .breadcrumb { - // height: 40px !important; - // line-height: 40px !important; - // } .main-cont.el-main { background-color: $bg-main; .menu-total { @@ -969,7 +880,6 @@ li { color: #000000; margin-top: 16px; } - // background-color: #f0f2f5; } } @@ -1093,6 +1003,7 @@ $mainHight: 100vh; .layout-cont { .right-box { + padding-top: 16px; display: flex; justify-content: flex-end; align-items: center; @@ -1228,6 +1139,7 @@ $mainHight: 100vh; width: 120px; margin-right: 32px; text-align: center; + margin-top: -12px; } .screenfull { @@ -1237,7 +1149,6 @@ $mainHight: 100vh; .el-dropdown { overflow: hidden; - height: 60px; } // dashboard diff --git a/web/src/style/newLogin.scss b/web/src/style/newLogin.scss index 022cab3b..c8551090 100644 --- a/web/src/style/newLogin.scss +++ b/web/src/style/newLogin.scss @@ -6,6 +6,10 @@ width: 100%; height: 100%; position: relative; + .input-icon{ + padding-right: 6px; + padding-top: 2px; + } .login_panle { position: absolute; top: 3vh; diff --git a/web/src/view/dashboard/index.vue b/web/src/view/dashboard/index.vue index fa74a8f3..21f6f7fa 100644 --- a/web/src/view/dashboard/index.vue +++ b/web/src/view/dashboard/index.vue @@ -9,17 +9,26 @@
- 今日流量 (1231231) + + + + 今日流量 (1231231)
- 总用户数 (24001) + + + + 总用户数 (24001)
- 好评率 (99%) + + + + 好评率 (99%)
@@ -64,7 +73,9 @@ >
- + + +

{{ card.label }}

@@ -106,42 +117,42 @@ export default { toolCards: [ { label: '用户管理', - icon: 'el-icon el-icon-monitor', + icon: 'monitor', name: 'user', color: '#ff9c6e', bg: 'rgba(255, 156, 110,.3)' }, { label: '角色管理', - icon: 'el-icon el-icon-setting', + icon: 'setting', name: 'authority', color: '#69c0ff', bg: 'rgba(105, 192, 255,.3)' }, { label: '菜单管理', - icon: 'el-icon el-icon-menu', + icon: 'menu', name: 'menu', color: '#b37feb', bg: 'rgba(179, 127, 235,.3)' }, { label: '代码生成器', - icon: ' el-icon-cpu', + icon: 'cpu', name: 'autoCode', color: '#ffd666', bg: 'rgba(255, 214, 102,.3)' }, { label: '表单生成器', - icon: 'el-icon-document-checked', + icon: 'document-checked', name: 'formCreate', color: '#ff85c0', bg: 'rgba(255, 133, 192,.3)' }, { label: '关于我们', - icon: ' el-icon-user', + icon: 'user', name: 'about', color: '#5cdbd3', bg: 'rgba(92, 219, 211,.3)' diff --git a/web/src/view/example/breakpoint/breakpoint.vue b/web/src/view/example/breakpoint/breakpoint.vue index fa588732..89cf2a7d 100644 --- a/web/src/view/example/breakpoint/breakpoint.vue +++ b/web/src/view/example/breakpoint/breakpoint.vue @@ -13,7 +13,9 @@
- + + + {{ file.name }} {{ percentage }}% diff --git a/web/src/view/example/customer/customer.vue b/web/src/view/example/customer/customer.vue index 69932980..2880d647 100644 --- a/web/src/view/example/customer/customer.vue +++ b/web/src/view/example/customer/customer.vue @@ -3,7 +3,7 @@
- 新增 + 新增
diff --git a/web/src/view/example/excel/excel.vue b/web/src/view/example/excel/excel.vue index 55a66f5f..073070b3 100644 --- a/web/src/view/example/excel/excel.vue +++ b/web/src/view/example/excel/excel.vue @@ -10,10 +10,10 @@ :on-success="loadExcel" :show-file-list="false" > - 导入 + 导入 - 导出 - 下载模板 + 导出 + 下载模板
diff --git a/web/src/view/example/upload/upload.vue b/web/src/view/example/upload/upload.vue index a6c82356..5fc08c2d 100644 --- a/web/src/view/example/upload/upload.vue +++ b/web/src/view/example/upload/upload.vue @@ -45,8 +45,8 @@ diff --git a/web/src/view/iconList/index.vue b/web/src/view/iconList/index.vue deleted file mode 100644 index 4d1e9283..00000000 --- a/web/src/view/iconList/index.vue +++ /dev/null @@ -1,379 +0,0 @@ - - - - - diff --git a/web/src/view/init/index.vue b/web/src/view/init/index.vue index dce11518..7ccd90fe 100644 --- a/web/src/view/init/index.vue +++ b/web/src/view/init/index.vue @@ -117,7 +117,7 @@ export default { const loading = this.$loading({ lock: true, text: '正在初始化数据库，请稍候', - spinner: 'el-icon-loading', + spinner: 'loading', background: 'rgba(0, 0, 0, 0.7)' }) try { diff --git a/web/src/view/layout/aside/asideComponent/asyncSubmenu.vue b/web/src/view/layout/aside/asideComponent/asyncSubmenu.vue index be5c9bdf..50776665 100644 --- a/web/src/view/layout/aside/asideComponent/asyncSubmenu.vue +++ b/web/src/view/layout/aside/asideComponent/asyncSubmenu.vue @@ -1,7 +1,9 @@ @@ -96,7 +99,6 @@