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/predictiveWorkPlan/PredictiveWorkPlanModal.vue | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/src/views/eam/modules/predictiveWorkPlan/PredictiveWorkPlanModal.vue b/src/views/eam/modules/predictiveWorkPlan/PredictiveWorkPlanModal.vue
index 8d605b5..92635d6 100644
--- a/src/views/eam/modules/predictiveWorkPlan/PredictiveWorkPlanModal.vue
+++ b/src/views/eam/modules/predictiveWorkPlan/PredictiveWorkPlanModal.vue
@@ -21,8 +21,8 @@
>
<a-input
allowClear
- :disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇疯緭鍏ユ柟妗堢紪鐮�'"
+ :placeholder="鑷姩鐢熸垚"
+ :disabled="true"
v-decorator="[ 'num', validatorRules.num]"
/>
</a-form-item>
@@ -194,6 +194,7 @@
import { preview } from 'vue-photo-preview'
import PdfView from '@views/common/PdfView'
import EquipmentList from '@/views/eam/common/EquipmentList'
+import { getAction } from '../../../../api/manage'
export default {
name: 'MaintenanceStandardModal',
@@ -238,7 +239,7 @@
},
useDepartName: {
rules: [
- { required: true, message: '璇烽�夋嫨瀵硅薄閮ㄩ棬!' }
+ { required: true, message: '璇烽�夋嫨浣跨敤閮ㄩ棬!' }
]
},
equipmentName: {
@@ -266,7 +267,8 @@
add: '/eam/predictiveworkplan/add',
edit: '/eam/predictiveworkplan/edit',
revise: '/eam/predictiveworkplan/revise',
- getReviseVersion: '/eam/predictiveworkplan/getReviseVersion'
+ getReviseVersion: '/eam/predictiveworkplan/getReviseVersion',
+ getNum:'/eam/sysIdentity/getNumNew'
},
dataSource: [],
@@ -284,9 +286,19 @@
methods: {
add() {
- this.edit()
+ this.model={};
+ let that = this;
+ let param = {
+ type: 'PredictiveWorkPlan',
+ length: 4
+ };
+ getAction(this.url.getNum,param).then(res=>{
+ if(res.success){
+ that.model.num = res.result;
+ that.edit(that.model);
+ }
+ })
},
-
edit(record) {
let that = this
this.dataSource = []
@@ -297,10 +309,12 @@
that.model.equipmentId = record.equipmentId
that.model.teamId = record.teamId
that.form.setFieldsValue(pick(that.model, 'num', 'name', 'monitorType', 'maintenanceMethod', 'assignMode', 'teamName', 'planVersion'))
- that.form.setFieldsValue({
- equipmentName: record.deviceNum + '/' + record.deviceName + '/' + record.deviceModel,
- historyVersion: record.planVersion
- })
+ if(that.model.id){
+ that.form.setFieldsValue({
+ equipmentName: record.deviceNum + '/' + record.deviceName + '/' + record.deviceModel,
+ historyVersion: record.planVersion
+ })
+ }
})
if (record.id) {
this.codeDisable = true
--
Gitblit v1.9.3