From 4ca33e9ede11f4896e448546e4523b1f60f89753 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com> Date: Wed, 15 Nov 2023 14:47:51 +0800 Subject: [PATCH] =?UTF-8?q?CN-1407=20fix:=20Detections-Policies-Create=20E?= =?UTF-8?q?vent=20Policy=E6=A8=A1=E5=9D=97=E4=B8=8B=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=8F=96=E6=B6=88=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detection-form-setting.scss | 12 +- .../detection-create/detection-form.scss | 19 +- .../detectionPolicies/PolicyForm.vue | 166 ++++++++++++++++-- 3 files changed, 176 insertions(+), 21 deletions(-) diff --git a/src/assets/css/components/views/detections/detection-create/detection-form-setting.scss b/src/assets/css/components/views/detections/detection-create/detection-form-setting.scss index a637e976..7b9ceef3 100644 --- a/src/assets/css/components/views/detections/detection-create/detection-form-setting.scss +++ b/src/assets/css/components/views/detections/detection-create/detection-form-setting.scss @@ -194,12 +194,13 @@ } } -.form-setting__btn, .form-setting__btn1 { +.form-setting__btn, .form-setting__btn1, .policy-form__footer__btn { width: 100%; display: flex; justify-content: flex-end; .el-button { + width: 80px !important; height: 30px !important; min-height: 30px !important; line-height: 30px !important; @@ -222,8 +223,15 @@ } } } +.policy-form__footer__btn { + justify-content: center; + margin-top: 8px; -.form-setting__btn1 { + .btn1 { + margin-right: 16px; + } +} +.form-setting__btn1, .policy-form__footer__btn { .el-button { padding: 0 11px !important; } diff --git a/src/assets/css/components/views/detections/detection-create/detection-form.scss b/src/assets/css/components/views/detections/detection-create/detection-form.scss index ebef8d00..f82c0da9 100644 --- a/src/assets/css/components/views/detections/detection-create/detection-form.scss +++ b/src/assets/css/components/views/detections/detection-create/detection-form.scss @@ -10,9 +10,9 @@ } .detection-form-content { - height: 100%; + height: calc(100% - 92px); overflow: scroll; - padding-bottom: 40px; + padding-bottom: 20px; .detection-form-collapse { margin-top: 20px; @@ -130,6 +130,12 @@ } } } + + .policy-form-trigger { + .el-collapse-item__content { + padding-bottom: 0 !important; + } + } } .el-input--mini, .el-input--mini .el-input__inner { @@ -143,4 +149,13 @@ padding-bottom: 20px; } + .policy-form__footer { + width: calc(100% + 40px); + height: 60px; + margin-left: -20px; + box-shadow: 0 -1px 4px 0 rgba(0,0,0,0.10); + display: flex; + align-items: center; + justify-content: center; + } } diff --git a/src/views/detections/detectionPolicies/PolicyForm.vue b/src/views/detections/detectionPolicies/PolicyForm.vue index d23212cd..d41c9007 100644 --- a/src/views/detections/detectionPolicies/PolicyForm.vue +++ b/src/views/detections/detectionPolicies/PolicyForm.vue @@ -6,8 +6,8 @@ {{ ruleId ? $t('detection.editEventPolicies') : $t('detection.createEventPolicies') }} -
+
@@ -43,7 +43,7 @@
- + @@ -369,7 +371,7 @@ export default { } }, /** 创建policy */ - createPolicy (flag) { + createPolicy () { const settingLen = Object.keys(this.settingObj).length const ruleLen = Object.keys(this.ruleObj).length @@ -378,9 +380,6 @@ export default { if (valid) { // 最终提交form const formObj = this.$_.cloneDeep({ ...this.settingObj, ruleConfig: JSON.stringify(this.ruleObj), ruleTrigger: this.triggerObj }) - if (flag) { - formObj.status = 1 - } // 将时间转为参数所需，如5分钟转为PT5M formObj.ruleTrigger.resetInterval = getDurationsTimeByType(formObj.ruleTrigger.resetInterval, formObj.ruleTrigger.resetIntervalVal) formObj.ruleTrigger.interval = getDurationsTimeByType(formObj.ruleTrigger.interval, formObj.ruleTrigger.intervalVal) @@ -429,12 +428,18 @@ export default { message: this.$t('tip.saveSuccess') }) + const { query } = this.$route + const queryInfo = { + pageNo: self.pageNoForTable ? Number(self.pageNoForTable) : 1, + t: +new Date() + } + if (query.name && query.id) { + queryInfo.ruleId = query.id + queryInfo.name = this.settingObj.name + } this.$router.push({ path: '/detection/policy', - query: { - pageNo: self.pageNoForTable ? Number(self.pageNoForTable) : 1, - t: +new Date() - } + query: queryInfo }) } else { console.error(response.data.message) @@ -492,7 +497,134 @@ export default { return { flag: false, msg: this.$t('policy.dateTimeRangeSeconds') } } } + }, + cancel () { + const { query } = this.$route + const queryInfo = { + pageNo: this.pageNoForTable ? Number(this.pageNoForTable) : 1, + t: +new Date() + } + if (query.name && query.id) { + queryInfo.ruleId = query.id + queryInfo.name = this.settingObj.name + } + this.$refs.form3.validate(valid => { + if (this.settingObj.settingNoContinue || this.ruleObj.settingNoContinue || !valid) { + this.$confirm(this.$t('tip.leavePage'), { + confirmButtonText: this.$t('tip.confirm'), + cancelButtonText: this.$t('overall.cancel'), + message: this.$t('tip.leavePageTips'), + title: this.$t('tip.leavePage'), + type: 'warning', + iconClass: 'width:0px;height:0px;', + customClass: 'del-model' + }).then(() => { + this.$router.push({ + path: '/detection/policy', + query: queryInfo + }) + }).catch(() => {}) + } else { + this.$router.push({ + path: '/detection/policy', + query: queryInfo + }) + } + }) } } } + +