后台提交1

longyvfengyun

2022-05-19 0d4bacb85ffed64b9018931e82f8eadefba490b5

后台提交1

 WebRoot/charge-test.jsp

@@ -30,7 +30,7 @@
<link rel="stylesheet" type="text/css" href="src/css/layui.css">
<!-- font-awesome-4.7.0 -->
<link rel="stylesheet" href="font-awesome-4.7.0/css/font-awesome.min.css">
<script type="text/javascript" src="js/echarts2.js"></script>
<script type="text/javascript" src="js/plus/echarts.js"></script>
<script type="text/javascript" src="js/frame.js"></script> 
<script type="text/javascript" src="js/jquery-1.8.3.js"></script>

@@ -2070,7 +2070,9 @@
            //console.info(AllTestData);
            
            if(AllTestData!=undefined){
                let testType = 0;
                if(Monnum_list != undefined && Monnum_list.length>0){
                    testType = AllTestData[0].test_type;
                    AllData=new Array();
                    for(var i=0;i<Monnum_list.length;i++){
                        batt_test_voldata[i] = new Array();
@@ -2139,9 +2141,17 @@
                //CreateEchart(oLBottom,Voltage,Monnum_list,Monvol_list,title,tempmax,tempmin, cPicker);
                //console.log(slide_index+'****'+li_index);
                createEchartBar(AllData,slide_index,li_index);
                console.log(BattGroupVol);
                let specialPoint = getSpecialPointIndex(BattGroupVol[0]);
                // 放电状态
                if(testType != 3) {
                    specialPoint.code = 0;
                }
                if(specialPoint.code == 1) {
                    let qgth = getQgth(specialPoint, batt.MonVolStd * batt.MonCount);
                    thrname = qgth.title;
                }
                //生成左下条形图
                CreateLineEchartTop('myLineChartTop',oLTop,group_vol, TestTime, BattGroupVol,getMaxFromArr(BattGroupVol),getMinFromArr(BattGroupVol),thrname);            //生成左上折线图
                CreateLineEchartTop('myLineChartTop',oLTop,group_vol, TestTime, BattGroupVol,getMaxFromArr(BattGroupVol),getMinFromArr(BattGroupVol),thrname, specialPoint);            //生成左上折线图
                CreateRightLineEchart('myRightLineChart',rtop, batt_curr, TestTime, BattGroupCurr, (Math.max.apply(null, BattGroupCurr)).toFixed(2),(Math.min.apply(null, BattGroupCurr)).toFixed(2),thrname);    //生成右上折线图
                // 根据折线图的状态值生成对应的折线
                var line_status = $('#lineStatus').val();

 src/com/fgkj/actions/LoginAction.java

@@ -24,6 +24,7 @@
import com.fgkj.services.User_infService;
import com.fgkj.services.User_logService;
import com.fgkj.services.Vip_userService;
import com.fgkj.util.RSAUtil;
import com.opensymphony.xwork2.ActionSupport;


@@ -88,6 +89,7 @@
            Cookie c = null;
            //System.out.println(ActionUtil.DecryptionBase64());
            if(uinf.getUId() == 1){
                uinf.setUSnId(RSAUtil.decryptFrontP(uinf.getUpassword(), RSAUtil.fontSeparator)[0]);
                c = new Cookie("user", ActionUtil.EncryptionBase64(ActionUtil.getGson().toJson(uinf)).toString());
            }else{
                c = new Cookie("user", "");

 src/com/fgkj/services/User_infService.java

@@ -207,7 +207,7 @@
            uinf.setUSnId(u.getUSnId());
            model.setCode(1);
            //model.setMsg("index.jsp");
            model.setMsg("index-outline.jsp");
            model.setMsg("index.jsp");
            // 将登陆成功的用户存入session
            ActionUtil.getSession().setAttribute("user", u);
            
@@ -248,7 +248,7 @@
                uinf.setUSnId(u.getUSnId());
                model.setCode(1);
                //model.setMsg("index.jsp");
                model.setMsg("index-outline.jsp");
                model.setMsg("index.jsp");
                // 将登陆成功的用户存入session
                ActionUtil.getSession().setAttribute("user", u);