From 6951bf9f3ae5f8b1056cb8b9ae04ca0c33cbf3f2 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 9 Aug 2019 17:26:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20=E5=9B=BD=E9=99=85=E5=8C=96=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/en/index.js                    |  4 +-
 src/i18n/langs/en/scriptRecord.js             | 17 ++++
 src/i18n/langs/zh/index.js                    |  4 +-
 src/i18n/langs/zh/scriptRecord.js             | 17 ++++
 src/views/display/scriptRecord/addAction.vue  |  2 +-
 src/views/display/scriptRecord/getAction.vue  | 52 ++++++-----
 .../display/scriptRecord/getBehavior.vue      | 90 ++++++++++---------
 .../scriptRecord/roleConditionScript.vue      |  7 +-
 .../display/scriptRecord/roleSection.vue      | 23 +++--
 src/views/display/scriptRecord/taskScript.vue |  2 +
 src/views/display/tipScriptRecord.vue         | 10 +--
 11 files changed, 137 insertions(+), 91 deletions(-)
 create mode 100644 src/i18n/langs/en/scriptRecord.js
 create mode 100644 src/i18n/langs/zh/scriptRecord.js

diff --git a/src/i18n/langs/en/index.js b/src/i18n/langs/en/index.js
index c6cb99f28..f6b0ed64b 100644
--- a/src/i18n/langs/en/index.js
+++ b/src/i18n/langs/en/index.js
@@ -5,6 +5,7 @@ import router from './router';
 import lesson from './lesson';
 import error from './error';
 import rules from './rules';
