Browse Source

首页智者修改、投资机构页面修复

Michael_9527 8 years ago
parent
commit
6f19daa448

+ 1 - 0
src/main/java/com/goafanti/common/enums/MarketingPage.java

@@ -4,6 +4,7 @@ public enum MarketingPage {
 	mainAchievement("/index",1,5), //首页成果
 	mainDemand("/index",2,5),	// 首页需求
 	mainPolicy("/index",6,3); //首页政策
+	
 	MarketingPage(String pageUrl,Integer boothType,Integer boothSize){
 		this.boothSize = boothSize;
 		this.pageUrl = pageUrl;

+ 19 - 2
src/main/java/com/goafanti/portal/controller/PortalFinancialController.java

@@ -1,5 +1,8 @@
 package com.goafanti.portal.controller;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -8,6 +11,8 @@ import org.springframework.web.servlet.ModelAndView;
 
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.controller.BaseController;
+import com.goafanti.user.bo.OrgPartnerDetailBo;
+import com.mysql.fabric.xmlrpc.base.Array;
 
 /**
  * 
@@ -39,9 +44,21 @@ public class PortalFinancialController extends BaseController{
 	@RequestMapping(value = "/portal/financial/investmentDetail", method = RequestMethod.GET)
 	public ModelAndView investmentDetail(String organizationId){
 		ModelAndView mv = new ModelAndView();
-		
+		OrgPartnerDetailBo bo=new OrgPartnerDetailBo();
 		mv.setViewName("/portal/financial/investmentDetail");
+		List<OrgPartnerDetailBo> list = new ArrayList<OrgPartnerDetailBo>();
+		mv.addObject("bo",bo);
+		mv.addObject("recommendCompanyList",list);
+		return mv;
+	}
+	@RequestMapping(value = "/portal/financial/investmentInstitution", method = RequestMethod.GET)
+	public ModelAndView investmentInstitution(String organizationId){
+		ModelAndView mv = new ModelAndView();
+		OrgPartnerDetailBo bo=new OrgPartnerDetailBo();
+		mv.setViewName("/portal/financial/investmentInstitution");
+		List<OrgPartnerDetailBo> list = new ArrayList<OrgPartnerDetailBo>();
+		mv.addObject("bo",bo);
+		mv.addObject("recommendCompanyList",list);
 		return mv;
 	}
-	
 }

+ 4 - 4
src/main/webapp/WEB-INF/views/portal/financial/investmentDetail.html

@@ -33,7 +33,7 @@
 	                <li>></li>
 	                <li><a th:href="${basePath + '/portal/financial/investmentInstitution.html'}">投资机构 </a></li>
 	                <li>></li>
-	             	<li class="that" th:text="${bo.companyName}"></li>
+	             	<li class="that" th:text="${bo.unitName}"></li>
 	            </ul>
 	        </div>
 	    </div>    
@@ -81,8 +81,8 @@
         					<p>线下约见<span> 32次</span></p>
         				</div>
         			</div>        			
-        			<h4 th:text="${bo.companyName}"></h4>
-        			<p>所在地:   <span th:text=${bo.companyLocation}></span></p>
+        			<h4 th:text="${bo.unitName}"></h4>
+        			<p>所在地:   <span th:text=${bo.city}></span></p>
         			<a onclick="_MEIQIA('showPanel')">在线咨询</a>       			
         		</div>
         		<div class="institutions_bottom">
@@ -91,7 +91,7 @@
        				<li th:each="company : ${recommendCompanyList}">
        						<img th:src="${portalHost + company.logoUrl}" alt="" />
        						<a th:href="@{/portal/financial/investmentDetail(organizationId=${company.id})}">
-	       						<p th:text="${company.companyName}"></p>
+	       						<p th:text="${company.unitName}"></p>
 	       						<p th:text="${company.companyIntroduction}"></p>
        						</a>
        					</li> 				

+ 74 - 34
src/main/webapp/WEB-INF/views/portal/index.html

@@ -200,42 +200,82 @@
 		<div id="index_man">
 			<div class="index_man">
 				<img src="../img/index_er6.png" alt="" />
-				<div class="index_cont">
-					<div>
-						<a href="#">
-							<div class="index_oneman">
-								<img src="../img/index_er1.jpg" alt="" />
-								<h4 class="appellation" th:text="${rePartnerDetail.position}?${rePartnerDetail.position}:''"></h4>
-								<h3 class="definition" th:text="${rePartnerDetail.workUnit}?${rePartnerDetail.workUnit}:${rePartnerDetail.username}"></h3>
-								<p th:text="${rePartnerDetail.achievement}"></p>
-							</div>
-						</a>	
-					</div>
-					<div>
-						<a href="#">
-							<div class="index_oneman">
-								<img src="../img/index_er1.jpg" alt="" />
-								<h4 class="appellation">湖南大学生物科学教授</h4>
-								<h3 class="definition">梁晓欣</h3>
-								<p>食子酸在高温和中压条件下可以脱去羧基,从而获得焦性没食子酸,再通过升华的方式获得较纯的焦性没食子产品,
-							单升华方式产能较低且能耗高,希望通过其他方式(重结晶)等获得此产品,提高产品的产能降低能耗。</p>
-							</div>
-						</a>	
-					</div>
-					<div>
-						<a href="#">
-							<div class="index_oneman">
-								<img src="../img/index_er1.jpg" alt="" />
-								<h4 class="appellation">湖南大学生物科学教授</h4>
-								<h3 class="definition">梁晓欣</h3>
-								<p>食子酸在高温和中压条件下可以脱去羧基,从而获得焦性没食子酸,再通过升华的方式获得较纯的焦性没食子产品,
-							单升华方式产能较低且能耗高,希望通过其他方式(重结晶)等获得此产品,提高产品的产能降低能耗。</p>
-							</div>
-						</a>	
+				<div>
+					<span class="man_left">
+						<img src="../img/index_er7.png" alt="" />
+					</span>
+					<div class="index_cont">
+						<div>
+							<a href="#">
+								<div class="index_oneman">
+									<img src="../img/index_er1.jpg" alt="" />
+									<h4 class="appellation">湖南大学生物科学教授</h4>
+									<h3 class="definition">梁晓欣</h3>
+									<p>食子酸在高温和中压条件下可以脱去羧基,从而获得焦性没食子酸,再通过升华的方式获得较纯的焦性没食子产品,
+								单升华方式产能较低且能耗高,希望通过其他方式(重结晶)等获得此产品,提高产品的产能降低能耗。</p>
+								</div>
+							</a>	
+						</div>
+						<div>
+							<a href="#">
+								<div class="index_oneman">
+									<img src="../img/index_er1.jpg" alt="" />
+									<h4 class="appellation">中医皮肤病医院专家</h4>
+									<h3 class="definition">钱艳雯</h3>
+									<p>师从中医医院皮肤科师承中医泰斗、全国著名皮外科专家赵炳南先生20余年,深受其真传。
+									尤其擅长治各种急性热性红斑性皮肤病,是著名的中西医结合皮肤病专家。</p>
+								</div>
+							</a>	
+						</div>
+						<div>
+							<a href="#">
+								<div class="index_oneman">
+									<img src="../img/index_er1.jpg" alt="" />
+									<h4 class="appellation">电子薄膜材料专家</h4>
+									<h3 class="definition">刘钊鑫</h3>
+									<p>主要研究方向包括:BST铁电薄膜、半导体SiC 外延薄膜、半导体低维结构等</p>
+								</div>
+							</a>	
+						</div>
+						<div>
+							<a href="#">
+								<div class="index_oneman">
+									<img src="../img/index_er1.jpg" alt="" />
+									<h4 class="appellation">热轧平整工艺专家</h4>
+									<h3 class="definition">郑纹光</h3>
+									<p>主要研究内容有热轧平整工艺的专家指导系统开发,板料冲压成型CAE和模具CAD设计。
+									在各类核心期刊发表研究论文18篇。研究方向:1、 模具优化设计理论及应用2、
+									人工智能技术在材料成型中的应用</p>
+								</div>
+							</a>	
+						</div>
+						<div>
+							<a href="#">
+								<div class="index_oneman">
+									<img src="../img/index_er1.jpg" alt="" />
+									<h4 class="appellation">联网信息产品营销专家</h4>
+									<h3 class="definition">安良煜</h3>
+									<p>从2003正式接触互联网至今拥有10多年的互联网信息产品营销实战经验。</p>
+								</div>
+							</a>	
+						</div>
+						<div>
+							<a href="#">
+								<div class="index_oneman">
+									<img src="../img/index_er1.jpg" alt="" />
+									<h4 class="appellation">考古文博学院教授</h4>
+									<h3 class="definition">齐方栋</h3>
+									<p>论著百余篇,主要包括吐谷浑余部历史的研究、三国至隋唐时期墓葬制度的研究、
+									中国古代金银器研究、古代马具的研究、古代玻璃器研究、丝绸之路考古研究。</p>
+								</div>
+							</a>	
+						</div>
 					</div>
+					<span class="man_right">
+						<img src="../img/index_er8.png" alt="" />
+					</span>
 				</div>
-			</div>
-			
+			</div>	
 		</div>
 	
 	<footer>

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementDetail.html

@@ -52,7 +52,7 @@
 							<span>技术成熟度:</span> <span th:text="${achievementdetail.maturityS}?${achievementdetail.maturityS}:未知"></span>
 						</div>
 						<div class="inline_span">
-							<span>所在地:</span> <span th:text="${achievementdetail.location}">长沙</span>
+							<span>所在地:</span> <span th:text="${achievementdetail.location}?${achievementdetail.location}:长沙">长沙</span>
 						</div>
 						<div class="inline_span">
 							<span>类型:</span> <span th:text="${achievementdetail.categoryS}?${achievementdetail.categoryS}:暂无分类信息"></span>