diff --git a/proxy.config.json b/proxy.config.json
index 11d61cc..1d372f9 100644
--- a/proxy.config.json
+++ b/proxy.config.json
@@ -1,6 +1,8 @@
{
"/api": {
"target": "http://121.36.37.70:8080/",
+ "测试":"http://121.36.37.70:8080/",
+ "s":"http://121.36.37.70:8080/",
"secure": false,
"changeOrigin": true
},
diff --git a/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.html b/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.html
index 63531c4..e3b135d 100644
--- a/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.html
+++ b/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.html
@@ -54,9 +54,9 @@
(nzOnOk)="handleOk()">
-
-
-
+
+
+
diff --git a/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.ts b/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.ts
index 68d1ef3..80c8a83 100644
--- a/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.ts
+++ b/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.ts
@@ -215,18 +215,11 @@ export class AnalysisOfTheHostComponent implements OnInit {
}
isVisible = false;
- radioValue = '交大';
+ radioValue = '警旗1';
configdata;
config(data) {
this.isVisible = true;
this.configdata = data;
- // this.router.navigate([`/system/host/camera`], {
- // queryParams: {
- // hostId: this.configdata.id,
- // orId: this.selectedOilStation.id,
- // type: '交大',
- // },
- // });
}
handleOk(): void {
@@ -287,7 +280,7 @@ export class AnalysisOfTheHostComponent implements OnInit {
}
enum DeviceProvider {
- '交大' = 0,
- '黄海' = 1,
- '安信' = 2,
+ '警旗1' = 0,
+ '警旗2' = 1,
+ '警旗3' = 2,
}
diff --git a/src/app/system-management/host-config/host-config.component.html b/src/app/system-management/host-config/host-config.component.html
index 40dc688..09ac7b8 100644
--- a/src/app/system-management/host-config/host-config.component.html
+++ b/src/app/system-management/host-config/host-config.component.html
@@ -29,13 +29,13 @@
{{ item.uri }} |
{{ item.type | cameraType}} |
-
+
{{item.dimensionedPoints ? '已标注' : '未标注'}}
-
+
{{item.dimensionedPointsHuanghai ? '已标注' : '未标注'}}
-
+
{{item.dimensionedPointsAnxin ? '已标注' : '未标注'}}
|
@@ -55,16 +55,16 @@
-