From cf9211f711be85c8e0c1c739d01c8694d2cf5c51 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期一, 13 四月 2026 16:23:04 +0800
Subject: [PATCH] 屏蔽预调度任务
---
src/main/webapp/static/js/wrkAnalysis/wrkAnalysis.js | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/static/js/wrkAnalysis/wrkAnalysis.js b/src/main/webapp/static/js/wrkAnalysis/wrkAnalysis.js
index 4ea91bf..ee5fe57 100644
--- a/src/main/webapp/static/js/wrkAnalysis/wrkAnalysis.js
+++ b/src/main/webapp/static/js/wrkAnalysis/wrkAnalysis.js
@@ -35,6 +35,7 @@
taskEndTime$: "",
taskDurationMs: null,
avgTaskBeatDurationMs: null,
+ avgTaskPerHour: null,
avgTotalDurationMs: null,
avgStationDurationMs: null,
avgCraneDurationMs: null,
@@ -69,7 +70,7 @@
listLoading: false,
analyzeLoading: false,
exportingPdf: false,
- selectedWrkNoMap: {},
+ selectedLogIdMap: {},
analysis: createEmptyAnalysis(),
analysisReady: false,
charts: {
@@ -82,8 +83,8 @@
};
},
computed: {
- selectedWrkNos: function () {
- return Object.keys(this.selectedWrkNoMap).map(function (key) {
+ selectedLogIds: function () {
+ return Object.keys(this.selectedLogIdMap).map(function (key) {
return Number(key);
}).filter(function (value) {
return !!value;
@@ -180,7 +181,7 @@
this.filters = createDefaultFilters();
this.currentPage = 1;
this.pageSize = 20;
- this.selectedWrkNoMap = {};
+ this.selectedLogIdMap = {};
this.analysis = createEmptyAnalysis();
this.analysisReady = false;
this.disposeCharts();
@@ -203,24 +204,24 @@
}
table.clearSelection();
(this.tableData || []).forEach(function (row) {
- if (self.selectedWrkNoMap[row.wrkNo]) {
+ if (self.selectedLogIdMap[row.logId]) {
table.toggleRowSelection(row, true);
}
});
},
syncCurrentPageSelection: function (selection) {
- var nextMap = Object.assign({}, this.selectedWrkNoMap);
+ var nextMap = Object.assign({}, this.selectedLogIdMap);
var selectedMap = {};
(selection || []).forEach(function (row) {
- selectedMap[row.wrkNo] = true;
+ selectedMap[row.logId] = true;
});
(this.tableData || []).forEach(function (row) {
- delete nextMap[row.wrkNo];
+ delete nextMap[row.logId];
});
Object.keys(selectedMap).forEach(function (key) {
nextMap[key] = true;
});
- this.selectedWrkNoMap = nextMap;
+ this.selectedLogIdMap = nextMap;
},
runAnalysis: function () {
var self = this;
@@ -233,11 +234,11 @@
deviceType: this.filters.deviceType
};
if (this.filters.mode === "TASK") {
- if (!this.selectedWrkNos.length) {
+ if (!this.selectedLogIds.length) {
this.$message.warning("璇峰厛鍕鹃�夎鍒嗘瀽鐨勪换鍔�");
return;
}
- request.wrkNos = this.selectedWrkNos;
+ request.wrkLogIds = this.selectedLogIds;
request.timeField = this.filters.timeField;
} else {
if (!this.filters.timeRange || this.filters.timeRange.length !== 2) {
@@ -819,6 +820,16 @@
}
return this.formatDurationBySeconds(ms / 1000);
},
+ formatTaskPerHour: function (value) {
+ if (value === null || value === undefined || value === "") {
+ return "--";
+ }
+ var num = Number(value);
+ if (!isFinite(num)) {
+ return "--";
+ }
+ return this.trimTrailingZeros(num.toFixed(2)) + " 浠诲姟/灏忔椂";
+ },
formatDurationBySeconds: function (seconds) {
var totalSeconds = Number(seconds || 0);
if (!isFinite(totalSeconds)) {
--
Gitblit v1.9.1