颜色更新及echarts表格调整

app/public/css/main.css

@@ -1822,42 +1822,60 @@ overflow-y: auto;
   width: 70px;
   text-align: center;
 }
-.bg-new-red{
+.bg-new-advance{
   background: rgba(241, 82, 91, 0.08) !important;
 }
-.bg-new-orange{
+.bg-new-ledger{
   background: rgba(250, 140, 22, 0.08) !important;
 }
-.bg-new-yellow{
+.bg-new-revise{
   background: rgba(251, 182, 45, 0.08) !important;
 }
-.bg-new-green{
+.bg-new-stage{
   background: rgba(82, 196, 26, 0.08) !important;
 }
-.bg-new-blue{
+.bg-new-changeProject{
   background: rgba(51, 119, 255, 0.08) !important;
 }
-.bg-new-purple{
+.bg-new-changePlan{
     background: rgba(114, 46, 209, 0.08) !important;
 }
-.text-new-red{
+.bg-new-change{
+    background: rgba(22, 208, 208, 0.08) !important;
+}
+.bg-new-changeApply{
+    background: rgba(41, 58, 210, 0.08) !important;
+}
+.bg-new-material{
+    background: rgba(187, 41, 210, 0.08) !important;
+}
+.text-new-advance{
   color: rgba(241, 82, 91, 1) !important;
 }
-.text-new-orange{
+.text-new-ledger{
   color: rgba(250, 140, 22, 1) !important;
 }
-.text-new-yellow{
+.text-new-revise{
   color: rgba(251, 182, 45, 1) !important;
 }
-.text-new-green{
+.text-new-stage{
   color: rgba(82, 196, 26, 1) !important;
 }
-.text-new-blue{
+.text-new-changeProject{
   color: rgba(51, 119, 255, 1) !important;
 }
-.text-new-purple{
+.text-new-changePlan{
     color: rgba(114, 46, 209, 1) !important;
 }
+.text-new-change{
+    color: rgba(22, 208, 208, 1) !important;
+}
+.text-new-changeApply{
+    color: rgba(41, 58, 210, 1) !important;
+}
+.text-new-material{
+    color: rgba(187, 41, 210, 1); !important;
+}
 .text-width{
   width: 66px;
   text-align: center;

app/view/dashboard/index.ejs

@@ -73,7 +73,7 @@
                                         <% for (const t of auditTenders) { %>
                                             <% if (t.ledger_status === acLedger.status.checking) { %>
                                                 <tr data-type="5">
-                                                    <td><span class="bg-new-red text-new-red badge text-width">台账审批</span></td>
+                                                    <td><span class="bg-new-ledger text-new-ledger badge text-width">台账审批</span></td>
                                                     <td><a href="/tender/<%- t.id %>"><%- t.name %></a></td>
                                                     <td>台账</td>
                                                     <td><%- (t.begin_time ? ctx.moment(t.begin_time).format('YYYY/MM/DD HH:mm') : '') %></td>
@@ -81,7 +81,7 @@
                                                 </tr>
                                             <% } else { %>
                                                 <tr data-type="5">
-                                                    <td><span class="bg-new-red text-new-red badge text-width">台账审批</span></td>
+                                                    <td><span class="bg-new-ledger text-new-ledger badge text-width">台账审批</span></td>
                                                     <td><a href="/tender/<%- t.id %>"><%- t.name %></a></td>
                                                     <td>台账</td>
                                                     <td><%- (t.end_time ? ctx.moment(t.end_time).format('YYYY/MM/DD HH:mm') : '') %></td>
@@ -91,7 +91,7 @@
                                         <% } %>
                                         <% for (const revise of auditRevise) { %>
                                             <tr data-type="4">
-                                                <td><span class="bg-new-orange text-new-orange badge text-width">台账修订</span></td>
+                                                <td><span class="bg-new-revise text-new-revise badge text-width">台账修订</span></td>
                                                 <td><a href="/tender/<%- revise.t_id %>"><%- revise.t_name %></a> <a href="/tender/<%- revise.t_id %>/revise/<%- revise.id %>/info">第<%- revise.corder %>次</a></td>
                                                 <td>第<%- revise.corder %>次</td>
                                                 <td><%- (
@@ -105,7 +105,7 @@
                                         <% for (const audit of auditStages) { %>
                                             <% if (audit.sstatus !== acStage.status.checkNo) { %>
                                                 <tr data-type="2">
-                                                    <td><span class="bg-new-yellow text-new-yellow badge text-width">计量审批</span></td>
+                                                    <td><span class="bg-new-stage text-new-stage badge text-width">计量审批</span></td>
                                                     <td><a href="/tender/<%- audit.tid %>"><%- audit.name %></a> <a href="/tender/<%- audit.tid %>/measure/stage/<%- audit.sorder %>">第<%- audit.sorder %>期</a></td>
                                                     <td>第<%- audit.sorder %>期</td>
                                                     <td><%- ctx.moment(audit.begin_time).format('YYYY/MM/DD HH:mm') %></td>
@@ -113,7 +113,7 @@
                                                 </tr>
                                             <% } else { %>
                                                 <tr data-type="2">
-                                                    <td><span class="bg-new-yellow text-new-yellow badge text-width">计量审批</span></td>
+                                                    <td><span class="bg-new-stage text-new-stage badge text-width">计量审批</span></td>
                                                     <td><a href="/tender/<%- audit.tid %>"><%- audit.name %></a> <a href="/tender/<%- audit.tid %>/measure/stage/<%- audit.sorder %>">第<%- audit.sorder %>期</a></td>
                                                     <td>第<%- audit.sorder %>期</td>
                                                     <td><%- ctx.moment(audit.end_time).format('YYYY/MM/DD HH:mm') %></td>
@@ -123,7 +123,7 @@
                                         <% } %>
                                         <% for (const change of auditChanges) { %>
                                             <tr data-type="3">
-                                                <td><span class="bg-new-green text-new-green badge text-width">变更审批</span></td>
+                                                <td><span class="bg-new-change text-new-change badge text-width">变更审批</span></td>
                                                 <td><a href="/tender/<%- change.tid %>"><%- change.name %></a> <a href="/tender/<%- change.tid %>/change/<%- change.cid %>/information"><%- change.ccode %></a></td>
                                                 <td>变更</td>
                                                 <td><%- (change.sin_time ? ctx.moment(change.sin_time).format('YYYY/MM/DD HH:mm') : '') %></td>
@@ -132,7 +132,7 @@
                                         <% } %>
                                         <% for (const acp of auditChangeProject) { %>
                                             <tr data-type="7">
-                                                <td><span class="bg-new-green text-new-green badge text-width">变更立项</span></td>
+                                                <td><span class="bg-new-changeProject text-new-changeProject badge text-width">变更立项</span></td>
                                                 <td><a href="/tender/<%- acp.tid %>"><%- acp.name %></a> <a href="/tender/<%- acp.tid %>/change/project/<%- acp.cpid %>/information"><%- acp.mcode %></a></td>
                                                 <td>变更</td>
                                                 <td><%- (
@@ -145,7 +145,7 @@
                                         <% } %>
                                         <% for (const aca of auditChangeApply) { %>
                                             <tr data-type="8">
-                                                <td><span class="bg-new-green text-new-green badge text-width">变更申请</span></td>
+                                                <td><span class="bg-new-changeApply text-new-changeApply badge text-width">变更申请</span></td>
                                                 <td><a href="/tender/<%- aca.tid %>"><%- aca.name %></a> <a href="/tender/<%- aca.tid %>/change/apply/<%- aca.caid %>/information"><%- aca.mcode %></a></td>
                                                 <td>变更</td>
                                                 <td><%- (
@@ -158,7 +158,7 @@
                                         <% } %>
                                         <% for (const acp of auditChangePlan) { %>
                                             <tr data-type="9">
-                                                <td><span class="bg-new-green text-new-green badge text-width">变更方案</span></td>
+                                                <td><span class="bg-new-changePlan text-new-changePlan badge text-width">变更方案</span></td>
                                                 <td><a href="/tender/<%- acp.tid %>"><%- acp.name %></a> <a href="/tender/<%- acp.tid %>/change/plan/<%- acp.cpid %>/information"><%- acp.mcode %></a></td>
                                                 <td>变更</td>
                                                 <td><%- (
@@ -172,7 +172,7 @@
                                         <% for (const am of auditMaterial) { %>
                                             <% if (am.mstatus !== acMaterial.status.checkNo) { %>
                                                 <tr data-type="1">
-                                                    <td><span class="bg-new-blue text-new-blue badge text-width">材料调差</span></td>
+                                                    <td><span class="bg-new-material text-new-material badge text-width">材料调差</span></td>
                                                     <td><a href="/tender/<%- am.tid %>"><%- am.name %></a> <a href="/tender/<%- am.tid %>/measure/material/<%- am.morder %>">第<%- am.morder %>期</a></td>
                                                     <td>第<%- am.morder %>期</td>
                                                     <td><%- ctx.moment(am.begin_time).format('YYYY/MM/DD HH:mm') %></td>
@@ -180,7 +180,7 @@
                                                 </tr>
                                             <% } else { %>
                                                 <tr data-type="1">
-                                                    <td><span class="bg-new-blue text-new-blue badge text-width">材料调差</span></td>
+                                                    <td><span class="bg-new-material text-new-material badge text-width">材料调差</span></td>
                                                     <td><a href="/tender/<%- am.tid %>"><%- am.name %></a>  <a href="/tender/<%- am.tid %>/measure/material/<%- am.morder %>">第<%- am.morder %>期</a></td>
                                                     <td>第<%- am.morder %>期</td>
                                                     <td><%- ctx.moment(am.end_time).format('YYYY/MM/DD HH:mm') %></td>
@@ -191,7 +191,7 @@
                                         <% for (const am of auditAdvance) { %>
                                             <% if (am.mstatus !== acAdvance.status.checkNo) { %>
                                                 <tr data-type="6">
-                                                    <td><span class="bg-new-purple text-new-purple badge text-width">预付款</span></td>
+                                                    <td><span class="bg-new-advance text-new-advance badge text-width">预付款</span></td>
                                                     <td><a href="/tender/<%- am.tid %>"><%- am.name %></a> <a href="/tender/<%- am.tid %>/advance/<%- am.vid %>/detail"><%- typeColMap[am.mtype].text %>第<%- am.morder %>期</a></td>
                                                     <td>第<%- am.morder %>期</td>
                                                     <td><%- ctx.moment(am.create_time).format('YYYY/MM/DD HH:mm') %></td>
@@ -199,7 +199,7 @@
                                                 </tr>
                                             <% } else { %>
                                                 <tr data-type="6">
-                                                    <td><span class="bg-new-purple text-new-purple badge text-width">预付款</span></td>
+                                                    <td><span class="bg-new-advance text-new-advance badge text-width">预付款</span></td>
                                                     <td><a href="/tender/<%- am.tid %>"><%- am.name %></a> <a href="/tender/<%- am.tid %>/advance/<%- am.vid %>/detail"><%- typeColMap[am.mtype].text %>第<%- am.morder %>期</a></td>
                                                     <td>第<%- am.morder %>期</td>
                                                     <td><%- ctx.moment(am.end_time).format('YYYY/MM/DD HH:mm') %></td>
@@ -317,7 +317,7 @@
                                         <% for (const notice of noticeList) { %>
                                             <% if(notice.type === pushType.stage) { %>
                                                 <tr data-type="2">
-                                                    <td><span class="bg-new-yellow text-new-yellow badge text-width">计量审批</span></td>
+                                                    <td><span class="bg-new-stage text-new-stage badge text-width">计量审批</span></td>
                                                     <td><a href="/tender/<%- notice.tid %>"><%- notice.name %></a> <a href="/tender/<%- notice.tid %>/measure/stage/<%- notice.order %>">第<%- notice.order %>期</a></td>
                                                     <td><%- notice.su_name %><%- (notice.su_role ? '-' + notice.su_role : '') %></td>
                                                     <td><%- ctx.helper.dateTran(notice.create_time, 'YYYY/MM/DD HH:mm') %></td>
@@ -327,7 +327,7 @@
                                                 </tr>
                                             <% } else if(notice.type === pushType.material) { %>
                                                 <tr data-type="1">
-                                                    <td><span class="bg-new-blue text-new-blue badge text-width">材料调差</span></td>
+                                                    <td><span class="bg-new-material text-new-material badge text-width">材料调差</span></td>
                                                     <td><a href="/tender/<%- notice.tid %>"><%- notice.name %></a> <a href="/tender/<%- notice.tid %>/measure/material/<%- notice.order %>">第<%- notice.order %>期</a></td>
                                                     <td><%- notice.su_name %><%- (notice.su_role ? '-' + notice.su_role : '') %></td>
                                                     <td><%- ctx.helper.dateTran(notice.create_time, 'YYYY/MM/DD HH:mm') %></td>
@@ -337,7 +337,7 @@
                                                 </tr>
                                             <% } else if(notice.type === pushType.ledger) { %>
                                                 <tr data-type="5">
-                                                    <td><span class="bg-new-red text-new-red badge text-width">台账审批</span></td>
+                                                    <td><span class="bg-new-ledger text-new-ledger badge text-width">台账审批</span></td>
                                                     <td><a data-id="<%- notice.id %>" href="/tender/<%- notice.tid %>/ledger"><%- notice.name %></a></td>
                                                     <td><%- notice.su_name %><%- (notice.su_role ? '-' + notice.su_role : '') %></td>
                                                     <td><%- ctx.helper.dateTran(notice.create_time, 'YYYY/MM/DD HH:mm') %></td>
@@ -347,7 +347,7 @@
                                                 </tr>
                                             <% } else if(notice.type === pushType.revise) { %>
                                                 <tr data-type="4">
-                                                    <td><span class="bg-new-orange text-new-orange badge text-width">台账修订</span></td>
+                                                    <td><span class="bg-new-revise text-new-revise badge text-width">台账修订</span></td>
                                                     <td><a href="/tender/<%- notice.tid %>/ledger"><%- notice.name %></a> <a href="/tender/<%- notice.tid %>/revise/<%- notice.rid %>/info">台账修订（第<%- notice.corder %>次）</a></td>
                                                     <td><%- notice.su_name %><%- (notice.su_role ? '-' + notice.su_role : '') %></td>
                                                     <td><%- ctx.helper.dateTran(notice.create_time, 'YYYY/MM/DD HH:mm') %></td>
@@ -357,7 +357,7 @@
                                                 </tr>
                                             <% } else if(notice.type === pushType.change){ %>
                                                 <tr data-type="3">
-                                                    <td><span class="bg-new-green text-new-green badge text-width">变更审批</span></td>
+                                                    <td><span class="bg-new-change text-new-change badge text-width">变更审批</span></td>
                                                     <td><a href="/tender/<%- notice.tid %>"><%- notice.name %></a> <a href="/tender/<%- notice.tid %>/change/<%- notice.cid %>/information"><%- notice.c_code %></a></td>
                                                     <td><%- notice.su_name %><%- (notice.su_role ? '-' + notice.su_role : '') %></td>
                                                     <td><%- ctx.helper.dateTran(notice.create_time, 'YYYY/MM/DD HH:mm') %></td>
@@ -367,7 +367,7 @@
                                                 </tr>
                                             <% } else if(notice.type === pushType.changeProject && ctx.session.sessionProject.page_show.openChangeProject) { %>
                                                 <tr data-type="7">
-                                                    <td><span class="bg-new-green text-new-green badge text-width">变更立项</span></td>
+                                                    <td><span class="bg-new-changeProject text-new-changeProject badge text-width">变更立项</span></td>
                                                     <td><a href="/tender/<%- notice.tid %>"><%- notice.name %></a> <a href="/tender/<%- notice.tid %>/change/project/<%- notice.cpid %>/information"><%- notice.c_code %></a></td>
                                                     <td><%- notice.su_name %><%- (notice.su_role ? '-' + notice.su_role : '') %></td>
                                                     <td><%- ctx.helper.dateTran(notice.create_time, 'YYYY/MM/DD HH:mm') %></td>
@@ -377,7 +377,7 @@
                                                 </tr>
                                             <% } else if(notice.type === pushType.changeApply && ctx.session.sessionProject.page_show.openChangeApply) { %>
                                                 <tr data-type="8">
-                                                    <td><span class="bg-new-green text-new-green badge text-width">变更申请</span></td>
+                                                    <td><span class="bg-new-changeApply text-new-changeApply badge text-width">变更申请</span></td>
                                                     <td><a href="/tender/<%- notice.tid %>"><%- notice.name %></a> <a href="/tender/<%- notice.tid %>/change/apply/<%- notice.caid %>/information"><%- notice.c_code %></a></td>
                                                     <td><%- notice.su_name %><%- (notice.su_role ? '-' + notice.su_role : '') %></td>
                                                     <td><%- ctx.helper.dateTran(notice.create_time, 'YYYY/MM/DD HH:mm') %></td>
@@ -387,7 +387,7 @@
                                                 </tr>
                                             <% } else if(notice.type === pushType.changePlan && ctx.session.sessionProject.page_show.openChangePlan) { %>
                                                 <tr data-type="9">
-                                                    <td><span class="bg-new-green text-new-green badge text-width">变更方案</span></td>
+                                                    <td><span class="bg-new-changePlan text-new-changePlan badge text-width">变更方案</span></td>
                                                     <td><a href="/tender/<%- notice.tid %>"><%- notice.name %></a> <a href="/tender/<%- notice.tid %>/change/plan/<%- notice.cpid %>/information"><%- notice.c_code %></a></td>
                                                     <td><%- notice.su_name %><%- (notice.su_role ? '-' + notice.su_role : '') %></td>
                                                     <td><%- ctx.helper.dateTran(notice.create_time, 'YYYY/MM/DD HH:mm') %></td>
@@ -397,7 +397,7 @@
                                                 </tr>
                                             <% } else if(notice.type === pushType.advance) { %>
                                                 <tr data-type="6">
-                                                    <td><span class="bg-new-purple text-new-purple badge text-width">预付款</span></td>
+                                                    <td><span class="bg-new-advance text-new-advance badge text-width">预付款</span></td>
                                                     <td><a href="/tender/<%- notice.tid %>"><%- notice.name %></a> <a href="/tender/<%- notice.tid %>/advance/<%- notice.vid %>/detail"><%- notice.ad_type ? typeColMap[notice.ad_type].text : '' %>第<%- notice.order %>期</a></td>
                                                     <td><%- notice.su_name %><%- (notice.su_role ? '-' + notice.su_role : '') %></td>
                                                     <td><%- ctx.helper.dateTran(notice.create_time, 'YYYY/MM/DD HH:mm') %></td>
@@ -513,39 +513,55 @@
         //     top:'7%'
         // },
         color: [
-            'rgba(241, 82, 91, 0.7)',
             'rgba(250, 140, 22, 0.7)',
             'rgba(251, 182, 45, 0.7)',
             'rgba(82, 196, 26, 0.7)',
+            'rgba(22, 208, 208, 0.7)',
             <% if (ctx.session.sessionProject.page_show.openChangeProject) { %>
-            'rgba(82, 196, 26, 0.7)',
+            'rgba(51, 119, 255, 0.7)',
             <% } %>
             <% if (ctx.session.sessionProject.page_show.openChangeApply) { %>
-            'rgba(82, 196, 26, 0.7)',
+            'rgba(41, 58, 210, 0.7)',
             <% } %>
             <% if (ctx.session.sessionProject.page_show.openChangePlan) { %>
-            'rgba(82, 196, 26, 0.7)',
+            'rgba(114, 46, 209, 0.7)',
             <% } %>
-            'rgba(51, 119, 255,0.7)',
-            'rgba(114, 46, 209,0.7)',
+            'rgba(187, 41, 210, 0.7)',
+            'rgba(241, 82, 91, 0.7)',
         ],
         tooltip: {
             trigger: 'item'
         },
-        legend: {
-            orient: 'vertical',
-            right: '3%',
-            top: '5%',
-            textStyle: {
-                fontSize: 12
+        legend: [
+            {
+                orient: 'vertical',
+                left: '3%',
+                top: '20%',
+                textStyle: {
+                    fontSize: 12
+                },
+                data: [<% for (const sc of shenpi_count.slice(0, shenpi_count.length/2)) { %>
+                    '<%- sc.name %>',
+                <% } %>]
+            },
+            {
+                orient: 'vertical',
+                right: '3%',
+                top: '20%',
+                textStyle: {
+                    fontSize: 12
+                },
+                data: [<% for (const sc of shenpi_count.slice(shenpi_count.length/2, shenpi_count.length)) { %>
+                    '<%- sc.name %>',
+                    <% } %>]
             }
-        },
+        ],
         series: [
             {
                 name: '次数',
                 type: 'pie',
                 radius: ['50%', '75%'],
-                right:'20%',
+                right:'0',
                 avoidLabelOverlap: false,
                 data: [
                     <% for (const sc of shenpi_count) { %>