From 663cb21eb21359d910c2878e6bfc1b28fac7e193 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 10 Mar 2023 15:52:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E4=B8=BB=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/layout/AiDvWrapper/AiDvWrapper.vue |  50 ++++++++++++++++--
 .../assets/headerThemePrimaryBG_lb.png        | Bin 0 -> 329 bytes
 .../assets/headerThemePrimaryBG_rb.png        | Bin 0 -> 290 bytes
 .../AiDvWrapper/assets/themeTimeIcon.png      | Bin 0 -> 1213 bytes
 .../layout/AiDvWrapper/layout/primary.vue     |  24 ++++-----
 .../bigscreen/designer/components/preview.vue |  12 ++---
 6 files changed, 61 insertions(+), 25 deletions(-)
 create mode 100644 components/layout/AiDvWrapper/assets/headerThemePrimaryBG_lb.png
 create mode 100644 components/layout/AiDvWrapper/assets/headerThemePrimaryBG_rb.png
 create mode 100644 components/layout/AiDvWrapper/assets/themeTimeIcon.png

diff --git a/components/layout/AiDvWrapper/AiDvWrapper.vue b/components/layout/AiDvWrapper/AiDvWrapper.vue
index 7268d150..fb9e3ea9 100644
--- a/components/layout/AiDvWrapper/AiDvWrapper.vue
+++ b/components/layout/AiDvWrapper/AiDvWrapper.vue
@@ -1,9 +1,8 @@
 <template>
   <section class="AiDvWrapper" :class="'AiDvWrapper' + theme">
     <dv-full-screen-container>
-      <div class="viewPanel column" flex>
-        <component :is="headerComponent" v-bind="{...$props,...$data}"
-                   @fullscreen="handleFullScreen" @setting="e=>dialog=e" @change="e=>$emit('change',e)"/>
+      <div class="viewPanel column" flex :style="{backgroundImage:`url('${background}')`}">
+        <component :is="headerComponent" v-bind="{...$props,...$data}" @fullscreen="handleFullScreen" @setting="e=>dialog=e" @change="e=>$emit('change',e)"/>
         <div class="fill">
           <slot/>
         </div>
