From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/webapp/static/js/basShuttleErrLog/basShuttleErrLog.js | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/static/js/basShuttleErrLog/basShuttleErrLog.js b/src/main/webapp/static/js/basShuttleErrLog/basShuttleErrLog.js
index 368ae75..241c6bb 100644
--- a/src/main/webapp/static/js/basShuttleErrLog/basShuttleErrLog.js
+++ b/src/main/webapp/static/js/basShuttleErrLog/basShuttleErrLog.js
@@ -22,8 +22,8 @@
height: 'full-120',
cols: [[
// {type: 'checkbox'}
- // ,{field: 'id', align: 'center',title: ''}
- ,{field: 'uuid', align: 'center',title: '缂栧彿'}
+ {field: 'id', align: 'center',title: '缂栧彿'}
+ // ,{field: 'uuid', align: 'center',title: '缂栧彿'}
,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'startTime$', align: 'center',title: '鍙戠敓鏃堕棿'}
,{field: 'endTime$', align: 'center',title: '缁撴潫鏃堕棿'}
@@ -39,13 +39,14 @@
,{field: 'errCode', align: 'center',title: '寮傚父鐮�'}
,{field: 'error', align: 'center',title: '寮傚父'}
,{field: 'status$', align: 'center',title: '寮傚父鎯呭喌'}
+ ,{field: 'systemStatus', align: 'center',title: '绯荤粺鐘舵��'}
,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
request: {
pageName: 'curr',
--
Gitblit v1.9.1