Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev...

admin:huo123456@qq

2019-01-21 a86aed1d459024ab2a97d98115ef57f8dce808e6

 gx_tieta/WebRoot/mobil/voltageMbargraph.html

@@ -59,7 +59,7 @@
             background-image: -o-linear-gradient(#444,#2d2d2d);

             background-image: linear-gradient(#444,#2d2d2d); border:1px solid #111; color: #fff; text-decoration: none;">返回</a>



         <h1>单体电压</h1>

         <h1 id="biaoti">单体电压</h1>

          <div  data-role="collapsible"  data-type="horizontal"  class="ui-btn-right"  style=" background-color: none; color: #333333; text-decoration: none;" >

                <h1 id="alwaysRight">其他</h1>

                <div class="clear"></div>

@@ -82,6 +82,14 @@
               </div>

            </div>

      </header>

      <div>

           <div class="ui-grid-c">

               <div class="ui-block-a">最大<span class="max">&nbsp;</span></div>

               <div class="ui-block-b">最小<span class="min">&nbsp;</span></div>

               <div class="ui-block-c">平均<span class="avg">&nbsp;</span></div>

               <div class="ui-block-d">累加和<span class="leijiasum">&nbsp;</span></div>

           </div>

    </div>		
      <div id="bar"></div>

      

        <div data-role="footer" data-position="fixed" data-theme="a">    

@@ -93,7 +101,7 @@
         </div>      

      </div>       

   </div>            

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

   <script type="text/javascript">

   /* $('#alwaysRight').tap(function(){

@@ -129,6 +137,7 @@
             var model = eval("("+data.result+")");

             //model = eval("("+model.result+")");

           datas = model.data;

           $("#biaoti").text("电压("+batt.BattGroupName+")");//标题添加电池组编号

           

           mon_vol = new Array();            //电压

         mon_tmp = new Array();            //温度

@@ -146,6 +155,7 @@
            mon_ser_percent.push((batt.MonSerStd==0?0:(datas[i].mon_ser*100/batt.MonSerStd)).toFixed(1));

            mon_num.push(""+datas[i].mon_num);            //电池组序号

           }

           createCount(datas); 
           if(myChart.getOption()==undefined){

              createEcharts(myChart, mon_num, mon_vol);

              console.info(myChart.getOption());           

@@ -157,7 +167,23 @@
        });

    }           

         

			
   function createCount(datas){

      var temp=new Array();

      var sum=0;

      console.info(datas); 
      for(var i=0;i<datas.length;i++){

         temp.push((datas[i].mon_vol).toFixed(3));

         sum+=parseFloat(temp[i]);

      }

      var max=Math.max.apply(null, temp);

      var min=Math.min.apply(null, temp);

      var avg=(sum/temp.length).toFixed(3);

       sum=(sum).toFixed(2); 
        $(".max").text(max+'V');

        $(".min").text(min+'V');

        $(".avg").text(avg+'V'); 
        $(".leijiasum").text(sum+'V');    
   } 		
         

   function insertdata (mon_vol){

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