diff --git a/src/i18n/langs/en/scriptRecord.js b/src/i18n/langs/en/scriptRecord.js index e48e0c82f..d5401bde5 100644 --- a/src/i18n/langs/en/scriptRecord.js +++ b/src/i18n/langs/en/scriptRecord.js @@ -1,22 +1,102 @@ 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', - conditionTitle: 'Target condition', - deviceType: 'Device Type', - deviceCondition: 'Device Condition', - paramDeviceType: 'Param DeviceType', - paramDeviceCode: 'Param DeviceCode' + mapList: 'Map List', + createScript: 'Create Script', + scriptName: 'Script Name', + addScript: 'Add Script', + map: 'Map', + scriptDescription: 'Script Description', + submit: 'submit', + scriptNameRule: 'Please input script name', + scriptDescriptionRule: 'Please input script description', + createScriptSuccess: 'Create script success', + createScriptFail: 'Create script failure', + scriptDetail: 'Script Detail', + scriptRecord: 'Record', + scriptModify: 'Modify', + scriptDelete: 'Delete', + getScriptFail: 'Get script information failure', + createSimulationFail: 'Create simulation failure', + modifyScriptSuccess: 'Modify script success', + modifyScriptFail: 'Modify script failure', + deleteScriptTip: 'This action will delete this script, whether to continue?', + operateTip: 'Prompt', + confirmButtonText: 'Submit', + cancelButtonText: 'Cancle', + deleteScriptSucess: 'delete script sucess', + deleteScriptFail: 'delete script failure', + scriptRecordTitle: 'Script Record', + drivingPause: 'Pause', + recoverAndExecute: 'Recover And Execute', + resetScript: 'Reset Script', + pauseFail: 'Pause failure', + recoverFail: 'Recover failure', + saveBackgroundSuceess: 'Save background suceess', + updateLocationFail: 'update location failure', + saveBackgroundFail: 'Save background failure', + saveDataSucess: 'Save data sucess', + saveDataFail: 'Save data failure', + clearDataTip: 'This action will clear the saved script data, whether to continue?', + resetDataSuccess: 'Reset script success', + resetDataFail: 'Reset script failure', + + allRoles: 'All Roles', + actors: 'Actors', + roleSexMale: 'Male', + roleSexFemale: 'Female', + selectScriptActorSuccess: 'Select script actor success', + selectScriptActorFail: 'Select script actor failure', + cancleScriptActorSuccess: 'Cancle script actor success', + cancleScriptActorFail: 'Cancle script actor failure', + modifyScriptActorSexSuccess: 'Modify script actor sex success', + modifyScriptActorSexFail: 'Modify script actor sex failure', + + addConversition: 'Add Conversition', + narrator: 'Narrator', + narratorRules: 'Please select narrator', + receiver: 'Receiver', + receiverRules: 'Please select receiver', + conversitionContent: 'Content', + addCommand: 'Add Command', + executor: 'Executor', + executorRules: 'Please select executor', + executeCommand: 'Command', + executeCommandRules: 'Please select execute command', + startStation: 'Start Station', + startStationRules: 'Please select start station ', + endStation: 'End Station', + endStationRules: 'Please select end station', + + addCommandButton: 'Add Command', + addConversitionButton: 'Add Conversition', + conversitionContentRules: 'Please input content', + addCommandSucess: 'Add command sucess', + addCommandFail: 'Add command failure', + addConversitionSuccess: 'Add conversition success', + addConversitionFail: 'Add conversition failure', + modifyConversitionSuccess: 'Modify conversition success', + modifyConversitionFail: 'Modify conversition failure', + modifyConversition: 'Modify Conversition', + modifyConversitionButton: 'modify', + drivingByPlan: 'Driving By Plan', + scriptBack: 'Back' + + // 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', + // conditionTitle: 'Target condition', + // deviceType: 'Device Type', + // deviceCondition: 'Device Condition', + // paramDeviceType: 'Param DeviceType', + // paramDeviceCode: 'Param DeviceCode' }; diff --git a/src/i18n/langs/zh/scriptRecord.js b/src/i18n/langs/zh/scriptRecord.js index 71e7b9023..af2bbecd9 100644 --- a/src/i18n/langs/zh/scriptRecord.js +++ b/src/i18n/langs/zh/scriptRecord.js @@ -1,12 +1,89 @@ export default { scriptTitle: '剧本录制', - // saveMaplocation: '更新定位', saveBackground: '保存背景', saveData: '保存数据', mapList: '地图列表', createScript: '创建剧本', scriptName: '剧本名称', - + addScript: '添加剧本', + map: '所属地图', + scriptDescription: '剧本描述', + submit: '确定', + scriptNameRule: '请输入剧本名称', + scriptDescriptionRule: '请输入剧本描述', + createScriptSuccess: '创建剧本成功', + createScriptFail: '创建剧本失败', + scriptDetail: '剧本详情', + scriptRecord: '编制', + scriptModify: '修改', + scriptDelete: '删除', + getScriptFail: '获取剧本信息失败', + createSimulationFail: '创建仿真失败', + modifyScriptSuccess: '修改剧本成功', + modifyScriptFail: '修改剧本失败', + deleteScriptTip: '此操作将删除此剧本, 是否继续?', + operateTip: '提示', + confirmButtonText: '确定', + cancelButtonText: '取消', + deleteScriptSucess: '删除成功', + deleteScriptFail: '删除失败', + scriptRecordTitle: '剧本编制', + drivingPause: '暂停', + recoverAndExecute: '恢复并执行', + resetScript: '重置剧本', + pauseFail: '暂停失败', + recoverFail: '恢复失败', + saveBackgroundSuceess: '保存背景成功', + updateLocationFail: '更新定位失败', + saveBackgroundFail: '保存背景失败', + saveDataSucess: '保存数据成功', + saveDataFail: '保存数据失败', + clearDataTip: '此操作将会清除已保存的编制数据, 是否继续?', + resetDataSuccess: '重置剧本成功', + resetDataFail: '重置剧本失败', + + allRoles: '所有角色', + actors: '演员角色', + roleSexMale: '男', + roleSexFemale: '女', + selectScriptActorSuccess: '选择剧本角色成功', + selectScriptActorFail: '选择剧本角色失败', + cancleScriptActorSuccess: '取消剧本角色成功', + cancleScriptActorFail: '取消剧本角色失败', + modifyScriptActorSexSuccess: '修改剧本成员性别成功', + modifyScriptActorSexFail: '修改剧本成员性别失败', + + addConversition: '添加对话', + narrator: '讲述者', + narratorRules: '请选择讲述者', + receiver: '接收者', + receiverRules: '请选择接收者', + conversitionContent: '内容', + addCommand: '添加指令', + executor: '执行者', + executorRules: '请选择执行者', + executeCommand: '执行指令', + executeCommandRules: '请选择执行指令', + startStation: '起始站台', + startStationRules: '请选择起始站台', + endStation: '终点站台', + endStationRules: '请选择终点站台', + + addCommandButton: '添加指令', + addConversitionButton: '添加对话', + conversitionContentRules: '请输入内容', + addCommandSucess: '添加指令成功', + addCommandFail: '添加指令失败', + addConversitionSuccess: '添加对话成功', + addConversitionFail: '添加对话失败', + modifyConversitionSuccess: '修改对话成功', + modifyConversitionFail: '修改对话失败', + modifyConversition: '修改对话', + modifyConversitionButton: '修改', + + drivingByPlan: '按计划行车', + scriptBack: '返回' + // roleManage: '角色管理', // targetCondition: '任务目标', // taskScript: '任务剧本', diff --git a/src/ibp/mouseController.js b/src/ibp/mouseController.js index 0f2331a82..412b81e74 100644 --- a/src/ibp/mouseController.js +++ b/src/ibp/mouseController.js @@ -122,14 +122,17 @@ class MouseController extends Eventful { } mouseup(e) { + console.log('-------', this.eventTarget._type===deviceType.Background); if (!eventTool.notLeftMouse(e)&&this.isAllowDragging && this.eventTarget) { this.eventTarget.setModel(e.offsetX - this._offsetX, e.offsetY - this._offsetY); this.eventTarget.dirty(); - this.eventTarget = ''; } + // debugger; if (this.eventTarget && this.eventTarget._type === deviceType.Background) { + // console.log('111-------'); this.eventTarget.setCursor('default'); } + this.eventTarget = ''; this._dragging = false; } diff --git a/src/views/display/menuScript.vue b/src/views/display/menuScript.vue index c01ab2e17..b1fc4d2e6 100644 --- a/src/views/display/menuScript.vue +++ b/src/views/display/menuScript.vue @@ -7,9 +7,9 @@ 重置剧本 --> - 按计划行车 + {{$t('scriptRecord.drivingByPlan')}} - 返回 + {{$t('scriptRecord.scriptBack')}} diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpTipBox.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpTipBox.vue index 36d083737..0928b9623 100644 --- a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpTipBox.vue +++ b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpTipBox.vue @@ -94,8 +94,8 @@ this.form.x = model.point.x; this.form.y = model.point.y; this.opacity = model.opacity; - this.form.lineWidth = model.form.lineWidth; - this.form.stroke = model.form.stroke; + this.form.lineWidth = model.lineWidth; + this.form.stroke = model.stroke; } } }, diff --git a/src/views/scriptManage/category/tree.vue b/src/views/scriptManage/category/tree.vue index 3aa3cec6e..137cf92b2 100644 --- a/src/views/scriptManage/category/tree.vue +++ b/src/views/scriptManage/category/tree.vue @@ -1,8 +1,8 @@ + + + +