+
@@ -19,7 +21,7 @@ export default {
title: {
type: String,
default: ''
- }
+ },
}
}
@@ -30,14 +32,16 @@ export default {
padding: 6px 14px;
display: flex;
align-items: center;
+ border-radius: 2px;
.el-icon{
- color: #ED6A0C;
+ font-size: 18px;
+ color: #ED6A0C;
}
- margin-bottom: 22px;
+ margin-bottom: 12px;
span{
- color:#5D5D5E;
+ line-height: 22px;
+ color:#F67207;
margin-left: 8px;
- line-height: 18px;
}
}
diff --git a/web/src/core/gin-vue-admin.js b/web/src/core/gin-vue-admin.js
index 0a1270332..f70252090 100644
--- a/web/src/core/gin-vue-admin.js
+++ b/web/src/core/gin-vue-admin.js
@@ -5,14 +5,16 @@
// 加载网站配置文件夹
import { register } from './global'
-export const run = function(app) {
- register(app)
- console.log(`
- 欢迎使用 Gin-Vue-Admin
- 当前版本:V2.4.5 beta.1
- 加群方式:微信：shouzi_1994 QQ群：622360840
- 默认自动化文档地址:http://127.0.0.1:${import.meta.env.VITE_SERVER_PORT}/swagger/index.html
- 默认前端文件运行地址:http://127.0.0.1:${import.meta.env.VITE_CLI_PORT}
- 如果项目让您获得了收益，希望您能请团队喝杯可乐:https://www.gin-vue-admin.com/docs/coffee
- `)
+export default {
+ install: (app) => {
+ register(app)
+ console.log(`
+ 欢迎使用 Gin-Vue-Admin
+ 当前版本:V2.4.5 beta.1
+ 加群方式:微信：shouzi_1994 QQ群：622360840
+ 默认自动化文档地址:http://127.0.0.1:${import.meta.env.VITE_SERVER_PORT}/swagger/index.html
+ 默认前端文件运行地址:http://127.0.0.1:${import.meta.env.VITE_CLI_PORT}
+ 如果项目让您获得了收益，希望您能请团队喝杯可乐:https://www.gin-vue-admin.com/docs/coffee
+ `)
+ }
}
diff --git a/web/src/directive/auth.js b/web/src/directive/auth.js
index 48be58f22..c5406029d 100644
--- a/web/src/directive/auth.js
+++ b/web/src/directive/auth.js
@@ -1,39 +1,42 @@
// 权限按钮展示指令
import { store } from '@/store'
-export const auth = (app) => {
- app.directive('auth', {
- // 当被绑定的元素插入到 DOM 中时……
- mounted: function(el, binding) {
- const userInfo = store.getters['user/userInfo']
- let type = ''
- switch (Object.prototype.toString.call(binding.value)) {
- case '[object Array]':
- type = 'Array'
- break
- case '[object String]':
- type = 'String'
- break
- case '[object Number]':
- type = 'Number'
- break
- default:
- type = ''
- break
+export default {
+ install: (app) => {
+ app.directive('auth', {
+ // 当被绑定的元素插入到 DOM 中时……
+ mounted: function(el, binding) {
+ const userInfo = store.getters['user/userInfo']
+ let type = ''
+ switch (Object.prototype.toString.call(binding.value)) {
+ case '[object Array]':
+ type = 'Array'
+ break
+ case '[object String]':
+ type = 'String'
+ break
+ case '[object Number]':
+ type = 'Number'
+ break
+ default:
+ type = ''
+ break
+ }
+ if (type === '') {
+ /* eslint-disable */
+ console.error("v-auth必须是Array,Number,String属性,暂不支持其他属性")
+ /* eslint-enable */
+ return
+ }
+ const waitUse = binding.value.toString().split(',')
+ let flag = waitUse.some(item => item === userInfo.authorityId)
+ if (binding.modifiers.not) {
+ flag = !flag
+ }
+ if (!flag) {
+ el.style.display = 'none'
+ }
}
- if (type === '') {
- /* eslint-disable */
- console.error("v-auth必须是Array,Number,String属性,暂不支持其他属性")
- /* eslint-enable */
- return
- }
- const waitUse = binding.value.toString().split(',')
- let flag = waitUse.some(item => item === userInfo.authorityId)
- if (binding.modifiers.not) {
- flag = !flag
- }
- if (!flag) {
- el.style.display = 'none'
- }
- }
- })
+ })
+ }
}
+
diff --git a/web/src/main.js b/web/src/main.js
index 5cd0c413d..503be9e7f 100644
--- a/web/src/main.js
+++ b/web/src/main.js
@@ -1,22 +1,25 @@
import { createApp } from 'vue'
import 'element-plus/dist/index.css'
+import './style/element_visiable.scss'
import ElementPlus from 'element-plus'
import zhCn from 'element-plus/es/locale/lang/zh-cn'
// 引入gin-vue-admin前端初始化相关内容
import './core/gin-vue-admin'
// 引入封装的router
import router from '@/router/index'
-import { run } from '@/core/gin-vue-admin.js'
+import run from '@/core/gin-vue-admin.js'
+import auth from '@/directive/auth'
+
import '@/permission'
import { store } from '@/store/index'
-import { auth } from '@/directive/auth'
-
import App from './App.vue'
const app = createApp(App)
-run(app)
-auth(app)
app.config.productionTip = false
-app.use(store).use(router).use(ElementPlus, { locale: zhCn }).mount('#app')
+app.use(run)
+ .use(auth)
+ .use(store)
+ .use(router)
+ .use(ElementPlus, { locale: zhCn }).mount('#app')
export default app
diff --git a/web/src/style/element_visiable.scss b/web/src/style/element_visiable.scss
index 17d4ec2a2..a19c1ba89 100644
--- a/web/src/style/element_visiable.scss
+++ b/web/src/style/element_visiable.scss
@@ -1,21 +1,192 @@
/* 改变主题色变量 */
-$--color-primary: #1890ff;
#app{
.el-button{
font-weight: 400;
- border-radius: 4px;
+ border-radius: 2px;
}
}
-///* 改变 icon 字体路径变量，必需 */
-//$--font-path: '~element-ui/lib/theme-chalk/fonts';
-//
-//
-//
-//@import "~element-ui/packages/theme-chalk/src/index";
-//
-
-:export {
- colorPrimary: $--color-primary
+.el-dialog{
+ border-radius: 2px;
}
+
+::-webkit-scrollbar-track-piece {
+ background-color: #f8f8f8;
+}
+
+::-webkit-scrollbar {
+ width: 9px;
+ height: 9px;
+}
+
+::-webkit-scrollbar-thumb {
+ background-color: #dddddd;
+ background-clip: padding-box;
+ min-height: 28px;
+ border-radius: 4px;
+}
+
+::-webkit-scrollbar-thumb:hover {
+ background-color: #bbb;
+}
+
+.el-button--primary {
+ --el-button-font-color: #ffffff;
+ --el-button-background-color: #4D70FF;
+ --el-button-border-color: #4D70FF;
+ --el-button-hover-color: #0d84ff;
+ --el-button-active-font-color: #e6e6e6;
+ --el-button-active-background-color: #0d84ff;
+ --el-button-active-border-color: #0d84ff;
+}
+
+.el-button--primary {
+ --el-button-font-color: #ffffff;
+ --el-button-background-color: #4D70FF;
+ --el-button-border-color: #4D70FF;
+ --el-button-hover-color: #0d84ff;
+ --el-button-active-font-color: #e6e6e6;
+ --el-button-active-background-color: #0d84ff;
+ --el-button-active-border-color: #0d84ff;
+}
+
+:root {
+ --el-color-primary: #4D70FF;
+}
+
+.gva-search-box {
+ .el-collapse {
+ border: none;
+ .el-collapse-item__header,
+ .el-collapse-item__wrap {
+ border-bottom: none;
+ }
+ }
+ padding: 24px;
+ padding-bottom: 2px;
+ background-color: #fff;
+ border-radius: 2px;
+ margin-bottom: 12px;
+ .el-form {
+ .el-form-item {
+ padding-right: 28px;
+ }
+ }
+}
+
+.gva-form-box {
+ padding: 24px;
+ background-color: #fff;
+ border-radius: 2px;
+}
+
+.gva-table-box {
+ padding: 24px;
+ background-color: #fff;
+ border-radius: 2px;
+}
+
+.gva-pagination {
+ display: flex;
+ justify-content: flex-end;
+ .el-pagination__editor {
+ .el-input__inner {
+ height: 32px;
+ }
+ }
+ .el-pagination__total {
+ line-height: 32px !important;
+ }
+ .btn-prev {
+ padding-right: 6px;
+ display: inline-flex;
+ justify-content: center;
+ align-items: center;
+ width: 32px;
+ height: 32px;
+ }
+ .number {
+ display: inline-flex;
+ justify-content: center;
+ align-items: center;
+ width: 32px;
+ height: 32px;
+ }
+ .btn-quicknext {
+ display: inline-flex;
+ justify-content: center;
+ align-items: center;
+ width: 32px;
+ height: 32px;
+ }
+ .btn-next {
+ padding-left: 6px;
+ width: 32px;
+ height: 32px;
+ display: inline-flex;
+ justify-content: center;
+ align-items: center;
+ }
+ .active {
+ background: #4D70FF;
+ border-radius: 2px;
+ color: #ffffff !important;
+ }
+ .el-pager li.active+li {
+ border-left: 1px solid #ddd !important;
+ }
+ .el-pagination__sizes {
+ .el-input {
+ .el-input__suffix {
+ margin-top: 2px;
+ }
+ }
+ }
+ .el-pagination__jump {
+ .el-pagination__editor {}
+ }
+}
+
+.el-button--mini {
+ min-height: 32px;
+}
+
+.el-button {
+ padding: 8px 16px;
+ border-radius: 2px;
+ &.el-button--text {
+ padding: 8px 0;
+ }
+}
+
+.el-dialog {
+ padding: 12px;
+ .el-dialog__body {
+ padding: 12px 6px;
+ }
+ .el-dialog__header {
+ .el-dialog__title {
+ font-size: 14px;
+ font-weight: 500;
+ }
+ padding: 2px 20px 12px 20px;
+ border-bottom: 1px solid #E4E4E4;
+ }
+ .el-dialog__headerbtn {
+ top: 16px;
+ }
+ .el-dialog__footer {
+ margin-top: -12px;
+ padding: 0 0 16px 0;
+ .dialog-footer {
+ .el-button {
+ padding-left: 24px;
+ padding-right: 24px;
+ }
+ .el-button+.el-button {
+ margin-left: 30px;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/web/src/style/main.scss b/web/src/style/main.scss
index dcc0bf1a2..abd46b8bb 100644
--- a/web/src/style/main.scss
+++ b/web/src/style/main.scss
@@ -1368,183 +1368,3 @@ $mainHight: 100vh;
.justify-content-flex-end {
justify-content: flex-end;
}
-
-::-webkit-scrollbar-track-piece {
- background-color: #f8f8f8;
-}
-
-::-webkit-scrollbar {
- width: 9px;
- height: 9px;
-}
-
-::-webkit-scrollbar-thumb {
- background-color: #dddddd;
- background-clip: padding-box;
- min-height: 28px;
- border-radius: 4px;
-}
-
-::-webkit-scrollbar-thumb:hover {
- background-color: #bbb;
-}
-
-.el-button--primary {
- --el-button-font-color: #ffffff;
- --el-button-background-color: #4D70FF;
- --el-button-border-color: #4D70FF;
- --el-button-hover-color: #0d84ff;
- --el-button-active-font-color: #e6e6e6;
- --el-button-active-background-color: #0d84ff;
- --el-button-active-border-color: #0d84ff;
-}
-
-.el-button--primary {
- --el-button-font-color: #ffffff;
- --el-button-background-color: #4D70FF;
- --el-button-border-color: #4D70FF;
- --el-button-hover-color: #0d84ff;
- --el-button-active-font-color: #e6e6e6;
- --el-button-active-background-color: #0d84ff;
- --el-button-active-border-color: #0d84ff;
-}
-
-:root {
- --el-color-primary: #4D70FF;
-}
-
-.gva-search-box {
- .el-collapse {
- border: none;
- .el-collapse-item__header,
- .el-collapse-item__wrap {
- border-bottom: none;
- }
- }
- padding: 24px;
- padding-bottom: 2px;
- background-color: #fff;
- border-radius: 2px;
- margin-bottom: 12px;
- .el-form {
- .el-form-item {
- padding-right: 28px;
- }
- }
-}
-
-.gva-form-box {
- padding: 24px;
- background-color: #fff;
- border-radius: 2px;
-}
-
-.gva-table-box {
- padding: 24px;
- background-color: #fff;
- border-radius: 2px;
-}
-
-.gva-pagination {
- display: flex;
- justify-content: flex-end;
- .el-pagination__editor {
- .el-input__inner {
- height: 32px;
- }
- }
- .el-pagination__total {
- line-height: 32px !important;
- }
- .btn-prev {
- padding-right: 6px;
- display: inline-flex;
- justify-content: center;
- align-items: center;
- width: 32px;
- height: 32px;
- }
- .number {
- display: inline-flex;
- justify-content: center;
- align-items: center;
- width: 32px;
- height: 32px;
- }
- .btn-quicknext {
- display: inline-flex;
- justify-content: center;
- align-items: center;
- width: 32px;
- height: 32px;
- }
- .btn-next {
- padding-left: 6px;
- width: 32px;
- height: 32px;
- display: inline-flex;
- justify-content: center;
- align-items: center;
- }
- .active {
- background: #4D70FF;
- border-radius: 2px;
- color: #ffffff !important;
- }
- .el-pager li.active+li {
- border-left: 1px solid #ddd !important;
- }
- .el-pagination__sizes {
- .el-input {
- .el-input__suffix {
- margin-top: 2px;
- }
- }
- }
- .el-pagination__jump {
- .el-pagination__editor {}
- }
-}
-
-.el-button--mini {
- min-height: 32px;
-}
-
-.el-button {
- padding: 8px 16px;
- border-radius: 2px;
- &.el-button--text {
- padding: 8px 0;
- }
-}
-
-.el-dialog {
- padding: 12px;
- .el-dialog__body {
- padding: 12px 6px;
- }
- .el-dialog__header {
- .el-dialog__title {
- font-size: 14px;
- font-weight: 500;
- }
- padding: 2px 20px 12px 20px;
- border-bottom: 1px solid #E4E4E4;
- }
- .el-dialog__headerbtn {
- top: 16px;
- }
- .el-dialog__footer {
- margin-top: -12px;
- padding: 0 0 16px 0;
- .dialog-footer {
- .el-button {
- padding-left: 24px;
- padding-right: 24px;
- }
- .el-button+.el-button {
- margin-left: 30px;
- }
- }
- }
-}
\ No newline at end of file
diff --git a/web/src/view/example/customer/customer.vue b/web/src/view/example/customer/customer.vue
index 5e5c7343a..699329809 100644
--- a/web/src/view/example/customer/customer.vue
+++ b/web/src/view/example/customer/customer.vue
@@ -1,5 +1,6 @@
-
+
-
+
-
+
{{ scope.row.tag }}
-
+
下载
删除
diff --git a/web/src/view/login/index.vue b/web/src/view/login/index.vue
index aa49d5c45..0369d437b 100644
--- a/web/src/view/login/index.vue
+++ b/web/src/view/login/index.vue
@@ -3,10 +3,19 @@
-
+
+
+
diff --git a/web/src/view/superAdmin/api/api.vue b/web/src/view/superAdmin/api/api.vue
index f5f93a6bd..675dfc502 100644
--- a/web/src/view/superAdmin/api/api.vue
+++ b/web/src/view/superAdmin/api/api.vue
@@ -29,7 +29,6 @@
+ 新增
@@ -12,15 +13,15 @@
row-key="ID"
>
+
{{ formatDate(scope.row.CreatedAt) }}
-
+
变更
@@ -36,7 +37,6 @@
- 下载模板
-
+
{{ scope.row.hidden?"隐藏":"显示" }}
-
diff --git a/web/src/view/example/upload/upload.vue b/web/src/view/example/upload/upload.vue
index ccdf897ca..a6c82356a 100644
--- a/web/src/view/example/upload/upload.vue
+++ b/web/src/view/example/upload/upload.vue
@@ -23,19 +23,19 @@
{{ formatDate(scope.row.UpdatedAt) }}
+ 
+ 
+ 
+
-
新增
确定
- 确定要删除吗？
@@ -38,7 +37,7 @@
{{ scope.row.method }} / {{ methodFiletr(scope.row.method) }}
@@ -59,7 +58,7 @@
-
+