diff --git a/frontend/src/components/ProTable/index.vue b/frontend/src/components/ProTable/index.vue index f556b79..c0395f0 100644 --- a/frontend/src/components/ProTable/index.vue +++ b/frontend/src/components/ProTable/index.vue @@ -10,7 +10,7 @@ /> -
+
@@ -126,6 +126,7 @@ export interface ProTableProps { requestError?: (params: any) => void; // 表格 api 请求错误监听 ==> 非必传 dataCallback?: (data: any) => any; // 返回数据的回调函数,可以对数据进行处理 ==> 非必传 title?: string; // 表格标题 ==> 非必传 + showCard?: boolean; // 下个是否需要卡片 pagination?: boolean; // 是否需要分页组件 ==> 非必传(默认为true) initParam?: any; // 初始化请求参数 ==> 非必传(默认为{}) border?: boolean; // 是否带有纵向边框 ==> 非必传(默认为true) @@ -141,6 +142,7 @@ const props = withDefaults(defineProps(), { pagination: true, initParam: {}, border: true, + showCard: true, toolButton: true, rowKey: 'id', searchCol: () => ({ xs: 1, sm: 2, md: 2, lg: 3, xl: 4 }), diff --git a/frontend/src/styles/element.scss b/frontend/src/styles/element.scss index 71a9d53..a163182 100644 --- a/frontend/src/styles/element.scss +++ b/frontend/src/styles/element.scss @@ -500,6 +500,18 @@ } } + + .el-message-box__headerbtn{ + top: 5px; + } + .el-message-box__close{ + svg{ + color: #fff; + } + :hover{ + color: #409eff; + } + } .el-message-box__content{ padding: 10px ; border-bottom: 1px solid #cccccc; @@ -507,4 +519,60 @@ .el-message-box__btns { padding: 10px;} - } \ No newline at end of file + } + + .form-one { + display: flex; + flex-wrap: wrap; + justify-content: space-between; + .el-form-item { + display: flex; + width: 98%; + margin-bottom: 15px !important; + .el-form-item__content { + flex: 1; + .el-select, + .el-cascader, + .el-input__inner, + .el-date-editor { + width: 100%; + } + } + } +} +.form-two { + display: flex; + flex-wrap: wrap; + justify-content: space-between; + .el-form-item { + display: flex; + width: 48%; + .el-form-item__content { + flex: 1; + .el-select, + .el-cascader, + .el-input__inner, + .el-date-editor { + width: 100%; + } + } + } +} +.form-three { + display: flex; + flex-wrap: wrap; + // justify-content: space-between; + .el-form-item { + display: flex; + width: 32.3%; + .el-form-item__content { + flex: 1; + .el-select, + .el-cascader, + .el-input__inner, + .el-date-editor { + width: 100%; + } + } + } +} \ No newline at end of file diff --git a/frontend/src/views/home/components/channelsTest.vue b/frontend/src/views/home/components/channelsTest.vue index 6e6da25..852f672 100644 --- a/frontend/src/views/home/components/channelsTest.vue +++ b/frontend/src/views/home/components/channelsTest.vue @@ -1,279 +1,283 @@ diff --git a/frontend/src/views/home/components/channelsTestTable.vue b/frontend/src/views/home/components/channelsTestTable.vue index 2f80d43..2b14a96 100644 --- a/frontend/src/views/home/components/channelsTestTable.vue +++ b/frontend/src/views/home/components/channelsTestTable.vue @@ -1,11 +1,11 @@