From 0a6213f50ed995a9c492ec15183392e165599ba6 Mon Sep 17 00:00:00 2001 From: bianyaqi Date: Thu, 6 Jul 2023 15:41:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=9A=84=E5=88=86=E5=AD=90?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8F=98=E5=A4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 - src/core/initHotKeys.js | 129 +++++++++--------- .../reservation/schedule/doctor-schedule.vue | 11 +- 3 files changed, 70 insertions(+), 71 deletions(-) diff --git a/package.json b/package.json index 3066b12..d0d4eec 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,6 @@ "tui-color-picker": "^2.2.8", "tui-image-editor": "^3.15.3", "v-tooltip": "^2.1.3", - "view-design": "^4.7.0", "vue": "^2.6.11", "vue-chat-scroll": "^1.4.0", "vue-clipboard2": "^0.3.3", diff --git a/src/core/initHotKeys.js b/src/core/initHotKeys.js index 5bfc1d7..ad6c04f 100644 --- a/src/core/initHotKeys.js +++ b/src/core/initHotKeys.js @@ -9,81 +9,78 @@ import hotkeys from 'hotkeys-js' import { cloneDeep } from 'lodash-es' import { v4 as uuid } from 'uuid' -import { Message } from 'view-design' const keyNames = { - lrdu: 'left,right,down,up', // 左右上下 - backspace: 'backspace', // backspace键盘 - ctrlz: 'ctrl+z', - ctrlc: 'ctrl+c', - ctrlv: 'ctrl+v' - } + lrdu: 'left,right,down,up', // 左右上下 + backspace: 'backspace', // backspace键盘 + ctrlz: 'ctrl+z', + ctrlc: 'ctrl+c', + ctrlv: 'ctrl+v' +} function initHotkeys(canvas) { - // 删除快捷键 - hotkeys(keyNames.backspace, function () { - const activeObject = canvas.getActiveObjects() - if (activeObject) { - activeObject.map(item => canvas.remove(item)) - canvas.requestRenderAll() - canvas.discardActiveObject() - } - }) - - // 移动快捷键 - hotkeys(keyNames.lrdu, (event, handler) => { - const activeObject = canvas.getActiveObject() - if (activeObject) { - switch (handler.key) { - case 'left': - activeObject.set('left', activeObject.left - 1 ) - break; - case 'right': - activeObject.set('left', activeObject.left + 1 ) - break; - case 'down': - activeObject.set('top', activeObject.top + 1 ) - break; - case 'up': - activeObject.set('top', activeObject.top - 1 ) - break; - default: - } - canvas.renderAll() - } - }) + // 删除快捷键 + hotkeys(keyNames.backspace, function() { + const activeObject = canvas.getActiveObjects() + if (activeObject) { + activeObject.map(item => canvas.remove(item)) + canvas.requestRenderAll() + canvas.discardActiveObject() + } + }) - // 复制粘贴 - copyElement(canvas) + // 移动快捷键 + hotkeys(keyNames.lrdu, (event, handler) => { + const activeObject = canvas.getActiveObject() + if (activeObject) { + switch (handler.key) { + case 'left': + activeObject.set('left', activeObject.left - 1) + break + case 'right': + activeObject.set('left', activeObject.left + 1) + break + case 'down': + activeObject.set('top', activeObject.top + 1) + break + case 'up': + activeObject.set('top', activeObject.top - 1) + break + default: + } + canvas.renderAll() + } + }) + // 复制粘贴 + copyElement(canvas) } +function copyElement(canvas) { + let copyEl = null -function copyElement(canvas){ - let copyEl = null - - // 复制 - hotkeys(keyNames.ctrlc, (event, handler) => { - const activeObject = canvas.getActiveObjects() - if(activeObject.length === 0) return - copyEl = cloneDeep(activeObject[0]) - if(copyEl.left === activeObject[0].left) { - copyEl.left += 10 - copyEl.top += 10 - } - Message.success('复制成功') - }) - // 粘贴 - hotkeys(keyNames.ctrlv, (event, handler) => { - if(!copyEl) return Message.warning('暂无复制内容') - const myCopyEl = cloneDeep(copyEl) - myCopyEl.id = uuid() - copyEl.left += 10 - copyEl.top += 10 - canvas.add(myCopyEl) - canvas.setActiveObject(myCopyEl) - }) + // 复制 + hotkeys(keyNames.ctrlc, (event, handler) => { + const activeObject = canvas.getActiveObjects() + if (activeObject.length === 0) return + copyEl = cloneDeep(activeObject[0]) + if (copyEl.left === activeObject[0].left) { + copyEl.left += 10 + copyEl.top += 10 + } + this.$message.success('复制成功') + }) + // 粘贴 + hotkeys(keyNames.ctrlv, (event, handler) => { + if (!copyEl) return this.$message.warning('暂无复制内容') + const myCopyEl = cloneDeep(copyEl) + myCopyEl.id = uuid() + copyEl.left += 10 + copyEl.top += 10 + canvas.add(myCopyEl) + canvas.setActiveObject(myCopyEl) + }) } export default initHotkeys -export { keyNames, hotkeys } \ No newline at end of file +export { keyNames, hotkeys } diff --git a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/doctor-schedule.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/doctor-schedule.vue index ff8238f..f3ac329 100644 --- a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/doctor-schedule.vue +++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/doctor-schedule.vue @@ -77,7 +77,7 @@ >

约满

- {{ weekInfoItem.morning.orderNum }} / + {{ weekInfoItem.morning.orderNum }} / {{ weekInfoItem.morning.maxNumber }}

@@ -87,7 +87,7 @@ >

已约

- {{ weekInfoItem.morning.orderNum }} / + {{ weekInfoItem.morning.orderNum }} / {{ weekInfoItem.morning.maxNumber }}

@@ -125,7 +125,7 @@ >

约满

- {{ weekInfoItem.after.orderNum }} / + {{ weekInfoItem.after.orderNum }} / {{ weekInfoItem.after.maxNumber }}

@@ -135,7 +135,7 @@ >

已约

- {{ weekInfoItem.after.orderNum }} / + {{ weekInfoItem.after.orderNum }} / {{ weekInfoItem.after.maxNumber }}

@@ -408,6 +408,9 @@ export default {