环境监测实时数据图表修改调整

WebRoot/general/admin/allcount.jsp

 <script type="text/javascript" charset="utf-8">
-window.location.href="http://192.168.1.3:8081/MineJSON/allcount.jsp"
+window.location.href="http://192.168.1.11:8081/MineJSON/allcount.jsp"
 
 
 //    window.location.href="http://192.168.1.8:8082/MineJSON/allcount.jsp"

WebRoot/general/admin/attendance.jsp

@@ -156,7 +156,7 @@
 								//		+ timeSe, null, function(obj) {
 								$
 										.getJSON(
-												'http://192.168.1.3:8081/MineJSON/vzigbee.action?type=8&param='
+												'http://192.168.1.11:8081/MineJSON/vzigbee.action?type=8&param='
 														+ rowData.personcode
 														+ '-'
 														+ (Date.parse(new Date(

WebRoot/general/admin/co2jiance.jsp

 <script type="text/javascript" charset="utf-8">
-window.location.href="http://192.168.1.3:8081/MineEM/tubiao/co2jiance.jsp"
+window.location.href="http://192.168.1.11:8081/MineEM/tubiao/co2jiance.jsp"
 </script>

WebRoot/general/admin/cojiance.jsp

 <script type="text/javascript" charset="utf-8">
-window.location.href="http://192.168.1.3:8081/MineEM/tubiao/cojiance.jsp"
+window.location.href="http://192.168.1.11:8081/MineEM/tubiao/cojiance.jsp"
 </script>

WebRoot/general/admin/fengsu.jsp

 <script type="text/javascript" charset="utf-8">
-window.location.href="http://192.168.1.3:8081/MineEM/tubiao/fengsu.jsp"
+window.location.href="http://192.168.1.11:8081/MineEM/tubiao/fengsu.jsp"
 //window.location.href="http://localhost:8080/MineTRS/tubiao/fengsu.jsp"
 </script>

WebRoot/general/admin/fengya.jsp

 <script type="text/javascript" charset="utf-8">
-window.location.href="http://192.168.1.3:8081/MineEM/tubiao/fengya.jsp"
+window.location.href="http://192.168.1.11:8081/MineEM/tubiao/fengya.jsp"
 //window.location.href="http://localhost:8080/MineTRS/tubiao/fengya.jsp"
 </script>

WebRoot/general/admin/no2jiance.jsp

 <script type="text/javascript" charset="utf-8">
-window.location.href="http://192.168.1.3:8081/MineEM/tubiao/no2jiance.jsp"
+window.location.href="http://192.168.1.11:8081/MineEM/tubiao/no2jiance.jsp"
 </script>

WebRoot/general/admin/o2jiance.jsp

 <script type="text/javascript" charset="utf-8">
-window.location.href="http://192.168.1.3:8081/MineEM/tubiao/o2jiance.jsp"
+window.location.href="http://192.168.1.11:8081/MineEM/tubiao/o2jiance.jsp"
 </script>

WebRoot/tubiao/co2jiance.jsp

@@ -275,7 +275,7 @@
                             });
                             arrss.push({x: 0, y: value1});
                             arrss.push({x: 23, y: value1});
-                            var ifbj = parseFloat(value.ifbj.toString());
+                            var ifbj = parseFloat(value.ifbj);
                             var ifguzhang = parseFloat(value.ifguzhang.toString());
                             var color = '#204120';
                             if (ifbj == "1") color = "#EA0000";

WebRoot/tubiao/cojiance.jsp

@@ -41,7 +41,7 @@
 
         setInterval('myrefresh()', 600000);
 
-        function initpolygon1(polygon, cgqName, color, sensorname) {
+        function initpolygon1(polygon, cgqName, color, sensorname, devicename) {
             var chart ;
             Highcharts.setOptions({
                 colors: ['#0A75A3', '#FF0000', '#00FF00']
@@ -112,7 +112,7 @@
                 tooltip: {
                     formatter: function () {
                         return '' +
-                            this.series.name + ': ' + this.y.toFixed(3) + '毫克/立方米';
+                            devicename + ': ' + this.y.toFixed(3) + '毫克/立方米';
                     }
                 },
                 credits: {
@@ -276,7 +276,7 @@
                             });
                             arrss.push({x: 0, y: value1});
                             arrss.push({x: 23, y: value1});
-                            var ifbj = parseFloat(value.ifbj.toString());
+                            var ifbj = parseFloat(value.ifbj);
                             var ifguzhang = parseFloat(value.ifguzhang.toString());
                             var color = '#204120';
                             if (ifbj == "1") color = "#EA0000";
@@ -285,7 +285,7 @@
                                     color = "#cccccc";
                                 }
                             };
-                            initpolygon1("polygon" + (j + 1), value.name , color, value.name);
+                            initpolygon1("polygon" + (j + 1), value.name , color, value.name, value.poumian);
                             shuju(value.name);
                             dayAndMonth(value.name);
                             chartlst[j].addSeries({name: "co", type: 'spline', data: arrs});

WebRoot/tubiao/disscreen.jsp

@@ -107,7 +107,7 @@
         // 页面加载初始化
         $(function() {
             $.ajax({
-                url: "http://192.168.1.3:8080/MineTT/online!EnvironmentRealTimeData.do?token=laowangzhuanyong",
+                url: "http://192.168.1.11:8080/MineTT/online!EnvironmentRealTimeData.do?token=laowangzhuanyong",
                 type: "get",
                 dataType:"jsonp",//请求的数据类型
                 success: function(data) {

WebRoot/tubiao/fengsu.jsp

@@ -417,7 +417,7 @@
                 } ,
                 success : function(date) { //etoak - 服务器返回的响应数据
                     if (date.flag) {
-                        // Dialog.alert("解除成功",function(){window.location.href="http://192.168.1.3:8081/MineEM/tubiao/fengsu.jsp";});
+                        // Dialog.alert("解除成功",function(){window.location.href="http://192.168.1.11:8081/MineEM/tubiao/fengsu.jsp";});
                         //$("#msgbox").hide();
                         // window.location.href="http://192.168.1.8:8081/MineEM/tubiao/fengsu.jsp"
                         $('#polygon1').datagrid('reload');    // 重新加载数据

WebRoot/tubiao/fengya.jsp

@@ -410,7 +410,7 @@
 								success : function(date) { //etoak - 服务器返回的响应数据
 
 									if (date.flag) {
-										Dialog.alert("解除成功",function(){window.location.href="http://192.168.1.3:8081/MineEM/tubiao/fengya.jsp";});
+										Dialog.alert("解除成功",function(){window.location.href="http://192.168.1.11:8081/MineEM/tubiao/fengya.jsp";});
 										//$("#msgbox").hide();
 
 									} else {

WebRoot/tubiao/o2jiance.jsp

@@ -275,7 +275,7 @@
                             });
                             arrss.push({x: 0, y: value1});
                             arrss.push({x: 23, y: value1});
-                            var ifbj = parseFloat(value.ifbj.toString());
+                            var ifbj = parseFloat(value.ifbj);
                             var ifguzhang = parseFloat(value.ifguzhang.toString());
                             var color = '#204120';
                             if (ifbj == "1") color = "#EA0000";

WebRoot/tubiao/shidu.jsp

@@ -410,7 +410,7 @@
 								success : function(date) { //etoak - 服务器返回的响应数据
 
 									if (date.flag) {
-										Dialog.alert("解除成功",function(){window.location.href="http://192.168.1.3:8081/MineEM/tubiao/fengya.jsp";});
+										Dialog.alert("解除成功",function(){window.location.href="http://192.168.1.11:8081/MineEM/tubiao/fengya.jsp";});
 										//$("#msgbox").hide();
 
 									} else {

WebRoot/tubiao/wendu.jsp

@@ -408,7 +408,7 @@
 								success : function(date) { //etoak - 服务器返回的响应数据
 
 									if (date.flag) {
-										Dialog.alert("解除成功",function(){window.location.href="http://192.168.1.3:8081/MineEM/tubiao/fengya.jsp";});
+										Dialog.alert("解除成功",function(){window.location.href="http://192.168.1.11:8081/MineEM/tubiao/fengya.jsp";});
 										//$("#msgbox").hide();
 
 									} else {