From 4b480d972e021e849c60f2244cc483845d66a6eb Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Mon, 28 Feb 2022 14:16:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86-ui?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/t-zs.png | Bin 0 -> 2227 bytes src/assets/styles/eladmin.scss | 24 ++-- src/assets/styles/index.scss | 135 ++++++++++++++++++- src/assets/styles/login.scss | 36 +---- src/assets/styles/sidebar.scss | 4 + src/layout/index.vue | 4 +- src/views/device/deviceConfig.vue | 3 - src/views/device/index.vue | 78 ++++++++--- src/views/login.vue | 45 +++++-- src/views/system/dept/index.vue | 185 ++++++++++++++++++-------- src/views/system/menu/index.vue | 108 ++++++++++----- src/views/system/role/index.vue | 190 ++++++++++++++++++++------- src/views/system/user/index.vue | 210 +++++++++++++++++------------- 13 files changed, 715 insertions(+), 307 deletions(-) create mode 100644 src/assets/images/t-zs.png diff --git a/src/assets/images/t-zs.png b/src/assets/images/t-zs.png new file mode 100644 index 0000000000000000000000000000000000000000..824f898d12887b614962d2b8f91e465db66d7bd0 GIT binary patch literal 2227 zcmaJ@X;@Qd77n89n~JE2l18>5*;tbR#*l>7M3x8$s04C>6p|a0D@hQMbpj~cAjl{b zu_+)hFj$B{Z2^T^)FMTt=u|{TK@bs8K^99BD|UVibD!tl?|k2L-uJxceD9B&<;(EU z)iTzC!C<;xo>YIuYNL2D8fuDfiGfvvV%ZMSf}sE~3KFpd0F2BABLKJ;mlX~811z@W zSP$R=gQ;3@n88pmeLpc0XTQm;afTC;T)f#lSFP79WE{W0ftfCerEu zKb6bfxq+f?(Y06n$er2o%PE zd^m-ooSGBdDu}~lgCZgFBZf{Vdhvu1ix&xaQC$%V7Bq*$CgQMeSRC1oN^r2Z#o=fa zvNEQS9Ua`rR3}@U!zz{vMjqz^JZKfm{tHW66RWfXm#?Ty1q7UUfbA{-x$uu|6FF;Z zaa)t`6PCTU7Rs7fj6w`XdAa{}*{eqi2PwnP)>Ujin;+mQ94}BP@z)q&0}{F4mFq+83fGRWn}<$(IG!3a+X?aAvl{#?bdd zkNPd8Pp!xnL6eNB!*Qm|)19GtgqETVa%ttLWm}68DSUHj#hlUOp-XccAFmYcYe1@> zfbF;~f=(9gorcQ3%q;rqM8cfz;U|#Kib%CYeWhe#OvgqxF}kEvI`Jz{9~ex_Xs~N> z(KHy?`pWXY`z&ujB}sfYEV_AlIhMtmNJ6j6{XyF|cnE2T*KRT5AL8|CNN2j4?ricu9O?< z>oSJV;)~wgZc<-Zc#yK|j5D!12;h!RSEEnR^|5qeal6qK35=Xf-;-qFcm35cRFkn= z%98V0`>a&mlQagj9HHc5KWuH+;EMu==93=tA49H8V1Kr2oO2r7)|L6@#>msMi(v4! zbDmc(kB2`NZLZ#6W{CJ|;}>Qf!Q_;nH88}qMKJs2)n%g=-0Q6 z7`OFk?}Ljs+E?A^p50MhcYTLJ{1uvM$208W?B)0zp4F^|4>AfKnA~Gs5MJ?qD4j^l ztM}eF_(Rqi6ZfZ3byS>%w6(CR+xVLwNBeY~U)vjMzw{FhO19SeMaaY7PHnvNTN5nD zB0RnCIKH}!5g-*X8|r)$O98rP33A**O1}0aaC6WEUqFZ(%{C5a#ppjA25Jt{*XtU+ zS!%s%&B;eyO^ilSK6q*?G z9=YiC4x!8@HOlV!G_~i^hOxbyNBhFo)!PLcI_fzNSnsKmQ~vE}U$@*j9b_rr4@W+Y zJM~Lp`O==Gu*QRz3NP51ANl2Hq;#U!9sTG9qdq-RV11W*Q8!vBt93&EQ+p&(yKb>D zT|=v|E@e<+Wph1IZbUX^XAYLGmx%tp0S+NJte%tF^s4WXQ zs=CS3?fV#nOCxV-^7I>7%LX%}G=i_kcI>yp>*t@GpHGDdDI}nhv)y^I^LtXa-3!NF nwnR0t9A??~3fDF~7ptNM^G`fWS%f_1mA?^QGzPWaEj;xP@#B}Z literal 0 HcmV?d00001 diff --git a/src/assets/styles/eladmin.scss b/src/assets/styles/eladmin.scss index e1e0195..6510976 100644 --- a/src/assets/styles/eladmin.scss +++ b/src/assets/styles/eladmin.scss @@ -1,12 +1,14 @@ .head-container { - padding-bottom: 10px; + padding-bottom: 20px; + margin-bottom: 12px; + border-bottom: 1px solid #eee; .filter-item { display: inline-block; vertical-align: middle; - margin: 0 3px 10px 0; + // margin: 0 3px 10px 0; input { - height: 30.5px; - line-height: 30.5px; + height: 32px; + line-height: 32px; } } .el-form-item-label { @@ -16,20 +18,22 @@ vertical-align: middle; font-size: 14px; color: #606266; - line-height: 30.5px; + line-height: 32px; padding: 0 7px 0 7px; } - .el-button+.el-button { - margin-left: 0 !important; + .el-button { + // margin-left: 0 !important; + padding: 0 15px; + height: 32px; } .el-select__caret.el-input__icon.el-icon-arrow-up{ - line-height: 30.5px; + line-height: 32px; } .date-item { display: inline-block; vertical-align: middle; - margin-bottom: 10px; - height: 30.5px !important; + // margin-bottom: 10px; + height: 32pxpx !important; width: 230px !important; } } diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index ec8be31..2eab990 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -126,7 +126,11 @@ aside { //main-container全局样式 .app-container { - padding: 20px 20px 45px 20px; + margin: 24px; + padding: 20px 24px; + background-color: #fff; + border-radius: 4px; + min-height: calc(100vh - 152px); } .components-container { @@ -186,19 +190,146 @@ aside { } // start +.auth_code { + position: relative; + .login-code { + position: absolute; + right: 0; + top: 0; + width: 33%; + display: inline-block; + height: 40px; + img { + cursor: pointer; + vertical-align: middle + } + span { + position: relative; + display: block; + width: 100%; + font-size: 12px; + text-align: center; + line-height: 40px; + color: #33a1fa; + cursor: pointer; + &:before { + content: ""; + position: absolute; + left: 2px; + top: 50%; + width: 1px; + height: 18px; + margin-top: -9px; + background-color: #e2e6ee; + } + } + } +} .page_add { text-align: right; + .table_add{ + padding: 0 24px; + height: 28px; + border-radius: 14px; + margin-top: 2px; + } } .form_item { + display: flex; margin: 0 10px; span { + display: block; + line-height: 32px; font-size: 14px; margin-right: 10px; - color: #666; + color: #333; } } .list_table { margin-top: 20px; } +.col_flex { + display: flex; +} +.el-table{ + color: #333; + font-size: 14px; + .el-button{ + padding: 5px 8px; + border: none !important; + } + .delt_btn { + background-color: #ee5747 !important; + } + .stop_btn{ + background-color: #faaf45 !important; + } + .record_btn{ + background: linear-gradient(to right, #fc8c6f, #fa544e) !important; + } +} +.el-dialog__body{ + .el-form-item{ + margin-bottom: 24px; + } + .el-form-item__label{ + line-height: 40px; + color: #333; + } + .el-input__inner{ + height: 40px; + line-height: 40px; + } + .el-range-separator{ + line-height: 34px; + } +} +.el-dialog__header{ + position: relative; + padding: 20px 0; + margin: 0 24px; + border-bottom: 1px solid #eee; + &::before{ + content: ""; + position: absolute; + left: -18px; + top: 50%; + width: 44px; + height: 47px; + margin-top: -24px; + background: url(../images/t-zs.png) no-repeat left center; + background-size: 100% 100%; + } + .el-dialog__title{ + color: #000; + } + .el-dialog__headerbtn{ + font-size: 20px; + top: 50%; + right: 0; + transform: translateY(-50%); + } +} +.el-dialog__footer { + padding: 10px 0 40px 0; + text-align: center; + .dialog-footer{ + .el-button{ + font-size: 14px; + padding: 10px 36px; + } + .el-button--default{ + color: #3a8aeb; + border-color: #3a8aeb; + margin-left: 40px; + } + } +} +.record_layer { + .el-dialog__body { + padding: 0 20px 30px 20px; + color: #333; + } +} // end diff --git a/src/assets/styles/login.scss b/src/assets/styles/login.scss index 2370862..7a814bd 100644 --- a/src/assets/styles/login.scss +++ b/src/assets/styles/login.scss @@ -43,38 +43,4 @@ // height: 39px;width: 14px;margin-left: 2px; // } } - .auth_code{ - position: relative; - .login-code { - position: absolute; - right: 0; - top: 0; - width: 33%; - display: inline-block; - height: 40px; - img{ - cursor: pointer; - vertical-align:middle - } - span{ - position: relative; - display: block; - width: 100%; - font-size: 12px; - text-align: center; - line-height: 40px; - color: #33a1fa; - cursor: pointer; - &:before { - content: ""; - position: absolute; - left: 2px; - top: 50%; - width: 1px; - height: 18px; - margin-top: -9px; - background-color: #e2e6ee; - } - } - } - } + diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index 7655962..edb7e17 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -5,6 +5,10 @@ transition: margin-left .28s; margin-left: $sideBarWidth; position: relative; + background-color: #f5f5f5; + .el-button--primary { + background: #3a8aeb; + } } .sidebar-container { diff --git a/src/layout/index.vue b/src/layout/index.vue index 4318fb9..c0b5c13 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -45,8 +45,8 @@ export default { }), classObj() { return { - hideSidebar: !this.sidebar.opened, - openSidebar: this.sidebar.opened, + // hideSidebar: !this.sidebar.opened, + // openSidebar: this.sidebar.opened, withoutAnimation: this.sidebar.withoutAnimation, mobile: this.device === 'mobile' } diff --git a/src/views/device/deviceConfig.vue b/src/views/device/deviceConfig.vue index 41a4a4e..11004fc 100644 --- a/src/views/device/deviceConfig.vue +++ b/src/views/device/deviceConfig.vue @@ -274,9 +274,6 @@ export default { } diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 7f740dc..3a5e26a 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -3,56 +3,96 @@
- + - - +
+ 所属菜单: + +
+
+ 时间: + +
- 新增 + + 新增 +
- - + + - - + + - + - + + - - - - - - - - - + + + + + + + @@ -81,7 +121,7 @@ export default { name: 'Menu', components: { rrOperation, DateRangePicker }, cruds() { - return CRUD({ title: '菜单', url: 'api/menus', crudMethod: { ...crudMenu }}) + return CRUD({ title: '菜单', url: 'api/menus', crudMethod: { ...crudMenu } }) }, mixins: [presenter(), header(), form(defaultForm), crud()], data() { @@ -166,7 +206,7 @@ export default { }, getSupDepts(id) { crudMenu.getMenuSuperior(id).then(res => { - const children = res.map(function(obj) { + const children = res.map(function (obj) { if (!obj.leaf && !obj.children) { obj.children = null } @@ -178,7 +218,7 @@ export default { loadMenus({ action, parentNode, callback }) { if (action === LOAD_CHILDREN_OPTIONS) { crudMenu.getMenusTree(parentNode.id).then(res => { - parentNode.children = res.map(function(obj) { + parentNode.children = res.map(function (obj) { if (!obj.leaf) { obj.children = null } diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 1a5d960..96552c2 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -3,36 +3,89 @@
- + - +
+ 角色名称: + +
- 新增 + + 新增 +
- - - - - - 全选 + + + + + + + + + + 全选
- - {{ items.name }} - + {{ items.name }}
-
- + @@ -41,37 +94,48 @@ + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -96,7 +160,7 @@ export default { name: 'Role', components: { pagination, rrOperation }, cruds() { - return CRUD({ title: '角色', url: 'api/roles', sort: 'level,asc', crudMethod: { ...crudRoles }}) + return CRUD({ title: '角色', url: 'api/roles', sort: 'level,asc', crudMethod: { ...crudRoles } }) }, mixins: [presenter(), header(), form(defaultForm), crud()], data() { @@ -232,12 +296,42 @@ export default { border: 0; padding: 0; } - +::v-deep .el-dialog__body { + .el-form-item { + margin-bottom: 24px; + } + .el-form-item__label { + line-height: 32px; + color: #333; + } + .el-input__inner { + height: 32px; + line-height: 32px; + } + .el-range-separator { + line-height: 24px; + } +} .el-tag { + height: 26px; + line-height: 26px; margin: 5px 10px 5px 0; + background: #cbe3ff; + color: #3a8aeb; + border: none; } .press_form { display: flex; + &:last-child { + .check_list { + width: 590px; + .el-checkbox { + &:nth-child(1) { + display: block; + } + } + } + } } .press_form ::v-deep .el-form-item__content { display: flex; @@ -249,7 +343,7 @@ export default { width: 430px; } .check_all, -.check_list .el-checkbox{ +.check_list .el-checkbox { margin-right: 10px; } diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index d5452b6..3244e7a 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -3,35 +3,48 @@
- + - - +
+ 角色名称: + +
+
+ 管理员名称: + +
- 新增 + 新增
- + - + - + - + @@ -71,95 +84,104 @@ { required: true, trigger: 'change', message: '请选择管理员状态' } ]" > - + - - + + - + - + - + - + - - - {{ verification }} + + + - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -185,7 +207,7 @@ export default { name: 'User', components: { rrOperation, pagination }, cruds() { - return CRUD({ title: '用户', url: 'api/users', crudMethod: { ...crudUser }}) + return CRUD({ title: '用户', url: 'api/users', crudMethod: { ...crudUser } }) }, mixins: [presenter(), header(), form(defaultForm), crud()], // 数据字典 @@ -257,7 +279,7 @@ export default { created() { this.crud.msg.add = '新增成功,默认密码:123456' }, - mounted: function() { + mounted: function () { const that = this window.onresize = function temp() { that.height = document.documentElement.clientHeight - 180 + 'px;' @@ -341,10 +363,10 @@ export default {