diff --git a/server/api/v1/sys_authority.go b/server/api/v1/sys_authority.go index a38dda91..4b3f7149 100644 --- a/server/api/v1/sys_authority.go +++ b/server/api/v1/sys_authority.go @@ -28,7 +28,7 @@ func CreateAuthority(c *gin.Context) { } if err, authBack := service.CreateAuthority(authority); err != nil { global.GVA_LOG.Error("创建失败!", zap.Any("err", err)) - response.FailWithMessage("创建失败", c) + response.FailWithMessage("创建失败"+err.Error(), c) } else { response.OkWithDetailed(response.SysAuthorityResponse{Authority: authBack}, "创建成功", c) } @@ -55,7 +55,7 @@ func CopyAuthority(c *gin.Context) { } if err, authBack := service.CopyAuthority(copyInfo); err != nil { global.GVA_LOG.Error("拷贝失败!", zap.Any("err", err)) - response.FailWithMessage("拷贝失败", c) + response.FailWithMessage("拷贝失败"+err.Error(), c) } else { response.OkWithDetailed(response.SysAuthorityResponse{Authority: authBack}, "拷贝成功", c) } @@ -78,7 +78,7 @@ func DeleteAuthority(c *gin.Context) { } if err := service.DeleteAuthority(&authority); err != nil { // 删除角色之前需要判断是否有用户正在使用此角色 global.GVA_LOG.Error("删除失败!", zap.Any("err", err)) - response.FailWithMessage("删除失败", c) + response.FailWithMessage("删除失败"+err.Error(), c) } else { response.OkWithMessage("删除成功", c) } @@ -101,7 +101,7 @@ func UpdateAuthority(c *gin.Context) { } if err, authority := service.UpdateAuthority(auth); err != nil { global.GVA_LOG.Error("更新失败!", zap.Any("err", err)) - response.FailWithMessage("更新失败", c) + response.FailWithMessage("更新失败"+err.Error(), c) } else { response.OkWithDetailed(response.SysAuthorityResponse{Authority: authority}, "更新成功", c) } @@ -124,7 +124,7 @@ func GetAuthorityList(c *gin.Context) { } if err, list, total := service.GetAuthorityInfoList(pageInfo); err != nil { global.GVA_LOG.Error("获取失败!", zap.Any("err", err)) - response.FailWithMessage("获取失败", c) + response.FailWithMessage("获取失败"+err.Error(), c) } else { response.OkWithDetailed(response.PageResult{ List: list, @@ -152,7 +152,7 @@ func SetDataAuthority(c *gin.Context) { } if err := service.SetDataAuthority(auth); err != nil { global.GVA_LOG.Error("设置失败!", zap.Any("err", err)) - response.FailWithMessage("设置失败", c) + response.FailWithMessage("设置失败"+err.Error(), c) } else { response.OkWithMessage("设置成功", c) } diff --git a/server/api/v1/sys_system.go b/server/api/v1/sys_system.go index 21d66287..d6a0fe82 100644 --- a/server/api/v1/sys_system.go +++ b/server/api/v1/sys_system.go @@ -72,7 +72,7 @@ func GetServerInfo(c *gin.Context) { global.GVA_LOG.Error("获取失败!", zap.Any("err", err)) response.FailWithMessage("获取失败", c) return - }else { + } else { response.OkWithDetailed(gin.H{"server": server}, "获取成功", c) } diff --git a/server/api/v1/sys_user.go b/server/api/v1/sys_user.go index e55214de..1d5d07a8 100644 --- a/server/api/v1/sys_user.go +++ b/server/api/v1/sys_user.go @@ -32,7 +32,7 @@ func Login(c *gin.Context) { U := &model.SysUser{Username: L.Username, Password: L.Password} if err, user := service.Login(U); err != nil { global.GVA_LOG.Error("登陆失败! 用户名不存在或者密码错误", zap.Any("err", err)) - response.FailWithMessage("登陆失败!", c) + response.FailWithMessage("用户名不存在或者密码错误", c) } else { tokenNext(c, *user) } diff --git a/server/model/sys_base_menu.go b/server/model/sys_base_menu.go index 6f2052d3..f9ec18b1 100644 --- a/server/model/sys_base_menu.go +++ b/server/model/sys_base_menu.go @@ -29,7 +29,7 @@ type Meta struct { type SysBaseMenuParameter struct { global.GVA_MODEL SysBaseMenuID uint - Type string `json:"type" gorm:"commit:'地址栏携带参数为params还是query'"` - Key string `json:"key" gorm:"commit:'地址栏携带参数的key'"` - Value string `json:"value" gorm:"commit:'地址栏携带参数的值'"` + Type string `json:"type" gorm:"comment:地址栏携带参数为params还是query"` + Key string `json:"key" gorm:"comment:地址栏携带参数的key"` + Value string `json:"value" gorm:"comment:地址栏携带参数的值"` } diff --git a/server/service/sys_api.go b/server/service/sys_api.go index 7201e832..7ec062d4 100644 --- a/server/service/sys_api.go +++ b/server/service/sys_api.go @@ -46,7 +46,7 @@ func AutoCreateApi(api model.SysApi) (err error) { fxErr := tx.Where("path = ? AND method = ?", api.Path, api.Method).First(&fApi).Error if errors.Is(fxErr, gorm.ErrRecordNotFound) { txErr = tx.Create(&api).Error - if txErr != nil{ + if txErr != nil { return txErr } } diff --git a/server/service/sys_base_menu.go b/server/service/sys_base_menu.go index e5e71242..2f7c1889 100644 --- a/server/service/sys_base_menu.go +++ b/server/service/sys_base_menu.go @@ -58,26 +58,26 @@ func UpdateBaseMenu(menu model.SysBaseMenu) (err error) { return errors.New("存在相同name修改失败") } } - err = tx.Delete(&model.SysBaseMenuParameter{}, "sys_base_menu_id = ?", menu.ID).Error - if err != nil { - global.GVA_LOG.Debug(err.Error()) - return err + txErr := tx.Unscoped().Delete(&model.SysBaseMenuParameter{}, "sys_base_menu_id = ?", menu.ID).Error + if txErr != nil { + global.GVA_LOG.Debug(txErr.Error()) + return txErr } if len(menu.Parameters) > 0 { for k, _ := range menu.Parameters { menu.Parameters[k].SysBaseMenuID = menu.ID } - err = tx.Create(&menu.Parameters).Error - if err != nil { - global.GVA_LOG.Debug(err.Error()) - return err + txErr = tx.Create(&menu.Parameters).Error + if txErr != nil { + global.GVA_LOG.Debug(txErr.Error()) + return txErr } } - err = db.Updates(upDateMap).Error - if err != nil { - global.GVA_LOG.Debug(err.Error()) - return err + txErr = db.Updates(upDateMap).Error + if txErr != nil { + global.GVA_LOG.Debug(txErr.Error()) + return txErr } return nil }) diff --git a/web/debug.log b/web/debug.log new file mode 100644 index 00000000..d55ae557 --- /dev/null +++ b/web/debug.log @@ -0,0 +1 @@ +[1110/113210.377:ERROR:directory_reader_win.cc(43)] FindFirstFile: ϵͳҲָ· (0x3) diff --git a/web/src/style/basics.scss b/web/src/style/basics.scss index 73719b9f..1280dfee 100644 --- a/web/src/style/basics.scss +++ b/web/src/style/basics.scss @@ -4,12 +4,20 @@ $icon-size:17px; $active-color:#1890ff; $bg-main:#f0f2f5; $border-color: #f4f4f4; - +$white-bg:#fff; +$el-icon-small:30px; +$el-icon-mini:24px; // aside +$width-aside:220px; +$width-hideside-aside:54px; +$width-mobile-aside:210px; $color-aside:rgba(255, 255, 255,.9); $icon-arrow-size-aside:12px; $width-submenu-aside:55px; $bg-aside:#191a23; +$height-aside-tilte:64px; +$height-aside-img:30px; +$width-aside-img:30px; // header $height-header: 60px; // nav-scroll @@ -22,3 +30,5 @@ $border-color-table:#ededed; $height-table-cell:45px; $color-table-tbody:#595959; $color-table-thead:#262626; +// dashboard +$height-car:68px; diff --git a/web/src/style/main.scss b/web/src/style/main.scss index 42cc471d..d097a8ab 100644 --- a/web/src/style/main.scss +++ b/web/src/style/main.scss @@ -8,6 +8,7 @@ */ @import '@/style/basics.scss'; + html { line-height: 1.15; /* 1 */ @@ -365,7 +366,7 @@ textarea { * 2. Change font properties to `inherit` in Safari. */ - ::-webkit-file-upload-button { +::-webkit-file-upload-button { -webkit-appearance: button; /* 1 */ font: inherit; @@ -532,61 +533,171 @@ li { list-style-type: none; } -// .el-table__body-wrapper { -// tr { -// td { -// .cell { -// .el-button+.el-button { -// margin-left: 0; -// } -// } -// } -// } -// } -// navbar -.aside { - .el-scrollbar { - .el-scrollbar__view { - .el-menu-vertical { - background-color: $bg-aside; +// 导航 +#app { + .el-container { + position: relative; + height: 100%; + width: 100%; + } + + .el-container.mobile.openside { + position: fixed; + top: 0; + } + + .el-aside { + -webkit-transition: width .2s; + transition: width .2s; + width: $width-aside; + background-color: $bg-aside; + height: 100%; + position: fixed; + font-size: 0; + top: 0; + bottom: 0; + left: 0; + z-index: 1001; + overflow: hidden; + + .el-menu { + border-right: none; + } + + .tilte { + min-height: $height-aside-tilte; + line-height: $height-aside-tilte; + background: $bg-aside; + text-align: center; + + .logoimg { + width: $width-aside-img; + height: $height-aside-img; + vertical-align: middle; + background: #fff; + border-radius: 50%; + padding: 3px; } - .el-menu-item:hover i, - .el-menu-item:hover span { + + .tit-text { + display: inline-block; color: #fff; + font-weight: 600; + font-size: 20px; + vertical-align: middle; + padding-left: 10px; } - li { - background-color: $bg-aside; - ul { - .el-menu-item { - background-color: #000408; - height: 44px; - line-height: 44px; - } - .is-active { - background-color: #1890ff; - } + } + + } + + .aside { + .el-menu-vertical { + background-color: $bg-aside; + } + .el-submenu { + background-color: $bg-aside; + .el-menu { + .el-menu-item { + background-color: #000408; + height: 44px; + line-height: 44px; + } + .is-active { + background-color: #1890ff; } } - .el-submenu__title:hover { - background-color: $bg-aside; - } - .el-submenu__title:hover i, - .el-submenu__title:hover span { - color: #fff; - } - .el-menu--inline { - border-left: 5px solid #2c3b41; - } + } + .el-menu-item:focus, .el-menu-item:hover{ + background-color: transparent; + } + .el-menu-item:hover i, + .el-menu-item:hover span { + color: #fff; + } + + .el-submenu__title:hover { + background-color: $bg-aside; + } + + .el-submenu__title:hover i, + .el-submenu__title:hover span { + color: #fff; + } + .el-menu--inline { + border-left: 5px solid #2c3b41; + } + } + + .hideside { + .aside { + width: $width-hideside-aside; + } + } + + .mobile.hideside { + .el-aside { + -webkit-transition-duration: .2s; + transition-duration: .2s; + -webkit-transform: translate3d(-210px, 0, 0); + transform: translate3d(-220px, 0, 0); + } + } + + .mobile { + .el-aside { + -webkit-transition: -webkit-transform .28s; + transition: -webkit-transform .28s; + transition: transform .28s; + transition: transform .28s, -webkit-transform .28s; + width: $width-mobile-aside; + } + } + + + + .main-cont.el-main { + min-height: 100%; + -webkit-transition: margin-left .28s; + transition: margin-left .28s; + margin-left: $width-aside; + position: relative; + } + + .hideside { + .main-cont.el-main { + margin-left: 54px; + } + } + + .mobile { + .main-cont.el-main { + margin-left: 0px; + } + } + + .openside.mobile { + .shadowBg { + background: #000; + opacity: .3; + width: 100%; + top: 0; + height: 100%; + position: absolute; + z-index: 999; + left: 0; } } } + + // layout .layout-cont { .main-cont { position: relative; &.el-main { - background-color: #ecf0f5; + background-color: $bg-main; padding: 0; } } @@ -601,22 +712,102 @@ li { height: 30px; line-height: 30px; } + .el-input__icon { line-height: 30px; } } +.admin-box { + min-height: calc(100vh - 200px); + background-color: $white-bg; + padding: 15px; + margin: 115px 15px 20px; + border-radius: 2px; + + .el-table--border { + border-radius: 4px; + margin-bottom: 15px; + } + + .el-table { + thead { + color: $color-table-thead; + } + + th { + padding: 5px 0; + + .cell { + min-height: 34px; + line-height: 34px; + } + } + + td { + padding: 8px 0; + } + + td, + th.is-leaf { + border-bottom: 1px solid #e8e8e8; + } + } + + .search-term { + border-left: none; + border-right: none; + padding: 0 5px; + + .el-form-item { + margin-bottom: 10px; + } + } + + .el-pagination { + padding: 20px 0 0 0; + } + + .upload-demo, + .upload { + padding: 0; + } + + .system { + padding: 0; + } + + .el-form.el-form--inline { + .el-form-item:last-child { + margin-bottom: 0; + } + } + + .edit_container, + .edit { + padding: 0; + } +} + +.admin-box:after, +.admin-box:before { + content: ""; + display: block; + clear: both; +} + .button-box { - background: #fff; - border: 1px solid #ebeef5; - border-bottom: none; + background: $white-bg; + border: none; + padding: 0 0 10px 0px; } .search-term { - background: #fff; + background: $white-bg; padding: 0 15px; border-left: 1px solid #ebeef5; border-right: 1px solid #ebeef5; + .demo-form-inline { margin-bottom: 10px; } @@ -635,7 +826,7 @@ li { .el-table__body { tr.el-table__row--striped { td { - background: #fff!important; + background: #fff !important; } } } @@ -647,11 +838,13 @@ li { } .el-pagination { + .btn-prev, .btn-next { border: 1px solid #ddd; border-radius: 4px; } + .el-pager { li { color: #666; @@ -661,11 +854,13 @@ li { border-radius: 4px; } } - padding: 20px 0!important; + + padding: 20px 0 !important; } .el-row { padding: 10px 0; + .el-col>label { line-height: 30px; text-align: right; @@ -673,6 +868,7 @@ li { padding-right: 15px; display: inline-block; } + .line { line-height: 30px; text-align: center; @@ -681,16 +877,18 @@ li { // edit_container .edit_container { - background-color: #fff; + background-color: $white-bg; padding: 15px; + .el-button { margin: 15px 0; } } .edit { - background-color: #fff; + background-color: $white-bg; padding: 15px; + .el-button { margin: 15px 0; } @@ -699,12 +897,14 @@ li { // upload-demo .upload-demo, .upload { - background-color: #fff; + background-color: $white-bg; padding: 15px; + .el-upload-list__item-status-label { right: 0; left: 120px; } + .el-upload__tip { margin: 10px 0; } @@ -713,103 +913,13 @@ li { // system .system { padding: 15px; + .el-input__inner { width: 80%; } } -// 导航 -#app { - .el-container { - position: relative; - height: 100%; - width: 100%; - } - .el-container.mobile.openside { - position: fixed; - top: 0; - } - .hideside { - .aside { - width: 54px!important; - } - } - .el-aside { - -webkit-transition: width .2s; - transition: width .2s; - width: 220px; - background-color: $bg-aside; - height: 100%; - position: fixed; - font-size: 0; - top: 0; - bottom: 0; - left: 0; - z-index: 1001; - overflow: hidden; - } - .mobile.hideside { - .el-aside { - // pointer-events: none; - -webkit-transition-duration: .2s; - transition-duration: .2s; - -webkit-transform: translate3d(-210px, 0, 0); - transform: translate3d(-220px, 0, 0); - } - } - .mobile { - .el-aside { - -webkit-transition: -webkit-transform .28s; - transition: -webkit-transform .28s; - transition: transform .28s; - transition: transform .28s, -webkit-transform .28s; - width: 210px!important - } - } - .el-container { - position: relative; - height: 100%; - width: 100%; - .el-aside { - // transition: none; - .aside { - background: #000; - .el-menu { - border-right: none; - } - } - } - } - .main-cont.el-main { - min-height: 100%; - -webkit-transition: margin-left .28s; - transition: margin-left .28s; - margin-left: 220px; - position: relative; - } - .hideside { - .main-cont.el-main { - margin-left: 54px; - } - } - .mobile { - .main-cont.el-main { - margin-left: 0px; - } - } - .openside.mobile { - .shadowBg { - background: #000; - opacity: .3; - width: 100%; - top: 0; - height: 100%; - position: absolute; - z-index: 999; - left: 0; - } - } -} + // .el-menu .el-menu--inline { // background: #2c3b41; @@ -817,93 +927,111 @@ li { // .el-submenu .el-submenu { // background-color: #000408 !important; // } -.aside .el-scrollbar .el-scrollbar__view .el-submenu__title:hover { - background-color: $bg-aside !important; -} +// .aside .el-scrollbar .el-scrollbar__view .el-submenu__title:hover { +// background-color: $bg-aside !important; +// } -.el-menu--vertical { - .el-menu { - margin-left: -8px; - background-color: rgb(48, 65, 86); - .el-menu-item { - background-color: rgb(48, 65, 86); - } - .el-menu-item:focus, - .el-menu-item:hover { - background-color: #263445; - color: #fff; - } - } -} +// .el-menu--vertical { +// .el-menu { +// margin-left: -8px; +// background-color: rgb(48, 65, 86); + +// .el-menu-item { +// background-color: rgb(48, 65, 86); +// } + +// .el-menu-item:focus, +// .el-menu-item:hover { +// background-color: #263445; +// color: #fff; +// } +// } +// } // 导航***** // add 5.13 .el-container { - .admin-box { - padding: 15px; - margin: 115px 15px 20px; - border-radius: 2px; - .button-box { - border: none; - padding: 0 0 10px 0px; - } - .el-table--border { - border-radius: 4px; - margin-bottom: 15px; - } - .el-table { - thead { - color: $color-table-thead; - } - th { - padding: 5px 0; - .cell { - min-height: 34px; - line-height: 34px; - } - } - td { - padding: 8px 0; - } - td, - th.is-leaf { - border-bottom: 1px solid #e8e8e8; - } - } - .search-term { - border-left: none; - border-right: none; - padding: 0 5px; - .el-form-item { - margin-bottom: 10px; - } - } - .el-pagination { - padding: 20px 0 0 0; - } - .upload-demo, - .upload { - padding: 0; - } - .system { - padding: 0; - } - .el-form.el-form--inline { - .el-form-item:last-child { - margin-bottom: 0; - } - } - .edit_container, - .edit { - padding: 0; - } - } - .admin-box:after, - .admin-box:before { - content: ""; - display: block; - clear: both; - } + // .admin-box { + // padding: 15px; + // margin: 115px 15px 20px; + // border-radius: 2px; + + // .button-box { + // border: none; + // padding: 0 0 10px 0px; + // } + + // .el-table--border { + // border-radius: 4px; + // margin-bottom: 15px; + // } + + // .el-table { + // thead { + // color: $color-table-thead; + // } + + // th { + // padding: 5px 0; + + // .cell { + // min-height: 34px; + // line-height: 34px; + // } + // } + + // td { + // padding: 8px 0; + // } + + // td, + // th.is-leaf { + // border-bottom: 1px solid #e8e8e8; + // } + // } + + // .search-term { + // border-left: none; + // border-right: none; + // padding: 0 5px; + + // .el-form-item { + // margin-bottom: 10px; + // } + // } + + // .el-pagination { + // padding: 20px 0 0 0; + // } + + // .upload-demo, + // .upload { + // padding: 0; + // } + + // .system { + // padding: 0; + // } + + // .el-form.el-form--inline { + // .el-form-item:last-child { + // margin-bottom: 0; + // } + // } + + // .edit_container, + // .edit { + // padding: 0; + // } + // } + + // .admin-box:after, + // .admin-box:before { + // content: ""; + // display: block; + // clear: both; + // } + .tips { margin-top: 10px; font-size: 14px; @@ -913,6 +1041,7 @@ li { } .el-container.layout-cont { + // .header-cont, // .breadcrumb { // height: 40px !important; @@ -920,11 +1049,13 @@ li { // } .main-cont.el-main { background-color: $bg-main; + .menu-total { font-size: 22px; color: #838383; margin-top: 16px; } + // background-color: #f0f2f5; } } @@ -937,14 +1068,17 @@ li { padding: 0 6px; border-top: 1px solid $border-color; padding: 0; + .el-tabs__header { margin: 0px 0 0 0; + .el-tabs__item { height: $height-nav-scroll; height: $height-nav-scroll; border: none; border-left: 1px solid $border-color; } + .el-tabs__item::before { content: ""; width: 9px; @@ -955,12 +1089,15 @@ li { border-radius: 50%; transition: background-color .2s; } + .el-tabs__item.is-active::before { background-color: #409eff; } + .el-tabs__item.is-active { background-color: rgba(64, 158, 255, .08); } + .el-tabs__nav { border: none; } @@ -973,6 +1110,7 @@ li { .el-button.el-button--text.el-button--small { position: relative; } + // .el-button.el-button--text.el-button--small::after { // content: ''; // position: absolute; @@ -984,9 +1122,9 @@ li { // } .cell { button:last-child::after { - content: ''!important; - position: absolute!important; - width: 0px!important; + content: '' !important; + position: absolute !important; + width: 0px !important; } } } @@ -1004,6 +1142,7 @@ li { border-right: 1.5px solid #ccc; margin-left: 6px; } + .el-table__placeholder { width: 10px; } @@ -1016,6 +1155,7 @@ li { border-right: 1.5px solid #ccc; margin-left: 6px; } + .el-table__placeholder { width: 10px; } @@ -1043,6 +1183,7 @@ li { $headerHigh: 52px; $mainHight: 100vh; + .dropdown-group { min-width: 100px; } @@ -1054,11 +1195,7 @@ $mainHight: 100vh; z-index: 999; } -.admin-box { - min-height: calc(100vh - 200px); - background-color: rgb(255, 255, 255); - margin-top: 100px; -} + .el-scrollbar__wrap { padding-bottom: 17px; @@ -1071,16 +1208,19 @@ $mainHight: 100vh; text-align: center; vertical-align: middle; margin-right: 40px; + img { vertical-align: middle; border: 1px solid #ccc; border-radius: 6px; } } + .header-cont { height: $height-header; background: #fff; } + .main-cont { .breadcrumb { height: $height-header; @@ -1089,17 +1229,21 @@ $mainHight: 100vh; background-color: #fff; padding: 0 24px; } + .fl-right { // height: $height-header; // line-height: $height-header; } + &.el-main { overflow: auto; background: #fff; } + height: $mainHight !important; overflow: visible; position: relative; + .menu-total { float: left; margin-top: 10px; @@ -1108,44 +1252,56 @@ $mainHight: 100vh; line-height: 30px; font-size: 30px; } + .aside { overflow: auto; + // background: #fff; &::-webkit-scrollbar { display: none; } } + .el-menu-vertical { height: calc(100vh - 64px) !important; visibility: auto; + &:not(.el-menu--collapse) { width: 220px; } } + .el-menu--collapse { width: 54px; + li { + .el-tooltip, .el-submenu__title { padding: 0px 15px !important; } } } + &::-webkit-scrollbar { display: none; } + &.main-left { width: auto !important; } + &.main-right { .admin-title { float: left; font-size: 16px; vertical-align: middle; margin-left: 20px; + img { vertical-align: middle; } + &.collapse { width: 53px; } @@ -1154,29 +1310,6 @@ $mainHight: 100vh; } } -.tilte { - min-height: 64px; - line-height: 64px; - background: $bg-aside; - text-align: center; - .logoimg { - width: 30px; - height: 30px; - vertical-align: middle; - background: #fff; - border-radius: 50%; - padding: 3px; - } - .tit-text { - display: inline-block; - color: #fff; - font-weight: 600; - font-size: 20px; - vertical-align: middle; - padding-left: 10px; - } -} - .screenfull { display: inline-block; } @@ -1193,13 +1326,16 @@ $mainHight: 100vh; height: 60px; width: 120px; text-align: center; + .el-input__inner { border: none; border-bottom: 1px solid #606266; } + .el-dropdown-link { cursor: pointer; } + .search-icon { font-size: $icon-size; margin-right: 14px; @@ -1208,6 +1344,7 @@ $mainHight: 100vh; box-sizing: border-box; color: #606266; } + .dropdown-group { min-width: 100px; } @@ -1230,71 +1367,84 @@ $mainHight: 100vh; height: 60px; } +// dashboard .card { - background-color: #fff; + background-color: $white-bg; padding: 20px; border-radius: 4px; overflow: hidden; + .car-left { - height: 68px; + height: $height-car; width: 70%; float: left; } + .car-right { - height: 68px; + height: $height-car; width: 29%; float: left; + .flow, .user-number, .feedback { - width: 24px; - height: 24px; + width: $el-icon-mini; + height: $el-icon-mini; display: inline-block; border-radius: 50%; - line-height: 24px; + line-height: $el-icon-mini; text-align: center; font-size: 13px; margin-right: 5px; } + .flow { background-color: #fff7e8; border-color: #feefd0; color: #faad14; } + .user-number { background-color: #ecf5ff; border-color: #d9ecff; color: #409eff; } + .feedback { background-color: #eef9e8; border-color: #dcf3d1; color: #52c41a; } + .car-item { text-align: right; + b { display: block; } } } + .card-img { - width: 68px; - height: 68px; + width: $height-car; + height: $height-car; display: inline-block; float: left; overflow: hidden; + img { width: 100%; height: 100%; border-radius: 50%; } } + .text { - height: 68px; + height: $height-car; margin-left: 10px; float: left; margin-top: 14px; + h4 { font-size: 20px; color: #262626; @@ -1303,25 +1453,32 @@ $mainHight: 100vh; word-break: break-all; text-overflow: ellipsis; } + .tips-text { color: #8c8c8c; margin-top: 8px; + .el-icon{ + margin-right: 8px; + display:inline-block; + } } } } .shadow { margin: 5px 0; + .grid-content { - background-color: #fff; + background-color: $white-bg; border-radius: 4px; text-align: center; padding: 10px 0; cursor: pointer; + .el-icon { - width: 30px; - height: 30px; - font-size: 30px; + width: $el-icon-small; + height: $el-icon-small; + font-size: $el-icon-small; margin-bottom: 8px; } } diff --git a/web/src/view/dashboard/index.vue b/web/src/view/dashboard/index.vue index 01b49ec1..3f93b575 100644 --- a/web/src/view/dashboard/index.vue +++ b/web/src/view/dashboard/index.vue @@ -6,7 +6,7 @@

早安，管理员， 请开始您一天的工作吧！

- + 今日晴，0℃ - 10℃，天气寒冷，注意添加衣物。

diff --git a/web/src/view/example/simpleUploader/simpleUploader.vue b/web/src/view/example/simpleUploader/simpleUploader.vue index 79ceea48..dcfb916d 100644 --- a/web/src/view/example/simpleUploader/simpleUploader.vue +++ b/web/src/view/example/simpleUploader/simpleUploader.vue @@ -147,7 +147,7 @@ export default { .uploader-example { width: 880px; padding: 15px; - margin: 40px auto 0; + margin: 115px 15px 20px; font-size: 12px; box-shadow: 0 0 10px rgba(0, 0, 0, 0.4); }