From f146b547d60fa769a86a5307124235875f5b1a3b Mon Sep 17 00:00:00 2001 From: "liu.shiyi" Date: Wed, 30 Aug 2023 16:44:36 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=9A=84=E6=9A=97=E9=BB=91=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E8=83=8C=E6=99=AF=E8=89=B2=E9=80=8F=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BasicComponents/CurrentTime/index.vue | 2 +- .../CurrentTime/settingConfig.js | 2 +- .../ScreenScrollBoard/index.vue | 2 +- .../ScreenScrollRanking/index.vue | 2 +- .../packages/BasicComponents/Tables/index.vue | 6 +- .../BasicComponents/Tables/settingConfig.js | 4 +- .../BasicComponents/TimeCountDown/index.vue | 2 +- .../TimeCountDown/settingConfig.js | 2 +- .../BigScreenDesign/OverallSetting/index.vue | 3 +- .../BigScreenDesign/PageDesignTop.vue | 61 ++++++++++++------- 10 files changed, 50 insertions(+), 36 deletions(-) diff --git a/data-room-ui/packages/BasicComponents/CurrentTime/index.vue b/data-room-ui/packages/BasicComponents/CurrentTime/index.vue index fa3b3e58..ea09a316 100644 --- a/data-room-ui/packages/BasicComponents/CurrentTime/index.vue +++ b/data-room-ui/packages/BasicComponents/CurrentTime/index.vue @@ -117,7 +117,7 @@ export default { color: #000000; } .dark-theme { - background-color: #000000; + background-color:transparent; color: #ffffff; } .auto-theme { diff --git a/data-room-ui/packages/BasicComponents/CurrentTime/settingConfig.js b/data-room-ui/packages/BasicComponents/CurrentTime/settingConfig.js index 39f5ef21..342f7cc8 100644 --- a/data-room-ui/packages/BasicComponents/CurrentTime/settingConfig.js +++ b/data-room-ui/packages/BasicComponents/CurrentTime/settingConfig.js @@ -21,7 +21,7 @@ const customConfig = { customize: { fontSize: 28, fontWeight: 700, - color: '#ffffff' + color: 'rgb(155 159 172)' } } diff --git a/data-room-ui/packages/BasicComponents/ScreenScrollBoard/index.vue b/data-room-ui/packages/BasicComponents/ScreenScrollBoard/index.vue index 8b962aad..9f169738 100644 --- a/data-room-ui/packages/BasicComponents/ScreenScrollBoard/index.vue +++ b/data-room-ui/packages/BasicComponents/ScreenScrollBoard/index.vue @@ -5,7 +5,7 @@ > diff --git a/data-room-ui/packages/BasicComponents/ScreenScrollRanking/index.vue b/data-room-ui/packages/BasicComponents/ScreenScrollRanking/index.vue index 2d62e6d3..c235856b 100644 --- a/data-room-ui/packages/BasicComponents/ScreenScrollRanking/index.vue +++ b/data-room-ui/packages/BasicComponents/ScreenScrollRanking/index.vue @@ -6,7 +6,7 @@ diff --git a/data-room-ui/packages/BasicComponents/Tables/index.vue b/data-room-ui/packages/BasicComponents/Tables/index.vue index b2b67d89..166903ad 100644 --- a/data-room-ui/packages/BasicComponents/Tables/index.vue +++ b/data-room-ui/packages/BasicComponents/Tables/index.vue @@ -68,9 +68,8 @@ export default { computed: { headerCellStyle () { const headerBackgroundColor = { - dark: '#141414', light: '#ffffff', - auto: 'transparent' + dark: 'transparent' } if (document.getElementById(this.config.code)?.querySelector('tr')) { document @@ -124,9 +123,8 @@ export default { cellStyle ({ row, column, rowIndex, columnIndex }) { const bodyBackgroundColor = { - dark: '#141414', light: '#ffffff', - auto: 'transparent' + dark: 'transparent' } const initColor = this.customTheme === 'light' ? '#000000' : '#ffffff' const style = { diff --git a/data-room-ui/packages/BasicComponents/Tables/settingConfig.js b/data-room-ui/packages/BasicComponents/Tables/settingConfig.js index 64a38426..eef6938a 100644 --- a/data-room-ui/packages/BasicComponents/Tables/settingConfig.js +++ b/data-room-ui/packages/BasicComponents/Tables/settingConfig.js @@ -41,13 +41,13 @@ const customConfig = { // 表格头部背景颜色 headerBackgroundColor: '#232832', // 表格头部字体颜色 - headerFontColor: '#ffffff', + headerFontColor: '#fff', // 表格头部字体大小 headerFontSize: 14, // 表格主体背景颜色 bodyBackgroundColor: '', // 表格主体字体颜色 - bodyFontColor: '#ffffff', + bodyFontColor: 'rgb(155 159 172)', // 表格主体字体大小 bodyFontSize: 14, // 表格是否需要斑马纹 diff --git a/data-room-ui/packages/BasicComponents/TimeCountDown/index.vue b/data-room-ui/packages/BasicComponents/TimeCountDown/index.vue index 8505fec9..c654948c 100644 --- a/data-room-ui/packages/BasicComponents/TimeCountDown/index.vue +++ b/data-room-ui/packages/BasicComponents/TimeCountDown/index.vue @@ -176,7 +176,7 @@ export default { color: #000000; } .dark-theme { - background-color: #000000; + background-color: transparent; color: #ffffff; } .auto-theme { diff --git a/data-room-ui/packages/BasicComponents/TimeCountDown/settingConfig.js b/data-room-ui/packages/BasicComponents/TimeCountDown/settingConfig.js index 0a9ec7c3..7c7be7b8 100644 --- a/data-room-ui/packages/BasicComponents/TimeCountDown/settingConfig.js +++ b/data-room-ui/packages/BasicComponents/TimeCountDown/settingConfig.js @@ -20,7 +20,7 @@ const customConfig = { customize: { fontSize: 28, fontWeight: 700, - color: '#ffffff' + color: 'rgb(155 159 172)' } } diff --git a/data-room-ui/packages/BigScreenDesign/OverallSetting/index.vue b/data-room-ui/packages/BigScreenDesign/OverallSetting/index.vue index 6150a0b5..7805b42a 100644 --- a/data-room-ui/packages/BigScreenDesign/OverallSetting/index.vue +++ b/data-room-ui/packages/BigScreenDesign/OverallSetting/index.vue @@ -361,7 +361,8 @@ export default { 'changePageConfig', 'changeLayout', 'changeChartKey', - 'changeRefreshConfig' + 'changeRefreshConfig', + 'changePageInfo' ]), // 切换主题时更新主题配置 changeTheme (theme) { diff --git a/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue b/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue index fc4f00fb..8e131c8e 100644 --- a/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue +++ b/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue @@ -10,33 +10,31 @@ {{ pageInfo.name }}
- - - + 对齐 - + + + + + +