diff --git a/src/assets/styles/mixin.scss b/src/assets/styles/mixin.scss index ac1f8ee..4788a7e 100644 --- a/src/assets/styles/mixin.scss +++ b/src/assets/styles/mixin.scss @@ -320,6 +320,15 @@ } } +@mixin tab_height_min{ + [data-theme="dark"] & { + min-height: calc(100vh - 200px); + } + [data-theme="light"] & { + min-height: calc(100vh - 178px); + } +} + @mixin input_style{ [data-theme="dark"] & { border: 1px solid $mainColor; diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss index bf1072c..0ce2787 100644 --- a/src/assets/styles/yxk-admin.scss +++ b/src/assets/styles/yxk-admin.scss @@ -5,6 +5,9 @@ @include box_padding; .head-container{ margin-bottom: 20px; + .crud-opts{ + justify-content: center; + } } .container-left{ @include tree_height_min; @@ -18,6 +21,9 @@ } .container-right{ @include table_height_min; + &.tab-content{ + @include tab_height_min; + } } } @@ -32,12 +38,24 @@ .elect-cont-right{ width: calc(100vw - 379px); } + + .category-container{ + .elect-cont-right{ + width: calc(100vw - 482px); + } + } } .openSidebar{ // siderbar-展开 256 + 间距 60 + treeLeft 265 .elect-cont-right{ width: calc(100vw - 581px); } + + .category-container{ + .elect-cont-right{ + width: calc(100vw - 684px); + } + } } .row-container{ @@ -52,6 +70,10 @@ .tab-container{ @include bg_color; @include box_padding; +} + +.tab-container, +.category-container{ .tab-content{ position: relative; @include row_tab_style; @@ -62,6 +84,15 @@ } } +.category-container{ + .elect-cont-left{ + width: 368px; + } + .elect-cont-right{ + margin-top: 0; + } +} + .head-container { .filter-item { vertical-align: middle; diff --git a/src/views/system/dict/dictDetail.vue b/src/views/system/dict/dictDetail.vue deleted file mode 100644 index dc135b8..0000000 --- a/src/views/system/dict/dictDetail.vue +++ /dev/null @@ -1,180 +0,0 @@ - - - - - diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index 7610442..ca4cf72 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -120,7 +120,7 @@ import { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect' const defaultForm = { id: null, dicName: null, isTop: '1', dicCode: null, sequence: 999, dicExplain: null, dicType: false, dicPid: null } export default { - name: 'Dict', + name: 'Dicts', components: { crudOperation, Treeselect }, cruds() { return [