81041
2018-11-01 1d720cd0736b198a1a275d6cb7ff169d27ae92af
Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
6个文件已修改
431 ■■■■■ 已修改文件
gx_tieta/.settings/org.jboss.tools.jst.web.xml 68 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/batt-fault-manage.jsp 151 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/eleAnalyse.jsp 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/eleMonomer.jsp 119 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/ele_statistics.jsp 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/iframe/batt-fault-manage-add.html 48 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/.settings/org.jboss.tools.jst.web.xml
@@ -9,73 +9,73 @@
 <file-system NAME="classes" location="%workspace.home%/classes" model-entity="FileSystemFolder"/>
 <file-system NAME="fuguang" location="%eclipse.project%" model-entity="FileSystemFolder"/>
 <file-system NAME="lib-javaee.jar"
  location="D:\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\javaee.jar" model-entity="FileSystemJar"/>
  location="D:\MyEclipse10\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\javaee.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-jsf-impl.jar"
  location="D:\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jsf-impl.jar" model-entity="FileSystemJar"/>
  location="D:\MyEclipse10\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jsf-impl.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-jsf-api.jar"
  location="D:\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jsf-api.jar" model-entity="FileSystemJar"/>
  location="D:\MyEclipse10\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jsf-api.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-jstl-1.2.jar"
  location="D:\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jstl-1.2.jar" model-entity="FileSystemJar"/>
  location="D:\MyEclipse10\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jstl-1.2.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-c3p0-0.9.5.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\lib\c3p0-0.9.5.jar" model-entity="FileSystemJar"/>
  location="E:\GitWorkSpace\gx_tieta\gx_tieta\lib\c3p0-0.9.5.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-c3p0-oracle-thin-extras-0.9.5.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\lib\c3p0-oracle-thin-extras-0.9.5.jar" model-entity="FileSystemJar"/>
  location="E:\GitWorkSpace\gx_tieta\gx_tieta\lib\c3p0-oracle-thin-extras-0.9.5.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-mchange-commons-java-0.2.9.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\lib\mchange-commons-java-0.2.9.jar" model-entity="FileSystemJar"/>
  location="E:\GitWorkSpace\gx_tieta\gx_tieta\lib\mchange-commons-java-0.2.9.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-resources.jar"
  location="D:\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\resources.jar" model-entity="FileSystemJar"/>
  location="D:\MyEclipse10\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\resources.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-dnsns.jar"
  location="D:\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\dnsns.jar" model-entity="FileSystemJar"/>
  location="D:\MyEclipse10\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\dnsns.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-localedata.jar"
  location="D:\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\localedata.jar" model-entity="FileSystemJar"/>
  location="D:\MyEclipse10\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\localedata.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-sunjce_provider.jar"
  location="D:\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\sunjce_provider.jar" model-entity="FileSystemJar"/>
  location="D:\MyEclipse10\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\sunjce_provider.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-commons-beanutils-1.7.0.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-beanutils-1.7.0.jar" model-entity="FileSystemJar"/>
  location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-beanutils-1.7.0.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-commons-codec-1.10.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-codec-1.10.jar" model-entity="FileSystemJar"/>
  location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-codec-1.10.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-commons-collections-3.1.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-collections-3.1.jar" model-entity="FileSystemJar"/>
  location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-collections-3.1.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-commons-dbcp-1.2.1.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-dbcp-1.2.1.jar" model-entity="FileSystemJar"/>
  location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-dbcp-1.2.1.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-commons-fileupload-1.2.2.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-fileupload-1.2.2.jar" model-entity="FileSystemJar"/>
  location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-fileupload-1.2.2.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-commons-io-2.0.1.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-io-2.0.1.jar" model-entity="FileSystemJar"/>
  location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-io-2.0.1.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-commons-lang-2.5.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-lang-2.5.jar" model-entity="FileSystemJar"/>
  location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-lang-2.5.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-commons-pool-1.2.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-pool-1.2.jar" model-entity="FileSystemJar"/>
  location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-pool-1.2.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-dom4j-1.6.1.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\dom4j-1.6.1.jar" model-entity="FileSystemJar"/>
  location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\dom4j-1.6.1.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-ezmorph-1.0.3.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\ezmorph-1.0.3.jar" model-entity="FileSystemJar"/>
  location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\ezmorph-1.0.3.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-freemarker-2.3.16.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\freemarker-2.3.16.jar" model-entity="FileSystemJar"/>
  location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\freemarker-2.3.16.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-gson-2.2.4.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\gson-2.2.4.jar" model-entity="FileSystemJar"/>
  location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\gson-2.2.4.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-javassist-3.11.0.GA.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\javassist-3.11.0.GA.jar" model-entity="FileSystemJar"/>
  location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\javassist-3.11.0.GA.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-json-lib-2.1-jdk15.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\json-lib-2.1-jdk15.jar" model-entity="FileSystemJar"/>
  location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\json-lib-2.1-jdk15.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-mysql-connector-java-5.1.33-bin.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\mysql-connector-java-5.1.33-bin.jar" model-entity="FileSystemJar"/>
  location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\mysql-connector-java-5.1.33-bin.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-ognl-3.0.1.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\ognl-3.0.1.jar" model-entity="FileSystemJar"/>
  location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\ognl-3.0.1.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-poi-3.10.1-20140818.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\poi-3.10.1-20140818.jar" model-entity="FileSystemJar"/>
  location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\poi-3.10.1-20140818.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-sqljdbc.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\sqljdbc.jar" model-entity="FileSystemJar"/>
  location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\sqljdbc.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-struts2-core-2.2.3.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\struts2-core-2.2.3.jar" model-entity="FileSystemJar"/>
  location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\struts2-core-2.2.3.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-struts2-json-plugin-2.2.3.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\struts2-json-plugin-2.2.3.jar" model-entity="FileSystemJar"/>
  location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\struts2-json-plugin-2.2.3.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-struts2-sunspoter-stream-1.0.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\struts2-sunspoter-stream-1.0.jar" model-entity="FileSystemJar"/>
  location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\struts2-sunspoter-stream-1.0.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-xwork-core-2.2.3.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\xwork-core-2.2.3.jar" model-entity="FileSystemJar"/>
  location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\xwork-core-2.2.3.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-jacob.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\jacob.jar" model-entity="FileSystemJar"/>
  location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\jacob.jar" model-entity="FileSystemJar"/>
 <web SERVLET_VERSION="2.4" model-entity="JstWeb" model-path="/web.xml">
  <module URI="/WEB-INF/faces-config.xml" model-entity="WebJSFModule"
   model-path="/faces-config.xml" src="src" web-root="WEB-ROOT"/>
