Commit 3857fa90 authored by Santhanavanich's avatar Santhanavanich
Browse files

update

parent e35a6a72
Pipeline #6884 passed with stage
in 23 seconds
Showing with 21 additions and 11 deletions
+21 -11
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
<h4><i class="bi bi-globe2"></i> 3D Viewer</h4> <h4><i class="bi bi-globe2"></i> 3D Viewer</h4>
</div> </div>
<div id="cesiumContainer" style=" <div id="cesiumContainer" style="
height: 500px; height: 600px;
width: 100%; width: 100%;
margin: 0; margin: 0;
padding: 0; padding: 0;
...@@ -115,17 +115,17 @@ ...@@ -115,17 +115,17 @@
</div> </div>
<div class="col-12 col-lg-3"> <div class="col-12 col-lg-3">
<div class="card"> <div class="card" style="height: 680px">
<div class="card-header"> <div class="card-header">
<h4>3D Map Tool</h4> <h4>3D Map Tool</h4>
</div> </div>
<div class="card-content pb-4"> <div class="card-content pb-4">
<div class="card-body"> <div class="card-body">
<h6>GIS Layers</h6> <h6>Layers</h6>
<div class="form-check"> <div class="form-check">
<input class="form-check-input" type="checkbox" value="" id="util_nw_Enisyst" checked> <input class="form-check-input" type="checkbox" value="" id="3d_building_checkbox" checked>
<label class="form-check-label" for="util_nw_Enisyst"> <label class="form-check-label" for="3d_building_checkbox">
Utility Network Stations (Enisyst) 3D Building Models
</label> </label>
</div> </div>
<hr> <hr>
...@@ -135,6 +135,9 @@ ...@@ -135,6 +135,9 @@
<option value="AllWhite" selected>Default</option> <option value="AllWhite" selected>Default</option>
<option value="transparent">Transparent</option> <option value="transparent">Transparent</option>
<option value="height">Building Height</option> <option value="height">Building Height</option>
<option value="specific_heatdemand">Specific Space Heating Demand</option>
<option value="PVSpecificYield">PV Specific Yield</option>
<option value="PVPotential">PV Potential</option>
<!-- <option value="PVPotential">PV Potential</option> <!-- <option value="PVPotential">PV Potential</option>
<option value="PVSpecificYield">PV Specific Yield</option> --> <option value="PVSpecificYield">PV Specific Yield</option> -->
</select> </select>
...@@ -144,6 +147,9 @@ ...@@ -144,6 +147,9 @@
Building Shadow Building Shadow
</label> </label>
</div> </div>
<div class="pt-2 cesiumLegend" id="specific_heatdemand-legend" style="display:none"></div>
<div class="pt-2 cesiumLegend" id="PVPotential-legend" style="display:none"></div>
<div class="pt-2 cesiumLegend" id="PVSpecificYield-legend" style="display:none"></div>
<hr> <hr>
</div> </div>
...@@ -158,12 +164,12 @@ ...@@ -158,12 +164,12 @@
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="card-header"> <div class="card-header">
<h4><i class="bi bi-graph-up"></i> Sensor</h4> <!-- <h4><i class="bi bi-graph-up"></i> Sensor</h4> -->
</div> </div>
<div class="card-body"> <div class="card-body">
<div id="attribute-table-area"> <div id="attribute-table-area">
<p> Click on the utility network station (Enisyst) on the 3D Map to see sensor data.</p> <p> Click on the 3D Building to show attributes.</p>
</div> </div>
<div id="chart_area"></div> <div id="chart_area"></div>
</div> </div>
...@@ -185,7 +191,9 @@ ...@@ -185,7 +191,9 @@
<!-- Joe's Application --> <!-- Joe's Application -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/apexcharts"></script> <!-- <script src="https://cdn.jsdelivr.net/npm/apexcharts"></script> -->
<script src="https://cdn.jsdelivr.net/npm/echarts@5.3.3/dist/echarts.js"></script>
<!-- <script src="../application/js/drawchart.js"></script> <!-- <script src="../application/js/drawchart.js"></script>
<script src="../application/js/utility_point_data.js"></script> <script src="../application/js/utility_point_data.js"></script>
<script src="../application/js/staconnector.js"></script> <script src="../application/js/staconnector.js"></script>
...@@ -194,8 +202,10 @@ ...@@ -194,8 +202,10 @@
<script src="../application/js/cesium_mouse_handling.js"></script> --> <script src="../application/js/cesium_mouse_handling.js"></script> -->
<!-- theme template --> <!-- theme template -->
<script src="assets/js/app.js"></script> <!-- <script src="assets/js/app.js"></script> -->
<script src="assets/js/cesium_00_Main.js"></script> <script src="assets/js/app-min.js"></script>
<!-- <script src="assets/js/cesium_00_Main.js"></script> -->
<!-- <script src="assets/js/cesium_01_mouse.js"></script> -->
</body> </body>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment