修改内容

whychdw

2020-06-28 5e01c14748f0fe4336faa1a3f76b6d5473ffa2b5

修改内容

 fuguang_sx/WebRoot/charge-test.jsp

@@ -3264,7 +3264,7 @@
    
    // 实时-历史切换定位到具体电池组
    $(function() {
        $('body').on('click', '#nav a[href="control.jsp"]', function() {
        $('body').on('click', '#nav a[href="control1.jsp"]', function() {
            var batt = getBattinfById();
            var province = batt.StationName1;
            var city = batt.StationName2;

 fuguang_sx/WebRoot/charge-test01.jsp

@@ -2699,7 +2699,7 @@
    
    // 实时-历史切换定位到具体电池组
    $(function() {
        $('body').on('click', '#nav a[href="control.jsp"]', function() {
        $('body').on('click', '#nav a[href="control1.jsp"]', function() {
            var batt = getBattinfById();
            //console.info(batt.StationId);
            $(this).attr('href', 'control.jsp?battgroupId='+BattGroupId+'&stationId='+batt.StationId);

 fuguang_sx/WebRoot/charge-test02.jsp

@@ -2697,7 +2697,7 @@
    
    // 实时-历史切换定位到具体电池组
    $(function() {
        $('body').on('click', '#nav a[href="control.jsp"]', function() {
        $('body').on('click', '#nav a[href="control1.jsp"]', function() {
            var batt = getBattinfById();
            //console.info(batt.StationId);
            $(this).attr('href', 'control.jsp?battgroupId='+BattGroupId+'&stationId='+batt.StationId);

 fuguang_sx/WebRoot/control.jsp

@@ -130,6 +130,24 @@
        #contai {
            position: relative;
        }
        .canvas-container {
            position: relative;
            margin: 0 auto;
            width: 800px;
            height: 540px;
            background-color: #FFFFFF;
        }
        .canvas-content {
            width: 100%;
            height: 100%;
        }
        .canvas-content.canvas-mask {
            position: absolute;
            top: 0;
            right: 0;
            bottom: 0;
            left: 0;
        }
    </style>
    
  </head>  
@@ -244,7 +262,11 @@
                        </div>
                        
                        <div style="" class="ele-circle">
                            <canvas id="eleCircle" width="800" height="540"></canvas>
                            <div class="canvas-container">
                                <div class="canvas-content" id="topgraph"></div>
                                <div class="canvas-content canvas-mask" id="topgraphArc"></div>
                            </div>
                            <canvas id="eleCircle" width="800" height="540" style="display:none"></canvas>
                            <div class="elecircle-status" id="eleCircleStatus">
                                <ul></ul>
                            </div>
@@ -558,7 +580,7 @@
                        </tr>
                        <tr>
                            <th><s:text name="Monomer"/><s:text name="Lower_limit"/><s:text name="Threshold"/><!-- 单体下限阀值 -->（0~20V）</th>
                            <th><s:text name="Group_of_end"/><s:text name="Lower_limit"/><s:text name="Threshold"/><!-- 组端下限阀值 -->（0~60V）</th>
                            <th><s:text name="Group_of_end"/><s:text name="Lower_limit"/><s:text name="Threshold"/><!-- 组端下限阀值 -->（0~600V）</th>
                        </tr>
                        <tr>
                            <td><input id="MonomerVol_low" type="text" value="1.804"><i class="fa fa-frown-o error-img" title="数据格式错误"></i></td>
@@ -1109,7 +1131,7 @@
                        </tr>
                        <tr>
                            <th>电池标称温度（0.1~60.0℃）</th>
                            <th>电池浮充电压阀值（0.1~60.0V）</th>
                            <th>电池浮充电压阀值（0.1~600.0V）</th>
                        </tr>
                        <tr>
                            <td><input type="text" id="battInfo_batt_nom_temp" value=""></td>
@@ -1117,7 +1139,7 @@
                        </tr>
                        <tr>
                            <th>电池浮充电流阀值（0.1~30.0A）</th>
                            <th>在线电压低阀值（0.1~60.0V）</th>
                            <th>在线电压低阀值（0.1~600.0V）</th>
                        </tr>
                        <tr>
                            <td><input type="text" id="battInfo_batt_float_curr" value=""></td>
@@ -1171,8 +1193,13 @@
    <script type="text/javascript" src="pages/js/pages/control-common.js"></script>
    <script type="text/javascript" src="pages/js/pages/siderbar.js?v=<%=Math.random() %>"></script>
    <!-- 引入电路图 -->
    <script type="text/javascript" src="topgraph/js/topgraph.js?v=<%=Math.random() %>"></script>
    <script type="text/javascript" src="topgraph/js/shanxi.js?v=<%=Math.random() %>"></script>
	
    <script type="text/javascript" src="js/elecircle.js?v=<%=Math.random() %>"></script>
    <script type="text/javascript" src="js/elecircle.content.js?v=<%=Math.random() %>"></script>
	
	
    <script type="text/javascript" src="js/dischargetest/curing.js"></script>
    <script type="text/javascript">
        var permits;
@@ -1189,6 +1216,7 @@
            graphtype:0,            //拓扑图类型    0->浮充       1->放电       2->稳流(限流)充电     3->直流(直连)充电        4->未知(未连接)
            group_vol:"0V",            //组端电压值
            online_vol:"0V",            //在线电压值
            curr: 0,
            ischange:1,                //是否重新绘制,        0:不需要重新绘制              1:需要重新绘制
        };
        
@@ -2043,6 +2071,28 @@
                }else{
                    document.getElementById("reserve_time").value = "------";
                }
				
                mygraph.online_vol = online_vol+"V";
                mygraph.group_vol = group_vol+"V";
                mygraph.curr = Number(obj.group_curr.toFixed(2));
				
                var line21 = shanXiTopGraph.topgrahpInfo.line21;
                var textColor = "#FF0000";
                if(shanXiTopGraph.type == 'charge') {
                    textColor = "#58AFEF";
                }
				
                shanXiTopGraph.topgraphArc.setText({
                    id: 'curr',
                    point: {
                        x: line21.end.x+50,
                        y: line21.end.y-40,
                    },
                    text: "I="+mygraph.curr+"A",
                    font: 14,
                    color: textColor,
                });
				
            }
        }
        
@@ -2062,6 +2112,24 @@
                var group_vol = rtstate.group_vol.toFixed(2);
                mygraph.online_vol = online_vol+"V";
                mygraph.group_vol = group_vol+"V";
                mygraph.curr = Number(rtstate.group_curr.toFixed(2));
				
                var line21 = shanXiTopGraph.topgrahpInfo.line21;
                var textColor = "#FF0000";
                if(shanXiTopGraph.type == 'charge') {
                    textColor = "#58AFEF";
                }
				
                shanXiTopGraph.topgraphArc.setText({
                    id: 'curr',
                    point: {
                        x: line21.end.x+50,
                        y: line21.end.y-40,
                    },
                    text: "I="+mygraph.curr+"A",
                    font: 14,
                    color: textColor,
                });
                
                // 更改在线电压，组端电压
                changeEleCircleOpt(eleCircle, 'onlineVol', {name: mygraph.online_vol});

 fuguang_sx/WebRoot/control1.jsp

File was renamed from fuguang_sx/WebRoot/control_sx.jsp
@@ -130,24 +130,6 @@
        #contai {
            position: relative;
        }
        .canvas-container {
            position: relative;
            margin: 0 auto;
            width: 800px;
            height: 540px;
            background-color: #FFFFFF;
        }
        .canvas-content {
            width: 100%;
            height: 100%;
        }
        .canvas-content.canvas-mask {
            position: absolute;
            top: 0;
            right: 0;
            bottom: 0;
            left: 0;
        }
    </style>
    
  </head>  
@@ -262,11 +244,7 @@
                        </div>
                        
                        <div style="" class="ele-circle">
                            <div class="canvas-container">
                                <div class="canvas-content" id="topgraph"></div>
                                <div class="canvas-content canvas-mask" id="topgraphArc"></div>
                            </div>
                            <canvas id="eleCircle" width="800" height="540" style="display:none"></canvas>
                            <canvas id="eleCircle" width="800" height="540"></canvas>
                            <div class="elecircle-status" id="eleCircleStatus">
                                <ul></ul>
                            </div>
@@ -1193,13 +1171,8 @@
    <script type="text/javascript" src="pages/js/pages/control-common.js"></script>
    <script type="text/javascript" src="pages/js/pages/siderbar.js?v=<%=Math.random() %>"></script>
    <!-- 引入电路图 -->
    <script type="text/javascript" src="topgraph/js/topgraph.js?v=<%=Math.random() %>"></script>
    <script type="text/javascript" src="topgraph/js/shanxi.js?v=<%=Math.random() %>"></script>
	
    <script type="text/javascript" src="js/elecircle.js?v=<%=Math.random() %>"></script>
    <script type="text/javascript" src="js/elecircle.content.js?v=<%=Math.random() %>"></script>
	
	
    <script type="text/javascript" src="js/dischargetest/curing.js"></script>
    <script type="text/javascript">
        var permits;

 fuguang_sx/WebRoot/index-outline.jsp

@@ -103,7 +103,7 @@
                                <div class="block-title">实时监测</div>
                                <div class="block-content">实时监测机房电池组的电压、内阻、温度、电导。</div>
                                <div class="block-btn">
                                    <a href="control.jsp">实时监测</a>
                                    <a href="control1.jsp">实时监测</a>
                                </div>
                            </div>
                            <div class="block history">

 fuguang_sx/WebRoot/index.jsp

@@ -102,7 +102,7 @@
                                <div class="block-title">实时监测</div>
                                <div class="block-content">实时监测机房电池组的电压、内阻、温度、电导。</div>
                                <div class="block-btn">
                                    <a href="control.jsp">实时监测</a>
                                    <a href="control1.jsp">实时监测</a>
                                </div>
                            </div>
                            <div class="block history">

 fuguang_sx/WebRoot/js/dischargetest/battData.js

@@ -74,8 +74,8 @@
            pattern: /^[0-9]{1,4}(\.[0-9]{0,1})?$/,
            regVal: true,
            min: 0.1,
            max: 60,
            msg: '取值范围0.1~60.0'
            max: 600,
            msg: '取值范围0.1~600.0'
        });
        
        // 电池浮充电流阀值
@@ -92,8 +92,8 @@
            pattern: /^[0-9]{1,4}(\.[0-9]{0,1})?$/,
            regVal: true,
            min: 0.1,
            max: 60,
            msg: '取值范围0.1~60.0'
            max: 600,
            msg: '取值范围0.1~600.0'
        });
        
        // 电池组连接类型

 fuguang_sx/WebRoot/js/elecircle.content.js

@@ -1093,10 +1093,9 @@
            if(typeof callback == 'function') {
                callback.call({}, data);
            }
        	
            // 在线电压
            var online_vol = Number(mygraph.online_vol.slice(0, -1));
            var float_vol = batt.FloatVolLevel;
            // 实时电流
            var curr = Number(mygraph.curr);
            var float_current = batt.BattFloatCurrent;
            
            // 判断workstatus
            switch(workstatus) {
@@ -1111,18 +1110,26 @@
                    if(data.dev_res_test_state != 0) {
                        _str += '(内阻测试)';
                    }
    				
                    /**
                     * mk1断开
                     * 1.在线电压低于浮充电压阀值
                     * 2.电流是浮充电流
                     */
                    if(online_vol < float_vol) {
                        shanXiTopGraph.changeCurrState('');
                    }else {
                        shanXiTopGraph.changeCurrState('charge');
                    var time = 0;
                    if(shanXiTopGraph.type == 'discharge') {
                        time = 5000
                    }
                    // 从放电切换延时执行
                    setTimeout(function() {
                        var state = $('#ele_state').val();
                        var isCharge = /开关断开/.test(_str) && /放电/.test(state);
                    
                        if(isCharge) {
                            // 充电
                            shanXiTopGraph.changeCurrState('breakDischarge');
                        }else if(state){
                            // 充电
                            shanXiTopGraph.changeCurrState('charge');
                        }else {
                            // 充电
                            shanXiTopGraph.changeCurrState('nolink');
                        }
                    }, time);
                }
                break;
                case 1:{ // 放电测试
@@ -1162,16 +1169,31 @@
                            mygraph.graphtype = 3 ;
                            _str = '(开关闭合)';
                        }
    					
                        // 充电
                        shanXiTopGraph.changeCurrState('charge');
                    }else{
                        mygraph.graphtype = 0;
                        _str = '(开关闭合)';
    					
                        // 无状态
                        shanXiTopGraph.changeCurrState('');
                    }
    				
                    var time = 0;
                    if(shanXiTopGraph.type == 'discharge') {
                        time = 5000
                    }
                    // 从放电切换延时执行
                    setTimeout(function() {
                        var state = $('#ele_state').val();
                        var isCharge = /开关断开/.test(_str) && /放电/.test(state);
        				
                        if(isCharge) {
                            // 充电
                            shanXiTopGraph.changeCurrState('breakDischarge');
                        }else if(state){
                            // 充电
                            shanXiTopGraph.changeCurrState('charge');
                        }else {
                            // 充电
                            shanXiTopGraph.changeCurrState('nolink');
                        }
                    }, time);
                }
                break;
                default:{
@@ -1180,7 +1202,7 @@
                    _str = '(未知)';
                    
                    // 无状态
                    shanXiTopGraph.changeCurrState('');
                    shanXiTopGraph.changeCurrState('nolink');
                }
                break;
            }
@@ -1193,7 +1215,7 @@
            }
            
            // 无状态
            shanXiTopGraph.changeCurrState('');
            shanXiTopGraph.changeCurrState('nolink');
        }
        // 判断是否更新拓扑图
        if(lasttype != mygraph.graphtype){

 fuguang_sx/WebRoot/topgraph/js/shanxi.js

@@ -2,7 +2,7 @@
    this.topgraph = topgraph;
    this.topgraphArc = topgraphArc;
    this.topgrahpInfo = {};
    this.type="";
    this.type="nolink";
    this.topgraphArc.start();
};

@@ -534,19 +534,6 @@
    };
    // 绘制线条
    topgraph.drawDotLine(dotLine4);
    console.log(eleGroup);
    // 设置文本
//    topgraph.setText({
//        id: 'curr',
//        point: {
//            x: eleGroup.top.x+60,
//            y: eleGroup.top.y-20,
//        },
//        text: 'I=100A',
//        font: 14,
//        color: "#58AFEF",
//        nocenter: true,
//    });

    this.topgrahpInfo =  {
        line1,
@@ -753,6 +740,18 @@
        radius: raidus,
        fillStyle: fillStyle
    });
    
    // 设置文本
    topgraphArc.setText({
        id: 'statetext',
        point: {
            x: 400,
            y: 20,
        },
        text: '放电状态',
        font: 14,
        color: "#58AFEF",
    });
};

// 充电
@@ -938,11 +937,263 @@
        radius: radius,
        fillStyle: fillStyle
    });
    
    // 设置文本
    topgraphArc.setText({
        id: 'statetext',
        point: {
            x: 400,
            y: 20,
        },
        text: '充电状态',
        font: 14,
        color: "#58AFEF",
    });
};

