项目大屏调整

app/controller/project_screen_controller.js

@@ -37,7 +37,7 @@ module.exports = app => {
                 renderData.finishedProjects = listOnly(finishedProjects);
                 renderData.plannedProjects = listOnly(plannedProjects);
                 renderData.buildingProjects = listOnly(buildingProjects);
-                renderData.overview = template.code === 'guangyuan' ? await ctx.service.projectScreen.getOverview(plannedProjects, buildingProjects, finishedProjects) : null;
+                renderData.overview = template.code === 'guangyuan' ? await ctx.service.projectScreen.getOverview(summaries) : null;
                 await this.layout('project_screen/index.ejs', renderData, template.code === 'guangyuan' ? 'project_screen/guangyuan_modal.ejs' : '');
             } catch (error) {
                 this.log(error);

app/service/project_screen.js

@@ -232,11 +232,11 @@ module.exports = app => {
             return result;
         }
 
-        async getOverview(planned, building, finished) {
+        async getOverview(projects) {
             const ctx = this.ctx;
             const calc = ctx.helper;
+            const [planned, building, finished] = ['拟建', '在建', '已建'].map(status => projects.filter(project => project.status === status));
             const lists = [planned, building, finished];
-            const projects = [].concat(...lists);
             const present = value => value !== null && value !== undefined && value !== '';
             const rank = (list, amount) => list.map(p => ({ id: p.id, name: p.name, value: amount(p) }))
                 .filter(p => present(p.value)).sort((a, b) => b.value - a.value).slice(0, 10);