From 63e2a57f3665379a0df02aa79a781f59ff3b556a Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 12 Jan 2021 15:40:05 +0800
Subject: [PATCH] =?UTF-8?q?Bug48:=20=E5=9C=B0=E5=9B=BE=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E4=BD=8D=E7=BD=AE=E9=94=81=E5=AE=9A&=E4=BB=BF?=
 =?UTF-8?q?=E7=9C=9F=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/demonstration/detail/index.vue | 23 ++++++++++++++++++++---
 src/views/trainingPlatform/demonList.vue |  2 +-
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/views/demonstration/detail/index.vue b/src/views/demonstration/detail/index.vue
index c69af0a36..ef172ee33 100644
--- a/src/views/demonstration/detail/index.vue
+++ b/src/views/demonstration/detail/index.vue
@@ -170,7 +170,11 @@ export default {
                 this.$router.push({ path: `/jointTrainingNew`, query: query });
                 launchFullscreen();
             }).catch(error => {
-                this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
+                if (error.code == 10003) {
+                    this.$messageBox(this.$t('error.createSimulationFailed') + '：您的仿真权限不足！');
+                } else {
+                    this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
+                }
                 this.disabled = false;
             });
         },
@@ -185,6 +189,11 @@ export default {
                     this.$router.push({ path: `/displayIscs/system`, query: query });
                 }
             } catch (error) {
+                if (error.code == 10003) {
+                    this.$messageBox(this.$t('error.createSimulationFailed') + '：您的仿真权限不足！');
+                } else {
+                    this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
+                }
                 this.disabled = false;
             }
         },
@@ -197,7 +206,11 @@ export default {
                 }
                 this.$router.push({ path: `/displayBigScreen/${this.courseModel.mapId}`, query: query });
             }).catch(error => {
-                this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
+                if (error.code == 10003) {
+                    this.$messageBox(this.$t('error.createSimulationFailed') + '：您的仿真权限不足！');
+                } else {
+                    this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
+                }
                 this.disabled = false;
             });
         },
@@ -217,7 +230,11 @@ export default {
                 this.$router.push({ path: `${UrlConfig.displayNew}/demon`, query: query });
                 launchFullscreen();
             }).catch(error=>{
-                this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
+                if (error.code == 10003) {
+                    this.$messageBox(this.$t('error.createSimulationFailed') + '：您的仿真权限不足！');
+                } else {
+                    this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
+                }
                 this.disabled = false;
             });
         },
diff --git a/src/views/trainingPlatform/demonList.vue b/src/views/trainingPlatform/demonList.vue
index 95777bcd3..b126bc3cd 100644
--- a/src/views/trainingPlatform/demonList.vue
+++ b/src/views/trainingPlatform/demonList.vue
@@ -206,7 +206,7 @@ export default {
         },
         nodeCollapse(obj, node, ele) {
             const key = obj.key;
-            this.expandList = this.expandList.filter(item => item !== key);
+            this.expandList = this.expandList.filter(item => (item !== key && !item.startsWith(`${key}-`)));
             localStore.set('trainIngPlatformExpandList' + this.filterSelect + this.userId + this.project, this.expandList);
         },
         getExpandList(filterSelect) {