From 43fe18b40a84b82ca5c5f1a88abb89ea168f95f5 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.23>
Date: 星期一, 12 十一月 2018 10:12:26 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/User_ChartAction.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/User_ChartAction.java b/gx_tieta/src/com/fgkj/actions/User_ChartAction.java
index aa7d4c0..bba9c7b 100644
--- a/gx_tieta/src/com/fgkj/actions/User_ChartAction.java
+++ b/gx_tieta/src/com/fgkj/actions/User_ChartAction.java
@@ -43,6 +43,8 @@
put("devalarm","home_warn.gif");
put("precharge","home_warn.gif");
put("onlinecharge","home_warn.gif");
+ put("poff","poff.gif");
+ put("install","install.gif");
}
};
@@ -160,6 +162,10 @@
uc.setChart_pre_charge(files.get(i));
}else if("onlinecharge".equals(ftype.get(i))){
uc.setChart_online_charge(files.get(i));
+ }else if("poff".equals(ftype.get(i))){
+ uc.setChart_poff(files.get(i));
+ }else if("install".equals(ftype.get(i))){
+ uc.setChart_install(files.get(i));
}
}
--
Gitblit v1.9.1