From e91ea94c5e06bd183c65999b49c7852205e1ac64 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 20 九月 2023 17:42:55 +0800
Subject: [PATCH] 1、工作日历管理页面增加表格单条数据删除功能 2、报警号管理页面与对比分析页面中的驱动类型数据不再使用数据字典，而采用调用接口获取数据方式 3、报警号管理页面的新增与编辑弹窗中的是否过滤选项切换器优化
---
src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue | 61 +++++++++++++++++++-----------
1 files changed, 39 insertions(+), 22 deletions(-)
diff --git a/src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue b/src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue
index 438c3e8..cc5e3b8 100644
--- a/src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue
+++ b/src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue
@@ -7,7 +7,7 @@
<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">
@@ -20,16 +20,22 @@
<!--<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"
- />
+ <!--<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'>-->
@@ -77,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,
@@ -103,24 +116,20 @@
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: !',
- // }],
- // },
+ driveType:{
+ rules: [{
+ required: true, message: '璇烽�夋嫨椹卞姩绫诲瀷!',
+ }],
+ },
alarmCode:{
rules: [{
required: true, message: '璇疯緭鍏ユ姤璀﹀彿!',
}],
},
- alarmDescription:{
+ alarmContent:{
rules: [{
required: true, message: '璇疯緭鍏ユ姤璀﹀唴瀹�!',
}],
@@ -152,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.visible = true
this.$nextTick(() => {
})
@@ -200,6 +210,13 @@
handleCancel() {
this.close()
},
+ /**
+ * 鏄惁杩囨护鍒囨崲鍣╟hange浜嬩欢
+ * @param checked 鍒囨崲鍚庣殑鐘舵��
+ */
+ isFilterChange(checked){
+ this.isFilterChecked=checked
+ }
}
}
</script>
--
Gitblit v1.9.3