Merge branch 'master' of http://192.168.10.120:8080/other-project/qiankunweb

src/main/webapp/WEB-INF/decorators/main.jsp

@@ -48,21 +48,22 @@
         </button>
         <ul class="layui-nav" lay-filter="">
           <li class="layui-nav-item <c:if test="${nav=='index'}">layui-this</c:if>"><a href="index.html">首页</a></li>
-          <li class="layui-nav-item <c:if test="${nav=='product'||nav=='ability'}">layui-this</c:if>">
-          		<a href="#" >产品</a>
+           <li class="layui-nav-item <c:if test="${nav=='ability'}">layui-this</c:if>"><a href="ability.html">技术能力</a></li>
+          <li class="layui-nav-item <c:if test="${nav=='product'}">layui-this</c:if>">
+          		<a href="#" >产品服务</a>
           		
-			    <ul class="layui-nav-child" style="width:400px;"> 
-		         <li> 
+			    <ul class="layui-nav-child" style="width:200px;"> 
+		         <!-- <li> 
 		          <ul> 
 		           <li class="listTitle">能力</li> 
 		           <li><a href="ability.html" class="">数据感知</a></li> 
 		           <li><a href="ability.html" class="">数据治理</a></li> 
 		           <li><a href="ability.html" class="">智能预警</a></li> 
 		           <li><a href="ability.html" class="">虚拟可视化</a></li> 
-		          </ul> </li> 
+		          </ul> </li> --> 
 		         <li> 
 		          <ul> 
-		           <li class="listTitle">产品</li> 
+		           <!-- <li class="listTitle">产品</li> --> 
 		           <li><a href="product.html?id=perspective" class="">业务透视平台</a></li> 
 		           <li><a href="product.html?id=fictitious" class="">虚拟指挥中心</a></li> 
 		           <li><a href="product.html?id=analysis" class="">业务数据治理平台</a></li> 
@@ -92,7 +93,7 @@
           
           </li>
           
-          <li class="layui-nav-item <c:if test="${nav=='service'}">layui-this</c:if>"><a href="#">服务中心</a></li>
+         <%--  <li class="layui-nav-item <c:if test="${nav=='service'}">layui-this</c:if>"><a href="#">服务中心</a></li> --%>
           
           <li class="layui-nav-item <c:if test="${nav=='about'}">layui-this</c:if>"><a href="about.html">关于我们</a></li>
         </ul>

src/main/webapp/WEB-INF/pages/fictitious.jsp

@@ -78,11 +78,11 @@
 			    	<div class="layui-col-sm6 layui-col-md12">
 			          <div class=" " style="height:610px;text-align: center;">
 			            <div>
-			              <p class="label">基于拖拽方式的3D场景构建能力，基于Gis数据构造场景，使3D场景的构建简单易行。</p>
+			              <p class="label">当虚拟指挥中心接收告警数据，指挥中心会弹出相应告警信息，并在场景异常范围显示故障特效，如：烟雾、火源等，在告警面板可以查询历史告警。</p>
 			            </div>
 			            
 			            
-			            <div><img src="resources/static/img/3d1.png"></div>
+			            <div><img src="resources/static/img/sn1.png"></div>
 			            <!-- <a href="javascript:;">查看产品 ></a> -->
 			          </div>
 			        </div>
@@ -100,6 +100,27 @@
 		  
 		  	<div class="layui-container">
 			    
+			    <div class="layui-row layui-col-space25">
+			    	<div class="layui-col-sm6 layui-col-md12">
+			          <div class=" " style="height:610px;text-align: center;">
+			            <div>
+			              <p class="label">当虚拟指挥中心接收告警数据，指挥中心会弹出相应告警信息，并在场景异常范围显示故障特效，如：烟雾、火源等，在告警面板可以查询历史告警。</p>
+			            </div>
+			            
+			            
+			            <div><img src="resources/static/img/sn1.png"></div>
+			            <!-- <a href="javascript:;">查看产品 ></a> -->
+			          </div>
+			        </div>
+			        
+			        
+			    
+			    </div>
+			    
+			    <p></p>
+			   </div>
+		  <!-- <div class="layui-container">
+			    
 			    <div class="layui-row layui-col-space25">
 			    	<div class="layui-col-sm6 layui-col-md12">
 			          <div class=" " style="height:750px;text-align: center;">
@@ -109,7 +130,7 @@
 			            
 			            
 			            <div><iframe src="http://39.100.79.208:9090/overview?userId=campus" style="padding:0; margin:0 auto;position:relative; bottom: 0px;left:0px" width="988" height="550px" frameborder="0"></iframe></div>
-			            <!-- <a href="javascript:;">查看产品 ></a> -->
+			            <a href="javascript:;">查看产品 ></a>
 			          </div>
 			        </div>
 			        
@@ -118,7 +139,7 @@
 			    </div>
 			    
 			    <p></p>
-		   </div>
+		   </div> -->
   </div>
 
   

src/main/webapp/WEB-INF/pages/index.jsp

@@ -38,7 +38,7 @@
   <div class="main-product">
     <div class="layui-container">
       <p class="title">以用户为中心的数据运营<span>核心能力</span></p>
-      <div class="layui-row layui-col-space25">
+      <div class="layui-row layui-col-space25" style="cursor: pointer;" onclick="window.location.href='ability.html'">
         <div class="layui-col-sm6 layui-col-md3">
           <div class="content">
             <div><img src="resources/static/img/Big_icon1.png"></div>

src/main/webapp/resources/static/css/index.css

@@ -202,7 +202,7 @@ body{background: #FFF;}
   .nav.index{background: rgba(255, 255, 255 ,0.8);}
   .nav .nav-list button{display: none;}
   .nav .layui-nav{width: auto; position: absolute; top: 0; padding: 0 5px; border-radius: 0; margin: 0;}
-  .nav .layui-nav .layui-nav-item{display: inline-block; margin:0 53px; line-height: 80px;}
+  .nav .layui-nav .layui-nav-item{display: inline-block; margin:0 35px; line-height: 80px;}
   .main-product p.title
   ,.main-service p.title{font-size: 36px; line-height: 216px;}
   .main.product .content .content-img{text-align: left;}