实时和历史页面跳转以及设备告警查询

whyclj

2020-09-28 2bc2bfa4d24cf057c29348b97022f51c8cc22cbf

实时和历史页面跳转以及设备告警查询

 zijing/WebRoot/Top.jsp

@@ -135,7 +135,7 @@
                </div>            
            </div>
            <div class="international">
                <span style="vertical-align: top;">系统版本：V3.5.0.006</span>
                <span style="vertical-align: top;">系统版本：V3.5.0.007</span>
                <!-- <img src="./image/fuguang_logo.jpg" height="70"> -->            
            </div>
            <!--用户登录后显示用户名鼠标经过显示下拉菜单-->

 zijing/WebRoot/charge-test.jsp

@@ -3285,7 +3285,7 @@
            var province = batt.StationName1;

            var city = batt.StationName2;

            var county = batt.StationName5;

            var home = batt.StationName;

            var home = batt.StationName3;

            var battid = batt.BattGroupId;

            $(this).attr('href', 'control.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home+'&battid='+battid);

        });


 zijing/WebRoot/control.jsp

@@ -3328,7 +3328,7 @@
                var province = batt.StationName1;
                var city = batt.StationName2;
                var county = batt.StationName5;
                var home = batt.StationName;
                var home = batt.StationName3;
                var battid = batt.BattGroupId;
                $(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home+'&battid='+battid);
            });

 zijing/WebRoot/index-outline.jsp

@@ -2149,6 +2149,7 @@
                var rs = JSON.parse(res.result);
                if(rs.code == 1){
                    var data = rs.data[0];
                    console.log(data);
                    content = '<div style="padding:6px;"><span>蓄电池组告警数目：</span>'+obj.alarm_num+'<a style="margin-left: 14px" href="javascript:loadToWarnPage();">详情>></a></div>'+
                            '<div style="padding:6px;"><span>蓄电池组落后数目：</span>'+obj.low_num+'<a style="margin-left: 14px" href="javascript:loadToBehindPage();">详情>></a></div>'+
                            '<div style="padding:6px;"><span>蓄电池组延时数目：</span>'+obj.delay_num+'<a style="margin-left: 14px" href="javascript:loadToDischargeDelay();">详情>></a></div>'+
@@ -2157,7 +2158,7 @@
                            '<input type="hidden" class="ipt-hide" value="'+data.StationName1+'">'+
                            '<input type="hidden" class="ipt-hide" value="'+data.StationName2+'">'+
                            '<input type="hidden" class="ipt-hide" value="'+data.StationName5+'">'+
                            '<input type="hidden" class="ipt-hide" value="'+data.StationName+'">';
                            '<input type="hidden" class="ipt-hide" value="'+data.StationName3+'">';
                    objVal.content = content;
                }
        

 zijing/src/com/fgkj/actions/Batt_devalarm_dataAction.java

@@ -116,7 +116,7 @@
    
    //3.4设备实时告警(取消告警)<多数据修改><-----------跨域------------->
    public String cancelPro_ky() {
        List<Batt_devalarm_data> list = getGson().fromJson(json,new TypeToken<List<Batt_devalarm_data>>(){}.getType());
        List<Batt_devalarm_data> list = getGson(ActionUtil.time_yyyyMMddHHmmss).fromJson(json,new TypeToken<List<Batt_devalarm_data>>(){}.getType());
        ServiceModel model = service.cancelPro(list);
        result = tojson(model);
        return SUCCESS;        

 zijing/src/com/fgkj/services/Batt_devalarm_dataService.java

@@ -1,6 +1,7 @@
package com.fgkj.services;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;

import com.fgkj.dao.BaseDAO;
@@ -93,6 +94,9 @@
             }
        }
        Boolean bl = DAOHelper.makeManualCommit(DBUtil.getConn(), sql_str);
        for (String sql : sql_str) {
            System.out.println(sql);
        }
        (new User_logService()).addPro(listU);//将用户的操作记录下来
        if(bl){
            model.setCode(1);

 zijing/src/com/fgkj/services/User_infService.java

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