Browse Source

技术评估和bug修改

wanghui 8 years ago
parent
commit
eca24dd08f

+ 12 - 0
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -605,6 +605,18 @@ public class WebpageController extends BaseController {
 		return modelview;
 	}
 	
+	/**
+	 *  技术评估
+	 * @param request
+	 * @param modelview
+	 * @return
+	 */
+	@RequestMapping(value="/portal/technologyTrading/assessMent")
+	public ModelAndView assessMent(HttpServletRequest request, ModelAndView modelview){
+		modelview.setViewName("/portal/technologyTrading/assessMent");
+		return modelview;
+	}
+	
 	private void handleBanners(ModelAndView modelview, BannersType bannersType) {
 		List<Banners> banners = bannersService.findPortalBanners(bannersType.getKey());
 		if (!banners.isEmpty()) {

+ 3 - 2
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -1160,9 +1160,10 @@
   		a.maturity,
   		a.introduction,
   		a.transfer_mode as transferMode,
-  		a.technical_picture_url as technicalPictureUrl
+  		a.technical_picture_url as technicalPictureUrl,
+  		b.name as fieldAs
   	from achievement a 
-  	<!-- left join user u on u.id = a.owner_id -->
+  	left join field_glossory b on a.field_a = b.id
   	where a.deleted_sign = 0 
   	<if test="dataCategory != null and dataCategory != ''">
   		and a.data_category = #{dataCategory,jdbcType=INTEGER}

+ 1 - 1
src/main/java/com/goafanti/common/mapper/MarketingManagementMapper.xml

@@ -358,7 +358,7 @@
 		where mm.effective =1 and x.audit_status=3 and x.deleted_sign = 0 and mm.show_page= #{showPage,jdbcType=VARCHAR}
   	</if>
   	<if test="category == 2"> <!-- 需求 -->
-  		select mm.product_id as productId,x.demand_type as ownerType,x.name,mm.cover_img as coverImg
+  		select mm.product_id as productId,x.data_category as ownerType,x.name,mm.cover_img as coverImg
 		from marketing_management mm left join demand x on mm.product_id = x.id
 		where mm.effective =1  and x.audit_status =3 and x.deleted_sign = 0 and mm.show_page= #{showPage,jdbcType=VARCHAR}
   	</if>

+ 11 - 1
src/main/java/com/goafanti/portal/bo/AchievementSearchListBo.java

@@ -101,7 +101,10 @@ public class AchievementSearchListBo {
 	 * 项目介绍
 	 */
 	private String		introduction;
-
+	
+	/** 行业分类 **/
+	private String 		fieldAs;
+	
 	public Integer getLevel() {
 		return level;
 	}
@@ -275,5 +278,12 @@ public class AchievementSearchListBo {
 		this.maturityS = maturityS;
 	}
 
+	public String getFieldAs() {
+		return fieldAs;
+	}
 
+	public void setFieldAs(String fieldAs) {
+		this.fieldAs = fieldAs;
+	}
+	
 }

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

@@ -53,6 +53,9 @@
 							<li><a
 								th:href="${basePath + '/portal/technologyTrading/demand.html'}">技术需求</a>
 							</li>
+							<li><a
+								th:href="${basePath + '/portal/technologyTrading/assessMent.html'}">技术评估</a>
+							</li>
 						</ol>
 					</li>
 					<li th:classappend="${mainM=='thinkTank'}? 'active'"><a
@@ -68,8 +71,7 @@
 								th:href="${basePath + '/portal/financial/investmentInstitution.html'}">投资机构</a>
 							</li>
 						</ol></li>
-					<!-- <li><a href="#">科技活动</a></li>
-	<li><a href="#">平台共建</a></li> 			 -->
+					<!-- <li><a href="#">科技活动</a></li> <li><a href="#">平台共建</a></li> 	-->
 				</ul>
 			</div>
 			<div class="nav_right" th:if="${!isLogin}">
@@ -79,10 +81,9 @@
 				<div></div>
 			</div>
 			<div class="nav_right" th:if="${isLogin}">
-				<a
-					th:href="${basePath + (isAdmin? '/admin/index.html':'/user/account/index.html')}"
-					th:text="${userName}">个人中心</a> <a
-					th:href="${basePath + '/user/logout'}">退出</a> <a href="">关于我们</a>
+				<a th:href="${basePath + (isAdmin? '/admin/index.html':'/user/account/index.html')}"
+					th:text="${#strings.isEmpty(userName)?'个人中心':userName}">个人中心</a> 
+				<a th:href="${basePath + '/user/logout'}">退出</a> <a href="">关于我们</a>
 				<div></div>
 			</div>
 		</div>
@@ -150,27 +151,27 @@
 					</div>
 					<div class="text_bottom">
 						<p>友情链接</p>
-						<a href="http://www.hnst.gov.cn/">湖南省科技厅/</a> <a
-							href="http://www.cssti.cn/">长沙市科技局/</a> <a
-							href="http://www.cast.org.cn/">中国科学技术协会/</a> <a
-							href="http://www.chinatorch.gov.cn/">科技部火炬中心/</a> <a
-							href="http://www.nosta.gov.cn/web/index.aspx">国家科技成果奖励办/</a> <a
-							href="http://www.nast.org.cn/">国家科技成果网/</a> <a
-							href="http://www.hnast.org.cn/portal/comm/index.action">湖南省科学技术协会/</a>
-						<a href="http://www.hncgw.gov.cn/">湖南省科技成果转化公共服务平台/</a> <a
-							href="http://www.hnjxw.gov.cn/">湖南省经济信息化委员会/</a> <a
-							href="http://kyy.hnu.cn/">湖南大学科学技术研究院/</a> <a
-							href="http://www.gxst.gov.cn/gxkjt/">广西省科技厅/</a> <a
-							href="http://www.nmkjt.gov.cn/">内蒙古自治区科技厅/</a> <a
-							href="http://www.cshtz.gov.cn/">长沙市高新区管委会/</a> <a
-							href="http://www.jxas.ac.cn/">江西省科学院/</a> <a
-							href="http://www.cnic.cn/front/index.html#/cnicSite/home">中科院计算机网络信息中心/</a>
-						<a href="http://kxyjb.csu.edu.cn/">中南大学科学研究部/</a> <a
-							href="http://www.cast.org.cn/">中国科协创新创业服务中心/</a> <a
-							href="http://www.hbstd.gov.cn/">湖北省科技厅/</a> <a
-							href="http://www.gdstc.gov.cn/">广东省科技厅/</a> <a
-							href="http://www.hnkjt.gov.cn/">河南省科技厅/</a> <a
-							href="http://www.cbtm.gov.cn/">技术合同登记官网</a>
+						<a href="http://www.hnst.gov.cn/" target="_blank">湖南省科技厅/</a> <a
+							href="http://www.cssti.cn/" target="_blank">长沙市科技局/</a> <a
+							href="http://www.cast.org.cn/" target="_blank">中国科学技术协会/</a> <a
+							href="http://www.chinatorch.gov.cn/" target="_blank">科技部火炬中心/</a> <a
+							href="http://www.nosta.gov.cn/web/index.aspx" target="_blank">国家科技成果奖励办/</a> <a
+							href="http://www.nast.org.cn/" target="_blank">国家科技成果网/</a> <a
+							href="http://www.hnast.org.cn/portal/comm/index.action" target="_blank">湖南省科学技术协会/</a>
+						<a href="http://www.hncgw.gov.cn/" target="_blank">湖南省科技成果转化公共服务平台/</a> <a
+							href="http://www.hnjxw.gov.cn/" target="_blank">湖南省经济信息化委员会/</a> <a
+							href="http://kyy.hnu.cn/" target="_blank">湖南大学科学技术研究院/</a> <a
+							href="http://www.gxst.gov.cn/gxkjt/" target="_blank">广西省科技厅/</a> <a
+							href="http://www.nmkjt.gov.cn/" target="_blank">内蒙古自治区科技厅/</a> <a
+							href="http://www.cshtz.gov.cn/" target="_blank">长沙市高新区管委会/</a> <a
+							href="http://www.jxas.ac.cn/" target="_blank">江西省科学院/</a> <a
+							href="http://www.cnic.cn/front/index.html#/cnicSite/home" target="_blank">中科院计算机网络信息中心/</a>
+						<a href="http://kxyjb.csu.edu.cn/" target="_blank">中南大学科学研究部/</a> <a
+							href="http://www.cast.org.cn/" target="_blank">中国科协创新创业服务中心/</a> <a
+							href="http://www.hbstd.gov.cn/" target="_blank">湖北省科技厅/</a> <a
+							href="http://www.gdstc.gov.cn/" target="_blank">广东省科技厅/</a> <a
+							href="http://www.hnkjt.gov.cn/" target="_blank">河南省科技厅/</a> <a
+							href="http://www.cbtm.gov.cn/" target="_blank">技术合同登记官网</a>
 					</div>
 				</div>
 			</div>

+ 19 - 4
src/main/webapp/WEB-INF/views/portal/service/propertyRight.html

@@ -94,18 +94,30 @@
   				</a>
   			</div>  			
   		</div> 
-  		<div class="welfare_href">
+  		<div th:if="${!isLogin}" class="welfare_href">
   			<a onclick="_MEIQIA('showPanel')">立即申请</a>
   			<a onclick="_MEIQIA('showPanel')">专利征集</a>
+  		</div>
+  		<div th:if="${!isLogin}" class="welfare_href">
+  			<a th:href="${basePath + '/user/account/services.html#patent'}">
+				立即申请
+			</a>
+			<a th:href="${basePath + '/user/account/services.html#contract'}">
+				专利征集
+			</a>
   		</div> 		
   	</div>
   	<div class="propery_star"></div>  		 	
   	<div class="copyright ">  		
   		<div class="copyright_contant">
   			<h4>软件著作权</h4>
-	  		<div class="copyright_left">
+	  		<div th:if="${!isLogin}" class="copyright_left">
+	  			<img th:src="${portalHost+'/img/property_05.png'}" alt="" />
+	  			<a onclick="_MEIQIA('showPanel')">立即申请</a>
+			</div>
+			<div th:if="${isLogin}" class="copyright_left">
 	  			<img th:src="${portalHost+'/img/property_05.png'}" alt="" />
-	  				<a onclick="_MEIQIA('showPanel')">立即申请</a>
+	  			<a th:href="${basePath + '/user/account/services.html#copyright'}">立即申请</a>
 			</div>
 	  		<div class="copyright_right">
 	  			<h6>软著动态</h6>
@@ -135,9 +147,12 @@
   		</div>    		
   	</div>
   	<div class="container">
-  		<div class="intellectual">
+  		<div th:if="${!isLogin}" class="intellectual">
   			<a onclick="_MEIQIA('showPanel')">立即咨询</a>
   		</div>
+  		<div th:if="${isLogin}" class="intellectual">
+  			<a th:href="${basePath + '/user/account/services.html#intellectual'}">立即咨询</a>
+  		</div>
   		<div class="intellectual_right">
   			<h4>知识产权贯标</h4>
   			<p>什么是知识产权贯标:企业按照GB/T29490-2013《企业知识产权管理规范》建立一套既适应经济和社会发展状况又符合企业自身发展需求的知识产权管理体系,

+ 152 - 0
src/main/webapp/WEB-INF/views/portal/technologyTrading/assessMent.html

@@ -0,0 +1,152 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org"
+	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+
+<head th:replace="common::header(~{::title},~{::link})">
+<title>技术交易--我的技术和科技服务交易平台</title>
+<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
+<link th:href="${portalHost + '/technologyTrading/assessMent.css'}"
+	rel="stylesheet">
+</head>
+<body>
+	<header>
+		<div th:replace="common::nav('technologyTrading','assessMent')"></div>
+	</header>
+	<!--banner-->
+  	<div class="carouselt">
+		<ul class="ct-img-big clear">
+			<li data-index=0><a href=""><img
+					th:src="${portalHost + '/img/technology_trading_banner01.jpg'}" alt="" /></a></li>
+			<li data-index=1><a href=""><img
+					th:src="${portalHost + '/img/technology_trading_banner01.jpg'}" alt="" /></a></li>
+			<li data-index=2><a href=""><img
+					th:src="${portalHost + '/img/technology_trading_banner01.jpg'}" alt="" /></a></li>
+		</ul>
+		<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>
+		<ul class="ct-img-small clear">
+
+		</ul>
+	</div>
+	
+	<!--主体内容区域开始-->
+  	<div class="assessMent">
+  		<div class="container">
+  			<ul>
+  				<li>
+  					<div>
+  						<img th:src="${portalHost + '/img/assessMent_01.png'}" alt="" class="people"/><span>项目服务</span>
+  						<img th:src="${portalHost + '/img/assessMent_00.png'}" alt="" class="line"/>
+  					</div>
+  				</li>
+  				<li>
+  					<div>
+  						<img th:src="${portalHost + '/img/assessMent_02.png'}" alt=""  class="people"/><span>政策法规</span>
+  						<img th:src="${portalHost + '/img/assessMent_00.png'}" alt="" class="line"/>
+  					</div>
+  				</li>
+  				<li>
+  					<div>
+  						<img th:src="${portalHost + '/img/assessMent_03.png'}" alt="" class="people"/><span>为何选我</span>
+  						<img th:src="${portalHost + '/img/assessMent_00.png'}" alt="" class="line" />
+  					</div>
+  				</li>
+  				<li>
+  					<div>
+  						<img th:src="${portalHost + '/img/assessMent_04.png'}" alt=""  class="people"/><span>服务案例</span>
+  					</div>
+  				</li>
+  			</ul>
+  		</div>
+  	</div>
+  	<div class="contant">
+  		<div class="contant_box">
+  			<div class="col-md-6" >
+  				<div class="con_box">
+  					<img th:src="${portalHost + '/img/assessMent_05.png'}" alt="" />
+  					<p>基本资料</p>
+  				</div>
+  				<p>技术名称、所属行业、转让方式等指标系统自动内置,您只需动动鼠标</p>
+  			</div>
+  			<div class="col-md-6 thon">
+  				<img th:src="${portalHost + '/img/assessMent_sjxzou.png'}" alt="" class="sjx_left"/>
+  				<div class="con_box">  					
+  					<img th:src="${portalHost + '/img/assessMent_06.png'}" alt="" />
+  					<p>法律评况</p>
+  				</div>
+  				<p>自主研发技术、外购获取、授权许可专利证书自助提交</p>
+  			</div>
+  		</div>
+  		<div class="contant_box">
+  			<div class="col-md-6 thon"> 				
+  				<div class="con_box">
+  					<img th:src="${portalHost + '/img/assessMent_06.png'}" alt="" />
+  					<p>技术评况</p>
+  				</div>
+  				<p>创新性、替代性、成熟度、供求关系步步为营</p>
+  				<img th:src="${portalHost + '/img/assessMent_sjx.png'}" alt="" class="sjx_right"/>
+  			</div>
+  			<div class="col-md-6">
+  				<div class="con_box">
+  					<img th:src="${portalHost + '/img/assessMent_08.png'}" alt="" />
+  					<p>历史收入</p>
+  				</div>
+  				<p>历史盈收情况收集</p>
+  			</div>
+  		</div>
+  		<div class="contant_box">
+  			<div class="col-md-6">
+  				<div class="con_box">
+  					<img th:src="${portalHost + '/img/assessMent_09.png'}" alt="" />
+  					<p>收入预估</p>
+  				</div>
+  				<p>市场份额法、数量单价法精准预估</p>
+  			</div>
+  			<div class="col-md-6 thon">
+  				<img th:src="${portalHost + '/img/assessMent_sjxzou.png'}" alt="" class="sjx_left"/>
+  				<div class="con_box">
+  					<img th:src="${portalHost + '/img/assessMent_10.png'}" alt="" />
+  					<p>所得税预估</p>
+  				</div>
+  				<p>企业所得税优惠政策税率一目了然</p>
+  			</div>
+  		</div>
+  		<div class="contant_box">
+  			<div class="col-md-6 thon" > 				
+  				<div class="con_box">
+  					<img th:src="${portalHost + '/img/assessMent_11.png'}" alt="" />
+  					<p>风险预估</p>
+  				</div>
+  				<p>政策、技术、市场、管理风险,全面评测</p>
+  				<img th:src="${portalHost + '/img/assessMent_sjx.png'}" alt="" class="sjx_right"/>
+  			</div>
+  			<div class="col-md-6">
+  				<div class="con_box">
+  					<img th:src="${portalHost + '/img/assessMent_12.png'}" alt="" />
+  					<p>完成评估</p>
+  				</div>
+  				<p>系统根据提供的关键指标,同时结合平台专家意见给出最具专业的评估报告</p>
+  			</div>  			
+  		</div>  		
+  	</div>
+  	<div class="Consultation">
+  			<a th:if="${!isLogin}" class="head_login" href="">立刻评估</a>
+  			<a th:if="${isLogin}" th:href="${basePath+'/user/account/services.html#evaluate'}">立刻评估</a> 			
+  			<a href="javascript:;" onclick="_MEIQIA('showPanel')">在线咨询</a>
+  	</div>
+  	<!--主体内容区域结束-->
+  	
+	<footer>
+		<div th:replace="common::copyright"></div>
+		<div th:replace="common::login"></div>
+	</footer>
+	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${portalHost + '/technologyTrading/assessMent.js'}"></script>
+	</div>
+</body>
+</html>

+ 22 - 16
src/main/webapp/WEB-INF/views/portal/technologyTrading/index.html

@@ -183,41 +183,47 @@
 			<h5>业务速通</h5>
 			<ul th:if="${!isLogin}">
 				<li class="head_login">
-					<a href=""> 
-						<p>发布技术</p>
-					</a>
+					<a href="">发布技术</a>
 				</li>
 				<li class="head_login">
-					<a href=""> 
-						<p>发布需求</p>
-					</a>
+					<a href="">发布需求</a>
 				</li>
-				<li><a href="">技术评估</a></li>
 				<li class="head_login">
-					<a href=""> 
-						<p>专利申请</p>
-					</a>
+					<a href="">技术评估</a>
+				</li>
+				<li class="head_login">
+					<a href="">专利申请</a>
+				</li>
+				<li class="head_login">
+					<a href="">专利征集</a>
 				</li>
-				<li><a href="">专利征集</a></li>
 			</ul>
 			<ul th:if="${isLogin}">
 				<li>
 					<a th:href="${basePath + '/user/account/achievement.html#techAchievement'}">
-						<p>发布技术</p>
+						发布技术
 					</a>
 				</li>
 				<li>
 					<a th:href="${basePath + '/user/account/demand.html#techDemand'}">
-						<p>发布需求</p>
+						发布需求
 					</a>
 				</li>				
-				<li><a href="">技术评估</a></li>
+				<li>
+					<a th:href="${basePath+'/user/account/services.html#evaluate'}">
+						技术评估
+					</a>
+				</li>
 				<li>
 					<a th:href="${basePath + '/user/account/services.html#patent'}">
-						<p>专利申请</p>
+						专利申请
+					</a>
+				</li>
+				<li>
+					<a th:href="${basePath + '/user/account/services.html#contract'}">
+						专利征集
 					</a>
 				</li>
-				<li><a href="">专利征集</a></li>
 			</ul>
 		</div>
 	</div>

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

@@ -37,7 +37,7 @@
 	            	<li>></li> 
 	                 <li><a th:href="${basePath + '/portal/thinkTank/index.html'}">智库咨询</a></li>
 	                <li>></li>               
-	                <li><a th:href="${basePath + '/portal/thinkTank/policyList.html'}">智政</a></li>
+	                <li class="that"><a th:href="${basePath + '/portal/thinkTank/policyList.html'}">智政</a></li>
 	            </ul>
 	            <div class="portal-content">
 					<div class="search-criteria row">

+ 7 - 6
src/main/webapp/WEB-INF/views/user/subscriberDetail.html

@@ -29,10 +29,11 @@
 					</div>
 				</div>
 				<div class="detailtop_img">
-					<div class="head_img">
-						<img
-							th:src="${avatarUploadHost+rePartnerDetail.personPortraitUrl}"
-							alt="" />
+					<div th:if="${rePartnerDetail.personPortraitUrl == null or rePartnerDetail.personPortraitUrl == ''}" class="head_img">
+						<img th:src="${avatarUploadHost+ '/default/person.jpg'}" alt="" />
+					</div>
+					<div th:if="${rePartnerDetail.personPortraitUrl != null and rePartnerDetail.personPortraitUrl != ''}" class="head_img">
+						<img th:src="${avatarUploadHost+ rePartnerDetail.personPortraitUrl}" alt="" />
 					</div>
 					<div class="people_name" th:text="${rePartnerDetail.username}"></div>
 				</div>
@@ -99,8 +100,8 @@
 							th:text="${rePartnerDetail.personalProfile}?${rePartnerDetail.personalProfile}:无"></p>
 					</div>
 					<div class="right_btn">
-						<div class="btn_right">在线咨询</div>
-						<div id="consultBtn">线下约见</div>
+						<div class="btn_right" onclick="_MEIQIA('showPanel')">在线咨询</div>
+						<div id="consultBtn" onclick="_MEIQIA('showPanel')">线下约见</div>
 					</div>
 				</div>
 				<h3>相关智者</h3>