内容提交

whychdw

2021-04-13 d90fb5a27406e4b36cb05933b0ce98469ee6bc25

内容提交

 gx_tieta/WebRoot/control02.jsp

@@ -81,6 +81,18 @@
    .elecircle-status li.elecircle-status-warn a {
      color: #FF0000;
    }
    table.state-table {
      width: 160px !important;
      color: #0244f8;
    }
    .state-table th {
      text-align: center;
    }
    table.state-table td {
      border: none !important;
      line-height: 20px;
      text-align: center;
    }
    .tools-btn {
      position: absolute;
      top: .5em;
@@ -187,6 +199,12 @@
      font-weight: bold;
      padding-right: 1em;
    }
    .layui-card-header.primary {
      background-color: #1495E7;
      text-align: center;
      color: #fff;
      font-weight: bold;
    }
  </style>

</head>
@@ -275,6 +293,7 @@
              </li>
              <li><span  id="Warning">告警</span>
              </li>
              <li><span  id="DevState" class="hide">均衡供电模块</span></li>
            </ul>
          </div>
          <!-- <div id="ele_statue"></div> -->
@@ -295,10 +314,37 @@
          <div style="" class="ele-circle">
            <canvas id="eleCircle" width="800" height="540"></canvas>
            <div class="elecircle-status" id="eleCircleStatus">
              <ul>
              <ul class="state-list">
                <li><i class="fa fa-rss"></i><a href="javascript:;">通讯正常</a></li>
                <li class="elecircle-status-warn"><i class="fa fa-thermometer-half"></i><a href="javascript:;">设备内部过温告警</a></li>
              </ul>
              <table class="state-table">
                <thead>
                  <tr>
                    <th>编号</th>
                    <th>天数</th>
                    <th>模式</th>
                    <th>组压</th>
                    <th>峰压</th>
                  </tr>
                </thead>
                <tbody>
                  <tr>
                    <td>1</td>
                    <td>100</td>
                    <td>停止</td>
                    <td>48</td>
                    <td>48.5</td>
                  </tr>
                  <tr>
                    <td>1</td>
                    <td>100</td>
                    <td>停止</td>
                    <td>48</td>
                    <td>48.5</td>
                  </tr>
                </tbody>
              </table>
            </div>
            <div class="tools-btn">
              <a href="javascript:void(0);" id="setParamBtn" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
@@ -310,6 +356,19 @@
                <span class="whyc-btn-icon fa fa-stop-circle"></span>
                <span class="whyc-btn-txt">停止测试</span>
              </a>
              <br>
              <!-- 屏蔽养护除硫模块 -->
              <div id="curingToolsBtn">
                <a href="javascript:void(0);" id="setCuringParamBtn" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
                  <span class="whyc-btn-icon fa fa-play-circle"></span>
                  <span class="whyc-btn-txt">启动养护/除硫</span>
                </a>
                <br>
                <a href="javascript:void(0);" id="stopCuring" class="whyc-btn whyc-btn-disabled">
                  <span class="whyc-btn-icon fa fa-stop-circle"></span>
                  <span class="whyc-btn-txt" id="stopCuringBtn">停止养护/除硫</span>
                </a>
              </div>
              <br>
              <a href="javascript:void(0);" id="battInfoBtn" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
                <span class="whyc-btn-icon fa fa-battery-full"></span>
@@ -332,6 +391,48 @@
              </a>
            </div>
          </div>

          <!-- 设备状态 -->
          <div class="tab_dev_state h550" style="margin-top: 8px; margin-left: 16px; margin-right: 16px; display: none">
            <div class="layui-row layui-col-space15">
              <div class="layui-col-md4">
                <div class="layui-card">
                  <div class="layui-card-header primary">电压</div>
                  <div class="layui-card-body" id="jhVols"></div>
                </div>
              </div>
              <div class="layui-col-md4">
                <div class="layui-card">
                  <div class="layui-card-header primary">电流</div>
                  <div class="layui-card-body" id="jhCurrs"></div>
                </div>
              </div>
              <div class="layui-col-md4">
                <div class="layui-card">
                  <div class="layui-card-header primary">其他</div>
                  <div class="layui-card-body">
                    <table class="card-table" id="jhOthers">
                      <colgroup>
                        <col width="50%"></col>
                        <col width="50%"></col>
                      </colgroup>
                      <tbody>
                      <tr>
                        <td>版本号</td>
                        <td></td>
                      </tr>
                      <tr>
                        <td>设备温度</td>
                        <td></td>
                      </tr>
                      </tbody>
                    </table>
                  </div>
                </div>
              </div>
            </div>
          </div>
        </div>

          <!-- 告警面板 -->
          <div class="panel_warning">
