资金统计页调整

app/public/js/financial_summary.js

@@ -61,7 +61,7 @@ $(document).ready(function() {
         }
         newTransferTenderList = !is_all ? _.filter(newTransferTenderList, function (item) { return _.includes(tenderSelects, item.tid); }) : newTransferTenderList;
         newPayList = !is_all ? _.filter(newPayList, function (item) { return _.includes(tenderSelects, item.tid); }) : newPayList;
-        const newTenders = !is_all ? _.filter(tenders, function (item) { return _.includes(tenderSelects, item.tid); }) : tenders;
+        const newTenders = !is_all ? _.filter(tenders, function (item) { return _.includes(tenderSelects, item.id); }) : tenders;
         summaryObj.changeHtmlAndCharts(newTenders, newTransferList, newTransferTenderList, newPayList, tenderSelects);
     });
 

app/view/financial/summary.ejs

@@ -5,7 +5,7 @@
         <div class="title-main  d-flex">
             <% include ./sub_mini_menu.ejs %>
             <div class="col-12 pl-0">
-                <div class="d-inline-block mr-2 col-sm-3">
+                <div class="d-inline-block mr-2" style="width: 300px;">
                     <div class="input-group input-group-sm pr-1">
                         <select class="form-control form-control-sm" multiple id="tender-select">
                             <option value="0" selected>全部</option>
@@ -42,14 +42,14 @@
                             <div class="card-body p-0">
                                 <div class="">
                                     <table class="table table-middle">
-                                        <thead class="text-center thead-light">
+                                        <thead class="text-center align-middle thead-light" style="height: 50px;line-height: 25px">
                                         <tr>
                                             <th>累计划拨</th>
                                             <th>累计支付</th>
                                             <th>待支付</th>
                                         </tr>
                                         </thead>
-                                        <tbody class="text-center">
+                                        <tbody class="text-center" style="height: 53.5px;">
                                         <tr>
                                             <td id="transfer_price">-</td>
                                             <td id="pay_price">-</td>
@@ -66,23 +66,12 @@
                                 <div class="mt-1"></div>
                             </div>
                             <div class="card-body p-0">
-                                <div class="progress m-4" id="pay_progress">
+                                <div class="progress my-5 mx-4" id="pay_progress">
                                 </div>
                             </div>
                         </div>
                         <div class="card ml-3 mt-3">
                             <div class="card-header card-white d-flex justify-content-between">
-                                <div class="card-big-htext"><span class="card-icon mr-2"></span>标段支出概况</div>
-                                <div class="mt-1"></div>
-                            </div>
-                            <div class="card-body p-0">
-                                <div id="jlchart3" style="height: 335%; width: 100%;"> </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-4 px-0">
-                        <div class="card ml-3">
-                            <div class="card-header card-white d-flex justify-content-between">
                                 <div class="card-big-htext"><span class="card-icon mr-2"></span>资金支出明细</div>
                                 <div class="mt-1">元</div>
                             </div>
@@ -101,23 +90,40 @@
                             </div>
                         </div>
                     </div>
-                    <div class="col-4 px-0">
-                        <div class="card ml-3">
-                            <div class="card-header card-white d-flex justify-content-between">
-                                <div class="card-big-htext"><span class="card-icon mr-2"></span>支出明细占比</div>
-                                <div class="mt-1"></div>
-                            </div>
-                            <div class="card-body p-0">
-                                <div id="jlchart1" style="height: 335%; width: 100%;"> </div>
+                    <div class="col-8 px-0">
+                        <div class="ml-3">
+                            <div class="card">
+                                <div class="card-header card-white d-flex justify-content-between">
+                                    <div class="card-big-htext"><span class="card-icon mr-2"></span>标段支出概况</div>
+                                    <div class="mt-1"></div>
+                                </div>
+                                <div class="card-body p-0">
+                                    <div id="jlchart3" style="height: 300%; width: 100%;"> </div>
+                                </div>
                             </div>
                         </div>
-                        <div class="card ml-3 mt-3">
-                            <div class="card-header card-white d-flex justify-content-between">
-                                <div class="card-big-htext"><span class="card-icon mr-2"></span>小额支出占比</div>
-                                <div class="mt-1"></div>
+                        <div class="ml-3 mt-3 row px-0">
+                            <div class="col-6 px-0">
+                                <div class="card">
+                                    <div class="card-header card-white d-flex justify-content-between">
+                                        <div class="card-big-htext"><span class="card-icon mr-2"></span>支出明细占比</div>
+                                        <div class="mt-1"></div>
+                                    </div>
+                                    <div class="card-body p-0">
+                                        <div id="jlchart1" style="height: 335%; width: 100%;"> </div>
+                                    </div>
+                                </div>
                             </div>
-                            <div class="card-body p-0">
-                                <div id="jlchart2" style="height: 335%; width: 100%;"> </div>
+                            <div class="col-6">
+                                <div class="card">
+                                    <div class="card-header card-white d-flex justify-content-between">
+                                        <div class="card-big-htext"><span class="card-icon mr-2"></span>小额支出占比</div>
+                                        <div class="mt-1"></div>
+                                    </div>
+                                    <div class="card-body p-0">
+                                        <div id="jlchart2" style="height: 335%; width: 100%;"> </div>
+                                    </div>
+                                </div>
                             </div>
                         </div>
                     </div>