From 531e90820c0f0bc3f52111bc784e8f3b6a0af268 Mon Sep 17 00:00:00 2001
From: he wei <858544502@qq.com>
Date: 星期一, 21 三月 2022 12:09:00 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whychw/testElectron
---
src/main/java/testElectronJ/TestController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/testElectronJ/TestController.java b/src/main/java/testElectronJ/TestController.java
index 5648af4..9330b20 100644
--- a/src/main/java/testElectronJ/TestController.java
+++ b/src/main/java/testElectronJ/TestController.java
@@ -145,7 +145,7 @@
//灞炴�ф爮
- String[] rowName = {"娴嬭瘯鏃堕棿","鎬荤數鍘�","娴嬭瘯瀹归噺","鍓╀綑瀹归噺"};
+ String[] rowName = {"娴嬭瘯鏃堕棿","鎬荤數鍘�","娴嬭瘯瀹归噺","瀹為檯瀹归噺"};
HSSFRow row = sheet1.createRow(rowNum);
for (int i=0;i<rowName.length;i++){
row.createCell(i).setCellValue(rowName[i]);
@@ -165,7 +165,7 @@
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.testCap);
- sheet1.getRow(rowNum).createCell(3).setCellValue(fbo.residualCap);
+ sheet1.getRow(rowNum).createCell(3).setCellValue(fbo.actualCap);
for (int k = 0;k<list.get(0).SingleVol.length;k++){
sheet1.getRow(rowNum).createCell(4+k).setCellValue(fbo.SingleVol[k]);
}
--
Gitblit v1.9.1