@@ -1279,6 +1380,105 @@
  </div>
</div>

<!-- 除硫养护面板 -->
<div class="popup" id="curingPopup">
  <div class="popup-title"><span>除硫养护参数设置</span> <a href="javascript:;" class="close">X</a></div>
  <div class="popup-content">
    <div class="popup-tbl">
      <table>
        <tbody>
        <tr>
          <th>设备id</th>
          <th>除硫/养护</th>
        </tr>
        <tr>
          <td><input type="text" id="curing_dev_id" readonly="readonly" value="" /></td>
          <td>
            <select id="curing_style">
              <option value="0xA2">除硫</option>
              <option value="0xA3">养护</option>
            </select>
          </td>
        </tr>
        <tr>
          <th>标称容量</th>
          <th>电池组号</th>
        </tr>
        <tr>
          <td><input type="text" id="curing_STDCap" readonly="readonly" value="" /></td>
          <td>
            <select id="curing_GroupNum">
              <option value="1">1</option>
              <option value="2">2</option>
              <option value="3">3</option>
              <option value="4">4</option>
            </select>
          </td>
        </tr>
        <tr>
          <th>浮充电压（0~90V）</th>
          <th>除硫强度（0~30）</th>
        </tr>
        <tr>
          <td><input type="text" id="curing_FloatVol" value="" /></td>
          <td><input type="text" id="curing_Strength" value="" /></td>
        </tr>
        <tr>
          <th>养护强度（0~30）</th>
          <th>除硫天数（0~999天）</th>
        </tr>
        <tr>
          <td><input type="text" id="curing_YHStrength" value="" /></td>
          <td><input type="text" id="curing_TimeLong" value="" /></td>
        </tr>
        </tbody>
      </table>
    </div>
  </div>
  <div class="popup-footer">
    <input type="button" name="" id="curing_btn_start_test" class="status-change-btn" value="启动" > <!-- 启动测试 -->
    <input type="button" name="" id="curing_btn_flush" value="读取" >                    <!-- 读取 -->
    <input type="button" name="" id="curing_btn_ensure" class="status-change-btn" value="设定" >                <!-- 设定 -->
  </div>
</div>

<!-- 停止养护除硫 -->
<div class="popup" id="stopCuringPopup">
  <div class="popup-title"><span>停止养护除硫</span> <a href="javascript:;" class="close">X</a></div>
  <div class="popup-content">
    <div class="popup-tbl">
      <table>
        <tbody>
          <tr>
            <th>模块编号</th>
            <th>模块状态</th>
          </tr>
          <tr>
            <td>
              <select id="stop_Curing_module_num">
                <option value="1">1</option>
                <option value="2">2</option>
                <option value="3">3</option>
                <option value="4">4</option>
                <option value="5">5</option>
              </select>
            </td>
            <td>
              <select id="stop_Curing_module_state" disabled="true">
                <option value="0">停止</option>
                <option value="1">养护</option>
                <option value="2">除硫</option>
              </select>
            </td>
          </tr>
        </tbody>
      </table>
    </div>
    <div class="popup-footer">
      <input type="button" name="" id="stop_curing_btn" class="status-change-btn" value="停止" > <!-- 停止 -->
    </div>
</div>

<!-- 最大内阻单体 -->
<div class="confirm">
  <div class="confirm-header"><span>最大内阻单体（前10）</span><a href="javascript:closeConfirm();" class="close">X</a></div>
