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

didiyu

2018-11-29 12c384847af42270e2ba167467173a928a59ded2

 gx_tieta/WebRoot/batt-station-update1.jsp

@@ -134,6 +134,11 @@
            <a class="layui-btn layui-btn-xs" lay-event="update">升级</a>

         {{# } }}

      </script>

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

         <div class="layui-progress layui-progress-big" lay-showpercent="true" lay-filter="upload{{d.fbsid}}" style="margin-top:6px">

              <div class="layui-progress-bar" lay-percent="0%"></div>

         </div>

      </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>

@@ -145,6 +150,7 @@
              var table = layui.table;      // 获取表格模块

              var form = layui.form;         // 获取表单模块

              var layer = layui.layer;      // 获取弹出框模块

              var element = layui.element;   // 获取元素操作模块

              

            var isNewLoad = true;

            var pre_province = getQueryString('province');

@@ -377,6 +383,7 @@
                  ,{field:'fbsname', title:'设备名称', align:'center'}

                  ,{field:'updatestatus', title:'升级状态', align:'center'}

                  ,{field:'status', title:'读写状态', align:'center'}

                  ,{field:'progress', title:'上传进度', align: 'center', templet:'#upProgress'}

                  ,{field:'datapackage', title:'当前数据包', align:'center'}

                  ,{fixed: 'right', title:'操作', align:'center', toolbar: '#barDemo', width:100}

                ]]

@@ -506,6 +513,7 @@
                             

                             // 生成表格数据

                           table.render(tOptions);

                           renderTblPorgess(allData);

                          }else {

                             layer.msg('没有要添加的内容！');

                          }

@@ -620,14 +628,13 @@
                          for(var i=0; i<rs.data.length; i++) {

                             var _data = rs.data[i];

                             var num = -1;

                             // 遍历现有的tblData

                             // 遍历现有的tblData/根据表格的设别id对获取到值进行排序以便对应表格内容

                             for(var k=0; k<tblData.length;k++) {

                                var _tblData = tblData[k];

                                if(_tblData.fbsid == _data.dev_id) {

                                   num = k;

                                   break;

                                }

				        				
                             }

                             

                             if(num == -1) {

@@ -652,7 +659,7 @@
                             tmp.datapackage[num] = dfuData;

                          }

                          var pageTbl = $('#pageTbl');

				        		
                          //console.log(tmp);

                          // 更新表格内容

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

                             updateLayuiTblCol(pageTbl, key, tmp[key]);

@@ -876,6 +883,18 @@
                });

            }

            

				
            // 渲染进度条

            function renderTblPorgess(tblData) {

               // 遍历tblData根据fbsid渲染进度条

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

                  var fbsid = tblData[i].fbsid;

						
                  // 渲染进度条

                  element.render('progress', 'upload'+fbsid);

               }

					
            }

           });

        </script>

    </body>