Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/Sinopec-Anxin

src/app/pages/equipment-info/equipment-info.component.html

@@ -80,4 +80,7 @@
       </div>
     </div>
   </div>
+  <div class="backbtn">
+    <button nz-button (click)="goback()">返回</button>
+  </div>
 </div>

src/app/pages/equipment-info/equipment-info.component.scss

@@ -3,6 +3,7 @@
   height: 100%;
   display: flex;
   justify-content: center;
+  position: relative;
 }
 
 .content {
@@ -115,3 +116,19 @@
 
   }
 }
+
+
+.backbtn {
+  position: absolute;
+  right: 66px;
+  top: 22px;
+
+  button {
+    width: 64px;
+    height: 32px;
+    background: rgba(0, 129, 255, 0.3);
+    border: 1px solid #36A2FF;
+    border-radius: 0px;
+    color: #91CCFF;
+  }
+}

src/app/pages/equipment-info/equipment-info.component.ts

@@ -5,6 +5,7 @@ import { NzMessageService } from 'ng-zorro-antd/message';
 import { AddequipmentComponent } from './addequipment/addequipment.component';
 import { HttpClient } from '@angular/common/http';
 import { EditequipmentComponent } from './editequipment/editequipment.component';
+import { Router, ActivatedRoute } from '@angular/router'
 @Component({
   selector: 'app-equipment-info',
   templateUrl: './equipment-info.component.html',
@@ -12,7 +13,7 @@ import { EditequipmentComponent } from './editequipment/editequipment.component'
 })
 export class EquipmentInfoComponent implements OnInit {
   validateForm!: FormGroup;
-  constructor(private fb: FormBuilder, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private message: NzMessageService, private http: HttpClient) { }
+  constructor(private router: Router,private fb: FormBuilder, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private message: NzMessageService, private http: HttpClient) { }
   arr = []
   ngOnInit(): void {
     this.validateForm = this.fb.group({
@@ -159,4 +160,8 @@ export class EquipmentInfoComponent implements OnInit {
       }
     });
   }
+
+  goback(){
+    this.router.navigate(['/warning/petrolStation'])
+  }
 }

src/app/pages/home/home.component.html

@@ -52,14 +52,9 @@
                 </ul>
             </nz-dropdown-menu>
         </div>
-        <div class="backbtn" *ngIf="isGasStation">
+        <div class="backbtn" *ngIf="isGasStationBack">
             <button nz-button (click)="goback()">返回</button>
         </div>
-        <!-- <div class="warningnumber" *ngIf="isWarning">
-            <img src="../../../assets/images/warningnum.png" alt="">
-            <span class="num">{{num}}</span>
-            <span class="today">今日预警</span>
-        </div> -->
     </div>
     <div class="content">
         <router-outlet></router-outlet>

src/app/pages/home/home.component.scss

