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/Daily3MaintenanceOrderList.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/eam/Daily3MaintenanceOrderList.vue b/src/views/eam/Daily3MaintenanceOrderList.vue
index 58808ee..0ab4543 100644
--- a/src/views/eam/Daily3MaintenanceOrderList.vue
+++ b/src/views/eam/Daily3MaintenanceOrderList.vue
@@ -297,22 +297,22 @@
type="vertical"
/>
<a
- v-show="record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == true "
@click="handleStoveDetection(record)"
v-has="'daily3MaintenanceOrder:StoveCategory'"
>鐐夌被妫�娴�</a>
<!-- v-show="record.status === '5' && record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')" -->
<a-divider
- v-show=" record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
+ v-show=" record.status === '5' && record.isNotStoveCategoryFlag == true "
type="vertical"
/>
<a
- v-show=" record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
+ v-show=" record.status === '5' && record.isNotStoveCategoryFlag == true "
@click="handleStoveReport(record)"
v-has="'daily3MaintenanceOrder:StoveCategoryReport'"
>鐐夌被鎶ュ憡</a>
<a-divider
- v-show="record.status === '5'&& record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == true "
type="vertical"
/>
<a
@@ -577,9 +577,9 @@
// dataIndex: 'actualWorkingHourQuota',
// },
{
- title: '鎵ц浜�',
+ title: '鎶ュ伐浜�',
align: "center",
- dataIndex: 'maintenanceUserName'
+ dataIndex: 'maintenanceUserId'
},
{
title: '闂鍙婄浉搴斿鐞嗘帾鏂芥弿杩�',
--
Gitblit v1.9.3