overflow_cloud/member_webapp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

map

Browse Source
This commit is contained in:
insanity 2018-04-26 21:33:37 +09:00
parent da0d397c34
commit 4642664ff5
3 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/environments/environment.ts
View File

@ -5,9 +5,9 @@
export const environment = { export const environment = {
production: false, production: false,
restBaseURL: 'http://192.168.1.103:19080/webapp', restBaseURL: 'http://192.168.1.50:19080/webapp',
webappRPCConfig: { webappRPCConfig: {
url: 'ws://192.168.1.103:19090/webapp', url: 'ws://192.168.1.50:19090/webapp',
reconnectInterval: 5000, reconnectInterval: 5000,
reconnectRetry: 10, reconnectRetry: 10,
}, },

28
src/packages/infra/component/map/map.component.html
View File

@ -25,31 +25,47 @@
</div> </div>
</div> </div>
<div class="ui-g-12 ui-g-nopad"> <div class="ui-g-12 ui-g-nopad">
<p-tree [value]="infraTree" selectionMode="single" [(selection)]="selectedTree" (onNodeSelect)="onNodeSelect($event)" [contextMenu]="cm"> <p-tree [value]="infraTree" selectionMode="single" [(selection)]="selectedTree" (onNodeSelect)="onNodeSelect($event)" [contextMenu]="cm"
[pTooltip]="desiredTooltip">
<ng-template let-node pTemplate="default"> <ng-template let-node pTemplate="default">
<div>{{node.label}}</div> <div>{{node.label}}</div>
</ng-template> </ng-template>
<ng-template let-node pTemplate="infra"> <ng-template let-node pTemplate="infra">
<div (contextmenu)="nodeMenu($event, node)">{{node.label}}</div> <div (contextmenu)="nodeMenu($event, node)">
<div>{{node.label}}</div>
</div>
</ng-template> </ng-template>
<ng-template let-node pTemplate="probe"> <ng-template let-node pTemplate="probe">
<div (contextmenu)="nodeMenu($event, node)">{{node.label}}</div> <div (contextmenu)="nodeMenu($event, node)">
<div>{{node.label}}</div>
</div>
</ng-template> </ng-template>
<ng-template let-node pTemplate="host"> <ng-template let-node pTemplate="host">
<div (contextmenu)="nodeMenu($event, node)">{{node.label}}</div> <div (contextmenu)="nodeMenu($event, node)">
<div>{{node.label}}</div>
<!-- <div>{{node.obj.infraType.name}}</div> -->
</div>
</ng-template> </ng-template>
<ng-template let-node pTemplate="service"> <ng-template let-node pTemplate="service">
<div (contextmenu)="nodeMenu($event, node)">{{node.label}}</div> <div (contextmenu)="nodeMenu($event, node)">
<div>{{node.label}}</div>
</div>
</ng-template> </ng-template>
<ng-template let-node pTemplate="sensor"> <ng-template let-node pTemplate="sensor">
<div (contextmenu)="nodeMenu($event, node)"> <div (contextmenu)="nodeMenu($event, node)">
<i class="fa ui-icon-stop ui-status-icon ui-status-success"></i>{{node.label}}</div> <div>
<i class="fa ui-icon-stop ui-status-icon ui-status-success"></i>{{node.label}}
</div>
<div>
{{node.obj.itemCount}} SensorItems
</div>
</div>
</ng-template> </ng-template>
</p-tree> </p-tree>

6
src/packages/infra/component/map/map.component.ts
View File

@ -437,10 +437,9 @@ export class MapComponent implements OnInit, AfterContentInit {
} }
viewInfo() { viewInfo() {
const temp = { this.onNodeSelect({
node : this.selectedNode, node : this.selectedNode,
}; });
this.onNodeSelect(temp);
} }
nodeMenu(event: MouseEvent, node: any) { nodeMenu(event: MouseEvent, node: any) {
@ -483,6 +482,7 @@ export class MapComponent implements OnInit, AfterContentInit {
} }
discovery() { discovery() {
this.display = true;
} }
addSensorWithTarget() { addSensorWithTarget() {