@@ -63,7 +63,7 @@
 
 .backbtn {
   position: absolute;
-  right: 26px;
+  left: 205px;
   bottom: 6px;
 
   button {

src/app/pages/home/home.component.ts

@@ -21,12 +21,11 @@ export class HomeComponent implements OnInit {
     private cookieService: CookieService, private message: NzMessageService) { }
   isGasStationNav: boolean
   isGasStation: boolean
-  isWarning: boolean = false//是否是今日预警页面
+  isGasStationBack: boolean
   num
 
   surname: string
   userName: string
-  // isGasStation: string
   ngOnInit(): void {
 
     this.navChangeService.getMessage().subscribe((message: any) => {
@@ -34,25 +33,21 @@ export class HomeComponent implements OnInit {
       if (message.name == 'oilstation') {
         this.isGasStationNav = true
       }
-      if (message.name == '改变数量') {
-        this.isWarning = true
-        this.num = message.num
-      }
     });
 
-    if (this.router.url.indexOf('warning') != -1) {
-      this.isWarning = true
-    } else {
-      this.isWarning = false
-    }
-
 
     if (this.router.url.indexOf('petrolStation') != -1 && sessionStorage.getItem('isGasStation') == 'false') {//控制返回按钮显示
-      this.isGasStation = true
+      this.isGasStationBack = true
     } else {
-      this.isGasStation = false
+      this.isGasStationBack = false
     }
 
+    // if (this.router.url.indexOf('petrolStation') != -1 && sessionStorage.getItem('isGasStation') == 'true') {
+    //   this.isGasStation = true
+    // } else {
+    //   this.isGasStation = false
+    // }
+
     if (sessionStorage.getItem('isGasStation') == 'true') {
       this.isGasStation = true
       this.isGasStationNav = true
@@ -64,15 +59,10 @@ export class HomeComponent implements OnInit {
     this.router.events.pipe(
       filter(event => event instanceof NavigationEnd)
     ).subscribe((event: any) => {
-      if (event.url.indexOf('warning') != -1) {//控制今日预警左上角数字显示
-
-      } else {
-        this.isWarning = false
-      }
       if (event.url.indexOf('petrolStation') != -1 && sessionStorage.getItem('isGasStation') == 'false') {//控制返回按钮显示
-        this.isGasStation = true
+        this.isGasStationBack = true
       } else {
-        this.isGasStation = false
+        this.isGasStationBack = false
       }
     });
 

src/app/pages/left-domain/left-domain.component.ts

@@ -230,7 +230,6 @@ export class LeftDomainComponent implements OnInit {
   updateFatherData(index) {
     PlanComponent.instance.nzCurrent = index
     PlanComponent.instance.isSuspend = true //暂停
-    PlanComponent.instance.timer? window.clearTimeout(PlanComponent.instance.timer) : null //清除定时器
     PlanComponent.instance.updateTimer? window.clearTimeout(PlanComponent.instance.updateTimer) : null //清除定时器
   }
 

src/app/pages/oil-station-info/oil-station-info.component.html

@@ -139,7 +139,8 @@
                 <nz-form-item>
                   <nz-form-control>
                     <nz-input-group>
-                      <input [(ngModel)]="httpBody.gasStationCount" nz-input type="text" formControlName="gasStationCount" />
+                      <input [(ngModel)]="httpBody.gasStationCount" nz-input type="text"
+                        formControlName="gasStationCount" />
                     </nz-input-group>
                   </nz-form-control>
                 </nz-form-item>
@@ -371,4 +372,7 @@
       </form>
     </div>
   </div>
+  <div class="backbtn">
+    <button nz-button (click)="goback()">返回</button>
+  </div>
 </div>

src/app/pages/oil-station-info/oil-station-info.component.scss

@@ -3,6 +3,7 @@
   height: 100%;
   display: flex;
   justify-content: center;
+  position: relative;
 }
 
 ::-webkit-scrollbar {
@@ -149,10 +150,12 @@
         border-radius: 0px;
         color: #91CCFF;
       }
+
       button:nth-child(1) {
         width: 100px;
         margin-left: 16px;
       }
+
       button:nth-child(2) {
         width: 130px;
         margin-left: 16px;
@@ -160,3 +163,18 @@
     }
   }
 }
+
+.backbtn {
+  position: absolute;
+  right: 66px;
+  top: 22px;
+
+  button {
+    width: 64px;
+    height: 32px;
+    background: rgba(0, 129, 255, 0.3);
+    border: 1px solid #36A2FF;
+    border-radius: 0px;
+    color: #91CCFF;
+  }
+}

src/app/pages/oil-station-info/oil-station-info.component.ts

@@ -5,6 +5,7 @@ import { ObjectsSimpleService } from 'src/app/service/objectsSimple.service';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import * as moment from 'moment';
 import Viewer from 'viewerjs';
+import { Router, ActivatedRoute } from '@angular/router'
 @Component({
   selector: 'app-oil-station-info',
   templateUrl: './oil-station-info.component.html',
@@ -12,7 +13,7 @@ import Viewer from 'viewerjs';
 })
 export class OilStationInfoComponent implements OnInit {
   validateForm!: FormGroup;
-  constructor(private fb: FormBuilder, private objectsSrv: ObjectsSimpleService, private http: HttpClient, private message: NzMessageService) { }
+  constructor(private router: Router, private fb: FormBuilder, private objectsSrv: ObjectsSimpleService, private http: HttpClient, private message: NzMessageService) { }
 
 
   userdata: any
@@ -148,7 +149,9 @@ export class OilStationInfoComponent implements OnInit {
     dangerousChemicalLicenseImage: '',
     gasSellLicenseImage: ''
   }
-
+  goback() {
+    this.router.navigate(['/warning/petrolStation'])
+  }
 
   submitForm() {
 

src/app/pages/pages.module.ts

@@ -37,6 +37,7 @@ import { NzCheckboxModule } from 'ng-zorro-antd/checkbox';
 import { NzTimePickerModule } from 'ng-zorro-antd/time-picker';
 import { NzProgressModule } from 'ng-zorro-antd/progress';
 import { NzPopconfirmModule } from 'ng-zorro-antd/popconfirm';
+import { NzBadgeModule } from 'ng-zorro-antd/badge';
 import { TodayWarningAdminComponent } from './today-warning-admin/today-warning-admin.component';
 import { CriminalRecordsAdminComponent } from './criminal-records-admin/criminal-records-admin.component';
 import { EquipmentInfoComponent } from './equipment-info/equipment-info.component';
@@ -90,7 +91,8 @@ import { NzNotificationModule } from 'ng-zorro-antd/notification';
     NzTimePickerModule,
     NzProgressModule,
     NzNotificationModule,
-    NzPopconfirmModule
+    NzPopconfirmModule,
+    NzBadgeModule
   ],
   entryComponents: [AddequipmentComponent, EditequipmentComponent,GetOutOfLineDetailsComponent],
   schemas: [CUSTOM_ELEMENTS_SCHEMA]

src/app/pages/plan/plan.component.html

@@ -161,7 +161,7 @@
           <ng-container *ngIf="beforeEmergencyPlan.nodes && beforeEmergencyPlan.nodes.length">
             <div class="progress" *ngFor="let item of beforeEmergencyPlan.nodes;let key = index;" title="{{item.name}}" [ngStyle]="{'flex': getProgressFlex(item)}">
               <img src="../../../assets/images/stepIcon.png" (click)="changePlanNode(key)">
-              <div><nz-progress [nzShowInfo]="false" [nzPercent]="progressList[key]" nzStrokeColor="#1890FF" nzStatus="active"></nz-progress></div>
+              <div><nz-progress [nzShowInfo]="false" [nzPercent]="progressList[key]" nzStrokeColor="#1890FF"></nz-progress></div>
             </div>
           </ng-container>
         </label>
@@ -169,7 +169,7 @@
           <i nz-icon nzType="backward" nzTheme="outline" (click)="toLast()" title="上一个节点"></i>
           <i nz-icon nzType="pause" nzTheme="outline" (click)="suspend(true)" [hidden]="isSuspend" title="暂停"></i>
           <i nz-icon nzType="play-circle" nzTheme="outline" (click)="suspend(false)" [hidden]="!isSuspend" title="开启"></i>
-          <i nz-icon nzType="border" nzTheme="outline" (click)="initialize()" title="初始化"></i>
+          <i nz-icon nzType="reload" nzTheme="outline" (click)="initialize()" title="重播"></i>
           <i nz-icon nzType="forward" nzTheme="outline" (click)="toNext()" title="下一个节点"></i>
         </label>
       </div>
@@ -233,6 +233,10 @@
       </form>
     </nz-modal>
     <!-- 应急预案设备任务弹窗 -->
+    <!-- 全景图/视频弹窗 -->
+    <nz-modal [(nzVisible)]="videoDialogType.url" (nzOnCancel)="videoDialogType.url = null;">
+    </nz-modal>
+    <!-- 全景图/视频弹窗 -->
   </div>
 
 </div>

src/app/pages/plan/plan.component.ts

@@ -338,7 +338,6 @@ export class PlanComponent implements OnInit {
   beforePlanNode: MarkNodeData = new MarkNodeData(-99, "请选择节点"); //当前选择 预案节点
   nzCurrent: number = -1; //当前选择 预案节点Index
   isSuspend: boolean = false; //是否暂停 自动切换节点
-  timer: any; //定时器
   progressList: number[] = []; //进度条 条/值
   updateTimer: any; //更新进度条定时器
 
@@ -347,7 +346,6 @@ export class PlanComponent implements OnInit {
     this.beforeEmergencyPlan = new MarkPlanData(-99, "请选择节点")
     this.beforePlanNode = new MarkNodeData(-99, "请选择节点")
     this.isSuspend = false //初始化暂停状态
-    window.clearTimeout(this.timer) //清除定时器
     this.progressList = []
     window.clearTimeout(this.updateTimer) //清除定时器
   }
@@ -369,62 +367,50 @@ export class PlanComponent implements OnInit {
   selectChildNode(item: MarkPlanData) {
     if (this.isShowChildComponent && this.leftDomain) {
       if (item.nodes.length) {
-        let isTrue = confirm("即将开始播放节点")
+        this.updateTimer? window.clearTimeout(this.updateTimer) : null //清除定时器
-        if (isTrue) {
+        this.nzCurrent = 0
-          this.timer? window.clearTimeout(this.timer) : null //清除定时器
+        this.beforeEmergencyPlan = item
-          this.updateTimer? window.clearTimeout(this.updateTimer) : null //清除定时器
+        this.updateProgressList().then(res=>{
-          this.nzCurrent = 0
+          this.publicToggleNode()
-          this.beforeEmergencyPlan = item
+        })
-          this.updateProgressList().then(res=>{
-            this.publicToggleNode().then(data=>{
-              !this.isSuspend? this.autoPlay() : null
-            })
-          })
-        }
       } else {
         this.message.info('暂无数据节点');
       }
     }
   }
 
+  //更新进度条 条数
+  updateProgressList() {
+    return new Promise((resolve, reject) => {
+      this.progressList = []
+      this.beforeEmergencyPlan.nodes.forEach(item=>{ this.progressList.push(0) })
+      resolve(true)
+    })
+  }
+
   //更新进度条 值
   updateProgress() {
     if (this.progressList[this.nzCurrent] >= 100) {
       this.progressList[this.nzCurrent] = 100
       window.clearTimeout(this.updateTimer) //清除定时器
+      !this.isSuspend? this.autoPlay() : null
       return
     }
     let time: number = this.beforePlanNode.getShowTime() || 1
     this.updateTimer = window.setTimeout(()=>{
-      this.progressList[this.nzCurrent] = this.progressList[this.nzCurrent] + Math.ceil(100 / time)
+      this.progressList[this.nzCurrent] = this.progressList[this.nzCurrent] + Number((100 / time).toFixed(2)) / 10
       this.updateProgress()
-    },1000)
+    },100)
-  }
-
-  //更新进度条 条数
-  updateProgressList() {
-    return new Promise((resolve, reject) => {
-      this.progressList = []
-      this.beforeEmergencyPlan.nodes.forEach(item=>{ this.progressList.push(0) })
-      resolve(true)
-    })
   }
 
   //自动播放-切换接点
   autoPlay() {
-    let time: number = this.beforePlanNode.getShowTime() || 1
+    if (this.nzCurrent >= this.beforeEmergencyPlan.nodes.length - 1) {
-    this.timer = window.setTimeout(()=>{
+      this.message.info('已播放至最后一节点');
-      if (this.nzCurrent >= this.beforeEmergencyPlan.nodes.length - 1) {
+      return
-        this.isSuspend = false //初始化暂停状态
+    }
-        window.clearTimeout(this.timer) //清除定时器
+    this.nzCurrent = this.nzCurrent + 1
-        this.message.info('已播放至最后一节点');
+    this.publicToggleNode()
-        return
-      }
-      this.nzCurrent = this.nzCurrent + 1
-      this.publicToggleNode().then(data=>{
-        !this.isSuspend? this.autoPlay() : null
-      })
-    },time * 1000)
   }
 
   //切换预案节点
@@ -432,10 +418,10 @@ export class PlanComponent implements OnInit {
     if (this.progressList.length != this.beforeEmergencyPlan.nodes.length) {
       this.updateProgressList()
     }
-    this.timer? window.clearTimeout(this.timer) : null //清除定时器
     this.updateTimer? window.clearTimeout(this.updateTimer) : null //清除定时器
+    this.isSuspend = true //暂停
     this.nzCurrent = event
-    this.progressList[this.nzCurrent] = 0
+    this.progressList.forEach((item,index)=>{ index >= this.nzCurrent? this.progressList[index] = 0 : null })
     this.publicToggleNode()
   }
 
@@ -452,13 +438,10 @@ export class PlanComponent implements OnInit {
     if (this.progressList.length != this.beforeEmergencyPlan.nodes.length) {
       this.updateProgressList()
     }
-    this.timer? window.clearTimeout(this.timer) : null //清除定时器
     this.updateTimer? window.clearTimeout(this.updateTimer) : null //清除定时器
     this.nzCurrent = this.nzCurrent - 1
-    this.progressList[this.nzCurrent] = 0
+    this.progressList.forEach((item,index)=>{ index >= this.nzCurrent? this.progressList[index] = 0 : null })
-    this.publicToggleNode().then(data=>{
+    this.publicToggleNode()
-      //!this.isSuspend? this.autoPlay() : null
-    })
   }
 
   //切换预案节点 暂停
@@ -474,15 +457,11 @@ export class PlanComponent implements OnInit {
     let msg: string = this.isSuspend? "目前已暂停" : "目前已开始播放"
     this.message.info(msg);
     if (this.isSuspend) { //暂停
-      window.clearTimeout(this.timer) //清除定时器
       window.clearTimeout(this.updateTimer) //清除定时器
     } else { //开启
-      this.timer? window.clearTimeout(this.timer) : null //清除定时器
       this.updateTimer? window.clearTimeout(this.updateTimer) : null //清除定时器
-      this.progressList.forEach((item,index)=>{ index >= this.nzCurrent? this.progressList[index] = 0 : null })
+      this.progressList.forEach((item,index)=>{ index > this.nzCurrent? this.progressList[index] = 0 : null })
-      MarkWindow.instance.selectMarkNode(this.beforeEmergencyPlan.id, this.beforePlanNode.id, false, true)
       this.updateProgress()
-      this.autoPlay()
     }
   }
 
@@ -492,13 +471,10 @@ export class PlanComponent implements OnInit {
       this.message.info('请选择节点');
       return
     }
-    this.timer? window.clearTimeout(this.timer) : null //清除定时器
     this.updateTimer? window.clearTimeout(this.updateTimer) : null //清除定时器
     this.updateProgressList().then(res=>{
       this.nzCurrent = 0
-      this.publicToggleNode().then(data=>{
+      this.publicToggleNode()
-        !this.isSuspend? this.autoPlay() : null
-      })
     })
   }
 
@@ -515,13 +491,10 @@ export class PlanComponent implements OnInit {
     if (this.progressList.length != this.beforeEmergencyPlan.nodes.length) {
       this.updateProgressList()
     }
-    this.timer? window.clearTimeout(this.timer) : null //清除定时器
     this.updateTimer? window.clearTimeout(this.updateTimer) : null //清除定时器
     this.nzCurrent = this.nzCurrent + 1
-    this.progressList[this.nzCurrent] = 0
+    this.progressList.forEach((item,index)=>{ index >= this.nzCurrent? this.progressList[index] = 0 : null })
-    this.publicToggleNode().then(data=>{
+    this.publicToggleNode()
-      //!this.isSuspend? this.autoPlay() : null
-    })
   }
 
   //获取进度条 flex分布
@@ -569,6 +542,8 @@ export class PlanComponent implements OnInit {
     this.contingencyPlanTask = null //关闭弹窗
   }
 
+  videoDialogType: videoDialog = new videoDialog(true, null); //全景图/视频 弹窗
+
   selectRightTopFast: number = 0; //当前选择功能 快捷栏
   selectAdsorb: boolean = false; //吸附状态
   topLevelView: boolean = false; //顶视图状态
@@ -644,6 +619,15 @@ export class PlanComponent implements OnInit {
 
 }
 
+//全景图/视频 type
+export class videoDialog {
+  isVideo: boolean
+  url: string
+  constructor(isVideo: boolean, url: string) {
+    this.isVideo = isVideo
+    this.url = url
+  }
+}
 //设备任务窗口 数据类型
 export class taskDialog {
   institution: string; //单位

src/app/pages/today-warning/today-warning.component.html

@@ -111,7 +111,10 @@
         {{item.violateTime | date:"yyyy-MM-dd HH:mm:ss"}}
       </div>
       <div nz-col nzSpan="2">
-        <button nz-button (click)="look(item)">查看</button>
+        <button nz-button (click)="look(item)" style="margin-right: 8px;">查看</button>
+        <button *ngIf="!item.handleTime" nz-button (click)="disposition(item)">处置</button>
+
+        <span *ngIf="item.handleTime" class="dispositioned">已处置</span>
         <!-- <img style="margin-left: 24px;cursor: pointer;" src="../../../assets/images/excel.png" alt=""> -->
       </div>
     </div>

src/app/pages/today-warning/today-warning.component.scss

@@ -87,7 +87,8 @@
       color: #91CCFF;
       margin-bottom: 12px;
       background: linear-gradient(180deg, rgba(3, 0, 0, 0) 0%, rgba(0, 46, 91, 0.68) 100%);
-
+      box-sizing: border-box;
+      padding-right: 36px;
       div {
         font-size: 15px;
         text-align: center;
@@ -103,6 +104,8 @@
         }
       }
     }
-
+    .dispositioned{
+      color: #23D9FF;
+    }
   }
 }

src/app/pages/today-warning/today-warning.component.ts

@@ -128,4 +128,8 @@ export class TodayWarningComponent implements OnInit {
     });
     const instance = modal.getContentComponent();
   }
+
+  disposition(item){
+    
+  }
 }