From 66b24afb9e84d8816dcdb1dd48c41b4bc5d184a7 Mon Sep 17 00:00:00 2001
From: "liu.shiyi" <liu.shiyi@ustcinfo.com>
Date: Tue, 4 Jul 2023 10:19:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8=E7=9A=84=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BasicComponents/CurrentTime/setting.vue   | 30 +++++++--------
 .../BasicComponents/TimeCountDown/setting.vue | 37 +++++++++++--------
 2 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/data-room-ui/packages/BasicComponents/CurrentTime/setting.vue b/data-room-ui/packages/BasicComponents/CurrentTime/setting.vue
index 08453b08..02dac82f 100644
--- a/data-room-ui/packages/BasicComponents/CurrentTime/setting.vue
+++ b/data-room-ui/packages/BasicComponents/CurrentTime/setting.vue
@@ -31,28 +31,32 @@
       <SettingTitle>基础</SettingTitle>
       <div class="setting-wrap">
         <el-form-item
-          label="时间字体大小"
+          label="字体大小"
           label-width="100px"
         >
-          <el-input
+          <el-input-number
             v-model="config.customize.fontSize"
-            placeholder="请输入时间字体大小"
-          >
-            <template slot="append">
-              px
-            </template>
-          </el-input>
+            class="bs-el-input-number"
+            placeholder="请输入字体大小"
+            :min="0"
+          />
         </el-form-item>
         <el-form-item
-          label="时间字体权重"
+          label="字体权重"
           label-width="100px"
         >
           <el-input-number
             v-model="config.customize.fontWeight"
             class="bs-el-input-number"
-            placeholder="请输入时间字体权重"
+            placeholder="请输入字体权重"
           />
         </el-form-item>
+        <el-form-item
+          label="字体颜色"
+          label-width="100px"
+        >
+          <el-color-picker v-model="config.customize.color" />
+        </el-form-item>
         <el-form-item
           label="时间格式"
           label-width="100px"
@@ -70,12 +74,6 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item
-          label="字体颜色"
-          label-width="100px"
-        >
-          <el-color-picker v-model="config.customize.color" />
-        </el-form-item>
       </div>
     </el-form>
   </div>
diff --git a/data-room-ui/packages/BasicComponents/TimeCountDown/setting.vue b/data-room-ui/packages/BasicComponents/TimeCountDown/setting.vue
index 9cd6bc0f..d4e31035 100644
--- a/data-room-ui/packages/BasicComponents/TimeCountDown/setting.vue
+++ b/data-room-ui/packages/BasicComponents/TimeCountDown/setting.vue
@@ -30,46 +30,46 @@
       <SettingTitle>基础</SettingTitle>
       <div class="lc-field-body">
         <el-form-item
-          label="时间字体大小"
+          label="字体大小"
           label-width="100px"
         >
-          <el-input
+          <el-input-number
             v-model="config.customize.fontSize"
-            placeholder="请输入时间字体大小"
-          >
-            <template slot="append">
-              px
-            </template>
-          </el-input>
+            class="bs-el-input-number"
+            placeholder="请输入字体大小"
+            :min="0"
+          />
         </el-form-item>
         <el-form-item
-          label="时间字体权重"
+          label="字体权重"
           label-width="100px"
         >
           <el-input-number
             v-model="config.customize.fontWeight"
             class="bs-el-input-number"
-            placeholder="请输入时间字体权重"
+            placeholder="请输入字体权重"
           />
         </el-form-item>
+        <el-form-item
+          label="字体颜色"
+          label-width="100px"
+        >
+          <el-color-picker v-model="config.customize.color" />
+        </el-form-item>
         <el-form-item
           label="结束日期"
           label-width="100px"
         >
           <el-date-picker
             v-model="config.endTime"
+            popper-class="dateClass"
+            :append-to-body="true"
             type="datetime"
             placeholder="请选择结束日期"
             :picker-options="pickerOptions"
             value-format="timestamp"
           />
         </el-form-item>
-        <el-form-item
-          label="字体颜色"
-          label-width="100px"
-        >
-          <el-color-picker v-model="config.customize.color" />
-        </el-form-item>
       </div>
     </el-form>
   </div>
@@ -137,4 +137,9 @@ export default {
 .lc-field-body {
   padding: 12px 16px;
 }
+/deep/.dateClass{
+  .el-time-panel{
+    width: 138px!important;
+  }
+}
 </style>