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/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue | 56 ++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 46 insertions(+), 10 deletions(-) diff --git a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue index b524ed4..538504e 100644 --- a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue +++ b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue @@ -36,15 +36,15 @@ <a-row :gutter="24"> <a-col :span="24"> <a-form-item label="绫诲瀷" :labelCol="labelColLong" :wrapperCol="wrapperColLong"> - <a-input :disabled="disableSubmit" placeholder="璇疯緭鍏ョ被鍨�" - :triggerChange="true" - v-decorator="['noplanType', validatorRules.noplanType]"/> + <j-dict-select-tag :readOnly="disableSubmit" placeholder="璇烽�夋嫨绫诲瀷" + :triggerChange="true" dictCode="mdc_noplan_type" + v-decorator="['noplanType', validatorRules.noplanType]" allow-clear/> </a-form-item> </a-col> </a-row> <a-row :gutter="24"> <a-form-item label="澶囨敞" :labelCol="labelColLong" :wrapperCol="wrapperColLong"> - <a-textarea :disabled="disableSubmit" v-decorator="['remark', validatorRules.remark]" placeholder="璇疯緭鍏ュ娉�" ></a-textarea> + <a-textarea :maxLength="20" :disabled="disableSubmit" v-decorator="['remark', validatorRules.remark]" placeholder="璇疯緭鍏ュ娉�" ></a-textarea> </a-form-item> </a-row> </a-form> @@ -60,7 +60,6 @@ import pick from 'lodash.pick' // import DeviceRepairListModel from './DeviceRepairListModel' // import DeviceRepairEditListModel from './DeviceRepairEditListModel' - // import JDate from './JDate' import { getAction, postAction, @@ -70,10 +69,10 @@ duplicateCheck } from '@/api/api' import AFormItem from 'ant-design-vue/es/form/FormItem' - + import JDate from '../deviceRepair/JDate' export default { name: 'UnplannedDowntimemManagerModalEdit', - components: { AFormItem }, + components: { AFormItem,JDate }, // components: {DeviceRepairListModel,JDate,DeviceRepairEditListModel}, props: {}, data() { @@ -134,6 +133,30 @@ { required:true, message: "" + }, + ], + }, + noplanType:{ + rules:[ + { + required:true, + message: "璇烽�夋嫨绫诲瀷" + }, + ], + }, + startTime:{ + rules:[ + { + required:true, + message: "璇烽�夋嫨寮�濮嬫椂闂�" + }, + ], + }, + endTime:{ + rules:[ + { + required:true, + message: "璇烽�夋嫨缁撴潫鏃堕棿" }, ], }, @@ -261,7 +284,12 @@ let startOne = start.replace(/:/g,''); let endOne = end.replace(/:/g,''); if(startOne>=endOne){ - that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�"); + // that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�"); + that.$notification.warning({ + message:'娑堟伅', + description:"缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�" + }); + // console.log(this.model) // this.endTime = '' that.confirmLoading = false @@ -276,11 +304,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