|
|
@@ -90,11 +90,23 @@ $('#dataGrid').dataGrid({
|
|
|
{header:'${text("行程下限")}', name:'smin', index:'a.s_min', width:150, align:"center"},
|
|
|
{header:'${text("拉力上限")}', name:'fmax', index:'a.f_max', width:150, align:"center"},
|
|
|
{header:'${text("行程上限")}', name:'smax', index:'a.s_max', width:150, align:"center"},
|
|
|
- {header:'${text("结果")}', name:'qty', index:'a.qty', width:150, align:"center", formatter: function(val, obj, row, act){
|
|
|
- if(row.qty == "1"){
|
|
|
- return "OK";
|
|
|
+ {header:'${text("结果")}', name:'qty', index:'a.qty', width:200, align:"center", formatter: function(val, obj, row, act){
|
|
|
+ if(row.qty == "0"){
|
|
|
+ return "设备拉铆中/未拉铆";
|
|
|
+ }else if(row.qty == "1"){
|
|
|
+ return "NG-拉力未达到";
|
|
|
+ }else if(row.qty == "2"){
|
|
|
+ return "NG-拉力达到，行程偏小";
|
|
|
+ }else if(row.qty == "3"){
|
|
|
+ return "拉铆OK";
|
|
|
+ }else if(row.qty == "4"){
|
|
|
+ return "拉力超限";
|
|
|
+ }else if(row.qty == "5"){
|
|
|
+ return "NG-拉力达到，行程偏大";
|
|
|
+ }else if(row.qty == "6"){
|
|
|
+ return "NG-空拉";
|
|
|
}else{
|
|
|
- return "NG";
|
|
|
+ return row.qty;
|
|
|
}
|
|
|
}},
|
|
|
{header:'${text("拉铆时间")}', name:'dateTime', index:'a.date_time', width:150, align:"center"},
|