@@ -1426,6 +1626,8 @@
  var sysSet_popup = new Popup($('#sysSet_popup'));
  var localNav = new Popup($('#localNav'));
  var battInfo_popup = new Popup($('#battInfo_popup'));
  var curing_popup = new Popup($('#curingPopup'));
  var stopCuringPopup = new Popup($('#stopCuringPopup'));
  // 充放电弹出框设置
  $(function() {
    // 初始化LD9充放电弹出框
@@ -1462,6 +1664,17 @@
    $('#battInfo_popup').find('.close').bind('click', function() {
      battInfo_popup.hidePopup();    // 隐藏battInfo_popup弹出框和遮罩层
    });

    // 初始化除硫养护面板
    $('#curingPopup').find('.close').bind('click', function() {
      curing_popup.hidePopup();    // 隐藏除硫养护面板和遮罩层
    });

    // 初始化停止除硫养护面板
    $('#stopCuringPopup').find('.close').bind('click', function() {
      stopCuringPopup.hidePopup();    // 隐藏除硫养护面板和遮罩层
    });



    // bts面板充电电流编辑
@@ -1537,6 +1750,8 @@
      localNav.hidePopup();
      sysSet_popup.hidePopup();    // 隐藏sysSet_popup弹出框和遮罩层
      battInfo_popup.hidePopup();    // 隐藏battInfo_popup弹出框和遮罩层
      curing_popup.hidePopup();    // 隐藏除硫养护面板和遮罩层
      stopCuringPopup.hidePopup();  // 隐藏停止养护除硫面板和遮罩层
    });
  });
  //初始化柱状图
@@ -1567,7 +1782,7 @@

    lname = $(this).attr('id');
    realname = $(this).text();
    if(lname != 'eleCircleBtn') {
    if(lname != 'eleCircleBtn' && lname != 'DevState') {
      table_index = $(this).index();
    }

@@ -1808,6 +2023,10 @@
    }else if(lname == 'eleCircleBtn') {
      $('.graph, .panel_warning').hide();
      $('.ele-circle').show();
    }else if(lname == 'DevState'){
      $('.tab_dev_state').show();
      $('.graph').hide();
      $('.ele-circle').hide();
    }else{
      $('.ele-circle, .panel_warning').hide();
      $('.graph').show();
@@ -2187,6 +2406,12 @@

    // 更新拓扑图状态
    searchDevStatusByDev_id();

    // 更新养护除硫信息
    realTimeStateList();

    // 查询均衡供电模块信息
    jhPowerSupplyModule();
  }

  //根据设备id查询设备当前的开关状态
@@ -3627,6 +3852,22 @@
          $('.graph').show();
          myChart.resize();
        }

        // 判断设备是否为61850设备
        if(regEquipType(batt.FBSDeviceId, globalPattern.equip61850, globalPattern.BTS)) {
          $('#DevState').removeClass('hide');
        }else {
          var isAct = $('#DevState').hasClass('action');
          if(isAct) {
            lname = 'Voltage';
            $('#'+lname).addClass('action');
            $('.tab_dev_state').hide();
            $('.graph').show();
          }
          $('#DevState').removeClass('action').addClass('hide');
          myChart.resize();
        }

        mygraph.ischange = 1;                //重新绘制拓扑图

        getBattStr();
@@ -4819,6 +5060,22 @@
          $('.graph').show();
          myChart.resize();
        }

        // 判断设备是否为61850设备
        if(regEquipType(batt.FBSDeviceId, globalPattern.equip61850, globalPattern.BTS)) {
          $('#DevState').removeClass('hide');
        }else {
          var isAct = $('#DevState').hasClass('action');
          if(isAct) {
            lname = 'Voltage';
            $('#'+lname).addClass('action');
            $('.tab_dev_state').hide();
            $('.graph').show();
          }
          $('#DevState').removeClass('action').addClass('hide');
          myChart.resize();
        }

        mygraph.ischange = 1;                //重新绘制拓扑图