gx_tieta/WebRoot/batt-fault-manage.jsp
@@ -85,7 +85,7 @@
    <div >
        <!-- 分页内容 -->
        <div id="paging">
            <!-- <a href="javascript:" class="search">添加</a>        添加 -->
            <a href="javascript:" id="search" class="layui-btn layui-btn-normal search">查找</a>
            <a class="layui-btn layui-btn-normal addbtn">添加</a>
    <script type="text/html" id="toolBar">
        <a class="layui-btn layui-btn-xs" lay-event="details">添加</a>
@@ -143,18 +143,18 @@
            
            // 生成表格数据
            table.render(tOptions);
             $(document).ready(function(){
                console.info(1111);
                tOptions.data=getData(100,0);
                var tableObj = table.render(tOptions);
                tableObj.reload(tOptions);
            });
            // $(document).ready(function(){
                //console.info(1111);
           //     tOptions.data=getData(100,0);
          //      var tableObj = table.render(tOptions);
          //      tableObj.reload(tOptions);
          //  });
            
            
            function getData(a,b){
            var arr=[];
            for(i=0;i<a;i++){
            arr.push({'station_name1':b,'city':b+i,'stationName3':b+i+1,'note':b+i+2,'question':'hahaha哈哈卡卡卡卡卡卡卡卡'+i});
                arr.push({'station_name1':b,'city':b+i,'stationName3':b+i+1,'note':b+i+2,'question':'hahaha哈哈卡卡卡卡卡卡卡卡'+i});
            }
                   return arr
            }
