修改内容

whychdw

2020-07-15 1323952949a85218d48417d255e5d9207d559ceb

修改内容

 zijing/WebRoot/control.jsp

@@ -719,18 +719,18 @@
                    <tbody>
                        <tr>
                            <th><s:text name="Equipment"/><!-- 设备 -->ID</th>
                            <th><s:text name="Batt_group"/><s:text name="Property"/><!-- 电池组属性 --></th>
                            <th><s:text name="Batt_group"/><s:text name="Mark"/><!-- 电池组号 --></th>
                        </tr>
                        <tr>
                            <td><input type="text" id="equip61850_dev_id" readonly="readonly" value=""></td>
                            <td><input type="text" id="equip61850_dev_battgroup_property" readonly="readonly" value=""></td>
                            <td><input id="equip61850_battgropunum" readonly="readonly" type="text" value=""></td>
                        </tr>
                        <tr>
                            <th><s:text name="Batt_group"/><s:text name="Mark"/><!-- 电池组号 --></th>
                            <th><s:text name="Batt_group"/><s:text name="Property"/><!-- 电池组属性 --></th>
                            <th>测试类型<!-- 放电类型 --></th>
                        </tr>
                        <tr>
                            <td><input id="equip61850_battgropunum" readonly="readonly" type="text" value=""></td>
                            <td><input type="text" id="equip61850_dev_battgroup_property" readonly="readonly" value=""></td>
                            <td>
                                <select id="equip61850_discharge_type">
                                    <option value="37">核容放电</option>
@@ -3901,6 +3901,8 @@
                // data.dev_workstate = 6;
                // 工作状态
                status.setStatus('workstatus', data.dev_workstate);
                // 设置工作状体
                $('#stopTest').data('workState', data.dev_workstate);
                // 操作失败原因
                status.setStatus('fail', data.dev_alarmstate);
                
@@ -4096,7 +4098,6 @@
            // 停止测试
            $('#stopTest').click(function() {
                var batt = getBatt();
                console.info(batt);
                if(regEquipType(batt.FBSDeviceId, globalPattern.BTS)) {
                    var temp = {
                        num: CMD_BTS_Stop,
@@ -4109,6 +4110,11 @@
                        enparams: [temp]
                    });
                }else if(regEquipType(batt.FBSDeviceId, globalPattern.equip61850)) {
                    var workState = $(this).data('workState');
                    if(workState == 5) {
                        layer.msg("K1/D1测试中，无法停止！");
                        return;
                    }
                    var temp = {
                        num: CMD_61850_STOP,
                        dev_id: batt.FBSDeviceId

 zijing/WebRoot/index.jsp

@@ -1754,6 +1754,7 @@
    

    function showMapPanel(target, warnList) {

        var point = target.point;

        point = new BMap.Point(point.lng, point.lat);
        var searchInforWin = null;

        for(var i = 0; i < warnList.length; i++) {

            if(warnList[i].lng == point.lng && warnList[i].lat == point.lat) {