diff --git a/data-room-ui/packages/BigScreenComponentMag/MenuContent.vue b/data-room-ui/packages/BigScreenComponentMag/MenuContent.vue index fd3eca44..87266cdf 100644 --- a/data-room-ui/packages/BigScreenComponentMag/MenuContent.vue +++ b/data-room-ui/packages/BigScreenComponentMag/MenuContent.vue @@ -27,6 +27,6 @@ export default { <style lang="scss" scoped> .right-screen-list-wrap { width: 100%; - padding-bottom: 16px; + // padding-bottom: 16px; } </style> diff --git a/data-room-ui/packages/BigScreenComponentMag/SideMenu.vue b/data-room-ui/packages/BigScreenComponentMag/SideMenu.vue index 1bc05f9b..ed70f367 100644 --- a/data-room-ui/packages/BigScreenComponentMag/SideMenu.vue +++ b/data-room-ui/packages/BigScreenComponentMag/SideMenu.vue @@ -77,7 +77,7 @@ export default { // padding-top: 16px; width: 220px; // height: 100%; - margin-bottom: 16px; + // margin-bottom: 16px; box-sizing: border-box; color: var(--bs-el-title); background-color: var(--bs-background-2); diff --git a/data-room-ui/packages/BigScreenComponentMag/index.vue b/data-room-ui/packages/BigScreenComponentMag/index.vue index 5803faf8..c70f670d 100644 --- a/data-room-ui/packages/BigScreenComponentMag/index.vue +++ b/data-room-ui/packages/BigScreenComponentMag/index.vue @@ -25,6 +25,7 @@ export default { .bs-manage-main-wrap { display: flex; height: 100%; - padding-top: 16px; + background-color: var(--bs-background-1); + // padding-top: 16px; } </style> diff --git a/data-room-ui/packages/BigScreenList/index.vue b/data-room-ui/packages/BigScreenList/index.vue index 3a7b1ea1..1a8a67b5 100644 --- a/data-room-ui/packages/BigScreenList/index.vue +++ b/data-room-ui/packages/BigScreenList/index.vue @@ -315,7 +315,8 @@ export default { .big-screen-list-wrap { position: relative; height: 100%; - margin:0 16px; + // margin:0 16px; + margin-left: 16px; padding: 16px; color: #9ea9b2; background-color: var(--bs-background-2) !important; diff --git a/data-room-ui/packages/BigScreenMag/MenuContent.vue b/data-room-ui/packages/BigScreenMag/MenuContent.vue index 302b92cf..2ec73b49 100644 --- a/data-room-ui/packages/BigScreenMag/MenuContent.vue +++ b/data-room-ui/packages/BigScreenMag/MenuContent.vue @@ -35,6 +35,6 @@ export default { <style lang="scss" scoped> .right-screen-list-wrap { width: 100%; - padding-bottom: 16px; + // padding-bottom: 16px; } </style> diff --git a/data-room-ui/packages/BigScreenMag/SideMenu.vue b/data-room-ui/packages/BigScreenMag/SideMenu.vue index f0f6eb98..a6267a6f 100644 --- a/data-room-ui/packages/BigScreenMag/SideMenu.vue +++ b/data-room-ui/packages/BigScreenMag/SideMenu.vue @@ -256,7 +256,7 @@ export default { // padding-top: 16px; width: 220px; // height: 100%; - margin-bottom: 16px; + // margin-bottom: 16px; box-sizing: border-box; color: var(--bs-el-title); background-color: var(--bs-background-2); diff --git a/data-room-ui/packages/BigScreenMag/index.vue b/data-room-ui/packages/BigScreenMag/index.vue index aa460da1..03d20275 100644 --- a/data-room-ui/packages/BigScreenMag/index.vue +++ b/data-room-ui/packages/BigScreenMag/index.vue @@ -47,6 +47,7 @@ export default { .bs-manage-main-wrap { display: flex; height: 100%; - padding-top: 16px; + background-color: var(--bs-background-1); + // padding-top: 16px; } </style> diff --git a/data-room-ui/packages/ComponentList/index.vue b/data-room-ui/packages/ComponentList/index.vue index 26400bda..e2185dff 100644 --- a/data-room-ui/packages/ComponentList/index.vue +++ b/data-room-ui/packages/ComponentList/index.vue @@ -421,7 +421,8 @@ export default { position: relative; height: 100%; padding: 16px; - margin:0 16px; + // margin:0 16px; + margin-left: 16px; color: #9ea9b2; background-color: var(--bs-background-2) !important; diff --git a/data-room-ui/packages/Layout/BigScreenHomeLayout/index.vue b/data-room-ui/packages/Layout/BigScreenHomeLayout/index.vue index 228588d1..78b8c920 100644 --- a/data-room-ui/packages/Layout/BigScreenHomeLayout/index.vue +++ b/data-room-ui/packages/Layout/BigScreenHomeLayout/index.vue @@ -151,6 +151,7 @@ export default { height: calc(100vh - 150px); background-color: var(--bs-background-1); box-sizing: border-box; + padding: 16px 16px 16px 0; } } diff --git a/data-room-ui/packages/SourceList/index.vue b/data-room-ui/packages/SourceList/index.vue index bfa78c6d..8dcf732f 100644 --- a/data-room-ui/packages/SourceList/index.vue +++ b/data-room-ui/packages/SourceList/index.vue @@ -228,7 +228,7 @@ export default { const isImage = file.type.startsWith('image/') const isVideo = file.type.startsWith('video/') const isValidFileType = isImage || isVideo - console.log(isValidFileType) + if (!isValidFileType) { this.$message.error('只能上传图片或视频文件') } @@ -330,7 +330,8 @@ export default { height: 100%; padding: 16px; color: #9ea9b2; - margin:0 16px; + // margin:0 16px; + margin-left: 16px; background-color: var(--bs-background-2) !important; .top-search-wrap { diff --git a/data-room-ui/packages/SourceMag/MenuContent.vue b/data-room-ui/packages/SourceMag/MenuContent.vue index 588b7a63..c35bec19 100644 --- a/data-room-ui/packages/SourceMag/MenuContent.vue +++ b/data-room-ui/packages/SourceMag/MenuContent.vue @@ -33,6 +33,6 @@ export default { <style lang="scss" scoped> .right-screen-list-wrap { width: 100%; - padding-bottom: 16px; + // padding-bottom: 16px; } </style> diff --git a/data-room-ui/packages/SourceMag/SideMenu.vue b/data-room-ui/packages/SourceMag/SideMenu.vue index de796889..718844aa 100644 --- a/data-room-ui/packages/SourceMag/SideMenu.vue +++ b/data-room-ui/packages/SourceMag/SideMenu.vue @@ -291,7 +291,7 @@ export default { // padding-top: 16px; width: 220px; // height: 100%; - margin-bottom: 16px; + // margin-bottom: 16px; box-sizing: border-box; color: var(--bs-el-title); background-color: var(--bs-background-2); diff --git a/data-room-ui/packages/SourceMag/index.vue b/data-room-ui/packages/SourceMag/index.vue index 1ec7d427..1a8b5e7a 100644 --- a/data-room-ui/packages/SourceMag/index.vue +++ b/data-room-ui/packages/SourceMag/index.vue @@ -44,6 +44,7 @@ export default { .bs-manage-main-wrap { display: flex; height: 100%; - padding-top: 16px; + background-color: var(--bs-background-1); + // padding-top: 16px; } </style> diff --git a/data-room-ui/packages/assets/style/common/index.scss b/data-room-ui/packages/assets/style/common/index.scss index 32dfcb30..ecf1b7b2 100644 --- a/data-room-ui/packages/assets/style/common/index.scss +++ b/data-room-ui/packages/assets/style/common/index.scss @@ -7,10 +7,12 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts'; // 布局样式 .bs-container { height: 100% !important; - width: 100%; - position: absolute; + // width: 100%; + // position: absolute; box-sizing: border-box; - padding: 16px; + // padding: 16px; + margin-left: 16px; + background-color: var(--bs-background-1); .inner-container { height: 100% !important; background-color: var(--bs-background-2); diff --git a/data-room-ui/packages/js/utils/registerConfig.js b/data-room-ui/packages/js/utils/registerConfig.js index 1495d91d..55501711 100644 --- a/data-room-ui/packages/js/utils/registerConfig.js +++ b/data-room-ui/packages/js/utils/registerConfig.js @@ -138,7 +138,8 @@ function registerTheme (config) { '--bs-el-background-3': '#303640', // 组件背景色,表格头部、下拉框hover... '--bs-el-title': '#ffffff', // 标题字体颜色 '--bs-el-text': '#ffffff', // 一般字体颜色 - '--bs-el-border': 'transparent' // 边框颜色 + '--bs-el-border': 'transparent', // 边框颜色 + '--bs-el-color-primary-active': '64, 158, 255' } const mergedTheme = { ...defaultTheme, ...config?.customTheme } const style = document.createElement('style')