搜索预览更新

src/main/webapp/resources/js/admin/controllers/search/search_See.js

@@ -87,6 +87,20 @@ define(['app/app'], function (app) {
                     },function (error) {
                     });
 
+                    $http({
+                        method:'GET',
+                        url:'search/componentGoods/collect',
+                        params:{
+                            'keyword' : $scope.keyword,
+                            'collectList' : 'goods_brand',
+                            'paramJSON':{}
+                        }}).then(function (data) {
+                        $scope.result = data.data;
+                        $scope.brandtime = (new Date()).valueOf() - timestart;
+                        console.log(data);
+                    },function (error) {
+                    });
+
 
 
                    // window.location.href = 'search?w=' + encodeURI(encodeURIComponent($scope.keyword)) + '&type=all';

src/main/webapp/resources/view/admin/search/search_See.html

@@ -14,7 +14,9 @@
                     共<span class="totalNum">{{result.total}}</span>条
                 </p>
                 <p style="margin-top: 8px; font-weight: bold;">
-                    共耗时<span class="totalNum">{{result.time}}</span>ms  ,kind共耗时 {{kindtime}} ms
+                    共耗时<span class="totalNum">{{result.time}}</span>ms  <br><br>
+                    类目统计共耗时 {{kindtime}} ms <br><br>
+                    品牌统计共耗时 {{brandtime}} ms
                 </p>
             </div>
             <div class="col-xs-offset-4 col-xs-7">
@@ -24,10 +26,7 @@
 					<button ng-click="search()" class="btn btn-primary" type="button">搜索</button>
 				</span>
                 </div>
-                <ul class="association" ng-show="associate || associateEnter"  ng-class="{'none': !associate || !associateEnter}" ng-mouseenter="onAssociateEnter()" ng-mouseleave="onAssociateLeave()">
-                    <li ng-repeat="as in associates" ng-bind="as" ng-class="{'active': $index==selectIndex}"
-                        ng-click="onAssociateClick(as)"></li>
-                </ul>
+
             </div>
         </div>
         <!--
@@ -44,13 +43,9 @@
             <thead>
             <tr class="tr-default">
                 <th width="10%;" class="text-center">用户UU号</th>
-                <th width="7%;" class="text-center">用户名</th>
-                <th width="10%" class="text-center">标题</th>
-                <th width="30%" class="text-center">具体操作信息</th>
-                <th width="8%%" class="text-center">时间</th>
-                <th width="10%" class="text-center">ip</th>
-                <th width="10%" class="text-center">手机号</th>
-                <th width="15%" class="text-center">邮箱</th>
+                <th width="7%;" class="text-center">企业UU号</th>
+                <th width="10%" class="text-center">搜索词</th>
+                <th width="30%" class="text-center">搜索时间</th>
             </tr>
             </thead>
             <tbody ng-repeat="logUsage in $data">