首页更新

app/public/css/main.css

@@ -1305,10 +1305,10 @@ overflow-y: auto;
   flex-grow: 18;
 }
 .bottom-height{
-  height: calc(100vh - 34px - 160px - 440px);
+  height:300px);
 }
 .bottom-height-two{
-  height: calc(100vh - 34px - 160px - 525px);
+  height: 300px;
 }
 .card-big-title{
   font-size: 1.75rem;

app/view/tender/detail.ejs

@@ -55,7 +55,8 @@
     </div>
     <div class="content-wrap">
         <div class="c-body" style="background:#2c3237 !important">
-            <div class="auto-main-height">
+            <div class="sjs-height-0">
+            <!--<div class="auto-main-height">-->
                 <div class="main-height-one">
                     <div class="m-3">
                         <!--金额概况-->
@@ -230,6 +231,19 @@
                                                     <div class="col-5 text-right">
                                                         <%- lastStage.qc_tp %>
                                                     </div>
+                                                <% } else { %>
+                                                        <div class="col-7 mb-1">
+                                                            &nbsp;
+                                                        </div>
+                                                        <div class="col-5 text-right  mb-1">
+                                                            &nbsp;
+                                                        </div>
+                                                        <div class="col-7">
+                                                            &nbsp;
+                                                        </div>
+                                                        <div class="col-5 text-right">
+                                                            &nbsp;
+                                                        </div>
                                                 <% } %>
                                             </div>
                                         </div>
@@ -303,12 +317,12 @@
                                     <% if (hadMap) { %>
                                         <div class="card-header"><h6 class="mb-0">章节计量情况表</h6></div>
                                         <div class="card-body">
-                                            <div id="jlchart3" style="height: 100%; width: 100%;"></div>
+                                            <div id="jlchart3" style="height: 300px; width: 100%;"></div>
                                         </div>
                                     <% } else { %>
                                         <div class="card-header"><h6 class="mb-0">期进度表</h6></div>
                                         <div class="card-body">
-                                            <div id="chartContainer4" style="height: 100%; width: 100%;"></div>
+                                            <div id="chartContainer4" style="height: 300px; width: 100%;"></div>
                                         </div>
                                     <% } %>
                                 </div>
@@ -340,7 +354,7 @@
                                     <% } else { %>
                                         <div class="card-header"><h6 class="mb-0">月进度表</h6></div>
                                         <div class="card-body">
-                                            <div id="chartContainer3" style="height: 100%; width: 100%;"></div>
+                                            <div id="chartContainer3" style="height: 300px; width: 100%;"></div>
                                         </div>
                                     <% } %>
                                 </div>
@@ -388,14 +402,16 @@
         },
         legend: {
             top: '0%',
-            left: 'center'
+            right: '0%',
+            orient:'vertical'
         },
         series: [
             {
                 name: '金额',
                 type: 'pie',
-                top:'20%',
-                radius: ['70%'],
+                top:'0%',
+                right:'50%',
+                radius: ['100%'],
                 avoidLabelOverlap: false,
                 label: {
                     show: false,
@@ -449,6 +465,7 @@
             name : '金额',
             position:'left',
             axisLabel : {
+                rotate: -90,
                 <% if (ctx.tender.info.display.thousandth) { %>
                 formatter: function (value, index) {
                     return value.format2Str('#,##0.######') + ' 元'
@@ -573,10 +590,11 @@
         },
         calculable : true,
         legend: {
+            itemWidth:15,
             data:['本期合同计量','本期数量变更计量','截至上期累计完成','本期完成计量','完成度']
         },
         dataZoom: [
-            {show: true, start: 0, end: 100}
+            {show: true, start: 0, end: 100,height:10,bottom:30}
         ],
         xAxis : [
             {
@@ -765,7 +783,9 @@
         dataZoom : {
             show : true,
             start : 50,
-            end : 100
+            end : 100,
+            height:10,
+            bottom:30
         },
         xAxis : [
             {
@@ -882,16 +902,17 @@
         },
         legend: {
             top: '0%',
-            right: 'right',
+            right: '0%',
             orient:'vertical',
+            itemWidth:15,
             data: ['一般变更', '较大变更', '重大变更', '待上报', '审批中', '已完成']
         },
         series: [
             {
                 name: '数量',
                 type: 'pie',
-                top:'2%',
-                right:'40%',
+                top:'0%',
+                right:'60%',
                 selectedMode: 'single',
                 radius:  '50%',
                 avoidLabelOverlap: false,
@@ -912,9 +933,9 @@
             {
                 name: '数量',
                 type: 'pie',
-                top:'2%',
-                right:'40%',
-                radius: ['80%', '100%'],
+                top:'0%',
+                right:'60%',
+                radius: ['70%', '100%'],
                 avoidLabelOverlap: false,
                 label: {
                     show: false,
@@ -1189,7 +1210,7 @@
             }
             // 初始化地图，设置中心点坐标和地图级别
             const point = new BMapGL.Point(centerPoint.lng, centerPoint.lat);
-            map.centerAndZoom(point, 14);
+            map.centerAndZoom(point, 15);
             map.enableScrollWheelZoom(true);
             map.setMapStyleV2({styleId: '20d4aea41cf71387395f2dc835f1c4b6'});
             if (polyLineList.length > 0) {