浏览代码

投资总控大屏

ellisran 3 月之前
父节点
当前提交
1284c97193
共有 2 个文件被更改,包括 7 次插入 和 7 次删除
  1. 2 2
      app/controller/datacollect_controller.js
  2. 5 5
      app/view/datacollect/index_tz.ejs

+ 2 - 2
app/controller/datacollect_controller.js

@@ -87,8 +87,8 @@ module.exports = app => {
                 // const is_cost = ctx.subProject.data_collect_pages.includes('7') && ctx.subProject.data_collect === 7;
                 const is_dz2 = ['P0505', 'P0506', 'P1201', 'P1202', 'GY18Y', 'GYJJ1', 'P1103', 'KLG25', 'I2U5B', 'SEN48'].indexOf(ctx.session.sessionProject.code) !== -1
                     && ctx.subProject.data_collect_pages.includes('6') && ctx.subProject.data_collect === 6;
-                const is_dzcb = ['P0505', 'P0506', 'P1201', 'P1202', 'GY18Y', 'Y3T2Q'].indexOf(ctx.session.sessionProject.code) !== -1 && ctx.subProject.data_collect_pages.includes('7') && ctx.subProject.data_collect === 7;// 成本管理定制大屏
-                const is_dztz = ['P0505', 'P0506', 'P1201', 'P1202', 'GY18Y', 'Y3T2Q'].indexOf(ctx.session.sessionProject.code) !== -1 && ctx.subProject.data_collect_pages.includes('8') && ctx.subProject.data_collect === 8;// 投资总控定制大屏
+                const is_dzcb = ['P0505', 'P0506', 'P1201', 'P1202', 'P1002', 'GY18Y', 'Y3T2Q'].indexOf(ctx.session.sessionProject.code) !== -1 && ctx.subProject.data_collect_pages.includes('7') && ctx.subProject.data_collect === 7;// 成本管理定制大屏
+                const is_dztz = ['P0505', 'P0506', 'P1201', 'P1202', 'P1002', 'Y3T2Q'].indexOf(ctx.session.sessionProject.code) !== -1 && ctx.subProject.data_collect_pages.includes('8') && ctx.subProject.data_collect === 8;// 投资总控定制大屏
                 // const shj_url = 'http://112.74.42.187:3300/#/project/viewer?projectId=b03i54j0j8ai';
                 const renderData = {
                     projectData,

+ 5 - 5
app/view/datacollect/index_tz.ejs

@@ -32,7 +32,7 @@
                     <div class="col-9 m-0 px-0 height-100">
                         <div class="row m-0 px-0 mb-2 mr-2 bg-dark" style="height: 31vh;">
                             <div class="col-12 text-white pt-2 pl-3">
-                                <div class="card-big-htext">|  公路总造价占比</div>
+                                <div class="card-big-htext">|  公路总造价占比<span class="float-right mr-2">万元&nbsp;</span></div>
                             </div>
                             <div class="col-12 row ml-0 mr-2 px-0" style="height: 88%">
                                 <div class="col-3 m-0 px-0 height-100">
@@ -827,19 +827,19 @@
                     );
                     chart_gu_data.push({
                         name: level1.name,
-                        value: level1.gu_tp || 0
+                        value: level1.gu_tp ? ZhCalc.div(level1.gu_tp, 10000) : 0,
                     });
                     chart_gai_data.push({
                         name: level1.name,
-                        value: level1.gai_tp || 0
+                        value: level1.gai_tp ? ZhCalc.div(level1.gai_tp, 10000) : 0,
                     });
                     chart_yu_data.push({
                         name: level1.name,
-                        value: level1.yu_tp || 0
+                        value: level1.yu_tp ? ZhCalc.div(level1.yu_tp, 10000) : 0,
                     });
                     chart_ctrl_data.push({
                         name: level1.name,
-                        value: level1.ctrl_tp || 0
+                        value: level1.ctrl_tp ? ZhCalc.div(level1.ctrl_tp, 10000) : 0,
                     });
                     chart_quan_data.push({
                         name: level1.name,