diff options
Diffstat (limited to 'usecaseui-portal/src/app')
14 files changed, 52 insertions, 128 deletions
diff --git a/usecaseui-portal/src/app/core/models/dataInterface.ts b/usecaseui-portal/src/app/core/models/dataInterface.ts index e092bd03..012b23e6 100644 --- a/usecaseui-portal/src/app/core/models/dataInterface.ts +++ b/usecaseui-portal/src/app/core/models/dataInterface.ts @@ -1,6 +1,5 @@ enum baseUrl{ baseUrl = '/api/usecaseui-server/v1' //online - // baseUrl = 'http://172.19.44.223/api/usecaseui-server/v1' //local one // baseUrl = 'http://10.73.191.100:8082' //local two } interface homeData { diff --git a/usecaseui-portal/src/app/core/services/homes.service.ts b/usecaseui-portal/src/app/core/services/homes.service.ts index 218756d4..321642db 100644 --- a/usecaseui-portal/src/app/core/services/homes.service.ts +++ b/usecaseui-portal/src/app/core/services/homes.service.ts @@ -23,16 +23,13 @@ export class HomesService { constructor(private http: HttpClient) { } baseUrl = baseUrl.baseUrl; - baseUrlbar = baseUrl.baseUrl + "/uui-lcm/"; url = { home_serviceData: this.baseUrl + "/uui-lcm/serviceNumByCustomer", - home_performanceData: this.baseUrl + "/performance/queryAllSourceNames", home_alarmData: this.baseUrl + "/alarm/statusCount", home_alarmChartData: this.baseUrl + "/alarm/diagram", - home_servicebarData: this.baseUrl + "", - home_servicebarnsData: this.baseUrlbar + "ns-packages", - home_servicebarvnfData: this.baseUrlbar + "vnf-packages", - home_servicebarpnfData: this.baseUrlbar + "pnf-packages", + home_servicebarnsData: this.baseUrl + "/uui-lcm/ns-packages", + home_servicebarvnfData: this.baseUrl + "/uui-lcm/vnf-packages", + home_servicebarpnfData: this.baseUrl + "/uui-lcm/pnf-packages", sourceNames: this.baseUrl + "/alarm/getSourceNames", listSortMasters: this.baseUrl + "/listSortMasters", currentLanguage: "/api/portal-auxapi/languageSetting/user/", @@ -42,9 +39,6 @@ export class HomesService { getHomeServiceData() { return this.http.get<any>(this.url.home_serviceData); } - getHomePerformanceData() { - return this.http.get<String[]>(this.url.home_performanceData); - } getHomeAlarmData() { return this.http.get<any>(this.url.home_alarmData); } @@ -52,10 +46,6 @@ export class HomesService { let params = new HttpParams({ fromObject: paramsObj }); return this.http.get<any>(this.url.home_alarmChartData, { params }); } - - getHomeServiceBarData() { - return this.http.get<any>(this.url.home_servicebarData); - } getHomeServiceBarNsData() { return this.http.get<any>(this.url.home_servicebarnsData); } diff --git a/usecaseui-portal/src/app/shared/components/graphiclist/graphiclist.component.html b/usecaseui-portal/src/app/shared/components/graphiclist/graphiclist.component.html index 317d48b0..19efdb36 100644 --- a/usecaseui-portal/src/app/shared/components/graphiclist/graphiclist.component.html +++ b/usecaseui-portal/src/app/shared/components/graphiclist/graphiclist.component.html @@ -14,9 +14,6 @@ limitations under the License. --> <div class="content"> - <!-- <nz-modal nzWrapClassName="vertical-center-modal" [(nzVisible)]="isVisibleMiddle" nzTitle="Alarm Chart" (nzOnCancel)="handleCancelMiddle()" (nzOnOk)="handleOkMiddle()"> - <app-line [initData]="alarmChartInitBig" [chartData]="alarmChartDataBig"></app-line> - </nz-modal> --> <div class="chart"> <div class="select"> <span>Report Time: </span> @@ -39,7 +36,6 @@ </tr> </thead> <tbody> - <!-- <ng-template ngFor let-data [ngForOf]="nzTable.data" let-i="index"> --> <tr *ngFor="let item of nzTable.data; let i = index; "> <td>{{i+1}}</td> <td>{{item.sourceName}}</td> @@ -48,7 +44,6 @@ <td>{{item.startEpochMicrosec | date:'yyyy-MM-dd HH:mm:ss'}}</td> <td><a class="action" (click)="detailShow(item)"><i class="details"></i></a></td> </tr> - <!-- </ng-template> --> </tbody> </nz-table> </div> diff --git a/usecaseui-portal/src/app/shared/components/graphiclist/graphiclist.component.less b/usecaseui-portal/src/app/shared/components/graphiclist/graphiclist.component.less index e302c7fd..494e2229 100644 --- a/usecaseui-portal/src/app/shared/components/graphiclist/graphiclist.component.less +++ b/usecaseui-portal/src/app/shared/components/graphiclist/graphiclist.component.less @@ -49,7 +49,6 @@ } } .chart { - // background-color: #fff; position: relative; border-radius: 5px; margin-bottom: 20px; @@ -72,50 +71,7 @@ font-weight: 400; } } - // nz-dropdown { - // margin-right: 20px; - // a { - // font: 700 12px "Arial"; - // color: #3d4d65; - // &:hover { - // color: #3fa8eb; - // } - // } - // } } - // .AlarmChart { - // // height: 0px; - // // border-bottom: 1px solid #f5f5f5; - // // transition: all 0.3s linear; - // width: 25%; - // padding-top: 7px; - // float: left; - // } - // .alarmChart-active { - // height: 386px; - // } - // .open-close { - // width: 50px; - // height: 25px; - // position: absolute; - // left: 50%; - // bottom: 0px; - // transform: translate(-25px,0); - // border: none; - // outline: none; - // cursor: pointer; - // background-color: #fff; - // background: url(../../../assets/images/open-close.png) no-repeat center -27px; - // &:hover { - // background: url(../../../assets/images/open-close.png) no-repeat center -79px; - // } - // } - // .open-close-active { - // background: url(../../../assets/images/open-close.png) center -1px; - // &:hover { - // background: url(../../../assets/images/open-close.png) no-repeat center -53px; - // } - // } } .tablelist { background-color: #fff; diff --git a/usecaseui-portal/src/app/shared/components/graphiclist/graphiclist.component.ts b/usecaseui-portal/src/app/shared/components/graphiclist/graphiclist.component.ts index c05d3b7c..ddd9ef64 100644 --- a/usecaseui-portal/src/app/shared/components/graphiclist/graphiclist.component.ts +++ b/usecaseui-portal/src/app/shared/components/graphiclist/graphiclist.component.ts @@ -38,7 +38,6 @@ export class GraphiclistComponent implements OnInit { this.isVisibleMiddle = true; } handleOkMiddle(): void { - // console.log('click ok'); this.isVisibleMiddle = false; } handleCancelMiddle(): void { diff --git a/usecaseui-portal/src/app/views/ccvpn-creation/ccvpn-creation.component.ts b/usecaseui-portal/src/app/views/ccvpn-creation/ccvpn-creation.component.ts index 214afbb7..cb1c61df 100644 --- a/usecaseui-portal/src/app/views/ccvpn-creation/ccvpn-creation.component.ts +++ b/usecaseui-portal/src/app/views/ccvpn-creation/ccvpn-creation.component.ts @@ -15,9 +15,7 @@ */ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; import * as d3 from 'd3'; -import * as $ from 'jquery'; import { MyhttpService } from '../../core/services/myhttp.service'; -import { el } from "@angular/platform-browser/testing/src/browser_util"; @Component({ selector: 'app-ccvpn-creation', @@ -82,11 +80,9 @@ export class CcvpnCreationComponent implements OnInit { } getccvpnTemParameters(data) { //Get template parameters - console.log(this.createParams); if (typeof data["model"] == 'string') { data = JSON.parse(data["model"]); } - console.log(data); let inputss = data["inputs"]; let inputs = {}; this.templateParameters.service = { @@ -135,7 +131,6 @@ export class CcvpnCreationComponent implements OnInit { }); this.showTemParametersSotnVpn(); this.showTemParametersSite(); - console.log(this.bodyTemplateParameter, this.templateParameters) } //sotnVpn data, after combining the structure, rendering the template data to the page @@ -455,7 +450,6 @@ export class CcvpnCreationComponent implements OnInit { this.tabInputShowWanPort[index] = true; } }); - console.log(this.siteTableData); this.drawImage(this.siteTableData); this.siteModelShow = false; } @@ -711,7 +705,6 @@ export class CcvpnCreationComponent implements OnInit { servicebody.service.parameters.requestInputs[item] = [].concat(this.sotnVpnTableData); } }); - console.log(servicebody); this.closeCreate.emit(servicebody); diff --git a/usecaseui-portal/src/app/views/ccvpn-network/ccvpn-network.component.css b/usecaseui-portal/src/app/views/ccvpn-network/ccvpn-network.component.css index 5055205d..53cf02b4 100644 --- a/usecaseui-portal/src/app/views/ccvpn-network/ccvpn-network.component.css +++ b/usecaseui-portal/src/app/views/ccvpn-network/ccvpn-network.component.css @@ -77,9 +77,7 @@ color: #A0AACD; } .model .creation { - /*margin-top:-4%;*/ background-color: #fff; - /*float: left;*/ width: 20%; position: absolute; left: 0; diff --git a/usecaseui-portal/src/app/views/ccvpn-network/ccvpn-network.component.ts b/usecaseui-portal/src/app/views/ccvpn-network/ccvpn-network.component.ts index 8a56d885..d02149d0 100644 --- a/usecaseui-portal/src/app/views/ccvpn-network/ccvpn-network.component.ts +++ b/usecaseui-portal/src/app/views/ccvpn-network/ccvpn-network.component.ts @@ -196,7 +196,6 @@ export class CcvpnNetworkComponent implements OnInit { } this.networkOption.push(name2); } - console.log(this.networkOption); for (let i = 0; i < data.length; i++) { let tp_length = data[i]['tps'].length; for (let h = 0; h < tp_length; h++) { @@ -244,7 +243,6 @@ export class CcvpnNetworkComponent implements OnInit { this.logicalLinks.push(textval); this.chose(textval); } - console.log(this.logicalLinks); if (this.dataCloudLink.length > 0) { this.getcloudLine(this.dataCloudLink); } diff --git a/usecaseui-portal/src/app/views/fcaps/fcaps.component.html b/usecaseui-portal/src/app/views/fcaps/fcaps.component.html index edd2111a..ee315b98 100644 --- a/usecaseui-portal/src/app/views/fcaps/fcaps.component.html +++ b/usecaseui-portal/src/app/views/fcaps/fcaps.component.html @@ -1,3 +1,19 @@ +<!-- + Copyright (C) 2019 CMCC, Inc. and others. All rights reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + <iframe src="http://172.30.1.80:5601" frameborder="0" style="height:100vh;width:100%;"></iframe> <!-- <iframe src="http://dl_es:5601/app/kibana#/dashboard/a0db79a0-624e-11e9-88e5-b7b07490dd67?_g=(refreshInterval%3A(pause%3A!f%2Cvalue%3A86400000)%2Ctime%3A(from%3Anow-1y%2Cmode%3Aquick%2Cto%3Anow))" frameborder="0" style="height:100vh;width:100%;"></iframe> --> <!-- <iframe src="http://dl_es:5601/app/kibana#/dashboard/a0db79a0-624e-11e9-88e5-b7b07490dd67?embed=true&_g=(refreshInterval%3A(pause%3A!f%2Cvalue%3A86400000)%2Ctime%3A(from%3Anow-1y%2Cmode%3Aquick%2Cto%3Anow))" style="height:100vh;width:100%;"></iframe> --> diff --git a/usecaseui-portal/src/app/views/fcaps/fcaps.component.ts b/usecaseui-portal/src/app/views/fcaps/fcaps.component.ts index 7f9ab7f4..d430b381 100644 --- a/usecaseui-portal/src/app/views/fcaps/fcaps.component.ts +++ b/usecaseui-portal/src/app/views/fcaps/fcaps.component.ts @@ -1,3 +1,19 @@ +/* + Copyright (C) 2019 CMCC, Inc. and others. All rights reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + import { Component, OnInit } from '@angular/core'; @Component({ diff --git a/usecaseui-portal/src/app/views/performance/performance-vm/performance-vm.component.less b/usecaseui-portal/src/app/views/performance/performance-vm/performance-vm.component.less index 31623dcf..d73e8aa9 100644 --- a/usecaseui-portal/src/app/views/performance/performance-vm/performance-vm.component.less +++ b/usecaseui-portal/src/app/views/performance/performance-vm/performance-vm.component.less @@ -56,7 +56,7 @@ hr { right: 10px; } } - //下拉框中的样式在style.less中，下拉框是在body中额外临时生成的 + //The style in the drop-down box is in style.less, and the drop-down box is extra temporary generated in the body. } .submit { margin-left: 20px; diff --git a/usecaseui-portal/src/app/views/performance/performance-vm/performance-vm.component.ts b/usecaseui-portal/src/app/views/performance/performance-vm/performance-vm.component.ts index 85150b69..f9421787 100644 --- a/usecaseui-portal/src/app/views/performance/performance-vm/performance-vm.component.ts +++ b/usecaseui-portal/src/app/views/performance/performance-vm/performance-vm.component.ts @@ -1,3 +1,19 @@ +/* + Copyright (C) 2019 CMCC, Inc. and others. All rights reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + import { Component, OnInit, HostBinding } from '@angular/core'; import { slideToRight, showHideAnimate } from '../../../shared/utils/animates'; @@ -20,11 +36,9 @@ export class PerformanceVmComponent implements OnInit { ReportingEntityNameList = ['aaaa', 'bbbb', 'cccc', 'ddddd']; ReportingEntityNameSelected = this.ReportingEntityNameList[0]; choseSourceName(item) { - console.log(item); this.sourceNameSelected = item; } choseReportingEntityName(item) { - console.log(item); this.ReportingEntityNameSelected = item; } @@ -152,7 +166,6 @@ export class PerformanceVmComponent implements OnInit { this.state3 = 'show'; this.graphicshow = true; this.detailshow = true; - console.log(prems); this.detailId = prems.id; } diff --git a/usecaseui-portal/src/app/views/services/onboard-vnf-vm/onboard-vnf-vm.component.html b/usecaseui-portal/src/app/views/services/onboard-vnf-vm/onboard-vnf-vm.component.html index 70ee81c0..4f865ff3 100644 --- a/usecaseui-portal/src/app/views/services/onboard-vnf-vm/onboard-vnf-vm.component.html +++ b/usecaseui-portal/src/app/views/services/onboard-vnf-vm/onboard-vnf-vm.component.html @@ -17,7 +17,6 @@ <nz-tab *ngFor="let tab of tabs" [nzTitle]="tab" (nzClick)="handleTabChange(tab)"> <!-- nsList --> <div class="list" *ngIf="tab === 'NS'"> - <!-- <h3 class="title"> Onboard {{tabTitle}} </h3> --> <div style="width:100%;height: 30%;margin-bottom: 1%"> <div class="listupload"> <nz-upload nzType="drag" [(nzFileList)]="fileListNS" [nzBeforeUpload]="beforeUploadNS"> @@ -76,7 +75,6 @@ <tbody> <tr *ngFor="let item of nzTable.data; let i = index; "> <td>{{i+1}}</td> - <!--<td *ngIf="item.uuid">{{item.uuid}}</td>--> <td *ngIf="item.nsdName">{{item.nsdName}}</td> <td *ngIf="item.nsdName === null || item.nsdName === ''"> </td> @@ -91,10 +89,6 @@ <span *ngIf="item.nsdOnboardingState === null || item.nsdOnboardingState === ''"> </span> <span *ngIf="item.uuid">{{status}}</span> - <!-- <span *ngIf="item.uuid" [ngClass]="{'active':data.status=='Active','closed':data.status=='Closed','onboarding':data.status=='Onboarding', - 'updating':data.status=='Updating','deleting':data.status=='Deleting','creating':data.status=='Creating', - 'scaling':data.status=='Scaling','healing':data.status=='Healing'}">{{data.status || "Active"}}</span> - <nz-progress *ngIf="item.uuid" *ngIf="data.status == 'Creating' || data.status == 'Deleting' || data.status == 'Scaling' || data.status == 'Healing' " [nzPercent]="data.rate"></nz-progress> --> </td> <td>{{item.nsdOperationalState}}</td> <td>{{item.nsdUsageState}}</td> @@ -104,31 +98,16 @@ *ngIf="item.uuid"></i> <i class="anticon anticon-delete" nzType="info" (click)="showConfirm(i,item.id,tab,notificationModel)" *ngIf="item.id"></i> - <!--<span *ngIf="item.id" [ngClass]="{'fileIcon':OnboardFile == 'disNone'}">--> - <!--<span *ngIf="item.id && item.sameid == undefined">--> - <!--<nz-upload [(nzFileList)]="fileList" [nzBeforeUpload]="beforeUpload">--> - <!--<i class="anticon anticon-file" type="upload" (click)="onClickId(item.id,tab)"></i>--> - <!--</nz-upload>--> - <!--<button nz-button [nzLoading]="nsuploading" (click)="onClick(tab)" [disabled]="fileList.length == 0"--> - <!--style="margin-top: 16px" *ngIf="item.id==nsdInfoId">--> - <!--{{ nsuploading ? 'Uploading' : 'Start Upload' }}--> - <!--</button>--> - <!--</span>--> </td> </tr> </tbody> </nz-table> </nz-spin> - <!-- <div style="margin-top:8px;"> - Loading state: - <nz-switch [(ngModel)]="isSpinning"></nz-switch> - </div> --> </div> <!-- VNFList --> <div class="list" *ngIf="tab === 'VNF'"> - <!-- <h3 class="title"> Onboard {{tabTitle}} </h3> --> <div style="width:100%;height: 30%;margin-bottom: 1%"> <div class="listupload"> <nz-upload nzType="drag" [(nzFileList)]="fileListVNF" [nzBeforeUpload]="beforeUploadVNF"> @@ -187,7 +166,6 @@ <tbody> <tr *ngFor="let item of nzTable.data; let i = index; "> <td>{{i+1}}</td> - <!--<td *ngIf="item.uuid">{{item.uuid}}</td>--> <td *ngIf="item.vnfProductName">{{item.vnfProductName}}</td> <td *ngIf="item.vnfProductName === null || item.vnfProductName === ''"> </td> <td *ngIf="item.name">{{item.name}}</td> @@ -203,20 +181,6 @@ *ngIf="item.uuid"></i> <i class="anticon anticon-delete" nzType="info" (click)="showConfirm(i,item.id,tab,notificationModel)" *ngIf="item.id"></i> - <!--<span *ngIf="item.id && item.sameid == undefined">--> - <!--<nz-upload [(nzFileList)]="fileList" [nzBeforeUpload]="beforeUpload">--> - <!--<!– <button nz-button> –>--> - <!--<i class="anticon anticon-file" type="upload" (click)="onClickId(item.id,tab)"></i>--> - <!--<!– <span >upload</span> –>--> - <!--<!– </button> –>--> - - <!--</nz-upload>--> - <!--<button nz-button [nzLoading]="nsuploading" (click)="onClick(tab)" [disabled]="fileList.length == 0"--> - <!--style="margin-top: 16px;margin-left: 55px;color: #FFFFFF;font-size: 13px;background-color: #3E9BFF;font-family: ArialMT;"--> - <!--*ngIf="item.id==vnfPkgId">--> - <!--{{ nsuploading ? 'Uploading' : 'Start Upload' }}--> - <!--</button>--> - <!--</span>--> </td> </tr> </tbody> @@ -226,7 +190,6 @@ </div> <!-- PNFList --> <div class="list" *ngIf="tab === 'PNF'"> - <!-- <h3 class="title"> Onboard {{tabTitle}} </h3> --> <div style="width:100%;height: 30%;margin-bottom: 1%"> <div class="listupload"> <nz-upload nzType="drag" [(nzFileList)]="fileListPNF" [nzBeforeUpload]="beforeUploadPNF"> @@ -290,16 +253,6 @@ <td>{{item.pnfdUsageState}}</td> <td> <i class="anticon anticon-delete" nzType="info" (click)="showConfirm(i,item.id,tab,notificationModel)"></i> - <!--<span *ngIf="item.id" [ngClass]="{'fileIcon':OnboardFile == 'disNone'}">--> - <!--<nz-upload [(nzFileList)]="fileList" [nzBeforeUpload]="beforeUpload">--> - <!--<i class="anticon anticon-file" type="upload" (click)="onClickId(item.id,tab)"></i>--> - <!--</nz-upload>--> - <!--<button nz-button [nzLoading]="nsuploading" (click)="onClick(tab)" [disabled]="fileList.length == 0"--> - <!--style="margin-top: 16px;margin-left: 55px;color: #FFFFFF;font-size: 13px;background-color: #3E9BFF;font-family: ArialMT;"--> - <!--*ngIf="item.id==vnfPkgId">--> - <!--{{ nsuploading ? 'Uploading' : 'Start Upload' }}--> - <!--</button>--> - <!--</span>--> </td> </tr> </tbody> diff --git a/usecaseui-portal/src/app/views/services/onboard-vnf-vm/onboard-vnf-vm.component.less b/usecaseui-portal/src/app/views/services/onboard-vnf-vm/onboard-vnf-vm.component.less index c31409c9..5ba479de 100644 --- a/usecaseui-portal/src/app/views/services/onboard-vnf-vm/onboard-vnf-vm.component.less +++ b/usecaseui-portal/src/app/views/services/onboard-vnf-vm/onboard-vnf-vm.component.less @@ -57,9 +57,7 @@ hr { } .list { - // background-color: #fff; border-radius: 5px; - // padding: 10px; .listupload { width: 22%; vertical-align: top; |