+
{{- range .Fields}} {{- if .FieldSearchType}} {{- if eq .FieldType "bool" }}
@@ -21,66 +21,71 @@
{{ end }}{{ end }}{{ end }}
+
+ 查询
+ 重置
+
-
-
-
- {{ "{{ formatDate(scope.row.CreatedAt) }}" }}
-
- {{- range .Fields}}
- {{- if .DictType}}
-
-
- {{"{{"}} filterDict(scope.row.{{.FieldJson}},"{{.DictType}}") {{"}}"}}
-
-
- {{- else if eq .FieldType "bool" }}
-
- {{"{{"}} formatBoolean(scope.row.{{.FieldJson}}) {{"}}"}}
- {{- else }}
-
-
- 变更
- 删除
-
-
-
-
{{- range .Fields}}
@@ -93,7 +98,7 @@
{{- end }}
{{- if eq .FieldType "int" }}
{{- if .DictType}}
-
+
{{- else }}
@@ -101,18 +106,18 @@
{{- end }}
{{- end }}
{{- if eq .FieldType "time.Time" }}
-
@@ -174,6 +179,9 @@ export default {
{{- end }}
},
methods: {
+ onReset() {
+ this.searchInfo = {}
+ },
// 条件搜索前端看此方法
onSubmit() {
this.page = 1
diff --git a/server/router/autocode/autocodeExample.go b/server/router/autocode/autocodeExample.go
index a8bc6d12aac108db0fd0fdbb441e2e17e3c0d203..981b5fa9fb704d96347fd73308ea7c89a0097ad0 100644
--- a/server/router/autocode/autocodeExample.go
+++ b/server/router/autocode/autocodeExample.go
@@ -11,12 +11,15 @@ type AutoCodeExampleRouter struct {
func (s *AutoCodeExampleRouter) InitSysAutoCodeExampleRouter(Router *gin.RouterGroup) {
autoCodeExampleRouter := Router.Group("autoCodeExample").Use(middleware.OperationRecord())
+ autoCodeExampleRouterWithoutRecord := Router.Group("autoCodeExample")
var autoCodeExampleApi = v1.ApiGroupApp.AutoCodeApiGroup.AutoCodeExampleApi
{
autoCodeExampleRouter.POST("createSysAutoCodeExample", autoCodeExampleApi.CreateAutoCodeExample) // 新建AutoCodeExample
autoCodeExampleRouter.DELETE("deleteSysAutoCodeExample", autoCodeExampleApi.DeleteAutoCodeExample) // 删除AutoCodeExample
autoCodeExampleRouter.PUT("updateSysAutoCodeExample", autoCodeExampleApi.UpdateAutoCodeExample) // 更新AutoCodeExample
- autoCodeExampleRouter.GET("findSysAutoCodeExample", autoCodeExampleApi.FindAutoCodeExample) // 根据ID获取AutoCodeExample
- autoCodeExampleRouter.GET("getSysAutoCodeExampleList", autoCodeExampleApi.GetAutoCodeExampleList) // 获取AutoCodeExample列表
+ }
+ {
+ autoCodeExampleRouterWithoutRecord.GET("findSysAutoCodeExample", autoCodeExampleApi.FindAutoCodeExample) // 根据ID获取AutoCodeExample
+ autoCodeExampleRouterWithoutRecord.GET("getSysAutoCodeExampleList", autoCodeExampleApi.GetAutoCodeExampleList) // 获取AutoCodeExample列表
}
}
diff --git a/server/router/example/exa_customer.go b/server/router/example/exa_customer.go
index 6e4b04662980abef5aba860fff9b5dcbc27f9877..dd5db6fb78f8b6ac0f41f016ec722ef743369c42 100644
--- a/server/router/example/exa_customer.go
+++ b/server/router/example/exa_customer.go
@@ -11,12 +11,15 @@ type CustomerRouter struct {
func (e *CustomerRouter) InitCustomerRouter(Router *gin.RouterGroup) {
customerRouter := Router.Group("customer").Use(middleware.OperationRecord())
+ customerRouterWithoutRecord := Router.Group("customer")
var exaCustomerApi = v1.ApiGroupApp.ExampleApiGroup.CustomerApi
{
- customerRouter.POST("customer", exaCustomerApi.CreateExaCustomer) // 创建客户
- customerRouter.PUT("customer", exaCustomerApi.UpdateExaCustomer) // 更新客户
- customerRouter.DELETE("customer", exaCustomerApi.DeleteExaCustomer) // 删除客户
- customerRouter.GET("customer", exaCustomerApi.GetExaCustomer) // 获取单一客户信息
- customerRouter.GET("customerList", exaCustomerApi.GetExaCustomerList) // 获取客户列表
+ customerRouter.POST("customer", exaCustomerApi.CreateExaCustomer) // 创建客户
+ customerRouter.PUT("customer", exaCustomerApi.UpdateExaCustomer) // 更新客户
+ customerRouter.DELETE("customer", exaCustomerApi.DeleteExaCustomer) // 删除客户
+ }
+ {
+ customerRouterWithoutRecord.GET("customer", exaCustomerApi.GetExaCustomer) // 获取单一客户信息
+ customerRouterWithoutRecord.GET("customerList", exaCustomerApi.GetExaCustomerList) // 获取客户列表
}
}
diff --git a/server/router/example/exa_excel.go b/server/router/example/exa_excel.go
index bd7477c1e0c91ba27d6305f81aaf5d9aba5a44e7..b964793c19a6de5e7082b13854c1983709067d5f 100644
--- a/server/router/example/exa_excel.go
+++ b/server/router/example/exa_excel.go
@@ -12,9 +12,9 @@ func (e *ExcelRouter) InitExcelRouter(Router *gin.RouterGroup) {
excelRouter := Router.Group("excel")
var exaExcelApi = v1.ApiGroupApp.ExampleApiGroup.ExcelApi
{
- excelRouter.POST("/importExcel", exaExcelApi.ImportExcel) // 导入Excel
- excelRouter.GET("/loadExcel", exaExcelApi.LoadExcel) // 加载Excel数据
- excelRouter.POST("/exportExcel", exaExcelApi.ExportExcel) // 导出Excel
- excelRouter.GET("/downloadTemplate", exaExcelApi.DownloadTemplate) // 下载模板文件
+ excelRouter.POST("importExcel", exaExcelApi.ImportExcel) // 导入Excel
+ excelRouter.GET("loadExcel", exaExcelApi.LoadExcel) // 加载Excel数据
+ excelRouter.POST("exportExcel", exaExcelApi.ExportExcel) // 导出Excel
+ excelRouter.GET("downloadTemplate", exaExcelApi.DownloadTemplate) // 下载模板文件
}
}
diff --git a/server/router/example/exa_file_upload_and_download.go b/server/router/example/exa_file_upload_and_download.go
index 158b47acf7d0b810140f869e71c4372af9d6b7f2..c65086635772f9dff120b7247c96e2621b6b9466 100644
--- a/server/router/example/exa_file_upload_and_download.go
+++ b/server/router/example/exa_file_upload_and_download.go
@@ -12,12 +12,12 @@ func (e *FileUploadAndDownloadRouter) InitFileUploadAndDownloadRouter(Router *gi
fileUploadAndDownloadRouter := Router.Group("fileUploadAndDownload")
var exaFileUploadAndDownloadApi = v1.ApiGroupApp.ExampleApiGroup.FileUploadAndDownloadApi
{
- fileUploadAndDownloadRouter.POST("/upload", exaFileUploadAndDownloadApi.UploadFile) // 上传文件
- fileUploadAndDownloadRouter.POST("/getFileList", exaFileUploadAndDownloadApi.GetFileList) // 获取上传文件列表
- fileUploadAndDownloadRouter.POST("/deleteFile", exaFileUploadAndDownloadApi.DeleteFile) // 删除指定文件
- fileUploadAndDownloadRouter.POST("/breakpointContinue", exaFileUploadAndDownloadApi.BreakpointContinue) // 断点续传
- fileUploadAndDownloadRouter.GET("/findFile", exaFileUploadAndDownloadApi.FindFile) // 查询当前文件成功的切片
- fileUploadAndDownloadRouter.POST("/breakpointContinueFinish", exaFileUploadAndDownloadApi.BreakpointContinueFinish) // 查询当前文件成功的切片
- fileUploadAndDownloadRouter.POST("/removeChunk", exaFileUploadAndDownloadApi.RemoveChunk) // 查询当前文件成功的切片
+ fileUploadAndDownloadRouter.POST("upload", exaFileUploadAndDownloadApi.UploadFile) // 上传文件
+ fileUploadAndDownloadRouter.POST("getFileList", exaFileUploadAndDownloadApi.GetFileList) // 获取上传文件列表
+ fileUploadAndDownloadRouter.POST("deleteFile", exaFileUploadAndDownloadApi.DeleteFile) // 删除指定文件
+ fileUploadAndDownloadRouter.POST("breakpointContinue", exaFileUploadAndDownloadApi.BreakpointContinue) // 断点续传
+ fileUploadAndDownloadRouter.GET("findFile", exaFileUploadAndDownloadApi.FindFile) // 查询当前文件成功的切片
+ fileUploadAndDownloadRouter.POST("breakpointContinueFinish", exaFileUploadAndDownloadApi.BreakpointContinueFinish) // 查询当前文件成功的切片
+ fileUploadAndDownloadRouter.POST("removeChunk", exaFileUploadAndDownloadApi.RemoveChunk) // 查询当前文件成功的切片
}
}
diff --git a/server/router/system/sys_api.go b/server/router/system/sys_api.go
index 70edc6776108a0b57213644213e57bac625bf4bf..6420382d993c453576dc111a1e380ffdb45387d7 100644
--- a/server/router/system/sys_api.go
+++ b/server/router/system/sys_api.go
@@ -11,14 +11,17 @@ type ApiRouter struct {
func (s *ApiRouter) InitApiRouter(Router *gin.RouterGroup) {
apiRouter := Router.Group("api").Use(middleware.OperationRecord())
+ apiRouterWithoutRecord := Router.Group("api")
var apiRouterApi = v1.ApiGroupApp.SystemApiGroup.SystemApiApi
{
apiRouter.POST("createApi", apiRouterApi.CreateApi) // 创建Api
apiRouter.POST("deleteApi", apiRouterApi.DeleteApi) // 删除Api
- apiRouter.POST("getApiList", apiRouterApi.GetApiList) // 获取Api列表
apiRouter.POST("getApiById", apiRouterApi.GetApiById) // 获取单条Api消息
apiRouter.POST("updateApi", apiRouterApi.UpdateApi) // 更新api
- apiRouter.POST("getAllApis", apiRouterApi.GetAllApis) // 获取所有api
apiRouter.DELETE("deleteApisByIds", apiRouterApi.DeleteApisByIds) // 删除选中api
}
+ {
+ apiRouterWithoutRecord.POST("getAllApis", apiRouterApi.GetAllApis) // 获取所有api
+ apiRouterWithoutRecord.POST("getApiList", apiRouterApi.GetApiList) // 获取Api列表
+ }
}
diff --git a/server/router/system/sys_authority.go b/server/router/system/sys_authority.go
index cb240c211923791428a3b83ca6f5a3f8ed6720c1..07787e999e398bb2274046170117b03ecf0a6421 100644
--- a/server/router/system/sys_authority.go
+++ b/server/router/system/sys_authority.go
@@ -11,13 +11,16 @@ type AuthorityRouter struct {
func (s *AuthorityRouter) InitAuthorityRouter(Router *gin.RouterGroup) {
authorityRouter := Router.Group("authority").Use(middleware.OperationRecord())
+ authorityRouterWithoutRecord := Router.Group("authority")
var authorityApi = v1.ApiGroupApp.SystemApiGroup.AuthorityApi
{
authorityRouter.POST("createAuthority", authorityApi.CreateAuthority) // 创建角色
authorityRouter.POST("deleteAuthority", authorityApi.DeleteAuthority) // 删除角色
authorityRouter.PUT("updateAuthority", authorityApi.UpdateAuthority) // 更新角色
- authorityRouter.POST("copyAuthority", authorityApi.CopyAuthority) // 更新角色
- authorityRouter.POST("getAuthorityList", authorityApi.GetAuthorityList) // 获取角色列表
+ authorityRouter.POST("copyAuthority", authorityApi.CopyAuthority) // 拷贝角色
authorityRouter.POST("setDataAuthority", authorityApi.SetDataAuthority) // 设置角色资源权限
}
+ {
+ authorityRouterWithoutRecord.POST("getAuthorityList", authorityApi.GetAuthorityList) // 获取角色列表
+ }
}
diff --git a/server/router/system/sys_casbin.go b/server/router/system/sys_casbin.go
index 0cb2acd6b1f8a6b3dba2ade2e86ca9428e297b8d..618444cb602261ad1c6cd96721f1a21c3d00afbb 100644
--- a/server/router/system/sys_casbin.go
+++ b/server/router/system/sys_casbin.go
@@ -11,9 +11,12 @@ type CasbinRouter struct {
func (s *CasbinRouter) InitCasbinRouter(Router *gin.RouterGroup) {
casbinRouter := Router.Group("casbin").Use(middleware.OperationRecord())
+ casbinRouterWithoutRecord := Router.Group("casbin")
var casbinApi = v1.ApiGroupApp.SystemApiGroup.CasbinApi
{
casbinRouter.POST("updateCasbin", casbinApi.UpdateCasbin)
- casbinRouter.POST("getPolicyPathByAuthorityId", casbinApi.GetPolicyPathByAuthorityId)
+ }
+ {
+ casbinRouterWithoutRecord.POST("getPolicyPathByAuthorityId", casbinApi.GetPolicyPathByAuthorityId)
}
}
diff --git a/server/router/system/sys_dictionary.go b/server/router/system/sys_dictionary.go
index 1ed6b7f180ab9c39c0ca60894918440993da1cab..2a9e89e2d37512032a8dbc16e6ef47d725b0178a 100644
--- a/server/router/system/sys_dictionary.go
+++ b/server/router/system/sys_dictionary.go
@@ -11,12 +11,15 @@ type DictionaryRouter struct {
func (s *DictionaryRouter) InitSysDictionaryRouter(Router *gin.RouterGroup) {
sysDictionaryRouter := Router.Group("sysDictionary").Use(middleware.OperationRecord())
+ sysDictionaryRouterWithoutRecord := Router.Group("sysDictionary")
var sysDictionaryApi = v1.ApiGroupApp.SystemApiGroup.DictionaryApi
{
sysDictionaryRouter.POST("createSysDictionary", sysDictionaryApi.CreateSysDictionary) // 新建SysDictionary
sysDictionaryRouter.DELETE("deleteSysDictionary", sysDictionaryApi.DeleteSysDictionary) // 删除SysDictionary
sysDictionaryRouter.PUT("updateSysDictionary", sysDictionaryApi.UpdateSysDictionary) // 更新SysDictionary
- sysDictionaryRouter.GET("findSysDictionary", sysDictionaryApi.FindSysDictionary) // 根据ID获取SysDictionary
- sysDictionaryRouter.GET("getSysDictionaryList", sysDictionaryApi.GetSysDictionaryList) // 获取SysDictionary列表
+ }
+ {
+ sysDictionaryRouterWithoutRecord.GET("findSysDictionary", sysDictionaryApi.FindSysDictionary) // 根据ID获取SysDictionary
+ sysDictionaryRouterWithoutRecord.GET("getSysDictionaryList", sysDictionaryApi.GetSysDictionaryList) // 获取SysDictionary列表
}
}
diff --git a/server/router/system/sys_dictionary_detail.go b/server/router/system/sys_dictionary_detail.go
index a126714561fddf08ca892a8099a9bc3c55b4f540..c9a4d8bf68d17898713214f02f7558cca1a321c4 100644
--- a/server/router/system/sys_dictionary_detail.go
+++ b/server/router/system/sys_dictionary_detail.go
@@ -11,12 +11,15 @@ type DictionaryDetailRouter struct {
func (s *DictionaryDetailRouter) InitSysDictionaryDetailRouter(Router *gin.RouterGroup) {
dictionaryDetailRouter := Router.Group("sysDictionaryDetail").Use(middleware.OperationRecord())
+ dictionaryDetailRouterWithoutRecord := Router.Group("sysDictionaryDetail")
var sysDictionaryDetailApi = v1.ApiGroupApp.SystemApiGroup.DictionaryDetailApi
{
dictionaryDetailRouter.POST("createSysDictionaryDetail", sysDictionaryDetailApi.CreateSysDictionaryDetail) // 新建SysDictionaryDetail
dictionaryDetailRouter.DELETE("deleteSysDictionaryDetail", sysDictionaryDetailApi.DeleteSysDictionaryDetail) // 删除SysDictionaryDetail
dictionaryDetailRouter.PUT("updateSysDictionaryDetail", sysDictionaryDetailApi.UpdateSysDictionaryDetail) // 更新SysDictionaryDetail
- dictionaryDetailRouter.GET("findSysDictionaryDetail", sysDictionaryDetailApi.FindSysDictionaryDetail) // 根据ID获取SysDictionaryDetail
- dictionaryDetailRouter.GET("getSysDictionaryDetailList", sysDictionaryDetailApi.GetSysDictionaryDetailList) // 获取SysDictionaryDetail列表
+ }
+ {
+ dictionaryDetailRouterWithoutRecord.GET("findSysDictionaryDetail", sysDictionaryDetailApi.FindSysDictionaryDetail) // 根据ID获取SysDictionaryDetail
+ dictionaryDetailRouterWithoutRecord.GET("getSysDictionaryDetailList", sysDictionaryDetailApi.GetSysDictionaryDetailList) // 获取SysDictionaryDetail列表
}
}
diff --git a/server/router/system/sys_jwt.go b/server/router/system/sys_jwt.go
index 735f2ad9b5944584e27275bba777e91025dbeafb..68713cd997bdb232c94e5d7d4ae1c1eccaabc713 100644
--- a/server/router/system/sys_jwt.go
+++ b/server/router/system/sys_jwt.go
@@ -2,7 +2,6 @@ package system
import (
v1 "github.com/flipped-aurora/gin-vue-admin/server/api/v1"
- "github.com/flipped-aurora/gin-vue-admin/server/middleware"
"github.com/gin-gonic/gin"
)
@@ -10,7 +9,7 @@ type JwtRouter struct {
}
func (s *JwtRouter) InitJwtRouter(Router *gin.RouterGroup) {
- jwtRouter := Router.Group("jwt").Use(middleware.OperationRecord())
+ jwtRouter := Router.Group("jwt")
var jwtApi = v1.ApiGroupApp.SystemApiGroup.JwtApi
{
jwtRouter.POST("jsonInBlacklist", jwtApi.JsonInBlacklist) // jwt加入黑名单
diff --git a/server/router/system/sys_menu.go b/server/router/system/sys_menu.go
index 8c545575a35f2ec3da82967018ee61cf7f0b8880..ecac63878d2f4d0b7726108431bf0b13a183a517 100644
--- a/server/router/system/sys_menu.go
+++ b/server/router/system/sys_menu.go
@@ -11,17 +11,20 @@ type MenuRouter struct {
func (s *MenuRouter) InitMenuRouter(Router *gin.RouterGroup) (R gin.IRoutes) {
menuRouter := Router.Group("menu").Use(middleware.OperationRecord())
+ menuRouterWithoutRecord := Router.Group("menu")
var authorityMenuApi = v1.ApiGroupApp.SystemApiGroup.AuthorityMenuApi
{
- menuRouter.POST("getMenu", authorityMenuApi.GetMenu) // 获取菜单树
- menuRouter.POST("getMenuList", authorityMenuApi.GetMenuList) // 分页获取基础menu列表
menuRouter.POST("addBaseMenu", authorityMenuApi.AddBaseMenu) // 新增菜单
- menuRouter.POST("getBaseMenuTree", authorityMenuApi.GetBaseMenuTree) // 获取用户动态路由
menuRouter.POST("addMenuAuthority", authorityMenuApi.AddMenuAuthority) // 增加menu和角色关联关系
- menuRouter.POST("getMenuAuthority", authorityMenuApi.GetMenuAuthority) // 获取指定角色menu
menuRouter.POST("deleteBaseMenu", authorityMenuApi.DeleteBaseMenu) // 删除菜单
menuRouter.POST("updateBaseMenu", authorityMenuApi.UpdateBaseMenu) // 更新菜单
- menuRouter.POST("getBaseMenuById", authorityMenuApi.GetBaseMenuById) // 根据id获取菜单
+ }
+ {
+ menuRouterWithoutRecord.POST("getMenu", authorityMenuApi.GetMenu) // 获取菜单树
+ menuRouterWithoutRecord.POST("getMenuList", authorityMenuApi.GetMenuList) // 分页获取基础menu列表
+ menuRouterWithoutRecord.POST("getBaseMenuTree", authorityMenuApi.GetBaseMenuTree) // 获取用户动态路由
+ menuRouterWithoutRecord.POST("getMenuAuthority", authorityMenuApi.GetMenuAuthority) // 获取指定角色menu
+ menuRouterWithoutRecord.POST("getBaseMenuById", authorityMenuApi.GetBaseMenuById) // 根据id获取菜单
}
return menuRouter
}
diff --git a/server/router/system/sys_user.go b/server/router/system/sys_user.go
index 0dcc6f375d8526645098d77163c7c29cb34cdb10..d520379e8e33f18978b26c9993e700eabffb8bb2 100644
--- a/server/router/system/sys_user.go
+++ b/server/router/system/sys_user.go
@@ -11,15 +11,18 @@ type UserRouter struct {
func (s *UserRouter) InitUserRouter(Router *gin.RouterGroup) {
userRouter := Router.Group("user").Use(middleware.OperationRecord())
+ userRouterWithoutRecord := Router.Group("user")
var baseApi = v1.ApiGroupApp.SystemApiGroup.BaseApi
{
userRouter.POST("register", baseApi.Register) // 用户注册账号
userRouter.POST("changePassword", baseApi.ChangePassword) // 用户修改密码
- userRouter.POST("getUserList", baseApi.GetUserList) // 分页获取用户列表
userRouter.POST("setUserAuthority", baseApi.SetUserAuthority) // 设置用户权限
userRouter.DELETE("deleteUser", baseApi.DeleteUser) // 删除用户
userRouter.PUT("setUserInfo", baseApi.SetUserInfo) // 设置用户信息
userRouter.POST("setUserAuthorities", baseApi.SetUserAuthorities) // 设置用户权限组
- userRouter.GET("getUserInfo", baseApi.GetUserInfo) // 获取自身信息
+ }
+ {
+ userRouterWithoutRecord.POST("getUserList", baseApi.GetUserList) // 分页获取用户列表
+ userRouterWithoutRecord.GET("getUserInfo", baseApi.GetUserInfo) // 获取自身信息
}
}
diff --git a/server/service/example/exa_file_upload_download.go b/server/service/example/exa_file_upload_download.go
index 14d0df5a4db080cc33bbd22f2ae316a66df1b284..122cb6be1d8d58ceb0828a86307db186bd155957 100644
--- a/server/service/example/exa_file_upload_download.go
+++ b/server/service/example/exa_file_upload_download.go
@@ -62,9 +62,9 @@ func (e *FileUploadAndDownloadService) DeleteFile(file example.ExaFileUploadAndD
func (e *FileUploadAndDownloadService) GetFileRecordInfoList(info request.PageInfo) (err error, list interface{}, total int64) {
limit := info.PageSize
offset := info.PageSize * (info.Page - 1)
- db := global.GVA_DB
+ db := global.GVA_DB.Model(&example.ExaFileUploadAndDownload{})
var fileLists []example.ExaFileUploadAndDownload
- err = db.Find(&fileLists).Count(&total).Error
+ err = db.Count(&total).Error
if err != nil {
return
}
diff --git a/server/service/system/sys_autocode_history.go b/server/service/system/sys_autocode_history.go
index 8604af6ac9b6d0af5849f57ad35b1b28acad404b..542cc5a3ed7d0f589cb02a722982310fc4bffca1 100644
--- a/server/service/system/sys_autocode_history.go
+++ b/server/service/system/sys_autocode_history.go
@@ -108,9 +108,9 @@ func (autoCodeHistoryService *AutoCodeHistoryService) GetMeta(id uint) (string,
func (autoCodeHistoryService *AutoCodeHistoryService) GetSysHistoryPage(info request.PageInfo) (err error, list interface{}, total int64) {
limit := info.PageSize
offset := info.PageSize * (info.Page - 1)
- db := global.GVA_DB
+ db := global.GVA_DB.Model(&system.SysAutoCodeHistory{})
var fileLists []system.SysAutoCodeHistory
- err = db.Find(&fileLists).Count(&total).Error
+ err = db.Count(&total).Error
if err != nil {
return
}
diff --git a/server/service/system/sys_casbin.go b/server/service/system/sys_casbin.go
index d35f85170868cffbde092ad1a2502389cf39e137..c583ab07ebaf2b80221ad0714e70543a97ab9fb6 100644
--- a/server/service/system/sys_casbin.go
+++ b/server/service/system/sys_casbin.go
@@ -39,7 +39,7 @@ func (casbinService *CasbinService) UpdateCasbin(authorityId string, casbinInfos
}
e := casbinService.Casbin()
success, _ := e.AddPolicies(rules)
- if success == false {
+ if !success {
return errors.New("存在相同api,添加失败,请联系管理员")
}
return nil
diff --git a/server/source/menu.go b/server/source/menu.go
index 516e7ee6326700e39d25bf6d4f3930d4a9565fbd..69010175ddbd2411a81ef29c55d72be7b8654e8d 100644
--- a/server/source/menu.go
+++ b/server/source/menu.go
@@ -20,7 +20,7 @@ var menus = []system.SysBaseMenu{
{GVA_MODEL: global.GVA_MODEL{ID: 3, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "0", Path: "admin", Name: "superAdmin", Component: "view/superAdmin/index.vue", Sort: 3, Meta: system.Meta{Title: "超级管理员", Icon: "user-solid"}},
{GVA_MODEL: global.GVA_MODEL{ID: 4, CreatedAt: time.Now(), UpdatedAt: time.Now()}, 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"}},
{GVA_MODEL: global.GVA_MODEL{ID: 5, CreatedAt: time.Now(), UpdatedAt: time.Now()}, 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}},
- {GVA_MODEL: global.GVA_MODEL{ID: 6, CreatedAt: time.Now(), UpdatedAt: time.Now()}, 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}},
+ {GVA_MODEL: global.GVA_MODEL{ID: 6, CreatedAt: time.Now(), UpdatedAt: time.Now()}, 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}},
{GVA_MODEL: global.GVA_MODEL{ID: 7, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "3", Path: "user", Name: "user", Component: "view/superAdmin/user/user.vue", Sort: 4, Meta: system.Meta{Title: "用户管理", Icon: "coordinate"}},
{GVA_MODEL: global.GVA_MODEL{ID: 8, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: true, ParentId: "0", Path: "person", Name: "person", Component: "view/person/person.vue", Sort: 4, Meta: system.Meta{Title: "个人信息", Icon: "message-solid"}},
{GVA_MODEL: global.GVA_MODEL{ID: 9, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "0", Path: "example", Name: "example", Component: "view/example/index.vue", Sort: 6, Meta: system.Meta{Title: "示例文件", Icon: "s-management"}},
diff --git a/web/package-lock.json b/web/package-lock.json
index 83bf7462d95667ca0d9686a2ea9675bc223257dd..23b83e350ad952df9a55c834cd5dd9018c296d91 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -2662,8 +2662,7 @@
"balanced-match": {
"version": "1.0.2",
"resolved": "https://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbalanced-match%2Fdownload%2Fbalanced-match-1.0.2.tgz",
- "integrity": "sha1-6D46fj8wCzTLnYf2FfoMvzV2kO4=",
- "dev": true
+ "integrity": "sha1-6D46fj8wCzTLnYf2FfoMvzV2kO4="
},
"base": {
"version": "0.11.2",
@@ -2723,8 +2722,7 @@
"base64-js": {
"version": "1.5.1",
"resolved": "https://registry.npm.taobao.org/base64-js/download/base64-js-1.5.1.tgz",
- "integrity": "sha1-GxtEAWClv3rUC2UPCVljSBkDkwo=",
- "dev": true
+ "integrity": "sha1-GxtEAWClv3rUC2UPCVljSBkDkwo="
},
"batch": {
"version": "0.6.1",
@@ -2775,6 +2773,37 @@
"file-uri-to-path": "1.0.0"
}
},
+ "bl": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+ "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+ "requires": {
+ "buffer": "^5.5.0",
+ "inherits": "^2.0.4",
+ "readable-stream": "^3.4.0"
+ },
+ "dependencies": {
+ "buffer": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+ "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+ "requires": {
+ "base64-js": "^1.3.1",
+ "ieee754": "^1.1.13"
+ }
+ },
+ "readable-stream": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+ "requires": {
+ "inherits": "^2.0.3",
+ "string_decoder": "^1.1.1",
+ "util-deprecate": "^1.0.1"
+ }
+ }
+ }
+ },
"bluebird": {
"version": "3.7.2",
"resolved": "https://registry.npm.taobao.org/bluebird/download/bluebird-3.7.2.tgz",
@@ -2860,7 +2889,6 @@
"version": "1.1.11",
"resolved": "https://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.11.tgz",
"integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=",
- "dev": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -3020,8 +3048,7 @@
"buffer-from": {
"version": "1.1.2",
"resolved": "https://registry.nlark.com/buffer-from/download/buffer-from-1.1.2.tgz",
- "integrity": "sha1-KxRqb9cugLT1XSVfNe1Zo6mkG9U=",
- "dev": true
+ "integrity": "sha1-KxRqb9cugLT1XSVfNe1Zo6mkG9U="
},
"buffer-indexof": {
"version": "1.1.1",
@@ -3584,6 +3611,15 @@
"integrity": "sha1-/UhehMA+tIgcIHIrpIA16FMa6zM=",
"dev": true
},
+ "commist": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/commist/-/commist-1.1.0.tgz",
+ "integrity": "sha512-rraC8NXWOEjhADbZe9QBNzLAN5Q3fsTPQtBV+fEVj6xKIgDgNiEVE6ZNfHpZOqfQ21YUzfVNUXLOEZquYvQPPg==",
+ "requires": {
+ "leven": "^2.1.0",
+ "minimist": "^1.1.0"
+ }
+ },
"commondir": {
"version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/commondir/download/commondir-1.0.1.tgz",
@@ -3646,8 +3682,7 @@
"concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npm.taobao.org/concat-map/download/concat-map-0.0.1.tgz",
- "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
- "dev": true
+ "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
},
"concat-stream": {
"version": "1.6.2",
@@ -4834,7 +4869,6 @@
"version": "1.4.4",
"resolved": "https://registry.npm.taobao.org/end-of-stream/download/end-of-stream-1.4.4.tgz",
"integrity": "sha1-WuZKX0UFe682JuwU2gyl5LJDHrA=",
- "dev": true,
"requires": {
"once": "^1.4.0"
}
@@ -5781,8 +5815,7 @@
"fs.realpath": {
"version": "1.0.0",
"resolved": "https://registry.npm.taobao.org/fs.realpath/download/fs.realpath-1.0.0.tgz",
- "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
- "dev": true
+ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
},
"fsevents": {
"version": "2.3.2",
@@ -5861,7 +5894,6 @@
"version": "7.1.7",
"resolved": "https://registry.nlark.com/glob/download/glob-7.1.7.tgz",
"integrity": "sha1-Oxk+kjPwHULQs/eClLvutBj5SpA=",
- "dev": true,
"requires": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
@@ -6063,6 +6095,27 @@
"integrity": "sha1-hK5l+n6vsWX922FWauFLrwVmTw8=",
"dev": true
},
+ "help-me": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/help-me/-/help-me-3.0.0.tgz",
+ "integrity": "sha512-hx73jClhyk910sidBB7ERlnhMlFsJJIBqSVMFDwPN8o2v9nmp5KgLq1Xz1Bf1fCMMZ6mPrX159iG0VLy/fPMtQ==",
+ "requires": {
+ "glob": "^7.1.6",
+ "readable-stream": "^3.6.0"
+ },
+ "dependencies": {
+ "readable-stream": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+ "requires": {
+ "inherits": "^2.0.3",
+ "string_decoder": "^1.1.1",
+ "util-deprecate": "^1.0.1"
+ }
+ }
+ }
+ },
"hex-color-regex": {
"version": "1.1.0",
"resolved": "https://registry.npm.taobao.org/hex-color-regex/download/hex-color-regex-1.1.0.tgz",
@@ -6407,8 +6460,7 @@
"ieee754": {
"version": "1.2.1",
"resolved": "https://registry.npm.taobao.org/ieee754/download/ieee754-1.2.1.tgz?cache=0&sync_timestamp=1603841204911&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fieee754%2Fdownload%2Fieee754-1.2.1.tgz",
- "integrity": "sha1-jrehCmP/8l0VpXsAFYbRd9Gw01I=",
- "dev": true
+ "integrity": "sha1-jrehCmP/8l0VpXsAFYbRd9Gw01I="
},
"iferr": {
"version": "0.1.5",
@@ -6527,7 +6579,6 @@
"version": "1.0.6",
"resolved": "https://registry.npm.taobao.org/inflight/download/inflight-1.0.6.tgz",
"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
- "dev": true,
"requires": {
"once": "^1.3.0",
"wrappy": "1"
@@ -6536,8 +6587,7 @@
"inherits": {
"version": "2.0.4",
"resolved": "https://registry.npm.taobao.org/inherits/download/inherits-2.0.4.tgz?cache=0&sync_timestamp=1560975547815&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Finherits%2Fdownload%2Finherits-2.0.4.tgz",
- "integrity": "sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w=",
- "dev": true
+ "integrity": "sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w="
},
"inquirer": {
"version": "7.3.3",
@@ -7208,6 +7258,11 @@
"launch-editor": "^2.2.1"
}
},
+ "leven": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz",
+ "integrity": "sha1-wuep93IJTe6dNCAq6KzORoeHVYA="
+ },
"levn": {
"version": "0.3.0",
"resolved": "https://registry.npm.taobao.org/levn/download/levn-0.3.0.tgz",
@@ -7626,7 +7681,6 @@
"version": "3.0.4",
"resolved": "https://registry.npm.taobao.org/minimatch/download/minimatch-3.0.4.tgz",
"integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
- "dev": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -7634,8 +7688,7 @@
"minimist": {
"version": "1.2.5",
"resolved": "https://registry.npm.taobao.org/minimist/download/minimist-1.2.5.tgz?cache=0&sync_timestamp=1584051509720&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fminimist%2Fdownload%2Fminimist-1.2.5.tgz",
- "integrity": "sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI=",
- "dev": true
+ "integrity": "sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI="
},
"minipass": {
"version": "3.1.3",
@@ -7721,6 +7774,76 @@
"run-queue": "^1.0.3"
}
},
+ "mqtt": {
+ "version": "4.2.8",
+ "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-4.2.8.tgz",
+ "integrity": "sha512-DJYjlXODVXtSDecN8jnNzi6ItX3+ufGsEs9OB3YV24HtkRrh7kpx8L5M1LuyF0KzaiGtWr2PzDcMGAY60KGOSA==",
+ "requires": {
+ "commist": "^1.0.0",
+ "concat-stream": "^2.0.0",
+ "debug": "^4.1.1",
+ "duplexify": "^4.1.1",
+ "help-me": "^3.0.0",
+ "inherits": "^2.0.3",
+ "minimist": "^1.2.5",
+ "mqtt-packet": "^6.8.0",
+ "pump": "^3.0.0",
+ "readable-stream": "^3.6.0",
+ "reinterval": "^1.1.0",
+ "split2": "^3.1.0",
+ "ws": "^7.5.0",
+ "xtend": "^4.0.2"
+ },
+ "dependencies": {
+ "concat-stream": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
+ "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
+ "requires": {
+ "buffer-from": "^1.0.0",
+ "inherits": "^2.0.3",
+ "readable-stream": "^3.0.2",
+ "typedarray": "^0.0.6"
+ }
+ },
+ "duplexify": {
+ "version": "4.1.2",
+ "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz",
+ "integrity": "sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==",
+ "requires": {
+ "end-of-stream": "^1.4.1",
+ "inherits": "^2.0.3",
+ "readable-stream": "^3.1.1",
+ "stream-shift": "^1.0.0"
+ }
+ },
+ "readable-stream": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+ "requires": {
+ "inherits": "^2.0.3",
+ "string_decoder": "^1.1.1",
+ "util-deprecate": "^1.0.1"
+ }
+ },
+ "ws": {
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
+ "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w=="
+ }
+ }
+ },
+ "mqtt-packet": {
+ "version": "6.10.0",
+ "resolved": "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.10.0.tgz",
+ "integrity": "sha512-ja8+mFKIHdB1Tpl6vac+sktqy3gA8t9Mduom1BA75cI+R9AHnZOiaBQwpGiWnaVJLDGRdNhQmFaAqd7tkKSMGA==",
+ "requires": {
+ "bl": "^4.0.2",
+ "debug": "^4.1.1",
+ "process-nextick-args": "^2.0.1"
+ }
+ },
"ms": {
"version": "2.1.2",
"resolved": "https://registry.nlark.com/ms/download/ms-2.1.2.tgz",
@@ -8098,7 +8221,6 @@
"version": "1.4.0",
"resolved": "https://registry.npm.taobao.org/once/download/once-1.4.0.tgz",
"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
- "dev": true,
"requires": {
"wrappy": "1"
}
@@ -8394,8 +8516,7 @@
"path-is-absolute": {
"version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/path-is-absolute/download/path-is-absolute-1.0.1.tgz",
- "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
- "dev": true
+ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
},
"path-is-inside": {
"version": "1.0.2",
@@ -9208,8 +9329,7 @@
"process-nextick-args": {
"version": "2.0.1",
"resolved": "https://registry.npm.taobao.org/process-nextick-args/download/process-nextick-args-2.0.1.tgz",
- "integrity": "sha1-eCDZsWEgzFXKmud5JoCufbptf+I=",
- "dev": true
+ "integrity": "sha1-eCDZsWEgzFXKmud5JoCufbptf+I="
},
"progress": {
"version": "2.0.3",
@@ -9277,7 +9397,6 @@
"version": "3.0.0",
"resolved": "https://registry.npm.taobao.org/pump/download/pump-3.0.0.tgz",
"integrity": "sha1-tKIRaBW94vTh6mAjVOjHVWUQemQ=",
- "dev": true,
"requires": {
"end-of-stream": "^1.1.0",
"once": "^1.3.1"
@@ -9554,6 +9673,11 @@
}
}
},
+ "reinterval": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/reinterval/-/reinterval-1.1.0.tgz",
+ "integrity": "sha1-M2Hs+jymwYKDOA3Qu5VG85D17Oc="
+ },
"relateurl": {
"version": "0.2.7",
"resolved": "https://registry.npm.taobao.org/relateurl/download/relateurl-0.2.7.tgz",
@@ -9843,8 +9967,7 @@
"safe-buffer": {
"version": "5.1.2",
"resolved": "https://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.1.2.tgz?cache=0&sync_timestamp=1589129010497&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsafe-buffer%2Fdownload%2Fsafe-buffer-5.1.2.tgz",
- "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=",
- "dev": true
+ "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0="
},
"safe-regex": {
"version": "1.1.0",
@@ -10524,6 +10647,26 @@
"extend-shallow": "^3.0.0"
}
},
+ "split2": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
+ "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
+ "requires": {
+ "readable-stream": "^3.0.0"
+ },
+ "dependencies": {
+ "readable-stream": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+ "requires": {
+ "inherits": "^2.0.3",
+ "string_decoder": "^1.1.1",
+ "util-deprecate": "^1.0.1"
+ }
+ }
+ }
+ },
"sprintf-js": {
"version": "1.0.3",
"resolved": "https://registry.npm.taobao.org/sprintf-js/download/sprintf-js-1.0.3.tgz",
@@ -10631,8 +10774,7 @@
"stream-shift": {
"version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/stream-shift/download/stream-shift-1.0.1.tgz?cache=0&sync_timestamp=1576147178936&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstream-shift%2Fdownload%2Fstream-shift-1.0.1.tgz",
- "integrity": "sha1-1wiCgVWasneEJCebCHfaPDktWj0=",
- "dev": true
+ "integrity": "sha1-1wiCgVWasneEJCebCHfaPDktWj0="
},
"strict-uri-encode": {
"version": "1.1.0",
@@ -10681,7 +10823,6 @@
"version": "1.1.1",
"resolved": "https://registry.npm.taobao.org/string_decoder/download/string_decoder-1.1.1.tgz?cache=0&sync_timestamp=1565170823020&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring_decoder%2Fdownload%2Fstring_decoder-1.1.1.tgz",
"integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
- "dev": true,
"requires": {
"safe-buffer": "~5.1.0"
}
@@ -11193,8 +11334,7 @@
"typedarray": {
"version": "0.0.6",
"resolved": "https://registry.npm.taobao.org/typedarray/download/typedarray-0.0.6.tgz",
- "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
- "dev": true
+ "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
},
"uglify-js": {
"version": "3.4.10",
@@ -11452,8 +11592,7 @@
"util-deprecate": {
"version": "1.0.2",
"resolved": "https://registry.npm.taobao.org/util-deprecate/download/util-deprecate-1.0.2.tgz",
- "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
- "dev": true
+ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
},
"util.promisify": {
"version": "1.0.1",
@@ -12517,8 +12656,7 @@
"wrappy": {
"version": "1.0.2",
"resolved": "https://registry.nlark.com/wrappy/download/wrappy-1.0.2.tgz",
- "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
- "dev": true
+ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
},
"write": {
"version": "1.0.3",
@@ -12541,8 +12679,7 @@
"xtend": {
"version": "4.0.2",
"resolved": "https://registry.npm.taobao.org/xtend/download/xtend-4.0.2.tgz",
- "integrity": "sha1-u3J3n1+kZRhrH0OPZ0+jR/2121Q=",
- "dev": true
+ "integrity": "sha1-u3J3n1+kZRhrH0OPZ0+jR/2121Q="
},
"y18n": {
"version": "4.0.3",
diff --git a/web/package.json b/web/package.json
index b32113d5f966f79d4052016a2c186e864ddf531c..faf96bca63704ff60c17b4d13d6108704de0817c 100644
--- a/web/package.json
+++ b/web/package.json
@@ -8,6 +8,7 @@
"preview": "vite preview"
},
"dependencies": {
+ "@element-plus/icons": "0.0.11",
"axios": "^0.19.2",
"core-js": "^3.6.5",
"echarts": "4.9.0",
diff --git a/web/src/api/sysOperationRecord.js b/web/src/api/sysOperationRecord.js
index fb64245c5d3c2256182ef2a732638dc311462a7d..d9150c2903475421d2231e6650ea293506035af1 100644
--- a/web/src/api/sysOperationRecord.js
+++ b/web/src/api/sysOperationRecord.js
@@ -9,15 +9,15 @@ import service from '@/utils/request'
// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
// @Router /sysOperationRecord/deleteSysOperationRecord [delete]
export const deleteSysOperationRecord = (data) => {
- return service({
- url: '/sysOperationRecord/deleteSysOperationRecord',
- method: 'delete',
- data
- })
+ return service({
+ url: '/sysOperationRecord/deleteSysOperationRecord',
+ method: 'delete',
+ data
+ })
}
// @Tags SysOperationRecord
-// @Summary 批量删除SysOperationRecord
+// @Summary 删除SysOperationRecord
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
@@ -25,11 +25,11 @@ export const deleteSysOperationRecord = (data) => {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
// @Router /sysOperationRecord/deleteSysOperationRecord [delete]
export const deleteSysOperationRecordByIds = (data) => {
- return service({
- url: '/sysOperationRecord/deleteSysOperationRecordByIds',
- method: 'delete',
- data
- })
+ return service({
+ url: '/sysOperationRecord/deleteSysOperationRecordByIds',
+ method: 'delete',
+ data
+ })
}
// @Tags SysOperationRecord
@@ -41,9 +41,9 @@ export const deleteSysOperationRecordByIds = (data) => {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /sysOperationRecord/getSysOperationRecordList [get]
export const getSysOperationRecordList = (params) => {
- return service({
- url: '/sysOperationRecord/getSysOperationRecordList',
- method: 'get',
- params
- })
-}
+ return service({
+ url: '/sysOperationRecord/getSysOperationRecordList',
+ method: 'get',
+ params
+ })
+}
\ No newline at end of file
diff --git a/web/src/api/workflowProcess.js b/web/src/api/workflowProcess.js
index 347df2a67b434f956de059c34975f4766a3823c3..8e1ca4cb5493bafdb96637b4040a8c5899155614 100644
--- a/web/src/api/workflowProcess.js
+++ b/web/src/api/workflowProcess.js
@@ -9,11 +9,11 @@ import service from '@/utils/request'
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /workflowProcess/createWorkflowProcess [post]
export const createWorkflowProcess = (data) => {
- return service({
- url: '/workflowProcess/createWorkflowProcess',
- method: 'post',
- data
- })
+ return service({
+ url: '/workflowProcess/createWorkflowProcess',
+ method: 'post',
+ data
+ })
}
// @Tags WorkflowProcess
@@ -25,11 +25,11 @@ export const createWorkflowProcess = (data) => {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
// @Router /workflowProcess/deleteWorkflowProcess [delete]
export const deleteWorkflowProcess = (data) => {
- return service({
- url: '/workflowProcess/deleteWorkflowProcess',
- method: 'delete',
- data
- })
+ return service({
+ url: '/workflowProcess/deleteWorkflowProcess',
+ method: 'delete',
+ data
+ })
}
// @Tags WorkflowProcess
@@ -37,15 +37,15 @@ export const deleteWorkflowProcess = (data) => {
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
-// @Param data body request.IdsReq true "批量删除WorkflowProcess"
+// @Param data body request.IdsReq true "删除WorkflowProcess"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
// @Router /workflowProcess/deleteWorkflowProcess [delete]
export const deleteWorkflowProcessByIds = (data) => {
- return service({
- url: '/workflowProcess/deleteWorkflowProcessByIds',
- method: 'delete',
- data
- })
+ return service({
+ url: '/workflowProcess/deleteWorkflowProcessByIds',
+ method: 'delete',
+ data
+ })
}
// @Tags WorkflowProcess
@@ -57,11 +57,11 @@ export const deleteWorkflowProcessByIds = (data) => {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}"
// @Router /workflowProcess/updateWorkflowProcess [put]
export const updateWorkflowProcess = (data) => {
- return service({
- url: '/workflowProcess/updateWorkflowProcess',
- method: 'put',
- data
- })
+ return service({
+ url: '/workflowProcess/updateWorkflowProcess',
+ method: 'put',
+ data
+ })
}
// @Tags WorkflowProcess
@@ -73,11 +73,11 @@ export const updateWorkflowProcess = (data) => {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
// @Router /workflowProcess/findWorkflowProcess [get]
export const findWorkflowProcess = (params) => {
- return service({
- url: '/workflowProcess/findWorkflowProcess',
- method: 'get',
- params
- })
+ return service({
+ url: '/workflowProcess/findWorkflowProcess',
+ method: 'get',
+ params
+ })
}
// @Tags WorkflowProcess
@@ -89,11 +89,11 @@ export const findWorkflowProcess = (params) => {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /workflowProcess/getWorkflowProcessList [get]
export const getWorkflowProcessList = (params) => {
- return service({
- url: '/workflowProcess/getWorkflowProcessList',
- method: 'get',
- params
- })
+ return service({
+ url: '/workflowProcess/getWorkflowProcessList',
+ method: 'get',
+ params
+ })
}
// @Tags WorkflowProcess
@@ -105,11 +105,11 @@ export const getWorkflowProcessList = (params) => {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
// @Router /workflowProcess/findWorkflowStep [get]
export const findWorkflowStep = (params) => {
- return service({
- url: '/workflowProcess/findWorkflowStep',
- method: 'get',
- params
- })
+ return service({
+ url: '/workflowProcess/findWorkflowStep',
+ method: 'get',
+ params
+ })
}
// @Tags ExaWfLeave
@@ -120,12 +120,12 @@ export const findWorkflowStep = (params) => {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /workflowProcess/startWorkflow [post]
export const startWorkflow = (data, params = { businessType: data.wf.businessType }) => {
- return service({
- url: '/workflowProcess/startWorkflow',
- method: 'post',
- data,
- params
- })
+ return service({
+ url: '/workflowProcess/startWorkflow',
+ method: 'post',
+ data,
+ params
+ })
}
// @Tags ExaWfLeave
@@ -136,12 +136,12 @@ export const startWorkflow = (data, params = { businessType: data.wf.businessTyp
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /workflowProcess/completeWorkflowMove [post]
export const completeWorkflowMove = (data, params = { businessType: data.wf.businessType }) => {
- return service({
- url: '/workflowProcess/completeWorkflowMove',
- method: 'post',
- data,
- params
- })
+ return service({
+ url: '/workflowProcess/completeWorkflowMove',
+ method: 'post',
+ data,
+ params
+ })
}
// @Tags WorkflowProcess
@@ -152,10 +152,10 @@ export const completeWorkflowMove = (data, params = { businessType: data.wf.busi
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /workflowProcess/getMyStated [get]
export const getMyStated = () => {
- return service({
- url: '/workflowProcess/getMyStated',
- method: 'get'
- })
+ return service({
+ url: '/workflowProcess/getMyStated',
+ method: 'get'
+ })
}
// @Tags WorkflowProcess
@@ -166,10 +166,10 @@ export const getMyStated = () => {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /workflowProcess/getMyNeed [get]
export const getMyNeed = () => {
- return service({
- url: '/workflowProcess/getMyNeed',
- method: 'get'
- })
+ return service({
+ url: '/workflowProcess/getMyNeed',
+ method: 'get'
+ })
}
// @Tags WorkflowProcess
@@ -181,9 +181,9 @@ export const getMyNeed = () => {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /workflowProcess/getWorkflowMoveByID [get]
export const getWorkflowMoveByID = (params) => {
- return service({
- url: '/workflowProcess/getWorkflowMoveByID',
- method: 'get',
- params
- })
-}
+ return service({
+ url: '/workflowProcess/getWorkflowMoveByID',
+ method: 'get',
+ params
+ })
+}
\ No newline at end of file
diff --git a/web/src/components/customPic/index.vue b/web/src/components/customPic/index.vue
index edb84e71ee52424465d0ead17392c77e4d23993c..7463e3e4fae4ce52c6bb3c0015f135ce9bbd0134 100644
--- a/web/src/components/customPic/index.vue
+++ b/web/src/components/customPic/index.vue
@@ -1,8 +1,8 @@
- ![]()
@@ -66,6 +66,7 @@ export default {
display: flex;
justify-content: center;
align-items: center;
+ margin-right: 8px;
}
.file{
width: 80px;
diff --git a/web/src/components/dashbordTable/dashbordTable.vue b/web/src/components/dashbordTable/dashbordTable.vue
deleted file mode 100644
index 13e161744cf23ff3a2590fe3c82bd894c3a49ba1..0000000000000000000000000000000000000000
--- a/web/src/components/dashbordTable/dashbordTable.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
- 查询
- 新增
-
- 批量删除
-
-
-
确定要删除吗？
-
- 取消
- 确定
-
-
-
+
+
+ {{ "{{ formatDate(scope.row.CreatedAt) }}" }}
+
+ {{- range .Fields}}
+ {{- if .DictType}}
+
+
+ {{"{{"}} filterDict(scope.row.{{.FieldJson}},"{{.DictType}}") {{"}}"}}
+
+
+ {{- else if eq .FieldType "bool" }}
+
+ {{"{{"}} formatBoolean(scope.row.{{.FieldJson}}) {{"}}"}}
+ {{- else }}
+
+
+ 变更
+ 删除
+
+
+
+
+ 新增
+
+ 删除
+
+
+
+ 确定要删除吗？
+
+ 取消
+ 确定
+
+
+
+
+
-
-
-
-
-
-
-
diff --git a/web/src/components/warningBar/warningBar.vue b/web/src/components/warningBar/warningBar.vue
new file mode 100644
index 0000000000000000000000000000000000000000..e485752218ade023bc6063c3907c3d585b9c7457
--- /dev/null
+++ b/web/src/components/warningBar/warningBar.vue
@@ -0,0 +1,43 @@
+
+
+
+
+
diff --git a/web/src/core/gin-vue-admin.js b/web/src/core/gin-vue-admin.js
index 4e31d7729dd20fbe0bf8f315cf538e6b08feeab3..0a1270332f43b82b12769fba99d4335437e6ee9f 100644
--- a/web/src/core/gin-vue-admin.js
+++ b/web/src/core/gin-vue-admin.js
@@ -6,13 +6,13 @@
import { register } from './global'
export const run = function(app) {
- register(app)
- console.log(`
+ register(app)
+ console.log(`
欢迎使用 Gin-Vue-Admin
- 当前版本:V2.4.5 beta
+ 当前版本: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
`)
-}
\ No newline at end of file
+}
diff --git a/web/src/permission.js b/web/src/permission.js
index 91caab563530cfd4946cd648e054fd1041e9cdc7..51747d0d7a7dafd51a5c4b98af901787534eb009 100644
--- a/web/src/permission.js
+++ b/web/src/permission.js
@@ -9,7 +9,7 @@ const getRouter = async() => {
await store.dispatch('router/SetAsyncRouter')
await store.dispatch('user/GetUserInfo')
const asyncRouters = store.getters['router/asyncRouters']
- asyncRouters.map(asyncRouter => {
+ asyncRouters.forEach(asyncRouter => {
router.addRoute(asyncRouter)
})
}
diff --git a/web/src/store/module/dictionary.js b/web/src/store/module/dictionary.js
index 533d206d6ae8d72963e790e5ab09ad679c941266..b71c2248f82c41e458f885a507fb2e5b49d9e0c9 100644
--- a/web/src/store/module/dictionary.js
+++ b/web/src/store/module/dictionary.js
@@ -21,7 +21,7 @@ export const dictionary = {
if (res.code === 0) {
const dictionaryMap = {}
const dict = []
- res.data.resysDictionary.sysDictionaryDetails && res.data.resysDictionary.sysDictionaryDetails.map(item => {
+ res.data.resysDictionary.sysDictionaryDetails && res.data.resysDictionary.sysDictionaryDetails.forEach(item => {
dict.push({
label: item.label,
value: item.value
diff --git a/web/src/store/module/router.js b/web/src/store/module/router.js
index 5f22b76d4284228364a53235e9c0ec702eb8ed31..e16f50df9f649b13dca4e9d1c7a44fd1708a8b62 100644
--- a/web/src/store/module/router.js
+++ b/web/src/store/module/router.js
@@ -5,7 +5,7 @@ import { asyncMenu } from '@/api/menu'
const routerList = []
const formatRouter = (routes) => {
- routes && routes.map(item => {
+ routes && routes.forEach(item => {
if ((!item.children || item.children.every(ch => ch.hidden)) && item.name !== '404' && !item.hidden) {
routerList.push({ label: item.meta.title, value: item.name })
}
diff --git a/web/src/store/module/user.js b/web/src/store/module/user.js
index e836a327cac75bba3f5ce73166596605b5a9ac9b..8f321c765eec9869988a8a56bf4202bbc148f93d 100644
--- a/web/src/store/module/user.js
+++ b/web/src/store/module/user.js
@@ -1,7 +1,6 @@
-import { login, getUserInfo } from '@/api/user'
+import { login, getUserInfo, setUserInfo } from '@/api/user'
import { jsonInBlacklist } from '@/api/jwt'
import router from '@/router/index'
-import { setUserInfo } from '@/api/user'
import { ElMessage } from 'element-plus'
export const user = {
@@ -13,7 +12,7 @@ export const user = {
headerImg: '',
authority: {},
sideMode: 'dark',
- activeColor: '#1890ff',
+ activeColor: '#0d84ff',
baseColor: '#fff'
},
token: '',
@@ -45,15 +44,9 @@ export const user = {
...userInfo
}
},
- ChangeActiveColor: async(state, val) => {
- state.userInfo.activeColor = val
- },
- ChangeSideMode: async(state, val) => {
+ ChangeSideMode: (state, val) => {
state.userInfo.sideMode = val
},
- ChangeBaseColor: (state, val) => {
- state.userInfo.baseColor = val
- }
},
actions: {
async GetUserInfo({ commit }) {
@@ -70,7 +63,7 @@ export const user = {
commit('setToken', res.data.token)
await dispatch('router/SetAsyncRouter', {}, { root: true })
const asyncRouters = rootGetters['router/asyncRouters']
- asyncRouters.map(asyncRouter => {
+ asyncRouters.forEach(asyncRouter => {
router.addRoute(asyncRouter)
})
// const redirect = router.history.current.query.redirect
@@ -89,16 +82,6 @@ export const user = {
commit('LoginOut')
}
},
- async changeActiveColor({ commit, state }, data) {
- const res = await setUserInfo({ activeColor: data, ID: state.userInfo.ID })
- if (res.code === 0) {
- commit('ChangeActiveColor', data)
- ElMessage({
- type: 'success',
- message: '设置成功'
- })
- }
- },
async changeSideMode({ commit, state }, data) {
const res = await setUserInfo({ sideMode: data, ID: state.userInfo.ID })
if (res.code === 0) {
@@ -109,16 +92,6 @@ export const user = {
})
}
},
- async changeBaseColor({ commit, state }, data) {
- const res = await setUserInfo({ baseColor: data, ID: state.userInfo.ID })
- if (res.code === 0) {
- commit('ChangeBaseColor', data)
- ElMessage({
- type: 'success',
- message: '设置成功'
- })
- }
- }
},
getters: {
userInfo(state) {
@@ -150,7 +123,7 @@ export const user = {
},
activeColor(state) {
if (state.userInfo.sideMode === 'dark' || state.userInfo.sideMode === 'light') {
- return '#1890ff'
+ return '#0d84ff'
}
return state.userInfo.activeColor
}
diff --git a/web/src/style/animition.scss b/web/src/style/animition.scss
deleted file mode 100644
index 29833fe89cbb879c6d632b1c4fea7f5e843334af..0000000000000000000000000000000000000000
--- a/web/src/style/animition.scss
+++ /dev/null
@@ -1,1044 +0,0 @@
-body {
- background-color: #fffaf0;
-}
-
-ul {
- padding: 0;
-}
-
-li {
- list-style: none;
-}
-
-.container {
- background-image: linear-gradient(to top, #fcf3d8 30%, #eaafc8, #654ea3);
- background-image: -webkit-linear-gradient(to bottom, #fcf3d8 30%, #eaafc8, #654ea3);
- background-color: #654ea3;
- height: 450px;
- width: 450px;
- border-radius: 100%;
- position: relative;
- transform: translate(-50%, -50%);
- left: 50%;
- top: 225px;
- overflow: hidden;
-}
-
-.mountain-range {
- position: absolute;
- width: 100%;
- height: 100px;
- top: 50%;
- display: flex;
- justify-content: center;
- padding: 0;
-}
-
-.mountain-range .mountain:nth-child(1) {
- width: 0;
- height: 0;
- margin-top: 32px;
- margin-left: -60%;
- border-left: 183px solid transparent;
- border-right: 183px solid transparent;
- border-bottom: 91.5px solid #75bbff;
-}
-
-.mountain-range .mountain:nth-child(2) {
- width: 0;
- height: 0;
- margin-top: 27px;
- margin-left: -60%;
- border-left: 195px solid transparent;
- border-right: 195px solid transparent;
- border-bottom: 97.5px solid #75bbff;
-}
-
-.mountain-range .mountain:nth-child(3) {
- width: 0;
- height: 0;
- margin-top: 24px;
- margin-left: -60%;
- border-left: 198px solid transparent;
- border-right: 198px solid transparent;
- border-bottom: 99px solid #75bbff;
-}
-
-.mountain-range .mountain:nth-child(4) {
- width: 0;
- height: 0;
- margin-top: 35px;
- margin-left: -60%;
- border-left: 154px solid transparent;
- border-right: 154px solid transparent;
- border-bottom: 77px solid #75bbff;
-}
-
-.mountain-range .mountain:nth-child(5) {
- width: 0;
- height: 0;
- margin-top: 20px;
- margin-left: -60%;
- border-left: 150px solid transparent;
- border-right: 150px solid transparent;
- border-bottom: 75px solid #75bbff;
-}
-
-.mountain-range .mountain:nth-child(6) {
- width: 0;
- height: 0;
- margin-top: 33px;
- margin-left: -60%;
- border-left: 198px solid transparent;
- border-right: 198px solid transparent;
- border-bottom: 99px solid #75bbff;
-}
-
-.mountain-range .mountain:nth-child(7) {
- width: 0;
- height: 0;
- margin-top: 37px;
- margin-left: -60%;
- border-left: 152px solid transparent;
- border-right: 152px solid transparent;
- border-bottom: 76px solid #75bbff;
-}
-
-.mountain-range .mountain:nth-child(8) {
- width: 0;
- height: 0;
- margin-top: 27px;
- margin-left: -60%;
- border-left: 166px solid transparent;
- border-right: 166px solid transparent;
- border-bottom: 83px solid #75bbff;
-}
-
-.forest {
- position: absolute;
- width: 100%;
- height: 100px;
- top: 65%;
-}
-
-.forest .hill {
- position: absolute;
- background-color: #82d9a2;
-}
-
-.forest .hill:nth-child(1) {
- width: 600px;
- height: 300px;
- top: -10px;
- left: -150px;
- border-top-left-radius: 300px 150px;
- border-top-right-radius: 300px 150px;
- border-bottom-left-radius: 300px 150px;
- border-bottom-right-radius: 300px 150px;
- box-shadow: inset 20px 30px 50px #2d79a0;
-}
-
-.forest .hill:nth-child(2) {
- width: 500px;
- height: 250px;
- top: -5px;
- left: 100px;
- border-top-left-radius: 250px 125px;
- border-top-right-radius: 250px 125px;
- border-bottom-left-radius: 250px 125px;
- border-bottom-right-radius: 250px 125px;
- box-shadow: inset 20px 30px 50px #2d79a0;
-}
-
-.forest .hill:nth-child(3) {
- width: 500px;
- height: 250px;
- top: 17px;
- left: -180px;
- border-top-left-radius: 250px 125px;
- border-top-right-radius: 250px 125px;
- border-bottom-left-radius: 250px 125px;
- border-bottom-right-radius: 250px 125px;
- box-shadow: inset 20px 30px 50px #2d79a0;
-}
-
-.grass {
- position: absolute;
- width: 600px;
- height: 300px;
- border-radius: 300px / 150px;
- top: 75%;
- left: -100px;
- background: #82d9a2;
- box-shadow: inset 20px 30px 60px #2d79a0;
-}
-
-.pokemon {
- position: absolute;
- width: 300px;
- height: 110px;
- left: calc(53% - 150px);
-}
-
-.poke {
- position: absolute;
- width: 100px;
- height: 100px;
-}
-
-#bulbasaur:before {
- content: '';
- position: absolute;
- width: 100px;
- height: 50px;
- background: rgba(0, 0, 0, 0.2);
- border-radius: 100%;
- top: 50px;
- left: 15px;
- transform: rotate(-15deg);
-}
-
-#bulbasaur .head {
- position: absolute;
- width: 60px;
- height: 45px;
- background-color: #00efd0;
- border-top-left-radius: 50% 25px;
- border-top-right-radius: 50% 25px;
- border-bottom-left-radius: 18px;
- border-bottom-right-radius: 18px;
- left: 55px;
-}
-
-#bulbasaur .ear {
- position: absolute;
- height: 20px;
- width: 23px;
- background-color: #00efd0;
- border-top-left-radius: 50px 90px;
- border-top-right-radius: 50px 90px;
- transform-origin: center bottom;
-}
-
-#bulbasaur .ear:nth-child(1) {
- transform: rotate(-45deg);
- left: 52px;
- top: -5px;
- animation: rotateLeftBulbEar 2s alternate infinite;
-}
-
-#bulbasaur .ear:nth-child(2) {
- transform: rotate(45deg);
- left: 87px;
- top: -5px;
- animation: rotateRightBulbEar 2s alternate infinite;
-}
-
-#bulbasaur .bulba-body {
- position: relative;
- width: 65px;
- height: 55px;
- background-color: #00efd0;
- left: 42px;
- top: 20px;
- border-radius: 100%;
- box-shadow: inset 10px -10px #00dbbe;
- animation: bodyBreathe 2s alternate infinite;
-}
-
-#bulbasaur .bulba-body:before,
-#bulbasaur .bulba-body:after {
- content: '';
- position: absolute;
-}
-
-#bulbasaur .bulba-body:before {
- width: 10px;
- height: 13px;
- top: 33px;
- left: 8px;
- background-color: #00c6ac;
- border-bottom-left-radius: 100%;
- border-bottom-right-radius: 30%;
- border-top-right-radius: 30%;
- border-top-left-radius: 50%;
- transform: rotate(-45deg);
-}
-
-#bulbasaur .bulba-body:after {
- width: 8px;
- height: 8px;
- top: 30px;
- left: 53px;
- background-color: #00dbbe;
- border-bottom-left-radius: 100%;
- border-bottom-right-radius: 30%;
- border-top-right-radius: 30%;
- border-top-left-radius: 50%;
- transform: rotate(65deg);
-}
-
-#bulbasaur .leg {
- position: absolute;
- width: 20px;
- height: 40px;
- background-color: #00efd0;
- border-bottom-left-radius: 35px 110%;
- border-bottom-right-radius: 35px 110%;
- box-shadow: inset 10px -20px #00d6ba;
- left: 90px;
- top: 30px;
-}
-
-#bulbasaur .bulbs {
- position: absolute;
- top: -1px;
- width: 55px;
- height: 55px;
- left: 50px;
- transform-origin: center;
- transform: rotate(45deg);
- z-index: 3;
- animation: bulbaBreathe 2s alternate infinite;
-}
-
-#bulbasaur .bulbs:before,
-#bulbasaur .bulbs:after {
- content: '';
- position: absolute;
- height: 45px;
- width: 45px;
- border-radius: 0 50% 50% 50%;
-}
-
-#bulbasaur .bulbs:before {
- transform: translate(-5px, 10px) rotate(7deg);
- background-color: #007061;
-}
-
-#bulbasaur .bulbs:after {
- transform: translate(10px, -5px) rotate(-7deg);
- background-color: #008a78;
-}
-
-#bulbasaur .bulb {
- position: absolute;
- top: 10px;
- right: 2px;
- left: 3px;
- width: 90%;
- height: 90%;
- border-radius: 0 50% 100% 50%;
- background-color: #00a38e;
- z-index: 4;
- box-shadow: inset 1px -5px #009480;
-}
-
-#pikachu {
- left: -.1em;
-}
-
-#pikachu:before {
- content: '';
- position: absolute;
- width: 60px;
- height: 80px;
- background: rgba(0, 0, 0, 0.2);
- border-radius: 100%;
- top: 50px;
- left: 115px;
- transform: rotate(40deg);
-}
-
-#pikachu .ear {
- position: absolute;
- height: 40px;
- width: 18px;
- background-color: #fff069;
- border-top-left-radius: 60px 150px;
- border-top-right-radius: 60px 150px;
- transform-origin: center bottom;
- overflow: hidden;
-}
-
-#pikachu .ear:nth-child(1) {
- transform: rotate(-35deg);
- left: 125px;
- top: -35px;
- animation: rotateLeftEar 1s alternate infinite;
-}
-
-#pikachu .ear:nth-child(1):after {
- content: '';
- position: absolute;
- background-color: #444;
- width: 150%;
- height: 15px;
- left: -8px;
- transform: rotate(-30deg);
-}
-
-#pikachu .ear:nth-child(2) {
- transform: rotate(50deg);
- left: 157px;
- top: -30px;
- animation: rotateRightEar 1s alternate infinite;
-}
-
-#pikachu .ear:nth-child(2):after {
- content: '';
- position: absolute;
- background-color: #444;
- width: 150%;
- height: 15px;
- left: 2px;
- transform: rotate(30deg);
-}
-
-#pikachu .hand {
- position: absolute;
- height: 38px;
- width: 15px;
- background-color: #fff069;
- border-top-left-radius: 60px 150px;
- border-top-right-radius: 60px 150px;
- transform-origin: center bottom;
- left: 123px;
- top: 5px;
- z-index: 5;
- transform: rotate(-40deg);
- animation: pikaPat .7s alternate infinite;
-}
-
-#pikachu .head {
- position: absolute;
- width: 60px;
- height: 45px;
- background-color: #fff069;
- border-top-left-radius: 50% 25px;
- border-top-right-radius: 50% 25px;
- border-bottom-left-radius: 18px;
- border-bottom-right-radius: 18px;
- left: 120px;
- width: 60px;
- height: 55px;
- top: -12px;
-}
-
-#pikachu .pika-body {
- position: absolute;
- width: 55px;
- height: 55px;
- background-color: #fff069;
- left: 122px;
- top: 20px;
- border-radius: 22px;
-}
-
-#pikachu .pika-body:before,
-#pikachu .pika-body:after {
- content: '';
- position: absolute;
- background-color: #9c5200;
- width: 70%;
- height: 7px;
- left: 13px;
- border-radius: 100%;
-}
-
-#pikachu .pika-body:before {
- top: 15px;
- z-index: 2;
-}
-
-#pikachu .pika-body:after {
- top: 30px;
-}
-
-#pikachu .pika-tail {
- position: absolute;
- height: 25px;
- width: 16px;
- background: #9c5200;
- border-radius: 5px;
- left: 150px;
- top: 40px;
- transform-origin: bottom center;
- transform: rotate(55deg);
- box-shadow: -2px 2px 1px rgba(68, 68, 68, 0.2);
- z-index: 2;
- animation: rotateTail 2s alternate infinite;
-}
-
-#pikachu .pika-tail:before,
-#pikachu .pika-tail:after {
- content: '';
- transform-origin: bottom center;
- position: absolute;
- background-color: #fff069;
-}
-
-#pikachu .pika-tail:before {
- height: 1.45rem;
- width: 1.4rem;
- top: -2rem;
- left: 0.25rem;
- transform: rotate(-90deg);
- border: 1px solid #9c5200;
- border-bottom-right-radius: 5px;
- z-index: 4;
- border-top: 1px solid #fff069;
-}
-
-#pikachu .pika-tail:after {
- background: #fff069;
- height: 3rem;
- width: 2rem;
- top: -2.8rem;
- left: -2.5rem;
- border-radius: 5px 5px 0 5px;
- border: 1px solid #9c5200;
-}
-
-.moon {
- position: absolute;
- width: 75px;
- height: 75px;
- background: #FFEFBA;
- background: -webkit-linear-gradient(135deg, #FFFFFF, #FFEFBA);
- background: linear-gradient(135deg, #FFFFFF, #FFEFBA);
- border: 5px solid #fffaf0;
- top: 10%;
- left: calc(50% - 45px);
- padding: 0;
- border-radius: 100%;
-}
-
-.moon li {
- position: absolute;
- border-radius: 100%;
-}
-
-.moon li:nth-child(1) {
- background: #ffe691;
- background: -webkit-linear-gradient(45deg, rgba(255, 250, 240, 0.1), #ffe691);
- background: linear-gradient(45deg, rgba(255, 250, 240, 0.1), #ffe691);
- width: 20px;
- height: 20px;
- left: 5px;
- top: 30px;
-}
-
-.moon li:nth-child(2) {
- background: #ffe691;
- background: -webkit-linear-gradient(to left, rgba(255, 250, 240, 0.1), #ffe691);
- background: linear-gradient(to left, rgba(255, 250, 240, 0.1), #ffe691);
- width: 35px;
- height: 35px;
- left: 35px;
- top: 35px;
-}
-
-.moon li:nth-child(3) {
- background: #ffe691;
- background: -webkit-linear-gradient(-120deg, rgba(255, 250, 240, 0.1), #ffe691);
- background: linear-gradient(-120deg, rgba(255, 250, 240, 0.1), #ffe691);
- width: 25px;
- height: 25px;
- left: 25px;
- top: 5px;
-}
-
-.sparkles {
- position: absolute;
- width: 120%;
- height: 190px;
- top: 30%;
- left: -45px;
-}
-
-.sparkles .sparkle {
- position: absolute;
- width: 11px;
- height: 11px;
- border-radius: 100%;
-}
-
-.sparkles .sparkle:nth-child(1) {
- background-color: #e9fbff;
- box-shadow: 0px 0px 10px #e9fbff;
-}
-
-.sparkles .sparkle:nth-child(2) {
- background-color: #e9fbff;
- box-shadow: 0px 0px 10px #e9fbff;
-}
-
-.sparkles .sparkle:nth-child(3) {
- background-color: #fffce6;
- box-shadow: 0px 0px 10px #fffce6;
-}
-
-.sparkles .sparkle:nth-child(4) {
- background-color: #e9fbff;
- box-shadow: 0px 0px 10px #e9fbff;
-}
-
-.sparkles .sparkle:nth-child(5) {
- background-color: #f3ffe4;
- box-shadow: 0px 0px 10px #f3ffe4;
-}
-
-.sparkles .sparkle:nth-child(6) {
- background-color: #fffce6;
- box-shadow: 0px 0px 10px #fffce6;
-}
-
-.sparkles .sparkle:nth-child(7) {
- background-color: #f3ffe4;
- box-shadow: 0px 0px 10px #f3ffe4;
-}
-
-.sparkles .sparkle:nth-child(8) {
- background-color: #f3ffe4;
- box-shadow: 0px 0px 10px #f3ffe4;
-}
-
-.sparkles .sparkle:nth-child(9) {
- background-color: #ffeefc;
- box-shadow: 0px 0px 10px #ffeefc;
-}
-
-.sparkles .sparkle:nth-child(10) {
- background-color: #fffce6;
- box-shadow: 0px 0px 10px #fffce6;
-}
-
-.sparkles .sparkle:nth-child(11) {
- background-color: #ffeefc;
- box-shadow: 0px 0px 10px #ffeefc;
-}
-
-.sparkles .sparkle:nth-child(12) {
- background-color: #f3ffe4;
- box-shadow: 0px 0px 10px #f3ffe4;
-}
-
-.sparkles .sparkle:nth-child(13) {
- background-color: #e9fbff;
- box-shadow: 0px 0px 10px #e9fbff;
-}
-
-.sparkles .sparkle:nth-child(14) {
- background-color: #f3ffe4;
- box-shadow: 0px 0px 10px #f3ffe4;
-}
-
-.sparkles .sparkle:nth-child(15) {
- background-color: #ffeefc;
- box-shadow: 0px 0px 10px #ffeefc;
-}
-
-.sparkles .sparkle:nth-child(16) {
- background-color: #f3ffe4;
- box-shadow: 0px 0px 10px #f3ffe4;
-}
-
-.sparkles .sparkle:nth-child(17) {
- background-color: #f3ffe4;
- box-shadow: 0px 0px 10px #f3ffe4;
-}
-
-.sparkles .sparkle:nth-child(18) {
- background-color: #ffeefc;
- box-shadow: 0px 0px 10px #ffeefc;
-}
-
-.sparkles .sparkle:nth-child(19) {
- background-color: #f3ffe4;
- box-shadow: 0px 0px 10px #f3ffe4;
-}
-
-.sparkles .sparkle:nth-child(20) {
- background-color: #ffeefc;
- box-shadow: 0px 0px 10px #ffeefc;
-}
-
-.sparkles .sparkle:nth-child(21) {
- background-color: #fffce6;
- box-shadow: 0px 0px 10px #fffce6;
-}
-
-.sparkles .sparkle:nth-child(22) {
- background-color: #f3ffe4;
- box-shadow: 0px 0px 10px #f3ffe4;
-}
-
-.sparkles .sparkle:nth-child(23) {
- background-color: #e9fbff;
- box-shadow: 0px 0px 10px #e9fbff;
-}
-
-.sparkles .sparkle:nth-child(24) {
- background-color: #fffce6;
- box-shadow: 0px 0px 10px #fffce6;
-}
-
-.sparkles .sparkle:nth-child(25) {
- background-color: #e9fbff;
- box-shadow: 0px 0px 10px #e9fbff;
-}
-
-.sparkles .sparkle:nth-child(26) {
- background-color: #ffeefc;
- box-shadow: 0px 0px 10px #ffeefc;
-}
-
-.sparkles .sparkle:nth-child(27) {
- background-color: #fffce6;
- box-shadow: 0px 0px 10px #fffce6;
-}
-
-.sparkles .sparkle:nth-child(28) {
- background-color: #e9fbff;
- box-shadow: 0px 0px 10px #e9fbff;
-}
-
-.sparkles .sparkle:nth-child(29) {
- background-color: #e9fbff;
- box-shadow: 0px 0px 10px #e9fbff;
-}
-
-.sparkles .sparkle:nth-child(30) {
- background-color: #ffeefc;
- box-shadow: 0px 0px 10px #ffeefc;
-}
-
-.sparkles .sparkle:nth-child(31) {
- background-color: #f3ffe4;
- box-shadow: 0px 0px 10px #f3ffe4;
-}
-
-.sparkles .sparkle:nth-child(32) {
- background-color: #f3ffe4;
- box-shadow: 0px 0px 10px #f3ffe4;
-}
-
-.one {
- left: 0;
- top: 0;
-}
-
-@keyframes flyOne {
- 95% {
- opacity: 1;
- }
- 100% {
- transform: translate(270px, 75px) scale(0);
- opacity: 0;
- }
-}
-
-.one:nth-child(1) {
- animation: flyOne 15s 0s infinite;
-}
-
-.one:nth-child(2) {
- animation: flyOne 15s 6.44s infinite;
-}
-
-.one:nth-child(3) {
- animation: flyOne 15s 12.88s infinite;
-}
-
-.one:nth-child(4) {
- animation: flyOne 15s 19.32s infinite;
-}
-
-.two {
- right: 0;
-}
-
-@keyframes flyTwo {
- 95% {
- opacity: 1;
- }
- 100% {
- transform: translate(-270px, 75px) scale(0);
- opacity: 0;
- }
-}
-
-.two:nth-child(5) {
- animation: flyTwo 21s 2.7s infinite;
-}
-
-.two:nth-child(6) {
- animation: flyTwo 21s 8s infinite;
-}
-
-.two:nth-child(7) {
- animation: flyTwo 21s 13.3s infinite;
-}
-
-.two:nth-child(8) {
- animation: flyTwo 21s 18.6s infinite;
-}
-
-.three {
- left: 0;
- top: 100%;
-}
-
-@keyframes flyThree {
- 95% {
- opacity: 1;
- }
- 100% {
- transform: translate(270px, -75px) scale(0);
- opacity: 0;
- }
-}
-
-.three:nth-child(9) {
- animation: flyThree 17s 1.4s infinite;
-}
-
-.three:nth-child(10) {
- animation: flyThree 17s 9.9s infinite;
-}
-
-.three:nth-child(11) {
- animation: flyThree 17s 18.4s infinite;
-}
-
-.three:nth-child(12) {
- animation: flyThree 17s 26.9s infinite;
-}
-
-.four {
- right: 0;
- top: 100%;
-}
-
-@keyframes flyFour {
- 95% {
- opacity: 1;
- }
- 100% {
- transform: translate(-270px, -75px) scale(0);
- opacity: 0;
- }
-}
-
-.four:nth-child(13) {
- animation: flyFour 25s 5.8s infinite;
-}
-
-.four:nth-child(14) {
- animation: flyFour 25s 10.4s infinite;
-}
-
-.four:nth-child(15) {
- animation: flyFour 25s 15s infinite;
-}
-
-.four:nth-child(16) {
- animation: flyFour 25s 19.6s infinite;
-}
-
-.five {
- left: 0;
- top: 50%;
-}
-
-@keyframes flyFive {
- 95% {
- opacity: 1;
- }
- 100% {
- transform: translate(270px, 0px) scale(0);
- opacity: 0;
- }
-}
-
-.five:nth-child(17) {
- animation: flyFive 35s 8.7s infinite;
-}
-
-.five:nth-child(18) {
- animation: flyFive 35s 14.4s infinite;
-}
-
-.five:nth-child(19) {
- animation: flyFive 35s 20.1s infinite;
-}
-
-.five:nth-child(20) {
- animation: flyFive 35s 25.8s infinite;
-}
-
-.six {
- right: 0;
- top: 50%;
-}
-
-@keyframes flySix {
- 95% {
- opacity: 1;
- }
- 100% {
- transform: translate(-270px, 0px) scale(0);
- opacity: 0;
- }
-}
-
-.six:nth-child(21) {
- animation: flySix 23.5s 10.6s infinite;
-}
-
-.six:nth-child(22) {
- animation: flySix 23.5s 15s infinite;
-}
-
-.six:nth-child(23) {
- animation: flySix 23.5s 19.4s infinite;
-}
-
-.six:nth-child(24) {
- animation: flySix 23.5s 23.8s infinite;
-}
-
-.seven {
- left: 0;
- top: 25%;
-}
-
-@keyframes flySeven {
- 95% {
- opacity: 1;
- }
- 100% {
- transform: translate(270px, 37px) scale(0);
- opacity: 0;
- }
-}
-
-.seven:nth-child(25) {
- animation: flySeven 29s 5s infinite;
-}
-
-.seven:nth-child(26) {
- animation: flySeven 29s 12.67s infinite;
-}
-
-.seven:nth-child(27) {
- animation: flySeven 29s 20.34s infinite;
-}
-
-.seven:nth-child(28) {
- animation: flySeven 29s 28.01s infinite;
-}
-
-.eight {
- right: 0;
- top: 25%;
-}
-
-@keyframes flyEight {
- 95% {
- opacity: 1;
- }
- 100% {
- transform: translate(-270px, 37px) scale(0);
- opacity: 0;
- }
-}
-
-.eight:nth-child(29) {
- animation: flyEight 28.5s 1.6s infinite;
-}
-
-.eight:nth-child(30) {
- animation: flyEight 28.5s 5.34s infinite;
-}
-
-.eight:nth-child(31) {
- animation: flyEight 28.5s 9.08s infinite;
-}
-
-.eight:nth-child(32) {
- animation: flyEight 28.5s 12.82s infinite;
-}
-
-@keyframes pikaPat {
- from {
- transform: rotate(-40deg);
- }
- to {
- transform: rotate(-50deg);
- }
-}
-
-@keyframes rotateTail {
- from {
- transform: rotate(55deg);
- }
- to {
- transform: rotate(65deg);
- }
-}
-
-@keyframes rotateLeftEar {
- from {
- transform: rotate(-35deg);
- }
- to {
- transform: rotate(-40deg);
- }
-}
-
-@keyframes rotateRightEar {
- from {
- transform: rotate(50deg);
- }
- to {
- transform: rotate(60deg);
- }
-}
-
-@keyframes bulbaBreathe {
- from {
- transform: rotate(45deg) scale(1);
- }
- to {
- transform: rotate(45deg) scale(1.01);
- }
-}
-
-@keyframes bodyBreathe {
- from {
- transform: scale(1);
- }
- to {
- transform: scale(1.05);
- }
-}
-
-@keyframes rotateLeftBulbEar {
- from {
- transform: rotate(-45deg);
- }
- to {
- transform: rotate(-55deg);
- }
-}
-
-@keyframes rotateRightBulbEar {
- from {
- transform: rotate(45deg);
- }
- to {
- transform: rotate(55deg);
- }
-}
\ No newline at end of file
diff --git a/web/src/style/base.scss b/web/src/style/base.scss
index 91c52758de308570a48ac2e8f969888601256515..0f8e5df34d2a01b9143ac9b90a851c203b09c437 100644
--- a/web/src/style/base.scss
+++ b/web/src/style/base.scss
@@ -58,17 +58,3 @@
.title-3 {
text-align: center;
}
-
-.el-pager li.active{
- color: #409EFF !important;
- border: 1px solid #409EFF;
-}
-
-.el-pager li.active+li{
- border-left: 1px;
-}
-
-.el-pager li:hover{
- color: #409EFF !important;
- border: 1px solid #409EFF;
-}
\ No newline at end of file
diff --git a/web/src/style/basics.scss b/web/src/style/basics.scss
index cfa018b6321ec699fea94adfe5f589841542f879..307baecc3eae7bad0f9c8acabac07930fee723c1 100644
--- a/web/src/style/basics.scss
+++ b/web/src/style/basics.scss
@@ -1,6 +1,6 @@
// basice
$font-size: 14px;
-$icon-size:17px;
+$icon-size:18px;
$active-color:#1890ff;
$bg-main:#f0f2f5;
$border-color: #f4f4f4;
@@ -11,7 +11,7 @@ $el-icon-mini:24px;
$width-aside:220px;
$width-hideside-aside:54px;
$width-mobile-aside:210px;
-$color-aside:rgba(255, 255, 255,.9);
+$color-aside:rgba(255, 255, 255, .9);
$icon-arrow-size-aside:12px;
$width-submenu-aside:55px;
$bg-aside:#191a23;
@@ -34,4 +34,4 @@ $color-table-thead:#262626;
$height-car:68px;
// mobile
$padding-xs: 5px;
-$margin-xs: 5px;
+$margin-xs: 5px;
\ No newline at end of file
diff --git a/web/src/style/main.scss b/web/src/style/main.scss
index e3418976274df91b21ae193b12930a1f66349a0d..dcc0bf1a2c40658a4d1e7e93de947c595ab92167 100644
--- a/web/src/style/main.scss
+++ b/web/src/style/main.scss
@@ -652,9 +652,6 @@ li {
.el-sub-menu__title:hover span {
color: #fff;
}
- .el-menu--inline {
- // border-left: 5px solid #2c3b41;
- }
}
.hideside {
.aside {
@@ -720,26 +717,10 @@ li {
}
}
-.admin-box {
- padding: 14px 20px;
- .el-button {
- padding: 7px 10px;
- }
- .el-input__inner {
- height: 30px;
- line-height: 30px;
- }
- .el-input__icon {
- line-height: 30px;
- }
-}
-
.admin-box {
min-height: calc(100vh - 200px);
- background-color: $white-bg;
- padding: 14px;
- margin: 114px 14px 20px;
- border-radius: 2px;
+ padding: 12px 16px;
+ margin: 100px 2px 20px;
.el-table--border {
border-radius: 4px;
margin-bottom: 14px;
@@ -749,26 +730,28 @@ li {
color: $color-table-thead;
}
th {
- padding: 5px 0;
+ padding: 6px 0;
+ background: #F7FBFF;
.cell {
- min-height: 34px;
- line-height: 34px;
+ color: rgba($color: #000000, $alpha: 0.85);
+ font-size: 14px;
+ line-height: 40px;
+ min-height: 40px;
}
}
td {
- padding: 8px 0;
+ padding: 6px 0;
+ .cell {
+ min-height: 40px;
+ line-height: 40px;
+ color: rgba($color: #000000, $alpha: 0.65);
+ }
}
- td,
- th.is-leaf {
+ td.is-leaf {
border-bottom: 1px solid #e8e8e8;
}
- }
- .search-term {
- border-left: none;
- border-right: none;
- padding: 0 5px;
- .el-form-item {
- margin-bottom: 10px;
+ th.is-leaf {
+ border-bottom: none;
}
}
.el-pagination {
@@ -778,17 +761,31 @@ li {
.upload {
padding: 0;
}
- .system {
+ .edit_container,
+ .edit {
padding: 0;
}
- .el-form.el-form--inline {
- .el-form-item:last-child {
- margin-bottom: 0;
+ .el-input {
+ .el-input__suffix {
+ margin-top: -3px;
+ }
+ &.is-disabled {
+ .el-input__suffix {
+ margin-top: 0px;
+ }
}
}
- .edit_container,
- .edit {
- padding: 0;
+ .el-cascader {
+ .el-input {
+ .el-input__suffix {
+ margin-top: 0px;
+ }
+ }
+ }
+ .el-input__inner {
+ border-color: rgba($color: #000000, $alpha: 0.15);
+ height: 32px;
+ border-radius: 2px;
}
}
@@ -805,13 +802,6 @@ li {
padding: 0 0 10px 0px;
}
-.search-term {
- background: $white-bg;
- padding: 0 15px;
- border-left: 1px solid #ebeef5;
- border-right: 1px solid #ebeef5;
-}
-
// table
.has-gutter {
tr {
@@ -833,7 +823,7 @@ li {
.el-table th,
.el-table tr {
- background-color: #fafafa;
+ background-color: #ffffff;
}
.el-pagination {
@@ -886,36 +876,6 @@ li {
}
}
-// upload-demo
-.upload-demo,
-.upload {
- .upload-box{
- margin-bottom: 12px;
- display: flex;
- justify-content: flex-end;
- .upload-btn{
- margin-left: 12px;
- }
- }
- background-color: $white-bg;
- padding: 15px;
- .el-upload-list__item-status-label {
- right: 0;
- left: 120px;
- }
- .el-upload__tip {
- margin: 10px 0;
- }
-}
-
-// system
-.system {
- padding: 15px;
- .el-input__inner {
- width: 80%;
- }
-}
-
// .el-menu .el-menu--inline {
// background: #2c3b41;
// }
@@ -973,14 +933,6 @@ li {
// border-bottom: 1px solid #e8e8e8;
// }
// }
- // .search-term {
- // border-left: none;
- // border-right: none;
- // padding: 0 5px;
- // .el-form-item {
- // margin-bottom: 10px;
- // }
- // }
// .el-pagination {
// padding: 20px 0 0 0;
// }
@@ -1025,8 +977,8 @@ li {
background-color: $bg-main;
.menu-total {
cursor: pointer;
- font-size: 22px;
- color: #838383;
+ font-size: 24px;
+ color: #000000;
margin-top: 16px;
}
// background-color: #f0f2f5;
@@ -1049,11 +1001,10 @@ li {
border: none;
border-left: 1px solid $border-color;
border-right: 1px solid $border-color;
- +.el-tabs__item{
+ +.el-tabs__item {
border-left: 0px solid $border-color;
}
}
-
.el-tabs__item.is-active {
background-color: rgba(64, 158, 255, .08);
}
@@ -1122,19 +1073,15 @@ li {
.el-input-number__increase {
position: absolute;
z-index: 1;
- top: 6px !important;
+ top: 3px !important;
width: 42px;
- height: 26px;
- line-height: 26px;
+ height: 29px;
+ line-height: 29px;
text-align: center;
background: #F5F7FA;
color: #606266;
cursor: pointer;
- font-size: 13px;
-}
-
-.table-button+span {
- margin-left: 10px !important;
+ font-size: 12px;
}
$headerHigh: 52px;
@@ -1158,11 +1105,9 @@ $mainHight: 100vh;
.layout-cont {
.right-box {
- height: $height-header;
- line-height: $height-header;
- text-align: center;
- vertical-align: middle;
- margin-right: 10px;
+ display: flex;
+ justify-content: flex-end;
+ align-items: center;
img {
vertical-align: middle;
border: 1px solid #ccc;
@@ -1170,6 +1115,7 @@ $mainHight: 100vh;
}
}
.header-cont {
+ padding: 0 16px;
height: $height-header;
background: #fff;
}
@@ -1178,8 +1124,19 @@ $mainHight: 100vh;
height: $height-header;
line-height: $height-header;
display: inline-block;
- background-color: #fff;
padding: 0;
+ margin-left: 46px;
+ font-size: 16px;
+ .el-breadcrumb__item {
+ .el-breadcrumb__inner {
+ color: rgba($color: #000000, $alpha: 0.45);
+ }
+ }
+ .el-breadcrumb__item:nth-last-child(1) {
+ .el-breadcrumb__inner {
+ color: rgba($color: #000000, $alpha: 0.65);
+ }
+ }
}
&.el-main {
overflow: auto;
@@ -1189,7 +1146,7 @@ $mainHight: 100vh;
overflow: visible;
position: relative;
.menu-total {
- margin-left:6px;
+ margin-left: 6px;
cursor: pointer;
float: left;
margin-top: 10px;
@@ -1244,10 +1201,6 @@ $mainHight: 100vh;
}
}
-.screenfull {
- display: inline-block;
-}
-
.header-avatar {
display: flex;
justify-content: center;
@@ -1255,10 +1208,8 @@ $mainHight: 100vh;
}
.search-component {
- display: inline-block;
+ display: inline-flex;
overflow: hidden;
- height: 60px;
- width: 120px;
text-align: center;
.el-input__inner {
border: none;
@@ -1269,27 +1220,31 @@ $mainHight: 100vh;
}
.search-icon {
font-size: $icon-size;
- margin-right: 14px;
display: inline-block;
vertical-align: middle;
box-sizing: border-box;
- color: #606266;
+ color: rgba($color: #000000, $alpha: 0.65);
}
.dropdown-group {
min-width: 100px;
}
+ .user-box {
+ cursor: pointer;
+ margin-right: 24px;
+ color: rgba($color: #000000, $alpha: 0.65);
+ }
}
.transition-box {
overflow: hidden;
width: 120px;
+ margin-right: 32px;
text-align: center;
}
.screenfull {
overflow: hidden;
- width: 40px;
- text-align: center;
+ color: rgba($color: #000000, $alpha: 0.65);
}
.el-dropdown {
@@ -1402,15 +1357,18 @@ $mainHight: 100vh;
}
}
-.gva-btn-list{
+.gva-btn-list {
margin-bottom: 12px;
display: flex;
- justify-content: flex-end;
- .el-button+.el-button{
+ .el-button+.el-button {
margin-left: 12px;
}
}
+.justify-content-flex-end {
+ justify-content: flex-end;
+}
+
::-webkit-scrollbar-track-piece {
background-color: #f8f8f8;
}
@@ -1429,4 +1387,164 @@ $mainHight: 100vh;
::-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/mobile.scss b/web/src/style/mobile.scss
index 159cf06c217cfe7ad1f5d075f079be3229addce2..a593f2ca0e24a585563560596e9ec0db07ecda89 100644
--- a/web/src/style/mobile.scss
+++ b/web/src/style/mobile.scss
@@ -1,89 +1,77 @@
-
@import '@/style/basics.scss';
-@media screen and (min-width: 320px)and (max-width: 750px){
- .el-header{
- padding: 0 $padding-xs;
- }
- .layout-cont {
- .main-cont{
- .breadcrumb{
- padding: 0 $padding-xs;
- }
+@media screen and (min-width: 320px)and (max-width: 750px) {
+ .el-header {
+ padding: 0 $padding-xs;
+ }
+ .layout-cont {
+ .main-cont {
+ .breadcrumb {
+ padding: 0 $padding-xs;
}
}
- .layout-cont{
- .right-box{
- margin-right: $margin-xs;
- }
+ }
+ .layout-cont {
+ .right-box {
+ margin-right: $margin-xs;
}
- .search-component{
- width: 30px;
+ }
+ .el-main {
+ .admin-box {
+ margin-left: 0;
+ margin-right: 0;
}
- .screenfull{
- width: 26px;
- text-align: center;
+ .big.admin-box {
+ padding: 0;
}
- .el-main{
- .admin-box{
- margin-left: 0;
- margin-right: 0;
- }
- .big.admin-box{
- padding: 0;
- }
- .big {
- .bottom {
- .chart-player{
- height: auto!important;
- margin-bottom: 15px;
- }
- .todoapp{
- background-color: #fff;
- padding-bottom: 10px;
- }
+ .big {
+ .bottom {
+ .chart-player {
+ height: auto!important;
+ margin-bottom: 15px;
+ }
+ .todoapp {
+ background-color: #fff;
+ padding-bottom: 10px;
}
}
}
-
- .card .car-left,
- .card .car-right{
+ }
+ .card .car-left,
+ .card .car-right {
+ width: 100%;
+ height: 100%;
+ }
+ .card {
+ padding-left: $padding-xs;
+ padding-right: $padding-xs;
+ }
+ .card {
+ .text {
width: 100%;
- height: 100%;
- }
- .card{
- padding-left: $padding-xs;
- padding-right: $padding-xs;
-
- }
- .card {
- .text{
- width: 100%;
- h4{
- white-space: break-spaces;
- }
+ h4 {
+ white-space: break-spaces;
}
}
- .shadow{
- margin-left: 4px;
- margin-right: 4px;
- .grid-content{
- margin-bottom: 10px;
- padding: 0;
- }
+ }
+ .shadow {
+ margin-left: 4px;
+ margin-right: 4px;
+ .grid-content {
+ margin-bottom: 10px;
+ padding: 0;
}
- .el-dialog{
- width: 90%;
+ }
+ .el-dialog {
+ width: 90%;
+ }
+ .el-transfer {
+ .el-transfer-panel {
+ width: 40%;
+ display: inline-block;
}
- .el-transfer{
- .el-transfer-panel{
- width: 40%;
- display: inline-block;
- }
- .el-transfer__buttons{
- padding: 0 5px;
- display: inline-block;
- }
-
+ .el-transfer__buttons {
+ padding: 0 5px;
+ display: inline-block;
}
-
-}
+ }
+}
\ No newline at end of file
diff --git a/web/src/utils/asyncRouter.js b/web/src/utils/asyncRouter.js
index 97eed4a33c6e12d76a408cb66fc1e8d446e43d84..ecd66563111facc92144880c48914c59392a52d5 100644
--- a/web/src/utils/asyncRouter.js
+++ b/web/src/utils/asyncRouter.js
@@ -1,7 +1,7 @@
const modules = import.meta.glob('../view/**/*.vue')
export const asyncRouterHandle = (asyncRouter) => {
- asyncRouter.map(item => {
+ asyncRouter.forEach(item => {
if (item.component) {
item.component = dynamicImport(modules, item.component)
} else {
diff --git a/web/src/components/dashbordCharts/echartsLine.vue b/web/src/view/dashboard/dashbordCharts/echartsLine.vue
similarity index 71%
rename from web/src/components/dashbordCharts/echartsLine.vue
rename to web/src/view/dashboard/dashbordCharts/echartsLine.vue
index cc35da4a1f8f67003a7a57179e7b27bd6b85d822..7f184573c7b2f53b5206a57821703d834d2baf85 100644
--- a/web/src/components/dashbordCharts/echartsLine.vue
+++ b/web/src/view/dashboard/dashbordCharts/echartsLine.vue
@@ -1,6 +1,8 @@
Gva 仓库commit 记录
-
-
Gva 仓库commit 记录
+
+ 访问趋势
+
diff --git a/web/src/view/dashboard/dashbordTable/dashbordTable.vue b/web/src/view/dashboard/dashbordTable/dashbordTable.vue
new file mode 100644
index 0000000000000000000000000000000000000000..d59635624bc66f16f4c012c6c5e7fb09d3d00e64
--- /dev/null
+++ b/web/src/view/dashboard/dashbordTable/dashbordTable.vue
@@ -0,0 +1,108 @@
+
+
+
+
+
+
+
diff --git a/web/src/view/dashboard/index.vue b/web/src/view/dashboard/index.vue
index 586bbaf44e24e3a9311f367ce2b4618668b2eebf..13c11469bc33a82561875e4d6a02949ffbe803e8 100644
--- a/web/src/view/dashboard/index.vue
+++ b/web/src/view/dashboard/index.vue
@@ -1,93 +1,100 @@
+ 更新日志
+
+
+
+
+
+ {{ key+1 }}
+
+ {{ item.from }}
+
-
-
-
早安，管理员，请开始一天的工作吧
- 今日晴，0℃ - 10℃，天气寒冷，注意添加衣物。
-
-
-
-
-
-
-
-
-
+
- 今日流量 (1231231)
-
-
- 总用户数 (24001)
-
-
- 好评率 (99%)
-
-
+ 
-
+
-
+
+ 早安，管理员，请开始一天的工作吧
+ 今日晴，0℃ - 10℃，天气寒冷，注意添加衣物。
+
+
+
+
+
+
+
+
+
+
+
+ 今日流量 (1231231)
+
+
+ 总用户数 (24001)
+
+
+ 好评率 (99%)
+
+
+
+ 使用教学：
+ https://www.bilibili.com/video/BV1Rg411u7xH
+
+
+ 插件仓库：
+ https://github.com/flipped-aurora/gva-plugins
+
+
-
-
+
-
+
-
-
+
+
-
-
+
- 使用教学：
- https://www.bilibili.com/video/BV1Rg411u7xH
-
-
- 插件仓库：
- https://github.com/flipped-aurora/gva-plugins
-
-
+
+
+
+
+
+
+
+
-
-
+ 快捷入口
+
+
+
+
+
+ {{ card.label }}
+
+
-
-
-
-
-
-
-
+
diff --git a/web/src/view/init/index.vue b/web/src/view/init/index.vue
index 31c3fb57a742ea4580bcc6b4175f7e40650501d7..7a9123f5e1c5d63aaaa692a1399ee3a5fa700c58 100644
--- a/web/src/view/init/index.vue
+++ b/web/src/view/init/index.vue
@@ -5,7 +5,7 @@
- 快捷入口
+ 数据统计
-
-
-
-
- {{ card.label }}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ GIN-VUE-ADMIN
初始化须知
-1.您需有用一定的VUE和golang基础
+1.您需有用一定的VUE和GOLANG基础
2.请您确认是否已经阅读过官方文档
3.请您确认是否了解后续的配置流程
注：开发组不为文档中书写过的内容提供无偿服务
diff --git a/web/src/view/layout/aside/index.vue b/web/src/view/layout/aside/index.vue index 9eeeb926effbe375e5c40f594cfb1be8398bb11f..bdc451f5216f13a89541a8f32b02fabf491b7a57 100644 --- a/web/src/view/layout/aside/index.vue +++ b/web/src/view/layout/aside/index.vue @@ -67,7 +67,7 @@ export default { const query = {} const params = {} ele.route.parameters && - ele.route.parameters.map(item => { + ele.route.parameters.forEach(item => { if (item.type === 'query') { query[item.key] = item.value } else { diff --git a/web/src/view/layout/index.vue b/web/src/view/layout/index.vue index 1a762a3df30822b121e4efc7a46bd5a38091a349..f213087b86274382f1becb7aa0d24ca7cf71636c 100644 --- a/web/src/view/layout/index.vue +++ b/web/src/view/layout/index.vue @@ -21,14 +21,14 @@
+
diff --git a/web/src/view/layout/screenfull/index.vue b/web/src/view/layout/screenfull/index.vue
index 1fba70ce04d1a755b883fa906960a9b630ac1448..e422ee5aae68f09d2f1722d6ce023dc7d07c6b37 100644
--- a/web/src/view/layout/screenfull/index.vue
+++ b/web/src/view/layout/screenfull/index.vue
@@ -1,38 +1,11 @@
-
-
+
-
-
+
@@ -41,6 +44,7 @@ export default {
return {
value: '',
show: false,
+ btnShow: true,
reload: false
}
},
@@ -55,8 +59,12 @@ export default {
},
hiddenSearch() {
this.show = false
+ setTimeout(() => {
+ this.btnShow = true
+ }, 500)
},
showSearch() {
+ this.btnShow = false
this.show = true
this.$nextTick(() => {
this.$refs['search-input'].focus()
@@ -74,10 +82,7 @@ export default {
+