From 57c109f4c962659e7a8f17ef4cd6b00a551e30ad Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 31 三月 2025 15:07:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lfdasrs-sxkVersion' into lfdasrs-sxkVersion
---
src/main/webapp/static/js/report/workOut.js | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/static/js/report/workOut.js b/src/main/webapp/static/js/report/workOut.js
index b4f4f32..bc8ecab 100644
--- a/src/main/webapp/static/js/report/workOut.js
+++ b/src/main/webapp/static/js/report/workOut.js
@@ -1,10 +1,11 @@
var pageCurr;
function getCol() {
var cols = [
- {field: 'io_time', align: 'center', title: '鍑哄簱鏃ユ湡', width: 200}
+ {field: 'ioTime$', align: 'center', title: '鍑哄簱鏃ユ湡', width: 200}
,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
,{field: 'crn_str_time', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
,{field: 'crn_end_time', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
+ ,{field: 'model', align: 'center',title: '鍥惧彿'}
];
cols.push.apply(cols, detlCols);
return cols;
--
Gitblit v1.9.1