投资总控大屏修改

app/view/datacollect/index_tz.ejs

@@ -99,10 +99,27 @@
                         </div>
                     </div>
                     <div class="col-3 m-0 px-0 height-100">
-                        <div class="row m-0 px-0 pb-2" style="height: 23.85vh">
+                        <style>
+                            #tender-chart .card-big-htext {
+                                display: flex;
+                                align-items: center;
+                            }
+                            .card-big-htext #tender1_name, .card-big-htext #tender2_name, .card-big-htext #tender3_name, .card-big-htext #tender4_name {
+                                flex: 1;
+                                min-width: 0;          /* 非常重要，flex 布局下省略号必须有 */
+                                overflow: hidden;
+                                white-space: nowrap;
+                                text-overflow: ellipsis;
+                            }
+
+                            #tender-chart .card-big-htext .float-right {
+                                flex-shrink: 0;
+                            }
+                        </style>
+                        <div class="row m-0 px-0 pb-2" id="tender-chart" style="height: 23.85vh">
                             <div class="row mx-0 w-100 height-100 bg-dark">
                                 <div class="col-12 text-white pt-2 pl-3">
-                                    <div class="card-big-htext" id="tender1_name">标段1</div>
+                                    <div class="card-big-htext"><span id="tender1_name" data-toggle="tooltip" data-original-title="">标段1</span><span class="float-right mr-2">万元&nbsp;</span></div>
                                 </div>
                                 <div class="col-12 m-0" style="height: 80%">
                                     <div class="tender1chart" id="tender1chart" style="height: 100%; width: 100%;"></div>
@@ -112,7 +129,7 @@
                         <div class="row m-0 px-0 pb-2" style="height: 23.85vh">
                             <div class="row mx-0 w-100 height-100 bg-dark">
                                 <div class="col-12 text-white pt-2 pl-3">
-                                    <div class="card-big-htext" id="tender2_name">标段2</div>
+                                    <div class="card-big-htext"><span id="tender2_name" data-toggle="tooltip" data-original-title="">标段2</span><span class="float-right mr-2">万元&nbsp;</span></div>
                                 </div>
                                 <div class="col-12 m-0" style="height: 80%">
                                     <div class="tender2chart" id="tender2chart" style="height: 100%; width: 100%;"></div>
@@ -122,7 +139,7 @@
                         <div class="row m-0 px-0 pb-2" style="height: 23.85vh">
                             <div class="row mx-0 w-100 height-100 bg-dark">
                                 <div class="col-12 text-white pt-2 pl-3">
-                                    <div class="card-big-htext" id="tender3_name">标段3</div>
+                                    <div class="card-big-htext"><span id="tender3_name" data-toggle="tooltip" data-original-title="">标段3</span><span class="float-right mr-2">万元&nbsp;</span></div>
                                 </div>
                                 <div class="col-12 m-0" style="height: 80%">
                                     <div class="tender3chart" id="tender3chart" style="height: 100%; width: 100%;"></div>
@@ -132,7 +149,7 @@
                         <div class="row m-0 pb-2 px-0" style="height: 23.85vh">
                             <div class="row mx-0 w-100 height-100 bg-dark">
                                 <div class="col-12 text-white pt-2 pl-3">
-                                    <div class="card-big-htext" id="tender4_name">标段4</div>
+                                    <div class="card-big-htext"><span id="tender4_name" data-toggle="tooltip" data-original-title="">标段4</span><span class="float-right mr-2">万元&nbsp;</span></div>
                                 </div>
                                 <div class="col-12 m-0" style="height: 80%">
                                     <div class="tender4chart" id="tender4chart" style="height: 100%; width: 100%;"></div>
@@ -827,19 +844,19 @@
                     );
                     chart_gu_data.push({
                         name: level1.name,
-                        value: level1.gu_tp ? ZhCalc.div(level1.gu_tp, 10000) : 0,
+                        value: level1.gu_tp ? ZhCalc.round(ZhCalc.div(level1.gu_tp, 10000), 0) : 0,
                     });
                     chart_gai_data.push({
                         name: level1.name,
-                        value: level1.gai_tp ? ZhCalc.div(level1.gai_tp, 10000) : 0,
+                        value: level1.gai_tp ? ZhCalc.round(ZhCalc.div(level1.gai_tp, 10000), 0) : 0,
                     });
                     chart_yu_data.push({
                         name: level1.name,
-                        value: level1.yu_tp ? ZhCalc.div(level1.yu_tp, 10000) : 0,
+                        value: level1.yu_tp ? ZhCalc.round(ZhCalc.div(level1.yu_tp, 10000), 0) : 0,
                     });
                     chart_ctrl_data.push({
                         name: level1.name,
-                        value: level1.ctrl_tp ? ZhCalc.div(level1.ctrl_tp, 10000) : 0,
+                        value: level1.ctrl_tp ? ZhCalc.round(ZhCalc.div(level1.ctrl_tp, 10000), 0) : 0,
                     });
                     chart_quan_data.push({
                         name: level1.name,
@@ -849,23 +866,23 @@
                             focus: 'series'
                         },
                         data: [
-                            level1.gu_tp ? ZhCalc.div(level1.gu_tp, 10000) : 0,
-                            level1.gai_tp ? ZhCalc.div(level1.gai_tp, 10000) : 0,
-                            level1.yu_tp ? ZhCalc.div(level1.yu_tp, 10000) : 0,
-                            level1.ctrl_tp ? ZhCalc.div(level1.ctrl_tp, 10000) : 0,
-                            level1.real_tp ? ZhCalc.div(level1.real_tp, 10000) : 0,
+                            level1.gu_tp ? ZhCalc.round(ZhCalc.div(level1.gu_tp, 10000), 0) : 0,
+                            level1.gai_tp ? ZhCalc.round(ZhCalc.div(level1.gai_tp, 10000), 0) : 0,
+                            level1.yu_tp ? ZhCalc.round(ZhCalc.div(level1.yu_tp, 10000), 0) : 0,
+                            level1.ctrl_tp ? ZhCalc.round(ZhCalc.div(level1.ctrl_tp, 10000), 0) : 0,
+                            level1.real_tp ? ZhCalc.round(ZhCalc.div(level1.real_tp, 10000), 0) : 0,
                         ]
                     });
 
                     table_data.push(`
                     <tr>
                         <td>${level1.name}</td>
-                        <td class="text-center">${level1.ctrl_tp ? ZhCalc.div(level1.ctrl_tp, 10000) : 0}</td>
-                        <td class="text-center">${level1.real_tp ? ZhCalc.div(level1.real_tp, 10000) : 0}</td>
+                        <td class="text-center">${level1.ctrl_tp ? ZhCalc.round(ZhCalc.div(level1.ctrl_tp, 10000), 0) : 0}</td>
+                        <td class="text-center">${level1.real_tp ? ZhCalc.round(ZhCalc.div(level1.real_tp, 10000), 0) : 0}</td>
                     </tr>`);
                     chart_mbsj_data.xData.push(level1.name);
