寿阳数据接入

.classpath

@@ -4,13 +4,13 @@
 	<classpathentry kind="src" path="configuration-src"/>
 	<classpathentry kind="src" path="core.src"/>
 	<classpathentry kind="src" path="test.src"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v8.0">
+	<classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry exported="true" kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0">
 		<attributes>
 			<attribute name="owner.project.facets" value="#system#;jst.web"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_60">
+	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_45">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>

.project

@@ -46,7 +46,7 @@
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
 		<nature>com.genuitec.eclipse.j2eedt.core.webnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+		
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 	</natures>

.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <runtime name="Apache Tomcat v8.0"/>
+  <runtime name="Apache Tomcat v6.0"/>
   <fixed facet="wst.jsdt.web"/>
   <installed facet="jst.web" version="2.5"/>
   <installed facet="wst.jsdt.web" version="1.0"/>

WebRoot/WEB-INF/classes/.gitignore

@@ -1,4 +1,2 @@
-/applicationContext.xml
-/bean-config/
 /com/
 /javaxb/

WebRoot/WEB-INF/classes/dbconfig.properties

@@ -27,8 +27,8 @@ jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
 #jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
 #jdbc.url=jdbc:oracle:thin:@localhost:1521:gdsj
 #jdbc.url=jdbc:oracle:thin:@192.168.1.105:1521:gdnxfd
-#jdbc.url=jdbc:oracle:thin:@192.168.2.215:1521:gdsj
-jdbc.url=jdbc:oracle:thin:@10.83.68.165:1521:gdsj
+jdbc.url=jdbc:oracle:thin:@192.168.2.215:1521:gdsj
+#jdbc.url=jdbc:oracle:thin:@10.83.68.165:1521:gdsj
 jdbc.username=gdprod
 jdbc.password=gd123
 
@@ -53,8 +53,8 @@ redis.pool.maxIdle=1500
 redis.pool.minIdle=500
 redis.pool.maxWaitMillis=500
 redis.pool.maxWait=500
-
-redis.host = 10.83.68.94
+#redis.host = 10.83.68.94
+redis.host = 192.168.2.202
 redis.port = 6379
 redis.port2 = 6380
 redis.timeout=30000

WebRoot/WEB-INF/classes/webconfig.properties

@@ -16,8 +16,7 @@ qt=AI056,AI057,AI069,AI070
 gfxs=1,0.306|2,0.303|3,0.289|4,0.297|5,0.3|6,0.359|7,0.304|8,0.301|9,0.309|10,0.308|11,0.280|12,0.292
 url=http\://localhost\:8080/report/
 
-#ip=192.168.2.212
-ip=10.83.68.212
+ip=192.168.2.212
 eDosProxyApi=C\:\\\\eDosProxyApi
 port=10010
 time=60
@@ -34,50 +33,11 @@ defaultwp=CL_FDC
 defaultpj=CL01_GC
 defaultln=CL01_XL
 #end temperature ai settings
-mongodb_ip =10.83.68.94
+mongodb_ip =192.168.2.202
+#mongodb_ip =10.83.68.94
 mongodb_port =27017
 mongodb_perHost =200
 mongodb_threadsAllowed =200
 mongodb_connectTimeout =60000
 mongodb_maxWaitTime =60000
 mongodb_socketTimeout =60000
-
-
-AQ_TARGET_SCORE = 80.0
-
-RLXS_CL = 1.3
-RLXS_KB = 1.7
-RLXS_DX = 1.0
-RLXS_JK = 1.0
-
-JZJJ_CL_YX = 8
-JZJJ_CL_JX = 10
-JZJJ_CL_GL = 12
-	
-JZJJ_KB_YX = 8
-JZJJ_KB_JX = 10
-JZJJ_KB_GL = 12
-	
-JZJJ_DX_YX = 10
-JZJJ_DX_JX = 10
-JZJJ_DX_GL = 10	
-
-JZJJ_SC = 12
-JZJJ_AQ = 12
-JZJJ_JK = 8
-
-RYRS_CL_YX = 3
-RYRS_KB_YX = 3
-RYRS_DX_YX = 3
-
-RYRS_CL_JX = 3
-RYRS_KB_JX = 3
-RYRS_DX_JX = 3
-
-RYRS_CL_GL = 2
-RYRS_KB_GL = 2
-RYRS_DX_GL = 2
-
-RYRS_SC = 3
-RYRS_AQ = 3
-RYRS_JK = 3

WebRoot/pages/agc/agc.js

@@ -353,6 +353,113 @@ options3= {
 				}*/
 						]
 	   };
+options7= {
+		colors: [
+					         '#00B259', //绿
+					         '#B20000', //红
+					         '#006DD9', //蓝
+					         '#000000', //黑
+					         '#FFBFFF',//藕荷色
+					         '#FF8000'//橘黄
+					      ],
+					chart: {
+					    renderTo: 'container4',
+					    type: 'spline',
+					    zoomType: 'x',
+				        events: {
+				        	
+				        }
+				         },
+				       title: {
+	            			 text: '冠山风电场AGC功率曲线'
+	        			 },
+				         
+				         subtitle: {
+				             text: ''
+				         },
+				         xAxis: {
+				        	 labels: {
+				          			align: 'center',
+				                	formatter: function() {
+				                       return  Highcharts.dateFormat('%H %M', this.value);
+				                	}
+				                },
+				            //tickInterval: 10,
+				            type: 'datetime'
+				         },
+				         yAxis: [{
+				             title: {
+				                 text: '功率数值(MW)'
+				             }
+				         }
+				        /* ,{
+				         	title:{
+				                text :'风速（m/s）'
+				            },
+				            labels:{  
+					             formatter: function(){  
+					                 return this.value;  
+					             }  
+					         },
+				            lineWidth : 1,
+				            opposite:true
+				          }*/],
+				         legend: {
+				             	layout: 'vertical',
+					            align: 'right',
+					            verticalAlign: 'top',
+					            x:-60,
+					            floating: true
+				         },
+				         tooltip: {
+				          	 crosshairs:{//控制十字线  
+				              	width:2  
+				          	 },
+				          	 shared:true,
+				          	 xDateFormat:'%Y-%m-%d %H:%M'
+				         },
+				         credits: {
+				    		enabled: false
+						},
+				         plotOptions: {
+				         	spline: {
+				                  		dataLabels : {  
+				                            enabled :false  
+				                        },  
+				                       borderWidth: 0
+				                  },
+				             series: {
+				                 cursor: 'pointer',
+				                 marker: {
+				                     radius: 0, 
+				                     symbol: 'circle' //曲线点类型："circle", "square", "diamond", "triangle","triangle-down"，默认是"circle"
+				                 }
+				             }
+				         },
+				         series: [{
+					         	type: 'spline',
+					             name: '实际功率(单位：MW)',
+					             yAxis:0
+					         }, 
+					         {
+					         	type: 'spline',
+					          	 name: 'AGC限电指令值(单位：MW)',
+					          	 yAxis:0
+					         },{
+						         	type: 'spline',
+						          	name: '理论功率(单位：MW)',
+						          	yAxis:0
+							}/*,{
+					         	type: 'spline',
+					          	name: '超短期预测功率(单位：MW)',
+					          	yAxis:0
+						},{
+			         	type: 'spline',
+			          	name: '短期预测功率(单位：MW)',
+			          	yAxis:0
+				}*/
+						]
+	   };
 
 options4= {
 		colors: [
@@ -606,6 +713,89 @@ options6= {
 					          	 yAxis:0
 					         }]
 	   };
+options8= {
+		colors: [
+					         '#00B259', //绿
+					         '#B20000', //红
+					         '#006DD9', //蓝
+					         '#000000', //黑
+					         '#FFBFFF',//藕荷色
+					         '#FF8000'//橘黄
+					      ],
+					chart: {
+					    renderTo: 'container4',
+					    type: 'spline',
+					    zoomType: 'x',
+				        events: {
+				        	
+				        }
+				         },
+				       title: {
+	            			 text: '冠山AVC电压曲线'
+	        			 },
+				         
+				         subtitle: {
+				             text: ''
+				         },
+				         xAxis: {
+				        	 labels: {
+				          			align: 'center',
+				                	formatter: function() {
+				                       return  Highcharts.dateFormat('%H %M', this.value);
+				                	}
+				                },
+				            //tickInterval: 10,
+				            type: 'datetime'
+				         },
+				         yAxis: [{
+				             title: {
+				                 text: '电压(KV)'
+				             }
+				         }
+				       ],
+				         legend: {
+				             	layout: 'vertical',
+					            align: 'right',
+					            verticalAlign: 'top',
+					            x:-60,
+					            floating: true
+				         },
+				         tooltip: {
+				          	 crosshairs:{//控制十字线  
+				              	width:2  
+				          	 },
+				          	 shared:true,
+				          	 xDateFormat:'%Y-%m-%d %H:%M'
+				         },
+				         credits: {
+				    		enabled: false
+						},
+				         plotOptions: {
+				         	spline: {
+				                  		dataLabels : {  
+				                            enabled :false  
+				                        },  
+				                       borderWidth: 0
+				                  },
+				             series: {
+				                 cursor: 'pointer',
+				                 marker: {
+				                     radius: 0, 
+				                     symbol: 'circle' //曲线点类型："circle", "square", "diamond", "triangle","triangle-down"，默认是"circle"
+				                 }
+				             }
+				         },
+				         series: [{
+					         	type: 'spline',
+					             name: 'AVC母线电压实际值(单位：KV)',
+					             yAxis:0
+					         }, 
+					         {
+					         	type: 'spline',
+					          	 name: 'AVC母线电压调控值(单位：KV)',
+					          	 yAxis:0
+					         }]
+	   };
 
 function agcLine(wpid,type){
 		var url = "/agc/getAgcLine.action";
@@ -714,6 +904,16 @@ function agcLine(wpid,type){
 						chart3 = new Highcharts.Chart(options3);
 						
 					}
+					else if(k=="SY_FDC"){
+						options7.series[0].data = sjgl;
+						options7.series[1].data = xdgl;
+//						options8.series[2].data = ycgl;
+						options7.series[2].data = llgl;
+						/*options8.series[4].data = dqcr;*/
+						options7.xAxis.categories = xtime;
+						chart7 = new Highcharts.Chart(options7);
+						
+					}
 				});
 					/*chart1 = new Highcharts.Chart(options1);
 					chart2 = new Highcharts.Chart(options2);

WebRoot/pages/agc/agc_indexnew.jsp

@@ -510,6 +510,11 @@ function agcinfo() {
 						options6.series[1].data = dytkz;
 						options6.xAxis.categories = xtime;
 						chart6 = new Highcharts.Chart(options6);
+					}else if (k == "SY_FDC") {
+						options8.series[0].data = dysjz;
+						options8.series[1].data = dytkz;
+						options8.xAxis.categories = xtime;
+						chart8 = new Highcharts.Chart(options8);
 					}
 				});
 
@@ -714,6 +719,60 @@ function agcinfo() {
 <div class="page_agc_right"> <div style="width: 98%;height: 88%;"  id="container3"></div></div>
 </div>
 <!--结束-->
+<!--风场-->
+<div class="page_agc_box">
+<div  class="page_agc_title"  onmouseover="this.style.cursor='pointer'"  onclick="showDiv('SY_FDC')"><li>冠山风电场</li><div class="page_agc_zt"><img src="/resource/images/agc/agc_zt1.png" width="60" height="27" alt=""/></div><div class="page_agc_title11">理论功率</div><div class="page_agc_num1" id="SY_FDC_LLGL" align="center">0</div><div class="page_agc_dw1">MW</div></div>
+<div class="page_agc_box1">
+<div class="page_agc_name1" onmouseover="this.style.cursor='pointer'" onclick="agcLine('SY_FDC','s');">AGC</div>
+<div class="page_agc_title1">实际功率</div>
+<div class="page_agc_num" id="SY_FDC_AGC001">0.0</div>
+<div class="page_agc_dw">MW</div>
+<div class="page_agc_title1">AGC限电指令值</div>
+<div class="page_agc_num" id="SY_FDC_AGC002">0.0</div>
+<div class="page_agc_dw">MW</div>
+<div class="page_agc_title1">AGC有功上限</div>
+<div class="page_agc_num" id="SY_FDC_AGC015">0.0</div>
+<div class="page_agc_dw">MW</div>
+<div class="page_agc_title1">AGC有功下限</div>
+<div class="page_agc_num" id="SY_FDC_AGC014">0.0</div>
+<div class="page_agc_dw">MW</div>
+<div class="page_agc_title1">AGC远方</div>
+<div class="page_agc_zt1" id="SY_FDC_AGC031"></div>
+<div class="page_agc_title1">AGC投退</div>
+<div class="page_agc_zt1" id="SY_FDC_AGC004"></div>
+<!-- <div class="page_agc_title1">AGC限电标志</div>
+<div class="page_agc_zt1" id="SY_FDC_AGC024"></div> -->
+<div class="page_agc_title1">AGC减闭锁</div>
+<div class="page_agc_zt1" id="SY_FDC_AGC026"></div>
+<div class="page_agc_title2">AGC增闭锁</div>
+<div class="page_agc_zt2" id="SY_FDC_AGC025"></div>
+</div>
+<div class="page_agc_box2">
+<div class="page_agc_name2" onmouseover="this.style.cursor='pointer'" onclick="getavcLine('SY_FDC')">AVC</div>
+<div class="page_agc_title3">AVC母线电压实际值</div>
+<div class="page_agc_num" id="SY_FDC_AGC011">0.0</div>
+<div class="page_agc_dw">KV</div>
+<div class="page_agc_title3">AVC母线电压调控值</div>
+<div class="page_agc_num" id="SY_FDC_AGC008">0.0</div>
+<div class="page_agc_dw">KV</div>
+<div class="page_agc_title3">AVC110KV母线系统可减无功</div>
+<div class="page_agc_num" id="SY_FDC_AGC007">0.0</div>
+<div class="page_agc_dw">Mvar</div>
+<div class="page_agc_title3">AVC110KV母线系统可增无功</div>
+<div class="page_agc_num" id="SY_FDC_AGC006">0.0</div>
+<div class="page_agc_dw">Mvar</div>
+<div class="page_agc_title3">AVC子站投退状态</div>
+<div class="page_agc_zt1" id="SY_FDC_AGC005"></div>
+<div class="page_agc_title3">AVC子站运行状态</div>
+<div class="page_agc_zt1" id="SY_FDC_AGC023"></div>
+<div class="page_agc_title3">AVC110KV母线减无功闭锁</div>
+<div class="page_agc_zt1" id="SY_FDC_AGC022"></div>
+<div class="page_agc_title3">AVC110KV母线增无功闭锁</div>
+<div class="page_agc_zt1" id="SY_FDC_AGC021"></div>
+</div>
+<div class="page_agc_right"> <div style="width: 98%;height: 88%;"  id="container4"></div></div>
+</div>
+<!--结束-->
 <!--弹出开始-->
 <div class="highslide-html-content" id="glshow" style="height: 1800px">
 				<div class="highslide-header">

WebRoot/pages/monitor/css/page_ztjs_hb_new.css

@@ -45,7 +45,7 @@ li{
 .page_box1, .page_box3{
 	width:1898px;
 	margin-left:1px;}
-.page_box1{height:185px;background:url(/resource/images/hbsj/page_ztjs_hb_box1_bg.png) no-repeat left top;
+.page_box1{height:216px;background:url(/resource/images/hbsj/page_ztjs_box1_bg.png) no-repeat left top;
 	margin-top:4px;}
 .page_box1_title{
 	width:133px; font-family:"Microsoft YaHei";
@@ -87,12 +87,12 @@ li{
 	height:31px;
 }
 .page_box1_col{
-	width:126px;height:185px;float:left; text-align:center;}
+	width:126px;height:216px;float:left; text-align:center;}
 .page_box1_col_on{
-	background: url(/resource/images/hbsj/page_ztjs_hb_box1_bg_a.png) no-repeat left top;
+	/* background: url(/resource/images/hbsj/page_ztjs_hb_box1_bg_a.png) no-repeat left top; */
 	width: 127px;
 	margin-top:-4px;