@@ -164,10 +164,8 @@
            });
            function searchStationHistRecord(){
                // 将param添加到#detailsOpts
                //$('#detailsOpts').data('data', param);
                //$('#detailsOpts').data('data', param);
                // 请求获取当前省下的市
                // 显示面板
                layer.open({
                    type: 2,
@@ -179,42 +177,35 @@
                });
                
            }        
              // 省-市-机房-电池组
    $(document).ready(function() {
        //页面加载时查询维护区中的枢纽类型
        $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup", null,
        function(data) {
            data = data.result;
            data = eval("(" + data + ")");
            //console.info(data);
            if (data.code == 1 && data.data.length > 0) {
                var $select = $("#station_name1");
                $select.text('');
                for (var i = 0; i <= data.data.length; i++) {
                    $option = $("<option></option>");
                    if (i == 0) {
                        $option.html("全部(" + data.data.length + ")");
                        $option.attr("value", "");
                    } else {
                        $option.text(data.data[i - 1]);
                        $option.attr("value", data.data[i - 1]);
                    }
                    $select.append($option);
                }
            } else {
                $("#station_name1").text('').html('<option>暂无管理的维护区</option>');
            }
            findCity();
        });
    });
        // 省-市-机房-电池组
        $(document).ready(function() {
            //页面加载时查询维护区中的枢纽类型
            $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup", null,
            function(data) {
                data = data.result;
                data = eval("(" + data + ")");
                //console.info(data);
                if (data.code == 1 && data.data.length > 0) {
                    var $select = $("#station_name1");
                    $select.text('');
                    for (var i = 0; i <= data.data.length; i++) {
                        $option = $("<option></option>");
                        if (i == 0) {
                            $option.html("全部(" + data.data.length + ")");
                            $option.attr("value", "");
                        } else {
                            $option.text(data.data[i - 1]);
                            $option.attr("value", data.data[i - 1]);
                        }
                        $select.append($option);
                    }
                } else {
                    $("#station_name1").text('').html('<option>暂无管理的维护区</option>');
                }
                findCity();
            });
     });
    function findCity() {
        var data = {
@@ -293,10 +284,72 @@
               
            }
        });
    }
    function tempCondition(){
        temp ={
            StationId:"",
            StationName1:$('#station_name1').val(),
            StationName2:$('#city').val(),
            StationName5:"",
            page:{
                    pageSize:10,
                    pageCurr:1,
                },
        }
        console.info(temp);
        return temp;
    }
        });
    function searchfault()
    {
        var sData = tempCondition();
        var loading = layer.load();
        // 根据查询条件,查询内容
        $.ajax({
            type: 'post',
            async: true,
            url: 'Deverror_recordAction!serchByCondition',
            data: "json="+JSON.stringify(sData),
            dataType: 'json',
            success: function(result) {
                //console.info(result);
                var data = JSON.parse(result.result);
                console.info(data)
                if(data.code==1&&data.data.length>0){
                    console.info(data);
                    var data = data.data;
                    for(i=0;i<data.length;i++){
                        var tmp = {};
                        var data = data[i];
                        tmp.station_name1 = data.stationName1;
                        tmp.city = data.stationName2;
                        tmp.stationName3 = data.stationName;
                        tmp.note = data.record_time;
                        tmp.question = data.error_descript;
                        tOptions.data.push(tmp);
                    }
                    //tOptions.data.length = data.length;
                }else {
                    layer.msg('暂无数据!', {icon:0, shade: 0.1,shadeClose:true});
                }
                console.info(tOptions);
                var pageNum = tOptions.data.length;
                console.info(pageNum);
                tOptions.limit = pageNum;
                // 设置分页信息
                $('#total').text(pageNum);
                table.render(tOptions);
                layer.close(loading);
            }
        });
    }
    $('#search').click(function(){
        searchfault();
    });
});
        
    
        
