From fd019c06c025ff7871d77c679d2b61680daf0b4d Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 30 八月 2023 18:40:32 +0800
Subject: [PATCH] 保养修改
---
src/views/eam/DailyMaintenanceOrderList.vue | 38 ++++++++++++++++++
src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue | 17 +++++++-
src/views/eam/SpecialtyMaintenanceOrderList.vue | 38 ++++++++++++++++++
3 files changed, 88 insertions(+), 5 deletions(-)
diff --git a/src/views/eam/DailyMaintenanceOrderList.vue b/src/views/eam/DailyMaintenanceOrderList.vue
index 0c3b90a..91351b9 100644
--- a/src/views/eam/DailyMaintenanceOrderList.vue
+++ b/src/views/eam/DailyMaintenanceOrderList.vue
@@ -127,6 +127,7 @@
class="j-table-force-nowrap"
@change="handleTableChange"
:rowSelection="rowSelection"
+ :rowClassName="tableRowClass"
>
<!-- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" -->
<!-- <span
@@ -647,9 +648,44 @@
// //娓呯┖鍒楄〃閫変腑
// this.onClearSelected()
// },
+
+ //棰勮棰滆壊
+ tableRowClass(record, index) {
+ if ("1" == record.status || "2" == record.status) {
+ if (record.yellowWarningTime < record.currentDateTime && record.currentDateTime < record.redWarningTime) {
+ return 'yellow'
+ } else if (record.redWarningTime < record.currentDateTime && record.currentDateTime < record.planStartTime) {
+ return 'error'
+ } else if (record.planStartTime < record.currentDateTime) {
+ return 'frozenRowClass'
+ }
+ }
+ },
}
}
</script>
-<style scoped>
+<style >
@import '~@assets/less/common.less';
+.frozenRowClass {
+ color: #c9c9c9;
+ font-weight: bold;
+}
+.success {
+ color: green;
+}
+.error {
+ color: red;
+ font-weight: bold;
+}
+.yellow {
+ color: yellow;
+ font-weight: bold;
+}
+.fontweight {
+ font-weight: bold;
+}
+
+.ant-table-tbody .red {
+ background-color: red !important;
+}
</style>
\ No newline at end of file
diff --git a/src/views/eam/SpecialtyMaintenanceOrderList.vue b/src/views/eam/SpecialtyMaintenanceOrderList.vue
index cb286e9..d7e8d27 100644
--- a/src/views/eam/SpecialtyMaintenanceOrderList.vue
+++ b/src/views/eam/SpecialtyMaintenanceOrderList.vue
@@ -126,6 +126,7 @@
:loading="loading"
class="j-table-force-nowrap"
@change="handleTableChange"
+ :rowClassName="tableRowClass"
>
<!-- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" -->
<span
@@ -573,9 +574,44 @@
// //娓呯┖鍒楄〃閫変腑
// this.onClearSelected()
// },
+
+ //棰勮棰滆壊
+ tableRowClass(record, index) {
+ if ("1" == record.status || "2" == record.status) {
+ if (record.yellowWarningTime < record.currentDateTime && record.currentDateTime < record.redWarningTime) {
+ return 'yellow'
+ } else if (record.redWarningTime < record.currentDateTime && record.currentDateTime < record.planStartTime) {
+ return 'error'
+ } else if (record.planStartTime < record.currentDateTime) {
+ return 'frozenRowClass'
+ }
+ }
+ },
}
}
</script>
-<style scoped>
+<style >
@import '~@assets/less/common.less';
+.frozenRowClass {
+ color: #c9c9c9;
+ font-weight: bold;
+}
+.success {
+ color: green;
+}
+.error {
+ color: red;
+ font-weight: bold;
+}
+.yellow {
+ color: yellow;
+ font-weight: bold;
+}
+.fontweight {
+ font-weight: bold;
+}
+
+.ant-table-tbody .red {
+ background-color: red !important;
+}
</style>
\ No newline at end of file
diff --git a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
index 8f34416..e5a0ffc 100644
--- a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
+++ b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
@@ -152,11 +152,14 @@
<a-select
v-if="col.dataIndex == 'inspectionProjectResult' && record.testValueType == '2'"
:value="text"
- :options="record.inspectionCycles"
@change="(e) => handleChange(e, record.key, col, index)"
style="width: 100%"
:disabled="record.disabled"
- />
+ >
+ <!-- :options="record.inspectionCycles" -->
+ <a-select-option value="1">姝ｅ父</a-select-option>
+ <a-select-option value="2">寮傚父</a-select-option>
+ </a-select>
<a-input-number
:value="text"
v-if="col.dataIndex == 'inspectionProjectResult' && record.testValueType == '1'"
@@ -679,7 +682,15 @@
target['judgmentResult'] = "";
}
} else {
-
+ target[column.dataIndex] = value;
+ if (value == "1") {
+ target['judgmentResult'] = "pass";
+ } else {
+ target['judgmentResult'] = "fail";
+ }
+ if (value == null || value == "") {
+ target['judgmentResult'] = "";
+ }
}
}
if (column.dataIndex == 'abnormalDesc') {
--
Gitblit v1.9.3