From c88618ed4701d34315047f0e2b70b7f63bc9abae Mon Sep 17 00:00:00 2001
From: wangqing <250543222@qq.com>
Date: Sat, 17 Jul 2021 15:52:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E5=8F=91=E5=B8=83=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=85=81=E8=AE=B8=E5=88=A0=E9=99=A4=20=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=E4=B8=8D=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/form/index.vue       | 19 +++++++++++++------
 src/views/project/my/index.vue |  4 ++--
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/views/form/index.vue b/src/views/form/index.vue
index 7fa1d13..c9d92c1 100644
--- a/src/views/form/index.vue
+++ b/src/views/form/index.vue
@@ -9,12 +9,12 @@
                     <img class="header-logo" src="@/assets/images/indexLogo.svg" @click="$router.push({path:'/home'})">
                 </el-col>
                 <el-col :span="1" :xs="3">
-                    <el-button type="primary" icon="el-icon-view" @click="previewDialogVisible=true">
+                    <el-button icon="el-icon-view" type="primary" @click="openPreviewHandle">
                         预览
                     </el-button>
                 </el-col>
                 <el-col :span="2" :xs="3">
-                    <el-button type="success" icon="el-icon-folder-add" @click="saveProjectAsTemplateHandle">
+                    <el-button icon="el-icon-folder-add" type="success" @click="saveProjectAsTemplateHandle">
                         保存为模板
                     </el-button>
                 </el-col>
@@ -22,8 +22,8 @@
         </el-card>
         <div class="main-container">
             <div class="left-menu-container">
-                <el-menu :collapse="isCollapse" class="el-menu-vertical"
-                         :default-active="defaultActiveMenu"
+                <el-menu :collapse="isCollapse" :default-active="defaultActiveMenu"
+                         class="el-menu-vertical"
                          @select="menuSelectHandle"
                 >
                     <el-menu-item v-for="menuItem in menuItemList" :key="menuItem.route" :index="menuItem.route">
@@ -40,20 +40,23 @@
         </div>
         <el-dialog
             :visible.sync="previewDialogVisible"
+            destroy-on-close
             fullscreen
         >
-            <pre-view :preview-qrcode="true" />
+            <pre-view :key="previewKey" :preview-qrcode="true" />
         </el-dialog>
     </div>
 </template>
 
 <script>
 import PreView from '@/views/form/preview'
+
 export default {
     name: 'NewIndex',
     components: {PreView},
     data() {
         return {
+            previewKey: +new Date(),
             previewDialogVisible: false,
             defaultActiveMenu: 'editor',
             projectKey: null,
@@ -99,6 +102,10 @@ export default {
         menuSelectHandle(index) {
             this.$router.replace({path: index, query: {key: this.projectKey}})
         },
+        openPreviewHandle() {
+            this.previewKey = +new Date()
+            this.previewDialogVisible = true
+        },
         saveProjectAsTemplateHandle() {
             this.$api.post('/user/project/template/save', {key: this.projectKey}).then(() => {
                 this.msgSuccess('保存成功')
@@ -192,7 +199,7 @@ export default {
   }
 }
 
-::v-deep.preview-container{
+::v-deep.preview-container {
   background-color: #ffffff;
 }
 </style>
diff --git a/src/views/project/my/index.vue b/src/views/project/my/index.vue
index 5997e39..d053921 100644
--- a/src/views/project/my/index.vue
+++ b/src/views/project/my/index.vue
@@ -105,7 +105,7 @@
                             </el-button>
                         </el-popconfirm>
                         <el-popconfirm
-                            v-if="p.status==3"
+                            v-if="p.status!=2"
                             title="确定删除该项目吗？"
                             @confirm="deleteProject(p.key)"
                         >
@@ -200,7 +200,7 @@
                             </el-button>
                         </el-popconfirm>
                         <el-popconfirm
-                            v-if="scope.row.status==3"
+                            v-if="scope.row.status!=2"
                             title="确定删除该项目吗？"
                             @confirm="deleteProject(scope.row.key)"
                         >