// 停电放电
ShanXiTopGraph.prototype.drawBreakDicharge = function() {
    var topgraph = this.topgraph;
    var topgraphInfo = this.topgrahpInfo;
    // 关闭开关1，3
    topgraph.change('switch1', {state:'open'});
    topgraph.change('switch3', {state:'open'});

    // 打开开关2，4
    topgraph.change('switch2', {state:'close'});
    topgraph.change('switch4', {state:'close'});

    var topgraphArc = this.topgraphArc;
    var radius = 4;
    var fillStyle = "#FF0000";
    
    // 设置文本
    topgraphArc.setText({
        id: 'statetext',
        point: {
            x: 400,
            y: 20,
        },
        text: '停电放电状态',
        font: 14,
        color: "#58AFEF",
    });
    
    // 约束运动
    var line21 = topgraphInfo.line21;
    topgraphArc.moveArc({
        id: 'moveArc1',
        point: {
            x: line21.end.x,
            y: line21.end.y,
        },
        
        start: {
            x: line21.end.x,
            y: line21.end.y,
        },
        end: {
            x: line21.start.x,
            y: line21.start.y,
        },
        radius: radius,
        fillStyle: fillStyle
    });
    
    // 约束运动
    var line3 = topgraphInfo.line3;
    topgraphArc.moveArc({
        id: 'moveArc2',
        point: {
            x: line3.start.x,
            y: line3.start.y,
        },
        
        start: {
            x: line3.start.x,
            y: line3.start.y,
        },
        end: {
            x: line3.end.x,
            y: line3.end.y,
        },
        radius: radius,
        fillStyle: fillStyle
    });
    
    // 约束运动
    var line4 = topgraphInfo.line4;
    topgraphArc.moveArc({
        id: 'moveArc3',
        point: {
            x: line4.start.x,
            y: line4.start.y,
        },
        
        start: {
            x: line4.start.x,
            y: line4.start.y,
        },
        end: {
            x: line4.end.x,
            y: line4.end.y,
        },
        radius: radius,
        fillStyle: fillStyle
    });
    
    // 约束运动
    var line5 = topgraphInfo.line5;
    topgraphArc.moveArc({
        id: 'moveArc5',
        point: {
            x: line5.start.x,
            y: line5.start.y,
        },
        
        start: {
            x: line5.start.x,
            y: line5.start.y,
        },
        end: {
            x: line5.end.x,
            y: line5.end.y,
        },
        radius: radius,
        fillStyle: fillStyle
    });
    
    // 约束运动
    var line51 = topgraphInfo.line51;
    topgraphArc.moveArc({
        id: 'moveArc6',
        point: {
            x: line51.start.x,
            y: line51.start.y,
        },
        
        start: {
            x: line51.start.x,
            y: line51.start.y,
        },
        end: {
            x: line51.end.x,
            y: line51.end.y,
        },
        radius: radius,
        fillStyle: fillStyle
    });
    // 约束运动
    var line52 = topgraphInfo.line52;
    topgraphArc.moveArc({
        id: 'moveArc7',
        point: {
            x: line52.start.x,
            y: line52.start.y,
        },
        
        start: {
            x: line52.start.x,
            y: line52.start.y,
        },
        end: {
            x: line52.end.x,
            y: line52.end.y,
        },
        radius: radius,
        fillStyle: fillStyle
    });
    
    // 约束运动
    var line10 = topgraphInfo.line10;
    topgraphArc.moveArc({
        id: 'moveArc8',
        point: {
            x: line10.end.x,
            y: line10.end.y,
        },
        
        start: {
            x: line10.end.x,
            y: line10.end.y,
        },
        end: {
            x: line10.start.x,
            y: line10.start.y,
        },
        radius: radius,
        fillStyle: fillStyle
    });
    
    // 约束运动
    var line9 = topgraphInfo.line9;
    topgraphArc.moveArc({
        id: 'moveArc9',
        point: {
            x: line9.end.x,
            y: line9.end.y,
        },
        
        start: {
            x: line9.end.x,
            y: line9.end.y,
        },
        end: {
            x: line9.start.x,
            y: line9.start.y,
        },
        radius: radius,
        fillStyle: fillStyle
    });
    
    // 约束运动
    var line8 = topgraphInfo.line8;
    topgraphArc.moveArc({
        id: 'moveArc10',
        point: {
            x: line8.end.x,
            y: line8.end.y,
        },
        
        start: {
            x: line8.end.x,
            y: line8.end.y,
        },
        end: {
            x: line8.start.x,
            y: line8.start.y,
        },
        radius: radius,
        fillStyle: fillStyle
    });
    
    // 约束运动
    var line22 = topgraphInfo.line22;
    topgraphArc.moveArc({
        id: 'moveArc11',
        point: {
            x: line22.end.x,
            y: line22.end.y,
        },
        
        start: {
            x: line22.end.x,
            y: line22.end.y,
        },
        end: {
            x: line22.start.x,
            y: line22.start.y,
        },
        radius: radius,
        fillStyle: fillStyle
    });
};

