From 3341a29421013272f4cb6d9903f602fba827f472 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Mon, 19 Apr 2021 16:24:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/iscs_new/iscsDraw/index.vue | 15 ++- .../iscs_new/iscsDraw/statusCombineEdit.vue | 123 ++++++++++++++++++ 2 files changed, 134 insertions(+), 4 deletions(-) create mode 100644 src/views/iscs_new/iscsDraw/statusCombineEdit.vue diff --git a/src/views/iscs_new/iscsDraw/index.vue b/src/views/iscs_new/iscsDraw/index.vue index 61c96cdb3..2a942405f 100644 --- a/src/views/iscs_new/iscsDraw/index.vue +++ b/src/views/iscs_new/iscsDraw/index.vue @@ -44,7 +44,7 @@ - + @@ -62,6 +62,7 @@ import orders from '@/iscs_new/utils/orders'; import * as utils from '@/iscs_new/utils/utils'; import Idb from '../utils/indexedDb.js'; import shapeType from '@/iscs_new/constant/shapeType.js'; +import StatusCombineEdit from './statusCombineEdit'; import { EventBus } from '@/scripts/event-bus'; export default { @@ -69,7 +70,8 @@ export default { components: { iscsCanvas, DataForm, - TableForm + TableForm, + StatusCombineEdit }, data() { return { @@ -85,7 +87,8 @@ export default { statusTab:'', showDeleteButton:false, elementList:[], - composeElemList:[] + composeElemList:[], + stateList:[] }; }, computed:{ @@ -131,7 +134,7 @@ export default { // }, null); // const position = rect ? [(rect.x + rect.width) / 2, (rect.y + rect.height) / 2] : [0, 0]; const position = [0, 0]; - const stateList = []; + const stateList = this.stateList; const model = { id, name, type, shapeList, stateList, position }; Idb.delete('composeTemplateList', model.id); @@ -146,6 +149,10 @@ export default { }, onSelectCardTab() { + }, + saveStateList(stateList) { + this.stateList = stateList; + this.onSave(); }, onSelected(em) { if (em.model) { diff --git a/src/views/iscs_new/iscsDraw/statusCombineEdit.vue b/src/views/iscs_new/iscsDraw/statusCombineEdit.vue new file mode 100644 index 000000000..13f82e58a --- /dev/null +++ b/src/views/iscs_new/iscsDraw/statusCombineEdit.vue @@ -0,0 +1,123 @@ + + +