From 4b8a3acca8427e16a7413cb88a9010332ed9e441 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 10 Sep 2019 16:14:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E4=BB=A5=E5=8F=8Aibp=E7=9B=98=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/langs/en/scriptRecord.js | 41 +++++++++++-------- src/i18n/langs/zh/scriptRecord.js | 7 +++- src/ibp/mouseController.js | 5 ++- .../ibpDraft/ibpEdit/ibpOperate/ibpTipBox.vue | 4 +- src/views/scriptManage/category/tree.vue | 4 +- src/views/scriptManage/home.vue | 12 +++--- 6 files changed, 43 insertions(+), 30 deletions(-) diff --git a/src/i18n/langs/en/scriptRecord.js b/src/i18n/langs/en/scriptRecord.js index e48e0c82f..efbbd4a57 100644 --- a/src/i18n/langs/en/scriptRecord.js +++ b/src/i18n/langs/en/scriptRecord.js @@ -1,22 +1,29 @@ 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' + + // 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..edb33e9c7 100644 --- a/src/i18n/langs/zh/scriptRecord.js +++ b/src/i18n/langs/zh/scriptRecord.js @@ -1,12 +1,15 @@ export default { scriptTitle: '剧本录制', - // saveMaplocation: '更新定位', saveBackground: '保存背景', saveData: '保存数据', mapList: '地图列表', createScript: '创建剧本', scriptName: '剧本名称', - + addScript: '添加剧本', + map: '所属地图', + scriptDescription: '剧本描述', + submit: '确定' + // 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/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 @@ + + + +