From 8029241ade625cee6ec30d1f8ca0234faa86e2af Mon Sep 17 00:00:00 2001
From: whyczh <hzjl@qq.com>
Date: 星期一, 21 三月 2022 15:40:46 +0800
Subject: [PATCH] 更新
---
src/main/java/testElectronJ/TestController.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/main/java/testElectronJ/TestController.java b/src/main/java/testElectronJ/TestController.java
index 3f780ab..46b95df 100644
--- a/src/main/java/testElectronJ/TestController.java
+++ b/src/main/java/testElectronJ/TestController.java
@@ -132,10 +132,10 @@
sheet.getRow(rowNumSheet).createCell(1).setCellValue("娴嬭瘯鏃堕暱锛�"+stop.TestTimeLong.hms());
rowNumSheet++;
sheet.createRow(rowNumSheet);
- sheet.getRow(rowNumSheet).createCell(0).setCellValue("姝ｆ瀬缁濈紭鐢甸樆锛�"+list.get(list.size()-1).PosInsRes);
- sheet.getRow(rowNumSheet).createCell(1).setCellValue("璐熸瀬缁濈紭鐢甸樆锛�"+list.get(list.size()-1).NegInsRes);
+ sheet.getRow(rowNumSheet).createCell(0).setCellValue("姝ｆ瀬缁濈紭鐢甸樆锛�"+list.get(list.size()-1).PosInsRes+"k惟");
+ sheet.getRow(rowNumSheet).createCell(1).setCellValue("璐熸瀬缁濈紭鐢甸樆锛�"+list.get(list.size()-1).NegInsRes+"k惟");
if(start.DataType==0xFD){
- sheet.getRow(rowNumSheet).createCell(2).setCellValue("棰勪及瀹為檯瀹归噺锛�"+list.get(list.size()-1).actualCap);
+ sheet.getRow(rowNumSheet).createCell(2).setCellValue("棰勪及瀹為檯瀹归噺锛�"+list.get(list.size()-1).actualCap+"AH");
}
rowNumSheet+=2;
//鎻掑叆鍥剧墖
@@ -185,11 +185,10 @@
sheet1.getRow(rowNum).createCell(0).setCellValue(fbo.m_TestTime.hms());
sheet1.getRow(rowNum).createCell(1).setCellValue(fbo.SumVoltage);
sheet1.getRow(rowNum).createCell(2).setCellValue(fbo.SumCurrent);
- sheet1.getRow(rowNum).createCell(3).setCellValue(fbo.actualCap);
- sheet1.getRow(rowNum).createCell(4).setCellValue(fbo.Temp_Envi);
- sheet1.getRow(rowNum).createCell(5).setCellValue(fbo.Humi_Envi);
+ sheet1.getRow(rowNum).createCell(3).setCellValue(fbo.Temp_Envi);
+ sheet1.getRow(rowNum).createCell(4).setCellValue(fbo.Humi_Envi);
if (start.DataType!=0xFB){
- sheet1.getRow(rowNum).createCell(6).setCellValue(fbo.testCap);
+ sheet1.getRow(rowNum).createCell(5).setCellValue(fbo.testCap);
}
for (int k = 0;k<list.get(0).SingleVol.length;k++){
sheet1.getRow(rowNum).createCell(rowName.length+k).setCellValue(fbo.SingleVol[k]);
@@ -218,10 +217,10 @@
public String[] getRowName(int dateType){
if (dateType==0xFB){
- String[] rowName = {"娴嬭瘯鏃堕棿","鎬荤數鍘�","鎬荤數娴�","瀹為檯瀹归噺","鐜娓╁害","鐜婀垮害"};
+ String[] rowName = {"娴嬭瘯鏃堕棿","鎬荤數鍘�","鎬荤數娴�","鐜娓╁害","鐜婀垮害"};
return rowName;
}else{
- String[] rowName1 = {"娴嬭瘯鏃堕棿","鎬荤數鍘�","鎬荤數娴�","瀹為檯瀹归噺","鐜娓╁害","鐜婀垮害","娴嬭瘯瀹归噺"};
+ String[] rowName1 = {"娴嬭瘯鏃堕棿","鎬荤數鍘�","鎬荤數娴�","鐜娓╁害","鐜婀垮害","娴嬭瘯瀹归噺"};
return rowName1;
}
}
--
Gitblit v1.9.1