Browse Source

修改细节

wanghui 8 years ago
parent
commit
5891efb087

+ 3 - 3
src/main/java/com/goafanti/common/controller/PortalController.java

@@ -166,7 +166,7 @@ public class PortalController extends BaseController {
 		List<DemandListBo> redemandlist = new ArrayList<DemandListBo>();
 
 		if (demandlist.size() >= 5) {
-			int idx = (int) new Random().nextInt(demandlist.size() - 4);
+			int idx =  new Random().nextInt(demandlist.size() - 4);
 			redemandlist.add(demandlist.get(idx));
 			redemandlist.add(demandlist.get(idx + 1));
 			redemandlist.add(demandlist.get(idx + 2));
@@ -376,7 +376,7 @@ public class PortalController extends BaseController {
 		List<AchievementListBo> boutiqueachievement = achievementService.getAchievement(1);
 		List<AchievementListBo> reboutiqueachievement = new ArrayList<AchievementListBo>();
 		if (boutiqueachievement.size() >= 4) {
-			int index = (int) new Random().nextInt(boutiqueachievement.size() - 3);
+			int index =  new Random().nextInt(boutiqueachievement.size() - 3);
 			reboutiqueachievement.add(boutiqueachievement.get(index));
 			reboutiqueachievement.add(boutiqueachievement.get(index + 1));
 			reboutiqueachievement.add(boutiqueachievement.get(index + 2));
@@ -403,7 +403,7 @@ public class PortalController extends BaseController {
 		List<AchievementListBo> reachievementlist = new ArrayList<AchievementListBo>();
 
 		if (achievementlist.size() >= 5) {
-			int idx = (int) new Random().nextInt(achievementlist.size() - 4);
+			int idx =  new Random().nextInt(achievementlist.size() - 4);
 			reachievementlist.add(achievementlist.get(idx));
 			reachievementlist.add(achievementlist.get(idx + 1));
 			reachievementlist.add(achievementlist.get(idx + 2));

+ 2 - 2
src/main/webapp/WEB-INF/views/common.html

@@ -179,7 +179,7 @@
 						<p>实名认证</p>
 					</a>
 				</li>
-				<li th:if="${!isLogin}"><a href=""> <img
+				<li th:classappend="${!isLogin}? 'head_login'"><a href=""> <img
 						th:src="${portalHost+'/img/index_fix1.png'}" alt="" />
 						<p>发布需求</p>
 				</a></li>
@@ -187,7 +187,7 @@
 						th:src="${portalHost+'/img/index_fix1.png'}" alt="" />
 						<p>发布需求</p>
 				</a></li>
-				<li th:if="${!isLogin}"><a href=""> <img
+				<li th:classappend="${!isLogin}? 'head_login'"><a href=""> <img
 						th:src="${portalHost+'/img/index_fix2.png'}" alt="" />
 						<p>发布技术</p>
 				</a></li>

+ 122 - 99
src/main/webapp/WEB-INF/views/portal/index.html

@@ -7,97 +7,103 @@
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/index.css'}" rel="stylesheet">
 </head>
-<body>  	
-  	<header>
+<body>
+	<header>
 		<div th:replace="common::nav('','')"></div>
 	</header>
 	<div class="carouselt">
 		<ul class="ct-img-big clear">
-			<li data-index=0 ><a href=""><img th:src="${portalHost+'/img/index_banner01.jpg'}" alt=""/></a></li>
-			<li data-index=1 ><a href=""><img th:src="${portalHost+'/img/index_banner02.jpg'}" alt=""/></a></li>
-			<li data-index=2 ><a href=""><img th:src="${portalHost+'/img/index_banner03.jpg'}" alt=""/></a></li>
+			<li data-index=0><a href=""><img
+					th:src="${portalHost+'/img/index_banner01.jpg'}" alt="" /></a></li>
+			<li data-index=1><a href=""><img
+					th:src="${portalHost+'/img/index_banner02.jpg'}" alt="" /></a></li>
+			<li data-index=2><a href=""><img
+					th:src="${portalHost+'/img/index_banner03.jpg'}" alt="" /></a></li>
+			<li data-index=3><a href=""><img
+					th:src="${portalHost+'/img/index_banner04.jpg'}" alt="" /></a></li>
 		</ul>
-		<a class="btn btn-next" href="">
+		<!-- <a class="btn btn-next" href="">
 			<img th:src="${portalHost+'/img/index_next.png'}" alt=""/>
 		</a>
 		<a class="btn btn-pre" href="">
 			<img th:src="${portalHost+'/img/index_pre.png'}" alt=""/>
-		</a>
+		</a> -->
+		<ul class="ct-img-small clear">
+
+		</ul>
 	</div>
 	<div class="index_activity">
 		<div class="container">
 			<ul>
-				<li>
-					<strong>6900条</strong>
-					<p>需求数</p>
-				</li>
-				<li>
-					<strong>20万</strong>
-					<p>成果数</p>
-				</li>
-				<li>
-					<strong>2万个</strong>
-					<p>专家数</p>
-				</li>
-				<li>
-					<strong>1200笔</strong>
-					<p>专利交易</p>
-				</li>
-				<li>
-					<strong>12000家</strong>
-					<p>客户数</p>
-				</li>
-				<li>
-					<strong>68场</strong>
-					<p>技术对接场次</p>
-				</li>
+				<li><strong>6835条</strong>
+					<p>需求数</p></li>
+				<li><strong>204628条</strong>
+					<p>成果数</p></li>
+				<li><strong>21426个</strong>
+					<p>专家数</p></li>
+				<li><strong>853笔</strong>
+					<p>专利交易</p></li>
+				<li><strong>12495家</strong>
+					<p>客户数</p></li>
+				<li><strong>68场</strong>
+					<p>技术对接场次</p></li>
 			</ul>
-		</div> 		
-  	</div>
- 	<div id="active">
+		</div>
+	</div>
+	<div id="active">
 		<div class="coupon rf">
 			<div class="coupon_cont lf">
-				<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
-				<h2>注册即送代金券1000元</h2>
-				<p>立即领取</p>
-				</a>				
+				<a
+					href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
+					<h2>注册即送代金券1000元</h2>
+					<p>立即领取</p>
+				</a>
 			</div>
 			<div class="coupon_cont lf">
-				<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
-				<h2>做高新,送软著</h2>
-				<p>立即领取</p>
-				</a>						
+				<a
+					href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
+					<h2>做高新,送软著</h2>
+					<p>立即领取</p>
+				</a>
 			</div>
 			<div class="coupon_cont lf">
-				<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
-				<h2>买专利,享九折</h2>
-				<p>立即领取</p>
-				</a>						
+				<a
+					href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
+					<h2>买专利,享九折</h2>
+					<p>立即领取</p>
+				</a>
 			</div>
 			<div class="coupon_cont lf">
-				<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
-				<h2>百元做软著</h2>
-				<p>立即领取</p>
-				</a>								
+				<a
+					href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
+					<h2>百元做软著</h2>
+					<p>立即领取</p>
+				</a>
 			</div>
 		</div>
 		<div class="title">
 			<p>强势放价</p>
-		</div>
+		</div>      
 		<div class="line"></div>
 	</div>
 	<div id="product">
-		<div class="caption">精品成果<a th:href="${basePath + '/portal/technologyTrading/achievement.html'}">MORE+</a></div>
+		<div class="caption">
+			精品成果<a
+				th:href="${basePath + '/portal/technologyTrading/achievement.html'}">MORE+</a>
+		</div>
 		<div class="content">
 			<div class="con_hover">
-				<img th:src="${portalHost + '/img/search_txt.png'}" alt="" />
-				<p>详情</p>
+				<a href="#"> <img th:src="${portalHost + '/img/search_txt.png'}"
+					alt="" />
+					<p>详情</p>
+				</a>
 			</div>
 			<div class="cont cont_top1">
-				<a th:href="${basePath + '/portal/technologyTrading/achievementDetail?id=66b56b38-4e12-4089-892f-12f43d15387d&type=1'}">
+				<a
+					th:href="${basePath + '/portal/technologyTrading/achievementDetail?id=66b56b38-4e12-4089-892f-12f43d15387d&type=1'}">
 					<div class="img">
-						<img th:src="${portalHost+'/img/index_one.png'}" alt=""/>
-						<img th:src="${portalHost+'/img/product1.jpg'}" alt=""/>
+						<img th:src="${portalHost+'/img/index_one.png'}" alt="" /> <img
+							th:src="${portalHost+'/img/product1.jpg'}" alt="" />
 					</div>
 					<div class="text">
 						<h2>军民两用无人飞行器系统</h2>
@@ -106,10 +112,11 @@
 				</a>
 			</div>
 			<div class="cont cont_bottom1">
-				<a th:href="${basePath + '/portal/technologyTrading/achievementDetail?id=03120e15-6eb2-4066-9d04-ca59278fba8d&type=1'}">
+				<a
+					th:href="${basePath + '/portal/technologyTrading/achievementDetail?id=03120e15-6eb2-4066-9d04-ca59278fba8d&type=1'}">
 					<div class="img">
-						<img th:src="${portalHost+'/img/index_two.png'}" alt=""/>
-						<img th:src="${portalHost+'/img/product2.jpg'}" alt=""/>
+						<img th:src="${portalHost+'/img/index_two.png'}" alt="" /> <img
+							th:src="${portalHost+'/img/product2.jpg'}" alt="" />
 					</div>
 					<div class="text">
 						<h2>新型炭纳米管-石墨烯交联网络高导热薄膜</h2>
@@ -118,10 +125,11 @@
 				</a>
 			</div>
 			<div class="cont cont_top2">
-				<a th:href="${basePath + '/portal/technologyTrading/achievementDetail?id=73e9d01d-fc19-4585-a6e3-9ae4c9c274c6&type=1'}">
+				<a
+					th:href="${basePath + '/portal/technologyTrading/achievementDetail?id=73e9d01d-fc19-4585-a6e3-9ae4c9c274c6&type=1'}">
 					<div class="img">
-						<img th:src="${portalHost+'/img/index_three.png'}" alt=""/>
-						<img th:src="${portalHost+'/img/product3.jpg'}" alt=""/>
+						<img th:src="${portalHost+'/img/index_three.png'}" alt="" /> <img
+							th:src="${portalHost+'/img/product3.jpg'}" alt="" />
 					</div>
 					<div class="text">
 						<h2>基于原位氧化吸附热敏染料废水处理技术</h2>
@@ -130,10 +138,11 @@
 				</a>
 			</div>
 			<div class="cont cont_bottom2">
-				<a th:href="${basePath + '/portal/technologyTrading/achievementDetail?id=4ce4132f-3749-46da-843b-d4448c78a65b&type=1'}">
+				<a
+					th:href="${basePath + '/portal/technologyTrading/achievementDetail?id=4ce4132f-3749-46da-843b-d4448c78a65b&type=1'}">
 					<div class="img">
-						<img th:src="${portalHost+'/img/index_four.png'}" alt=""/>
-						<img th:src="${portalHost+'/img/product4.jpg'}" alt=""/>
+						<img th:src="${portalHost+'/img/index_four.png'}" alt="" /> <img
+							th:src="${portalHost+'/img/product4.jpg'}" alt="" />
 					</div>
 					<div class="text">
 						<h2>智能网联驾驶技术</h2>
@@ -142,10 +151,11 @@
 				</a>
 			</div>
 			<div class="cont cont_top3">
-				<a th:href="${basePath + '/portal/technologyTrading/achievementDetail?id=3ffb74be-fb8c-48df-9e29-31cc721ec44e&type=1'}">
+				<a
+					th:href="${basePath + '/portal/technologyTrading/achievementDetail?id=3ffb74be-fb8c-48df-9e29-31cc721ec44e&type=1'}">
 					<div class="img">
-						<img th:src="${portalHost+'/img/index_five.png'}" alt=""/>
-						<img th:src="${portalHost+'/img/product5.jpg'}" alt=""/>
+						<img th:src="${portalHost+'/img/index_five.png'}" alt="" /> <img
+							th:src="${portalHost+'/img/product5.jpg'}" alt="" />
 					</div>
 					<div class="text">
 						<h2>MR-PET高端医学影像装备的关键技术与关键部</h2>
@@ -156,15 +166,21 @@
 		</div>
 	</div>
 	<div id="policy">
-		<div class="captions">智政 <a th:href="${basePath + '/portal/thinkTank/policyList.html'}">MORE+</a></div>
+		<div class="captions">
+			智&nbsp;&nbsp;&nbsp;&nbsp;政  <a
+				th:href="${basePath + '/portal/thinkTank/policyList.html'}">MORE+</a>
+		</div>
 		<div class="pol_cont">
 			<div class="pol_left">
-				<img th:src="${portalHost+'/img/policy.jpg'}" alt=""/>
+				<img th:src="${portalHost+'/img/policy.jpg'}" alt="" />
 				<div class="pol_left_cont">
 					<h3>解读习近平总书记在中央财经领导小组第十六次会议上关于知识产权工作的重要论述</h3>
 					<p>“要调动拥有知识产权的自然人和法人的积极性和主动性,提升产权意识,自觉运用法律武器依法维权。</p>
 					<div class="pol_bottom">
-						<div class="more rf"><a th:href="${basePath + '/portal/news/newsDetail?id=116557327490236416'}">MORE+</a></div>
+						<div class="more rf">
+							<a
+								th:href="${basePath + '/portal/news/newsDetail?id=116557327490236416'}">MORE+</a>
+						</div>
 						<div class="data">2017-09-18</div>
 					</div>
 				</div>
@@ -174,7 +190,10 @@
 					<h3>国务院知识产权局印发《“十三五”国家知识产权保护和运用规划重点任务分工方案》</h3>
 					<p>中央组织部、中央编办、中央综治办、中央网信办,国务院知识产权战略实施工作部际联席会议各成员单位,民政部、食品药品监管总局</p>
 					<div class="pol_bottom">
-						<div class="more rf"><a th:href="${basePath + '/portal/news/newsDetail?id=116558483981484032'}">MORE+</a></div>
+						<div class="more rf">
+							<a
+								th:href="${basePath + '/portal/news/newsDetail?id=116558483981484032'}">MORE+</a>
+						</div>
 						<div class="data">2017-09-18</div>
 					</div>
 				</div>
@@ -182,15 +201,21 @@
 					<h3>科技部发布国家重点研发计划智能机器人等重点专项2017年度项目申报指南</h3>
 					<p>各省、自治区、直辖市及计划单列市科技厅(委、局),新疆生产建设兵团科技局,国务院各有关部门科技主管司局,各有关单位</p>
 					<div class="pol_bottom">
-						<div class="more rf"><a th:href="${basePath + '/portal/news/newsDetail?id=116557895017316352'}">MORE+</a></div>
+						<div class="more rf">
+							<a
+								th:href="${basePath + '/portal/news/newsDetail?id=116557895017316352'}">MORE+</a>
+						</div>
 						<div class="data">2017-09-18</div>
 					</div>
 				</div>
-				<div class="pol_right_sm pol_act">				
+				<div class="pol_right_sm pol_act">
 					<h3>开展湖南省2017年高新技术企业认定工作的通知</h3>
 					<p>申报条件:(一)在中国境内(不含港、澳、台地区)注册的企业,近三年内通过自主研发、受让、受赠、并购等方式</p>
 					<div class="pol_bottom">
-						<div class="more rf"><a th:href="${basePath + '/portal/news/newsDetail?id=116548420894081024'}">MORE+</a></div>
+						<div class="more rf">
+							<a
+								th:href="${basePath + '/portal/news/newsDetail?id=116548420894081024'}">MORE+</a>
+						</div>
 						<div class="data">2017-09-18</div>
 					</div>
 				</div>
@@ -200,61 +225,57 @@
 	<div class="need_main">
 		<div id="need">
 			<div class="caption">精品需求</div>
-			<span class="more"><a th:href="${basePath + '/portal/technologyTrading/demand.html'}">MORE+</a></span>
+			<span class="more"><a
+				th:href="${basePath + '/portal/technologyTrading/demand.html'}">MORE+</a></span>
 			<div class="carousel">
 				<span class="need_prev"><</span>
 				<div class="need_imgs">
 					<ul>
-						<li>
-							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=cdee3d8f-affe-45b0-9fd2-542cb2ed16fa&type=1'}">
-								<img th:src="${portalHost+'/img/need_img1.jpg'}" alt="" />	
+						<li><a
+							th:href="${basePath + '/portal/technologyTrading/demandDetail?id=cdee3d8f-affe-45b0-9fd2-542cb2ed16fa&type=1'}">
+								<img th:src="${portalHost+'/img/need_img1.jpg'}" alt="" />
 								<p>新型纳米涂料技术</p>
 								<div class="need_black">
 									<img th:src="${portalHost+'/img/search_txt.png'}" alt="" />
 									<p>详情</p>
 								</div>
-							</a>
-						</li>
-						<li>
-							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=b17c5768-327d-4d90-8557-e4f21af050b0&type=1'}">
+						</a></li>
+						<li><a
+							th:href="${basePath + '/portal/technologyTrading/demandDetail?id=b17c5768-327d-4d90-8557-e4f21af050b0&type=1'}">
 								<img th:src="${portalHost+'/img/need_img2.jpg'}" alt="" />
 								<p>汽车空调的辅助制冷装置</p>
 								<div class="need_black">
 									<img th:src="${portalHost+'/img/search_txt.png'}" alt="" />
 									<p>详情</p>
 								</div>
-							</a>
-						</li>
-						<li>
-							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=e6b9869a-15aa-437a-afdd-0c289acd8cbf&type=1'}">
+						</a></li>
+						<li><a
+							th:href="${basePath + '/portal/technologyTrading/demandDetail?id=e6b9869a-15aa-437a-afdd-0c289acd8cbf&type=1'}">
 								<img th:src="${portalHost+'/img/need_img1.jpg'}" alt="" />
 								<p>高性能铅炭电池</p>
 								<div class="need_black">
 									<img th:src="${portalHost+'/img/search_txt.png'}" alt="" />
 									<p>详情</p>
 								</div>
-							</a>
-						</li>
-						<li>
-							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=9b815c37-9748-4224-9770-07df8f35a6d9&type=1'}">
+						</a></li>
+						<li><a
+							th:href="${basePath + '/portal/technologyTrading/demandDetail?id=9b815c37-9748-4224-9770-07df8f35a6d9&type=1'}">
 								<img th:src="${portalHost+'/img/need_img2.jpg'}" alt="" />
 								<p>ABS板材改性工程塑料的配方及研究</p>
 								<div class="need_black">
 									<img th:src="${portalHost+'/img/search_txt.png'}" alt="" />
 									<p>详情</p>
 								</div>
-							</a>
-						</li>
-						<li>
-							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=5335f8d9-0e4d-4263-8d99-8faf92de5f1d&type=1'}">
+						</a></li>
+						<li><a
+							th:href="${basePath + '/portal/technologyTrading/demandDetail?id=5335f8d9-0e4d-4263-8d99-8faf92de5f1d&type=1'}">
 								<img th:src="${portalHost+'/img/need_img3.jpg'}" alt="" />
 								<p>机械领域新型产品或技术</p>
 								<div class="need_black">
 									<img th:src="${portalHost+'/img/search_txt.png'}" alt="" />
 									<p>详情</p>
 								</div>
-							</a>
-						</li>
+						</a></li>
 					</ul>
 				</div>
 				<span class="need_next">></span>
@@ -265,7 +286,9 @@
 		<div th:replace="common::copyright"></div>
 		<div th:replace="common::login"></div>
 	</footer>
-	<div class="smg"><input type="text" name="msg" value="" id="msg"/></div>
+	<div class="smg">
+		<input type="text" name="msg" value="" id="msg" />
+	</div>
 	<div th:replace="common::footer(~{::script})">
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/index.js'}"></script>

+ 11 - 12
src/main/webapp/WEB-INF/views/portal/thinkTank/policyList.html

@@ -12,20 +12,21 @@
 		<div th:replace="common::nav('thinkTank','policyList')"></div>
 	</header>
 	<!--banner-->
-  	<div class="carouselt">
+	<div class="carouselt">
 		<ul class="ct-img-big clear">
-			<li data-index=0 ><img th:src="${portalHost + '/img/highTech_slide_1.jpg'}" alt=""/></li>
-			<li data-index=1 ><img th:src="${portalHost + '/img/highTech_slide_2.jpg'}" alt=""/></li>
-			<li data-index=2 ><img th:src="${portalHost + '/img/highTech_slide_3.jpg'}" alt=""/></li>
-			<li data-index=3 ><img th:src="${portalHost + '/img/highTech_slide_4.jpg'}" alt=""/></li>
-			<li data-index=4 ><img th:src="${portalHost + '/img/highTech_slide_5.jpg'}" alt=""/></li>
+			<li data-index=0 ><img th:src="${portalHost + '/img/thinkTank_banner01.jpg'}" alt=""/></li>
+			<li data-index=1 ><img th:src="${portalHost + '/img/thinkTank_banner01.jpg'}" alt=""/></li>
+			<li data-index=2 ><img th:src="${portalHost + '/img/thinkTank_banner01.jpg'}" alt=""/></li>
 		</ul>
-		<a class="btn btn-next" href="">
+		<!-- <a class="btn btn-next" href="">
 			<img th:src="${portalHost + '/img/index_next.png'}" alt=""/>
 		</a>
 		<a class="btn btn-pre" href="">
 			<img th:src="${portalHost + '/img/index_pre.png'}" alt=""/>
-		</a>
+		</a> -->
+		<ul class="ct-img-small clear">
+
+		</ul>
 	</div>
 	<!--主体内容区域开始-->
     <div class="main_top">
@@ -34,11 +35,9 @@
 	            <ul class="detail_toptitle">
 	            	<li><img th:src="${portalHost + '/img/detail_home.jpg'}" alt="" /></li>
 	            	<li>></li> 
-	                <li><a href="#">智库咨询</a></li>
+	                 <li><a th:href="${basePath + '/portal/thinkTank/index.html'}">智库咨询</a></li>
 	                <li>></li>               
-	                <li><a href="#">智政</a></li>
-	                <li>></li>
-	                <li class="that"><a href="#" >智政资讯 </a></li>
+	                <li><a th:href="${basePath + '/portal/thinkTank/policyList.html'}">智政</a></li>
 	            </ul>
 	            <div class="portal-content">
 					<div class="search-criteria row">