From 66d0f0c8ab8bff74defe78d1c67e54824bcc7b84 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 1 Mar 2024 11:29:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=87=E9=A2=98=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E5=A4=A7=E5=B0=8F=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/layout/AiDvWrapper/AiDvWrapper.vue |  5 +-
 .../layout/AiDvWrapper/layout/primary.vue     |  7 ++-
 packages/bigscreen/designer/preview.vue       |  2 +-
 packages/bigscreen/designer/viewport.vue      | 57 ++++++++-----------
 4 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/components/layout/AiDvWrapper/AiDvWrapper.vue b/components/layout/AiDvWrapper/AiDvWrapper.vue
index 58870adf..8a9329e2 100644
--- a/components/layout/AiDvWrapper/AiDvWrapper.vue
+++ b/components/layout/AiDvWrapper/AiDvWrapper.vue
@@ -37,6 +37,7 @@ export default {
   },
   props: {
     title: {default: "数字乡村数据大屏"},
+    titleSize:{default:38},
     views: {
       default: () => []
     },
@@ -296,7 +297,7 @@ export default {
           font-weight: 600;
           line-height: 38px;
           letter-spacing: 2px;
-          text-shadow: 0px 2px 4px rgba(117, 9, 9, 0.1);
+          text-shadow: 0 2px 4px rgba(117, 9, 9, 0.1);
           background: linear-gradient(180deg, #FFF6C7 0%, #FF9A02 100%);
           -webkit-background-clip: text;
           -webkit-text-fill-color: transparent;
@@ -322,7 +323,7 @@ export default {
       font-weight: 400;
       color: #FF9A02;
       line-height: 22px;
-      text-shadow: 0px 2px 4px rgba(117, 9, 9, 0.1);
+      text-shadow: 0 2px 4px rgba(117, 9, 9, 0.1);
       background: linear-gradient(180deg, #FFF6C7 0%, #FF9A02 100%);
       -webkit-background-clip: text;
       -webkit-text-fill-color: transparent;
diff --git a/components/layout/AiDvWrapper/layout/primary.vue b/components/layout/AiDvWrapper/layout/primary.vue
index ecfbec95..5e7ac0d2 100644
--- a/components/layout/AiDvWrapper/layout/primary.vue
+++ b/components/layout/AiDvWrapper/layout/primary.vue
@@ -1,7 +1,7 @@
 <template>
   <section class="primary">
     <div flex class="content">
-      <b class="headerTitle" v-text="title"/>
+      <b class="headerTitle" v-text="title" :style="titleStyle"/>
       <el-tabs class="fill" v-model="current" @tab-click="$emit('change', current)">
         <el-tab-pane v-for="tab in tabs" :key="tab.id" :label="tab.label" :name="tab.id"/>
       </el-tabs>
@@ -40,7 +40,10 @@ export default {
       // {label: "测试哦哦", id: 8},
       // {label: "测试哦哦", id: 9},
       // {label: "测试哦哦", id: 10},
-    ]
+    ],
+    titleStyle: v => ({
+      fontSize: `${v.$attrs.titleSize || 38}px`,
+    })
   },
   data() {
     return {
diff --git a/packages/bigscreen/designer/preview.vue b/packages/bigscreen/designer/preview.vue
index 918404e1..d6c6ca5d 100644
--- a/packages/bigscreen/designer/preview.vue
+++ b/packages/bigscreen/designer/preview.vue
@@ -1,6 +1,6 @@
 <template>
   <section class="preview">
-    <ai-dv-wrapper :views="[{label: '返回'}]" :theme="config.theme" @change="handleBack" v-if="screenId" :title="info.name" :background="bgImg">
+    <ai-dv-wrapper :views="[{label: '返回'}]" :theme="config.theme" @change="handleBack" v-if="screenId" :title="info.name" :background="bgImg" :titleSize="config.titleSize">
       <ai-dv-viewer :urlPrefix="urlPrefix" :instance="instance" :dict="dict" :id="screenId"/>
     </ai-dv-wrapper>
   </section>
diff --git a/packages/bigscreen/designer/viewport.vue b/packages/bigscreen/designer/viewport.vue
index 75be8d30..10920c33 100644
--- a/packages/bigscreen/designer/viewport.vue
+++ b/packages/bigscreen/designer/viewport.vue
@@ -66,6 +66,7 @@
                   style="height: 100%"
                   :type="dashboard.style"
                   :title="$route.query.name"
+                  :titleSize="dashboard.titleSize"
                   :theme="dashboard.theme"
                   :background="dashboard.theme == 1 ? 'https://cdn.cunwuyun.cn/dvcp/dv/img/dj_bg.png' : (dashboard.backgroundImage.length ? dashboard.backgroundImage[0].url : '')">
                 <div style="width: 100%; height: 100%">
@@ -120,39 +121,26 @@
         <div class="layout-page__setting layout-right__content" v-else>
           <h2>页面设置</h2>
           <div class="layout-config__group">
-            <div class="layout-config__item">
-              <label>屏幕大小</label>
-              <div class="layout-config__item--right">
-                <el-input-number size="mini" :min="0" v-model="bigscreenWidth" disabled
-                                 controls-position="right"></el-input-number>
-                <el-input-number size="mini" :min="0" v-model="bigscreenHeight" disabled
-                                 controls-position="right"></el-input-number>
-              </div>
-            </div>
-            <div class="layout-config__item layout-config__item--input">
-              <label>屏幕标题</label>
-              <div class="layout-config__item--right">
-                <el-input v-model="dashboard.title" size="mini"></el-input>
-              </div>
-            </div>
-            <div class="layout-config__item">
-              <label>主题设置</label>
-              <div class="layout-config__item--right">
-                <el-select size="mini" v-model="dashboard.theme" placeholder="请选择">
-                  <el-option label="默认" value="0"></el-option>
-                  <el-option label="党建" value="1"></el-option>
-                </el-select>
-              </div>
-            </div>
-            <div class="layout-config__item">
-              <label>样式设置</label>
-              <div class="layout-config__item--right">
-                <el-select size="mini" v-model="dashboard.style" placeholder="请选择">
-                  <el-option label="默认" value="black"/>
-                  <el-option label="经典" value="classic"/>
-                </el-select>
-              </div>
-            </div>
+            <config-item label="屏幕大小">
+              <el-input-number size="mini" :min="0" v-model="bigscreenWidth" disabled controls-position="right"/>
+              <el-input-number size="mini" :min="0" v-model="bigscreenHeight" disabled controls-position="right"/>
+            </config-item>
+            <config-item label="屏幕标题">
+              <el-input v-model="dashboard.title" size="mini"/>
+              <el-input type="number" v-model="dashboard.titleSize" size="mini" placeholder="字体大小" :max="68"/>
+            </config-item>
+            <config-item label="主题设置">
+              <el-select size="mini" v-model="dashboard.theme" placeholder="请选择">
+                <el-option label="默认" value="0"></el-option>
+                <el-option label="党建" value="1"></el-option>
+              </el-select>
+            </config-item>
+            <config-item label="样式设置">
+              <el-select size="mini" v-model="dashboard.style" placeholder="请选择">
+                <el-option label="默认" value="black"/>
+                <el-option label="经典" value="classic"/>
+              </el-select>
+            </config-item>
             <div class="layout-config__item">
               <label>背景图</label>
               <div class="layout-config__item--right layout-config__item--bg">
@@ -235,6 +223,7 @@ import DataConfig from './components/DataConfig.vue'
 import ComponentConfig from "./components/componentConfig.vue";
 import {mapActions} from "vuex"
 import Vue from "vue";
+import ConfigItem from "./components/configItem.vue";
 
 export default {
   name: "viewport",
@@ -271,6 +260,7 @@ export default {
       componentList: [],
       dashboard: {
         title: '大屏',
+        titleSize: 38,
         width: 1920,
         height: 1080,
         theme: '0',
@@ -292,6 +282,7 @@ export default {
     }
   },
   components: {
+    ConfigItem,
     ComponentConfig,
     DataConfig,
     VueRulerTool,