From 376bd22e4498a0933ae7f287eb15c0ddad345b74 Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Tue, 10 Oct 2023 16:19:15 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E8=AE=BE=E7=BD=AE=E9=87=8C=E5=8F=8C=E6=BB=9A=E5=8A=A8?= =?UTF-8?q?=E6=9D=A1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data-room-ui/packages/BigScreenDesign/index.vue | 1 - data-room-ui/packages/BizComponent/index.vue | 1 - .../packages/DataSetManagement/src/index.vue | 10 ++++++---- .../packages/DataSetSetting/dataSetSetting.vue | 9 +++++---- .../packages/DataSourceManagement/src/index.vue | 6 ++---- .../packages/DataSourceManagement/style/index.scss | 2 +- data-room-ui/packages/assets/style/bsTheme.scss | 2 +- data-room-ui/packages/assets/style/common/index.scss | 12 ++++++------ .../packages/assets/style/zTree/treePackUp.scss | 2 +- 9 files changed, 22 insertions(+), 23 deletions(-) diff --git a/data-room-ui/packages/BigScreenDesign/index.vue b/data-room-ui/packages/BigScreenDesign/index.vue index bfa0bcf9..e75cc4f9 100644 --- a/data-room-ui/packages/BigScreenDesign/index.vue +++ b/data-room-ui/packages/BigScreenDesign/index.vue @@ -206,7 +206,6 @@ export default { }, watch: { chartList (val) { - // console.log(val,this.activeCode) // if(val.findIndex(item=>item.code==this.activeCode)==-1){ // this.updateRightVisiable(false) // } diff --git a/data-room-ui/packages/BizComponent/index.vue b/data-room-ui/packages/BizComponent/index.vue index 82862a25..2fae58e5 100644 --- a/data-room-ui/packages/BizComponent/index.vue +++ b/data-room-ui/packages/BizComponent/index.vue @@ -350,7 +350,6 @@ export default { } catch (error) { console.info(error) } - console.log(dataUrl) if (dataUrl) { if (showSize(dataUrl) > 200) { const url = dataURLtoBlob(dataUrl) diff --git a/data-room-ui/packages/DataSetManagement/src/index.vue b/data-room-ui/packages/DataSetManagement/src/index.vue index 887a155e..9577ad50 100644 --- a/data-room-ui/packages/DataSetManagement/src/index.vue +++ b/data-room-ui/packages/DataSetManagement/src/index.vue @@ -811,10 +811,12 @@ export default { padding-left: 16px !important; } .bs-pagination { - padding: 0 !important; - right: 16px !important; - bottom: 16px !important; - position: absolute !important; + margin-top: 4px; + padding-right: 16px; + // padding: 0 !important; + // right: 16px !important; + // bottom: 16px !important; + // position: absolute !important; ::v-deep .el-input__inner { width: 110px !important; border:none; diff --git a/data-room-ui/packages/DataSetSetting/dataSetSetting.vue b/data-room-ui/packages/DataSetSetting/dataSetSetting.vue index c321160d..8e582716 100644 --- a/data-room-ui/packages/DataSetSetting/dataSetSetting.vue +++ b/data-room-ui/packages/DataSetSetting/dataSetSetting.vue @@ -195,13 +195,14 @@ export default { .data-set-wrap { ::v-deep .el-dialog__body { - position: relative; + height: 100% !important; padding: 0 !important; + min-width: 515px !important; // min-height: 550px; - overflow: hidden; + overflow: hidden !important; .bs-pagination { - position: relative !important; + position: none !important; padding-right: 16px !important; } } @@ -245,7 +246,7 @@ export default { } ::v-deep .data-set-scrollbar { - height: 515px !important; + overflow-y: auto !important; } } } diff --git a/data-room-ui/packages/DataSourceManagement/src/index.vue b/data-room-ui/packages/DataSourceManagement/src/index.vue index 24ff2f2f..f65b399b 100644 --- a/data-room-ui/packages/DataSourceManagement/src/index.vue +++ b/data-room-ui/packages/DataSourceManagement/src/index.vue @@ -325,10 +325,8 @@ export default { @import '../../assets/style/bsTheme.scss'; .bs-pagination { - padding: 0 !important; - right: 16px !important; - bottom: 16px !important; - position: absolute !important; + margin-top: 4px; + padding-right: 16px; ::v-deep .el-input__inner { width: 110px !important; diff --git a/data-room-ui/packages/DataSourceManagement/style/index.scss b/data-room-ui/packages/DataSourceManagement/style/index.scss index f3ab6c88..66513763 100644 --- a/data-room-ui/packages/DataSourceManagement/style/index.scss +++ b/data-room-ui/packages/DataSourceManagement/style/index.scss @@ -148,7 +148,7 @@ } .el-dialog { .bs-container { - max-height: calc(90vh - 236px); + // max-height: calc(90vh - 236px); .el-table { max-height: calc(90vh - 340px); } diff --git a/data-room-ui/packages/assets/style/bsTheme.scss b/data-room-ui/packages/assets/style/bsTheme.scss index 3c77fb9a..a1a1a454 100644 --- a/data-room-ui/packages/assets/style/bsTheme.scss +++ b/data-room-ui/packages/assets/style/bsTheme.scss @@ -303,7 +303,7 @@ } ::v-deep .el-scrollbar { - height: 300px; + max-height: 440px !important; overflow-x: hidden !important; .el-scrollbar__view { diff --git a/data-room-ui/packages/assets/style/common/index.scss b/data-room-ui/packages/assets/style/common/index.scss index cfdc478b..cc562630 100644 --- a/data-room-ui/packages/assets/style/common/index.scss +++ b/data-room-ui/packages/assets/style/common/index.scss @@ -39,10 +39,10 @@ $--font-path: "~element-ui/lib/theme-chalk/fonts"; // page页样式 .bs-pagination { - position: absolute; - right: 0; - bottom: 16px; - padding: 0 10px 0px 16px; + // position: absolute; + // right: 0; + // bottom: 16px; + padding-right: 16px; } //输入框样式 @@ -280,7 +280,7 @@ $--font-path: "~element-ui/lib/theme-chalk/fonts"; .el-dialog__body { padding: 16px !important; - max-height: calc(90vh - 165px) !important; + max-height: calc(90vh - 150px) !important; min-height: 200px; overflow-y: auto; } @@ -333,5 +333,5 @@ $--font-path: "~element-ui/lib/theme-chalk/fonts"; } .el-dialog__footer{ - padding: 16px !important; + padding: 12px 16px !important; } diff --git a/data-room-ui/packages/assets/style/zTree/treePackUp.scss b/data-room-ui/packages/assets/style/zTree/treePackUp.scss index 53632f68..990f0069 100644 --- a/data-room-ui/packages/assets/style/zTree/treePackUp.scss +++ b/data-room-ui/packages/assets/style/zTree/treePackUp.scss @@ -137,5 +137,5 @@ .right-box { width: 75%; margin-left: 16px; - position: relative; + // position: relative; }