添加合作伙伴结果高亮显示

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@8428 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/webapp/resources/js/index/app.js

@@ -861,6 +861,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             result = decodeURI(result);
             return $sce.trustAsHtml(result);
     	}
+    	$rootScope.searchKeyword = null;// 清除缓存的关键字
     }]);
     
     /**
@@ -13751,6 +13752,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
 		// 搜索框回车
 		$scope.onSearch = function(keyword) {
+			$rootScope.searchKeyword = keyword;
 			$scope.keyword = keyword;
 			$scope.tableParams.page(1);
 			$scope.tableParams.reload();

src/main/webapp/resources/tpl/index/baseInfo/searchresult.html

@@ -263,6 +263,10 @@
 .search-bg .form-group{
 	position: relative;
 }
+.enterprise-table em {
+	font-family: "Microsoft YaHei", "微软雅黑";
+	font-style: normal;
+}
 </style>
 <div class="block" style="margin-left: -240px; width: 1170px;">
 <div class="loading in" ng-class="{'in': loading}">
@@ -289,7 +293,7 @@
 <table class="enterprise-table block" ng-table="tableParams">
 	<tbody ng-repeat="enterprise in $data" class="company-list">
 		<tr class="enterprise-hd" ng-dblclick="enterprise.$collapsed=!enterprise.$collapsed">
-			<td colspan="4"><span ng-bind="::enterprise.name" class="text-center"></span><span ng-if="::enterprise.shortName != null">（{{::enterprise.shortName}}）</span><img src="static/img/logo/youruanrenzheng.png" id="logo" ng-if="enterprise.status == 313"></td>
+			<td colspan="4"><span ng-bind-html="::enterprise.name| getkey:keyword" class="text-center"></span><span ng-if="::enterprise.shortName != null">（<em ng-bind-html="::enterprise.shortName| getkey:keyword"></em>）</span><img src="static/img/logo/youruanrenzheng.png" id="logo" ng-if="enterprise.status == 313"></td>
 			<td width="200" class="grey01 text-center" ng-if="enterprise.status != 313">当前企业不是优软云用户</td>
 			<td width="200" class="grey01 text-center" ng-if="enterprise.status == 313">优软云用户</td>
 		</tr>
@@ -299,7 +303,7 @@
 				<div class="" ng-if="::enterprise.industry != null">企业类型：<span class="text-muted" ng-bind="::enterprise.industry"></span></div>
 				<div class="" ng-if="::enterprise.address != null">企业地址：<span class="text-muted" ng-bind="::enterprise.address"></span></div>
 				<div class="">
-					<span  ng-if="::enterprise.adminName != null">管理员：{{::enterprise.adminName}}</span>
+					<span  ng-if="::enterprise.adminName != null">管理员：<em ng-bind-html="::enterprise.adminName| getkey:keyword"></em></span>
 					<span ng-if="::enterprise.adminTel != null">电话：{{::enterprise.adminTel}}</span>
 					<span ng-if="::enterprise.adminEmail != null">邮箱：{{::enterprise.adminEmail}}</span>
 				</div>