@@ -5793,8 +6050,186 @@
    });
  }

  // 获取剩余天数，工作模式，组端电压，峰值电压
  function realTimeStateList() {
    let batt = getBatt();
    $.ajax({
      type:"post",
      url:"Fbs9100s_fod_stateAction_action_serchByCondition",
      async:true,
      datatype:'json',
      data:"json="+JSON.stringify({
        battGroupId: batt.BattGroupId,
      }),
      success:function(res){
        let rs = JSON.parse(res.result);
        if(rs.code == 1) {
          let data = rs.data[0];
          let nums = ['one', 'two', 'three', 'four', 'five'];
          let workModels = ["停止", "养护", "除硫"];
          // 解析数据
          let list = nums.map((item,index)=>{
            let workModel = workModels[data['WorkState_'+item]];
            let tmp = [index+1, data['RestTime_'+item], workModel, data['VGroupVol_'+item], data['VpeakVol_'+item]];
            return tmp;
          });
          $('#eleCircleStatus .state-table').show();
          $('#eleCircleStatus .state-table tbody').text("");
          list.forEach(item=>{
            let tr = $('<tr></tr>');
            item.forEach(value=>{
              let td = $('<td>'+value+'</td>');
              tr.append(td);
            });
            $('#eleCircleStatus .state-table tbody').append(tr);
          });
        }else {
          $('#eleCircleStatus .state-table').hide();
        }
      }
    });
  }

  // 查询均衡供电模块信息
  function jhPowerSupplyModule() {
    var batt = getBatt();
    // 判断是否为61850设备
    if(!regEquipType(batt.FBSDeviceId, globalPattern.equip61850, globalPattern.BTS)) {
      return;
    }
    // 请求后台数据
    $.ajax({
      type: 'post',
      async: true,
      url: 'JhStateAction_action_serchByCondition',
      data: 'json='+JSON.stringify({
        dev_id: batt.FBSDeviceId
      }),
      dataType: 'json',
      success: function(res) {
        var rs = JSON.parse(res.result);
        var vols = [];
        var currs = [];
        var others = [];
        if(rs.code == 1) {
          var data = rs.data[0];
          // 电压
          vols = [
            {
              label: '总输入电压',
              value: data.input_vol_total+'V',
            },
            {
              label: '总输出电压',
              value: data.output_vol_total+'V',
            },
            {
              label: '输出电压1',
              value: data.output_vol_one+'V',
            },
            {
              label: '输出电压2',
              value: data.output_vol_two+'V',
            },
            {
              label: '输出电压3',
              value: data.output_vol_three+'V',
            },
            {
              label: '输出电压4',
              value: data.output_vol_four+'V',
            },
            {
              label: '输出电压5',
              value: data.output_vol_five+'V',
            },
            {
              label: '输出电压6',
              value: data.output_vol_six+'V',
            },
            {
              label: '输出电压7',
              value: data.output_vol_seven+'V',
            },
            {
              label: '输出电压8',
              value: data.output_vol_eight+'V',
            },
            {
              label: '输出电压9',
              value: data.output_vol_nine+'V',
            },
            {
              label: '输出电压10',
              value: data.output_vol_ten+'V',
            },
          ];

          // 电流
          currs = [
            {
              label: '总输入电流',
              value: data.input_curr_total+'A',
            },
            {
              label: '总输出电流',
              value: data.output_curr_total+'A',
            },
          ];


          // 其他
          others = [
            {
              label: '版本号',
              value: data.dev_version,
            },
            {
              label: '温度',
              value: data.dev_temp+'℃',
            }
          ];
        }

        // 生成电压列表
        createCardTable($('#jhVols'), vols);
        // 生成电压列表
        createCardTable($('#jhCurrs'), currs);
        // 生成电压列表
        createCardTable($('#jhOthers'), others);
      }
    });
  }

  // 生成面板中的表格
  function createCardTable(container, data) {
    container.text('');
    if(data.length == 0) {
      var noText = $('<div style="height: 32px; text-align: center;">暂无数据</div>');
      container.append(noText);
      return;
    }
    var table = $('<table class="card-table"></table>');
    var colgroup = $('<colgroup><col width="50%"></col><col width="50%"></col></colgroup>');
    table.append(colgroup);
    var tbody = $('<tbody></tbody>');
    for(var i=0; i<data.length; i++) {
      var tr = $('<tr></tr>');
      var _data = data[i];
      var td1 = $("<td>"+_data.label+"</td>");
      var td2 = $("<td>"+_data.value+"</td>");
      tr.append(td1);
      tr.append(td2);
      tbody.append(tr);
    }
    table.append(tbody);
    container.append(table);
  }3

</script>
<script type="text/javascript" src="js/Title.js"></script>
<script type="text/javascript" src="js/control.js"></script>
<script type="text/javascript" src="js/dischargetest/curing.js"></script>
  <script type="text/javascript" src="js/dischargetest/stopCuring.js"></script>
</body>
</html>

 gx_tieta/WebRoot/framework7/my/common.js

@@ -1121,13 +1121,13 @@
    if(!this.elem.hasClass('my-modal-show')) {

        this.elem.addClass('my-modal-show');

        setTimeout(function() {

            // 设置内容的高度
            // 设置内容的高度

            var container = this.elem.find('.my-modal-container');

            var header = this.elem.find('.my-modal-header');

            var content = this.elem.find('.my-modal-content');

            var footer = this.elem.find('.my-modal-footer');

            

            content.height(container.height()-header.height()-footer.height());
            content.height(container.height()-header.height()-footer.height());

        }.bind(this), 400);

    }

};

