瀏覽代碼

项目大屏调整

ellisran 1 周之前
父節點
當前提交
09942d9ca9
共有 2 個文件被更改,包括 2 次插入 和 2 次删除
  1. 1 1
      app/public/js/project_screen_guangyuan_finished.js
  2. 1 1
      app/service/project_screen.js

+ 1 - 1
app/public/js/project_screen_guangyuan_finished.js

@@ -61,7 +61,7 @@
             button.classList.toggle('active', active);
             button.classList.toggle('active', active);
             button.setAttribute('aria-pressed', String(active));
             button.setAttribute('aria-pressed', String(active));
         });
         });
-        document.getElementById('gy-finished-progress').textContent = selected.date ? `${selected.date},${selected.department}已完成交工验收。` : '暂无验收信息';
+        document.getElementById('gy-finished-progress').textContent = selected.progressText;
         document.getElementById('gy-finished-intro').textContent = selected.intro;
         document.getElementById('gy-finished-intro').textContent = selected.intro;
         renderCharts();
         renderCharts();
     }
     }

+ 1 - 1
app/service/project_screen.js

@@ -181,7 +181,7 @@ module.exports = app => {
             }
             }
             await ctx.service.tenderCache.loadTenderCaches(allTenders, user.accountId);
             await ctx.service.tenderCache.loadTenderCaches(allTenders, user.accountId);
             const allChanges = !options.summary && status === '在建' && allTenders.length ? await ctx.service.change.getAllCheckedChanges(allTenders.map(t => t.id)) : [];
             const allChanges = !options.summary && status === '在建' && allTenders.length ? await ctx.service.change.getAllCheckedChanges(allTenders.map(t => t.id)) : [];
-            const allProgress = !options.summary && selectedNodes.length && status !== '已建' ? await ctx.service.subProjProgress.getAllDataByCondition({ where: { spid: selectedNodes.map(n => n.id) }, orders: [['update_time', 'desc'], ['id', 'asc']] }) : [];
+            const allProgress = !options.summary && selectedNodes.length ? await ctx.service.subProjProgress.getAllDataByCondition({ where: { spid: selectedNodes.map(n => n.id) }, orders: [['update_time', 'desc'], ['id', 'asc']] }) : [];
             for (const node of selectedNodes) {
             for (const node of selectedNodes) {
                 const info = infos.find(i => i.id === node.id);
                 const info = infos.find(i => i.id === node.id);
                 if (!info) continue;
                 if (!info) continue;