فهرست منبع

图表显示优化

chente 5 سال پیش
والد
کامیت
b1e3c7d7f2
1فایلهای تغییر یافته به همراه43 افزوده شده و 30 حذف شده
  1. 43 30
      biaoduan-panel.html

+ 43 - 30
biaoduan-panel.html

@@ -19,11 +19,11 @@
         <nav class="fixed-top bg-dark">
             <div class="my-2 d-flex justify-content-between">
                 <span class="text-white ml-3"><a href="biaoduan.html" class="mr-2 text-white"><i class="fa fa-chevron-left"></i> 标段概况</a></span>
-                <a tabindex="0" class="text-white text-truncate" style="width:150px" data-toggle="popover" data-placement="top" data-content="标段名称标段名称标段名称标段名称标段名称标段名称段名称标段名称标段名称标段名称标段名称" data-trigger="focus">标段名称标段名称标段名称标段名称标段名称标段名称段名称标段名称标段名称标段名称标段名称</a>
+                <a tabindex="0" class="text-white text-truncate" style="width:150px" data-toggle="popover" data-placement="top" data-content="第二合同段" data-trigger="focus">第二合同段</a>
                 <div class="mr-3">
                     <div class="dropdown">
                       <button class="btn btn-sm btn-light dropdown-toggle" type="button" data-toggle="dropdown">
-                        张三
+                        莹洁
                       </button>
                       <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
                         <a class="dropdown-item" href="#">退出登录</a>
@@ -53,57 +53,55 @@
                 <div class="card-body">
                   <h5 class="card-title">月进度表</h5>
                   <div style="overflow-x:scroll;padding-bottom: 10px">
-                    <div id="chartContainer3" style="height: 300px; width: 250%;">
+                    <div id="chartContainer4" style="height: 300px; width: 100%;">
                     </div>
                   </div>
-                    <p class="text-center text-muted m-0">左右滑动</p>
                 </div>
               </div>
               <div class="card mb-3 mr-1">
                 <div class="card-body">
                   <h5 class="card-title">期进度表</h5>
                   <div style="overflow-x:scroll;padding-bottom: 10px">
-                    <div id="chartContainer4" style="height: 300px; width: 320%;">
+                    <div id="chartContainer3" style="height: 300px; width: 100%;">
                     </div>
                   </div>
-                    <p class="text-center text-muted m-0">左右滑动</p>
                 </div>
               </div>
             </div>
             <div class="tab-pane" id="jlqi">
               <!--期列表-->
               <dl class="mb-2 mt-3">
-                <dt class="bg-light p-2 d-flex justify-content-between"><span>第3期</span><span class="text-warning">王五-监理 审批中</span></dt>
+                <dt class="bg-light p-2 d-flex justify-content-between"><span>第6期</span><span class="text-warning">王五-监理 审批中</span></dt>
                 <dd>
                   <table class="table table-hover">
                     <tbody><tr>
                       <td>
                         <p class="mb-0">本期合同计量</p>
-                        <b>¥5,000,000.00</b>
+                        <b>¥5618881.00</b>
                       </td>
                       <td>
                         <p class="mb-0">本期数量变更计量</p>
-                        <b>¥233,453,000.00</b>
+                        <b>¥0.00</b>
                       </td>
                     </tr>
                     <tr>
                       <td>
                         <p class="mb-0">本期完成计量</p>
-                        <b>¥5,000,000.00</b>
+                        <b>¥5618881.00</b>
                       </td>
                       <td>
                         <p class="mb-0">截止上期完成计量</p>
-                        <b>¥233,453,000.00</b>
+                        <b>¥14763357.00</b>
                       </td>
                     </tr>
                     <tr>
                       <td>
                         <p class="mb-0">截止本期完成计量</p>
-                        <b>¥233,453,000.00</b>
+                        <b>¥20382238.00</b>
                       </td>
                       <td>
                         <p class="mb-0">本期应付</p>
-                        <b>¥233,453,000.00</b>
+                        <b>¥5618881.00</b>
                       </td>
                     </tr>
                     <tr>
@@ -114,37 +112,37 @@
                   </tbody>
                 </table>
                 </dd>
-                <dt class="bg-light p-2 d-flex justify-content-between"><span>第2期</span><span class="text-success">审批完成</span></dt>
+                <dt class="bg-light p-2 d-flex justify-content-between"><span>第5期</span><span class="text-success">审批完成</span></dt>
                 <dd>
                   <table class="table table-hover">
                     <tbody><tr>
                       <td>
                         <p class="mb-0">本期合同计量</p>
-                        <b>¥5,000,000.00</b>
+                        <b>¥6315822.00</b>
                       </td>
                       <td>
                         <p class="mb-0">本期数量变更计量</p>
