Commit 74c97dd6 by niuxiaolin

latest ui 08/08/2019 16:35:30

parent 09370c7e
...@@ -21,11 +21,11 @@ ...@@ -21,11 +21,11 @@
<option *ngFor="let c of projects2" [value]="c.id" >{{c.name}}</option> <option *ngFor="let c of projects2" [value]="c.id" >{{c.name}}</option>
</select> </select>
</div> </div>
<baidu-map #map [options]="opts"> <!-- <baidu-map #map [options]="opts">
<polyline [points]="points" [options]="polylineOptions" (loaded)="polylineLoaded($event)" <polyline [points]="points" [options]="polylineOptions" (loaded)="polylineLoaded($event)"
(clicked)="polylineClicked($event)"></polyline> (clicked)="polylineClicked($event)"></polyline>
</baidu-map> </baidu-map> -->
<div id="baidu-map"></div>
<div class="main"> <div class="main">
<div class="left"> <div class="left">
<fieldset> <fieldset>
...@@ -63,11 +63,6 @@ ...@@ -63,11 +63,6 @@
<section *ngIf="highShow" class="sub"> <section *ngIf="highShow" class="sub">
<div class="item" *ngFor="let prj of projects;let i=index"> <div class="item" *ngFor="let prj of projects;let i=index">
<label (click)="highLight(i,prj,'p');setPrj(prj);">{{prj.name}} </label> <label (click)="highLight(i,prj,'p');setPrj(prj);">{{prj.name}} </label>
<!-- <section class="sub">
<label (click)=" highLight(i,sec,'s');setCamera(sec);" *ngFor="let sec of prj.secs;let i=index">{{sec.name}}
</label>
</section> -->
</div> </div>
</section> </section>
...@@ -113,123 +108,6 @@ ...@@ -113,123 +108,6 @@
</div> </div>
</div> </div>
<!-- <button (click)="openDialog('custom-modal-1')" >新增项目</button> -->
<!-- <button (click)="toHighWay()">高速公路</button> -->
<!-- <div class="proj-info" *ngIf="!highShow">
<label>
<div>
项目总数:
</div>
<div>
{{staticHighWay.total}}个
</div>
</label>
<label>
<div>
总建设里程:
</div>
<div>
{{staticHighWay.mileage}}Km
</div>
</label>
<label>
<div>
总投资:
</div>
<div>
{{staticHighWay.capital}}亿
</div>
</label>
</div> -->
<!-- </section>
<section>
<button [ngClass]="{focus:normalShow}" (click)='toNormal()'>普通干线
</button>
<div *ngIf="!normalShow">
<label>
<div>
项目总数:
</div>
<div>
{{staticNormal.total}}个
</div>
</label>
<label>
<div>
总建设里程:
</div>
<div>
{{staticNormal.mileage}}Km
</div>
</label>
<label>
<div>
总投资:
</div>
<div>
{{staticNormal.capital}}亿
</div>
</label>
</div>
</section>
</div>
<div class="map">
<div id="polylineLength"></div>
<div id="result"></div>
</div>
<div class="right">
</div> -->
<!-- <section>
<button (click)="goToVideo()">视频监管
</button>
<label>监管项目:{{cameraSum.project}}个</label>
<label>监控点总计:{{cameraSum.total}} 个 </label>
</section>
<section>
<button>建设程序监管
</button>
</section>
<section>
<button>质量安全监管 </button>
<label>年度累计完成产值:</label>
<label>年度总目标产值: </label>
</section>
<section>
<button>造价监管
</button>
<label></label>
<label> </label>
<label></label>
</section> -->
<!-- <section>
<button>数据信息
</button>
<label>名字:{{currProj.name}}</label>
<label>里程:{{currProj.mileage}}</label>
<label>投资:{{currProj.capital}}</label>
</section>
</div>
</div>
-->
<jw-modal id="custom-modal-1"> <jw-modal id="custom-modal-1">
<h1>添加项目</h1> <h1>添加项目</h1>
<p>项目名称: <input type="text" [(ngModel)]="proj.name" /></p> <p>项目名称: <input type="text" [(ngModel)]="proj.name" /></p>
......
...@@ -190,4 +190,10 @@ fieldset{ ...@@ -190,4 +190,10 @@ fieldset{
.tooltip:hover .tooltiptext { .tooltip:hover .tooltiptext {
visibility: visible; visibility: visible;
} }
\ No newline at end of file
#baidu-map{
width: 100%;
height: 900px;
display: block;
}
\ No newline at end of file
...@@ -304,7 +304,7 @@ oWebControl.JS_RepairPartWindow(0, 0, 1001, 700); // 多1个像素点防止 ...@@ -304,7 +304,7 @@ oWebControl.JS_RepairPartWindow(0, 0, 1001, 700); // 多1个像素点防止
var appkey = "24824919"; //综合安防管理平台提供的appkey,必填 var appkey = "24824919"; //综合安防管理平台提供的appkey,必填
var secret = setEncrypt("Bnh6hmvisDdhb1gDDIMV"); //综合安防管理平台提供的secret,必填 var secret = setEncrypt("Bnh6hmvisDdhb1gDDIMV"); //综合安防管理平台提供的secret,必填
// var ip = "192.168.19.175"; //综合安防管理平台IP地址,必填 // var ip = "192.168.19.175"; //综合安防管理平台IP地址,必填
var ip = "221.131.9.171"; //综合安防管理平台IP地址,必填 var ip = "221.131.9.172"; //综合安防管理平台IP地址,必填
var playMode = 0; //初始播放模式:0-预览,1-回放 var playMode = 0; //初始播放模式:0-预览,1-回放
var port = 1443; //综合安防管理平台端口,若启用HTTPS协议,默认443 var port = 1443; //综合安防管理平台端口,若启用HTTPS协议,默认443
var snapDir = "D:\\SnapDir"; //抓图存储路径 var snapDir = "D:\\SnapDir"; //抓图存储路径
......
var bmapcfg = {
'imgext' : '.jpg', //瓦片图的后缀 根据需要修改,一般是 .png .jpg
'tiles_dir' : '', //普通瓦片图的地址,为空默认在tiles/ 目录
};
var scripts = document.getElementsByTagName("script");
var JS__FILE__ = scripts[scripts.length - 1].getAttribute("src"); //获得当前js文件路径
bmapcfg.home = JS__FILE__.substr(0, JS__FILE__.lastIndexOf("/")+1); //地图API主目录
(function(){
window.BMap_loadScriptTime = (new Date).getTime();
//加载地图API主文件
// document.write('<script type="text/javascript" src="'+bmapcfg.home+'getscript.js"></script>');
document.write('<script type="text/javascript" src="'+bmapcfg.home+'orgingetscript.js"></script>');
})();
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico"> <link rel="icon" type="image/x-icon" href="favicon.ico">
<script src="/assets/map_load.js"></script>
<link rel="stylesheet" href="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css" /> <link rel="stylesheet" href="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css" />
<style> <style>
body{ body{
......
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