From c02e430f16cb51cabb6f4b24f99ec48efc7b0596 Mon Sep 17 00:00:00 2001 From: Administrator <Administrator@192.168.10.26> Date: 星期三, 21 十一月 2018 11:59:20 +0800 Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw --- gx_tieta/WebRoot/control.jsp | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp index 67e1692..6d095b9 100644 --- a/gx_tieta/WebRoot/control.jsp +++ b/gx_tieta/WebRoot/control.jsp @@ -376,6 +376,10 @@ <td><s:text name="Head"/></td> <!-- 璐熻矗浜� --> <td></td> </tr> + <tr> + <td>瀹夎浜哄憳</td> <!-- 璐熻矗浜� --> + <td id="installUser"></td> + </tr> </table> </div> <div class="con-list ele-infor" style="height: 400px;overflow-y: auto"> @@ -656,7 +660,7 @@ </tr> <tr> <th><s:text name="Booster"/><s:text name="Upper_limit"/><!-- 鍗囧帇涓婇檺 -->锛圴锛�</th> - <th><s:text name="Charging_current"/><!-- 鍏呯數鐢垫祦 -->锛圓锛�</th> + <th id="ChargeCurrSetLabel"><s:text name="Charging_current"/><!-- 鍏呯數鐢垫祦 -->锛圓锛�</th> </tr> <tr> <td><input id="DCVolHighLimit" type="text" value="0"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td> @@ -675,7 +679,7 @@ </div> </div> <div class="popup-footer"> - <input type="button" name="" id="btn_start_test" class="status-change-btn whyc-btn-disabled" value="鍚姩娴嬭瘯" > <!-- 鍚姩娴嬭瘯 --> + <input type="button" name="" id="btn_start_test" class="status-change-btn whyc-btn-disabled no-remove-disabled" value="鍚姩娴嬭瘯" > <!-- 鍚姩娴嬭瘯 --> <input type="button" name="" id="btn_flush" value="璇诲彇" > <!-- 璇诲彇 --> <input type="button" name="" id="btn_ensure" class="status-change-btn whyc-btn-disabled" value="璁惧畾" > <!-- 璁惧畾 --> <!-- <input type="button" name="" id="bts_graph" value="鎷撴墤鍥�"> --> -- Gitblit v1.9.1