// 中间态
ShanXiTopGraph.prototype.drawPowerCut = function() {
ShanXiTopGraph.prototype.drawPowerCut = function(nolink) {
    var topgraph = this.topgraph;
    var topgraphArc = this.topgraphArc;
    
    // 打开开关1，3
    topgraph.change('switch1', {state:'open'});
    topgraph.change('switch3', {state:'open'});
@@ -950,6 +1201,32 @@
    // 打开开关2，4
    topgraph.change('switch2', {state:'open'});
    topgraph.change('switch4', {state:'open'});
    
    // 设置文本
    topgraphArc.setText({
        id: 'statetext',
        point: {
            x: 400,
            y: 20,
        },
        text: 'MK1断开',
        font: 14,
        color: "#58AFEF",
    });
    
    if(nolink) {
        // 设置文本
        topgraphArc.setText({
            id: 'statetext',
            point: {
                x: 400,
                y: 20,
            },
            text: '未连接',
            font: 14,
            color: "#FF0000",
        });
    }
};

// 修改电路状态
@@ -970,6 +1247,12 @@
        case 'charge':
            this.drawCharge();
        break;
        case 'breakDischarge':
            this.drawBreakDicharge();
        break;
        case 'nolink':
            this.drawPowerCut(true);
        break;
        default:
            this.drawPowerCut();
        break;
@@ -986,5 +1269,3 @@
setTimeout(function() {
    shanXiTopGraph.topgraph.stop();
}, 1000);

shanXiTopGraph.changeCurrState();

 fuguang_sx/src/com/fgkj/db/DBUtil.java

@@ -15,11 +15,11 @@
    //private static String username="website";
    //private static String password="amtb3737";
    
    private static String url="jdbc:mysql://118.89.139.230:3360/db_user";
    //private static String url="jdbc:mysql://118.89.139.230:3360/db_user";
    private static String username="root";
    private static String password="lmx8688139";
    //private static String url="jdbc:mysql://192.168.7.115:3360/db_user";
    //private static String url="jdbc:mysql://127.0.0.1:3360/db_user";
    private static String url="jdbc:mysql://127.0.0.1:3360/db_user";
    /*private static String username="root";
    private static String password="123456";*/