调整分页效果

donate-console/src/main/webapp/resources/css/base.css

@@ -70,4 +70,93 @@ input,button,select,textarea{outline:none}
 .text-center{
 	text-align: center !important;
 }
-/*通用颜色*/
+/*分页效果*/
+#form .ng-isolate-scope{
+	position: absolute;
+	bottom: 50px;
+	left: 50px;
+	width: 100%;
+}
+.ng-table-pager .ng-table-counts{
+	display: none;
+}
+.ng-table-pager .pagination{
+	padding-left: 50px;
+	width: 100%;
+}
+.ng-table-pager .pagination li{
+	height: 35px;
+	line-height: 35px;
+}
+.ng-table-pager .pagination li a{
+	display: inline-block;
+	padding: 0 5px;
+	height: 35px;
+	line-height: 35px;
+	text-align: center;
+	font-size: 14px;
+	color: #333;
+	border-radius: 3px;
+}
+.ng-table-pager .pagination li a span{
+	display: inline-block;
+	width: 35px;
+	height: 35px;
+	line-height: 35px;
+	text-align: center;
+	font-size: 14px;
+	color: #333;
+	border-radius: 3px;
+}
+.ng-table-pager .pagination li.active a,.ng-table-pager .pagination li:hover a{
+	font-size: 14px;
+	color: #333;
+}
+.ng-table-pager .btn-default.active, .ng-table-pager .btn-default:hover, .ng-table-pager .pagination>.disabled>a, .ng-table-pager .pagination>li>a:hover {
+	color: #fff;
+	background-color: #ef613b;
+	border-color: #ef613b;
+}
+.ng-table-pager .pagination>.disabled>a span, .ng-table-pager .pagination>li>a:hover span{
+	color: #fff;
+}
+.page-record{
+	height: 35px;
+	line-height: 35px;
+}
+.page-record span:first-child {
+	margin: 0 10px;
+}
+.page-record span input{
+	margin: 0 5px;
+	width: 40px;
+	height: 35px;
+	line-height: 35px;
+	text-align: center;
+	font-size: 14px;
+	color: #333;
+	border-radius: 3px;
+	border: 1px solid #ddd;
+}
+.page-record span input:focus{
+	border-color: #4574e8;
+}
+.page-record span button {
+	margin-left: 5px;
+	width: 40px;
+	height: 35px;
+	line-height: 35px;
+	text-align: center;
+	font-size: 14px;
+	color: #333;
+	background: none;
+	border: 1px solid #ddd;
+	border-radius: 3px;
+	cursor: pointer ;
+}
+.page-record span button:hover{
+	background: #ef613b;
+	border: 1px solid transparent ;
+	color: #fff;
+}
+

donate-console/src/main/webapp/resources/js/index/app.js

