From e314cb0314609a5949c57e5ace7084d778434a31 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Tue, 16 Aug 2022 14:39:30 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 proxy.config.json                                     |  4 ++--
 src/app/app.module.ts                                 |  3 +--
 .../condition-monitoring/model/model.component.html   |  4 +++-
 .../host-config/host-config.component.ts              | 11 +++++++++--
 .../organization/organization.component.html          |  6 +++---
 .../organization/organization.component.scss          |  8 --------
 6 files changed, 18 insertions(+), 18 deletions(-)

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 @@
                     <nz-option [nzValue]="'idnet'" nzLabel="idnet"></nz-option>
                     <nz-option [nzValue]="'oilnet'" nzLabel="oilnet"></nz-option>
                     <nz-option [nzValue]="'smoking_calling_net'" nzLabel="smoking_calling_net"></nz-option>
-                    <nz-option [nzValue]="'connet'" nzLabel="connet"></nz-option>
+                    <!-- <nz-option [nzValue]="'connet'" nzLabel="connet"></nz-option> -->
+                    <nz-option [nzValue]="'connet_oil'" nzLabel="connet_oil"></nz-option>
+                    <nz-option [nzValue]="'connet_grounder'" nzLabel="connet_grounder"></nz-option>
                     <nz-option [nzValue]="'fire_smoke_net'" nzLabel="fire_smoke_net"></nz-option>
                 </nz-select>
             </nz-form-control>
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 @@
     <div class="nodebox">
       <span class="name">{{ node.title }}</span>
       <span class="operation">
-        <span (click)="addOr(node)" *ngIf="!node.origin.isGasStation">新增</span>
-        <span (click)="editOr(node)">编辑</span>
-        <span (click)="deleteOr(node)">删除</span>
+        <span class="blue" (click)="addOr(node)" *ngIf="!node.origin.isGasStation">新增</span>
+        <span class="blue" (click)="editOr(node)">编辑</span>
+        <span class="red" (click)="deleteOr(node)">删除</span>
       </span>
     </div>
   </ng-template>
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);
-  }
 }