From d0e063d3b96cc3100479a1edd7fa84250ec1c789 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Tue, 8 Sep 2020 11:49:51 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/common/login.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/common/login.vue b/src/views/common/login.vue index 0138666..f7ed2fa 100644 --- a/src/views/common/login.vue +++ b/src/views/common/login.vue @@ -35,7 +35,7 @@ - + Date: Tue, 8 Sep 2020 12:15:06 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=A4=96=E9=98=9Ctgit=20?= =?UTF-8?q?pull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../record/recorddetail-add-or-update.vue | 56 +------------------ .../modules/result/record/recorddetail.vue | 4 +- 2 files changed, 5 insertions(+), 55 deletions(-) diff --git a/src/views/modules/result/record/recorddetail-add-or-update.vue b/src/views/modules/result/record/recorddetail-add-or-update.vue index 6357d05..b46efc4 100644 --- a/src/views/modules/result/record/recorddetail-add-or-update.vue +++ b/src/views/modules/result/record/recorddetail-add-or-update.vue @@ -12,13 +12,13 @@
- + @@ -112,8 +112,6 @@ export default { checkResultEditor: null, recordResultId: null, scoreCommentEditor: null, - keyResultEditorElem3_5: null, - keyResultEditorElem3_7: null, auth: [], recordType: 0, type: 0, @@ -209,12 +207,6 @@ export default { this.scoreCommentEditor.txt.html('') } - if (this.keyResultEditorElem3_5 !== null) { - this.keyResultEditorElem3_5.txt.html('

无

') - } - if (this.keyResultEditorElem3_7 !== null) { - this.keyResultEditorElem3_7.txt.html('

无

') - } this.visible = true this.$nextTick(async () => { this.$refs['dataForm'].resetFields() @@ -251,28 +243,6 @@ export default { this.scoreCommentEditor.$textElem.attr('contenteditable', false) } } - if (this.keyResultEditorElem3_5 === null) { - this.keyResultEditorElem3_5 = new E('#keyResultEditorElem3_5') - this.keyResultEditorElem3_5.customConfig.uploadImgServer = '/uploadPicture' - this.keyResultEditorElem3_5.customConfig.uploadFileName = 'file' - this.keyResultEditorElem3_5.customConfig.uploadImgParams = '' - this.keyResultEditorElem3_5.customConfig.debug = true - this.keyResultEditorElem3_5.create() - if (this.auth.keyResult35 < 2) { - this.keyResultEditorElem3_5.$textElem.attr('contenteditable', false) - } - } - if (this.keyResultEditorElem3_7 === null) { - this.keyResultEditorElem3_7 = new E('#keyResultEditorElem3_7') - this.keyResultEditorElem3_7.customConfig.uploadImgServer = '/uploadPicture' - this.keyResultEditorElem3_7.customConfig.uploadFileName = 'file' - this.keyResultEditorElem3_7.customConfig.uploadImgParams = '' - this.keyResultEditorElem3_7.customConfig.debug = true - this.keyResultEditorElem3_7.create() - if (this.auth.keyResult37 < 2) { - this.keyResultEditorElem3_7.$textElem.attr('contenteditable', false) - } - } if (this.dataForm.id && this.dataForm.id > 0) { const data = await apiDetailInfo(this.dataForm.id) @@ -295,13 +265,6 @@ export default { this.keyResultEditorElem3_5.txt.html('

无

') } } - if (this.keyResultEditorElem3_7 !== null) { - if (this.dataForm.keyResult37 !== null) { - this.keyResultEditorElem3_7.txt.html(this.dataForm.keyResult37 || '') - } else { - this.keyResultEditorElem3_7.txt.html('

无

') - } - } } } }) @@ -338,18 +301,7 @@ export default { return } } - if (this.auth.keyResult35 === 2 && this.type === 1) { - if (this.stringIsNull(this.keyResultEditorElem3_5.txt.html())) { - this.alertInfo('3.5考核标准不能为空') - return - } - } - if (this.auth.keyResult37 === 2 && this.type === 1) { - if (this.stringIsNull(this.keyResultEditorElem3_7.txt.html())) { - this.alertInfo('3.7考核标准不能为空') - return - } - } + if (this.auth.checkWeight === 2) { if (this.stringIsNull(this.dataForm.checkWeight)) { this.alertInfo('权重不能为空') @@ -406,8 +358,6 @@ export default { 'type': this.type, 'target': this.dataForm.target, 'keyResult': Base64.encode(this.keyResultEditor.txt.html()), - 'keyResult35': Base64.encode(this.keyResultEditorElem3_5.txt.html()), - 'keyResult37': Base64.encode(this.keyResultEditorElem3_7.txt.html()), 'checkWeight': this.dataForm.checkWeight, 'checkResult': Base64.encode(this.checkResultEditor.txt.html()), 'superScore': superScore1, diff --git a/src/views/modules/result/record/recorddetail.vue b/src/views/modules/result/record/recorddetail.vue index 1e7a680..ac85072 100644 --- a/src/views/modules/result/record/recorddetail.vue +++ b/src/views/modules/result/record/recorddetail.vue @@ -81,7 +81,7 @@ - +