大屏及标段概况调整样式

app/view/datacollect/index.ejs

@@ -592,6 +592,10 @@
     // 分类金额饼图表
     var myChart1 = echarts.init(document.getElementById('jechart'), 'dark');
     option1 = {
+        tooltip : {
+            trigger: 'item',
+            formatter: "{a} <br/>{b} : {c} ({d}%)"
+        },
         title: {
             text: '金额统计图',
             left: 'center',
@@ -599,9 +603,9 @@
         },
         color: ['rgba(24,144,255,0.7)','rgba(69,183,149,0.7)','rgba(250,204,20,0.7)','rgba(145,82,225,0.7)','rgba(58,207,221,0.7)','rgba(204,73,80,0.7)','rgba(255,255,225,0.7)'],
         backgroundColor: '#343a40 ',
-        tooltip: {
-            trigger: 'item'
-        },
+        // tooltip: {
+        //     trigger: 'item'
+        // },
         // legend: {
         //     orient: 'vertical',
         //     left: 'center',
@@ -1199,7 +1203,7 @@
             for (const t of tenders) {
                 calculateTender(t);
                 if (option5_is_tender) {
-                    chart_option5_data.data1.push({ value: t.total_price ? t.total_price : 0, name: t.name});
+                    if (t.total_price) chart_option5_data.data1.push({ value: t.total_price, name: t.name});
                 } else {
                     for (const cc1 of chart_category_data.data1) {
                         const sameObject = _.intersectionWith(t.category, cc1, _.isEqual);
@@ -1233,9 +1237,15 @@
                 }
             }
             const option5 = myChart5.getOption();
-            option5.series[0].data = chart_option5_data.data1;
-            option5.series[1].data = chart_option5_data.data2;
-            option5.series[2].data = chart_option5_data.data3;
+            option5.series[0].data = _.filter(chart_option5_data.data1, function (item) {
+                return item.value !== 0;
+            });
+            option5.series[1].data = _.filter(chart_option5_data.data2, function (item) {
+                return item.value !== 0;
+            });
+            option5.series[2].data = _.filter(chart_option5_data.data3, function (item) {
+                return item.value !== 0;
+            });
             myChart5.setOption(option5);
             // const selectCategory = {
             //     cid: category && category[0].value ? category[0].id : ,
@@ -1319,7 +1329,7 @@
                 const rate = ZhCalc.mul(ZhCalc.div(ZhCalc.add(t.pre_gather_tp, t.gather_tp), t.total_price, 2), 100, 0);
                 chart_option3_data.push(rate ? rate : '');
                 if (option1_is_tender) {
-                    chart_option1_data.push({ value: t.total_price ? t.total_price : 0, name: t.name});
+                    if(t.total_price) chart_option1_data.push({ value: t.total_price, name: t.name});
                 } else {
                     const sameObject = _.intersectionWith(t.category, chart_category_data, _.isEqual);
                     const index = sameObject[0] ? _.findIndex(chart_category_data, { cid: sameObject[0].cid, value: sameObject[0].value }) : -1;
@@ -1403,7 +1413,9 @@
             myChart3_2.setOption(option3);
 
             const option1 = myChart1.getOption();
-            option1.series[0].data = chart_option1_data;
+            option1.series[0].data = _.filter(chart_option1_data, function (item) {
+                return item.value !== 0;
+            });
             myChart1.setOption(option1);
 
             const option4_data = {

app/view/tender/detail.ejs

@@ -57,7 +57,7 @@
         </div>
     </div>
     <div class="content-wrap" id="big-data">
-        <div <% if (ctx.tender.info.display.dayMode) { %>class="dark-color"<% } %> style="height: 70px;display: none" id="exitfull-div">
+        <div style="height: 70px;display: none;<% if (!ctx.tender.info.display.dayMode) { %> background-color: #2c3237 !important;<% } %>" id="exitfull-div">
             <div class="title-main d-flex">
                 <div class="ml-auto">
                     <div class="dropdown d-flex float-left mt-1 mr-2">
@@ -66,7 +66,7 @@
                 </div>
             </div>
         </div>
-        <div class="c-body <% if (ctx.tender.info.display.dayMode) { %>c-body-white<% } else { %>dark-color<% } %>">
+        <div class="c-body <% if (ctx.tender.info.display.dayMode) { %>c-body-white<% } %>" <% if (!ctx.tender.info.display.dayMode) { %>style="background-color: #2c3237 !important;"<% } %>>
             <div class="sjs-height-0">
             <!--<div class="auto-main-height">-->
                 <div class="main-height-one">
@@ -388,7 +388,11 @@
     //计量完成概况//
     var myChart = echarts.init(document.getElementById('jlchart1')<% if (!ctx.tender.info.display.dayMode) { %>, 'dark'<% } %>);
     var option = {
-        color: ['rgba(24,144,255,0.7)','rgba(69,183,149,0.7)','rgba(250,204,20,0.7)','rgba(145,82,225,0.7)','rgba(58,207,221,0.7)','rgba(204,73,80,0.7)','rgba(255,255,225,0.7)'],
+        // color: ['rgba(24,144,255,0.7)','rgba(69,183,149,0.7)','rgba(250,204,20,0.7)','rgba(145,82,225,0.7)','rgba(58,207,221,0.7)','rgba(204,73,80,0.7)','rgba(255,255,225,0.7)'],
+        color: ['#e9af68','#57b7b6','#e4575a','#959eac','#6699FF',
+            '#d38b70','#8fb7cf','#cd5c5c','#ffa500','#40e0d0',
+            '#1e90ff','#ff6347','#7b68ee','#00fa9a','#ffd700',
+            '#5c616b','#ff6666','#3cb371','#b8860b','#30e0e0'],
         <% if (!ctx.tender.info.display.dayMode) { %>backgroundColor: '#343a40 ',<% } %>
         tooltip: {
             trigger: 'item'
@@ -486,7 +490,11 @@
             itemStyle:{
                 normal:{
                     color:function(params){
-                        var colorlist = ['rgba(24,144,255,0.7)','rgba(69,183,149,0.7)','rgba(250,204,20,0.7)','rgba(145,82,225,0.7)','rgba(58,207,221,0.7)','rgba(204,73,80,0.7)','rgba(255,255,225,0.7)'];
+                        // var colorlist = ['rgba(24,144,255,0.7)','rgba(69,183,149,0.7)','rgba(250,204,20,0.7)','rgba(145,82,225,0.7)','rgba(58,207,221,0.7)','rgba(204,73,80,0.7)','rgba(255,255,225,0.7)'];
+                        var colorlist = ['#e9af68','#57b7b6','#e4575a','#959eac','#6699FF',
+                            '#d38b70','#8fb7cf','#cd5c5c','#ffa500','#40e0d0',
+                            '#1e90ff','#ff6347','#7b68ee','#00fa9a','#ffd700',
+                            '#5c616b','#ff6666','#3cb371','#b8860b','#30e0e0'];
                         return colorlist[params.dataIndex];
                     }
                 }
@@ -500,7 +508,11 @@
     //章节计量情况图//
     var myChart2 = echarts.init(document.getElementById('jlchart3')<% if (!ctx.tender.info.display.dayMode) { %>, 'dark'<% } %>);
     var option2 = {
-        color: ['rgba(24,144,255,0.7)','rgba(69,183,149,0.7)','rgba(250,204,20,0.7)','rgba(145,82,225,0.7)','rgba(58,207,221,0.7)','rgba(204,73,80,0.7)','rgba(255,255,225,0.7)'],
+        // color: ['rgba(24,144,255,0.7)','rgba(69,183,149,0.7)','rgba(250,204,20,0.7)','rgba(145,82,225,0.7)','rgba(58,207,221,0.7)','rgba(204,73,80,0.7)','rgba(255,255,225,0.7)'],
+        color: ['#e9af68','#57b7b6','#e4575a','#959eac','#6699FF',
+            '#d38b70','#8fb7cf','#cd5c5c','#ffa500','#40e0d0',
+            '#1e90ff','#ff6347','#7b68ee','#00fa9a','#ffd700',
+            '#5c616b','#ff6666','#3cb371','#b8860b','#30e0e0'],
         <% if (!ctx.tender.info.display.dayMode) { %>backgroundColor: '#343a40 ',<% } %>
         tooltip: {
             trigger: 'axis',
@@ -589,7 +601,11 @@
     //4 标段期数计量进度//
     var myChart3 = echarts.init(document.getElementById('chartContainer4')<% if (!ctx.tender.info.display.dayMode) { %>, 'dark'<% } %>);
     var option3 = {
-        color: ['rgba(24,144,255,0.7)','rgba(69,183,149,0.7)','rgba(250,204,20,0.7)','rgba(145,82,225,0.7)','rgba(204,73,80,0.7)','rgba(58,207,221,0.7)','rgba(255,255,225,0.7)'],
+        // color: ['rgba(24,144,255,0.7)','rgba(69,183,149,0.7)','rgba(250,204,20,0.7)','rgba(145,82,225,0.7)','rgba(204,73,80,0.7)','rgba(58,207,221,0.7)','rgba(255,255,225,0.7)'],
+        color: ['#e9af68','#57b7b6','#e4575a','#959eac','#6699FF',
+            '#d38b70','#8fb7cf','#cd5c5c','#ffa500','#40e0d0',
+            '#1e90ff','#ff6347','#7b68ee','#00fa9a','#ffd700',
+            '#5c616b','#ff6666','#3cb371','#b8860b','#30e0e0'],
         <% if (!ctx.tender.info.display.dayMode) { %>backgroundColor: '#343a40 ',<% } %>
         title : {
             text: ''
@@ -756,7 +772,11 @@
     // 基于准备好的dom，初始化echarts图表
     var myChart4 = echarts.init(document.getElementById('chartContainer3')<% if (!ctx.tender.info.display.dayMode) { %>, 'dark'<% } %>);
     var option4 = {
-        color:["#17a2b8","#28a745"],
+        // color:["#17a2b8","#28a745"],
+        color: ['#e9af68','#57b7b6','#e4575a','#959eac','#6699FF',
+            '#d38b70','#8fb7cf','#cd5c5c','#ffa500','#40e0d0',
+            '#1e90ff','#ff6347','#7b68ee','#00fa9a','#ffd700',
+            '#5c616b','#ff6666','#3cb371','#b8860b','#30e0e0'],
         <% if (!ctx.tender.info.display.dayMode) { %>backgroundColor: '#343a40 ',<% } %>
         title : {
             text: ''
@@ -914,7 +934,11 @@
     //变更审批进度//
     var myChart5 = echarts.init(document.getElementById('bgchart')<% if (!ctx.tender.info.display.dayMode) { %>, 'dark'<% } %>);
     var option5 = {
-        color: ['rgba(145,82,225,0.7)','rgba(58,207,221,0.7)','rgba(204,73,80,0.7)','rgba(24,144,255,0.7)','rgba(69,183,149,0.7)','rgba(250,204,20,0.7)','rgba(255,255,225,0.7)'],
+        // color: ['rgba(145,82,225,0.7)','rgba(58,207,221,0.7)','rgba(204,73,80,0.7)','rgba(24,144,255,0.7)','rgba(69,183,149,0.7)','rgba(250,204,20,0.7)','rgba(255,255,225,0.7)'],
+        color: ['#e9af68','#57b7b6','#e4575a','#959eac','#6699FF',
+            '#d38b70','#8fb7cf','#cd5c5c','#ffa500','#40e0d0',
+            '#1e90ff','#ff6347','#7b68ee','#00fa9a','#ffd700',
+            '#5c616b','#ff6666','#3cb371','#b8860b','#30e0e0'],
         <% if (!ctx.tender.info.display.dayMode) { %>backgroundColor: '#343a40 ',<% } %>
         tooltip: {
             trigger: 'item'