+import scriptRecord from './scriptRecord';
 
 export default {
 	...enLocale,
@@ -13,5 +14,6 @@ export default {
 	router,
 	lesson,
 	error,
-	rules
+	rules,
+	scriptRecord
 };
diff --git a/src/i18n/langs/en/scriptRecord.js b/src/i18n/langs/en/scriptRecord.js
new file mode 100644
index 000000000..88dc72795
--- /dev/null
+++ b/src/i18n/langs/en/scriptRecord.js
@@ -0,0 +1,17 @@
+export default {
+    scriptTitle: "Task Recording",
+    saveMaplocation: "Update Location",
+    saveBackground: "Save Background",
+    saveData: "Save Data",
+    roleManage: "Role Manage",
+    targetCondition: "Task Target",
+    taskScript: "Task Script",
+    roleName: "Role Name",
+    roleType: "Role Type",
+    deviceCode: "Device Code",
+    roleList: "Role List",
+    operation:"Operation",
+    roleAdd: "Add",
+    delete: "Delete",
+    behaviorOperate: "Behavior Operate",
+};
\ No newline at end of file
diff --git a/src/i18n/langs/zh/index.js b/src/i18n/langs/zh/index.js
index 8e88ffa56..1bc599e67 100644
--- a/src/i18n/langs/zh/index.js
+++ b/src/i18n/langs/zh/index.js
@@ -5,6 +5,7 @@ import router from './router';
 import lesson from './lesson';
 import error from './error';
 import rules from './rules';
+import scriptRecord from './scriptRecord';
 
 export default {
 	...cnLocale,
@@ -13,5 +14,6 @@ export default {
 	router,
 	lesson,
 	error,
-	rules
+	rules,
+	scriptRecord
 };
diff --git a/src/i18n/langs/zh/scriptRecord.js b/src/i18n/langs/zh/scriptRecord.js
new file mode 100644
index 000000000..4a9cfbca2
--- /dev/null
+++ b/src/i18n/langs/zh/scriptRecord.js
@@ -0,0 +1,17 @@
+export default {
+    scriptTitle: "任务录制",
+    saveMaplocation: "更新定位",
+    saveBackground: "保存背景",
+    saveData: "保存数据",
+    roleManage:"角色管理",
+    targetCondition:"任务目标",
+    taskScript:"任务剧本",
+    roleName: "角色名称",
+    roleType: "角色类型",
+    deviceCode: "设备编码",
+    roleList: "角色列表",
+    operation: "操作",
+    roleAdd: "添加",
+    delete: "删除",
+    behaviorOperate: "行为操作",
+};
\ No newline at end of file
diff --git a/src/views/display/scriptRecord/addAction.vue b/src/views/display/scriptRecord/addAction.vue
index 84b8d4261..de961d051 100644
--- a/src/views/display/scriptRecord/addAction.vue
+++ b/src/views/display/scriptRecord/addAction.vue
@@ -265,7 +265,7 @@
         font-size: 15px;
     }
     .actionInfo{
-        margin-top: 30px;
+        margin-top:20px;
         margin-left: 5px;
         font-size: 15px;
         width:98%;
diff --git a/src/views/display/scriptRecord/getAction.vue b/src/views/display/scriptRecord/getAction.vue
index 320b1b0ed..f68f4200c 100644
--- a/src/views/display/scriptRecord/getAction.vue
+++ b/src/views/display/scriptRecord/getAction.vue
@@ -1,30 +1,32 @@
 <template>
-        <div class="tab-pane-big">
-        <el-scrollbar wrapClass="scrollbar-wrapper" ref="elActionScrollbar">
+        <div>
             <div class="actionList">
                 <i class="el-icon-back" @click="backToMember"></i>
                 <span class="titleStyle">{{memberName}}角色<span class="titleStyle">/</span><span class="titleStyle">{{behaviorName}}行为</span><span class="titleStyle">/</span><span class="titleStyle">动作信息</span></span>
             </div>
-            <add-action ref="addBehavior" :group="group" :memberId="memberId" :behaviorId="behaviorId" @create="create" :buttonName="buttonName" :operateType="operateType" @modifyButtonName="modifyButtonName"></add-action>
-            <el-table
-                v-loading="loading"
-                :data="actionList" border class="actionListTable">
-                <el-table-column prop="reply" label="回复消息" width="200">
-                </el-table-column>
-                <el-table-column prop="time" label="完成时间" width="200">
-                </el-table-column>
-                <el-table-column prop="type" label="动作类型" width="200">
-                </el-table-column>
-                <el-table-column label="操作" width="200">
-                    <template slot-scope="scope">
-                        <el-row>
-                            <el-button type="primary" size="mini" @click="modifyAction(scope.row)">修改</el-button>
-                            <el-button type="primary" size="mini" @click="deleteAction(scope.row)">删除</el-button>
-                        </el-row>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </el-scrollbar>
+            <div class="tab-pane-big">
+            <el-scrollbar wrapClass="scrollbar-wrapper" ref="elActionScrollbar">
+                <add-action ref="addBehavior" :group="group" :memberId="memberId" :behaviorId="behaviorId" @create="create" :buttonName="buttonName" :operateType="operateType" @modifyButtonName="modifyButtonName"></add-action>
+                <el-table
+                    v-loading="loading"
+                    :data="actionList" border class="actionListTable">
+                    <el-table-column prop="reply" label="回复消息" width="200">
+                    </el-table-column>
+                    <el-table-column prop="time" label="完成时间" width="200">
+                    </el-table-column>
+                    <el-table-column prop="type" label="动作类型" width="200">
+                    </el-table-column>
+                    <el-table-column label="操作" width="200">
+                        <template slot-scope="scope">
+                            <el-row>
+                                <el-button type="primary" size="mini" @click="modifyAction(scope.row)">修改</el-button>
+                                <el-button type="primary" size="mini" @click="deleteAction(scope.row)">删除</el-button>
+                            </el-row>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </el-scrollbar>
+            </div>
         </div>
 </template>
 <script>
@@ -120,11 +122,15 @@
         width:802px;
     }
     .actionList{
-        margin-top: 20px;
+        margin-top: 10px;
         margin-left: 5px;
         font-size: 15px;
+        margin-bottom:10px;
     }
     .titleStyle{
         margin-left:10px;
     }
+    .tab-pane-big{
+        height:380px;
+    }
 </style>
diff --git a/src/views/display/scriptRecord/getBehavior.vue b/src/views/display/scriptRecord/getBehavior.vue
index b639ad7ef..22370a101 100644
--- a/src/views/display/scriptRecord/getBehavior.vue
+++ b/src/views/display/scriptRecord/getBehavior.vue
@@ -1,46 +1,48 @@
 <template>
-    <div class="tab-pane-big">
-        <el-scrollbar wrapClass="scrollbar-wrapper" ref="elScrollbar">
-            <div class="behaviorList">
-                <i class="el-icon-back" @click="backToMember" style="cursor:pointer;"></i>
-                <span class="titleStyle">{{memberName}}角色<span class="titleStyle">/</span><span class="titleStyle">行为信息</span></span>
-            </div>
-            <add-behavior ref="addBehavior" :title="title" :group="group" :memberId="memberId" @create="handleCreate" :operateType="operateType" :buttonName="buttonName" @modifyButtonName="modifyButtonName"></add-behavior>
-            <div class="behaviorList">行为列表</div>
-            <el-table
-                v-loading="loading"
-                :data="behaviorList" border class="behaviorListTable">
-                <el-table-column label="是否主动触发" width="150">
-                    <template slot-scope="scope">
-                        <div>{{scope.row.auto?"是":"否"}}</div>
-                    </template>
-                </el-table-column>
-                <el-table-column label="目标角色" width="200">
-                    <template slot-scope="scope">
-                        <div>{{scope.row.targetMemberId}}</div>
-                    </template>
-                </el-table-column>
-                <el-table-column label="描述" width="200">
-                    <template slot-scope="scope">
-                        <div>{{scope.row.description}}</div>
-                    </template>
-                </el-table-column>
-                <el-table-column label="触发条件" width="150">
-                    <template slot-scope="scope">
-                        <div>{{scope.row.conditionVO.triggerType==null?"无":scope.row.conditionVO.triggerType}}</div>
-                    </template>
-                </el-table-column>
-                <el-table-column label="操作" width="200">
-                    <template slot-scope="scope">
-                        <el-row>
-                            <el-button type="primary" size="mini" @click="modifyActions(scope.row)">修改</el-button>
-                            <el-button type="primary" size="mini" @click="deleteBehavior(scope.row)">删除</el-button>
-                        </el-row>
-                        <el-row style="margin-top:10px"><el-button type="primary" size="mini" @click="getActions(scope.row)">动作操作</el-button></el-row>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </el-scrollbar>
+    <div>
+        <div class="behaviorList">
+            <i class="el-icon-back" @click="backToMember" style="cursor:pointer;"></i>
+            <span class="titleStyle">{{memberName}}角色<span class="titleStyle">/</span><span class="titleStyle">行为信息</span></span>
+        </div>
+        <div class="tab-pane-big">
+            <el-scrollbar wrapClass="scrollbar-wrapper" ref="elScrollbar">
+                <add-behavior ref="addBehavior" :title="title" :group="group" :memberId="memberId" @create="handleCreate" :operateType="operateType" :buttonName="buttonName" @modifyButtonName="modifyButtonName"></add-behavior>
+                <div class="behaviorList">行为列表</div>
+                <el-table
+                    v-loading="loading"
+                    :data="behaviorList" border class="behaviorListTable">
+                    <el-table-column label="是否主动触发" width="150">
+                        <template slot-scope="scope">
+                            <div>{{scope.row.auto?"是":"否"}}</div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="目标角色" width="200">
+                        <template slot-scope="scope">
+                            <div>{{scope.row.targetMemberId}}</div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="描述" width="200">
+                        <template slot-scope="scope">
+                            <div>{{scope.row.description}}</div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="触发条件" width="150">
+                        <template slot-scope="scope">
+                            <div>{{scope.row.conditionVO.triggerType==null?"无":scope.row.conditionVO.triggerType}}</div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="操作" width="200">
+                        <template slot-scope="scope">
+                            <el-row>
+                                <el-button type="primary" size="mini" @click="modifyActions(scope.row)">修改</el-button>
+                                <el-button type="primary" size="mini" @click="deleteBehavior(scope.row)">删除</el-button>
+                            </el-row>
+                            <el-row style="margin-top:10px"><el-button type="primary" size="mini" @click="getActions(scope.row)">动作操作</el-button></el-row>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </el-scrollbar>
+        </div>
     </div>
 </template>
 <script>
@@ -131,7 +133,7 @@
         width:901px;
     }
     .behaviorList{
-        margin-top: 20px;
+        margin-top: 10px;
         margin-left: 5px;
         font-size: 15px;
         margin-bottom:20px;
@@ -140,6 +142,6 @@
         margin-left:10px;
     }
     .tab-pane-big{
-        height:420px;
+        height:370px;
     }
 </style>
