Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/controller/sub_proj_setting_controller.js

@@ -511,7 +511,7 @@ module.exports = app => {
                     categoryData,
                     tenders,
                     dcTenders,
-                    is_dz1: ['P0505', 'MI22U'].indexOf(ctx.session.sessionProject.code) !== -1 ? 5 : false,
+                    is_dz1: ['P0505', 'MI22U', 'YY215'].indexOf(ctx.session.sessionProject.code) !== -1 ? 5 : false,
                     is_dz2,
                     is_dzcb,
                     is_dztz,

app/view/datacollect/index_tz.ejs

@@ -138,10 +138,10 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="row m-0" id="tender-chart" style="height: 33.333333%;">
+                        <div class="row m-0" id="tender-chart" style="height: 33.333333%; border-top: 1px solid #596168; padding-top: 8px;">
                             <% for (let i = 1; i <= 4; i++) { %>
                                 <div class="col-3 px-0 <%- i === 1 ? 'pr-1' : (i === 4 ? 'pl-1' : 'px-1') %> height-100">
-                                    <div class="row m-0 height-100 bg-dark">
+                                    <div class="row m-0 height-100" style="background: #3b4147;">
                                         <div class="col-12 text-white pt-2 pl-3">
                                             <div class="card-big-htext d-flex align-items-center"><span class="flex-fill text-truncate" id="tender<%- i %>_name" data-toggle="tooltip" data-original-title="" style="min-width: 0;">标段<%- i %></span><span class="text-nowrap mr-2">元</span></div>
                                         </div>
@@ -375,13 +375,8 @@
                 overflow: 'truncate'
             }
         },
-        color: ['rgba(38, 217, 217,0.7)','rgba(78, 139, 229,0.7)',
-            'rgba(78, 229, 139,0.7)','rgba(108, 78, 229,0.7)',
-            'rgba(58,207,221,0.7)','rgba(164, 229, 78,0.7)',
-            'rgba(199, 78, 229,0.7)', 'rgba(229, 92, 174, 0.7)',
-            'rgba(229, 214, 78, 0.7)', 'rgba(241, 87, 96, 0.7)',
-            'rgba(242, 179, 82, 0.7)'],
-        backgroundColor: '#343a40 ',
+        color: ['#5b9cf5', '#f2b15c', '#55c497'],
+        backgroundColor: 'transparent',
         tooltip: {
             trigger: 'axis',
             formatter: formatInvestmentTooltip,