Commit 614f340f by niuxiaolin

latest

parent 5ca763d3
......@@ -4,7 +4,7 @@
"scripts": {
"ng": "ng",
"start": "ng serve --proxy--config proxy.json",
"build": "ng build --prod --build-optimizer && npm run remove-to && npm run create && npm run copy-to",
"build": "ng build && npm run remove-to && npm run create && npm run copy-to",
"remove-to": "rd /s /q D:\\projects\\supervise\\src\\main\\resources\\static",
"create": "mkdir D:\\projects\\supervise\\src\\main\\resources\\static",
"copy-to": " powershell -command \" Copy-Item D:\\projects\\map\\dist\\map\\* -Destination D:\\projects\\supervise\\src\\main\\resources\\static\\ -Recurse \"",
......
......@@ -9,7 +9,10 @@ export const ScriptStore: Scripts[] = [
{ name: 'drawing', src: '/assets/DrawingManager.js' },
{ name: 'geouti', src: '/assets/GeoUtils.js' },
{ name: 'mapv', src: '/assets/mapv.min.js' }
{ name: 'mapv', src: '/assets/mapv.min.js' },
{ name: 'jsencrypt', src: '/assets/jsencrypt.min.js' },
{ name: 'jswebcontrol', src: '/assets/jsWebControl-1.0.0.min.js' },
{name:'jquery',src:"/assets/jquery-1.12.4.min.js"}
];
......
<baidu-map #map [options]="opts">
<polyline [points]="points" [options]="polylineOptions" (loaded)="polylineLoaded($event)"
(clicked)="polylineClicked($event)"></polyline>
</baidu-map>
<div class="main">
<div class="left">
<fieldset>
......
<div class="main">
<div>
<tree-ngx [nodeItems]="nodeItems"> </tree-ngx>
<a href="http://192.168.19.175/portal/" style=" color: white;
<a (click)="preview()" style=" color: white;
text-decoration: none;
margin-left: 2em;">演示demo</a>
margin-left: 2em;">演示demo1</a>
<a (click)="preview2()" style=" color: white;
text-decoration: none;
margin-left: 2em;
display: inherit;
">演示demo2</a>
</div>
<div class="right">
<div id="playWnd">
</div>
<!--
<div *ngFor="let i of cams" class="cam">
<video src = "http://192.168.19.175/portal/"></video>
<!-- <webcam width="350" height="200"></webcam> -->
<div class='bottom-line'>
<img class="cam-img" src="/assets/camera-retro.svg">
<img class="cam-img" src="/assets/microphone-alt.svg">
......@@ -17,9 +29,10 @@
<img class="cam-img" src="/assets/camera-retro.svg">
<img class="cam-img" src="/assets/volume-up.svg">
</div>
</div>
<div class="cam">一分部梁场摄像机不在线</div>
</div> -->
<!-- <div class="cam">一分部梁场摄像机不在线</div>
<div class="cam">一分部梁场摄像机不在线</div>
<div class="no-cam"> </div>
<div class="no-cam"> </div> -->
</div>
</div>
\ No newline at end of file
</div>
......@@ -26,4 +26,9 @@
bottom: 6px;
color: red;
}
}
#playWnd{
width:500px;
height: 500px;
}
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
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