From 87e6927c2db4c07eb27811196c8320fee51ef68c Mon Sep 17 00:00:00 2001 From: monkeyhouyi Date: Tue, 13 Aug 2024 16:56:47 +0800 Subject: [PATCH] 弹框样式 --- src/assets/style/common.scss | 9 ++++++++- src/components/InfoForm/index.vue | 6 ++++-- src/main.js | 9 +++++---- src/views/DisposalSuggestions/Form.vue | 2 +- src/views/baseCaseHandling/Form.vue | 20 ++++++++++---------- src/views/baseCaseHandling/index.vue | 5 +++-- src/views/baseComapnyInfo/Form.vue | 2 +- src/views/baseInspectionReport/Form.vue | 2 +- src/views/baseInspectionReport/FormPage.vue | 2 +- src/views/baseListHazardousSamples/Form.vue | 2 +- src/views/basePrincipalResponsibility/Form.vue | 2 +- src/views/baseSpecialAction/Form.vue | 2 +- src/views/baseSpecialAction/dynamicModel/list/Form.vue | 10 +++++----- src/views/baseSpecialAction/infoForm.vue | 2 +- src/views/baseSpecialhandle/index.vue | 10 ++++++---- src/views/baseSystemInfo/DetailForm.vue | 2 +- src/views/baseSystemInfo/HandleInspectForm.vue | 96 +++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------- src/views/baseSystemInfo/InspectForm.vue | 2 +- src/views/baseSystemInfo/index.vue | 2 +- src/views/overView/msgForm.vue | 12 +++++++----- 20 files changed, 108 insertions(+), 91 deletions(-) diff --git a/src/assets/style/common.scss b/src/assets/style/common.scss index 54977f8..99192bb 100644 --- a/src/assets/style/common.scss +++ b/src/assets/style/common.scss @@ -61,7 +61,6 @@ body, a { text-decoration: none - } .form-item { @@ -81,3 +80,11 @@ a { } } +.NCC-dialog.NCC-dialog_center { + .NCC-dialog-content { + padding: 20px 50px 0 !important; + margin: 0 !important; + width: 100%; + } +} + diff --git a/src/components/InfoForm/index.vue b/src/components/InfoForm/index.vue index 76a4118..1aa5ed3 100644 --- a/src/components/InfoForm/index.vue +++ b/src/components/InfoForm/index.vue @@ -15,7 +15,8 @@ class="NCC-dialog NCC-dialog_center dialog-box" destroy-on-close > - + - + + 取消 确认 diff --git a/src/main.js b/src/main.js index c4a880f..eccc595 100644 --- a/src/main.js +++ b/src/main.js @@ -4,13 +4,14 @@ import App from './App.vue' import router from './router' import 'normalize.css/normalize.css' import ElementUI from 'element-ui'; -import './styles/element-variables.scss' -import '@/assets/scss/common.scss' -import '@/assets/style/common.scss' import * as filters from './filters' // global filters - +import '@/styles/element-variables.scss' import '@/styles/index.scss' // global css + +import '@/assets/style/common.scss' +import '@/assets/scss/common.scss' import '@/assets/scss/theme.scss' // 主题 + import { message } from './utils/message'; import 'element-ui/lib/theme-chalk/index.css'; diff --git a/src/views/DisposalSuggestions/Form.vue b/src/views/DisposalSuggestions/Form.vue index f9ed044..6306a70 100644 --- a/src/views/DisposalSuggestions/Form.vue +++ b/src/views/DisposalSuggestions/Form.vue @@ -8,7 +8,7 @@ width="60%" v-loading="loading" > - + 巡查上报详情 diff --git a/src/views/baseCaseHandling/Form.vue b/src/views/baseCaseHandling/Form.vue index 9f35c38..1a61eaa 100644 --- a/src/views/baseCaseHandling/Form.vue +++ b/src/views/baseCaseHandling/Form.vue @@ -8,7 +8,7 @@ width="50%" v-loading="loading" > - + - - + + @@ -149,7 +149,7 @@ export default { punishmentDecision: undefined, closingReport: undefined, enforceType: undefined, - enforceContent: undefined, + enforcecontent: undefined, }, rules: { systemName: [ @@ -161,7 +161,7 @@ export default { enforceType: [ { required: true, message: "请选择执法方式", trigger: "change" } ], - enforceContent: [ + enforcecontent: [ { required: true, message: "请填写执法说明", trigger: "bulr" } ], }, @@ -242,7 +242,7 @@ export default { isReport: type, } this.$refs['elForm'].validate((valid) => { - if(!type || valid) { + if(valid) { !this.dataForm.id ? this.toRequest('/Extend/BaseCaseHandling', 'POST', obj) : this.toRequest(`/Extend/BaseCaseHandling/${this.dataForm.id}`, 'PUT', obj); } }) @@ -251,12 +251,12 @@ export default { handle() { this.$refs['elForm'].validate((valid) => { if(valid) { - return this.btnLoading = true; + let { enforceType, enforcecontent } = this.dataForm; request({ - url: `/Extend/basecasehandling/handling-case`, - method: "PUT", - data: this.dataForm, + url: `/Extend/basecasehandling/HandlingCase/${this.dataForm.id}`, + method: "POST", + data: { enforceType, enforcecontent }, }).then((res) => { this.$message({ type: "success", diff --git a/src/views/baseCaseHandling/index.vue b/src/views/baseCaseHandling/index.vue index a4db698..0c5c506 100644 --- a/src/views/baseCaseHandling/index.vue +++ b/src/views/baseCaseHandling/index.vue @@ -103,6 +103,7 @@