Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git ...

chenjingjing

2018-12-27 14f7839ff1c25cca8d9e7dad4d717973797ff2d9

 gx_tieta/WebRoot/batch-set-curr.jsp

@@ -152,6 +152,15 @@
            <table id="pageTbl" lay-filter="pageTbl"></table>

            </div>

        </div>

        <script type="text/html" id="setStatus">

         {{# if(d.setCurr == 1){ }}

            <button class="layui-btn layui-btn-sm layui-btn-warm">设置放电参数成功</button>

         {{# }else if(d.setCurr == 2){ }}

            <button class="layui-btn layui-btn-sm layui-btn-danger">设置放电参数失败</button>

         {{# }else { }}

            <button class="layui-btn layui-btn-sm layui-btn-normal">未设置放电参数</button>

         {{# } }}

      </script>

       <script type="text/javascript" src="js/jquery-1.8.3.js"></script>

       <script type="text/javascript" src="js/echarts.js"></script>

       <script type="text/javascript" src="jqueryui/jquery-ui.min.js"></script>

@@ -415,6 +424,7 @@
                  ,{field:'station_phone', title:'基站手机号码', align:'center', width: 140}

                  ,{field:'BattProducer', title:'电池品牌', align:'center', width: 140}

                  ,{field:'BattModel', title:'电池型号', align:'center', width: 260}

                  ,{field:'doThings', fixed: 'right', title: '设置状态', toolbar: '#setStatus', align: 'center', width: 160}

                ]]

               ,data:[]

               ,limit: 20

@@ -427,9 +437,6 @@
              

              // 更新表格的对象

              var layuiTbl = new LayuiTbl(tOptions, layui, laytpl, table.cache.pageTbl);

        		
              // 查询后台数据

        		
              

              // 点击添加电池组

              $('#batchAdd').click(function() {

@@ -455,25 +462,24 @@
                    ,data: 'json='+JSON.stringify(temp)

                    ,dataType: 'json'

                    ,success: function(res) {

                       console.log(res);

                       // console.log(res);

                       var rs = JSON.parse(res.result);

                       var data = [];

                       if(rs.code == 1) {

                          var data = rs.data;

                          console.log(data);

                          tOptions.data = data;

                          // 生成表格数据

                        table.render(tOptions);

                          data = rs.data;

                       }else {

                          layer.msg('没有可设置的电池组!');

                       }

        					
                       tOptions.data = data;

                         // 生成表格数据

                     table.render(tOptions);

                    }

                    ,complete:function() {

                       layer.close(load);

                    }

                 });

              }

        		
        		
              

              // 点击添加构造查询

            function structAddData() {

@@ -513,6 +519,26 @@
               }

               return rs;

            }

				
            // 点击批量设置放电电流参数

            $('#batchSetCurr').click(function() {

               var checkStatus = table.checkStatus('pageTbl');

               var data = checkStatus.data;

               if(data.length == 0) {

                  layer.msg('请选择要设置的机房');

                  return;

               }

               // console.log(data);

               // 设置放电参数

               getDisCurrParam(data);

            });

				
				
            // 获取放电参数

            function getDisCurrParam(data) {

               console.log(data);

               var data = GetHourRate();

            }

           });

        </script>

    </body>