fix

packages/bigscreen/designer/components/Add.vue

@@ -1,8 +1,7 @@
 <template>
   <ai-detail>
     <template slot="title">
-      <ai-title :title="id ? '编辑项目' : '添加项目'" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
-      </ai-title>
+      <ai-title :title="id ? '编辑项目' : '添加项目'" isShowBack isShowBottomBorder @onBackClick="cancel"/>
     </template>
     <template slot="content">
       <el-form ref="form" :model="form" label-width="110px" label-position="right">
@@ -33,14 +32,14 @@
           </template>
           <template #content>
             <ai-table
-              :tableData="tableData"
-              :col-configs="colConfigs"
-              :total="total"
-              style="margin-top: 6px;"
-              :border="true"
-              row-key="id"
-              :isShowPagination="false"
-              @getList="() => {}">
+                :tableData="tableData"
+                :col-configs="colConfigs"
+                :total="total"
+                style="margin-top: 6px;"
+                :border="true"
+                row-key="id"
+                :isShowPagination="false"
+                @getList="() => {}">
               <el-table-column slot="options" width="160px" fixed="right" label="操作" align="center">
                 <template slot-scope="{ row, column, $index }">
                   <div class="table-options">
@@ -55,23 +54,15 @@
         </ai-card>
       </el-form>
       <Layout
-        v-if="isShowLayout"
-        :instance="instance"
-        :dict="dict"
-        :params="query"
-        @change="onChange"
-        :urlPrefix="urlPrefix"
-        :theme="config.theme"
-        @close="isShowLayout = false">
-      </Layout>
-      <ai-dv-wrapper :views="[{label: '返回'}]" :theme="config.theme" @change="screenId = false" v-if="screenId" :title="form.name">
-        <AiDvBackground
+          v-if="isShowLayout"
+          :instance="instance"
+          :dict="dict"
+          :params="query"
+          @change="onChange"
+          :urlPrefix="urlPrefix"
           :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">
-        </AiDvBackground>
-        <AppGigscreenViewer :urlPrefix="urlPrefix" :instance="instance" :dict="dict" :id="screenId"></AppGigscreenViewer>
-      </ai-dv-wrapper>
+          @close="isShowLayout = false">
+      </Layout>
       <ai-dialog :visible.sync="dialog" title="定制大屏" @closed="custom={}" @onConfirm="handleCustomizedDV">
         <el-form ref="CustomDVFrom" size="small" :model="custom" :rules="rules" label-width="80px">
           <el-form-item label="大屏标题" prop="title">
@@ -94,29 +85,21 @@
 </template>
 
 <script>
-import AppGigscreenViewer from '../../viewer/AppGigscreenViewer'
 import Layout from './Layout.vue'
 import Sortable from 'sortablejs'
+import AppGigscreenViewer from "../../viewer/AppGigscreenViewer";
 
 export default {
   name: 'Add',
-
   props: {
     instance: Function,
     dict: Object,
-    params: Object,
     urlPrefix: String
   },
-
   inject: {
-    home:{default: ''}
+    home: {default: ''}
   },
-
-  components: {
-    Layout,
-    AppGigscreenViewer
-  },
-
+  components: {AppGigscreenViewer, Layout},
   data() {
     return {
       info: {},
@@ -152,24 +135,18 @@ export default {
 
   created() {
     this.dict.load('customizedDVs')
-    if (this.params && this.params.id) {
-      this.id = this.params.id
-      this.getInfo(this.params.id)
-    }
+    this.getInfo()
   },
 
-  mounted () {
-
-  },
 
   methods: {
-    getInfo(id) {
+    getInfo() {
+      let {id} = this.$route.query
       this.instance.post(`${this.urlPrefix}/appdiylargescreen/queryLargeScreenProjectDetailById?id=${id}`).then(res => {
-        if (res.code === 0) {
+        if (res?.data) {
           this.form = {
             ...res.data
           }
-
           if (res.data.relationLsIds) {
             this.tableData = res.data.lsList.map(v => {
               let conf = JSON.parse(v.config || '') || {}
@@ -194,7 +171,7 @@ export default {
       const tbody = document.querySelector('.el-table__body-wrapper tbody')
       const _this = this
       Sortable.create(tbody, {
-        onEnd({ newIndex, oldIndex }) {
+        onEnd({newIndex, oldIndex}) {
           const currRow = _this.tableData.splice(oldIndex, 1)[0]
           _this.tableData.splice(newIndex, 0, currRow)
         }
@@ -202,14 +179,8 @@ export default {
     },
 
     toViewer(id) {
-      this.instance.post(`${this.urlPrefix}/appdiylargescreen/queryLargeScreenDetailById?id=${id}`).then(res => {
-        if (res.data) {
-          this.config = JSON.parse(res.data.config).dashboard
-        }
-      })
-      this.screenId = id
+      this.$router.push({query: {id}, hash: "#preview"})
     },
-
     onChange(e) {
       const ids = this.tableData.map(v => v.id)
       if (ids.indexOf(e.id) < 0) {
@@ -267,7 +238,7 @@ export default {
 
               this.home && this.home.refreshDvOptions && this.home.refreshDvOptions()
               setTimeout(() => {
-                this.cancel(true)
+                this.cancel()
               }, 600)
             }
           })
@@ -275,11 +246,8 @@ export default {
       })
     },
 
-    cancel(isRefresh) {
-      this.$emit('change', {
-        type: 'list',
-        isRefresh: !!isRefresh
-      })
+    cancel() {
+      this.$router.push({})
     },
 
     handleCustomizedDV() {