From 3be46db9331e9e020ca132f69ad68ffc606daa6c Mon Sep 17 00:00:00 2001
From: "liu.tao3" <liu.tao3@ustcinfo.com>
Date: Mon, 16 Oct 2023 11:08:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=8C=87=E6=A0=87=E5=8D=A1=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=AD=97=E4=BD=93=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BasicComponents/IndexCard/index.vue       |  1 +
 .../BasicComponents/IndexCard/setting.vue     | 22 ++++++++++++++++++-
 .../IndexCard/settingConfig.js                |  1 +
 .../BasicComponents/IndexCard2/index.vue      |  2 ++
 .../BasicComponents/IndexCard2/setting.vue    | 22 ++++++++++++++++++-
 .../BasicComponents/IndicatorCard/index.vue   |  1 +
 .../BasicComponents/IndicatorCard/setting.vue |  1 +
 .../BasicComponents/IndicatorCard2/index.vue  |  1 +
 .../IndicatorCard2/setting.vue                |  1 +
 9 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/data-room-ui/packages/BasicComponents/IndexCard/index.vue b/data-room-ui/packages/BasicComponents/IndexCard/index.vue
index 35a61f41..9176b37d 100644
--- a/data-room-ui/packages/BasicComponents/IndexCard/index.vue
+++ b/data-room-ui/packages/BasicComponents/IndexCard/index.vue
@@ -32,6 +32,7 @@
         <span
           class="content-right-first"
           :style="{
+            'font-family': config.customize.fontFamily,
             'font-size': customize.firstSize + 'px',
             'height':customize.firstSize + 'px',
             color:customize.firstColor,
diff --git a/data-room-ui/packages/BasicComponents/IndexCard/setting.vue b/data-room-ui/packages/BasicComponents/IndexCard/setting.vue
index ace44f3e..b4c954f3 100644
--- a/data-room-ui/packages/BasicComponents/IndexCard/setting.vue
+++ b/data-room-ui/packages/BasicComponents/IndexCard/setting.vue
@@ -159,6 +159,23 @@
               class="bs-el-input-number"
               label="请输入首行文字大小"
             />
+          </el-form-item>
+           <el-form-item
+            label="文字类型"
+            label-width="100px"
+          >
+            <el-select
+              v-model="config.customize.fontFamily"
+              popper-class="bs-el-select"
+              class="bs-el-select"
+            >
+              <el-option
+                v-for="item in fontFamilyList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item label-width="100px" label="首行字体颜色">
             <ColorPicker
@@ -218,7 +235,9 @@ import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
 import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
+import fontList from 'data-room-ui/js/utils/fontList'
 export default {
   name: 'BarSetting',
   components: {
@@ -265,7 +284,8 @@ export default {
       }
     ],
       // 预设主题色
-      predefineThemeColors: predefineColors
+      predefineThemeColors: predefineColors,
+      fontFamilyList: fontList,
     }
   },
   computed: {
diff --git a/data-room-ui/packages/BasicComponents/IndexCard/settingConfig.js b/data-room-ui/packages/BasicComponents/IndexCard/settingConfig.js
index 61e2f116..9c90f9e2 100644
--- a/data-room-ui/packages/BasicComponents/IndexCard/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/IndexCard/settingConfig.js
@@ -52,6 +52,7 @@ const customConfig = {
     src: '',
     borderRadius: 0,
     borderWidth: 0,
+    fontFamily:'',
     lineDistance: 6,
     borderColor: '',
     gradientDirection:'to right',
diff --git a/data-room-ui/packages/BasicComponents/IndexCard2/index.vue b/data-room-ui/packages/BasicComponents/IndexCard2/index.vue
index 3413d34a..97511066 100644
--- a/data-room-ui/packages/BasicComponents/IndexCard2/index.vue
+++ b/data-room-ui/packages/BasicComponents/IndexCard2/index.vue
@@ -41,6 +41,7 @@
         >{{ customize.secondLine }}</span>
         <span
           :style="{
+            'font-family': config.customize.fontFamily,
             'font-size': customize.secondSize + 'px',
             'height':customize.secondSize + 'px',
             color:customize.secondColor,
@@ -131,6 +132,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import "../../assets/fonts/numberFont/stylesheet.css";
 .content{
   display: flex;
   flex-direction: row;
diff --git a/data-room-ui/packages/BasicComponents/IndexCard2/setting.vue b/data-room-ui/packages/BasicComponents/IndexCard2/setting.vue
index 8e4c5f4d..ea783291 100644
--- a/data-room-ui/packages/BasicComponents/IndexCard2/setting.vue
+++ b/data-room-ui/packages/BasicComponents/IndexCard2/setting.vue
@@ -192,6 +192,23 @@
               class="bs-el-input-number"
               label="请输入第二行文字大小"
             />
+          </el-form-item>
+          <el-form-item
+            label="文字类型"
+            label-width="100px"
+          >
+            <el-select
+              v-model="config.customize.fontFamily"
+              popper-class="bs-el-select"
+              class="bs-el-select"
+            >
+              <el-option
+                v-for="item in fontFamilyList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
            <el-form-item label-width="100px" label="第二行字体颜色">
             <ColorPicker
@@ -215,10 +232,12 @@
 </template>
 <script>
 import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
+import fontList from 'data-room-ui/js/utils/fontList'
 export default {
   name: 'BarSetting',
   components: {
@@ -265,7 +284,8 @@ export default {
       }
     ],
       // 预设主题色
-      predefineThemeColors: predefineColors
+      predefineThemeColors: predefineColors,
+      fontFamilyList: fontList,
     }
   },
   computed: {
diff --git a/data-room-ui/packages/BasicComponents/IndicatorCard/index.vue b/data-room-ui/packages/BasicComponents/IndicatorCard/index.vue
index 77c6e155..570a9620 100644
--- a/data-room-ui/packages/BasicComponents/IndicatorCard/index.vue
+++ b/data-room-ui/packages/BasicComponents/IndicatorCard/index.vue
@@ -133,6 +133,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import "../../assets/fonts/numberFont/stylesheet.css";
 .content{
   display: flex;
   flex-direction: column;
diff --git a/data-room-ui/packages/BasicComponents/IndicatorCard/setting.vue b/data-room-ui/packages/BasicComponents/IndicatorCard/setting.vue
index c23818d8..59a63821 100644
--- a/data-room-ui/packages/BasicComponents/IndicatorCard/setting.vue
+++ b/data-room-ui/packages/BasicComponents/IndicatorCard/setting.vue
@@ -189,6 +189,7 @@
 <script>
 import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
 import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
diff --git a/data-room-ui/packages/BasicComponents/IndicatorCard2/index.vue b/data-room-ui/packages/BasicComponents/IndicatorCard2/index.vue
index ed02ff46..19e7068d 100644
--- a/data-room-ui/packages/BasicComponents/IndicatorCard2/index.vue
+++ b/data-room-ui/packages/BasicComponents/IndicatorCard2/index.vue
@@ -133,6 +133,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import "../../assets/fonts/numberFont/stylesheet.css";
 .content{
   display: flex;
   flex-direction: column;
diff --git a/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue b/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue
index c23818d8..59a63821 100644
--- a/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue
+++ b/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue
@@ -189,6 +189,7 @@
 <script>
 import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
 import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'