From 84689f602b1ac37092c309cfc20715d706b58849 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 10 Mar 2023 09:38:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=BC=E8=88=AA=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/layout/AiDvWrapper/layout/primary.vue   | 11 ++++++++---
 packages/bigscreen/designer/components/Add.vue     |  3 +++
 packages/bigscreen/designer/components/preview.vue |  9 ++++++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/components/layout/AiDvWrapper/layout/primary.vue b/components/layout/AiDvWrapper/layout/primary.vue
index ac17b69b..a01b3b10 100644
--- a/components/layout/AiDvWrapper/layout/primary.vue
+++ b/components/layout/AiDvWrapper/layout/primary.vue
@@ -2,8 +2,8 @@
   <section class="primary">
     <div flex class="content">
       <b class="headerTitle" v-text="title"/>
-      <el-tabs class="fill">
-        <el-tab-pane v-for="tab in tabs" :key="tab.id" :label="tab.label" @click.native="$emit('change',tab.id)"/>
+      <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.name"/>
       </el-tabs>
       <div class="rightPane" flex>
         <div class="item" v-text="currentTime"/>
@@ -38,6 +38,11 @@ export default {
       // {label: "测试哦哦", id: 10},
     ]
   },
+  data() {
+    return {
+      current: ""
+    }
+  },
   methods: {
     getWeather() {
       this.$request.post("/app/weather/queryWeather").then(res => {
@@ -101,7 +106,7 @@ export default {
         font-size: 20px;
         font-weight: 400;
         font-family: "PingFang SC";
-        padding: 0 16px;
+        user-select: none;
 
         &.is-active {
           color: #02FEFF;
diff --git a/packages/bigscreen/designer/components/Add.vue b/packages/bigscreen/designer/components/Add.vue
index e4d2d788..f34ee549 100644
--- a/packages/bigscreen/designer/components/Add.vue
+++ b/packages/bigscreen/designer/components/Add.vue
@@ -86,6 +86,7 @@
 <script>
 import Layout from './Layout.vue'
 import Sortable from 'sortablejs'
+import {mapActions} from "vuex"
 
 export default {
   name: 'Add',
@@ -136,6 +137,7 @@ export default {
     this.getInfo().then(() => this.$route.params?.id && this.onChange(this.$route.params))
   },
   methods: {
+    ...mapActions(['closePage']),
     getInfo() {
       let {id} = this.$route.query
       if (!id) return Promise.reject()
@@ -252,6 +254,7 @@ export default {
     },
 
     cancel() {
+      this.closePage()
       this.$router.push({})
     },
 
diff --git a/packages/bigscreen/designer/components/preview.vue b/packages/bigscreen/designer/components/preview.vue
index 794c5109..362394af 100644
--- a/packages/bigscreen/designer/components/preview.vue
+++ b/packages/bigscreen/designer/components/preview.vue
@@ -1,6 +1,6 @@
 <template>
   <section class="preview">
-    <ai-dv-wrapper :views="[{label: '返回'}]" :theme="config.theme" @change="$router.back()" v-if="screenId" :title="info.name">
+    <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'"
@@ -12,6 +12,8 @@
 </template>
 
 <script>
+import {mapActions} from "vuex"
+
 export default {
   name: "preview",
   props: {
@@ -33,6 +35,7 @@ export default {
     }
   },
   methods: {
+    ...mapActions(['closePage']),
     getDvData() {
       let {id} = this.$route.query
       this.instance.post(`${this.urlPrefix}/appdiylargescreen/queryLargeScreenDetailById?id=${id}`).then(res => {
@@ -41,6 +44,10 @@ export default {
           this.config = JSON.parse(res.data.config).dashboard
         }
       })
+    },
+    handleBack() {
+      this.$router.back()
+      this.closePage()
     }
   },
   created() {