From ce5d0424d5b67fc2a74392a8ff0a4e61df6ca884 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Tue, 3 Sep 2019 18:45:02 +0800 Subject: [PATCH 01/18] =?UTF-8?q?ibp=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/ibp/ibpDraft/ibpEdit/ibpOperate/ibpBg.vue | 11 ++++++----- src/views/ibp/ibpDraft/ibpEdit/ibpOperate/index.vue | 6 +++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpBg.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpBg.vue index 5a1cd14f0..e850f4316 100644 --- a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpBg.vue +++ b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpBg.vue @@ -47,22 +47,23 @@ }, methods: { onSubmit() { + const code = this.generateCode(); const bgModel = { x: 0, y: 0, _type: 'Background', - code: this.generateCode(), + code: code, width: this.form .bgWidth, height: this.form.bgHeight }; this.$emit('createBg', bgModel) }, initPage(){ + }, + generateCode() { + const mydate = new Date(); + return "bg"+mydate.getDay()+ mydate.getHours()+ mydate.getMinutes()+mydate.getSeconds()+mydate.getMilliseconds()+ Math.round(Math.random() * 10000); } - }, - generateCode() { - const mydate = new Date(); - this.form.code = "bg"+mydate.getDay()+ mydate.getHours()+ mydate.getMinutes()+mydate.getSeconds()+mydate.getMilliseconds()+ Math.round(Math.random() * 10000); } }; diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/index.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/index.vue index f1f6cda87..973acc846 100644 --- a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/index.vue +++ b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/index.vue @@ -110,7 +110,7 @@ + diff --git a/src/views/planMonitor/editTool/menus/openRunPlan.vue b/src/views/planMonitor/editTool/menus/openRunPlan.vue index 7a1ec86fd..2fda864f2 100644 --- a/src/views/planMonitor/editTool/menus/openRunPlan.vue +++ b/src/views/planMonitor/editTool/menus/openRunPlan.vue @@ -1,44 +1,49 @@