环境监测数据查询调整

MineEM.iml

+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="lib" level="project" />
+  </component>
+</module>
\ No newline at end of file

WebRoot/WEB-INF/applicationContext.xml

@@ -20,7 +20,7 @@
 		<property name="dataSource">
 			<bean class="org.springframework.jdbc.datasource.DriverManagerDataSource">
 				<property name="driverClassName" value="org.postgresql.Driver"></property>
-		 		<property name="url" value="jdbc:postgresql://192.168.3.220:5432/MineSIX"></property>
+		 		<property name="url" value="jdbc:postgresql://192.168.100.220:5432/MineSIX_test1"></property>
 		 		<property name="username" value="postgres"></property>
 		 		<property name="password" value="red___"></property>
 			</bean>

WebRoot/WEB-INF/applicationContext.xml.bak

@@ -20,7 +20,7 @@
 		<property name="dataSource">
 			<bean class="org.springframework.jdbc.datasource.DriverManagerDataSource">
 				<property name="driverClassName" value="org.postgresql.Driver"></property>
-		 		<property name="url" value="jdbc:postgresql://localhost:5432/MineSIX"></property>
+		 		<property name="url" value="jdbc:postgresql://localhost:5432/MineSIX_test1"></property>
 		 		<property name="username" value="postgres"></property>
 		 		<property name="password" value="red___"></property>
 			</bean>

WebRoot/WEB-INF/classes/com/gemho/dao/pro.properties

 portto=5433
 ip=127.0.0.1
-url=jdbc:postgresql://192.168.3.220:5432/MineSIX
+url=jdbc:postgresql://192.168.100.220:5432/MineSIX_test1
 password=red___

WebRoot/WEB-INF/classes/hibernate.cfg.xml

@@ -11,7 +11,7 @@
 			org.hibernate.dialect.PostgreSQLDialect
 		</property>
 		<property name="connection.url">
-			jdbc:postgresql://192.168.3.220:5432/MineSIX
+			jdbc:postgresql://192.168.100.220:5432/MineSIX_test1
 		</property>
 		<property name="connection.username">postgres</property>
 		<property name="connection.password">red___</property>

WebRoot/general/admin/allcount.jsp

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

WebRoot/general/admin/attendance.jsp