-                    chart_mbsj_data.ctrlData.push(level1.ctrl_tp ? ZhCalc.div(level1.ctrl_tp, 10000) : 0);
-                    chart_mbsj_data.realData.push(level1.real_tp ? ZhCalc.div(level1.real_tp, 10000) : 0);
+                    chart_mbsj_data.ctrlData.push(level1.ctrl_tp ? ZhCalc.round(ZhCalc.div(level1.ctrl_tp, 10000), 0) : 0);
+                    chart_mbsj_data.realData.push(level1.real_tp ? ZhCalc.round(ZhCalc.div(level1.real_tp, 10000), 0) : 0);
                 }
             }
             table_data.push(`
@@ -877,8 +894,8 @@
             table_data.push(`
                 <tr>
                     <td>收益金额</td>
-                    <td class="text-center">${info.ctrl_profit ? ZhCalc.div(info.ctrl_profit, 10000) : 0}</td>
-                    <td class="text-center">${info.real_profit ? ZhCalc.div(info.real_profit, 10000) : 0}</td>
+                    <td class="text-center">${info.ctrl_profit ? ZhCalc.round(ZhCalc.div(info.ctrl_profit, 10000), 0) : 0}</td>
+                    <td class="text-center">${info.real_profit ? ZhCalc.round(ZhCalc.div(info.real_profit, 10000), 0) : 0}</td>
                 </tr>`);
             const guOption1 = guChart1.getOption();
             guOption1.series[0].data = chart_gu_data;
@@ -907,24 +924,27 @@
 
         function setRightTenderEchart(tenders) {
             for (const t in tenders) {
-                const tendera = tenders[t] ? tenders[t].a : null;
+                const tenderb = tenders[t] ? tenders[t].b : null;
                 const chart_data = {
                     contract_price: [],
                     end_gather_tp: [],
                     end_profit_tp: [],
                 };
-                if (tendera) {
-                    $('#tender'+ t + '_name').text(tendera.name);
-                    calculateTender(tendera);
-                    chart_data.contract_price.push(tendera.contract_price || 0);
-                    chart_data.end_gather_tp.push(tendera.end_gather_tp || 0);
+                if (tenderb) {
+                    $('#tender'+ t + '_name').text(tenderb.name);
+                    $('#tender'+ t + '_name').attr('data-original-title', tenderb.name);
+                    calculateTender(tenderb);
+                    chart_data.contract_price.push(ZhCalc.round(ZhCalc.div(tenderb.contract_price, 10000), 0) || 0);
+                    chart_data.end_gather_tp.push(ZhCalc.round(ZhCalc.div(tenderb.end_gather_tp, 10000), 0) || 0);
                     // chart_data.end_profit_tp.push(tendera.end_gather_tp || 0);
-                    const tenderb = tenders[t] ? tenders[t].b : null;
-                    if (tenderb) {
+                    const tendera = tenders[t] ? tenders[t].a : null;
+                    if (tendera) {
                         calculateTender(tenderb);
-                        chart_data.end_profit_tp.push(ZhCalc.sub(tendera.end_gather_tp, tenderb.end_gather_tp) || 0);
+                        const profit = ZhCalc.div(ZhCalc.sub(tendera.end_gather_tp, tenderb.end_gather_tp), 10000);
+                        chart_data.end_profit_tp.push(ZhCalc.round(profit, 0) || 0);
                     } else {
-                        chart_data.end_profit_tp.push(tendera.end_gather_tp || 0);
+                        const profit = ZhCalc.div(ZhCalc.sub(0, tenderb.end_gather_tp), 10000);
+                        chart_data.end_profit_tp.push(ZhCalc.round(profit, 0) || 0);
                     }
                 } else {
                     $('#tender'+ t + '_name').text('');
@@ -934,6 +954,7 @@
                 chartOption.series[1].data = chart_data.end_gather_tp;
                 chartOption.series[2].data = chart_data.end_profit_tp;
                 tenderChart[`chart${t}`].setOption(chartOption);
+                $('[data-toggle="tooltip"]').tooltip();
             }
         }