From b8f5f6cdf5c26db929b7cda0188c587eb8d66c1d Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期六, 18 三月 2023 17:42:51 +0800 Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0 --- src/App.vue | 35 ++++++++++++++++++++++------------- 1 files changed, 22 insertions(+), 13 deletions(-) diff --git a/src/App.vue b/src/App.vue index c46ebac..32de82a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -49,6 +49,9 @@ }; </script> <style lang="scss"> +body { + --operation-color: #409eff; +} .el-select-dropdown__item { height: 100% !important; } @@ -79,8 +82,8 @@ } .button-addition { - background-color: #eb5d01 !important; - border: 1px solid #eb5d01 !important; + background-color: #eb5d01; + border: 1px solid #eb5d01; color: #ffffff; } @@ -113,7 +116,6 @@ .el-dialog__body { // background-color: #06122c; } - .el-dialog__header { display: flex; align-items: center; @@ -121,7 +123,6 @@ padding: 20px; line-height: 60px; } - .el-dialog__close { width: 20px; height: 20px; @@ -133,42 +134,50 @@ } #app { + .userList{ + height: 100%; + overflow: auto; + } + .list{ + height: 100%; + overflow: auto; + header{ + background-color: transparent; + border: none + } + } // 璁剧疆寮瑰嚭妗嗘牱寮� .el-dialog__title { - color: #E9eef3; + color: #333; } .el-dialog__header { - background-color: #09152f; + color: black; + background-color: #DCDFE6; + //border: 1px solid #DCDFE6; } - // 璁剧疆table鏍峰紡 .el-table__empty-block { // background-color: #09152f; } - .el-table__empty-block { color: #4b9bb7; } - .el-table__empty-text { color: #4b9bb7; } - .el-table .warning-row { // background: #06122c; } - .el-table .success-row { // background: #071f39; } - .el-input__inner { // background-color: #09152f; // border: 1px solid #17324c; } .el-textarea__inner { // background-color: #09152f; - border: 1px solid #17324c; + // border: 1px solid #17324c; } } .el-table__body-wrapper::-webkit-scrollbar { -- Gitblit v1.8.0