@@ -156,7 +156,7 @@
 								//		+ timeSe, null, function(obj) {
 								$
 										.getJSON(
-												'http://192.168.3.220:8080/MineJSON/vzigbee.action?type=8&param='
+												'http://192.168.1.3: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.3.220:8080/MineEM/tubiao/co2jiance.jsp"
+window.location.href="http://192.168.1.3:8081/MineEM/tubiao/co2jiance.jsp"
 </script>

WebRoot/general/admin/cojiance.jsp

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

WebRoot/general/admin/fengsu.jsp

 <script type="text/javascript" charset="utf-8">
-window.location.href="http://192.168.3.220:8080/MineEM/tubiao/fengsu.jsp"
+window.location.href="http://192.168.1.3: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.3.220:8080/MineEM/tubiao/fengya.jsp"
+window.location.href="http://192.168.1.3: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.3.220:8080/MineEM/tubiao/no2jiance.jsp"
+window.location.href="http://192.168.1.3:8081/MineEM/tubiao/no2jiance.jsp"
 </script>

WebRoot/general/admin/o2jiance.jsp

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

WebRoot/tubiao/disscreen.jsp

+<%@ page language="java"  pageEncoding="gb2312"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+    <title>大屏显示</title>
+    <style type="text/css">
+    </style>
+    <link rel="stylesheet" type="text/css" href="../themes/themes/default/easyui.css">
+    <link rel="stylesheet" type="text/css" href="../themes/icon.css">
+    <script type="text/javascript" src="../js/jquery-1.7.1.js"></script>
+    <script type="text/javascript" src="../js/jquery-ui-1.8.20.custom.min.js"></script>
+    <script type="text/javascript" src="../js/highcharts.js"></script>
+    <script type="text/javascript" src="../js/jquery.easyui.min.js"></script>
+    <script>
+        /**
+         * 表格数据初始化
+         */
+        function initpolygon1(polygon,title,value1,name) {
+            $('#'+polygon).highcharts({
+                    chart: {
+                        type: 'gauge',
+                        plotBorderWidth: 1,
+                        plotBackgroundColor: {
+                            linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+                            stops: [
+                                [0, '#FFF4C6'],
+                                [0.3, '#FFFFFF'],
+                                [1, '#FFF4C6']
+                            ]
+                        },
+                        plotBackgroundImage: null,
+                        height: 450
+                    },
+
+                    title: {
+                        text: name+'号传感器实时温度图'
+                    },
+
+                    pane: [{
+                        startAngle: -45,
+                        endAngle: 45,
+                        background: null,
+                        center: ['50%', '70%'],
+                        size: 300
+                    }],
+
+                    yAxis: [{
+                        min: 0,
+                        max: 85,
+                        minorTickPosition: 'outside',
+                        tickPosition: 'outside',
+                        labels: {
+                            rotation: 'auto',
+                            distance: 20
+                        },
+                        plotBands: [{
+                            innerRadius: '100%',
+                            outerRadius: '105%'
+                        }],
+                        pane: 0,
+                        title: {
+                            text: '<span style="font-size:8px">温度 '+value1.toFixed(2)+'</span><br/>℃',
+                            y: -40
+                        }
+                    }],
+                    tooltip: {
+                        enabled: true,
+                        formatter: function () {
+                            return '温度：' +value1.toFixed(2)+'℃'
+                        }
+                    },
+                    plotOptions: {
+                        gauge: {
+                            dataLabels: {
+                                enabled: false
+                            },
+                            dial: {
+                                radius: '100%'
+                            }
+                        }
+                    },
+                    series: [{
+                        data: [value1]
+
+                    }]
+                },
+
+                function(chart) {
+                    setInterval(function() {
+                        var left = chart.series[0].points[0],
+                            leftVal,
+                            inc = (Math.random() - 0.5) * 3;
+
+                        leftVal =  left.y + inc;
+
+                        if (leftVal < -20 || leftVal > 20) {
+                            leftVal = left.y - inc;
+                        }
+                        chart.redraw();
+
+                    }, 700);
+
+                });
+        }
+
+        // 页面加载初始化
+        $(function() {
+            $.ajax({
+                url: "http://192.168.1.3:8080/MineTT/online!EnvironmentRealTimeData.do?token=laowangzhuanyong",
+                type: "get",
+                dataType:"jsonp",//请求的数据类型
+                success: function(data) {
+                    console.log(data)
+                }
+            })
+            for (var i = 0 ; i < 10 ; i++) {
+                $("#wd").append("<div style='width: 400px; height: 200px; float: left;margin-top: 20px; margin-left: 20px; border:1px solid #5896f3'></div>")
+            }
+        })
+
+    </script>
+</head>
+
+<body>
+
+    <div id="tt" class="easyui-tabs" style="width:auto;height:auto;">
+        <div id="wd" title="温度" style="padding:20px;">
+
+        </div>
+        <div title="湿度" data-options="closable:true" style="overflow:auto;padding:20px;display:none;">
+            湿度
+        </div>
+        <div title="风速" data-options="iconCls:'icon-reload',closable:true" style="padding:20px;display:none;">
+            风速
+        </div>
+        <div title="压力" data-options="iconCls:'icon-reload',closable:true" style="padding:20px;display:none;">
+            压力
+        </div>
+        <div title="一氧化碳" data-options="iconCls:'icon-reload',closable:true" style="padding:20px;display:none;">
+            一氧化碳
+        </div>
+        <div title="二氧化碳" data-options="iconCls:'icon-reload',closable:true" style="padding:20px;display:none;">
+            二氧化碳
+        </div>
+        <div title="氧气" data-options="iconCls:'icon-reload',closable:true" style="padding:20px;display:none;">
+            氧气
+        </div>
+    </div>
+
+</body>
+</html>
+

WebRoot/tubiao/fengsu.jsp

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

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.5:8080/MineEM/tubiao/fengya.jsp";});
+										Dialog.alert("解除成功",function(){window.location.href="http://192.168.1.3:8081/MineEM/tubiao/fengya.jsp";});
 										//$("#msgbox").hide();
 
 									} else {

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.5:8080/MineEM/tubiao/fengya.jsp";});
+										Dialog.alert("解除成功",function(){window.location.href="http://192.168.1.3: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.5:8080/MineEM/tubiao/fengya.jsp";});
+										Dialog.alert("解除成功",function(){window.location.href="http://192.168.1.3:8081/MineEM/tubiao/fengya.jsp";});
 										//$("#msgbox").hide();
 
 									} else {