[完善]修改0000坐标

src/app/system-management/config-form/config-form.component.ts

@@ -15,7 +15,7 @@ export class ConfigFormComponent implements OnInit {
   config1: string
   config2: string
   config3: string
-  config4: string
+  // config4: string
   hostId//主机id
   orId//加油站id
   ngOnInit(): void {
@@ -24,7 +24,7 @@ export class ConfigFormComponent implements OnInit {
     this.config1 = sessionStorage.getItem('config1')
     this.config2 = sessionStorage.getItem('config2')
     this.config3 = sessionStorage.getItem('config3')
-    this.config4 = sessionStorage.getItem('config4')
+    // this.config4 = sessionStorage.getItem('config4')
   }
   goback() {
     history.go(-1)

src/app/system-management/host-config/addcamera/addcamera.component.html

@@ -55,8 +55,21 @@
           <nz-option [nzValue]="5" nzLabel="5"></nz-option>
           <nz-option [nzValue]="6" nzLabel="6"></nz-option>
           <nz-option [nzValue]="7" nzLabel="7"></nz-option>
+          <nz-option [nzValue]="8" nzLabel="8"></nz-option>
+          <nz-option [nzValue]="9" nzLabel="9"></nz-option>
+          <nz-option [nzValue]="10" nzLabel="10"></nz-option>
+          <nz-option [nzValue]="11" nzLabel="11"></nz-option>
+          <nz-option [nzValue]="12" nzLabel="12"></nz-option>
+          <nz-option [nzValue]="13" nzLabel="13"></nz-option>
+          <nz-option [nzValue]="14" nzLabel="14"></nz-option>
+          <nz-option [nzValue]="15" nzLabel="15"></nz-option>
+          <nz-option [nzValue]="16" nzLabel="16"></nz-option>
+          <nz-option [nzValue]="17" nzLabel="17"></nz-option>
+          <nz-option [nzValue]="18" nzLabel="18"></nz-option>
+          <nz-option [nzValue]="19" nzLabel="19"></nz-option>
+          <nz-option [nzValue]="20" nzLabel="20"></nz-option>
         </nz-select>
       </nz-form-control>
     </nz-form-item>
   </form>
-</div>
+</div>

src/app/system-management/host-config/editcamera/editcamera.component.html

@@ -55,8 +55,21 @@
           <nz-option [nzValue]="5" nzLabel="5"></nz-option>
           <nz-option [nzValue]="6" nzLabel="6"></nz-option>
           <nz-option [nzValue]="7" nzLabel="7"></nz-option>
+          <nz-option [nzValue]="8" nzLabel="8"></nz-option>
+          <nz-option [nzValue]="9" nzLabel="9"></nz-option>
+          <nz-option [nzValue]="10" nzLabel="10"></nz-option>
+          <nz-option [nzValue]="11" nzLabel="11"></nz-option>
+          <nz-option [nzValue]="12" nzLabel="12"></nz-option>
+          <nz-option [nzValue]="13" nzLabel="13"></nz-option>
+          <nz-option [nzValue]="14" nzLabel="14"></nz-option>
+          <nz-option [nzValue]="15" nzLabel="15"></nz-option>
+          <nz-option [nzValue]="16" nzLabel="16"></nz-option>
+          <nz-option [nzValue]="17" nzLabel="17"></nz-option>
+          <nz-option [nzValue]="18" nzLabel="18"></nz-option>
+          <nz-option [nzValue]="19" nzLabel="19"></nz-option>
+          <nz-option [nzValue]="20" nzLabel="20"></nz-option>
         </nz-select>
       </nz-form-control>
     </nz-form-item>
   </form>
-</div>
+</div>

src/app/system-management/host-config/host-config.component.ts

@@ -355,6 +355,7 @@ logging_interval : 600
     this.listOfData.forEach((item: any, index) => {
       if (item.type == 2) {
         xieyouqu.push(item)
+        console.log('xxxxxxxxx',item.order)
         order = item.order
       }
 
@@ -404,13 +405,20 @@ mode=strict
 
     let xieyouguan = '';
     let jingdian = '';
-    (xieyouqu.length != 0 && xieyouqu[0].dimensionedPointsObj && xieyouqu[0].dimensionedPointsObj.rectangle.length != 0) ? xieyouqu[0].dimensionedPointsObj.rectangle.forEach(element => {
+    if (xieyouqu.length != 0 && xieyouqu[0].dimensionedPointsObj && xieyouqu[0].dimensionedPointsObj.rectangle.length != 0) {
-      if (element.oilUnloadingArea) {
+      xieyouqu[0].dimensionedPointsObj.rectangle.forEach(element => {
-        xieyouguan = element.x + ',' + element.y + ',' + element.width + ',' + element.height
+        if (element.oilUnloadingArea) {
-      } else {
+          xieyouguan = element.x + ',' + element.y + ',' + element.width + ',' + element.height
-        jingdian = element.x + ',' + element.y + ',' + element.width + ',' + element.height
+        } else {
-      }
+          jingdian = element.x + ',' + element.y + ',' + element.width + ',' + element.height
-    }) : '';
+        }
+      })
+    } else {
+      xieyouguan = '0,0,0,0'
+      jingdian = '0,0,0,0'
+    }
+
+    (order != undefined) ? null : order = this.listOfData[this.listOfData.length - 1].order + 1
     console.log('泄油管区域', xieyouguan)
     console.log('静电接地', jingdian)
     config2 = `# The all in one config file.