From 96dead378a34ce9e5b2aaada62d266a39f620254 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 12 Nov 2019 17:58:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E5=BD=95=E5=88=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A1=8C=E8=B0=83=E5=92=8C=E7=8E=B0=E5=9C=B0?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/limits/distribute.vue | 1 +
 src/views/components/limits/transfer.vue   | 1 +
 src/views/display/menuSchema.vue           | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/components/limits/distribute.vue b/src/views/components/limits/distribute.vue
index b9e44d501..2c6eb4cf1 100644
--- a/src/views/components/limits/distribute.vue
+++ b/src/views/components/limits/distribute.vue
@@ -183,6 +183,7 @@ export default {
                         this.formModel.permissionList = jsonData;
                     } else {
                         this.isDisabled = true;
+                        this.formModel.permissionList = [];
                     }
                 }).catch(()=>{
                     this.$messageBox(this.$t('error.getPermissionListFailed'));
diff --git a/src/views/components/limits/transfer.vue b/src/views/components/limits/transfer.vue
index 94c1e1e97..f8cdd2119 100644
--- a/src/views/components/limits/transfer.vue
+++ b/src/views/components/limits/transfer.vue
@@ -184,6 +184,7 @@ export default {
                         this.formModel.permissionList = jsonData;
                     } else {
                         this.isDisabled = true;
+                        this.formModel.permissionList = [];
                     }
                 }).catch(()=>{
                     this.$messageBox(this.$t('error.getPermissionListFailed'));
diff --git a/src/views/display/menuSchema.vue b/src/views/display/menuSchema.vue
index 9c865216b..e3770ff32 100644
--- a/src/views/display/menuSchema.vue
+++ b/src/views/display/menuSchema.vue
@@ -62,8 +62,8 @@ export default {
             return this.$route.params.mode === 'plan';
         },
         isScript() {
-            // return this.$route.params.mode === 'script';
-            return false;
+            return this.$route.params.mode === 'script';
+            // return false;
         },
         isDemon() {
             return this.$route.params.mode === 'demon';

From f1075d74b152ceb220b95fd018b3aecb8011f62d Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 12 Nov 2019 18:31:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/display/menuDemon.vue  | 2 +-
 src/views/display/menuSchema.vue | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/display/menuDemon.vue b/src/views/display/menuDemon.vue
index e9ec8ff6c..edf630e93 100644
--- a/src/views/display/menuDemon.vue
+++ b/src/views/display/menuDemon.vue
@@ -7,7 +7,7 @@
     </div>
     <div class="display-draft">
       <el-button-group>
-        <el-button v-if="isShowScheduling" type="primary" @click="">{{ $t('display.demon.dispatchingPlan') }}</el-button>
+        <el-button v-if="isShowScheduling" type="primary" @click="jumpScheduling">{{ $t('display.demon.dispatchingPlan') }}</el-button>
         <el-button type="jumpjlmap3d" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
         <template v-if="isShowQuest">
           <!-- && !isDesignPlatform  -->
diff --git a/src/views/display/menuSchema.vue b/src/views/display/menuSchema.vue
index e3770ff32..19cd08777 100644
--- a/src/views/display/menuSchema.vue
+++ b/src/views/display/menuSchema.vue
@@ -44,7 +44,7 @@ export default {
             OperateMode: OperateMode,
             viewDisabled: true,
             runing: false,
-            swch: '02',
+            swch: '01',
             swchList: [
                 { value: '01', name: '现地' },
                 { value: '02', name: '行调' }
@@ -96,7 +96,6 @@ export default {
                     getStationList(opt.mapId).then(response => {
                         this.$store.dispatch('runPlan/setStations', response.data).then(() => {
                             if (this.$route.params.mode == 'plan') {
-                                // debugger;
                                 if (this.$route.query.from == 'user') {
                                     // 测试运行图功能
                                     getRpDetailByUserMapId(this.$route.query.planId).then(resp => {