From 8e75a78f55d60565eb48b25eafd4eb07939ce2cc Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:09:05 +0800
Subject: [PATCH] Merge branch 'master' into develop
---
src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue | 91 ++++++++++++++++++++++++++-------------------
1 files changed, 52 insertions(+), 39 deletions(-)
diff --git a/src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue b/src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue
index 619644b..438c3e8 100644
--- a/src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue
+++ b/src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue
@@ -11,15 +11,20 @@
</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-form-item>
</a-col>
<a-col :span="24">
@@ -27,28 +32,28 @@
<a-switch :default-checked = 'showM' v-decorator="['isUse', validatorRules.isUse]"></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>
@@ -100,11 +105,11 @@
},
confirmLoading: false, form: this.$form.createForm(this),
validatorRules: {
- driveType:{
- rules: [{
- required: true, message: '璇烽�夋嫨椹卞姩绫诲瀷!',
- }],
- },
+ // driveType:{
+ // rules: [{
+ // required: true, message: '璇烽�夋嫨椹卞姩绫诲瀷!',
+ // }],
+ // },
// isUse:{
// rules: [{
// required: true, message: !',
@@ -117,12 +122,12 @@
},
alarmDescription:{
rules: [{
- required: true, message: '璇疯緭鍏ユ姤璀︽弿杩�!',
+ required: true, message: '璇疯緭鍏ユ姤璀﹀唴瀹�!',
}],
},
},
url: {
- add: '/mdc/alarmInfo/add',
+ add: '/mdc/mdcAlarmInfo/add',
// edit:'/mdc/alarmInfo/edit',
//椹卞姩绫诲瀷
initShiftList: '/mdc/mdcequipment/driveTypeSelected',
@@ -150,7 +155,7 @@
this.visible = true
this.form.resetFields()
this.model = Object.assign({}, record)
- this.initShiftList()
+ // this.initShiftList()
this.$nextTick(() => {
})
@@ -169,13 +174,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
--
Gitblit v1.9.3