Skip to content

S
supervise-front
Commit aaf5a95d by niuxiaolin
Options

latest ui 08/06/2019 12:10:28

parent 9f868a03
Showing with 55 additions and 33 deletions
package-lock.json
......@@ -2595,7 +2595,7 @@
},
"date-fns": {
"version": "1.30.1",
"resolved": "https://registry.npm.taobao.org/date-fns/download/date-fns-1.30.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdate-fns%2Fdownload%2Fdate-fns-1.30.1.tgz",
"resolved": "https://registry.npm.taobao.org/date-fns/download/date-fns-1.30.1.tgz",
"integrity": "sha1-LnG/CxGRU9u0zE6I2epaz7UNwFw="
},
"date-format": {
......@@ -6450,12 +6450,12 @@
"dev": true
},
"ng-zorro-antd": {
"version": "7.2.0",
"resolved": "https://registry.npm.taobao.org/ng-zorro-antd/download/ng-zorro-antd-7.2.0.tgz?cache=0&sync_timestamp=1564410999960&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fng-zorro-antd%2Fdownload%2Fng-zorro-antd-7.2.0.tgz",
"integrity": "sha1-N0dkjMYfJUhu244wwWKoRKoceZs=",
"version": "7.5.1",
"resolved": "https://registry.npm.taobao.org/ng-zorro-antd/download/ng-zorro-antd-7.5.1.tgz?cache=0&sync_timestamp=1564410999960&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fng-zorro-antd%2Fdownload%2Fng-zorro-antd-7.5.1.tgz",
"integrity": "sha1-w/rKxqHs0QXC3i7mu44SltQs2sc=",
"requires": {
"@angular/cdk": "^7.0.0",
"@ant-design/icons-angular": "^2.0.2",
"@ant-design/icons-angular": "^2.1.0",
"date-fns": "^1.29.0",
"tslib": "^1.9.0"
}
......
package.json
......@@ -4,10 +4,8 @@
"scripts": {
"ng": "ng",
"start": "ng serve --port 8008 --proxy--config proxy.json",
"build": "ng build --prod --build-optimizer && npm run remove-to && npm run create && npm run copy-to ",
"remove-to": "rd /s /q D:\\projects\\supervise\\supervise\\src\\main\\resources\\static",
"create": "mkdir D:\\projects\\supervise\\supervise\\src\\main\\resources\\static",
"copy-to": " powershell -command \" Copy-Item D:\\projects\\map\\dist\\map\\* -Destination D:\\projects\\supervise\\supervise\\src\\main\\resources\\static\\ -Recurse \"",
"build": "ng build --prod --build-optimizer && npm run publish-to-backend ",
"publish-to-backend": "Powershell.exe -executionpolicy remotesigned -File publish-to-backend.ps1",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e"
......@@ -27,7 +25,7 @@
"@fortawesome/free-solid-svg-icons": "^5.9.0",
"angular2-baidu-map": "^4.7.0",
"core-js": "^2.5.4",
"ng-zorro-antd": "^7.2.0",
"ng-zorro-antd": "^7.5.1",
"ngx-color-picker": "^8.1.0",
"rxjs": "~6.3.3",
"tslib": "^1.9.0",
......
publish-to-backend.ps1 0 → 100644
$msg = "latest ui $(get-date)"
$path = D:\\projects\\supervise\\supervise\\src\\main\\resources\\static
git pull
git add .
git commit -m $msg
git push
Remove-Item -Recurse -Force $path
mkdir $path
Copy-Item D:\\projects\\map\\dist\\map\\* -Destination $path -Recurse
cd ../supervise/supervise
git pull
git add .
git commit -m $msg
git push
src/app/video/video.component.html
<div class="main">
<div>
<button (click)="back()">返回</button>
<nz-tree [nzShowIcon]="true" [nzData]="nodes" nzAsyncData (nzClick)="addVCR($event)" (nzExpandChange)="nzEvent($event)">
<div>
<button (click)="back()">返回</button>
<nz-tree [nzShowIcon]="true" [nzTreeTemplate]="nzTreeTemplate" [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 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>
......@@ -21,20 +17,25 @@
<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>
<span *ngIf="node.isLeaf">
<i nz-icon nzType="video-camera" nzTheme="outline"></i>
{{node.title}}
</span>
<span *ngIf="!node.isLeaf">
<i nz-icon nzType="cluster" nzTheme="outline"></i>
{{node.title}}
</span>
</ng-template>
</nz-tree>
</div>
<div class="right">
<div id="playWnd">
<div id="playWnd">
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/assets/outline/cluster.svg 0 → 100644
<svg viewBox="64 64 896 896" fill="white" width="1em" height="1em" data-icon="cluster" aria-hidden="true"><path d="M888 680h-54V540H546v-92h238c8.8 0 16-7.2 16-16V168c0-8.8-7.2-16-16-16H240c-8.8 0-16 7.2-16 16v264c0 8.8 7.2 16 16 16h238v92H190v140h-54c-4.4 0-8 3.6-8 8v176c0 4.4 3.6 8 8 8h176c4.4 0 8-3.6 8-8V688c0-4.4-3.6-8-8-8h-54v-72h220v72h-54c-4.4 0-8 3.6-8 8v176c0 4.4 3.6 8 8 8h176c4.4 0 8-3.6 8-8V688c0-4.4-3.6-8-8-8h-54v-72h220v72h-54c-4.4 0-8 3.6-8 8v176c0 4.4 3.6 8 8 8h176c4.4 0 8-3.6 8-8V688c0-4.4-3.6-8-8-8zM256 805.3c0 1.5-1.2 2.7-2.7 2.7h-58.7c-1.5 0-2.7-1.2-2.7-2.7v-58.7c0-1.5 1.2-2.7 2.7-2.7h58.7c1.5 0 2.7 1.2 2.7 2.7v58.7zm288 0c0 1.5-1.2 2.7-2.7 2.7h-58.7c-1.5 0-2.7-1.2-2.7-2.7v-58.7c0-1.5 1.2-2.7 2.7-2.7h58.7c1.5 0 2.7 1.2 2.7 2.7v58.7zM288 384V216h448v168H288zm544 421.3c0 1.5-1.2 2.7-2.7 2.7h-58.7c-1.5 0-2.7-1.2-2.7-2.7v-58.7c0-1.5 1.2-2.7 2.7-2.7h58.7c1.5 0 2.7 1.2 2.7 2.7v58.7zM360 300a40 40 0 1 0 80 0 40 40 0 1 0-80 0z"></path></svg>
\ No newline at end of file
src/assets/outline/video-camera.svg 0 → 100644
<svg viewBox="64 64 896 896" fill="white" width="1em" height="1em" data-icon="video-camera" aria-hidden="true"><path d="M912 302.3L784 376V224c0-35.3-28.7-64-64-64H128c-35.3 0-64 28.7-64 64v576c0 35.3 28.7 64 64 64h592c35.3 0 64-28.7 64-64V648l128 73.7c21.3 12.3 48-3.1 48-27.6V330c0-24.6-26.7-40-48-27.7zM712 792H136V232h576v560zm176-167l-104-59.8V458.9L888 399v226zM208 360h112c4.4 0 8-3.6 8-8v-48c0-4.4-3.6-8-8-8H208c-4.4 0-8 3.6-8 8v48c0 4.4 3.6 8 8 8z"></path></svg>
\ No newline at end of file
src/styles.less
......@@ -276,6 +276,7 @@ legend{
color:white;
font-size:15px;
}
.ant-tree li .ant-tree-node-content-wrapper{
.ant-tree li {
font-size: 22px;
}
\ No newline at end of file
color:white;
}
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