|
@@ -167,11 +167,16 @@
|
|
|
<!--章节计量情况图-->
|
|
|
<div class="col-6 pl-0">
|
|
|
<div class="card mb-3 bg-dark text-white">
|
|
|
+ <% if (hadMap) { %>
|
|
|
+ <div class="card-body" id="map" style="height: 453px; width: 100%;">
|
|
|
+ </div>
|
|
|
+ <% } else { %>
|
|
|
<div class="card-header"><h6 class="mb-0">章节计量情况图</h6></div>
|
|
|
<div class="card-body">
|
|
|
<div id="jlchart3" style="height: 372px; width: 100%;">
|
|
|
</div>
|
|
|
</div>
|
|
|
+ <% } %>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="col-3 pl-0">
|
|
@@ -306,19 +311,49 @@
|
|
|
<!--期进度表-->
|
|
|
<div class="col-6">
|
|
|
<div class="card mb-3 bg-dark text-white">
|
|
|
- <div class="card-header"><h6 class="mb-0">期进度表</h6></div>
|
|
|
+ <% if (hadMap) { %>
|
|
|
+ <div class="card-header"><h6 class="mb-0">章节计量情况表</h6></div>
|
|
|
<div class="card-body">
|
|
|
- <div id="chartContainer4" style="height: 300px; width: 100%;"></div>
|
|
|
+ <div id="jlchart3" style="height: 338px; width: 100%;"></div>
|
|
|
</div>
|
|
|
+ <% } else { %>
|
|
|
+ <div class="card-header"><h6 class="mb-0">期进度表</h6></div>
|
|
|
+ <div class="card-body">
|
|
|
+ <div id="chartContainer4" style="height: 300px; width: 100%;"></div>
|
|
|
+ </div>
|
|
|
+ <% } %>
|
|
|
</div>
|
|
|
</div>
|
|
|
<!--月进度表-->
|
|
|
<div class="col-6 pl-0">
|
|
|
<div class="card mb-3 bg-dark text-white">
|
|
|
+ <% if (hadMap) { %>
|
|
|
+ <div class="card-header">
|
|
|
+ <ul class="nav nav-tabs card-header-tabs panel-card-tabs">
|
|
|
+ <li class="nav-item">
|
|
|
+ <a class="nav-link active" data-toggle="tab" href="#qijindubiao" role="tab" aria-selected="true">期进度表</a>
|
|
|
+ </li>
|
|
|
+ <li class="nav-item">
|
|
|
+ <a class="nav-link" data-toggle="tab" href="#yuejindbiao" role="tab" aria-selected="true">月进度表</a>
|
|
|
+ </li>
|
|
|
+ </ul>
|
|
|
+ </div>
|
|
|
+ <div class="card-body">
|
|
|
+ <div class="tab-content">
|
|
|
+ <div class="tab-pane active" id="qijindubiao">
|
|
|
+ <div id="chartContainer4" style="height: 338px; width: 100%;"></div>
|
|
|
+ </div>
|
|
|
+ <div class="tab-pane" id="yuejindbiao" >
|
|
|
+ <div id="chartContainer3" style="height: 338px; width: 800px;"></div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <% } else { %>
|
|
|
<div class="card-header"><h6 class="mb-0">月进度表</h6></div>
|
|
|
<div class="card-body">
|
|
|
<div id="chartContainer3" style="height: 300px; width: 100%;"></div>
|
|
|
</div>
|
|
|
+ <% } %>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -1071,3 +1106,21 @@
|
|
|
};
|
|
|
})
|
|
|
</script>
|
|
|
+<% if (hadMap) { %>
|
|
|
+<script type="text/javascript" src="https://api.map.baidu.com/api?v=1.0&type=webgl&ak=C3hLZAjuWTaCdwnwoYY83APrwlPEj4v7"></script>
|
|
|
+<script type="text/javascript">
|
|
|
+ var map = new BMapGL.Map("map");
|
|
|
+ // 创建地图实例
|
|
|
+ var point = new BMapGL.Point(116.404, 39.915);
|
|
|
+ // 创建点坐标
|
|
|
+ map.centerAndZoom(point, 14);
|
|
|
+ map.enableScrollWheelZoom(true);
|
|
|
+ // 初始化地图,设置中心点坐标和地图级别
|
|
|
+ var polyline = new BMapGL.Polyline([
|
|
|
+ new BMapGL.Point(116.399, 39.910),
|
|
|
+ new BMapGL.Point(116.405, 39.920),
|
|
|
+ // new BMapGL.Point(116.425, 39.900)
|
|
|
+ ], {strokeColor:"red", strokeWeight:5, strokeOpacity:1});
|
|
|
+ map.addOverlay(polyline);
|
|
|
+</script>
|
|
|
+<% } %>
|