From 4fba1be16ab3c6c005b499f3820a3aa2a1e7ec1e Mon Sep 17 00:00:00 2001 From: zhuzhuanzhuan Date: 星期五, 01 三月 2024 10:09:04 +0800 Subject: [PATCH] 1、车间看板页面缩放和拖拽时增加辅助线 2、驱动参数管理页面调整英文名称字段验证输入字数长度由2-18位调整为为仅验证非空 3、设备日志页面采样周期字段默认值由1000调整为100 4、设备日志页面设备日志列表中若时段状态为关机则不弹出工作曲线 5、设备综合效率分析页面增加表格数据加载动画 6、jQuery.table2excel组件导出表格数据功能增加日期格式的转换 7、设备日志页面工作曲线Y轴增加颜色区分,与对应数据颜色保持一致 8、设备管理页面表单填写界面设备功率增加计量单位kw --- src/views/eam/modules/daily3MaintenanceOrder/EquipmentTechnologyStatusModal.vue | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/views/eam/modules/daily3MaintenanceOrder/EquipmentTechnologyStatusModal.vue b/src/views/eam/modules/daily3MaintenanceOrder/EquipmentTechnologyStatusModal.vue index e862851..b0e4ef2 100644 --- a/src/views/eam/modules/daily3MaintenanceOrder/EquipmentTechnologyStatusModal.vue +++ b/src/views/eam/modules/daily3MaintenanceOrder/EquipmentTechnologyStatusModal.vue @@ -13,6 +13,23 @@ <a-spin :spinning="confirmLoading"> <a-form :form="form"> <a-row :gutter="24"> + <a-col + hidden + :span="24" + > + <a-form-item + label="淇濆吇宸ュ崟缂栧彿" + :labelCol="labelCol" + :wrapperCol="wrapperCol" + > + <a-input + allow-clear + :disabled="true" + :placeholder="disableSubmit?'':'璇疯緭鍏ヤ繚鍏诲伐鍗曠紪鍙�'" + v-decorator="['technologyStatusVerificationBill', validatorRules.technologyStatusVerificationBill ]" + /> + </a-form-item> + </a-col> <a-col :span="24"> <a-form-item label="缁熶竴缂栧彿" @@ -157,7 +174,7 @@ this.visible = true; this.disableSubmit = false; this.$nextTick(() => { - this.form.setFieldsValue(pick(this.model, 'equipmentNum', 'equipmentName', 'equipmentModel', 'specification', 'technologyStatus')) + this.form.setFieldsValue(pick(this.model, 'technologyStatusVerificationBill', 'equipmentNum', 'equipmentName', 'equipmentModel', 'specification', 'technologyStatus')) }); if (record.id) { this.codeDisable = true; @@ -182,7 +199,7 @@ if (!this.model.id) { obj = postAction(this.url.add, formData); } else { - obj = requestPut(this.url.edit, { id: this.model.equipmentId, technologyStatus: this.model.technologyStatus, maintenanceOrderId: this.model.id }); + obj = requestPut(this.url.edit, { id: this.model.equipmentId, technologyStatus: this.model.technologyStatus, maintenanceOrderId: this.model.id, technologyStatusVerificationBill: this.model.technologyStatusVerificationBill }); } obj.then((res) => { if (res.success) { -- Gitblit v1.9.3