@@ -46,7 +45,8 @@ export default {
     /**
      * 布局方案:black,classic
      */
-    type: {default: "black"}
+    type: {default: "black"},
+    background: {default: ""}
   },
   computed: {
     active: {
@@ -206,7 +206,46 @@ export default {
     }
   }
 
-  :deep(&.AiDvWrapper1) {
+  //党建主题
+  &.AiDvWrapper1 {
+    :deep(.primary) {
+      .content {
+        background-image: url("assets/headerThemePrimaryBG_lb.png"), url("assets/headerThemePrimaryBG_rb.png");
+
+        .item {
+          background-image: url("assets/themeTimeIcon.png");
+        }
+      }
+
+      .el-tabs {
+        .el-tabs__item {
+          &.is-active {
+            color: #FAD88E;
+          }
+        }
+
+        .el-tabs__active-bar {
+          background: linear-gradient(270deg, #fad88e00 0%, #fad88eff 51%, #fad88e00 98%);
+        }
+
+        .el-tabs__nav-prev {
+          background-image: linear-gradient(90deg, #fad88eff 0%, #21131e6e 28%, #23141f42 100%);
+
+          .el-icon-arrow-left:before {
+            color: #FAD88E;
+          }
+        }
+
+        .el-tabs__nav-next {
+          background-image: linear-gradient(270deg, #fad88eff 0%, #21131e6e 28%, #23141f42 100%);
+
+          .el-icon-arrow-right:before {
+            color: #FAD88E;
+          }
+        }
+      }
+    }
+
     .headerBottomBorder {
       display: none;
       background-image: none;
@@ -298,4 +337,5 @@ export default {
     }
   }
 }
+
 </style>
diff --git a/components/layout/AiDvWrapper/assets/headerThemePrimaryBG_lb.png b/components/layout/AiDvWrapper/assets/headerThemePrimaryBG_lb.png
new file mode 100644
index 0000000000000000000000000000000000000000..9432e2b50389aaceec6c485e093e11904613541f
GIT binary patch
literal 329
zcmeAS@N?(olHy`uVBq!ia0y~yV0HwuSvc5$q(_6vY#_y09OUlAu<o49OCX!s)5S3)
z!};wkLoa7Xk=BRBH8z)81nxL)*ep<DZgwn|Q%sTDqwGUjLSp7iE+)Zlm16}d9&$@I
zZIJnYo5%R>-!ut}GZrWJE>ZVfyM+DrX_el$&Punv;^dF-uKlc+siQebhl`O#V1@gF
z{nxKGe>3>_w&w2r`mb9&)HxIy7??N|E^u3%^t$vkb0N#z?Ay0h^dj2@jwCuVG}bFz
zXkXAjefzU#JEhmYTet7_-L!yfnk)hi3?Sot8U#Xawq4?5;`rnH;LxRKr)QQPK5t}Z
zXIC8zH8)_s1E=Hj`wy3G6R&Asoxk`c2O~?JxJ9eN*<Fd8&RWGFSAooWCGvxD(d^XZ
UI|pLyfnmeo>FVdQ&MBb@01;e%lK=n!

literal 0
HcmV?d00001

diff --git a/components/layout/AiDvWrapper/assets/headerThemePrimaryBG_rb.png b/components/layout/AiDvWrapper/assets/headerThemePrimaryBG_rb.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2eff9f7a668e97b56a336f44d2c349b085084f3
GIT binary patch
literal 290
zcmV+-0p0$IP)<h;3K|Lk000e1NJLTq00A2S000CC1^@s6zS^7H00001b5ch_0Itp)
z=>Px#+(|@1R9HvtmpuvsK@5ez;O`cq;0Y`(Exf@V!2^heU}<IJ0X&9YNWsERJb|!?
zjV$Yv5w)^WbYUTB(oJ5zWF9kyhZ86$0SPlh+6-Hlv~&PkfB-9KOGT3X<ebzhS;u<I
z<TVeeWM-M90k8s6U}B5etXZTEU8@s#5~xKNTkp&1I6k%e-E0elU3Rm{XGPwcO~7wv
zl2iwFK<6RnXp8wY$w!-4aRR?35S}lYAgann@wpN5HCzFYJP3ScHa?y_M&mX9LLit+
oR28H6e9vw+f5H6j(2u`SH)}a%gEJd{KmY&$07*qoM6N<$f}vS*bN~PV

literal 0
HcmV?d00001

diff --git a/components/layout/AiDvWrapper/assets/themeTimeIcon.png b/components/layout/AiDvWrapper/assets/themeTimeIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..773f051639c19d209ccfc874e5ef743561235908
GIT binary patch
literal 1213
zcmV;u1Va0XP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px(cS%G+R7gvWR!vM)R~S9#y*F<L`G=Cw7Hrk35wOu{DkfdP!d3s`0wS0+Y18_*
zkTxdO<?F5{HGwXuwoRKfDG*o~+ocOwG^sXPQ3FIP+9<Xrls^HPc{A^R&Aszx7+@s5
z$xB||+<VS<&OP_LL##7IgaB*+LNdsmDkA#3{yiWm&x6qu@{SNdWfqHw1E3(ByhJjk
z-@_uT)dgfg*AV0`5RoDP?}pDV0M+5bCjf>4{H!063#$vtORxewm1u!we*s{#E;O_w
z9xjaKe7g@7oS_pP$Vak5fhN$FNb*@H$c_-~cL3iau&%&O=*j^<S`Aw@0{9rf8)hp+
zbuqHxlMKch1tOw-RN~Kf0?^<K08Y^@{$|}E`13~qoCBck?4nz&Neq@=XB22@dXpqE
z-3DO~D2ov5AY)~hbJ8NfY;l^bY(89T(k1cP1E9JHun>@TMk{(Vn9SNDPYMyYuLH6j
z<T1voE{KQ=AZcuqsS?E1sKJj}b!6q!aL*zneTh#Vg~)k;cMuEqkkyL@TgOjFP8J@u
z1N;esD=e<rpS3KrFVo|th(;$2K_XGZiY;@?#fA3HPy7a=5s<?ys_ik@87aZs-ChER
zC_KTktzU}_I%IPy3o<=kDt7QlTSFD8W%;IAT|_!fL$;Ya`{!|?bPLdDmu_n_*y%m!
zw`FGgZ9sOA&MuZW++3^RTB*P>3W!t<EB3BcFmq#<2yXx!WBHw(WNVNnnEbU^iKVM^
zE#IzX&AzD|`RV9RUn^B9-zczbrw+;JG@{cHr~-wGeG4Xm6IUyhYgGCcRV}ODoL?qL
z#nS|0Z{$nO|E?i;Fj%Gvf(H<k0iq+U4_^etl(pnEa8vWF{5|-BV(`!qII$c8>9<pl
zW48(HP_TEqHE#`zcoylYEYWy>X%LOw1W*}*Yw-~PQ+8nO<STE__>V8`wuFBOFy_1*
zPg|t@*DtBR`g%beB5}grcqqHcnL}nGd4He;R)kQ=<?g9`!QA2!_a03K5BrXbpc^8+
z&Z}+h23rO_hs|CpHU2}pKuk;{uYI^bqhP&LyiA@}o4ohEi7COu&Xx~)40hInn?Dw&
z3Z7mEuw9^zx!X=&kP**iz2~n`v4Zh);$B6BTTdqZyI&n8tn&cwI3*=}Sp9zbpk-pJ
zZAy%N*+v9C02e88Fj9B=vh?@cs2U}jpa3tl#v_JcVX{ux+8QKB&mIu+B7i~x+M_!@
z>&;l7?WP$^{1LAc3LQc&P{}Fxb#L8f=il;<h=p?$6oKe;8@x|*?akY+{Trt{g{mXn
z3wf22`c5ofaoxy2rd#{T7pbIC=zIjoKAl*K)#dI!`}}sDwhF{Ri^bM~AaSjuMHu|A
z3x{H#iSF$hkp31MEdz=)XT*#=SLQN_jGQR)pZV`7k@pC$xH1JYY>}7T4el?j?_S6U
zo|hn-m{rxtV3UK$=JchXyuZZeq43gQE+}85pZl*OYuS)zV{$~aZMguZ;;MS0$qRBV
bSxxdEd*h}dpwwDK00000NkvXXu0mjf*C#KV

literal 0
HcmV?d00001

diff --git a/components/layout/AiDvWrapper/layout/primary.vue b/components/layout/AiDvWrapper/layout/primary.vue
index c463d695..a9943da1 100644
--- a/components/layout/AiDvWrapper/layout/primary.vue
+++ b/components/layout/AiDvWrapper/layout/primary.vue
@@ -26,16 +26,16 @@ export default {
   computed: {
     tabs: v => [
       ...v.views,
-      // {label: "测试哦哦", id: 1},
-      // {label: "测试哦哦", id: 2},
-      // {label: "测试哦哦", id: 3},
-      // {label: "测试哦哦", id: 4},
-      // {label: "测试哦哦", id: 5},
-      // {label: "测试哦哦", id: 6},
-      // {label: "测试哦哦", id: 7},
-      // {label: "测试哦哦", id: 8},
-      // {label: "测试哦哦", id: 9},
-      // {label: "测试哦哦", id: 10},
+      {label: "测试哦哦", id: 1},
+      {label: "测试哦哦", id: 2},
+      {label: "测试哦哦", id: 3},
+      {label: "测试哦哦", id: 4},
+      {label: "测试哦哦", id: 5},
+      {label: "测试哦哦", id: 6},
+      {label: "测试哦哦", id: 7},
+      {label: "测试哦哦", id: 8},
+      {label: "测试哦哦", id: 9},
+      {label: "测试哦哦", id: 10},
     ]
   },
   data() {
@@ -157,11 +157,11 @@ export default {
       background-position: left center;
 
       &.setting {
-        background-image: url("../assets/settingIcon.png");
+        background-image: url("../assets/settingIcon.png")!important;
       }
 
       &.fullscreen {
-        background-image: url("../assets/fullscreenIcon.png");
+        background-image: url("../assets/fullscreenIcon.png")!important;
       }
     }
   }
diff --git a/packages/bigscreen/designer/components/preview.vue b/packages/bigscreen/designer/components/preview.vue
index 362394af..d7b59896 100644
--- a/packages/bigscreen/designer/components/preview.vue
+++ b/packages/bigscreen/designer/components/preview.vue
@@ -1,11 +1,6 @@
 <template>
   <section class="preview">
-    <ai-dv-wrapper :views="[{label: '返回'}]" :theme="config.theme" @change="handleBack" v-if="screenId" :title="info.name">
-      <ai-dv-background
-          :theme="config.theme"
-          v-if="config.length || config.theme === '1'"
-          :src="config.theme === '1' ? 'https://cdn.cunwuyun.cn/dvcp/dv/img/dj-bg.png' : config.backgroundImage[0].url">
-      </ai-dv-background>
+    <ai-dv-wrapper :views="[{label: '返回'}]" :theme="config.theme" @change="handleBack" v-if="screenId" :title="info.name" :background="bgImg">
       <ai-dv-viewer :urlPrefix="urlPrefix" :instance="instance" :dict="dict" :id="screenId"/>
     </ai-dv-wrapper>
   </section>
@@ -26,7 +21,8 @@ export default {
     }
   },
   computed: {
-    screenId: v => v.$route.query.id
+    screenId: v => v.$route.query.id,
+    bgImg: v => v.config.theme == 1 ? 'https://cdn.cunwuyun.cn/dvcp/dv/img/dj-bg.png' : (v.config.backgroundImage?.[0]?.url || "")
   },
   data() {
     return {
@@ -38,7 +34,7 @@ export default {
     ...mapActions(['closePage']),
     getDvData() {
       let {id} = this.$route.query
-      this.instance.post(`${this.urlPrefix}/appdiylargescreen/queryLargeScreenDetailById?id=${id}`).then(res => {
+      this.instance.post(`/app/appdiylargescreen/queryLargeScreenDetailById?id=${id}`).then(res => {
         if (res?.data) {
           this.info = res.data
           this.config = JSON.parse(res.data.config).dashboard