gx_tieta/WebRoot/eleAnalyse.jsp
@@ -545,6 +545,24 @@
    });
    
    createPictable();
    //点击曲线选择复选框对表格内的复选框全部选中
    $('#tabEchartCon .tbFixed').on('click','table thead input',function(){
        if($(this).is(':checked'))
        {
            console.info($('#tabEchartCon .secCured table tbody input[type="checkbox"]').length);
            $('#tabEchartCon .secCured table tbody input[type="checkbox"]').prop('checked',true);
        }else{
            console.info(false);
            $('#tabEchartCon .secCured table tbody input[type="checkbox"]').prop('checked',false);
        }
    });
    $('#tabEchartCon .left .secCurve').on('click', 'input[type="checkbox"]', function(){
        createPicByTable();
        createMyTable(tbl_data);
    });
    //生成曲线表格选项
    function createPictable(){
        var ArrLineTh=["<s:text name='BatteryID'/>","<input type='checkbox' checked='checked'/><s:text name='Curve_to_choose'/>"];  /* 电池组ID     曲线选择 */
@@ -559,21 +577,8 @@
        }
        createCard($('#tabEchartCon .tbFixed'),ArrLineTh,ArrLineTd);
        createCard($('#tabEchartCon .secCurve'),ArrLineTh,ArrLineTd);
        //点击曲线选择复选框对表格内的复选框全部选中
        $('#tabEchartCon .tbFixed').on('click','table thead input',function(){
            if($(this).is(':checked'))
            {
                console.info($('#tabEchartCon .secCured table tbody input[type="checkbox"]').length);
                $('#tabEchartCon .secCured table tbody input[type="checkbox"]').prop('checked',true);
            }else{
                console.info(false);
                $('#tabEchartCon .secCured table tbody input[type="checkbox"]').prop('checked',false);
            }
        });
        $('#tabEchartCon .left .secCurve input[type="checkbox"]').click(function(){
            createPicByTable();
            createMyTable(tbl_data);
        });
        setTblWidth($('#tabEchartCon .tbFixed'), $('#tabEchartCon .secCurve'));
    }
    
    