\ No newline at end of file
diff --git a/src/views/display/scriptRecord/roleConditionScript.vue b/src/views/display/scriptRecord/roleConditionScript.vue
index 31ff54d48..6c4dcb876 100644
--- a/src/views/display/scriptRecord/roleConditionScript.vue
+++ b/src/views/display/scriptRecord/roleConditionScript.vue
@@ -1,20 +1,20 @@
 <template>
     <el-tabs v-model="activeName" type="card">
-        <el-tab-pane label="角色管理" name="first">
+        <el-tab-pane :label="$t('scriptRecord.roleManage')" name="first">
             <div class="tab-pane">
                 <el-scrollbar wrapClass="scrollbar-wrapper">
                     <role-section ref="roleSection" :group="group" @getBehaviorList="getBehaviorList"></role-section>
                 </el-scrollbar>
             </div>
         </el-tab-pane>
-        <el-tab-pane label="任务目标" name="second">
+        <el-tab-pane :label="$t('scriptRecord.targetCondition')" name="second">
             <div class="tab-pane">
                 <el-scrollbar wrapClass="scrollbar-wrapper">
                     <target-condition ref="targetCondition" :group="group"></target-condition>
                 </el-scrollbar>
             </div>
         </el-tab-pane>
-        <el-tab-pane label="任务剧本" name="third">
+        <el-tab-pane :label="$t('scriptRecord.taskScript')" name="third">
             <div class="tab-pane">
                 <el-scrollbar wrapClass="scrollbar-wrapper">
                     <task-script ref="taskScript" :group="group"></task-script>
