diff --git a/src/assets/css/base.css b/src/assets/css/base.css index bc8c84d..bb783fd 100644 --- a/src/assets/css/base.css +++ b/src/assets/css/base.css @@ -12,17 +12,44 @@ body { width: 100%; height: 100%; } +a { + text-decoration: none; +} +li { + list-style: none; +} #app { width: 100%; height: 100%; } /* table样式 */ -.el-table--mini td, .el-table--mini th { - padding: 3px 0; +.el-table th { + background: linear-gradient(180deg, #FAFCFC 0%, #EEEEEE 47%, #E7E7E7 100%); +} +.el-table--border td { + border-bottom: 2px solid #D5D5D5; +} +.el-table--border td { + border-right: 2px solid #D5D5D5; +} +.el-table th.is-leaf { + border-right: none !important; +} +.el-table tr td:first-child { + border-left: 2px solid #D5D5D5; +} +.el-table thead { color: #3D3D42; } -.el-table__row:nth-child(even) { - background: #F7F7F7; +.el-table th>.cell { + font-size: 16px; + font-family: PingFangSC-Medium, PingFang SC; + color: #3D3D42; +} +.el-table .el-table__body .cell { + font-size: 14px; + font-family: PingFangSC-Medium, PingFang SC; + color: #5C5A5A; } .el-table .el-table__body tr.current-row>td { background: linear-gradient(180deg, #327e77 0%, #2c9b92 46%, #1e524d 100%); @@ -30,6 +57,9 @@ body { .el-table .el-table__body tr.current-row>td div { color: #fff; } +.el-table--mini td, .el-table--mini th{ + padding: 3px 0; +} /* button样式 */ .el-button { color: #5C5A5A; @@ -40,6 +70,11 @@ body { color: #5C5A5A; border: 1px solid #C3C3C3; } +.el-button.is-disabled, .el-button.is-disabled:focus, .el-button.is-disabled:hover { + background: #C3C3C3; + border-color: #C3C3C3; + color: #fff; +} .el-table:before { height: 0; } @@ -52,9 +87,7 @@ body { .pagination-container { position: relative; height: 25px; - margin-bottom: 10px; - margin-top: 15px; - padding: 10px 20px !important; + padding: 8px 20px !important; } .pagination-container .el-pagination { @@ -114,8 +147,10 @@ body { } /* 新增按钮样式 */ .add-button-style { - width: 144px; - height: 40px; + width: 72px; + height: 32px !important; + min-height: 32px; + padding: 0; background: linear-gradient(180deg, #35B0A6 0%, #1E524D 100%); box-shadow: 0px 1px 1px 0px #FFFFFF; border-radius: 2px; @@ -132,7 +167,7 @@ body { } /* 搜索按钮样式 */ .search-button-style { - height: 40px; + height: 32px; background: linear-gradient(180deg, #35B0A6 0%, #1E524D 100%); border-radius: 2px; border: 1px solid #1E5353; @@ -149,7 +184,7 @@ body { } /* 重置按钮样式 */ .reset-button-style { - height: 40px; + height: 32px; background: linear-gradient(180deg, #EAEDED 0%, #FFFFFF 43%, #E7E7E7 100%); border-radius: 2px; border: 1px solid #CCCCCC; @@ -203,6 +238,8 @@ body { border-radius: 2px; border: 2px solid #CCCCCC; color: #5F6266; + height: 32px; + line-height: 32px; } .el-input__inner::placeholder { font-family: PingFang-SC-Medium, PingFang-SC; @@ -216,8 +253,8 @@ body { line-height: 42px; } .el-input--medium .el-input__inner { - height: 40px; - line-height: 40px; + height: 32px; + line-height: 32px; } .el-input__inner:focus { border: 2px solid #CCCCCC; @@ -236,6 +273,11 @@ body { padding: 0; border: none; } +.el-input-number__decrease, .el-input-number__increase { + height: 29px; + line-height: 29px; + top: 5px; +} /* select筛选框样式 */ .el-select { width: 100%; @@ -243,6 +285,9 @@ body { .el-select .el-input.is-focus .el-input__inner, .el-select .el-input__inner:focus { border-color: #CCCCCC; } +.el-select-dropdown__item.is-disabled:hover { + background: #2D9B8E; +} .el-select-dropdown__item.hover, .el-select-dropdown__item:hover { background: #2D9B8E; color: #fff; @@ -250,11 +295,14 @@ body { .el-form .el-select .el-input__suffix { right: 0; width: 48px; - height: 36px; - line-height: 36px; + height: 28px; + line-height: 28px; border: 2px solid #CCCCCC; background: linear-gradient(180deg, #EAEDED 0%, #FFFFFF 43%, #E7E7E7 100%); } +.el-select .el-input__icon { + line-height: normal; +} /* textarea框 */ .el-textarea__inner, .el-textarea__inner:focus { border: 2px solid #CCCCCC; @@ -303,6 +351,14 @@ body { border-top: 1px solid #C6C6C6; padding: 24px 40px 40px; } +.dialog-delete-button, .el-message-box__btns button:nth-child(2) { + width: 144px; + height: 40px; + background: linear-gradient(180deg, #ec8a8a 0%, #FF3B31 100%); + border-radius: 2px; + border: 1px solid #FF3B31 !important; + color: #fff !important; +} .dialog-submit-button, .el-message-box__btns button:nth-child(2) { width: 144px; height: 40px; @@ -320,16 +376,16 @@ body { margin-left: 40px !important; } .el-dialog .el-button--primary{ - width: 144px; - height: 40px; + width: 72px; + height: 30px; background: linear-gradient(180deg, #35B0A6 0%, #1E524D 100%); border-radius: 2px; border: 1px solid #1E5353; color: #fff; } .el-dialog .el-button--default{ - width: 144px; - height: 40px; + width: 72px; + height: 30px; border-radius: 2px; border: 1px solid #5C5A5A; color: #3D3D42; @@ -337,8 +393,8 @@ body { } .el-dialog .el-button--danger{ - width: 144px; - height: 40px; + width: 72px; + height: 30px; border-radius: 2px; color: #fff; } @@ -400,9 +456,9 @@ body { } /* 列表修改 删除按钮样式 */ .edit-button-style { - width: 70px; - height: 24px; - padding: 0; + min-width: 50px !important; + height: 24px !important; + padding: 0 10px; min-height: 24px; } /* 查询条件 */ @@ -412,12 +468,15 @@ body { /* form表单样式 */ .el-input-group__append .el-button { width: 102px; - height: 40px; + height: 32px; background: linear-gradient(180deg, #EAEDED 0%, #FFFFFF 43%, #E7E7E7 100%); border-radius: 2px; border: 2px solid #CCCCCC; margin: 0; } +.el-form-item .el-input,.el-input-number{ + width: 100%; +} /* checkbox */ .el-checkbox__input.is-checked+.el-checkbox__label { color: #3D3D42; @@ -430,4 +489,59 @@ body { } .el-checkbox__inner:hover, .el-checkbox__input.is-focus .el-checkbox__inner { border-color: #979797; +} +/* 穿梭框 */ +.el-transfer { + width: 100%; +} +.el-checkbox-group { + display: flex; + flex-direction: column; +} +.el-transfer__buttons { + width: 130px !important; +} +.el-transfer-panel { + width: calc((100% - 190px) / 2); +} +.el-transfer__buttons { + display: inline-flex; +} +.el-transfer__button:first-child { + margin-bottom: 0; +} +.el-transfer__button { + width: 60px !important; + border-radius: 4px; +} +.el-transfer__button.is-disabled:hover { + color: #FFF; + border: 1px solid #1E5353; + background: linear-gradient(180deg, #35B0A6 0%, #1E524D 100%); +} +/* tabs样式 */ +.el-tabs--card>.el-tabs__header { + background: #DFDFDF; + border: 2px solid #979797; +} +.el-tabs--card>.el-tabs__header .el-tabs__item { + background: linear-gradient(180deg, #EAEDED 0%, #FFFFFF 43%, #E7E7E7 100%); + /* box-shadow: 0px 4px 3px 0px #FFFFFF; */ + border-radius: 2px; + border: 2px solid #B9B9B9; + color: #2D3940; + height: 36px; + line-height: 31px; +} +.el-tabs__nav-wrap { + margin-bottom: -2px; +} +.el-tabs--top .el-tabs__item.is-top:nth-child(n+2) { + border-left: none; +} +.el-tabs--card>.el-tabs__header .el-tabs__item.is-active { + border-bottom-color: transparent; +} +.el-tabs__header { + margin: 0 0 13px; } \ No newline at end of file diff --git a/src/views/etl/components/configuration.vue b/src/views/etl/components/configuration.vue index 3482f3e..658aa45 100644 --- a/src/views/etl/components/configuration.vue +++ b/src/views/etl/components/configuration.vue @@ -28,7 +28,7 @@ - + - + @@ -46,6 +47,8 @@ + + @@ -55,6 +58,7 @@ import ContentContainer from "../../components/ContentContainer.vue" import EditTemplate from "./components/edit.vue" import Configuration from "./components/configuration.vue" + import ConfiguringParameters from "./components/configuringParameters.vue" import { ListMixin } from '@/mixins/ListMixin' import { post } from "../../server/api.js"; export default { @@ -63,7 +67,8 @@ SearchTemplate, ContentContainer, EditTemplate, - Configuration + Configuration, + ConfiguringParameters }, mixins: [ListMixin], // mixins 里面封装了操作列表的共用方法,直接引入mixins即可 data() { @@ -132,6 +137,11 @@ this.item=item; this.changeDialogStatus('configuration'); }, + // 配置脚本参数 + configuringParameters(item) { + this.item=item; + this.changeDialogStatus('configuringParameters'); + }, // 搜索按钮操作 handleQuery() { if (this.pagination.sourcetable === '') this.pagination.sourcetable = undefined diff --git a/src/views/oneimport/components/edit.vue b/src/views/oneimport/components/edit.vue index 8142107..835e685 100644 --- a/src/views/oneimport/components/edit.vue +++ b/src/views/oneimport/components/edit.vue @@ -50,14 +50,8 @@ - - - - - - +