Commit 5edd98d2 authored by van.chen's avatar van.chen

网关, 传感器绑定XXX

parent 1bc95301
This diff is collapsed.
...@@ -11,20 +11,20 @@ ...@@ -11,20 +11,20 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "~7.2.0", "@angular/animations": "^7.2.13",
"@angular/common": "~7.2.0", "@angular/common": "^7.2.13",
"@angular/compiler": "~7.2.0", "@angular/compiler": "^7.2.13",
"@angular/core": "~7.2.0", "@angular/core": "^7.2.13",
"@angular/forms": "~7.2.0", "@angular/forms": "^7.2.13",
"@angular/platform-browser": "~7.2.0", "@angular/platform-browser": "^7.2.13",
"@angular/platform-browser-dynamic": "~7.2.0", "@angular/platform-browser-dynamic": "^7.2.13",
"@angular/router": "~7.2.0", "@angular/router": "^7.2.13",
"@ngx-translate/core": "^11.0.1", "@ngx-translate/core": "^11.0.1",
"@ngx-translate/http-loader": "^4.0.0", "@ngx-translate/http-loader": "^4.0.0",
"core-js": "^2.5.4", "core-js": "^2.5.4",
"echarts": "^4.2.1", "echarts": "^4.2.1",
"ng-zorro-antd": "^7.2.0", "ng-zorro-antd": "^7.3.0",
"ngx-echarts": "^4.1.0", "ngx-echarts": "^4.1.1",
"rxjs": "~6.3.3", "rxjs": "~6.3.3",
"tslib": "^1.9.0", "tslib": "^1.9.0",
"zone.js": "~0.8.26" "zone.js": "~0.8.26"
...@@ -32,11 +32,11 @@ ...@@ -32,11 +32,11 @@
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "~0.13.0", "@angular-devkit/build-angular": "~0.13.0",
"@angular/cli": "~7.3.6", "@angular/cli": "~7.3.6",
"@angular/compiler-cli": "~7.2.0", "@angular/compiler-cli": "^7.2.13",
"@angular/language-service": "~7.2.0", "@angular/language-service": "^7.2.13",
"@types/node": "~8.9.4",
"@types/jasmine": "~2.8.8", "@types/jasmine": "~2.8.8",
"@types/jasminewd2": "~2.0.3", "@types/jasminewd2": "~2.0.3",
"@types/node": "~8.9.4",
"codelyzer": "~4.5.0", "codelyzer": "~4.5.0",
"jasmine-core": "~2.99.1", "jasmine-core": "~2.99.1",
"jasmine-spec-reporter": "~4.2.1", "jasmine-spec-reporter": "~4.2.1",
......
...@@ -210,7 +210,7 @@ export class GatewayComponent implements OnInit { ...@@ -210,7 +210,7 @@ export class GatewayComponent implements OnInit {
influxdbDatabaseNo: '', influxdbDatabaseNo: '',
pDeviceNo: '' pDeviceNo: ''
}; };
this.try = {field: ['address', 'deviceNo', 'pDeviceNo']}; this.try = {field: ['address', 'deviceNo']};
this.isBindConV = true; this.isBindConV = true;
} }
......
...@@ -156,7 +156,6 @@ ...@@ -156,7 +156,6 @@
[nzFooter]="foot5" (nzOnCancel)="cancel('isDivideConV')" nzMaskClosable="false"> [nzFooter]="foot5" (nzOnCancel)="cancel('isDivideConV')" nzMaskClosable="false">
<ng-template #con5> <ng-template #con5>
<app-search-select isMust="true" [(value)]="req5.companyNo" [label]="'selectCompany' | translate" optL="companyName" <app-search-select isMust="true" [(value)]="req5.companyNo" [label]="'selectCompany' | translate" optL="companyName"
(valueChange)="companySelected($event)"
[data]="companys" inModal="true" optV="companyNo"></app-search-select> [data]="companys" inModal="true" optV="companyNo"></app-search-select>
</ng-template> </ng-template>
<ng-template #foot5> <ng-template #foot5>
......
...@@ -233,7 +233,7 @@ export class SensorMgrComponent implements OnInit { ...@@ -233,7 +233,7 @@ export class SensorMgrComponent implements OnInit {
pDeviceNo: '' pDeviceNo: ''
}; };
this.isBindConV = true; this.isBindConV = true;
this.try = {field: ['address', 'deviceNo', 'pDeviceNo']}; this.try = {field: ['address', 'deviceNo']};
} }
unbind(one) { unbind(one) {
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
export const environment = { export const environment = {
production: false, production: false,
baseUrl: 'http://172.16.1.52:8094', // 对外访问测试网地址 baseUrl: 'http://cloud-test.witium.com/api', // 对外访问测试网地址
}; };
/* /*
......
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