Merge remote-tracking branch 'origin/master'

data-room-ui/packages/BigScreenDesign/OverallSetting/index.vue

@@ -391,7 +391,7 @@ export default {
         this.form.refreshConfig = []
       } else {
         this.pageInfo.chartList.forEach(chart => {
-          if (chart.dataSource?.businessKey) {
+          if (chart.dataSource?.businessKey || chart.type === 'marquee') {
             this.chartOptions.push({
               code: chart.code,
               title: chart.title,

data-room-ui/packages/BigScreenDesign/PageDesignTop.vue

@@ -12,6 +12,7 @@
     <div class="head-btn-group">
       <span style="margin-right:8px;font-size:12px">缩放比例</span>
       <el-input-number
+        class="bs-el-input-number"
         style="margin-right:20px"
         :value="zoom"
         :min="1"

data-room-ui/packages/assets/style/bsTheme.scss

@@ -39,11 +39,15 @@
   }
 
   .el-input-number__decrease {
+    color: var(--bs-el-text) !important;
+    font-size: 16px !important;
     background: var(--bs-el-background-1) !important;
     border-color: var(--bs-el-border) !important;
   }
 
   .el-input-number__increase {
+    color: var(--bs-el-text) !important;
+    font-size: 16px !important;
     background: var(--bs-el-background-1) !important;
     border-color: var(--bs-el-border) !important;
   }