From 6e6a56903faecb2e1fc4ca8146fa7f88a22cd7d7 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 20 Aug 2019 18:31:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E7=BC=96=E5=88=B6=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/scriptManage/home.vue               |  2 +-
 .../scriptManage/scriptRecord/addAction.vue   | 20 ++++++++--------
 .../scriptManage/scriptRecord/getAction.vue   | 23 +++++++++++--------
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/views/scriptManage/home.vue b/src/views/scriptManage/home.vue
index c8f86e746..9243e7458 100644
--- a/src/views/scriptManage/home.vue
+++ b/src/views/scriptManage/home.vue
@@ -32,7 +32,7 @@
                 loading:false,
                 mapList: [],
                 taskStatusList: [],
-                disabled:null,
+                disabled:true,
                 formModel: {
                     name: '',
                     mapId: '',
diff --git a/src/views/scriptManage/scriptRecord/addAction.vue b/src/views/scriptManage/scriptRecord/addAction.vue
index 7600a60a8..c7b0ebd30 100644
--- a/src/views/scriptManage/scriptRecord/addAction.vue
+++ b/src/views/scriptManage/scriptRecord/addAction.vue
@@ -50,7 +50,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item>
-                    <el-button type="primary" @click="addCommandAction('commandData')" :disabled="isPause" :loading="adding">添加动作</el-button>
+                    <el-button type="primary" @click="addCommandAction('commandData')" :disabled="isPause" :loading="adding">添加指令</el-button>
                 </el-form-item>
             </el-form>
         </el-card>
@@ -217,12 +217,12 @@
                         this.adding=true;
                         addScriptAction(group,data).then(response=>{
                             this.adding=false;
-                            this.$message.success('添加动作成功');
-                            this.$emit('create');
+                            this.$message.success('添加指令成功');
+                            this.$emit('create',true);
                             this.initCommandActionData();
                         }).catch(error => {
                             this.adding=false;
-                            this.$messageBox(`添加动作失败: ${error.message}`);
+                            this.$messageBox(`添加指令失败: ${error.message}`);
                         });
                     }
                     else {
@@ -243,12 +243,12 @@
                         {
                             addScriptAction(group,data).then(response=>{
                                 this.modifying=false;
-                                this.$message.success('添加动作成功');
-                                this.$emit('create');
+                                this.$message.success('添加对话成功');
+                                this.$emit('create',true);
                                 this.initActionData();
                             }).catch(error => {
                                 this.modifying=false;
-                                this.$messageBox(`添加动作失败: ${error.message}`);
+                                this.$messageBox(`添加对话失败: ${error.message}`);
                             });
                         }
                         else
@@ -259,12 +259,12 @@
                                 this.isNotModify=true;
                                 this.$parent.$parent.$parent.setDisabled(this.isNotModify);
                                 this.$emit('modifyButtonName');
-                                this.$message.success('修改动作成功');
-                                this.$emit('create');
+                                this.$message.success('修改对话成功');
+                                this.$emit('create',false);
                                 this.initActionData();
                             }).catch(error => {
                                 this.modifying=false;
-                                this.$messageBox(`修改动作失败: ${error.message}`);
+                                this.$messageBox(`修改对话失败: ${error.message}`);
                             });
                         }
                     }
diff --git a/src/views/scriptManage/scriptRecord/getAction.vue b/src/views/scriptManage/scriptRecord/getAction.vue
index 2876cf81b..9255680e8 100644
--- a/src/views/scriptManage/scriptRecord/getAction.vue
+++ b/src/views/scriptManage/scriptRecord/getAction.vue
@@ -1,7 +1,7 @@
 <template>
         <div class="actionPaneInner">
             <div class="actionList">
-                <span class="titleStyle">剧本动作</span>
+                <span class="titleStyle">剧本编制</span>
             </div>
             <div class="tab-pane-big">
                 <el-scrollbar wrapClass="scrollbar-wrapper" ref="elScrollbar" class="elScrollbar">
@@ -53,7 +53,7 @@
                 behaviorName:"",
                 memberName:"",
                 operateType:"add",
-                buttonName:"添加动作",
+                buttonName:"添加对话",
             }
         },
         components: {
@@ -62,6 +62,14 @@
         mounted(){
             this.loadInitData();
         },
+        watch:{
+            actionInfoList: function(val){
+                this.$nextTick(function(){
+                    var div = this.$refs['elActionScrollbar'].$refs['wrap'];
+                    div.scrollTop=this.$refs['elActionScrollbar'].wrap.scrollHeight;
+                });
+            }
+        },
         methods:{
             loadInitData() {
                 let group=this.$route.query.group;
@@ -138,21 +146,16 @@
             reloadTable(){
                 this.loadInitData();
             },
-            create(){
+            create(data){
                 this.reloadTable();
-                this.$nextTick(function(){
-                    var div = this.$refs['elActionScrollbar'].$refs['wrap'];
-                    div.scrollTop=this.$refs['elActionScrollbar'].wrap.scrollHeight;
-                });
-                
             },
             modifyAction(row){
                 this.operateType="modify";
-                this.buttonName="修改动作"
+                this.buttonName="修改对话"
                 this.$refs.addBehavior.doShow(row);
             },
             modifyButtonName(){
-                this.buttonName="添加动作",
+                this.buttonName="添加对话",
                 this.operateType="add"
             }
         }