Skip to content

S
supervise-front
Commit 9f868a03 by niuxiaolin
Options

改动之前稳定版

parent 75be738c
Showing with 35 additions and 21 deletions
src/app/api/api/default.service.ts
......@@ -41,7 +41,7 @@ import { Observable } from 'rxjs';
@Injectable()
export class DefaultService {
public basePath = 'http://localhost:8081';
public basePath = 'https://localhost:443';
// public basePath = 'http://192.168.19.199:8081';
// public basePath = environment.prod? 'http://localhost:8081':'http://192.168.19.199:8081';
public defaultHeaders = new HttpHeaders();
......
src/app/app.component.less
......@@ -9,6 +9,8 @@ h1{
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
letter-spacing: 20px;
margin-top:13px;
font-size: 36px;
/* -webkit-animation: neon6 1.5s ease-in-out infinite alternate; */
/* animation: neon6 0.5s ease-in-out infinite alternate; */
// text-shadow: 0px 0px 18px rgb(167, 223, 102);
......
src/app/app.module.ts
......@@ -11,7 +11,7 @@ import { ModalComponent } from './modal/modal.component';
import { ApiModule } from './api';
import { HttpClientModule } from '@angular/common/http';
import { ColorPickerModule } from 'ngx-color-picker';
import { NgZorroAntdModule, NZ_I18N, zh_CN } from 'ng-zorro-antd';
import { NgZorroAntdModule, NZ_I18N, zh_CN,NzIconModule } from 'ng-zorro-antd';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
@NgModule({
......@@ -31,6 +31,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
BrowserAnimationsModule,
FormsModule,
ApiModule,
NzIconModule,
/** 导入 ng-zorro-antd 模块 **/
NgZorroAntdModule,
BaiduMapModule.forRoot({ ak: 'KhQqnL3owyAzqjr4zCGbWiiHwPFmKTD6' })
......
src/app/video/video.component.html
......@@ -6,8 +6,26 @@
<div class="main">
<div>
<button (click)="back()">返回</button>
<!-- <tree-ngx [nodeItems]="nodeItems"> </tree-ngx> -->
<nz-tree [nzData]="nodes" nzAsyncData (nzClick)="addVCR($event)" (nzExpandChange)="nzEvent($event)"> </nz-tree>
<nz-tree [nzShowIcon]="true" [nzData]="nodes" nzAsyncData (nzClick)="addVCR($event)" (nzExpandChange)="nzEvent($event)">
<ng-template #nzTreeTemplate let-node>
<!-- <span class="custom-node" [class.active]="activedNode?.key === node.key">
<span *ngIf="!node.isLeaf" (contextmenu)="contextMenu($event, menu)">
<i nz-icon [nzType]="node.isExpanded ? 'folder-open' : 'folder'" (click)="openFolder(node)"></i>
<span class="folder-name">{{ node.title }}</span>
<span class="folder-desc">created by {{ node?.origin?.author | lowercase }}</span>
</span>
<span *ngIf="node.isLeaf" (contextmenu)="contextMenu($event, menu)">
<i nz-icon nzType="file"></i>
<span class="file-name">{{ node.title }}</span>
<span class="file-desc">modified by {{ node?.origin?.author | lowercase }}</span>
</span>
</span> -->
<!-- <i *ngIf="node.level==2" nz-icon nzType="video-camera" nzTheme="outline"></i>
<i *ngIf="node.level!=2" nz-icon nzType="cluster" nzTheme="outline"></i> -->
</ng-template>
</nz-tree>
......@@ -16,20 +34,7 @@
<div id="playWnd">
</div>
<!--
<div *ngFor="let i of cams" class="cam">
<div class='bottom-line'>
<img class="cam-img" src="/assets/camera-retro.svg">
<img class="cam-img" src="/assets/microphone-alt.svg">
<img class="cam-img" src="/assets/play-circle.svg">
<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 class="cam">一分部梁场摄像机不在线</div>
<div class="no-cam"> </div> -->
</div>
</div>
src/app/video/video.component.ts
......@@ -301,8 +301,8 @@ oWebControl.JS_RepairPartWindow(0, 0, 1001, 700); // 多1个像素点防止
getPubKey(oWebControl, function () {
////////////////////////////////// 请自行修改以下变量值 ////////////////////////////////////
var appkey = "29359046"; //综合安防管理平台提供的appkey，必填
var secret = setEncrypt("zRjsouOfWQQW5Yl4Ddgl"); //综合安防管理平台提供的secret，必填
var appkey = "24824919"; //综合安防管理平台提供的appkey，必填
var secret = setEncrypt("Bnh6hmvisDdhb1gDDIMV"); //综合安防管理平台提供的secret，必填
// var ip = "192.168.19.175"; //综合安防管理平台IP地址，必填
var ip = "221.131.9.171"; //综合安防管理平台IP地址，必填
var playMode = 0; //初始播放模式：0-预览，1-回放
......
src/assets/mapv.js
......@@ -550,7 +550,7 @@
next = points[index];
}
// console.log(Math.sqrt(Math.pow((current.x - next.x), 2) + Math.pow((current.y - next.y), 2)))
if (Math.sqrt(Math.pow((current.x - next.x), 2) + Math.pow((current.y - next.y), 2)) > 0.5) {
if (Math.sqrt(Math.pow((current.x - next.x), 2) + Math.pow((current.y - next.y), 2)) > 1) {
drawLine(movStart,current);
current.x += getStep(movStart, next).stepx;
current.y += getStep(movStart, next).stepy;
......
src/assets/organization.svg 0 → 100644
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1565060626945" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1243" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M960 887.466667h-213.333333c-25.6 0-42.666667-17.066667-42.666667-42.666667v-213.333333c0-25.6 17.066667-42.666667 42.666667-42.666667h85.333333v-85.333333h-298.666667v85.333333h85.333334c25.6 0 42.666667 17.066667 42.666666 42.666667v213.333333c0 25.6-17.066667 42.666667-42.666666 42.666667h-213.333334c-25.6 0-42.666667-17.066667-42.666666-42.666667v-213.333333c0-25.6 17.066667-42.666667 42.666666-42.666667h85.333334v-85.333333h-298.666667v85.333333h85.333333c25.6 0 42.666667 17.066667 42.666667 42.666667v213.333333c0 25.6-17.066667 42.666667-42.666667 42.666667h-213.333333c-25.6 0-42.666667-17.066667-42.666667-42.666667v-213.333333c0-25.6 17.066667-42.666667 42.666667-42.666667h85.333333v-128h341.333334v-85.333333h-85.333334c-25.6 0-42.666667-17.066667-42.666666-42.666667v-213.333333c0-25.6 17.066667-42.666667 42.666666-42.666667h213.333334c25.6 0 42.666667 17.066667 42.666666 42.666667v213.333333c0 25.6-17.066667 42.666667-42.666666 42.666667h-85.333334v85.333333h341.333334v128h85.333333c25.6 0 42.666667 17.066667 42.666667 42.666667v213.333333c0 21.333333-17.066667 42.666667-42.666667 42.666667z" p-id="1244"></path></svg>
\ No newline at end of file
src/styles.less
......@@ -275,4 +275,7 @@ legend{
.tooltiptextx{
color:white;
font-size:15px;
}
.ant-tree li .ant-tree-node-content-wrapper{
font-size: 22px;
}
\ No newline at end of file
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