党建主题

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>
+      <div class="viewPanel column" flex :style="{backgroundImage:`url('${background}')`}">
-        <component :is="headerComponent" v-bind="{...$props,...$data}"
+        <component :is="headerComponent" v-bind="{...$props,...$data}" @fullscreen="handleFullScreen" @setting="e=>dialog=e" @change="e=>$emit('change',e)"/>
-                   @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>

components/layout/AiDvWrapper/layout/primary.vue

@@ -26,16 +26,16 @@ export default {
   computed: {
     tabs: v => [
       ...v.views,
-      // {label: "测试哦哦", id: 1},
+      {label: "测试哦哦", id: 1},
-      // {label: "测试哦哦", id: 2},
+      {label: "测试哦哦", id: 2},
-      // {label: "测试哦哦", id: 3},
+      {label: "测试哦哦", id: 3},
-      // {label: "测试哦哦", id: 4},
+      {label: "测试哦哦", id: 4},
-      // {label: "测试哦哦", id: 5},
+      {label: "测试哦哦", id: 5},
-      // {label: "测试哦哦", id: 6},
+      {label: "测试哦哦", id: 6},
-      // {label: "测试哦哦", id: 7},
+      {label: "测试哦哦", id: 7},
-      // {label: "测试哦哦", id: 8},
+      {label: "测试哦哦", id: 8},
-      // {label: "测试哦哦", id: 9},
+      {label: "测试哦哦", id: 9},
-      // {label: "测试哦哦", id: 10},
+      {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;
       }
     }
   }

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-wrapper :views="[{label: '返回'}]" :theme="config.theme" @change="handleBack" v-if="screenId" :title="info.name" :background="bgImg">
-      <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-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