gx_tieta/WebRoot/eleMonomer.jsp
@@ -426,56 +426,17 @@
        });
    });
    
    //生成左侧的电池编号表格
    function createMonTab(){
        $('#tabEchartCon .tbFixed').text('');
        $('#tabEchartCon .secCurve').text('');
        if(MonNumlist!=null && MonNumlist!=undefined && MonNumlist.length>0){
            ArrLineTd=new Array();
            for(var i=0,index=0;i<MonNumlist.length;i++){
                if(MonNumlist[i]!=undefined){
                    ArrLineTd[index++]=[MonNumlist[i],"<input type='checkbox' checked='checked' value='"+MonNumlist[i]+"'>"];
                }
            }
            createCard($('#tabEchartCon .tbFixed'),ArrLineTh,ArrLineTd);
            createCard($('#tabEchartCon .secCurve'),ArrLineTh,ArrLineTd);
    //点击曲线表格的头部的复选框tbody内的复选框全被选中或取消
    $('#tabEchartCon').on('click', ' .tbFixed thead input[type="checkbox"]', function(){
        if($(this).is(':checked'))
        {
            $('#tabEchartCon .secCurve tbody input[type="checkbox"]').prop('checked',true);
        }else{
            createCard($('#tabEchartCon .tbFixed'),ArrLineTh,[]);
            createCard($('#tabEchartCon .secCurve'),ArrLineTh,[]);
            $('#tabEchartCon .secCurve tbody input[type="checkbox"]').prop('checked',false);
        }
        //点击曲线表格的头部的复选框tbody内的复选框全被选中或取消
        $('#tabEchartCon .tbFixed thead input[type="checkbox"]').click(function(){
            if($(this).is(':checked'))
            {
                $('#tabEchartCon .secCurve tbody input[type="checkbox"]').prop('checked',true);
            }else{
                $('#tabEchartCon .secCurve tbody input[type="checkbox"]').prop('checked',false);
            }
        });
        //console.info(MonVollist);
        if(Radiostatus==0){
            getListByCheckbox(MonVollist);
        }else if(Radiostatus==1){
            getListByCheckbox(RealCaplist);
        }else if(Radiostatus==2){
            getListByCheckbox(Voltagelist);
        }else if(Radiostatus==3){
            getListByCheckbox(Conductlist);
        }else if(Radiostatus==4){
            getListByCheckbox(Conductpercentlist);
        }else if(Radiostatus==5){
            getListByCheckbox(Resistancelist);
        }else if(Radiostatus==6){
            getListByCheckbox(Templist);
        }else if(Radiostatus==7){
            getListByCheckbox(ConnOhmlist);
        }
        $('#tabEchartCon input[type="checkbox"]').click(function(){
    });
    $('#tabEchartCon').on('click', 'input[type="checkbox"]', function(){
            if(Radiostatus==0){
                 //充放电测试
                 getListByCheckbox(MonVollist);
@@ -495,7 +456,46 @@
                getListByCheckbox(ConnOhmlist);
            }            
            
        });
        });
    //生成左侧的电池编号表格
    function createMonTab(){
        $('#tabEchartCon .tbFixed').text('');
        $('#tabEchartCon .secCurve').text('');
        if(MonNumlist!=null && MonNumlist!=undefined && MonNumlist.length>0){
            ArrLineTd=new Array();
            for(var i=0,index=0;i<MonNumlist.length;i++){
                if(MonNumlist[i]!=undefined){
                    ArrLineTd[index++]=[MonNumlist[i],"<input type='checkbox' checked='checked' value='"+MonNumlist[i]+"'>"];
                }
            }
            createCard($('#tabEchartCon .tbFixed'),ArrLineTh,ArrLineTd);
            createCard($('#tabEchartCon .secCurve'),ArrLineTh,ArrLineTd);
        }else{
            createCard($('#tabEchartCon .tbFixed'),ArrLineTh,[]);
            createCard($('#tabEchartCon .secCurve'),ArrLineTh,[]);
        }
        setTblWidth($('#tabEchartCon .tbFixed'), $('#tabEchartCon .secCurve'));
        if(Radiostatus==0){
            getListByCheckbox(MonVollist);
        }else if(Radiostatus==1){
            getListByCheckbox(RealCaplist);
        }else if(Radiostatus==2){
            getListByCheckbox(Voltagelist);
        }else if(Radiostatus==3){
            getListByCheckbox(Conductlist);
        }else if(Radiostatus==4){
            getListByCheckbox(Conductpercentlist);
        }else if(Radiostatus==5){
            getListByCheckbox(Resistancelist);
        }else if(Radiostatus==6){
            getListByCheckbox(Templist);
        }else if(Radiostatus==7){
            getListByCheckbox(ConnOhmlist);
        }
    }
    
    var OconEchart = document.getElementById('conEchart');
@@ -843,7 +843,7 @@
                $("#battgroup_name").text('').html('<option>暂无可测蓄电池组</option>');
            }
            
            layer.close(filterLoad);
            searchBattMonNum();
        });
    }
    
@@ -862,11 +862,13 @@
            $option.attr("value", 0);
            OSingle_number.text('');
            OSingle_number.append($option);
            layer.close(filterLoad);
        }else{
            //console.info(battgroup_id);
            console.info(battgroup_id);
            $.post("BattInfAction!serchByMonNum","bif.BattGroupId="+battgroup_id,function(data){
                data=data.result;
                data=eval("("+data+")");
                console.log(data);
                if(data.code==1 && data.data.length>0){
                    data=data.data[0];
                    OSingle_number.text('');
@@ -886,9 +888,8 @@
                        OSingle_number.append($option);
                    }
                }
                if(mon_num != undefined){
                    searchMonomer();
                }
                layer.close(filterLoad);
                searchMonomer();
            });
        }
    }