@@ -1241,13 +1241,13 @@
        data: obj

    };

    Object.keys(verify).forEach(function(key) {

        // 上一笔数据是否有效
        // 上一笔数据是否有效

        if(result.code && obj[key] != undefined) {

            var valueStatus = checkValueIsGood(obj[key], verify[key]);

            result.code = valueStatus.code;

            result.name = valueStatus.name;

            result.msg = valueStatus.msg;

        }
        }

    });

    

    // 如果code=1设置msg的值


 gx_tieta/WebRoot/js/elecircle.content2.js

@@ -816,9 +816,10 @@
    _prop._init = function() {
        // 清理当前容器的内容
        this.ele.hide();
        this.ele.text("");
        //this.ele.text("");
        this.ele.find('.state-list').remove();
        // 使用js的方式生成特定的元素
        var _ul = $('<ul></ul>');
        var _ul = $('<ul class="state-list"></ul>');
        // 遍历options
        for(var i=0; i<this.options.length; i++) {
            var _opts = this.options[i];
@@ -826,7 +827,7 @@
            this._setLi(_li, _opts);
            _ul.append(_li);
        }
        this.ele.append(_ul);
        this.ele.prepend(_ul);
    };

    // 设置配置项
@@ -1086,7 +1087,7 @@
    var globalPattern = {
        LD9: /^40190/,
        equip61850: /^61850/,
        BTS:/^(9100)|(9600)|(9616)/,
        BTS:/^(9100)|(9600)|(9616)|(9110)/,
        BTSSreen: /^9611/,
        equip4016:/^4016/
    };

 gx_tieta/WebRoot/pages/js/common.js

@@ -411,7 +411,7 @@
    var type = {

        LD9: /^40190/,

        equip61850: /^61850/,

        BTS:/^(9100)|(9600)|(9616)/,

        BTS:/^(9100)|(9600)|(9616)|(9110)/,

        BTSSreen: /^9611/,

        equip4016:/^4016/

    };


 gx_tieta/src/com/fgkj/dao/BaseDAO.java

@@ -211,6 +211,8 @@
    public static final int  BATT_REPLACE=103;

    

    public static final int  DEVTMP_RECORD=104;



    public static final int JHSTATE=105;

    

    public boolean add(Object obj); // 添加




 gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java

@@ -50,6 +50,7 @@
import com.fgkj.dao.impl.Deverror_recordImpl;

import com.fgkj.dao.impl.Devstate_usrImpl;

import com.fgkj.dao.impl.Devtmp_recordImpl;

import com.fgkj.dao.impl.ram.JhStateImpl;

import com.fgkj.dao.impl.Echarts_usrImpl;

import com.fgkj.dao.impl.Fbsdev_Statechange_infImpl;

import com.fgkj.dao.impl.MapImpl;

@@ -87,17 +88,7 @@
import com.fgkj.dao.impl.Ld9.Ld9testdatastopImpl;

import com.fgkj.dao.impl.bts61850.BTS_61850_setparamImpl;

import com.fgkj.dao.impl.bts61850.BTS_61850_stateImpl;

import com.fgkj.dao.impl.ram.Bts_gprs_stateImpl;

import com.fgkj.dao.impl.ram.Bts_station_stateImpl;

import com.fgkj.dao.impl.ram.Fbs9100_battparamImpl;

import com.fgkj.dao.impl.ram.Fbs9100_setparamImpl;

import com.fgkj.dao.impl.ram.Fbs9100_stateImpl;

import com.fgkj.dao.impl.ram.Fbs9100_sysparamImpl;

import com.fgkj.dao.impl.ram.Fbs9100s_dcdc_stateImpl;

import com.fgkj.dao.impl.ram.Fbs9100s_dfu_stateImpl;

import com.fgkj.dao.impl.ram.Fbs9600_stateImpl;

import com.fgkj.dao.impl.ram.Hard_dev_sms_stateImpl;

import com.fgkj.dao.impl.ram.Server_stateImpl;

import com.fgkj.dao.impl.ram.*;

import com.fgkj.dao.impl.rt.Batt_rtdataRtImpl;

import com.fgkj.dao.impl.rt.Rtstate_rtImpl;

import com.fgkj.dto.BadBatt_mon;

@@ -218,6 +209,7 @@
            case 102:return new  Thread_utilImpl();

            case 103:return new  Batt_replaceImpl();

            case 104:return new  Devtmp_recordImpl();

            case 105:return new JhStateImpl();

            default :return null;

        }

    }