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

app/public/css/main.css

@@ -1293,30 +1293,36 @@ overflow-y: auto;
 .context-menu-icon.context-menu-hover.context-menu-icon--fa.fa-tag span{
     color: #fff;!important;
 }
-.auto-main-height{
+/*.auto-main-height{
   height: calc(100vh - 34px);
   display: flex;
   flex-direction: column;
 }
 .auto-main-height .main-height-one{
-  flex-grow: 1;
+  flex-grow: 10;
 }
 .auto-main-height .main-height-two{
-  flex-grow: 18;
+  flex-grow: 30;
 }
-.bottom-height{
-  height:300px);
+.auto-main-height .main-height-three{
+  flex-grow: 1;
 }
+
+.bottom-height{
+  height:300px;
+}*/
 .bottom-height-two{
   height: 300px;
 }
 .card-big-title{
   font-size: 1.75rem;
   margin-bottom: .30rem;
+  position: relative;
 }
 .card-big-title small{
-  margin-top: -15px;
-  margin-right: -10px;
+  position: absolute;
+  right: -15px;
+  top: -20px;
 }
 .circle-box{
   float: left;

app/view/tender/detail.ejs

@@ -85,7 +85,7 @@
                                     <div class="col-2 pl-0">
                                         <div class="card text-center bg-dark text-white">
                                             <div class="card-body">
-                                                <h5 class="card-title card-big-title"><%- ctx.helper.formatMoney(tender.end_qc_tp) %> <small class="float-right text-danger"  data-toggle="tooltip" data-placement="bottom" title="" data-original-title="占合同比例"><%- tender.qc_ratio %>%</small></h5>
+                                                <h5 class="card-title card-big-title"><%- ctx.helper.formatMoney(tender.end_qc_tp) %> <small class="text-danger"  data-toggle="tooltip" data-placement="bottom" title="" data-original-title="占合同比例"><%- tender.qc_ratio %>%</small></h5>
                                                 <p class="card-text text-muted">截止本期变更</p>
                                             </div>
                                         </div>
@@ -308,11 +308,11 @@
                                                         </div>
                                                         <table class="table table-bordered table-2sm mb-0 mt-1 table-dark">
                                                             <% if (materialData) { %>
-                                                                <tr><th>含税（信息价/指数法）</th><td width="70"><%= materialData.m_tp !== null ? ctx.helper.round(ctx.helper.mul(materialData.m_tp, 1+materialData.rate/100), 2) : '0' %></td><td width="70"><%= materialData.ex_tp !== null ? ctx.helper.round(ctx.helper.mul(materialData.ex_tp, 1+materialData.rate/100), 2) : '0' %></td></tr>
-                                                                <tr><th>不含税（信息价/指数法）</th><td width="70"><%= materialData.m_tp !== null ? ctx.helper.round(materialData.m_tp, 2) : '0' %></td><td width="70"><%= materialData.ex_tp !== null ? ctx.helper.round(materialData.ex_tp, 2) : '0' %></td></tr>
+                                                                <tr><th width="60%">含税(信息价/指数法)</th><td width="20%"><%= materialData.m_tp !== null ? ctx.helper.round(ctx.helper.mul(materialData.m_tp, 1+materialData.rate/100), 2) : '0' %></td><td width="20%"><%= materialData.ex_tp !== null ? ctx.helper.round(ctx.helper.mul(materialData.ex_tp, 1+materialData.rate/100), 2) : '0' %></td></tr>
+                                                                <tr><th>不含税(信息价/指数法)</th><td><%= materialData.m_tp !== null ? ctx.helper.round(materialData.m_tp, 2) : '0' %></td><td><%= materialData.ex_tp !== null ? ctx.helper.round(materialData.ex_tp, 2) : '0' %></td></tr>
                                                             <% } else { %>
-                                                                <tr><th>含税（信息价/指数法）</th><td width="70">0</td><td width="70">0</td></tr>
-                                                                <tr><th>不含税（信息价/指数法）</th><td width="70">0</td><td width="70">0</td></tr>
+                                                                <tr><th width="60%">含税(信息价/指数法)</th><td width="20%">0</td><td width="20%">0</td></tr>
+                                                                <tr><th>不含税(信息价/指数法)</th><td>0</td><td>0</td></tr>
                                                             <% } %>
                                                         </table>
                                                     </div>
@@ -393,7 +393,7 @@
         },
         legend: {
             top: '0%',
-            right: '0%',
+            left: '0%',
             orient:'vertical'
         },
         series: [
@@ -401,7 +401,7 @@
                 name: '金额',
                 type: 'pie',
                 top:'0%',
-                right:'50%',
+                left:'50%',
                 radius: ['100%'],
                 avoidLabelOverlap: false,
                 label: {
@@ -444,7 +444,7 @@
             left: '3%',
             right: '18%',
             top:'5%',
-            bottom: '3%',
+            bottom: '0%',
             containLabel: true
         },
         yAxis: {
@@ -456,7 +456,8 @@
             name : '金额',
             position:'left',
             axisLabel : {
-                rotate: 30,
+                interval: 0,//横轴信息全部显示
+                rotate: 35,// 倾斜角度
                 formatter: function (value, index) {
                     if (value < 0) {
                         let newValue = Math.abs(value);
@@ -931,7 +932,7 @@
             data:['一般变更','较大变更','重大变更']
         },{
             top: '0%',
-            left: '0%',
+            right: '35%',
             orient:'vertical',
             itemWidth:15,
             data:['待上报','审批中','已完成']
@@ -941,7 +942,7 @@
                 name: '数量',
                 type: 'pie',
                 top:'0%',
-                right:'0%',
+                right:'65%',
                 selectedMode: 'single',
                 radius:  '50%',
                 avoidLabelOverlap: false,
@@ -963,7 +964,7 @@
                 name: '数量',
                 type: 'pie',
                 top:'0%',
-                right:'0%',
+                right:'65%',
                 radius: ['70%', '100%'],
                 avoidLabelOverlap: false,
                 label: {
@@ -1004,7 +1005,6 @@
 
     $(function () {
         $('#change-echarts a[data-toggle="tab"]').on('shown.bs.tab', function(e) {
-            console.log('hello');
             myChart3.resize();
             myChart4.resize();
         });