-                        <b>¥233,453,000.00</b>
+                        <b>¥0.00</b>
                       </td>
                     </tr>
                     <tr>
                       <td>
                         <p class="mb-0">本期完成计量</p>
-                        <b>¥5,000,000.00</b>
+                        <b>¥6315822.00</b>
                       </td>
                       <td>
                         <p class="mb-0">截止上期完成计量</p>
-                        <b>¥233,453,000.00</b>
+                        <b>¥8447535.00</b>
                       </td>
                     </tr>
                     <tr>
                       <td>
                         <p class="mb-0">截止本期完成计量</p>
-                        <b>¥233,453,000.00</b>
+                        <b>¥14763357.00</b>
                       </td>
                       <td>
                         <p class="mb-0">本期应付</p>
-                        <b>¥233,453,000.00</b>
+                        <b>¥6315822.00</b>
                       </td>
                     </tr>
                   </tbody></table>
@@ -284,7 +282,7 @@
             {
                 type : 'category',
                 splitLine : {show : true},
-                data : ['第一期','第二期','第三期','第四期','第五期','第六期','第七期']
+                data : ['第一期','第二期','第三期','第四期','第五期','第六期']
             }
         ],
         yAxis : [
@@ -293,7 +291,14 @@
                 name : '金额',
                 position:'left',
                 axisLabel : {
-                    formatter: '{value} 元'
+                      formatter: function (value, index) {
+                  if (value >= 10000 && value < 10000000) {
+                      value = value / 10000 + "万";
+                  } else if (value >= 10000000) {
+                      value = value / 10000000 + "千万";
+                  }
+                  return value;
+                  }
                 },
                 splitArea : {show : true}
             },
@@ -307,41 +312,46 @@
                 splitArea : {show : true}
             }
         ],
+    grid: {
+        left: 60,
+        right: 35,
+        top:110
+    },
         series : [
             {
                 name:'本期合同计量',
                 type:'bar',
                 tooltip : {trigger: 'item',formatter: "{b}  <br/>{a}:{c}元"},
                 stack: '合同',
-                data:[32322222220, 332, 301, 334, 390, 330, 320]
+                data:[1266825, 1691474, 2085065, 3327735, 6315822, 5618881]
             },
             {
                 name:'本期数量变更计量',
                 type:'bar',
                 tooltip : {trigger: 'item',formatter: "{b}  <br/>{a}:{c}元"},
                 stack: '合同',
-                data:[320, -20, 301, 334, 390, 330, 320]
+                data:[0, 76436, 0, 0, 0, 0]
             },
             {
                 name:'截止上期累计完成',
                 type:'bar',
                 tooltip : {trigger: 'item',formatter: "{b}  <br/>{a}:{c}元"},
                 stack: '完成',
-                data:[120, 132, 101, 134, 90, 230, 210]
+                data:[0, 1266825, 3034735, 5119800, 8447535, 14763357]
             },
             {
                 name:'本期完成计量',
                 type:'bar',
                 tooltip : {trigger: 'item',formatter: "{b}  <br/>{a}:{c}元"},
                 stack: '完成',
-                data:[220, 182, 191, 234, 290, 330, 310]
+                data:[1266825, 1767910, 2085065, 3327735, 6315822, 5618881]
             },
             {
                 name:'完成度',
                 type:'line',
                 tooltip : {trigger: 'axis',formatter: "{b}占总标段<br/>{a}:{c} %"},
                 yAxisIndex: 1,
-                data:[10, 15, 20, 13, 11, 9, 5]
+                data:[0, 1, 1, 1, 2, 2]
             },
         ]
     };
@@ -380,7 +390,7 @@
                                       type : 'category',
                                       boundaryGap : true,
                 data : [
-                    '2月','3月','4月','5月','6月','7月','8月','9月','10月'
+                    '2020-04','2020-05','2020-06'
                 ]
             }
         ],
@@ -393,6 +403,9 @@
                                       splitArea : {show : true}
                                   }
                               ],
+    grid: {
+        left: 42,
+    },
         series : [
                                   {
                                       name:'截止本月完成',
@@ -407,7 +420,7 @@
                                               }
                                           }
                                       },
-                                      data:[10, 10, 30, 40, 50, 60, 80, 85, 100]
+                                      data:[2.45, 4.28, 5.91]
                                   },
                                   {
                                       name:'本月完成',
@@ -422,7 +435,7 @@
                                               }
                                           }
                                       },
-                                      data:[10, 0, 20, 10, 10, 10, 10, 5, 15]
+                                      data:[0.96, 1.83, 1.63]
                                   }
                               ]
       };