~whychwj/haha.git

parent: 6d580b1c | 补丁 | 提交 | show whitespace

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

81041

2019-01-04 9887c97863d53f48bb39f73c366e86d5fcd0476e

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

5个文件已修改

	gx_tieta/WebRoot/ex-battinfo.jsp	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gx_tieta/WebRoot/mobil/conductanceMbargraph.html	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gx_tieta/WebRoot/mobil/internalresistanceMbargraph.html	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gx_tieta/WebRoot/mobil/temperatureMbargraph.html	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gx_tieta/WebRoot/mobil/voltageMbargraph.html	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 gx_tieta/WebRoot/ex-battinfo.jsp

@@ -582,6 +582,7 @@
                            var rs = JSON.parse(res.result);

                            var resData = [];

                            var isUpdateTbl = false;

                            //console.log(Page.all);

                            if(rs.code == 1) {

                                var data = rs.data;

                                // console.log(data);

@@ -589,8 +590,7 @@
                                for(var i=0; i<data.length; i++) {

                                    var _data = data[i];

                                    var _tmp = formaterResData(_data);

									
                                    if(_data.apply_note != Page.all) {

                                    if(_data.apply_note &&_data.apply_note != Page.all) {

                                        resData.push(_tmp);

                                        Page.setAll(_data.apply_note);

                                        isUpdateTbl = true;

@@ -598,6 +598,7 @@
                                }

                            }else {

                                Page.setAll(0);

                                isUpdateTbl = true;

                            }

                            // console.log(isUpdateTbl);

                            if(isUpdateTbl) {


 gx_tieta/WebRoot/mobil/conductanceMbargraph.html

@@ -82,7 +82,7 @@
            background-image: linear-gradient(#ffefaa,#ffe155);     

               font-weight: bold;     color: #333333; 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>

@@ -159,6 +159,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();                //温度


 gx_tieta/WebRoot/mobil/internalresistanceMbargraph.html

@@ -75,7 +75,7 @@


           <a href="control.html" class="ui-btn ui-corner-all ui-shadow  ui-btn-icon-left" target="_top" style="padding:0.5em 0.5em; /*background-color: #e9e9e9; color: #333333;*/color:#fff;border:1px solid #3a755a;; 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: #ffffff; text-decoration: none;" >

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

@@ -147,6 +147,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();                //温度


 gx_tieta/WebRoot/mobil/temperatureMbargraph.html

@@ -59,7 +59,7 @@
                background-image: -o-linear-gradient(#5f9cc5,#396b9e);

                background-image: linear-gradient(#5f9cc5,#396b9e); border: 1px solid #044062; 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>

@@ -133,6 +133,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();                //温度


 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>

@@ -129,6 +129,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();                //温度

			@@ -582,6 +582,7 @@
			var rs = JSON.parse(res.result);
			var resData = [];
			var isUpdateTbl = false;
			//console.log(Page.all);
			if(rs.code == 1) {
			var data = rs.data;
			// console.log(data);
			@@ -589,8 +590,7 @@
			for(var i=0; i<data.length; i++) {
			var _data = data[i];
			var _tmp = formaterResData(_data);

			if(_data.apply_note != Page.all) {
			if(_data.apply_note &&_data.apply_note != Page.all) {
			resData.push(_tmp);
			Page.setAll(_data.apply_note);
			isUpdateTbl = true;
			@@ -598,6 +598,7 @@
			}
			}else {
			Page.setAll(0);
			isUpdateTbl = true;
			}
			// console.log(isUpdateTbl);
			if(isUpdateTbl) {

			@@ -82,7 +82,7 @@
			background-image: linear-gradient(#ffefaa,#ffe155);
			font-weight: bold; color: #333333; 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>
			@@ -159,6 +159,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(); //温度

			@@ -75,7 +75,7 @@

			<a href="control.html" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left" target="_top" style="padding:0.5em 0.5em; /background-color: #e9e9e9; color: #333333;/color:#fff;border:1px solid #3a755a;; 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: #ffffff; text-decoration: none;" >
			<h1 id="alwaysRight">其他</h1>
			@@ -147,6 +147,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(); //温度

			@@ -59,7 +59,7 @@
			background-image: -o-linear-gradient(#5f9cc5,#396b9e);
			background-image: linear-gradient(#5f9cc5,#396b9e); border: 1px solid #044062; 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>
			@@ -133,6 +133,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(); //温度

			@@ -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>
			@@ -129,6 +129,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(); //温度