From 22be7e2da24203aeb706a39ad8dc056983ac8fcf Mon Sep 17 00:00:00 2001
From: "liu.tao3" <liu.tao3@ustcinfo.com>
Date: Mon, 16 Oct 2023 11:13:00 +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=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IndexCard2/settingConfig.js               |  1 +
 .../BasicComponents/IndicatorCard/index.vue   |  1 +
 .../BasicComponents/IndicatorCard/setting.vue | 21 ++++++++++++++++++-
 .../IndicatorCard/settingConfig.js            |  1 +
 .../BasicComponents/IndicatorCard2/index.vue  |  1 +
 .../IndicatorCard2/setting.vue                | 19 +++++++++++++++++
 .../IndicatorCard2/settingConfig.js           |  1 +
 7 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/data-room-ui/packages/BasicComponents/IndexCard2/settingConfig.js b/data-room-ui/packages/BasicComponents/IndexCard2/settingConfig.js
index 11bb8f6d..d3a5fe96 100644
--- a/data-room-ui/packages/BasicComponents/IndexCard2/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/IndexCard2/settingConfig.js
@@ -54,6 +54,7 @@ const customConfig = {
     borderWidth: 0,
     lineDistance: 6,
     borderColor: '',
+    fontFamily:'',
     gradientDirection:'to right',
     gradientColor0: 'rgba(0, 122, 255, 0.07)',
     gradientColor1:'rgba(0, 122, 255, 0.07)',
diff --git a/data-room-ui/packages/BasicComponents/IndicatorCard/index.vue b/data-room-ui/packages/BasicComponents/IndicatorCard/index.vue
index 570a9620..db522b4c 100644
--- a/data-room-ui/packages/BasicComponents/IndicatorCard/index.vue
+++ b/data-room-ui/packages/BasicComponents/IndicatorCard/index.vue
@@ -21,6 +21,7 @@
       >
         <span
         :style="{
+          'font-family': config.customize.fontFamily,
           'font-size': customize.firstSize + 'px',
           color:customize.firstColor,
           'font-weight':customize.firstWeight,
diff --git a/data-room-ui/packages/BasicComponents/IndicatorCard/setting.vue b/data-room-ui/packages/BasicComponents/IndicatorCard/setting.vue
index 59a63821..f18a4b05 100644
--- a/data-room-ui/packages/BasicComponents/IndicatorCard/setting.vue
+++ b/data-room-ui/packages/BasicComponents/IndicatorCard/setting.vue
@@ -133,6 +133,23 @@
               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
               v-model="config.customize.firstColor"
@@ -193,6 +210,7 @@ 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'
+import fontList from 'data-room-ui/js/utils/fontList'
 export default {
   name: 'BarSetting',
   components: {
@@ -239,7 +257,8 @@ export default {
       }
     ],
       // 预设主题色
-      predefineThemeColors: predefineColors
+      predefineThemeColors: predefineColors,
+      fontFamilyList: fontList,
     }
   },
   computed: {
diff --git a/data-room-ui/packages/BasicComponents/IndicatorCard/settingConfig.js b/data-room-ui/packages/BasicComponents/IndicatorCard/settingConfig.js
index 49f6fd06..d4b32f27 100644
--- a/data-room-ui/packages/BasicComponents/IndicatorCard/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/IndicatorCard/settingConfig.js
@@ -53,6 +53,7 @@ const customConfig = {
     borderWidth: 0,
     lineDistance: 25,
     borderColor: '',
+    fontFamily:'',
     gradientDirection:'to right',
     gradientColor0: 'rgba(0, 122, 255, 1)',
     gradientColor1:'rgba(0, 122, 255, 1)',
diff --git a/data-room-ui/packages/BasicComponents/IndicatorCard2/index.vue b/data-room-ui/packages/BasicComponents/IndicatorCard2/index.vue
index 19e7068d..05e9d874 100644
--- a/data-room-ui/packages/BasicComponents/IndicatorCard2/index.vue
+++ b/data-room-ui/packages/BasicComponents/IndicatorCard2/index.vue
@@ -33,6 +33,7 @@
       >
       <span
       :style="{
+        'font-family': config.customize.fontFamily,
           'font-size': customize.secondSize + 'px',
           color:customize.secondColor,
           'font-weight':customize.secondWeight,
diff --git a/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue b/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue
index 59a63821..292829a2 100644
--- a/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue
+++ b/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue
@@ -165,6 +165,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
@@ -192,6 +209,7 @@ 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 fontList from 'data-room-ui/js/utils/fontList'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
 export default {
   name: 'BarSetting',
@@ -238,6 +256,7 @@ export default {
         value: 'to top left'
       }
     ],
+    fontFamilyList: fontList,
       // 预设主题色
       predefineThemeColors: predefineColors
     }
diff --git a/data-room-ui/packages/BasicComponents/IndicatorCard2/settingConfig.js b/data-room-ui/packages/BasicComponents/IndicatorCard2/settingConfig.js
index 78cb4aea..44ffd34b 100644
--- a/data-room-ui/packages/BasicComponents/IndicatorCard2/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/IndicatorCard2/settingConfig.js
@@ -50,6 +50,7 @@ const customConfig = {
   },
   customize: {
     borderRadius: 0,
+    fontFamily:'',
     borderWidth: 0,
     lineDistance: 25,
     borderColor: '',