diff --git a/package-lock.json b/package-lock.json index 9c9cca4..d098475 100644 --- a/package-lock.json +++ b/package-lock.json @@ -465,7 +465,7 @@ }, "@ant-design/colors": { "version": "3.2.2", - "resolved": "https://registry.npm.taobao.org/@ant-design/colors/download/@ant-design/colors-3.2.2.tgz?cache=0&sync_timestamp=1596611396536&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40ant-design%2Fcolors%2Fdownload%2F%40ant-design%2Fcolors-3.2.2.tgz", + "resolved": "https://registry.npm.taobao.org/@ant-design/colors/download/@ant-design/colors-3.2.2.tgz", "integrity": "sha1-WtQ9YZ6RHzSI66wwPWBuZqhCOQM=", "requires": { "tinycolor2": "^1.4.1" @@ -473,7 +473,7 @@ }, "@ant-design/icons-angular": { "version": "9.0.1", - "resolved": "https://registry.npm.taobao.org/@ant-design/icons-angular/download/@ant-design/icons-angular-9.0.1.tgz?cache=0&sync_timestamp=1601000889997&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40ant-design%2Ficons-angular%2Fdownload%2F%40ant-design%2Ficons-angular-9.0.1.tgz", + "resolved": "https://registry.nlark.com/@ant-design/icons-angular/download/@ant-design/icons-angular-9.0.1.tgz", "integrity": "sha1-Wsi+xbw00jEgggyT+FEbWaoRe8U=", "requires": { "@ant-design/colors": "^3.1.0" @@ -11981,7 +11981,7 @@ }, "ng-zorro-antd": { "version": "9.3.0", - "resolved": "https://registry.npm.taobao.org/ng-zorro-antd/download/ng-zorro-antd-9.3.0.tgz", + "resolved": "https://registry.nlark.com/ng-zorro-antd/download/ng-zorro-antd-9.3.0.tgz", "integrity": "sha1-+A2+JxXleMR1codzRJRC8AmfFSw=", "requires": { "@angular/cdk": "^9.0.0", diff --git a/proxy.config.json b/proxy.config.json index 85fd897..1ba29a0 100644 --- a/proxy.config.json +++ b/proxy.config.json @@ -1,6 +1,6 @@ { "/api": { - "target": "http://218.75.214.31:28085", + "target": "http://39.106.78.171:8890", "secure": false, "changeOrigin": true } diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.ts b/src/app/key-unit/key-unit-management/key-unit-management.component.ts index 4e7f394..7baecba 100644 --- a/src/app/key-unit/key-unit-management/key-unit-management.component.ts +++ b/src/app/key-unit/key-unit-management/key-unit-management.component.ts @@ -378,7 +378,7 @@ export class KeyUnitManagementComponent implements OnInit { PageSize: this.pageSizeOptions[0], Sort: this.integritySort ? 'integrityscore' : '', SortType: this.integritySort || '', - IsNewData:true, + // IsNewData:true, IntegrityScoreMin:this.integrityScoreMin/100||0, IntegrityScoreMax:this.integrityScoreMax/100||1 } diff --git a/src/app/plan-management/maintain-up/maintain-up.component.ts b/src/app/plan-management/maintain-up/maintain-up.component.ts index a7e265c..6b8416c 100644 --- a/src/app/plan-management/maintain-up/maintain-up.component.ts +++ b/src/app/plan-management/maintain-up/maintain-up.component.ts @@ -376,7 +376,7 @@ export class MaintainUpComponent implements OnInit { PageSize: this.pageSizeOptions[0], Sort: this.integritySort ? 'integrityscore' : '', SortType: this.integritySort || '', - IsNewData : false, + // IsNewData : false, IntegrityScoreMin:this.integrityScoreMin/100||0, IntegrityScoreMax:this.integrityScoreMax/100||1 } diff --git a/src/app/statistic-analysis/echarts-data.service.ts b/src/app/statistic-analysis/echarts-data.service.ts index 4b5c81f..90fe6d1 100644 --- a/src/app/statistic-analysis/echarts-data.service.ts +++ b/src/app/statistic-analysis/echarts-data.service.ts @@ -574,7 +574,7 @@ export class EchartsDataService { obdata orid async getData(paramsdata,api){ - let jwt = sessionStorage.getItem("token"); + let jwt = sessionStorage.getItem("token"); let rawJwt = CryptoJS.enc.Base64.parse(jwt.split('.')[1]); let identityJson = CryptoJS.enc.Utf8.stringify(rawJwt); let identityJsonparse=JSON.parse(identityJson) @@ -584,6 +584,10 @@ export class EchartsDataService { let result = await new Promise((resolve, reject)=>{ this.http.get(api,{params:paramsdata}).subscribe((data:any)=>{ resolve(data) + },err=>{ + // console.log('产生错误了',api) + // console.log('产生错误了',paramsdata) + console.log('产生错误了',err) }) }) this.allDate.push(result)