From 120cf05bfd146a9bd1c011c9dd0244a57d0dea64 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 12 一月 2024 17:35:43 +0800
Subject: [PATCH] 1、优化代码：mdc全局页面表格区域内容若需滚动无需翻至最底部且部分页面竖向滚动会滚动整个页面调整为仅滚动表格区域，表格操作列右固定以满足不同分辨率下操作列始终显示不被遮挡 2、优化代码：mdc全局左侧树组件所在区域的滚动条将不再进行全部内容滚动，调整为仅只有树组件内容滚动 3、优化代码：报警分析、利用率走势分析以及利用率分段分析页面在浏览器窗口尺寸变化后重绘图表以适应页面新尺寸 4、设备综合效率分析页面取消分页器以便能一次性导出所有表格数据 5、mdc全局左侧树区域宽度增大，右侧数据展示区域宽度减小
---
src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue | 47 +++++++++++++++++++++++++++++++++--------------
1 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue b/src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue
index 4186f79..54261aa 100644
--- a/src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue
+++ b/src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue
@@ -5,20 +5,20 @@
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-row :gutter="24">
- <a-col :span="24">
- <a-form-item label="璁惧缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <!--<a-input v-decorator="['equipmentId', validatorRules.equipmentId]">-->
- <a-input :disabled='disabled' placeholder="璇疯緭鍏ヨ澶囩紪鍙�" v-decorator="['equipmentId', validatorRules.equipmentId]"></a-input>
- </a-form-item>
- </a-col>
+ <!--<a-col :span="24">-->
+ <!--<a-form-item label="璁惧缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+ <!--<!–<a-input v-decorator="['equipmentId', validatorRules.equipmentId]">–>-->
+ <!--<a-input :disabled='disabled' placeholder="璇疯緭鍏ヨ澶囩紪鍙�" v-decorator="['equipmentId', validatorRules.equipmentId]"></a-input>-->
+ <!--</a-form-item>-->
+ <!--</a-col>-->
<a-col :span="24">
<a-form-item label="鎶ヨ鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol">
<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'>
@@ -31,7 +31,7 @@
<a-col :span="24">
<a-form-item label="鏄惁杩囨护" :labelCol="labelCol" :wrapperCol="wrapperCol">
<!--<j-switch v-model="model.isUse"></j-switch>-->
- <a-switch v-model="isUse"/>
+ <a-switch v-model="isUse"/>
<!--<a-radio-group v-model="model.isUse">-->
<!--<a-radio :value="1">-->
<!--鏄�-->
@@ -103,10 +103,20 @@
// required: true, message: '璇烽�夋嫨鐝埗!',
// }],
// },
+ alarmCode:{
+ rules: [{
+ required: true, message: '璇疯緭鍏ユ姤璀﹀彿!',
+ }],
+ },
+ alarmContent:{
+ rules: [{
+ required: true, message: '璇疯緭鍏ユ姤璀﹀唴瀹�!',
+ }],
+ },
},
url: {
// add: '/mdc/alarmInfo/add',
- edit: '/mdc/alarmInfo/edit',
+ edit: '/mdc/mdcAlarmInfo/edit',
//椹卞姩绫诲瀷
initShiftList: '/mdc/mdcequipment/driveTypeSelected',
},
@@ -124,7 +134,8 @@
this.model = Object.assign({}, record)
this.visible = true
this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model,'equipmentId', 'alarmCode', 'alarmDescription','driveType'))
+ this.isUse=record.isUse===0?true:false
+ this.form.setFieldsValue(pick(this.model, 'alarmCode', 'alarmContent','driveType'))
})
},
initShiftList() {
@@ -146,7 +157,7 @@
if (!err) {
that.confirmLoading = true
let formData = Object.assign(this.model, values)
- formData.isUse = this.isUse ? "1" : "2"
+ formData.isUse = this.isUse ? "0" : "-1"
let obj
if (!this.model.id) {
// obj = postAction(this.url.add, formData)
@@ -157,11 +168,19 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("娣诲姞鎴愬姛")
+ // that.$message.success("娣诲姞鎴愬姛")
+ that.$notification.success({
+ message:'娑堟伅',
+ description:"淇敼鎴愬姛"
+ });
// that.$message.success(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