@@ -936,7 +937,8 @@
        
        //创建等待的框框
        loading.showLoading($('#main'));
        var battgroupid=$('#battgroup_name').attr('value');
        var monNum = $('#Single_number').val()?$('#Single_number').val():0;
        console.log($("#search_form").serialize());
        var temp ={
            binf:{
                StationName1:$('#station_name1').val(),
@@ -944,7 +946,7 @@
                StationName5: $('#county').val(),
                StationName:$('#station_name').val(),
                BattGroupId:$('#battgroup_name').val(),
                MonNum:$('#Single_number').val(),
                MonNum: monNum,
            },
            tdata:{
                test_type:$('#test_type').val()
@@ -1179,11 +1181,6 @@
        //console.info(ArrTd);
        eleform.submit();
    }
    //当选择电池组时也查询
    $('#battgroup_name').change(function(){
        searchMonomer();
    });
    
    //拖动滑块改变容器的大小
    $(document).ready(function(){
gx_tieta/WebRoot/ele_statistics.jsp
@@ -254,13 +254,17 @@
    var battinfo_list = new Array();
    var formjson;
    $(document).ready(function(){
        $(window).resize(function() {
            setTblWidth($('#tbHead'), $('#maintence_infor'));
        });
        $("#container a").eq(0).click(function(){
            var jsontemp = $("#search_form").serialize();
            if(jsontemp != formjson){
                $('#pageCurr').val(1);
                formjson = jsontemp;
            }
            var load = layer.load();
            var load = layer.load(1);
            //console.info($("#search_form").serialize());
            var temp = createSearchForm();
            var json = JSON.stringify(temp);
@@ -330,11 +334,13 @@
                    $('#tbHead').text('');
                    $('#maintence_infor').text('');
                    //alert(newArrTd);
                    //alert(ArrayTh);
                    //alert(ArrayTh);
                    //createFullTbl($('#tbHead'));
                    createTable('tbHead','tbFixed',ArrayTh.length,ArrayTh,newArrTd);
                    createTable('maintence_infor','eleTab',ArrayTh.length,ArrayTh,newArrTd);
                    setTblSize($('#tbHead'), $('#maintenced_infor'));
                    
                    setTblWidth($('#tbHead'), $('#maintence_infor'));
                    //鼠标点击表格触发事件
                    $('#maintence_infor .eleTab tbody tr').mousedown(function(e){
                        $('#maintence_infor .eleTab tbody tr').css('background-color','');
gx_tieta/WebRoot/iframe/batt-fault-manage-add.html
@@ -61,7 +61,7 @@
                                        <div class="layui-form-item layui-form-text">
                                            <label class="layui-form-label" style="text-align:center;">问题描述</label>
                                            <div class="layui-input-block">
                                                <textarea placeholder="请输入内容" class="layui-textarea"></textarea>
                                                <textarea placeholder="请输入内容" id="faultcontex" class="layui-textarea"></textarea>
                                            </div>
                                        </div>
                                        
@@ -70,7 +70,7 @@
                                        <div class="layui-form-item">
                                            
                                            <div class="layui-input-block tr" >
                                                <a class="layui-btn" lay-submit="" lay-filter="sub">立即提交</a>
                                                <a class="layui-btn" id="falutsubmit" lay-submit="" lay-filter="sub">立即提交</a>
                                                <a type="reset" class="layui-btn layui-btn-primary">重置</a>
                                            </div>
                                        </div>
@@ -127,8 +127,8 @@
    
     form.on('submit(sub)',function(data){
     $('#addtime').val(getNowFormatDate());
     console.warn(3333);
    console.info(data);
     //console.warn(3333);
    //console.info(data);
    return false;
});
    
@@ -248,7 +248,45 @@
            }
        });
    }
    function creatAddFaultAdd(){
        var date = new Date().format('yyyy-MM-dd');
        var id = 42000570;
        var temp = {
            stationId:id,
            record_time:date,
            error_descript:$('#faultcontex').val(),
        }
        console.info(temp);
        return temp;
    }
    function searchFaultAdd(){
        var temp = creatAddFaultAdd();
        var loading = layer.load();
        // 根据查询条件,查询内容
        $.ajax({
            type: 'post',
            async: true,
            url: 'Deverror_recordAction!add',
            data: "json="+JSON.stringify(temp),
            dataType: 'json',
            success: function(result) {
                layer.close(loading);
                console.info(result);
                var data = JSON.parse(result);
                if(data.code==1){
                    layer.msg('添加成功!', {icon:0, shade: 0.1,shadeClose:true});
                }else{
                    layer.msg('添加失败!', {icon:0, shade: 0.1,shadeClose:true});
                }
            }
        });
    }
    $('#falutsubmit').click(function(){
        searchFaultAdd();
    });
}); 
     </script>
</body>