diff --git a/src/assets/css/index.css b/src/assets/css/index.css index bfc9d256b3504f25b907e842e3d68361c66b624c..36305e52a5b53863964a0946ae8913bf18b9b599 100644 --- a/src/assets/css/index.css +++ b/src/assets/css/index.css @@ -994,39 +994,32 @@ border-radius:8px; display: flex; } -.top_fliter .filter_list { +.filter_list { flex-grow: 1; - min-width: 550px; font-size: 0; - padding-left: 16px; } - -.filter_list>.filter_item { - display: inline-block; - vertical-align: middle; - margin-top: 16px; -} - .filter_list>.filter_item { - margin-right:34px; + display: flex; + align-items: center; + margin: 0 34px 16px 0; } -.filter_list>.filter_item>* { +/* .filter_list>.filter_item>* { display: inline-block; vertical-align: middle; -} +} */ .filter_list>.filter_item>.filter_title { - min-width: 56px; text-align: right; font-size: 14px; - font-weight: 700; color: #242c43; margin-right: 10px; - white-space: nowrap; + width: 84px; + white-space: pre-wrap; + font-weight: normal; } -.filter_list>.filter_item>.filter_title+* { +/* .filter_list>.filter_item>.filter_title+* { width: 300px; } @@ -1038,7 +1031,7 @@ border-radius:8px; position: absolute; right: 5px; top: 1px; -} +} */ .top_fliter .filter_action { flex-shrink: 0; diff --git a/src/assets/item.css b/src/assets/item.css index c137c3e0248e4849c7e8f517da3aab5832e3effb..f5de29d9b6735bd1dc6fb908a3d668eb8f76ee35 100644 --- a/src/assets/item.css +++ b/src/assets/item.css @@ -1,83 +1,82 @@ :root { - --font-color: #404a62; - /* --el-color-primary-light-9: #f7f7f9; */ + --font-color: #404a62; + /* --el-color-primary-light-9: #f7f7f9; */ + --el-color-white: #ffffff; + --el-color-black: #1a1a1a; + --el-color-primary: #2b4695; + --el-color-primary-light-3: #6b7eb5; + --el-color-primary-light-5: #95a3ca; + --el-color-primary-light-7: #c0c8df; + --el-color-primary-light-8: #d5daea; + --el-color-primary-light-9: #eaedf5; + --el-color-primary-dark-2: #223877; + --el-color-success: #429e8a; + --el-color-success-light-3: #7bbbad; + --el-color-success-light-5: #a1cfc5; + --el-color-success-light-7: #c7e2dc; + --el-color-success-light-8: #d9ece8; + --el-color-success-light-9: #ecf5f4; + --el-color-success-dark-2: #357e6e; + --el-color-warning: #e56600; + --el-color-warning-light-3: #ed944d; + --el-color-warning-light-5: #f2b380; + --el-color-warning-light-7: #f7d1b3; + --el-color-warning-light-8: #fae0cc; + --el-color-warning-light-9: #fcf0e6; + --el-color-warning-dark-2: #b75200; + --el-color-danger: #d75138; + --el-color-danger-light-3: #e38674; + --el-color-danger-light-5: #eba89c; + --el-color-danger-light-7: #f3cbc4; + --el-color-danger-light-8: #f7dcd7; + --el-color-danger-light-9: #fbeeeb; + --el-color-danger-dark-2: #ac412d; + --el-color-error: #d75138; + --el-color-error-light-3: #e38674; + --el-color-error-light-5: #eba89c; + --el-color-error-light-7: #f3cbc4; + --el-color-error-light-8: #f7dcd7; + --el-color-error-light-9: #fbeeeb; + --el-color-error-dark-2: #ac412d; + --el-color-info: #404a62; + --el-color-info-light-3: #7a8191; + --el-color-info-light-5: #a0a5b1; + --el-color-info-light-7: #c6c9d0; + --el-color-info-light-8: #d9dbe0; + --el-color-info-light-9: #ecedf0; + --el-color-info-dark-2: #333b4e; + --el-bg-color: #ffffff; + --el-bg-color-page: #f2f3f5; + --el-bg-color-overlay: #ffffff; + --el-text-color-primary: #202531; + --el-text-color-regular: #404a62; + --el-text-color-secondary: #909bb6; + --el-text-color-placeholder: #a9b1c7; + --el-text-color-disabled: #a9b1c7; + --el-border-color: #dadee7; + --el-border-color-light: #e3e5eb; + --el-border-color-lighter: #e6e9ef; + --el-border-color-extra-light: #edf0f5; + --el-border-color-dark: #d1d5de; + --el-border-color-darker: #cbced7; + --el-fill-color: #f0f2f5; + --el-fill-color-light: #f2f3f7; + --el-fill-color-lighter: #f7f7f9; + --el-fill-color-extra-light: #fafcff; + --el-fill-color-dark: #ebedf0; + --el-fill-color-darker: #e6e8eb; + --el-fill-color-blank: #ffffff; + --el-component-size: 36px; +} - --el-color-white: #ffffff; - --el-color-black: #1a1a1a; - --el-color-primary: #2b4695; - --el-color-primary-light-3: #6b7eb5; - --el-color-primary-light-5: #95a3ca; - --el-color-primary-light-7: #c0c8df; - --el-color-primary-light-8: #d5daea; - --el-color-primary-light-9: #eaedf5; - --el-color-primary-dark-2: #223877; - --el-color-success: #429e8a; - --el-color-success-light-3: #7bbbad; - --el-color-success-light-5: #a1cfc5; - --el-color-success-light-7: #c7e2dc; - --el-color-success-light-8: #d9ece8; - --el-color-success-light-9: #ecf5f4; - --el-color-success-dark-2: #357e6e; - --el-color-warning: #e56600; - --el-color-warning-light-3: #ed944d; - --el-color-warning-light-5: #f2b380; - --el-color-warning-light-7: #f7d1b3; - --el-color-warning-light-8: #fae0cc; - --el-color-warning-light-9: #fcf0e6; - --el-color-warning-dark-2: #b75200; - --el-color-danger: #d75138; - --el-color-danger-light-3: #e38674; - --el-color-danger-light-5: #eba89c; - --el-color-danger-light-7: #f3cbc4; - --el-color-danger-light-8: #f7dcd7; - --el-color-danger-light-9: #fbeeeb; - --el-color-danger-dark-2: #ac412d; - --el-color-error: #d75138; - --el-color-error-light-3: #e38674; - --el-color-error-light-5: #eba89c; - --el-color-error-light-7: #f3cbc4; - --el-color-error-light-8: #f7dcd7; - --el-color-error-light-9: #fbeeeb; - --el-color-error-dark-2: #ac412d; - --el-color-info: #404a62; - --el-color-info-light-3: #7a8191; - --el-color-info-light-5: #a0a5b1; - --el-color-info-light-7: #c6c9d0; - --el-color-info-light-8: #d9dbe0; - --el-color-info-light-9: #ecedf0; - --el-color-info-dark-2: #333b4e; - --el-bg-color: #ffffff; - --el-bg-color-page: #f2f3f5; - --el-bg-color-overlay: #ffffff; - --el-text-color-primary: #202531; - --el-text-color-regular: #404a62; - --el-text-color-secondary: #909bb6; - --el-text-color-placeholder: #a9b1c7; - --el-text-color-disabled: #a9b1c7; - --el-border-color: #dadee7; - --el-border-color-light: #e3e5eb; - --el-border-color-lighter: #e6e9ef; - --el-border-color-extra-light: #edf0f5; - --el-border-color-dark: #d1d5de; - --el-border-color-darker: #cbced7; - --el-fill-color: #f0f2f5; - --el-fill-color-light: #f2f3f7; - --el-fill-color-lighter: #f7f7f9; - --el-fill-color-extra-light: #fafcff; - --el-fill-color-dark: #ebedf0; - --el-fill-color-darker: #e6e8eb; - --el-fill-color-blank: #ffffff; - } - - .text-hide1{ - overflow: hidden; - text-overflow:ellipsis; - white-space: nowrap; - } - - .log_content_nor::-webkit-scrollbar { - width: 0px; /*对垂直流动条有效*/ - height: 0px; /*对水平流动条有效*/ - } \ No newline at end of file +.text-hide1{ + overflow: hidden; + text-overflow:ellipsis; + white-space: nowrap; +} +.log_content_nor::-webkit-scrollbar { + width: 0px; /*对垂直流动条有效*/ + height: 0px; /*对水平流动条有效*/ +} \ No newline at end of file diff --git a/src/bg-ui/bg-filter-group.vue b/src/bg-ui/bg-filter-group.vue index ed64fd5314a84a7ad0dc723f01e41ac4dd821664..3e38179083eb4a0fbc7fdbad94c1b5f7e303cf99 100644 --- a/src/bg-ui/bg-filter-group.vue +++ b/src/bg-ui/bg-filter-group.vue @@ -28,7 +28,7 @@ \ No newline at end of file diff --git a/src/bg-ui/bg-table.vue b/src/bg-ui/bg-table.vue index 437e28f311c70c346f18ced289dac29bcb7504f8..1239ccb9236e5c6737083b117aed0025f779180a 100644 --- a/src/bg-ui/bg-table.vue +++ b/src/bg-ui/bg-table.vue @@ -7,6 +7,8 @@ @select="selectActionRow" @select-all="selectActionAll" :stripe="stripe" + :row-class-name="stripe ? tableRowClassName : ''" + tooltip-effect="light" > + @@ -111,7 +117,11 @@ export default { stripe: { type: Boolean, default: false - } + }, + paddingLeft: { + type: [Number, String], + default: () => 33, + }, }, /* filters: { ellipsis(value, max) { @@ -172,7 +182,14 @@ export default { this.allSelectData={} this.nowSelectData=[] this.clearSelection(); - } + }, + tableRowClassName({ row, rowIndex }) { + if (rowIndex % 2 == 0) { + return "white-row"; + } else { + return "stripe-row"; + } + }, }, }; diff --git a/src/bg-ui/index.js b/src/bg-ui/index.js index 62c577995b0a6231c0d4ebf8c2ea6c69f692f923..3c997eab95d366818ed647a9eed24aa75342d814 100644 --- a/src/bg-ui/index.js +++ b/src/bg-ui/index.js @@ -32,6 +32,7 @@ import debounce from './debounce' import BgPagination from './bg-pagination.vue' import BgInnerTabs from './bg-inner-tabs.vue' + import BgFilterGroup from './bg-filter-group.vue' const components = { BgIcon,//字体图标 @@ -65,6 +66,7 @@ const components = { debounce,//防抖组件 BgPagination,// 分页组件 BgInnerTabs,//内部tab + BgFilterGroup,//高级搜索 }; const install = (Vue) => { diff --git a/src/bg-ui/index.scss b/src/bg-ui/index.scss index 6c40e06d0f63b096decfe1a1637692278f367fd9..d6a458c429e0d0c363c0b7e0025958d44b483a14 100644 --- a/src/bg-ui/index.scss +++ b/src/bg-ui/index.scss @@ -669,7 +669,6 @@ a { &.el-table--border { border-top-color: #b0bee8; - border-bottom: 1px solid #ebeef5; .el-table__header-wrapper { position: relative; @@ -687,7 +686,7 @@ a { &::after { content: ""; - width: 1px; + width: 0px; height: 100%; background-color: #b0bee8; position: absolute; @@ -705,7 +704,12 @@ a { } } } - + .stripe-row td { + background-color: #fff!important; + } + .white-row td { + background-color: #f7f7f9!important; + } .el-table--striped .el-table__body tr.el-table__row--striped td { background-color: #f7f7f9; } @@ -738,6 +742,15 @@ a { margin: 0 !important; } } + .el-popper { + max-width: 388px; + padding: 15px 12px; + color: #202531; + box-shadow: 0px 4px 12px 0px + rgba(18, 30, 63, 0.1); + border: solid 1px #e6e9ef; + font-size: 14px; + } } .bg-table-pro{ @@ -2312,9 +2325,8 @@ a { .bg-pagination { height: 32px; - position: absolute; - right: 24px; - bottom: 16px; + margin-top: 16px; + float: right; .el-pagination { text-align: center; margin: 0 auto; diff --git a/src/page/main/config/dict/index.vue b/src/page/main/config/dict/index.vue index 0791bec0e4ed8f6aefe8a48daa347beae721b912..43118a31d7c8246e16e220287bf5944bace57d0f 100644 --- a/src/page/main/config/dict/index.vue +++ b/src/page/main/config/dict/index.vue @@ -6,50 +6,81 @@ 字典配置 -
-
- +
+
+
+ -
-
- {{item.name}} +
+
+ {{item.name}} +
-
- -
- - - 新建 - -
-
- - -