diff --git a/proxy.config.json b/proxy.config.json index 12f3cd9..df2c281 100644 --- a/proxy.config.json +++ b/proxy.config.json @@ -1,11 +1,11 @@ { "/api": { - "target": "http://39.106.78.171:8920", + "target": "http://121.36.37.70:8080", "secure": false, "changeOrigin": true }, "/signalr": { - "target": "http://39.106.78.171:8920", + "target": "http://121.36.37.70:8080", "secure": false, "ws": true, "logLevel": "debug" diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 72a75de..301a3e2 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -28,8 +28,7 @@ import { ConfigFormDataService } from './service/configFormData.service'; NzNotificationModule, NzMessageModule ], - providers: [httpInterceptorProviders, CacheTokenService, TreeService, ConfigFormDataService, - { provide: RouteReuseStrategy, useClass: CustomReuseStrategy }], + providers: [httpInterceptorProviders, CacheTokenService, TreeService, ConfigFormDataService], bootstrap: [AppComponent] }) export class AppModule { } diff --git a/src/app/system-management/condition-monitoring/model/model.component.html b/src/app/system-management/condition-monitoring/model/model.component.html index 26b4f8e..f2bdfee 100644 --- a/src/app/system-management/condition-monitoring/model/model.component.html +++ b/src/app/system-management/condition-monitoring/model/model.component.html @@ -9,7 +9,9 @@ - + + + diff --git a/src/app/system-management/host-config/host-config.component.ts b/src/app/system-management/host-config/host-config.component.ts index 1629752..e1ef6ad 100644 --- a/src/app/system-management/host-config/host-config.component.ts +++ b/src/app/system-management/host-config/host-config.component.ts @@ -591,12 +591,19 @@ smoking_calling_net: interval: 1 batch_size: 32 -connet: +connet_oil: enable: true apply_on: 2 roi: - 'oil_tube-${order}': - - [${xieyouguan}] + - [${xieyouguan}] + interval: 1 + batch_size: 2 + +connet_grounder: + enable: true + apply_on: 2 + roi: - 'grounder-${order}': - [${jingdian}] interval: 1 diff --git a/src/app/system-management/organization/organization.component.html b/src/app/system-management/organization/organization.component.html index 1667338..e8c8250 100644 --- a/src/app/system-management/organization/organization.component.html +++ b/src/app/system-management/organization/organization.component.html @@ -25,9 +25,9 @@
{{ node.title }} - 新增 - 编辑 - 删除 + 新增 + 编辑 + 删除
diff --git a/src/app/system-management/organization/organization.component.scss b/src/app/system-management/organization/organization.component.scss index 84fe2ac..1498be0 100644 --- a/src/app/system-management/organization/organization.component.scss +++ b/src/app/system-management/organization/organization.component.scss @@ -67,12 +67,4 @@ margin-left: 40px; } - span:nth-child(1), - span:nth-child(2) { - color: #2399FF; - } - - span:nth-child(3) { - color: rgba(0, 13, 33, 0.48); - } }