@@ -122,7 +122,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
                     Project[getProjectState($scope.active)].call(null, BaseService.parseParams(pageParams), function (page) {
                         $scope.loading = false;
                         if (page) {
-                            params.total(page.totalElement);
+                            params.total(page.totalElements);
                             $defer.resolve(page.content);
                             // $scope.keywordXls = angular.copy($scope.keyword); // 保存当前取值的关键词  做导出时需要的字段
                         }

donate-console/src/main/webapp/resources/view/project/project_list.html

@@ -130,7 +130,7 @@
         color: #323232;
     }
     .content .boxes-body table tbody tr td div.name{
-        width: 220px;
+        /*width: 220px;*/
     }
     .content .boxes-body table tbody tr td div.name p {
         font-size: 14px;
@@ -140,6 +140,11 @@
     .content .boxes-body table tbody tr td div.name:hover p{
         text-decoration: underline;
     }
+    .content .boxes-body table tbody tr td div.name p a{
+        font-size: 14px;
+        font-weight: bold;
+        color: #323232;
+    }
     /*.content .boxes-body table tbody tr td div.name div{*/
     /*display: none;*/
     /*}*/
@@ -724,13 +729,13 @@
     <section class="content-header clearfix">
         <h1>项目列表</h1>
         <div class="row content-row clearfix">
-            <div class="all">
+            <div class="all fl">
                 <span class="active" ng-click="setState('audited')">已审核<em>({{numOfAudited}})</em><b class="line"></b></span>
                 <span ng-click="setState('unaudited')">未审核<em>({{numOfUnaudited}})</em><b class="line"></b></span>
                 <span ng-click="setState('disagreed')">未通过<em>({{numOfUnagreed}})</em></span>
             </div>
             <!--<form class="form-horizontal" method="POST" action="">-->
-            <div class="input-group input-group-sm">
+            <div class="input-group input-group-sm fr">
                 <input id="post-search-input" class="form-control" type="search" ng-model="keyword" ng-search="onSearch()" value="" name="" placeholder="请输入关键词">&nbsp;&nbsp;
                 <input id="search-submit" class="btn btn-default btn-sm" type="submit" value="搜索" ng-click="onSearch()">
             </div>

donate-service/src/main/java/com/uas/service/donate/controller/indexController.java

@@ -4,8 +4,6 @@ import com.uas.service.donate.model.*;
 import com.uas.service.donate.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.ui.ModelMap;
@@ -147,7 +145,7 @@ public class indexController {
         List<ProjectRecode> projectRecodeList=projectRecodeService.findByuuid(uuid);
         modelMap.put("projectRecodeList",projectRecodeList);
         //计算参与的项目总数
-        Long sumJoin=projectRecodeService.sumJOin(uuid);
+        Long sumJoin=projectRecodeService.sumJoin(uuid);
         modelMap.put("sumJoin",sumJoin);
         //捐赠的善款总数
         Long sumMoney=projectRecodeService.sumMoney(uuid);

donate-service/src/main/java/com/uas/service/donate/dao/ProjectRecodeDao.java

@@ -18,7 +18,7 @@ public interface ProjectRecodeDao extends JpaRepository<ProjectRecode,Long>,JpaS
 
     //计算某人参与项目的次数
     @Query("select count(*) from ProjectRecode where uuid=:uuid")
-    Long sumJOin(@Param("uuid")Long uuid);
+    Long sumJoin(@Param("uuid")Long uuid);
 
     //计算某人捐赠的总善款
     @Query("select sum(amount) from ProjectRecode where uuid=:uuid")

donate-service/src/main/java/com/uas/service/donate/service/ProjectRecodeService.java

@@ -1,7 +1,6 @@
 package com.uas.service.donate.service;
 
 import com.uas.service.donate.model.ProjectRecode;
-import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 
@@ -11,7 +10,7 @@ public interface ProjectRecodeService {
     List<ProjectRecode> findByuuid(Long uuid);
 
     //计算某人参与项目的次数
-    Long sumJOin(Long uuid);
+    Long sumJoin(Long uuid);
 
     //计算某人捐赠的总善款
     Long sumMoney(Long uuid);

donate-service/src/main/java/com/uas/service/donate/service/impl/ActivityRecodeServiceImpl.java

@@ -32,5 +32,10 @@ public class ActivityRecodeServiceImpl implements ActivityRecodeService {
         return activityRecodeDao.findOne(activityId,uuid);
     }
 
+    //计算某人活动参与总次数
+    public Long sumJoin(Long uuid){
+        return activityRecodeDao.sumJoin(uuid);
+    }
+
 
 }

donate-service/src/main/java/com/uas/service/donate/service/impl/ProjectRecordServiceImpl.java

@@ -2,11 +2,8 @@ package com.uas.service.donate.service.impl;
 
 import com.uas.service.donate.dao.ProjectDao;
 import com.uas.service.donate.dao.ProjectRecodeDao;
-import com.uas.service.donate.model.Activity;
-import com.uas.service.donate.model.Project;
 import com.uas.service.donate.model.ProjectRecode;
 import com.uas.service.donate.service.ProjectRecodeService;
-import com.uas.service.donate.service.ProjectReportService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -50,4 +47,14 @@ public class ProjectRecordServiceImpl implements ProjectRecodeService {
         return projectRecodeDao.findOne(id);
     }
 
+
+    //计算某人捐赠的总善款
+    public Long sumMoney(Long uuid){
+        return projectRecodeDao.sumMoney(uuid);
+    }
+    //计算某人参与项目的次数
+    public Long sumJoin(Long uuid){
+        return projectRecodeDao.sumJoin(uuid);
+    }
+
 }