From 5cbba170e270e6f1c99a91e27dbb7951a27d596a Mon Sep 17 00:00:00 2001 From: “linengliang” <vanSuperEnergy@163.com> Date: 星期五, 24 十一月 2023 16:41:32 +0800 Subject: [PATCH] 故障报修验收 --- src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue | 122 +++++++++++++++++++++++++--------------- 1 files changed, 76 insertions(+), 46 deletions(-) diff --git a/src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue b/src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue index 619644b..cc5e3b8 100644 --- a/src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue +++ b/src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue @@ -7,48 +7,59 @@ <a-row :gutter="24"> <a-col :span="24"> <a-form-item label="鎶ヨ鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol"> - <a-input placeholder="璇疯緭鍏ユ姤璀﹀彿" v-decorator="['alarmCode', validatorRules.alarmCode]"></a-input> + <a-input placeholder="璇疯緭鍏ユ姤璀﹀彿" v-decorator="['alarmCode', validatorRules.alarmCode]" ></a-input> </a-form-item> </a-col> <a-col :span="24"> - <a-form-item label="鎶ヨ鎻忚堪" :labelCol="labelCol" :wrapperCol="wrapperCol"> - <a-input placeholder="璇疯緭鍏ユ姤璀︽弿杩�" v-decorator="['alarmDescription', validatorRules.alarmDescription]"></a-input> + <a-form-item label="鎶ヨ鍐呭" :labelCol="labelCol" :wrapperCol="wrapperCol"> + <a-input placeholder="璇疯緭鍏ユ姤璀﹀唴瀹�" v-decorator="['alarmContent', validatorRules.alarmContent]"></a-input> </a-form-item> </a-col> <a-col :span='24'> <a-form-item label="椹卞姩绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol"> - <a-select v-decorator="['driveType', validatorRules. driveType]" placeholder="璇烽�夋嫨椹卞姩绫诲瀷" - :options="shiftList"> - </a-select> + <!--<a-select v-decorator="['driveType', validatorRules. driveType]" placeholder="璇烽�夋嫨椹卞姩绫诲瀷"--> + <!--:options="shiftList">--> + <!--</a-select>--> + <!--<j-dict-select-tag--> + <!--placeholder="璇烽�夋嫨椹卞姩绫诲瀷"--> + <!--v-decorator="['driveType', validatorRules.driveType]"--> + <!--dictCode="mdc_driveType"--> + <!--/>--> + <a-auto-complete + v-decorator="['driveType', validatorRules.driveType]" + :data-source="driveTypeList" + placeholder="璇烽�夋嫨椹卞姩绫诲瀷" + :filter-option="filterOption" + /> </a-form-item> </a-col> <a-col :span="24"> <a-form-item label="鏄惁杩囨护" :labelCol="labelCol" :wrapperCol="wrapperCol"> - <a-switch :default-checked = 'showM' v-decorator="['isUse', validatorRules.isUse]"></a-switch> + <a-switch :checked="isFilterChecked" v-decorator="['isUse', validatorRules.isUse]" @change="isFilterChange"></a-switch> </a-form-item> </a-col> - <a-col :span='24'> - <a-form-item - :labelCol="labelCol" - :wrapperCol="wrapperCol" - label="鏂板鏂瑰紡" - hidden> - <a-input - v-decorator="[ - 'addWay', - { rules: - [ - { required: true, message: '' } - ], - initialValue: '2' - } - ]" - placeholder="璇疯緭鍏ユ柊澧炴柟寮�" - allowClear - > - </a-input> - </a-form-item> - </a-col> + <!--<a-col :span='24'>--> + <!--<a-form-item--> + <!--:labelCol="labelCol"--> + <!--:wrapperCol="wrapperCol"--> + <!--label="鏂板鏂瑰紡"--> + <!--hidden>--> + <!--<a-input--> + <!--v-decorator="[--> + <!--'addWay',--> + <!--{ rules:--> + <!--[--> + <!--{ required: true, message: '' }--> + <!--],--> + <!--initialValue: '2'--> + <!--}--> + <!--]"--> + <!--placeholder="璇疯緭鍏ユ柊澧炴柟寮�"--> + <!--allowClear--> + <!-->--> + <!--</a-input>--> + <!--</a-form-item>--> + <!--</a-col>--> </a-row> </a-form> </a-spin> @@ -72,10 +83,17 @@ export default { name: 'alarmManagerForm', // components: {AlarmManagerEqupment}, - props: {}, + props: { + driveTypeList:{ + type:Array + }, + filterOption:{ + type:Function + } + }, data() { return { - showM:true, + isFilterChecked:true, isUse:true, title: '', visible: false, @@ -98,31 +116,27 @@ span: 18 } }, - confirmLoading: false, form: this.$form.createForm(this), + confirmLoading: false, + form: this.$form.createForm(this), validatorRules: { driveType:{ rules: [{ required: true, message: '璇烽�夋嫨椹卞姩绫诲瀷!', }], }, - // isUse:{ - // rules: [{ - // required: true, message: !', - // }], - // }, alarmCode:{ rules: [{ required: true, message: '璇疯緭鍏ユ姤璀﹀彿!', }], }, - alarmDescription:{ + alarmContent:{ rules: [{ - required: true, message: '璇疯緭鍏ユ姤璀︽弿杩�!', + required: true, message: '璇疯緭鍏ユ姤璀﹀唴瀹�!', }], }, }, url: { - add: '/mdc/alarmInfo/add', + add: '/mdc/mdcAlarmInfo/add', // edit:'/mdc/alarmInfo/edit', //椹卞姩绫诲瀷 initShiftList: '/mdc/mdcequipment/driveTypeSelected', @@ -147,10 +161,11 @@ }, add(record) { let _this = this - this.visible = true + this.isFilterChecked=true this.form.resetFields() this.model = Object.assign({}, record) - this.initShiftList() + // this.initShiftList() + this.visible = true this.$nextTick(() => { }) @@ -169,13 +184,21 @@ let formData = Object.assign(this.model, values) // console.log(formData) // formData.isUse = formData.isUse ? "1" : "2" - formData.isUse = formData.isUse == true || formData.isUse == undefined ? "1" : "2" - putAction(this.url.add, formData).then((res) => { + formData.isUse = formData.isUse == true || formData.isUse == undefined ? "0" : "-1" + postAction(this.url.add, formData).then((res) => { if (res.success) { - that.$message.success(res.message) + // that.$message.success(res.message) + that.$notification.success({ + message:'娑堟伅', + description:res.message + }); that.$emit('ok', res.result) } else { - that.$message.warning(res.message) + // that.$message.warning(res.message) + that.$notification.warning({ + message:'娑堟伅', + description:res.message + }); } }).finally(() => { that.confirmLoading = false @@ -187,6 +210,13 @@ handleCancel() { this.close() }, + /** + * 鏄惁杩囨护鍒囨崲鍣╟hange浜嬩欢 + * @param checked 鍒囨崲鍚庣殑鐘舵�� + */ + isFilterChange(checked){ + this.isFilterChecked=checked + } } } </script> -- Gitblit v1.9.3