-	height:189px;float:left; text-align:center;
+	height:216px;float:left; text-align:center;
 }
 .page_box1_col h1{
 	color:#fff;

WebRoot/pages/monitor/hbsj/line_cl.jsp

@@ -506,6 +506,7 @@ function cl02gc(){
    <li onclick="lineInfo('CL_FDC')"  class="now">红花梁风电场</li>
    <li onclick="lineInfo('KB_FDC')">照阳河风电场</li>
    <li onclick="lineInfo('DX_FDC')">雁门关风电场</li>
+   <li onclick="lineInfo('SY_FDC')">冠山风电场</li>
 </ul>
 </div>
 </div>

WebRoot/pages/monitor/hbsj/line_cl1.jsp

@@ -383,6 +383,7 @@ function cl02gc(){
    <li onclick="lineInfo('CL_FDC')"  class="now">红花梁风电场</li>
    <li onclick="lineInfo('KB_FDC')">照阳河风电场</li>
    <li onclick="lineInfo('DX_FDC')">雁门关风电场</li>
+   <li onclick="lineInfo('SY_FDC')">冠山风电场</li>
 </ul>
 </div>
 </div>

WebRoot/pages/monitor/hbsj/line_cl2.jsp

@@ -386,6 +386,7 @@ function cl02gc(){
    <li onclick="lineInfo('CL_FDC')"  class="now">红花梁风电场</li>
    <li onclick="lineInfo('KB_FDC')">照阳河风电场</li>
    <li onclick="lineInfo('DX_FDC')">雁门关风电场</li>
+   <li onclick="lineInfo('SY_FDC')">冠山风电场</li>
 </ul>
 </div>
 </div>

WebRoot/pages/monitor/hbsj/line_dx.jsp

@@ -277,6 +277,7 @@ function gowt(wtId)
    <li onclick="lineInfo('CL_FDC')">红花梁风电场</li>
    <li onclick="lineInfo('KB_FDC')">照阳河风电场</li>
    <li onclick="lineInfo('DX_FDC')"   class="now">雁门关风电场</li>
+   <li onclick="lineInfo('SY_FDC')">冠山风电场</li>
 </ul>
 </div>
 </div>

WebRoot/pages/monitor/hbsj/line_kb.jsp

@@ -1147,6 +1147,7 @@ function gowt(wtId)
           <li onclick="lineInfo('CL_FDC')">红花梁风电场</li>
           <li onclick="lineInfo('KB_FDC')"  class="now">照阳河风电场</li>
           <li onclick="lineInfo('DX_FDC')">雁门关风电场</li>
+          <li onclick="lineInfo('SY_FDC')">冠山风电场</li>
         </ul>
       </div>
     </div>

WebRoot/pages/monitor/hbsj/line_kb1.jsp

@@ -419,6 +419,7 @@ function kb04gc(){
           <li onclick="lineInfo('CL_FDC')">红花梁风电场</li>
           <li onclick="lineInfo('KB_FDC')"  class="now">照阳河风电场</li>
           <li onclick="lineInfo('DX_FDC')">雁门关风电场</li>
+          <li onclick="lineInfo('SY_FDC')">冠山风电场</li>
         </ul>
       </div>
     </div>

WebRoot/pages/monitor/hbsj/line_kb2.jsp

@@ -402,6 +402,7 @@ function kb04gc(){
           <li onclick="lineInfo('CL_FDC')">红花梁风电场</li>
           <li onclick="lineInfo('KB_FDC')"  class="now">照阳河风电场</li>
           <li onclick="lineInfo('DX_FDC')">雁门关风电场</li>
+          <li onclick="lineInfo('SY_FDC')">冠山风电场</li>
         </ul>
       </div>
     </div>

WebRoot/pages/monitor/hbsj/line_kb3.jsp

@@ -424,6 +424,7 @@ function kb04gc(){
           <li onclick="lineInfo('CL_FDC')">红花梁风电场</li>
           <li onclick="lineInfo('KB_FDC')"  class="now">照阳河风电场</li>
           <li onclick="lineInfo('DX_FDC')">雁门关风电场</li>
+          <li onclick="lineInfo('SY_FDC')">冠山风电场</li>
         </ul>
       </div>
     </div>

WebRoot/pages/monitor/hbsj/line_kb4.jsp

@@ -886,6 +886,7 @@ function kb04gc(){
           <li onclick="lineInfo('CL_FDC')">红花梁风电场</li>
           <li onclick="lineInfo('KB_FDC')"  class="now">照阳河风电场</li>
           <li onclick="lineInfo('DX_FDC')">雁门关风电场</li>
+          <li onclick="lineInfo('SY_FDC')">冠山风电场</li>
         </ul>
       </div>
     </div>

WebRoot/pages/monitor/hbsj/page_cft.jsp

@@ -170,6 +170,10 @@ for(i=0;i<menu.length;i++)
 	{
 		setTab(1,2);
 	}
+	else if(wpId=="SY_FDC")
+	{
+		setTab(1,3);
+	}
 		/********日风资源*********/
 				options1 = {
 				 chart: {
@@ -398,6 +402,7 @@ function fjpb()
    <li onclick="selectcft('CL_FDC',0)">红花梁风电场</li>
    <li onclick="selectcft('KB_FDC',1)">照阳河风电场</li>
    <li onclick="selectcft('DX_FDC',2)">雁门关风电场</li>
+   <li onclick="selectcft('SY_FDC',3)">冠山风电场</li>
     </ul>
 </div>
 </div>
@@ -406,7 +411,7 @@ function fjpb()
 <div class="index_top_left">综合指标</div>
 <div class="page_top_right">
 <div class="index_top_center">
-<div class="page_top_center_top" id="wpName">红花梁风电场</div>
+<div class="page_top_center_top" id="wpName">冠山风电场</div>
 <div class="page_top_center_top_a">安全天数</div>
 <div class="page_top_center_center" id="aqts"></div>
 <div class="page_top_center_bottom">天</div>

WebRoot/pages/monitor/hbsj/page_power.jsp

@@ -100,6 +100,10 @@ $(document).ready(function() {
 	{
 		setTab(1,2);
 	}
+	else if(wpId=="SY_FDC")
+	{
+		setTab(1,3);
+	}
 	wpAllInfoAjax();
 	apdata();
 	window.setInterval(wpAllInfoAjax, 60000);
@@ -208,7 +212,7 @@ function reloadHighchart(){
    <li onclick="selectpw('CL_FDC',0)">红花梁风电场</li>
    <li onclick="selectpw('KB_FDC',1)">照阳河风电场</li>
    <li onclick="selectpw('DX_FDC',2)">雁门关风电场</li>
-
+<li onclick="selectpw('SY_FDC',3)">冠山风电场</li>
 
 </ul>
 </div>

WebRoot/pages/monitor/hbsj/page_wt.jsp

@@ -193,6 +193,10 @@ function wtinitalinfo(wpId) {
 	{
 		setTab(1,2);
 	}
+	else if(wpId=="SY_FDC")
+	{
+		setTab(1,3);
+	}
 	
 	wpAllInfoAjax();
 	
@@ -522,6 +526,7 @@ function fjjz()
    <li onclick="wtnumberinfo('CL_FDC',0)">红花梁风电场</li>
    <li onclick="wtnumberinfo('KB_FDC',1)">照阳河风电场</li>
    <li onclick="wtnumberinfo('DX_FDC',2)">雁门关风电场</li>
+   <li onclick="wtnumberinfo('SY_FDC',3)">冠山风电场</li>
   </ul>
 </div>
 </div>

WebRoot/pages/monitor/hbsj/sys_dx.jsp

@@ -1066,6 +1066,7 @@ function fjpb()
     <li onclick="onTabLink('0','CL_FDC')">红花梁风电场</li>
 		   <li onclick="onTabLink('1','KB_FDC')">照阳河风电场</li>
 		   <li onclick="onTabLink('2','DX_FDC')"  class="now">雁门关风电场</li>
+		   <li onclick="onTabLink('3','SY_FDC')">冠山风电场</li>
 </ul>
 </div>
 </div>
@@ -1148,7 +1149,7 @@ function fjpb()
 	
 	<a href="#"  class="left_menu_out" id="button4" onmouseover="button1.className='left_menu_out';button2.className='left_menu_out';button3.className='left_menu_out';button5.className='left_menu_out';button6.className='left_menu_out';this.className='left_menu_over'" onmouseout="this.className='left_menu_over'" onclick="tower()"><li>测风塔</li></a>
 	
-	<a href="#"  class="left_menu_out" id="button5" onmouseover="button1.className='left_menu_out';button2.className='left_menu_out';button3.className='left_menu_out';button4.className='left_menu_out';button6.className='left_menu_out';this.className='left_menu_over'" onmouseout="this.className='left_menu_over'" onclick="wtinfo()"><li>风机信息</li></a>
+	<!-- <a href="#"  class="left_menu_out" id="button5" onmouseover="button1.className='left_menu_out';button2.className='left_menu_out';button3.className='left_menu_out';button4.className='left_menu_out';button6.className='left_menu_out';this.className='left_menu_over'" onmouseout="this.className='left_menu_over'" onclick="wtinfo()"><li>风机信息</li></a> -->
 	
 	<a href="#"  class="left_menu_out" id="button6" onmouseover="button1.className='left_menu_out';button2.className='left_menu_out';button3.className='left_menu_out';button4.className='left_menu_out';button5.className='left_menu_out';this.className='left_menu_over'" onmouseout="this.className='left_menu_over'" onclick="power()"><li>功率曲线</li></a>
 </div>

WebRoot/pages/monitor/hbsj/sys_kb.jsp

@@ -2873,6 +2873,7 @@ $("#KB35KV3MDW20").html(res["KB35KV3MDW20"] + "");
           <li onclick="onTabLink('0','CL_FDC')">红花梁风电场</li>
           <li onclick="onTabLink('1','KB_FDC')"  class="now">照阳河风电场</li>
           <li onclick="onTabLink('2','DX_FDC')">雁门关风电场</li>
+          <li onclick="onTabLink('3','SY_FDC')">冠山风电场</li>
         </ul>
       </div>
     </div>
@@ -3069,8 +3070,8 @@ $("#KB35KV3MDW20").html(res["KB35KV3MDW20"] + "");
         <li>升压站</li>
         </a> <a href="#"  class="left_menu_out" id="button4" onmouseover="button5.className='left_menu_out';button6.className='left_menu_out';button1.className='left_menu_out';button2.className='left_menu_out';button3.className='left_menu_out';this.className='left_menu_over'" onmouseout="this.className='left_menu_over'" onclick="tower()">
         <li>测风塔</li>
-        </a> <a href="#"  class="left_menu_out" id="button5" onmouseover="button1.className='left_menu_out';button6.className='left_menu_out';button4.className='left_menu_out';button2.className='left_menu_out';button3.className='left_menu_out';this.className='left_menu_over'" onmouseout="this.className='left_menu_over'" onclick="wtinfo()">
-        <li>风机信息</li>
+       <!--  </a> <a href="#"  class="left_menu_out" id="button5" onmouseover="button1.className='left_menu_out';button6.className='left_menu_out';button4.className='left_menu_out';button2.className='left_menu_out';button3.className='left_menu_out';this.className='left_menu_over'" onmouseout="this.className='left_menu_over'" onclick="wtinfo()">
+        <li>风机信息</li> -->
         </a> <a href="#"  class="left_menu_out" id="button6" onmouseover="button5.className='left_menu_out';button1.className='left_menu_out';button4.className='left_menu_out';button2.className='left_menu_out';button3.className='left_menu_out';this.className='left_menu_over'" onmouseout="this.className='left_menu_over'" onclick="power()">
         <li>功率曲线</li>
         </a> </div>

WebRoot/pages/monitor/monitormain.js

@@ -6,6 +6,7 @@ var chart5;
 var chart6;
 var chart7;
 var chart8;
+var chart9;
 
 var categor = ['0','1', '2', '3','4', '5', '6', '7', '8',
                '9', '10', '11', '12', '13','14', '15', 
@@ -19,6 +20,7 @@ var options5;
 var options6;
 var options7;
 var options8;
+var options9;
 Highcharts.setOptions({
 	global : {
 		useUTC : false
@@ -841,6 +843,74 @@ options8 = {
             }
         }]
 	};
+/*******************************************************************/
+options9 = {
+		
+        chart: {
+            renderTo: 'speedSY',
+            type: 'solidgauge'
+        },
+        title: null,
+        pane: {
+            center: ['50%', '85%'],
+            size: '170%',
+            startAngle: -90,
+            endAngle: 90,
+            background: {
+                backgroundColor: (Highcharts.theme && Highcharts.theme.background2) || '#EEE',
+                innerRadius: '60%',
+                outerRadius: '100%',
+                shape: 'arc'
+            }
+        },
+        tooltip: {
+            enabled: false
+        },
+        // the value axis
+        yAxis: {
+            stops: [
+                [0.1, '#55BF3B'], // green
+                [0.5, '#DDDF0D'], // yellow
+                [0.9, '#DF5353'] // red
+            ],
+            lineWidth: 0,
+            minorTickInterval: null,
+            tickPixelInterval: 400,
+            tickWidth: 0,
+            min: 0,
+            max: 25,
+            title: {
+                y: 7,
+                text: ''
+            },
+            labels: {
+                y: 16
+            }
+        },
+        plotOptions: {
+            solidgauge: {
+                dataLabels: {
+                    y: 22,
+                    borderWidth: 0,
+                    useHTML: true
+                }
+            }
+        },
+         credits: {
+            enabled: false
+        },series: [{
+            name: '风速',
+            data: [6.66],
+            dataLabels: {
+                format: '<div style="text-align:center"><span style="font-size:15px;color:' +
+                ((Highcharts.theme && Highcharts.theme.contrastTextColor) || 'black') + '">{y}</span><br/>' +
+                '<span style="font-size:12px;color:silver">m/s</span></div>'
+            },
+            tooltip: {
+                valueSuffix: 'm/s'
+            }
+        }]
+	};
 
 /***************************************************************/
 realPowerCharBy24();
@@ -963,6 +1033,9 @@ function wpAllInfoAjaxs() {
 			$("#DX_FDC_WHTS").html(getValueToInt(res["DX_FDC_WHTS"] ));
 			$("#DX_FDC_LXTS").html(getValueToInt(res["DX_FDC_LXTS"] ));
 			
+			
+			
+			
 
 			$("#KB_FDC_RFDL").html(getValueInfo(res["KB_FDC_RFDL"] ));
 			$("#KB_FDC_LLFDL").html(getValueInfo(res["KB_FDC_LLFDL"] ));
@@ -1014,6 +1087,38 @@ function wpAllInfoAjaxs() {
 			$("#QYGS_YFGL").html(getValueInfo(res["QYGS_YFGL"] ));
 			$("#QYGS_XNSS").html(getValueInfo(res["QYGS_XNSS"] ));
 			
+			
+			$("#SY_FDC_RFDL").html(getValueInfo(res["SY_FDC_RFDL"] ));
+			$("#SY_FDC_LLFDL").html(getValueInfo(res["SY_FDC_LLFDL"] ));
+			$("#SY_FDC_RSWDL").html(getValueInfo(res["SY_FDC_RSWDL"] ));
+			$("#SY_FDC_SCADAFDL").html(getValueInfo(res["SY_FDC_SCADAFDL"] ));
+			//$("#SY_FDC_YLYXS").html(getValueInfo(res["SY_FDC_YLYXS"] ));
+			if(parseFloat(res["SY_FDC_FNLYL"])<80){
+				$("#SY_FDC_YLYXS").attr("style","color:red");
+			}
+			$("#SY_FDC_YLYXS").html(getValueInfo(res["SY_FDC_FNLYL"] ));
+			
+			$("#SY_FDC_WHSS").html(getValueInfo(res["SY_FDC_WHSS"] ));
+			$("#SY_FDC_FS").html(getValueInfo(res["SY_FDC_FS"] ));
+			$("#SY_FDC_GZSS").html(getValueInfo(res["SY_FDC_GZSS"] ));
+			$("#SY_FDC_GL").html(getValueInfo(res["SY_FDC_GL"] ));
+			$("#SY_FDC_XDSS").html(getValueInfo(res["SY_FDC_XDSS"] ));
+			$("#SY_FDC_LLGL").html(getValueInfo(res["SY_FDC_LLGL"] ));
+			$("#SY_FDC_SLSS").html(getValueInfo(res["SY_FDC_SLSS"] ));
+			$("#SY_FDC_YFGL").html(getValueInfo(res["SY_FDC_YFGL"] ));
+			$("#SY_FDC_XNSS").html(getValueInfo(res["SY_FDC_XNSS"] ));
+			
+			$("#SY_FDC_FDL").html(getValueInfo(res["SY_FDC_RFDL"] ));
+			
+			$("#SY_FDC_GL1").html(getValueInfo(res["SY_FDC_GL"] ));
+			$("#SY_FDC_JRTS").html(getValueToInt(res["SY_FDC_JRTS"] ));
+			$("#SY_FDC_YXTS").html(getValueToInt(res["SY_FDC_YXTS"] ));
+			$("#SY_FDC_GZTS").html(getValueToInt(res["SY_FDC_GZTS"] ));
+			$("#SY_FDC_XDTS").html(getValueToInt(res["SY_FDC_XDTS"] ));
+			$("#SY_FDC_DJTS").html(getValueToInt(res["SY_FDC_DJTS"] ));
+			$("#SY_FDC_WHTS").html(getValueToInt(res["SY_FDC_WHTS"] ));
+			$("#SY_FDC_LXTS").html(getValueToInt(res["SY_FDC_LXTS"] ));
+			
 
 			//$("#CL_FDC_FS1").html();
 			//$("#DX_FDC_FS1").html();
@@ -1022,18 +1127,21 @@ function wpAllInfoAjaxs() {
 			var clfs = [];
 			var kbfs = [];
 			var dxfs = [];
+			var syfs = [];
 			
 			clfs.push( parseFloat(res["CL_FDC_FS"] ));
 			kbfs.push(parseFloat(res["KB_FDC_FS"] ));
 			dxfs.push(parseFloat(res["DX_FDC_FS"] ));
+			syfs.push(parseFloat(res["SY_FDC_FS"] ));
 			
 			options6.series[0].data = clfs;
             options7.series[0].data = kbfs;
 			options8.series[0].data = dxfs;
+			options9.series[0].data = syfs;
 			chart6 = new Highcharts.Chart(options6);
 			chart7 = new Highcharts.Chart(options7);
 			chart8 = new Highcharts.Chart(options8);
-			
+			chart9 = new Highcharts.Chart(options9);
 			/********************************************************************************************************/
 		}
 	});

WebRoot/pages/monitor/monitormain.jsp

@@ -26,21 +26,28 @@
     <style type="text/css">
 <!--
   #dltj_Chart_1 {
-	position: absolute;
+	/* position: absolute;
 	left: 1254px;
 	top: 196px;
 	width: 277px;
 	height: 215px;
-	z-index: 1;
+	z-index: 1; */
+	position: absolute;
+	left: 1578px;
+	top: 225px;
+	width: 277px;
+	height: 215px;
+	z-index: 2;
+	
 }
-    #dltj_Chart_2 {
+    /* #dltj_Chart_2 {
 	position: absolute;
 	left: 1533px;
 	top: 196px;
 	width: 277px;
 	height: 215px;
 	z-index: 2;
-}
+} */
 -->
     </style>
 </head>
@@ -55,6 +62,7 @@
 <h5 style="cursor: pointer;" onclick="goaction('CL_FDC')">红花梁风电场</h5>
 <h5 style="cursor: pointer;" onclick="goaction('KB_FDC')">照阳河风电场</h5>
 <h5 style="cursor: pointer;" onclick="goaction('DX_FDC')">雁门关风电场</h5>
+<h5 style="cursor: pointer;" onclick="goaction('SY_FDC')">冠     山风电场</h5>
 </div>
 
 <div onmouseover="this.className='page_box1_col_on'"  onmouseout= "this.className='page_box1_col'"  class="page_box1_col">
@@ -64,6 +72,7 @@
 <h3 id="CL_FDC_FS" onclick="showZB('崇礼风速','HB_GD_CLF_JS_XX_XX_XXX_CI0124','m/s');"></h3>
 <h3 id="KB_FDC_FS" onclick="showZB('康保风速','HB_GD_KBF_JS_XX_XX_XXX_CI0124','m/s');"></h3>
 <h3 id="DX_FDC_FS" onclick="showZB('代县风速','HB_GD_DXF_JS_XX_XX_XXX_CI0124','m/s');"></h3>
+<h3 id="SY_FDC_FS" onclick="showZB('寿阳风速','HB_GD_SYF_JS_XX_XX_XXX_CI0124','m/s');"></h3>
 </div>
 
 <div onmouseover="this.className='page_box1_col_on'"  onmouseout= "this.className='page_box1_col'"  class="page_box1_col">
@@ -73,6 +82,7 @@
 <h3 id="CL_FDC_GL" onclick="showZB('崇礼实际功率','HB_GD_CLF_JS_XX_XX_XXX_CI0125','MW');"></h3>
 <h3 id="KB_FDC_GL" onclick="showZB('康保实际功率','HB_GD_KBF_JS_XX_XX_XXX_CI0125','MW');"></h3>
 <h3 id="DX_FDC_GL" onclick="showZB('代县实际功率','HB_GD_DXF_JS_XX_XX_XXX_CI0125','MW');"></h3>
+<h3 id="SY_FDC_GL" onclick="showZB('寿阳实际功率','HB_GD_SYF_JS_XX_XX_XXX_CI0124','m/s');"></h3>
 </div>
 
 <div onmouseover="this.className='page_box1_col_on'"  onmouseout= "this.className='page_box1_col'"  class="page_box1_col">
@@ -82,6 +92,7 @@
 <h3 id="CL_FDC_RFDL" onclick="showZB('崇礼日发电量','HB_GD_CLF_JS_XX_XX_XXX_CI0078','万kWh');"></h3>
 <h3 id="KB_FDC_RFDL" onclick="showZB('康保日发电量','HB_GD_KBF_JS_XX_XX_XXX_CI0078','万kWh');"></h3>
 <h3 id="DX_FDC_RFDL" onclick="showZB('代县日发电量','HB_GD_DXF_JS_XX_XX_XXX_CI0078','万kWh');"></h3>
+<h3 id="SY_FDC_RFDL" onclick="showZB('寿阳日发电量','HB_GD_SYF_JS_XX_XX_XXX_CI0078','万kWh');"></h3>
 </div>
 
 <div onmouseover="this.className='page_box1_col_on'"  onmouseout= "this.className='page_box1_col'"  class="page_box1_col">
@@ -91,6 +102,7 @@
 <h3 id="CL_FDC_RSWDL" onclick="showZB('崇礼上网电量','HB_GD_CLF_JS_XX_XX_XXX_CI0126','万kWh');"></h3>
 <h3 id="KB_FDC_RSWDL" onclick="showZB('康保上网电量','HB_GD_KBF_JS_XX_XX_XXX_CI0126','万kWh');"></h3>
 <h3 id="DX_FDC_RSWDL" onclick="showZB('代县上网电量','HB_GD_DXF_JS_XX_XX_XXX_CI0126','万kWh');"></h3>
+<h3 id="SY_FDC_RSWDL" onclick="showZB('寿阳上网电量','HB_GD_SYF_JS_XX_XX_XXX_CI0126','万kWh');"></h3>
 </div>
 
 <div onmouseover="this.className='page_box1_col_on'"  onmouseout= "this.className='page_box1_col'"  class="page_box1_col">
@@ -100,6 +112,7 @@
 <h3 id="CL_FDC_LLGL" onclick="showZB('崇礼保证功率','HB_GD_CLF_JS_XX_XX_XXX_CI0179','MW');"></h3>
 <h3 id="KB_FDC_LLGL" onclick="showZB('康保保证功率','HB_GD_KBF_JS_XX_XX_XXX_CI0179','MW');"></h3>
 <h3 id="DX_FDC_LLGL" onclick="showZB('代县保证功率','HB_GD_DXF_JS_XX_XX_XXX_CI0179','MW');"></h3>
+<h3 id="SY_FDC_LLGL" onclick="showZB('寿阳保证功率','HB_GD_SYF_JS_XX_XX_XXX_CI0179','MW');"></h3>
 </div>
 
 <div onmouseover="this.className='page_box1_col_on'"  onmouseout= "this.className='page_box1_col'"  class="page_box1_col">
@@ -109,6 +122,7 @@
 <h3 id="CL_FDC_YFGL" onclick="showZB('崇礼理论功率','HB_GD_CLF_JS_XX_XX_XXX_CI0180','MW');"></h3>
 <h3 id="KB_FDC_YFGL" onclick="showZB('康保理论功率','HB_GD_KBF_JS_XX_XX_XXX_CI0180','MW');"></h3>
 <h3 id="DX_FDC_YFGL" onclick="showZB('代县理论功率','HB_GD_DXF_JS_XX_XX_XXX_CI0180','MW');"></h3>
+<h3 id="SY_FDC_YFGL" onclick="showZB('寿阳理论功率','HB_GD_SYF_JS_XX_XX_XXX_CI0180','MW');"></h3>
 </div>
 
 <div onmouseover="this.className='page_box1_col_on'"  onmouseout= "this.className='page_box1_col'"  class="page_box1_col">
@@ -118,6 +132,7 @@
 <h3 id="CL_FDC_LLFDL"></h3>
 <h3 id="KB_FDC_LLFDL"></h3>
 <h3 id="DX_FDC_LLFDL"></h3>
+<h3 id="SY_FDC_LLFDL"></h3>
 </div>
 
 <div onmouseover="this.className='page_box1_col_on'"  onmouseout= "this.className='page_box1_col'"  class="page_box1_col">
@@ -127,6 +142,7 @@
 <h3 id="CL_FDC_SCADAFDL" onclick="showZB('崇礼SCADA发电量','HB_GD_CLF_JS_XX_XX_XXX_CI0077','万kWh');"></h3>
 <h3 id="KB_FDC_SCADAFDL" onclick="showZB('康保SCADA发电量','HB_GD_KBF_JS_XX_XX_XXX_CI0077','万kWh');"></h3>
 <h3 id="DX_FDC_SCADAFDL" onclick="showZB('代县SCADA发电量','HB_GD_DXF_JS_XX_XX_XXX_CI0077','万kWh');"></h3>
+<h3 id="SY_FDC_SCADAFDL" onclick="showZB('寿阳SCADA发电量','HB_GD_SYF_JS_XX_XX_XXX_CI0077','万kWh');"></h3>
 </div>
 
 
@@ -138,6 +154,7 @@
 <h3 id="CL_FDC_WHSS"></h3>
 <h3 id="KB_FDC_WHSS"></h3>
 <h3 id="DX_FDC_WHSS"></h3>
+<h3 id="SY_FDC_WHSS"></h3>
 </div>
 
 <div onmouseover="this.className='page_box1_col_on'"  onmouseout= "this.className='page_box1_col'"  class="page_box1_col">
@@ -147,6 +164,7 @@
 <h3 id="CL_FDC_GZSS"></h3>
 <h3 id="KB_FDC_GZSS"></h3>
 <h3 id="DX_FDC_GZSS"></h3>
+<h3 id="SY_FDC_GZSS"></h3>
 </div>
 <div onmouseover="this.className='page_box1_col_on'"  onmouseout= "this.className='page_box1_col'"  class="page_box1_col">
 <h1>限电损失电量</h1>
@@ -155,6 +173,7 @@
 <h3 id="CL_FDC_XDSS" onclick="showZB('崇礼限电损失电量','HB_GD_CLF_JS_XX_XX_XXX_CI0116','万kWh');"></h3>
 <h3 id="KB_FDC_XDSS" onclick="showZB('康保限电损失电量','HB_GD_KBF_JS_XX_XX_XXX_CI0116','万kWh');"></h3>
 <h3 id="DX_FDC_XDSS" onclick="showZB('代县限电损失电量','HB_GD_DXF_JS_XX_XX_XXX_CI0116','万kWh');"></h3>
+<h3 id="SY_FDC_XDSS" onclick="showZB('寿阳限电损失电量','HB_GD_SYF_JS_XX_XX_XXX_CI0116','万kWh');"></h3>
 </div>
 
 <div onmouseover="this.className='page_box1_col_on'"  onmouseout= "this.className='page_box1_col'"  class="page_box1_col">
@@ -164,6 +183,7 @@
 <h3 id="CL_FDC_SLSS"></h3>
 <h3 id="KB_FDC_SLSS"></h3>
 <h3 id="DX_FDC_SLSS"></h3>
+<h3 id="SY_FDC_SLSS"></h3>
 </div>
 
 <div onmouseover="this.className='page_box1_col_on'"  onmouseout= "this.className='page_box1_col'"  class="page_box1_col">
@@ -173,6 +193,7 @@
 <h3 id="CL_FDC_XNSS" onclick="showZB('康保性能损失电量','HB_GD_CLF_JS_XX_XX_XXX_CI0100','万kWh');"></h3>
 <h3 id="KB_FDC_XNSS" onclick="showZB('康保性能损失电量','HB_GD_KBF_JS_XX_XX_XXX_CI0100','万kWh');"></h3>
 <h3 id="DX_FDC_XNSS" onclick="showZB('代县性能损失电量','HB_GD_DXF_JS_XX_XX_XXX_CI0100','万kWh');;"></h3>
+<h3 id="SY_FDC_XNSS" onclick="showZB('寿阳性能损失电量','HB_GD_SYF_JS_XX_XX_XXX_CI0100','万kWh');;"></h3>
 </div>
 
 <div onmouseover="this.className='page_box1_col_on'"  onmouseout= "this.className='page_box1_col'"  class="page_box1_col">
@@ -182,6 +203,7 @@
 <h3 id="CL_FDC_YLYXS"></h3>
 <h3 id="KB_FDC_YLYXS"></h3>
 <h3 id="DX_FDC_YLYXS"></h3>
+<h3 id="SY_FDC_YLYXS"></h3>
 </div>
 
 
@@ -393,13 +415,84 @@
   
 </div>
 
-<div class="dltj">
-  <h1 class="dltj_t">电量统计</h1>
-  <div class="dltj_tu">
-	<div id="dltj_Chart_1"></div>
-	<div id="dltj_Chart_2"></div>
+
+
+<div class="bj1">
+  <div class="lan_t">
+  <div class="bk">冠山风电场</div>
+  <div class="lv_bj">
+  <div class="lv_shuzi" id="SY_FDC_JRTS"></div>
   </div>
+    <div class="tai">台</div>
+  </div>
+  <div class="fd">
+  <div class="fd_left" id="speedSY">
+    
+  </div>
+  <div class="fdl_right">
+    <ul>
+      <li>
+      <div class="fdl_zi">发电量</div>
+       <div onmouseover="this.className='fdl_bj1'"  onmouseout= "this.className='fdl_bj'"  class="fdl_bj" id="SY_FDC_FDL">
+       </div>
+       <div class="danwei">万kWh</div>
+      </li>
+    <li>
+      <div class="fdl_zi">功 率</div>
+       <div onmouseover="this.className='fdl_bj1'"  onmouseout= "this.className='fdl_bj'"  class="fdl_bj" id="SY_FDC_GL1">
+       </div>
+       <div class="danwei">MW</div>
+      </li>
+    </ul>
+  </div>
+  </div>
+  
+  <div class="bg_bj">
+    <ul>
+     <li>
+     <div class="yanse1">运行</div>
+     <div class="liang" id="SY_FDC_YXTS"></div>
+     <div class="tai_s">台</div>
+     </li>
+      <li>
+     <div class="yanse2">故障</div>
+     <div class="liang" id="SY_FDC_GZTS"></div>
+     <div class="tai_s">台</div>
+     </li>
+      <li>
+     <div class="yanse3">限电</div>
+     <div class="liang" id="SY_FDC_XDTS"></div>
+     <div class="tai_s">台</div>
+     </li>
+      <li>
+     <div class="yanse4">待机</div>
+     <div class="liang" id="SY_FDC_DJTS"></div>
+     <div class="tai_s">台</div>
+     </li>
+      <li>
+     <div class="yanse5">维护</div>
+     <div class="liang" id="SY_FDC_WHTS"></div>
+     <div class="tai_s">台</div>
+     </li>
+      <li>
+     <div class="yanse6">离线</div>
+     <div class="liang" id="SY_FDC_LXTS"></div>
+     <div class="tai_s">台</div>
+     </li>
+     
+    </ul>
+  </div>
+  
+  
 </div>
+
+<!-- <div class="dltj">
+  <h1 class="dltj_t">电量统计</h1>
+  <div class="dltj_tu"> -->
+	<div id="dltj_Chart_1"></div>
+	<!-- <div id="dltj_Chart_2"></div> -->
+<!--   </div>
+</div> -->
 </div>
 <div class="main_tubiao">
 <div class="ycdlylldl">

WebRoot/pages/monitor/windpowerStatus.jsp

@@ -95,6 +95,20 @@
 			arr.push(obj16);
 			arr.push(obj17);
 			arr.push(obj18);
+			//寿阳
+			var obj19=initData("syFjStatus",res.dxDjlStatus);
+			var obj20=initData("sySyzStatus",res.dxDjlStatus);
+			var obj21=initData("syCftStatus",res.dxDjlStatus);
+			var obj22=initData("syFgvStatus",res.dxDjlStatus);
+			var obj23=initData("syDjlStatus",res.dxDjlStatus);
+			var obj24=initData("syAGCStatus",res.dxDjlStatus);
+			arr.push(obj13);
+			arr.push(obj14);
+			arr.push(obj15);
+			arr.push(obj16);
+			arr.push(obj17);
+			arr.push(obj18);
+			
 			for(var i=0;i<arr.length;i++){
 				if(arr[i].value=='1'){
 					$("#"+arr[i].code).attr("class","zt1 l");
@@ -178,6 +192,26 @@
 </div>
 <div class="bottom l"></div>
 </div>
+
+<div class="sjjr_box l">
+<div class="top l">冠山风电场</div>
+<div class="center l">
+<div  id="syFjStatus"  class="zt1 l" style="margin-right:41px;"><div class="icon"><img src="/resource/images/monitor/new_pic_01.png" width="77" height="77" alt=""/></div>
+<div class="text">风机接入状态</div><div class="zt"><img id="dxSyzStatusImg"  src="/resource/images/monitor/sjjr_zt1.png" width="55" height="55" alt=""/></div></div>
+<div  id="sySyzStatus"  class="zt2 l" style="margin-right:41px;"><div class="icon"><img src="/resource/images/monitor/new_pic_02.png" width="77" height="77" alt=""/></div>
+<div class="text">升压站接入状态</div><div class="zt"><img id="dxCftStatusImg"  src="/resource/images/monitor/sjjr_zt1.png" width="55" height="55" alt=""/></div></div>
+<div  id="syCftStatus"  class="zt1 l" style="margin-right:41px;"><div class="icon"><img src="/resource/images/monitor/new_pic_03.png" width="77" height="77" alt=""/></div>
+<div class="text">测风塔接入状态</div><div class="zt"><img  id="dxFgvStatusImg"  src="/resource/images/monitor/sjjr_zt1.png" width="55" height="55" alt=""/></div></div>
+<div  id="syFgvStatus"  class="zt1 l" style="margin-right:41px;"><div class="icon"><img src="/resource/images/monitor/new_pic_04.png" width="77" height="77" alt=""/></div>
+<div class="text">风功率预测接入状态</div><div class="zt"><img  id="dxFgvStatusImg" src="/resource/images/monitor/sjjr_zt1.png" width="55" height="55" alt=""/></div></div>
+<div  id="syDjlStatus"  class="zt1 l" style="margin-right:41px;"><div class="icon"><img src="/resource/images/monitor/new_pic_05.png" width="77" height="77" alt=""/></div>
+<div class="text">电计量接入状态</div><div class="zt"><img  id="dxDjlStatusImg"  src="/resource/images/monitor/sjjr_zt1.png" width="55" height="55" alt=""/></div></div>
+<div   id="syAGCStatus"   class="zt1 l"><div class="icon"><img src="/resource/images/monitor/new_pic_06.png" width="77" height="77" alt=""/></div>
+<div class="text">AGC/AVC接入状态</div><div class="zt"><img  id="dxAGCStatusImg" src="/resource/images/monitor/sjjr_zt1.png" width="55" height="55" alt=""/></div></div>
+</div>
+<div class="bottom l"></div>
+</div>
+
 </div>
 </body>
 

WebRoot/pages/system/desktop.js

@@ -143,112 +143,112 @@ function wpInfoAjax() {
 				$("#jys").html(res["jys"]);
 				
 				//作假
-				if(wpId=='0'){
-					
-					
-					
-					$("#whssy").html((res["whssy"]-1000.6429).toFixed(2));
-					$("#whssn").html((res["whssy"]-1000.6429).toFixed(2));
-					
-					$("#gzssy").html((res["gzssy"]-252.8915).toFixed(2));
-					$("#gzssn").html((res["gzssy"]-252.8915).toFixed(2));
-					
-					$("#xdssy").html((res["xdssy"]-1273.2357).toFixed(2));
-					$("#xdssn").html((res["xdssy"]-1273.2357).toFixed(2));
-					
-					$("#slssy").html((res["slssy"]-0.1315).toFixed(2));
-					$("#slssn").html((res["slssy"]-0.1315).toFixed(2));
-					
-					$("#xnssy").html((res["xnssy"]-1682.4901).toFixed(2));
-					$("#xnssn").html((res["xnssy"]-1682.4901).toFixed(2));
-				}else if(wpId.indexOf("CL_FDC")>-1){
-					$("#whssy").html((res["whssy"]-432.0266).toFixed(2));
-					$("#whssn").html((res["whssy"]-432.0266).toFixed(2));
-					
-					$("#gzssy").html((res["gzssy"]-42.9232).toFixed(2));
-					$("#gzssn").html((res["gzssy"]-42.9232).toFixed(2));
-					
-					$("#xdssy").html((res["xdssy"]-60.9183).toFixed(2));
-					$("#xdssn").html((res["xdssy"]-60.9183).toFixed(2));
-					
-					$("#slssy").html((res["slssy"]-0.0038).toFixed(2));
-					$("#slssn").html((res["slssy"]-0.0038).toFixed(2));
-					
-					$("#xnssy").html((res["xnssy"]-235.0909).toFixed(2));
-					$("#xnssn").html((res["xnssy"]-235.0909).toFixed(2));
-				}else if(wpId.indexOf("KB04_GC")>-1){
-					$("#whssy").html((res["whssy"]-122.9792).toFixed(2));
-					$("#whssn").html((res["whssy"]-122.9792).toFixed(2));
-					
-					$("#gzssy").html((res["gzssy"]-38.3588).toFixed(2));
-					$("#gzssn").html((res["gzssy"]-38.3588).toFixed(2));
-					
-					$("#xdssy").html((res["xdssy"]-212.3221).toFixed(2));
-					$("#xdssn").html((res["xdssy"]-212.3221).toFixed(2));
-					
-					$("#slssy").html((res["slssy"]).toFixed(2));
-					$("#slssn").html((res["slssy"]).toFixed(2));
-					
-					$("#xnssy").html((res["xnssy"]-300.8463).toFixed(2));
-					$("#xnssn").html((res["xnssy"]-300.8463).toFixed(2));
-				}else if(wpId.indexOf("KB_FDC")>-1){
-					$("#whssy").html((res["whssy"]-300.9792).toFixed(2));
-					$("#whssn").html((res["whssy"]-300.9792).toFixed(2));
-					
-					$("#gzssy").html((res["gzssy"]-100.3588).toFixed(2));
-					$("#gzssn").html((res["gzssy"]-100.3588).toFixed(2));
-					
-					$("#xdssy").html((res["xdssy"]-1000.3221).toFixed(2));
-					$("#xdssn").html((res["xdssy"]-1000.3221).toFixed(2));
-					
-					$("#slssy").html((res["slssy"]).toFixed(2));
-					$("#slssn").html((res["slssy"]).toFixed(2));
-					
-					$("#xnssy").html((res["xnssy"]-1000.8463).toFixed(2));
-					$("#xnssn").html((res["xnssy"]-1000.8463).toFixed(2));
-				}else if(wpId.indexOf("DX_FDC")>-1){
-					$("#whssy").html((res["whssy"]-145.9178).toFixed(2));
-					$("#whssn").html((res["whssy"]-145.9178).toFixed(2));
-					
-					$("#gzssy").html((res["gzssy"]-73.2744).toFixed(2));
-					$("#gzssn").html((res["gzssy"]-73.2744).toFixed(2));
-					
-					$("#xdssy").html((res["xdssy"]).toFixed(2));
-					$("#xdssn").html((res["xdssy"]).toFixed(2));
-					
-					$("#slssy").html((res["slssy"]-0.2589).toFixed(2));
-					$("#slssn").html((res["slssy"]-0.2589).toFixed(2));
-					
-					$("#xnssy").html((res["xnssy"]-146.6001).toFixed(2));
-					$("#xnssn").html((res["xnssy"]-146.6001).toFixed(2));
-				}else{
+//				if(wpId=='0'){
+//					
+//					
+//					
+//					$("#whssy").html((res["whssy"]-1000.6429).toFixed(2));
+//					$("#whssn").html((res["whssy"]-1000.6429).toFixed(2));
+//					
+//					$("#gzssy").html((res["gzssy"]-252.8915).toFixed(2));
+//					$("#gzssn").html((res["gzssy"]-252.8915).toFixed(2));
+//					
+//					$("#xdssy").html((res["xdssy"]-1273.2357).toFixed(2));
+//					$("#xdssn").html((res["xdssy"]-1273.2357).toFixed(2));
+//					
+//					$("#slssy").html((res["slssy"]-0.1315).toFixed(2));
+//					$("#slssn").html((res["slssy"]-0.1315).toFixed(2));
+//					
+//					$("#xnssy").html((res["xnssy"]-1682.4901).toFixed(2));
+//					$("#xnssn").html((res["xnssy"]-1682.4901).toFixed(2));
+//				}else if(wpId.indexOf("CL_FDC")>-1){
+//					$("#whssy").html((res["whssy"]-432.0266).toFixed(2));
+//					$("#whssn").html((res["whssy"]-432.0266).toFixed(2));
+//					
+//					$("#gzssy").html((res["gzssy"]-42.9232).toFixed(2));
+//					$("#gzssn").html((res["gzssy"]-42.9232).toFixed(2));
+//					
+//					$("#xdssy").html((res["xdssy"]-60.9183).toFixed(2));
+//					$("#xdssn").html((res["xdssy"]-60.9183).toFixed(2));
+//					
+//					$("#slssy").html((res["slssy"]-0.0038).toFixed(2));
+//					$("#slssn").html((res["slssy"]-0.0038).toFixed(2));
+//					
+//					$("#xnssy").html((res["xnssy"]-235.0909).toFixed(2));
+//					$("#xnssn").html((res["xnssy"]-235.0909).toFixed(2));
+//				}else if(wpId.indexOf("KB04_GC")>-1){
+//					$("#whssy").html((res["whssy"]-122.9792).toFixed(2));
+//					$("#whssn").html((res["whssy"]-122.9792).toFixed(2));
+//					
+//					$("#gzssy").html((res["gzssy"]-38.3588).toFixed(2));
+//					$("#gzssn").html((res["gzssy"]-38.3588).toFixed(2));
+//					
+//					$("#xdssy").html((res["xdssy"]-212.3221).toFixed(2));
+//					$("#xdssn").html((res["xdssy"]-212.3221).toFixed(2));
+//					
+//					$("#slssy").html((res["slssy"]).toFixed(2));
+//					$("#slssn").html((res["slssy"]).toFixed(2));
+//					
+//					$("#xnssy").html((res["xnssy"]-300.8463).toFixed(2));
+//					$("#xnssn").html((res["xnssy"]-300.8463).toFixed(2));
+//				}else if(wpId.indexOf("KB_FDC")>-1){
+//					$("#whssy").html((res["whssy"]-300.9792).toFixed(2));
+//					$("#whssn").html((res["whssy"]-300.9792).toFixed(2));
+//					
+//					$("#gzssy").html((res["gzssy"]-100.3588).toFixed(2));
+//					$("#gzssn").html((res["gzssy"]-100.3588).toFixed(2));
+//					
+//					$("#xdssy").html((res["xdssy"]-1000.3221).toFixed(2));
+//					$("#xdssn").html((res["xdssy"]-1000.3221).toFixed(2));
+//					
+//					$("#slssy").html((res["slssy"]).toFixed(2));
+//					$("#slssn").html((res["slssy"]).toFixed(2));
+//					
+//					$("#xnssy").html((res["xnssy"]-1000.8463).toFixed(2));
+//					$("#xnssn").html((res["xnssy"]-1000.8463).toFixed(2));
+//				}else if(wpId.indexOf("DX_FDC")>-1){
+//					$("#whssy").html((res["whssy"]-145.9178).toFixed(2));
+//					$("#whssn").html((res["whssy"]-145.9178).toFixed(2));
+//					
+//					$("#gzssy").html((res["gzssy"]-73.2744).toFixed(2));
+//					$("#gzssn").html((res["gzssy"]-73.2744).toFixed(2));
+//					
+//					$("#xdssy").html((res["xdssy"]).toFixed(2));
+//					$("#xdssn").html((res["xdssy"]).toFixed(2));
+//					
+//					$("#slssy").html((res["slssy"]-0.2589).toFixed(2));
+//					$("#slssn").html((res["slssy"]-0.2589).toFixed(2));
+//					
+//					$("#xnssy").html((res["xnssy"]-146.6001).toFixed(2));
+//					$("#xnssn").html((res["xnssy"]-146.6001).toFixed(2));
+//				}else{
 					$("#whss").html(res["whss"]);
 					$("#whssy").html(res["whssy"]);
-//					$("#whssn").html(res["whssn"]);
-					$("#whssn").html(res["whssy"]);
+					$("#whssn").html(res["whssn"]);
+//					$("#whssn").html(res["whssy"]);
 					
 					$("#gzss").html(res["gzss"]);
 					$("#gzssy").html(res["gzssy"]);
-//					$("#gzssn").html(res["gzssn"]);
-					$("#gzssn").html(res["gzssy"]);
+					$("#gzssn").html(res["gzssn"]);
+//					$("#gzssn").html(res["gzssy"]);
 					
 					$("#xdss").html(res["xdss"]);
 					$("#xdssy").html(res["xdssy"]);
-//					$("#xdssn").html(res["xdssn"]);
-					$("#xdssn").html(res["xdssy"]);
+					$("#xdssn").html(res["xdssn"]);
+//					$("#xdssn").html(res["xdssy"]);
 					
 					$("#slss").html(res["slss"]);
 					$("#slssy").html(res["slssy"]);
-//					$("#slssn").html(res["slssn"]);
-					$("#slssn").html(res["slssy"]);
+					$("#slssn").html(res["slssn"]);
+//					$("#slssn").html(res["slssy"]);
 					
 					
 					$("#xnss").html(res["xnss"]);
 					$("#xnssy").html(res["xnssy"]);
-//					$("#xnssn").html(res["xnssn"]);
-					$("#xnssn").html(res["xnssy"]);
+					$("#xnssn").html(res["xnssn"]);
+//					$("#xnssn").html(res["xnssy"]);
 					
-				}
+//				}
 				$("#whss").html(res["whss"]);
 				$("#gzss").html(res["gzss"]);
 				$("#xdss").html(res["xdss"]);
@@ -318,11 +318,20 @@ function wpInfoAjax() {
 				$("#xdtsd").html(res["xdts"]);			
 				$("#lxtsd").html(res["lxts"]);
 				$("#jrtsd").html(res["yxts"]+res["djts"]+res["whts"]+res["gzts"]+res["xdts"]+res["lxts"]);
+				
+				$("#yxtss").html(res["yxts"]);
+				$("#djtss").html(res["djts"]);
+				$("#whtss").html(res["whts"]);
+				$("#gztss").html(res["gzts"]);
+				$("#xdtss").html(res["xdts"]);			
+				$("#lxtss").html(res["lxts"]);
+				$("#jrtss").html(res["yxts"]+res["djts"]+res["whts"]+res["gzts"]+res["xdts"]+res["lxts"]);
 			/**********************************************************************************************/	
 			
 				statebtnimg("#cl_fczt", res["CL_FDC_FCZT"]);
 				statebtnimg("#kb_fczt", res["KB_FDC_FCZT"]);
 				statebtnimg("#dx_fczt", res["DX_FDC_FCZT"]);
+				statebtnimg("#sy_fczt", res["SY_FDC_FCZT"]);
 				
 				
 			
@@ -351,6 +360,12 @@ function wpInfoAjax() {
 				$("#KB_SIQI_RFDL").html(res["KB_SIQI_RFDL"]);
 				$("#KB_SIQI_FS").html(res["KB_SIQI_FS"]);
 				$("#KB_SIQI_GL").html(res["KB_SIQI_GL"]);
+				
+				$("#SY_ZJTS").html(res["SY_FDC_ZJTS"]);
+				$("#SY_ZJRL").html(res["SY_FDC_ZJRL"]*10);
+				$("#SY_FS").html(res["SY_FDC_FS"]);
+				$("#SY_RFDL").html(res["SY_FDC_RFDL"]);
+				$("#SY_GL").html(res["SY_FDC_GL"]);
 								
 			/**********************************************************************************************/
 					if(chart3.series[0])
@@ -1661,6 +1676,7 @@ function goObjView(obj,type)
 			$("#kbdt").css("display","none");	
 			$("#dxdt").css("display","none");
 			$("#kbdt4").css("display","none");
+			$("#sydt").css("display","none");
 			break;
 		case 1:
 			$("#hbgsdt").css("display","none");	
@@ -1668,6 +1684,7 @@ function goObjView(obj,type)
 			$("#kbdt").css("display","none");
 			$("#kbdt4").css("display","none");
 			$("#dxdt").css("display","none");
+			$("#sydt").css("display","none");
 			if("CL01_GC" == obj){
 				$("#cl01").removeClass("page_cz_chongli_acr_name_b page_cz_chongli_no2");
 				$("#cl01").addClass("page_cz_chongli_acr_name_b1 page_cz_chongli_no2");
@@ -1689,6 +1706,7 @@ function goObjView(obj,type)
 			$("#kbdt").css("display","");
 			$("#kbdt4").css("display","none");
 			$("#dxdt").css("display","none");
+			$("#sydt").css("display","none");
 			if("KB01_GC" == obj){
 				$("#kb01").removeClass("page_cz_kangbao_acr_name page_cz_kangbao_no1");
 				$("#kb01").addClass("page_cz_kangbao_acr_name1 page_cz_kangbao_no1");
@@ -1717,6 +1735,7 @@ function goObjView(obj,type)
 			$("#kbdt").css("display","none");
 			$("#kbdt4").css("display","");
 			$("#dxdt").css("display","none");
+			$("#sydt").css("display","none");
 			if("KB04_GC" == obj){
 				$("#kb04").removeClass("page_cz_kangbao_name page_cz_kangbao_no4");
 				$("#kb04").addClass("page_cz_kangbao_name1 page_cz_kangbao_no4");
@@ -1732,9 +1751,17 @@ function goObjView(obj,type)
 			$("#kbdt").css("display","none");
 			$("#kbdt4").css("display","none");
 			$("#dxdt").css("display","");
+			$("#sydt").css("display","none");
 			break;
 			
 		case 5:		
+			$("#hbgsdt").css("display","none");	
+			$("#cldt").css("display","none");
+			$("#kbdt").css("display","none");
+			$("#kbdt4").css("display","none");
+			$("#dxdt").css("display","none");
+			$("#sydt").css("display","");
+			
 			break;
 		}
 	}else{
@@ -1743,24 +1770,32 @@ function goObjView(obj,type)
 	    	 $("#cl_bt").css("display","none");
 	    	 $("#kb_bt").css("display","none");
 	    	 $("#dx_bt").css("display","none");
+	    	 $("#sy_bt").css("display","none");
 	     }else if(obj=="1"){
 	    	 $("#hbgs_bt").css("display","none");
 	    	 $("#cl_bt").css("display","");
 	    	 $("#kb_bt").css("display","none");
 	    	 $("#dx_bt").css("display","none");
+	    	 $("#sy_bt").css("display","none");
 	     }else if(obj=="2"){
 	    	 $("#hbgs_bt").css("display","none");
 	    	 $("#cl_bt").css("display","none");
 	    	 $("#kb_bt").css("display","");
 	    	 $("#dx_bt").css("display","none");
-	     }else if(obj=="3"){
-	    	 
+	    	 $("#sy_bt").css("display","none");
+	     }else if(obj=="5"){
+	    	 $("#hbgs_bt").css("display","none");
+	    	 $("#cl_bt").css("display","none");
+	    	 $("#kb_bt").css("display","none");
+	    	 $("#dx_bt").css("display","none");
+	    	 $("#sy_bt").css("display","");
 
 		 }else if(obj=="4") {
 			 $("#hbgs_bt").css("display","none");
 	    	 $("#cl_bt").css("display","none");
 	    	 $("#kb_bt").css("display","none");
 	    	 $("#dx_bt").css("display","");
+	    	 $("#sy_bt").css("display","none");
 
 		 }
 	}

WebRoot/pages/system/desktopNew.jsp

@@ -1178,6 +1178,7 @@ function goBigSmail(type)
    <li id="kb_bt"  onclick="goObjView('KB_FDC',2)">照阳河风电场</li>
    <li id="kb04_bt"  onclick="goObjView('KB04_GC',3)">五福堂风电场</li>
    <li id="dx_bt"   onclick="goObjView('DX_FDC',4)">雁门关风电场</li>
+   <li id="sy_bt"   onclick="goObjView('SY_FDC',5)">冠山风电场</li>
 </ul>
 </div>
 </div>
@@ -1315,17 +1316,18 @@ function goBigSmail(type)
 
 
 <!-- <div class="index_bottom_cs"></div> -->
-<div class="index_bottom_point index_bottom_point_hhl"><embed src="/resource/images/hbsj/feng.swf" width="90" height="90" wmode="transparent"></embed></div>
-<div class="index_bottom_point index_bottom_point_wft"><embed src="/resource/images/hbsj/feng.swf" width="90" height="90" wmode="transparent"></embed></div>
-<div class="index_bottom_point index_bottom_point_zyh"><embed src="/resource/images/hbsj/feng.swf" width="90" height="90" wmode="transparent"></embed></div>
-<div class="index_bottom_point index_bottom_point_yms"><embed src="/resource/images/hbsj/feng.swf" width="90" height="90" wmode="transparent"></embed></div>
-
-<a href="#"  class="index_bottom_fcbot" style="left: 870px; top: 185px;" id="button1" onmouseover="main1.style.display='block';main2.style.display='none';main3.style.display='none';main4.style.display='none';" onmouseout="main1.style.display='none'" onclick="goObjView('CL_FDC',1)">红花梁风场</a>
-<a href="#" class="index_bottom_fcbot" id="button2" style="left: 690px; top: 80px;" onmouseover="main2.style.display='block';main1.style.display='none';main3.style.display='none';main4.style.display='none';" onmouseout="main2.style.display='none'" onclick="goObjView('KB_FDC',2)">照阳河风场</a>
-<a href="#"  class="index_bottom_fcbot" style="left: 424px; top: 553px;" id="button3" onmouseover="main3.style.display='block';main1.style.display='none';main2.style.display='none';main4.style.display='none';" onmouseout="main3.style.display='none'" onclick="goObjView('DX_FDC',4)">雁门关风场</a>
-<a href="#"  class="index_bottom_fcbot" style="left: 760px; top: 125px;" id="button4" onmouseover="main4.style.display='block';main1.style.display='none';main2.style.display='none';main3.style.display='none';" onmouseout="main4.style.display='none'" onclick="goObjView('KB04_GC',3)">五福堂风场</a>
-
-<div class="index_bottom_fcxl" id="main1" style="display:none; left: 870px; top: 215px;">
+<div class="index_bottom_point index_bottom_point_hhl"><embed src="/resource/images/hbsj/default_fj.gif" width="90" height="90" wmode="transparent"></embed></div>
+<div class="index_bottom_point index_bottom_point_wft"><embed src="/resource/images/hbsj/default_fj.gif" width="90" height="90" wmode="transparent"></embed></div>
+<div class="index_bottom_point index_bottom_point_zyh"><embed src="/resource/images/hbsj/default_fj.gif" width="90" height="90" wmode="transparent"></embed></div>
+<div class="index_bottom_point index_bottom_point_yms"><embed src="/resource/images/hbsj/default_fj.gif" width="90" height="90" wmode="transparent"></embed></div>
+<div class="index_bottom_point index_bottom_point_sy"><embed src="/resource/images/hbsj/default_fj.gif" width="90" height="90" wmode="transparent"></embed></div>
+<a href="#"  class="index_bottom_fcbot" style="left: 1050px; top: 139px;" id="button1" onmouseover="main1.style.display='block';main2.style.display='none';main3.style.display='none';main4.style.display='none';main5.style.display='none';" onmouseout="main1.style.display='none'" onclick="goObjView('CL_FDC',1)">红花梁风场</a>
+<a href="#" class="index_bottom_fcbot" id="button2" style="left: 872px; top: 80px;" onmouseover="main2.style.display='block';main1.style.display='none';main3.style.display='none';main4.style.display='none';main5.style.display='none';" onmouseout="main2.style.display='none'" onclick="goObjView('KB_FDC',2)">照阳河风场</a>
+<a href="#"  class="index_bottom_fcbot" style="left: 535px; top: 302px;" id="button3" onmouseover="main3.style.display='block';main1.style.display='none';main2.style.display='none';main4.style.display='none';main5.style.display='none';" onmouseout="main3.style.display='none'" onclick="goObjView('DX_FDC',4)">雁门关风场</a>
+<a href="#"  class="index_bottom_fcbot" style="left: 962px; top: 107px;" id="button4" onmouseover="main4.style.display='block';main1.style.display='none';main2.style.display='none';main3.style.display='none';main5.style.display='none';" onmouseout="main4.style.display='none'" onclick="goObjView('KB04_GC',3)">五福堂风场</a>
+<a href="#"  class="index_bottom_fcbot" style="left: 441px; top: 495px;" id="button5" onmouseover="main5.style.display='block';main1.style.display='none';main2.style.display='none';main3.style.display='none';main4.style.display='none';" onmouseout="main5.style.display='none'" onclick="goObjView('SY_FDC',5)">冠山风场</a>
+
+<div class="index_bottom_fcxl" id="main1" style="display:none; left: 1031px; top: 171px;">
 <div class="index_bottom_fcxl_top"></div>
 <div class="index_bottom_fcxl_bottom1"><div class="index_bottom_fcxl_left">风机台数</div><div class="index_bottom_fcxl_center" id="CL_ZJTS">0</div><div class="index_bottom_fcxl_right">台</div></div>
 <div class="index_bottom_fcxl_bottom2"><div class="index_bottom_fcxl_left">装机容量</div><div class="index_bottom_fcxl_center" id="CL_ZJRL">0</div><div class="index_bottom_fcxl_right">MW</div></div>
@@ -1333,7 +1335,7 @@ function goBigSmail(type)
 <div class="index_bottom_fcxl_bottom2"><div class="index_bottom_fcxl_left">日发电量</div><div class="index_bottom_fcxl_center" id="CL_RFDL">0</div><div class="index_bottom_fcxl_right">万kwh</div></div>
 <div class="index_bottom_fcxl_bottom1"><div class="index_bottom_fcxl_left">有功功率</div><div class="index_bottom_fcxl_center" id="CL_GL">0</div><div class="index_bottom_fcxl_right">MW</div></div>
 </div>
-<div class="index_bottom_fcxl" id="main2" style="display:none; left: 690px; top: 111px;">
+<div class="index_bottom_fcxl" id="main2" style="display:none; left: 854px; top: 111px;">
 <div class="index_bottom_fcxl_top"></div>
 <div class="index_bottom_fcxl_bottom1"><div class="index_bottom_fcxl_left">风机台数</div><div class="index_bottom_fcxl_center" id="KB_ZJTS">0</div><div class="index_bottom_fcxl_right">台</div></div>
 <div class="index_bottom_fcxl_bottom2"><div class="index_bottom_fcxl_left">装机容量</div><div class="index_bottom_fcxl_center">148.5</div><div class="index_bottom_fcxl_right">MW</div></div>
@@ -1341,7 +1343,7 @@ function goBigSmail(type)
 <div class="index_bottom_fcxl_bottom2"><div class="index_bottom_fcxl_left">日发电量</div><div class="index_bottom_fcxl_center" id="KB_RFDL">0</div><div class="index_bottom_fcxl_right">万kwh</div></div>
 <div class="index_bottom_fcxl_bottom1"><div class="index_bottom_fcxl_left">有功功率</div><div class="index_bottom_fcxl_center" id="KB_GL">0</div><div class="index_bottom_fcxl_right">MW</div></div>
 </div>
-<div class="index_bottom_fcxl" id="main3" style="display:none; left: 538px; top: 554px;">
+<div class="index_bottom_fcxl" id="main3" style="display:none; left: 519px; top: 334px;">
 <div class="index_bottom_fcxl_top"></div>
 <div class="index_bottom_fcxl_bottom1"><div class="index_bottom_fcxl_left">风机台数</div><div class="index_bottom_fcxl_center" id="DX_ZJTS">0</div><div class="index_bottom_fcxl_right">台</div></div>
 <div class="index_bottom_fcxl_bottom2"><div class="index_bottom_fcxl_left">装机容量</div><div class="index_bottom_fcxl_center" id="DX_ZJRL">0</div><div class="index_bottom_fcxl_right">万MW</div></div>
@@ -1349,7 +1351,7 @@ function goBigSmail(type)
 <div class="index_bottom_fcxl_bottom2"><div class="index_bottom_fcxl_left">日发电量</div><div class="index_bottom_fcxl_center" id="DX_RFDL">0</div><div class="index_bottom_fcxl_right">万kwh</div></div>
 <div class="index_bottom_fcxl_bottom1"><div class="index_bottom_fcxl_left">有功功率</div><div class="index_bottom_fcxl_center" id="DX_GL">0</div><div class="index_bottom_fcxl_right">MW</div></div>
 </div>
-<div class="index_bottom_fcxl" id="main4" style="display:none; left: 760px; top: 154px;">
+<div class="index_bottom_fcxl" id="main4" style="display:none; left: 943px; top: 139px;">
 <div class="index_bottom_fcxl_top"></div>
 <div class="index_bottom_fcxl_bottom1"><div class="index_bottom_fcxl_left">风机台数</div><div class="index_bottom_fcxl_center" id="KB_SIQI_ZJTS">0</div><div class="index_bottom_fcxl_right">台</div></div>
 <div class="index_bottom_fcxl_bottom2"><div class="index_bottom_fcxl_left">装机容量</div><div class="index_bottom_fcxl_center" id="KB_SIQI_ZJRL">300</div><div class="index_bottom_fcxl_right">MW</div></div>
@@ -1357,6 +1359,14 @@ function goBigSmail(type)
 <div class="index_bottom_fcxl_bottom2"><div class="index_bottom_fcxl_left">日发电量</div><div class="index_bottom_fcxl_center" id="KB_SIQI_RFDL">0</div><div class="index_bottom_fcxl_right">万kwh</div></div>
 <div class="index_bottom_fcxl_bottom1"><div class="index_bottom_fcxl_left">有功功率</div><div class="index_bottom_fcxl_center" id="KB_SIQI_GL">0</div><div class="index_bottom_fcxl_right">MW</div></div>
 </div>
+<div class="index_bottom_fcxl" id="main5" style="display:none; left: 425px; top: 527px;">
+<div class="index_bottom_fcxl_top"></div>
+<div class="index_bottom_fcxl_bottom1"><div class="index_bottom_fcxl_left">风机台数</div><div class="index_bottom_fcxl_center" id="SY_ZJTS">0</div><div class="index_bottom_fcxl_right">台</div></div>
+<div class="index_bottom_fcxl_bottom2"><div class="index_bottom_fcxl_left">装机容量</div><div class="index_bottom_fcxl_center" id="SY_ZJRL">0</div><div class="index_bottom_fcxl_right">MW</div></div>
+<div class="index_bottom_fcxl_bottom1"><div class="index_bottom_fcxl_left">平均风速</div><div class="index_bottom_fcxl_center" id="SY_FS">0</div><div class="index_bottom_fcxl_right">m/s</div></div>
+<div class="index_bottom_fcxl_bottom2"><div class="index_bottom_fcxl_left">日发电量</div><div class="index_bottom_fcxl_center" id="SY_RFDL">0</div><div class="index_bottom_fcxl_right">万kwh</div></div>
+<div class="index_bottom_fcxl_bottom1"><div class="index_bottom_fcxl_left">有功功率</div><div class="index_bottom_fcxl_center" id="SY_GL">0</div><div class="index_bottom_fcxl_right">MW</div></div>
+</div>
 </div>
 <!-- <a href="#"  class="index_bottom_fcbot" style="left: 625px; top: 90px;" id="button1" onmouseover="main1.style.display='block';main2.style.display='none';main3.style.display='none';" onmouseout="main1.style.display='none'" onclick="goObjView('KB_FDC',2)">康保风场</a>
 <a href="#" name="button2"  class="index_bottom_fcbot" id="button2" style="left: 731px; top: 155px;" onmouseover="main2.style.display='block';main1.style.display='none';main3.style.display='none';" onmouseout="main2.style.display='none'" onclick="goObjView('CL_FDC',1)">崇礼风场</a>
@@ -1511,6 +1521,31 @@ function goBigSmail(type)
 </div>
 <!--   代县风场  end--> 
 
+<!--   寿阳风场  begin--> 
+
+<div class="page_cz_shouyang" id="sydt" style="display:none;">
+<div class="map_right l">
+<div class="box l"><h5>接入</h5><h6 id="jrtss">0</h6><h4>台</h4></div>
+<div class="box l"><h1><img src="/resource/images/system/img/map_fj_blue.png" width="52" height="64" alt=""/></h1><h2>运行</h2><h3 id="yxtss">0</h3><h4>台</h4></div>
+<div class="box l"><h1><img src="/resource/images/system/img/map_fj_green.png" width="52" height="64" alt=""/></h1><h2>待机</h2><h3 id="djtss">0</h3><h4>台</h4></div>
+<div class="box l"><h1><img src="/resource/images/system/img/map_fj_red.png" width="52" height="64" alt=""/></h1><h2>停机</h2><h3 id="gztss">0</h3><h4>台</h4></div>
+<div class="box l"><h1><img src="/resource/images/system/img/map_fj_orange.png" width="52" height="64" alt=""/></h1><h2>维护</h2><h3 id="whtss">0</h3><h4>台</h4></div>
+<div class="box l"><h1><img src="/resource/images/system/img/map_fj_pink.png" width="52" height="64" alt=""/></h1><h2>限电</h2><h3 id="xdtss">0</h3><h4>台</h4></div>
+<div class="box l"><h1><img src="/resource/images/system/img/map_fj_gary.png" width="52" height="64" alt=""/></h1><h2>离线</h2><h3 id="lxtss">0</h3><h4>台</h4></div>
+</div>
+<div class="page_cz_top">
+<a href="#" class="page_cz_over l" id="button1" onmouseover="button2.className='page_cz_out l';button3.className='page_cz_out l';this.className='page_cz_over l'" onmouseout="page_cz_out l" onclick="goObjView('0',0)">返回公司</a>
+</div>
+
+<a href="#" class="page_cz_lineleft page_cz_kangbao1_line1" onclick="goObjView('SY01_XL',5)">#1 集电线路</a>
+<a href="#" class="page_cz_lineright page_cz_kangbao1_line2" onclick="goObjView('SY02_XL',5)">#2 集电线路</a>
+<a href="#" class="page_cz_lineleft page_cz_kangbao1_line3" onclick="goObjView('SY03_XL',5)">#3 集电线路</a>
+<a href="#" class="page_cz_lineright page_cz_kangbao1_line4" onclick="goObjView('SY04_XL',5)">#4 集电线路</a>
+<a href="#" class="page_cz_lineleft page_cz_kangbao1_line5" onclick="goObjView('SY05_XL',5)">#5 集电线路</a>
+<a href="#" class="page_cz_lineright page_cz_kangbao1_line6" onclick="goObjView('SY06_XL',5)">#6 集电线路</a>
+</div>
+<!--   寿阳风场  end--> 
+
 
 
 

WebRoot/pages/system/main.jsp

@@ -503,7 +503,7 @@ function goUrl(){
 		<div id="tabs-2">
 			<iframe id="tab2" src="about:blank" style="border: 0px;margin: 0px"
 				marginwidth="0px" marginheight="0px" frameborder="0" width="1899px"
-				height="864px" scrolling="auto"></iframe>
+				height="895px" scrolling="auto"></iframe>
 		</div>
 		<div id="tabs-3">
 			<iframe id="tab3" src="about:blank" style="border: 0px;margin: 0px"
@@ -550,12 +550,12 @@ function goUrl(){
 		<div id="tabs-11">
 			<iframe id="tab11" src="about:blank" style="border: 0px;margin: 0px"
 				marginwidth="0px" marginheight="0px" frameborder="0" width="1890px"
-				height="879px" scrolling="no"></iframe>
+				height="1200px" scrolling="no"></iframe>
 		</div>
 		<div id="tabs-12">
 			<iframe id="tab12" src="about:blank" style="border: 0px;margin: 0px"
-				marginwidth="0px" marginheight="0px" frameborder="0" width="1890px"
-				height="879px" scrolling="no"></iframe>
+				marginwidth="0px" marginheight="0px" frameborder="0" width="1920px"
+				height="1100px" scrolling="yes"></iframe>
 		</div>
 		<div id="tabs-13">
 			<iframe id="tab13" src="about:blank" style="border: 0px;margin: 0px"

WebRoot/pages/warn/warnlayoutJsp.jsp

@@ -1,249 +1,249 @@
-<%@ page language="java" contentType="text/html;charset=utf-8"%>
-<%@include file="/pages/includes/taglibs.jsp"%>
-<!DOCTYPE html>
-<html>
-<head>
-<title></title>
-
-<link rel="stylesheet" type="text/css" href="<%=request.getContextPath()%>/resource/plugin/jqueryui/css/custom-theme/jquery-ui-1.9.2.custom.css">
-<link rel="stylesheet" type="text/css" href="<%=request.getContextPath()%>/resource/css/button.css">
-<!-- CUSTOMIZE/OVERRIDE THE DEFAULT CSS -->
-<style type="text/css">
-
-  
-/*  
-三种必备样式为：  
-paneClass:    "ui-layout-pane" 窗格样式  
-resizerClass: "ui-layout-resizer" 拉动条样式  
-togglerClass: "ui-layout-toggler" 拉动条上按钮样式  
-*/  
-  
-/*  
- 所有窗格应用的样式,也是必备样式  
-ui-layout-pane   
-ui-layout-pane-[PANE-NAME]（东南西北中，如：ui-layout-pane-west。这个样式放入基本样式下方，可覆盖原样式。 ）   
-ui-layout-pane-[PANE-STATE] （open、closed 如：ui-layout-pane-open。窗格打开时的样式）  
-ui-layout-pane-[PANE-NAME]-[PANE-STATE] （如：ui-layout-pane-west-closed。指定东南西北中一个窗格在某状态下的样式。）  
-*/  
-.ui-layout-pane {   
-    background: #ffffff;  
-    border:     0px solid #ffffff;  
-    padding:    1px;   
-    overflow:   hidden;  
-
-}  
-    /*非必备样式，描述窗格中的内容*/  
-    .ui-layout-content {  
-        padding:    0px;  
-        position:   relative;   
-        overflow:   hidden; 
-        margin: 0px;
-        width: 100%;
-    }  
-  
-/*  
- *  所有拉动条的样式  
- */  
-.ui-layout-resizer  {   
-    background:     #dfe8f6;  
-    border:         0.5px solid #BBB;  
-    border-width:   0;  
-    }  
-    /*  
-     * 拉动条拉动时，保持不动的拉动条样式，不明白修改背景测试。  
-     */  
-    .ui-layout-resizer-drag {  
-    }  
-      
-    /*鼠标移动到拉动条时的样式*/  
-    .ui-layout-resizer-hover{  
-    }  
-    /*   
-     *拖动拉动条时，拉动条的样式，据说是设置“打开悬停”和“拖动”为同一样式。  
-     */  
-    /*.ui-layout-resizer-open-hover ,   */  
-    .ui-layout-resizer-dragging {     
-        background:#aaaaaa;  
-    }  
-  
-    /*拖动拉动条时，到最大或最小边缘时的样式*/  
-    .ui-layout-resizer-dragging-limit {  
-        background: #E1A4A4; /* red */  
-    }  
-  
-    /*拉动条关闭时，的样式。*/  
-    .ui-layout-resizer-closed-hover {   
-        background: #FFCC00;  
-    }  
-      
-    /*窗格关闭后，点击拉动条（非拉动条按钮）,窗格滑动时拉动条的样式*/  
-    .ui-layout-resizer-sliding {      
-        opacity: .10;   
-        filter:  alpha(opacity=10);  
-        }  
-        /*窗格关闭后，点击拉动条（非拉动条按钮）,窗格滑动时，鼠标悬停在拉动条上的样式*/  
-        .ui-layout-resizer-sliding-hover {  
-            opacity: 1.00;   
-            filter:  alpha(opacity=100);  
-        }  
-  
-  
-  
-      
-  
-/*  
- *  拖动杆上的按钮  
- */  
-.ui-layout-toggler {  
-    border: 1px solid #CCCCCC;   
-    background-color: #bcd2ef;  
-    opacity: .60;  
-    filter:  alpha(opacity=60);  
-    }  
-      
-/*  
-    鼠标悬停在拉动条时的样式，已被.ui-layout-resizer-open-hover和.ui-layout-resizer-closed-hover覆盖了。  
-    .ui-layout-resizer-hover  
- */  
-      
-      
-    /*鼠标悬停在拖动条上按钮的样式*/  
-    .ui-layout-toggler-hover {  
-        background-color: #0099FF；  
-        opacity: 1.00;  
-        filter:  alpha(opacity=100);  
-    }  
-      
-    /*窗格关闭后，半打开状态的拉动条是隐藏的*/  
-    .ui-layout-resizer-sliding  ui-layout-toggler {  
-        display: none;  
-    }  
-  	.ui-widget { /* Footer in East-pane */
-	font-size:		14px;
-	font-family: "Times New Roman", Times, serif;
-	font-weight:    bold;
-	border-width:	0px 0 0;
-	}
-
-h3 { /* Headers & Footer in Center & East panes */
-
-	height:14px;
-	background:		#fff;
-	border:			0px solid #BBB;
-	border-width:	0 0 0px;
-	margin:			0;
-}
-h4 { /* Footer in East-pane */
-	font-size: 12px;
-	font-weight: bolder;
-	color: #333;
-	border-width:	0px 0 0;
-	margin: 5px;
-}
-.ui-accordion .ui-accordion-content 
-{
- padding: 0;
- border-top: 0; 
- overflow: auto; 
- zoom: 1; 
- }
-.ui-helper-reset
-{
-font-size: 12px;
-}
-</style>
-
-<script type="text/javascript" src="<%=request.getContextPath()%>/resource/plugin/jqueryui/js/jquery-1.8.3.js"></script>
-<script type="text/javascript" src="<%=request.getContextPath()%>/resource/plugin/jqueryui/js/jquery-ui-1.9.2.custom.js"></script>
-<script type="text/javascript" src="<%=request.getContextPath()%>/resource/js/layout/jquery.layout.js"></script>
-<script type="text/javascript" src="<%=request.getContextPath()%>/resource/js/layout/jquery.layout.resizePaneAccordions.js"></script>
-
-<script type="text/javascript" src="<%=request.getContextPath()%>/resource/js/layout/themeswitchertool.js"></script> 
-
-<script type="text/javascript">
-$(document).ready( function() {
-
-	myLayout = $('body').layout({
-		west__size:			220
-	
-		// RESIZE Accordion widget when panes resize
-	,	west__onresize:		$.layout.callbacks.resizePaneAccordions
-	});
-
-	// ACCORDION - in the West pane
-	$("#accordion1").accordion({
-		heightStyle:	"fill"
-	});
-		
-		// ACCORDION - in the West pane
-		$("#accordion1").accordion({
-			heightStyle:	"fill"
-		});
-		
-	
-
-goUrl("/warnhistory/warnhistoryIndex.action");
-		
-	});
-	function goUrl(url)
-	{
-		$("#frame").attr("src",url);
-	}
-	</script>
-<style type="text/css">
-body {
-	margin-left: 0px;
-	margin-top: 0px;
-	margin-right: 0px;
-	margin-bottom: 0px;
-}
-.Navigation_Text {
-	font-family: "Times New Roman", Times, serif;
-	font-size: 12px;
-	font-weight:normal;
-	color: #333;
-	text-decoration: none;
-	position:relative; 
-	top: 6px;
-	left:30px;
-}
-</style>
-</head>
-<body>
-
-
-<div class="ui-layout-center" style="display: none;"> 
-	<div class="ui-layout-content ui-widget-content">
-	 <iframe id="frame" width="99%" height="100%" frameborder="0" scrolling="auto"  style="margin-left:5px" src=""></iframe>
-	</div>
-</div>
-
-
-<div class=ui-layout-west >
-
-
-	<div class="ui-layout-content">
-		<div id="accordion1" class="basic">
-		<h3 style="text-align:left;background-image:url(<%=request.getContextPath()%>/resource/images/link/zbph_Link_Top.jpg) " >报警中心</h3>
-			<div  style="overflow:hidden"  >
-			<!--<h4 style="height:28px;text-align:left;vertical-align: middle;background-image: url('<%=request.getContextPath()%>/resource/images/system/pictures/item_Bg.fw.png')" ><a class="Navigation_Text" href="#" onclick="goUrl('/alerthistroy/alarmwindowIndex.action')">光&nbsp;字牌报&nbsp;警</a></h4>-->
-			<h4 style="height:28px;text-align:left;vertical-align: middle;background-image: url('<%=request.getContextPath()%>/resource/images/system/pictures/item_Bg.fw.png')" ><a class="Navigation_Text" href="#" onclick="goUrl('/alerthistroy/runningAlarmIndex.action')">实&nbsp;&nbsp;时&nbsp;&nbsp;报&nbsp;&nbsp;警</a></h4>
-			<h4 style="height:28px;text-align:left;vertical-align: middle;background-image: url('<%=request.getContextPath()%>/resource/images/system/pictures/item_Bg.fw.png')" ><a class="Navigation_Text"  href="#" onclick="goUrl('/alerthistroy/temperatureHz.action')">主&nbsp;&nbsp;要&nbsp;&nbsp;指&nbsp;&nbsp;标</a></h4>
-			<h4 style="height:28px;text-align:left;vertical-align: middle;background-image: url('<%=request.getContextPath()%>/resource/images/system/pictures/item_Bg.fw.png')" ><a class="Navigation_Text"  href="#" onclick="goUrl('/monitor/temperatureIndex.action')">温&nbsp;&nbsp;度&nbsp;&nbsp;监&nbsp;&nbsp;控</a></h4>			
-			<h4 style="height:28px;text-align:left;vertical-align: middle;background-image: url('<%=request.getContextPath()%>/resource/images/system/pictures/item_Bg.fw.png')" ><a class="Navigation_Text" href="#" onclick="goUrl('/alerthistroy/alerthistroyIndex.action')">历&nbsp;&nbsp;史&nbsp;&nbsp;报&nbsp;&nbsp;警</a></h4>
-			<h4 style="height:28px;text-align:left;vertical-align: middle;background-image: url('<%=request.getContextPath()%>/resource/images/system/pictures/item_Bg.fw.png')" ><a class="Navigation_Text" href="#" onclick="goUrl('/warnhistory/warnhistoryIndex.action')">SCADA报警</a></h4>
-			<h4 style="height:28px;text-align:left;vertical-align: middle;background-image: url('<%=request.getContextPath()%>/resource/images/system/pictures/item_Bg.fw.png')" ><a class="Navigation_Text"  href="#" onclick="goUrl('/electricalwarn/electricalwarnIndex.action')">升&nbsp;压站报&nbsp;警</a></h4>
-			<h4 style="height:28px;text-align:left;vertical-align: middle;background-image: url('<%=request.getContextPath()%>/resource/images/system/pictures/item_Bg.fw.png')" ><a class="Navigation_Text"  href="#" onclick="goUrl('/event/index.action')">停&nbsp;&nbsp;机&nbsp;&nbsp;事&nbsp;&nbsp;件</a></h4>			 						 
-			<!--  <h4 style="height:28px;text-align:left;vertical-align: middle;background-image: url('<%=request.getContextPath()%>/resource/images/system/pictures/item_Bg.fw.png')" ><a class="Navigation_Text"  href="#" onclick="goUrl('/customwarn/index.action')">自&nbsp;定义报&nbsp;警</a></h4>-->
-			<h4 style="height:28px;text-align:left;vertical-align: middle;background-image: url('<%=request.getContextPath()%>/resource/images/system/pictures/item_Bg.fw.png')" ><a class="Navigation_Text"  href="#" onclick="goUrl('/brownouts/index.action')">限&nbsp;&nbsp;电&nbsp;&nbsp;管&nbsp;&nbsp;理</a></h4>
-			
-			</div>
-			
-	
-		</div>
-	</div>
-
-</div>
-
-</body>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@include file="/pages/includes/taglibs.jsp"%>
+<!DOCTYPE html>
+<html>
+<head>
+<title></title>
+
+<link rel="stylesheet" type="text/css" href="<%=request.getContextPath()%>/resource/plugin/jqueryui/css/custom-theme/jquery-ui-1.9.2.custom.css">
+<link rel="stylesheet" type="text/css" href="<%=request.getContextPath()%>/resource/css/button.css">
+<!-- CUSTOMIZE/OVERRIDE THE DEFAULT CSS -->
+<style type="text/css">
+
+  
+/*  
+三种必备样式为：  
+paneClass:    "ui-layout-pane" 窗格样式  
+resizerClass: "ui-layout-resizer" 拉动条样式  
+togglerClass: "ui-layout-toggler" 拉动条上按钮样式  
+*/  
+  
+/*  
+ 所有窗格应用的样式,也是必备样式  
+ui-layout-pane   
+ui-layout-pane-[PANE-NAME]（东南西北中，如：ui-layout-pane-west。这个样式放入基本样式下方，可覆盖原样式。 ）   
+ui-layout-pane-[PANE-STATE] （open、closed 如：ui-layout-pane-open。窗格打开时的样式）  
+ui-layout-pane-[PANE-NAME]-[PANE-STATE] （如：ui-layout-pane-west-closed。指定东南西北中一个窗格在某状态下的样式。）  
+*/  
+.ui-layout-pane {   
+    background: #ffffff;  
+    border:     0px solid #ffffff;  
+    padding:    1px;   
+    overflow:   hidden;  
+
+}  
+    /*非必备样式，描述窗格中的内容*/  
+    .ui-layout-content {  
+        padding:    0px;  
+        position:   relative;   
+        overflow:   hidden; 
+        margin: 0px;
+        width: 100%;
+    }  
+  
+/*  
+ *  所有拉动条的样式  
+ */  
+.ui-layout-resizer  {   
+    background:     #dfe8f6;  
+    border:         0.5px solid #BBB;  
+    border-width:   0;  
+    }  
+    /*  
+     * 拉动条拉动时，保持不动的拉动条样式，不明白修改背景测试。  
+     */  
+    .ui-layout-resizer-drag {  
+    }  
+      
+    /*鼠标移动到拉动条时的样式*/  
+    .ui-layout-resizer-hover{  
+    }  
+    /*   
+     *拖动拉动条时，拉动条的样式，据说是设置“打开悬停”和“拖动”为同一样式。  
+     */  
+    /*.ui-layout-resizer-open-hover ,   */  
+    .ui-layout-resizer-dragging {     
+        background:#aaaaaa;  
+    }  
+  
+    /*拖动拉动条时，到最大或最小边缘时的样式*/  
+    .ui-layout-resizer-dragging-limit {  
+        background: #E1A4A4; /* red */  
+    }  
+  
+    /*拉动条关闭时，的样式。*/  
+    .ui-layout-resizer-closed-hover {   
+        background: #FFCC00;  
+    }  
+      
+    /*窗格关闭后，点击拉动条（非拉动条按钮）,窗格滑动时拉动条的样式*/  
+    .ui-layout-resizer-sliding {      
+        opacity: .10;   
+        filter:  alpha(opacity=10);  
+        }  
+        /*窗格关闭后，点击拉动条（非拉动条按钮）,窗格滑动时，鼠标悬停在拉动条上的样式*/  
+        .ui-layout-resizer-sliding-hover {  
+            opacity: 1.00;   
+            filter:  alpha(opacity=100);  
+        }  
+  
+  
+  
+      
+  
+/*  
+ *  拖动杆上的按钮  
+ */  
+.ui-layout-toggler {  
+    border: 1px solid #CCCCCC;   
+    background-color: #bcd2ef;  
+    opacity: .60;  
+    filter:  alpha(opacity=60);  
+    }  
+      
+/*  
+    鼠标悬停在拉动条时的样式，已被.ui-layout-resizer-open-hover和.ui-layout-resizer-closed-hover覆盖了。  
+    .ui-layout-resizer-hover  
+ */  
+      
+      
+    /*鼠标悬停在拖动条上按钮的样式*/  
+    .ui-layout-toggler-hover {  
+        background-color: #0099FF；  
+        opacity: 1.00;  
+        filter:  alpha(opacity=100);  
+    }  
+      
+    /*窗格关闭后，半打开状态的拉动条是隐藏的*/  
+    .ui-layout-resizer-sliding  ui-layout-toggler {  
+        display: none;  
+    }  
+  	.ui-widget { /* Footer in East-pane */
+	font-size:		14px;
+	font-family: "Times New Roman", Times, serif;
+	font-weight:    bold;
+	border-width:	0px 0 0;
+	}
+
+h3 { /* Headers & Footer in Center & East panes */
+
+	height:14px;
+	background:		#fff;
+	border:			0px solid #BBB;
+	border-width:	0 0 0px;
+	margin:			0;
+}
+h4 { /* Footer in East-pane */
+	font-size: 12px;
+	font-weight: bolder;
+	color: #333;
+	border-width:	0px 0 0;
+	margin: 5px;
+}
+.ui-accordion .ui-accordion-content 
+{
+ padding: 0;
+ border-top: 0; 
+ overflow: auto; 
+ zoom: 1; 
+ }
+.ui-helper-reset
+{
+font-size: 12px;
+}
+</style>
+
+<script type="text/javascript" src="<%=request.getContextPath()%>/resource/plugin/jqueryui/js/jquery-1.8.3.js"></script>
+<script type="text/javascript" src="<%=request.getContextPath()%>/resource/plugin/jqueryui/js/jquery-ui-1.9.2.custom.js"></script>
+<script type="text/javascript" src="<%=request.getContextPath()%>/resource/js/layout/jquery.layout.js"></script>
+<script type="text/javascript" src="<%=request.getContextPath()%>/resource/js/layout/jquery.layout.resizePaneAccordions.js"></script>
+
+<script type="text/javascript" src="<%=request.getContextPath()%>/resource/js/layout/themeswitchertool.js"></script> 
+
+<script type="text/javascript">
+$(document).ready( function() {
+
+	myLayout = $('body').layout({
+		west__size:			220
+	
+		// RESIZE Accordion widget when panes resize
+	,	west__onresize:		$.layout.callbacks.resizePaneAccordions
+	});
+
+	// ACCORDION - in the West pane
+	$("#accordion1").accordion({
+		heightStyle:	"fill"
+	});
+		
+		// ACCORDION - in the West pane
+		$("#accordion1").accordion({
+			heightStyle:	"fill"
+		});
+		
+	
+
+goUrl("/warnhistory/warnhistoryIndex.action");
+		
+	});
+	function goUrl(url)
+	{
+		$("#frame").attr("src",url);
+	}
+	</script>
+<style type="text/css">
+body {
+	margin-left: 0px;
+	margin-top: 0px;
+	margin-right: 0px;
+	margin-bottom: 0px;
+}
+.Navigation_Text {
+	font-family: "Times New Roman", Times, serif;
+	font-size: 12px;
+	font-weight:normal;
+	color: #333;
+	text-decoration: none;
+	position:relative; 
+	top: 6px;
+	left:30px;
+}
+</style>
+</head>
+<body>
+
+
+<div class="ui-layout-center" style="display: none;"> 
+	<div class="ui-layout-content ui-widget-content">
+	 <iframe id="frame" width="99%" height="100%" frameborder="0" scrolling="auto"  style="margin-left:5px" src=""></iframe>
+	</div>
+</div>
+
+
+<div class=ui-layout-west >
+
+
+	<div class="ui-layout-content">
+		<div id="accordion1" class="basic">
+		<h3 style="text-align:left;background-image:url(<%=request.getContextPath()%>/resource/images/link/zbph_Link_Top.jpg) " >报警中心</h3>
+			<div  style="overflow:hidden"  >
+			<!--<h4 style="height:28px;text-align:left;vertical-align: middle;background-image: url('<%=request.getContextPath()%>/resource/images/system/pictures/item_Bg.fw.png')" ><a class="Navigation_Text" href="#" onclick="goUrl('/alerthistroy/alarmwindowIndex.action')">光&nbsp;字牌报&nbsp;警</a></h4>-->
+			<h4 style="height:28px;text-align:left;vertical-align: middle;background-image: url('<%=request.getContextPath()%>/resource/images/system/pictures/item_Bg.fw.png')" ><a class="Navigation_Text" href="#" onclick="goUrl('/alerthistroy/runningAlarmIndex.action')">实&nbsp;&nbsp;时&nbsp;&nbsp;报&nbsp;&nbsp;警</a></h4>
+		<%-- 	<h4 style="height:28px;text-align:left;vertical-align: middle;background-image: url('<%=request.getContextPath()%>/resource/images/system/pictures/item_Bg.fw.png')" ><a class="Navigation_Text"  href="#" onclick="goUrl('/alerthistroy/temperatureHz.action')">主&nbsp;&nbsp;要&nbsp;&nbsp;指&nbsp;&nbsp;标</a></h4> --%>
+			<h4 style="height:28px;text-align:left;vertical-align: middle;background-image: url('<%=request.getContextPath()%>/resource/images/system/pictures/item_Bg.fw.png')" ><a class="Navigation_Text"  href="#" onclick="goUrl('/monitor/temperatureIndex.action')">温&nbsp;&nbsp;度&nbsp;&nbsp;监&nbsp;&nbsp;控</a></h4>			
+			<h4 style="height:28px;text-align:left;vertical-align: middle;background-image: url('<%=request.getContextPath()%>/resource/images/system/pictures/item_Bg.fw.png')" ><a class="Navigation_Text" href="#" onclick="goUrl('/alerthistroy/alerthistroyIndex.action')">历&nbsp;&nbsp;史&nbsp;&nbsp;报&nbsp;&nbsp;警</a></h4>
+			<h4 style="height:28px;text-align:left;vertical-align: middle;background-image: url('<%=request.getContextPath()%>/resource/images/system/pictures/item_Bg.fw.png')" ><a class="Navigation_Text" href="#" onclick="goUrl('/warnhistory/warnhistoryIndex.action')">SCADA报警</a></h4>
+			<h4 style="height:28px;text-align:left;vertical-align: middle;background-image: url('<%=request.getContextPath()%>/resource/images/system/pictures/item_Bg.fw.png')" ><a class="Navigation_Text"  href="#" onclick="goUrl('/electricalwarn/electricalwarnIndex.action')">升&nbsp;压站报&nbsp;警</a></h4>
+			<h4 style="height:28px;text-align:left;vertical-align: middle;background-image: url('<%=request.getContextPath()%>/resource/images/system/pictures/item_Bg.fw.png')" ><a class="Navigation_Text"  href="#" onclick="goUrl('/event/index.action')">停&nbsp;&nbsp;机&nbsp;&nbsp;事&nbsp;&nbsp;件</a></h4>			 						 
+			<!--  <h4 style="height:28px;text-align:left;vertical-align: middle;background-image: url('<%=request.getContextPath()%>/resource/images/system/pictures/item_Bg.fw.png')" ><a class="Navigation_Text"  href="#" onclick="goUrl('/customwarn/index.action')">自&nbsp;定义报&nbsp;警</a></h4>-->
+			<h4 style="height:28px;text-align:left;vertical-align: middle;background-image: url('<%=request.getContextPath()%>/resource/images/system/pictures/item_Bg.fw.png')" ><a class="Navigation_Text"  href="#" onclick="goUrl('/brownouts/index.action')">限&nbsp;&nbsp;电&nbsp;&nbsp;管&nbsp;&nbsp;理</a></h4>
+			
+			</div>
+			
+	
+		</div>
+	</div>
+
+</div>
+
+</body>
 </html> 

WebRoot/resource/css/hbsj/index_hb.css

@@ -346,7 +346,7 @@ color:#5d5d5d;}
 		height:704px;
 		border:1px solid #bec3c7;
 	float:left;
-	background:url(/resource/images/hbsj/index_map_hb_bg.png) no-repeat left top;
+	background:url(/resource/images/hbsj/index_map_hb_bg1.png) no-repeat left top;
     position: relative;}
 	
 .map_right{width:156px;background-color: rgba(255, 255, 255, 0.8); top:249px;left:1146px;border:1px solid #bdc3c7;border-bottom:0px;position:absolute;border-right:0px}
@@ -370,20 +370,24 @@ color:#5d5d5d;}
 .index_bottom_point_yongmao{left:378px;top:274px;}
 .index_bottom_point_wanfa{left:433px;top:274px;}
 .index_bottom_point_hhl{
-	left: 703px;
+	left: 879px;
 	top: 3px;
 }
 .index_bottom_point_wft{
-	left: 769px;
-	top: 46px;
+	left: 970px;
+	top: 28px;
 }
 .index_bottom_point_zyh{
-	left: 883px;
-	top: 103px;
+	left: 1067px;
+	top: 60px;
 }
 .index_bottom_point_yms{
-	left: 440px;
-	top: 465px;
+	left: 543px;
+	top: 221px;
+}
+.index_bottom_point_sy{
+	left: 450px;
+	top: 413px;
 }
 .index_bottom_point_aolun{left:378px;top:403px;}
 .index_bottom_point_beizhen{left:391px;top:468px;}

WebRoot/resource/css/hbsj/page_cz.css

@@ -39,7 +39,7 @@ li{
 .l{float:left;}
 .r{float:right;}
 	
-.page_cz_aolun, .page_cz_chongli, .page_cz_kangbao1, .page_cz_kangbao2{
+.page_cz_aolun, .page_cz_chongli, .page_cz_kangbao1, .page_cz_kangbao2 ,.page_cz_shouyang{
 			width:1303px;
 		height:704px;
 		border:1px solid #bec3c7;
@@ -52,6 +52,8 @@ li{
 	background:url(/resource/images/hbsj/page_cz_kangbao1.png) no-repeat left top;}
 .page_cz_kangbao2{
 	background:url(/resource/images/hbsj/page_cz_kangbao2.png) no-repeat left top;}
+.page_cz_shouyang{
+	background:url(/resource/images/hbsj/page_cz_daixian.png) no-repeat left top;}
 .page_cz_top{
 	width:118px;
 	height:34px;

configuration-src/dbconfig.properties

@@ -27,8 +27,8 @@ jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
 #jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
 #jdbc.url=jdbc:oracle:thin:@localhost:1521:gdsj
 #jdbc.url=jdbc:oracle:thin:@192.168.1.105:1521:gdnxfd
-#jdbc.url=jdbc:oracle:thin:@192.168.2.215:1521:gdsj
-jdbc.url=jdbc:oracle:thin:@10.83.68.165:1521:gdsj
+jdbc.url=jdbc:oracle:thin:@192.168.2.215:1521:gdsj
+#jdbc.url=jdbc:oracle:thin:@10.83.68.165:1521:gdsj
 jdbc.username=gdprod
 jdbc.password=gd123
 
@@ -53,8 +53,8 @@ redis.pool.maxIdle=1500
 redis.pool.minIdle=500
 redis.pool.maxWaitMillis=500
 redis.pool.maxWait=500
-
-redis.host = 10.83.68.94
+#redis.host = 10.83.68.94
+redis.host = 192.168.2.202
 redis.port = 6379
 redis.port2 = 6380
 redis.timeout=30000

configuration-src/webconfig.properties

@@ -16,8 +16,7 @@ qt=AI056,AI057,AI069,AI070
 gfxs=1,0.306|2,0.303|3,0.289|4,0.297|5,0.3|6,0.359|7,0.304|8,0.301|9,0.309|10,0.308|11,0.280|12,0.292
 url=http\://localhost\:8080/report/
 
-#ip=192.168.2.212
-ip=10.83.68.212
+ip=192.168.2.212
 eDosProxyApi=C\:\\\\eDosProxyApi
 port=10010
 time=60
@@ -34,50 +33,11 @@ defaultwp=CL_FDC
 defaultpj=CL01_GC
 defaultln=CL01_XL
 #end temperature ai settings
-mongodb_ip =10.83.68.94
+mongodb_ip =192.168.2.202
+#mongodb_ip =10.83.68.94
 mongodb_port =27017
 mongodb_perHost =200
 mongodb_threadsAllowed =200
 mongodb_connectTimeout =60000
 mongodb_maxWaitTime =60000
 mongodb_socketTimeout =60000
-
-
-AQ_TARGET_SCORE = 80.0
-
-RLXS_CL = 1.3
-RLXS_KB = 1.7
-RLXS_DX = 1.0
-RLXS_JK = 1.0
-
-JZJJ_CL_YX = 8
-JZJJ_CL_JX = 10
-JZJJ_CL_GL = 12
-	
-JZJJ_KB_YX = 8
-JZJJ_KB_JX = 10
-JZJJ_KB_GL = 12
-	
-JZJJ_DX_YX = 10
-JZJJ_DX_JX = 10
-JZJJ_DX_GL = 10	
-
-JZJJ_SC = 12
-JZJJ_AQ = 12
-JZJJ_JK = 8
-
-RYRS_CL_YX = 3
-RYRS_KB_YX = 3
-RYRS_DX_YX = 3
-
-RYRS_CL_JX = 3
-RYRS_KB_JX = 3
-RYRS_DX_JX = 3
-
-RYRS_CL_GL = 2
-RYRS_KB_GL = 2
-RYRS_DX_GL = 2
-
-RYRS_SC = 3
-RYRS_AQ = 3
-RYRS_JK = 3

src/com/hcks/cmfds/service/EquipmentMatrixService.java

@@ -504,7 +504,7 @@ public class EquipmentMatrixService {
 
 						map.put(String.valueOf(new StringBuilder(wt.getId())
 								.append("code")), point.getCode());
-						map.put(wt.getId(), realMap.get(point.getId()));
+						map.put(wt.getId(), realMap.get(point.getId())!=null?realMap.get(point.getId()):0);
 					}
 				}
 			}

src/com/hcks/cmfds/service/Windpowerinfoday3Service.java

@@ -446,9 +446,9 @@ public class Windpowerinfoday3Service extends GenericJdbcDao<Windpowerinfoday3>
 			if(0==type){
 				List<Windpowerstation> pwls=CacheContext.wpls;
 				for(int i=0;i<pwls.size();i++){
-					if(pwls.get(i).getId().equals("SY_FDC")){
+					/*if(pwls.get(i).getId().equals("SY_FDC")){
 						continue;
-					}
+					}*/
 					Windpowerinfoday3 wpd=(Windpowerinfoday3)map.get(pwls.get(i).getCode());
 					double lyl = 0.0;
 					if(wpd.getTotal()!=0){
@@ -472,9 +472,9 @@ public class Windpowerinfoday3Service extends GenericJdbcDao<Windpowerinfoday3>
 			}else if(1==type){
 				List<Project> pwls=CacheContext.pjls;
 				for(int i=0;i<pwls.size();i++){
-					if(pwls.get(i).getWindpowerstationid().equals("SY_FDC")){
+					/*if(pwls.get(i).getWindpowerstationid().equals("SY_FDC")){
 						continue;
-					}
+					}*/
 					Windpowerinfoday3 wpd=(Windpowerinfoday3)map.get(pwls.get(i).getCode());
 					double lyl = 0.0;
 					if(wpd.getTotal()!=0){

src/com/hcks/cmfds/service/Windturbineinfoday3Service.java

@@ -41,7 +41,7 @@ public class Windturbineinfoday3Service extends
 			String sortName, String sortOrder) {
 		List<Windturbineinfoday3> vos = new ArrayList<Windturbineinfoday3>();
 		List<Windturbineinfoday3> vosapp = new ArrayList<Windturbineinfoday3>();
-		String sql = "select * from powerAjax t where 1=1 and windpowerstationid !='SY_FDC' ";
+		String sql = "select * from powerAjax t where 1=1  ";
 		if (StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
 			// Map<String, Object> params = new HashMap<String, Object>();
 			List<Object> objs = new ArrayList<Object>();

src/com/hcks/cmfds/service/agc/AgcShowService.java

@@ -51,9 +51,9 @@ public class AgcShowService {
 		Map<String, Double> resultmap = new HashMap<String, Double>();
 		List<Windpowerstation> wpList = CacheContext.wpls;
 		for (Windpowerstation wp : wpList) {
-			if(wp.getId().equals("SY_FDC")){
+			/*if(wp.getId().equals("SY_FDC")){
 				continue;
-			}
+			}*/
 			String[] agcPoints = Constant.TPOINT_WP_AGC;
 
 			Map<String, WindPowerStationTestingPoint> map = CacheContext.stationPointmap
@@ -144,9 +144,9 @@ public class AgcShowService {
 		String[] ycPoints3 = Constant.TPOINT_WP_FGLYC48.split(",");
 		int length = 48;
 		for (Windpowerstation wp : wpList) {
-			if(wp.getId().equals("SY_FDC")){
+			/*if(wp.getId().equals("SY_FDC")){
 				continue;
-			}
+			}*/
 			Calendar cal2 = Calendar.getInstance();
 			cal2.setTime(beginDate);
 			List<DataVo> vos = new ArrayList<DataVo>();
@@ -185,6 +185,10 @@ public class AgcShowService {
 				for (int i = 0; i < vos.size(); i++) {
 					vos.get(i).setValue6((double) count);
 				}
+			}else{
+				for (int i = 0; i < vos.size(); i++) {
+					vos.get(i).setValue1(0.0);
+				}
 			}
 			WindPowerStationTestingPoint llgl = map
 					.get(Constant.TPOINT_WP_ZZSGL);
@@ -214,6 +218,10 @@ public class AgcShowService {
 				for (int i = 0; i < vos.size(); i++) {
 					vos.get(i).setValue5((double) count);
 				}
+			}else{
+				for (int i = 0; i < vos.size(); i++) {
+					vos.get(i).setValue4(0.0);
+				}
 			}
 			WindPowerStationTestingPoint xdgl = map.get(agcPoints[1]);
 			if (null != xdgl) {
@@ -239,6 +247,10 @@ public class AgcShowService {
 				for (int i = 0; i < vos.size(); i++) {
 					vos.get(i).setValue7((double) count);
 				}
+			}else{
+				for (int i = 0; i < vos.size(); i++) {
+					vos.get(i).setValue2(0.0);
+				}
 			}
 
 			if (map.containsKey(ycPoints[0])) {
@@ -266,11 +278,16 @@ public class AgcShowService {
 							for (int i = 0; i < subresult; i++) {
 								WindPowerStationTestingPoint ycgl = map
 										.get(ycPoints2[i]);
-								double value = 0.0;
-								value = ednaApiUtil.getRealData(ycgl)
-										.getPointValueInDouble();
-								vos.get(datas.size() + i).setValue3(
-										StringUtils.round(value, 2));
+								if(ycgl!=null){
+									double value = 0.0;
+									value = ednaApiUtil.getRealData(ycgl)
+											.getPointValueInDouble();
+									vos.get(datas.size() + i).setValue3(
+											StringUtils.round(value, 2));
+								}else{
+									vos.get(datas.size() + i).setValue3(0d);
+								}
+								
 							}
 							total = datas.size() + subresult;
 							subresult = length - (total);
@@ -286,6 +303,10 @@ public class AgcShowService {
 						}
 					}
 				//}// else结束
+			}else{
+				for (int i = 0; i < vos.size(); i++) {
+					vos.get(i).setValue3(0.0);
+				}
 			}
 			double ycgl3;
 			cal.setTime(DateUtils.now());//把当前时间赋给日历
@@ -308,6 +329,10 @@ public class AgcShowService {
 				for (int k = 0; k < vos.size(); k++) {
 					vos.get(k).setValue10(48.0);
 				}
+			}else{
+				for (int i = 0; i < vos.size(); i++) {
+					vos.get(i).setValue9(0.0);
+				}
 			}
 			resultmap.put(wp.getId(), vos);
 		}

src/com/hcks/cmfds/service/monitor/WindTowerService.java

@@ -31,6 +31,7 @@ public class WindTowerService extends GenericJdbcDao<Windpowerstationthewindinfo
      * @return
      * @throws Exception 
      * @since JDK 1.6
+     * 李玉生修改
      */
 	public Map<String, Double> findWtowerInfo(String wpId) throws Exception {
 		Map<String, Double> map =new HashMap<String, Double>();

src/com/hcks/cmfds/service/system/DeskTopService.java

@@ -197,9 +197,10 @@ public class DeskTopService extends GenericJdbcDao<Windturbine> {
 
 								}
 							} else {
-								pointids.add(CacheContext.stationPointmap.get(wpls.get(k).getId()).get(uniformcode[i])
-										.getCode().trim());
-								uniformcode2.add(uniformcode[i]);
+									pointids.add(CacheContext.stationPointmap.get(wpls.get(k).getId()).get(uniformcode[i])
+											.getCode().trim());
+									uniformcode2.add(uniformcode[i]);
+								
 							}
 						}
 					}