diff --git a/src/views/baseDeviceParamVal/val/index.vue b/src/views/baseDeviceParamVal/val/index.vue new file mode 100644 index 0000000..509d1fa --- /dev/null +++ b/src/views/baseDeviceParamVal/val/index.vue @@ -0,0 +1,552 @@ + + + + + 生产控制看板 + + {{ nowTimeStr }} + + 刷新 + {{ dashboardMode ? '切换列表' : '切换看板' }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + 新增 + + + 修改 + + + 删除 + + + 导出 + + + + + + + + + + + {{ dev.deviceCode || '未知设备' }} + 最近记录:{{ parseTime(dev.latestRecordTime, '{y}-{m}-{d} {h}:{i}:{s}') }} + + + + + {{ p.paramName || p.paramCode }} + {{ p.paramValue }} + + + + + {{ p.paramName || p.paramCode }} + {{ p.paramValue }} + + + + + + + + + 最近采集记录 + + + + + + + {{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }} + + + + + {{ parseTime(scope.row.recordTime, '{y}-{m}-{d} {h}:{i}:{s}') }} + + + + + + + + + + + + + + + + + + {{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }} + + + + + {{ parseTime(scope.row.recordTime, '{y}-{m}-{d} {h}:{i}:{s}') }} + + + + + 修改 + 删除 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/dms/dmsRepair/index.vue b/src/views/dms/dmsRepair/index.vue index 257db6d..80e88f3 100644 --- a/src/views/dms/dmsRepair/index.vue +++ b/src/views/dms/dmsRepair/index.vue @@ -128,13 +128,13 @@ - + diff --git a/src/views/dms/lube/index.vue b/src/views/dms/lube/index.vue index 574d633..8669240 100644 --- a/src/views/dms/lube/index.vue +++ b/src/views/dms/lube/index.vue @@ -322,9 +322,6 @@ export default { form: {}, // 表单校验 rules: { - deviceId: [ - { required: true, message: "润滑设备ID不能为空", trigger: "blur" } - ], cronExpression: [ { required: true, message: "定时计划不能为空", trigger: "blur" } ], diff --git a/src/views/dms/shutDown/index.vue b/src/views/dms/shutDown/index.vue index d740f5c..eaed349 100644 --- a/src/views/dms/shutDown/index.vue +++ b/src/views/dms/shutDown/index.vue @@ -292,9 +292,7 @@ export default { form: {}, // 表单校验 rules: { - deviceId: [ - { required: true, message: "设备ID不能为空", trigger: "blur" } - ], + isFlag: [ { required: true, message: "是否标识:1-是;2-否不能为空", trigger: "blur" } ], diff --git a/src/views/dms/shutDownRecord/index.vue b/src/views/dms/shutDownRecord/index.vue index 03279d8..9fd79f8 100644 --- a/src/views/dms/shutDownRecord/index.vue +++ b/src/views/dms/shutDownRecord/index.vue @@ -292,9 +292,7 @@ export default { form: {}, // 表单校验 rules: { - deviceId: [ - { required: true, message: "设备ID不能为空", trigger: "blur" } - ], + isFlag: [ { required: true, message: "是否标识:1-是;2-否不能为空", trigger: "blur" } ], diff --git a/src/views/dms/shutReason/index.vue b/src/views/dms/shutReason/index.vue index 74e9914..e9bfcfa 100644 --- a/src/views/dms/shutReason/index.vue +++ b/src/views/dms/shutReason/index.vue @@ -270,9 +270,9 @@ export default { isFlag: [ { required: true, message: "是否标识:1-是;0-否不能为空", trigger: "blur" } ], - deviceId: [ - { required: true, message: "设备类型ID不能为空", trigger: "blur" } - ], + // deviceId: [ + // { required: true, message: "设备类型ID不能为空", trigger: "blur" } + // ], reasonCode: [ { required: true, message: "部位名称不能为空", trigger: "blur" } ], diff --git a/src/views/dms/shutType/index.vue b/src/views/dms/shutType/index.vue index eeb5b70..07c5e5c 100644 --- a/src/views/dms/shutType/index.vue +++ b/src/views/dms/shutType/index.vue @@ -33,38 +33,38 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 新增 + + + 修改 + + + 删除 + diff --git a/src/views/report/repairMeasures/index.vue b/src/views/report/repairMeasures/index.vue index 232fa74..136e1b8 100644 --- a/src/views/report/repairMeasures/index.vue +++ b/src/views/report/repairMeasures/index.vue @@ -144,7 +144,8 @@