@@ -60,7 +60,6 @@
                     this.$store.dispatch('scriptRecord/updateDeviceCondition', deviceConditionList);
                     this.$store.dispatch('scriptRecord/updateMemberList', response.data.memberVOList);
                     this.$store.dispatch('scriptRecord/updateScript', response.data.script);
-                    debugger;
                     if(response.data.mapLocation)
                     {
                         let mapLocation={"offsetX":response.data.mapLocation.x,"offsetY":response.data.mapLocation.y,"scaleRate":response.data.mapLocation.scale};
diff --git a/src/views/display/scriptRecord/roleSection.vue b/src/views/display/scriptRecord/roleSection.vue
index c74d24ddd..a455e5ba3 100644
--- a/src/views/display/scriptRecord/roleSection.vue
+++ b/src/views/display/scriptRecord/roleSection.vue
@@ -1,35 +1,34 @@
 <template>
     <div>
-            <el-form :model="memberVO" ref="memberVO" :rules="rules" label-width="80px" class="roleAction" label-position="left">
-                <el-form-item label="角色名称" class="conditionVO" prop="name">
+            <el-form :model="memberVO" ref="memberVO" :rules="rules" label-width="100px" class="roleAction" label-position="right">
+                <el-form-item :label="$t('scriptRecord.roleName')" class="conditionVO" prop="name">
                     <el-input v-model="memberVO.name" class="inputStyle"></el-input>
                 </el-form-item>
-                <el-form-item label="角色类型" class="conditionVO" prop="role">
+                <el-form-item :label="$t('scriptRecord.roleType')" class="conditionVO" prop="role">
                     <el-select v-model="memberVO.role" placeholder="请选择角色类型" @change="changeRoleType">
                         <el-option v-for="rolerType in roleTypeList" :key="rolerType.label" :label="rolerType.label" :value="rolerType.value"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="设备编码" class="conditionVO">
+                <el-form-item :label="$t('scriptRecord.deviceCode')" class="conditionVO">
                     <el-select v-model="memberVO.deviceCode" clearable placeholder="请选择设备编码">
-                        <!-- groupNumber -->
                         <el-option v-for="deviceCode in deviceCodeList" :key="deviceCode.code" :label="deviceCode.name" :value="deviceCode.code"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item>
-                    <el-button type="primary" @click="addQuestMember('memberVO')">添加</el-button>
+                    <el-button type="primary" @click="addQuestMember('memberVO')">{{$t('scriptRecord.roleAdd')}}</el-button>
                 </el-form-item>
             </el-form>
-        <div class="roleList">角色列表</div>
+        <div class="roleList">{{$t('scriptRecord.roleList')}}</div>
         <el-table
             v-loading="loading"
             :data="memberList" border class="memberList">
-            <el-table-column prop="name" label="角色名称" width="350">
+            <el-table-column prop="name" :label="$t('scriptRecord.roleName')" width="350">
             </el-table-column>
-            <el-table-column label="操作"  width="350">
+            <el-table-column :label="$t('scriptRecord.operation')"  width="350">
                 <template slot-scope="scope">
                     <el-row>
-                        <el-button type="primary" size="mini" @click="getMembers(scope.row)">行为操作</el-button>
-                        <el-button type="primary" size="mini" @click="deleteMember(scope.$index,scope.row)">删除</el-button>
+                        <el-button type="primary" size="mini" @click="getMembers(scope.row)">{{$t('scriptRecord.behaviorOperate')}}</el-button>
+                        <el-button type="primary" size="mini" @click="deleteMember(scope.$index,scope.row)">{{$t('scriptRecord.delete')}}</el-button>
                     </el-row>
                 </template>
             </el-table-column>
@@ -88,7 +87,6 @@
                         let group=this.group;
                         postQuestMember(group,data).then(resp => {
                             this.reloadTable();
-                            // this.dialogFormVisible=false;
                             this.memberVO.role="Admin";
                             this.memberVO.deviceCode="";
                             this.memberVO.name="";
@@ -119,6 +117,7 @@
                 let group=this.group;
                 getQuestRecord(group).then(response=>{
                     this.memberList=response.data.memberVOList;
+                    this.$store.dispatch('scriptRecord/updateScript', response.data.script);
                     this.$store.dispatch('scriptRecord/updateMemberList', response.data.memberVOList);
                 });
             },
diff --git a/src/views/display/scriptRecord/taskScript.vue b/src/views/display/scriptRecord/taskScript.vue
index 3382c5cf0..825394afa 100644
--- a/src/views/display/scriptRecord/taskScript.vue
+++ b/src/views/display/scriptRecord/taskScript.vue
@@ -66,6 +66,8 @@
         },
         watch: {
             '$store.state.scriptRecord.memberList': function (val, old){
+                this.taskScript.memberId="";
+                this.taskScript.behavior="";
                 this.taskScriptList=val;
             },
             '$store.state.scriptRecord.script': function (val, old){
diff --git a/src/views/display/tipScriptRecord.vue b/src/views/display/tipScriptRecord.vue
index d44c2cb24..e3e987118 100644
--- a/src/views/display/tipScriptRecord.vue
+++ b/src/views/display/tipScriptRecord.vue
@@ -20,9 +20,9 @@
                             <get-action ref="getAction" :group="group" :memberId="memberId" :behaviorId="behaviorId" @backToBehavior="backToBehavior"></get-action>
                         </template>
                         <el-button-group class="button-group">
-                            <el-button type="primary" @click="saveMaplocation">更新定位</el-button>
-                            <el-button type="primary" @click="saveScenesStage">保存背景</el-button>
-                            <el-button type="success" @click="saveScenesData">保存数据</el-button>
+                            <el-button type="primary" @click="saveMaplocation">{{$t('scriptRecord.saveMaplocation')}}</el-button>
+                            <el-button type="primary" @click="saveScenesStage">{{$t('scriptRecord.saveBackground')}}</el-button>
+                            <el-button type="success" @click="saveScenesData">{{$t('scriptRecord.saveData')}}</el-button>
                             <!-- <el-button type="danger" @click="dumpScenesData">重置剧本</el-button> -->
                         </el-button-group>
                 </div>
@@ -35,7 +35,7 @@
     import GetBehavior from './scriptRecord/getBehavior';
     import GetAction from './scriptRecord/getAction';
     import RoleConditionScript from './scriptRecord/roleConditionScript';
-    
+
     import { launchFullscreen, exitFullscreen } from '@/utils/screen';
     import {saveScriptScenes, saveScriptData, dumpScriptData} from '@/api/simulation';
     import {updateMapLocation} from '@/api/quest';
@@ -55,7 +55,7 @@
         },
         data() {
             return {
-                title: '任务录制',
+                title: this.$t('scriptRecord.scriptTitle'),
                 isShrink: false,
                 memberId:null,
                 behaviorId:null,