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

src/app/app.module.ts

@@ -3,17 +3,12 @@ import { NgModule } from '@angular/core';
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { MatButtonModule } from '@angular/material/button';
-import { MatCheckboxModule } from '@angular/material/checkbox';
-import { MatIconModule } from '@angular/material/icon';
-import { MatSidenavModule } from '@angular/material/sidenav';
 import { PagesModule } from './pages/pages.module';
 import { FormsModule } from '@angular/forms';
 import { HttpClientModule } from '@angular/common/http';
 import { httpInterceptorProviders } from './http-interceptors/index'
 import { CacheTokenService } from './service/cache-token.service'
 import { TreeService } from './service/tree.service'
-import { CountdownModule } from 'ngx-countdown'; //倒计时插件
 import { NzNotificationModule } from 'ng-zorro-antd/notification';
 import { NzMessageModule } from 'ng-zorro-antd/message';
 @NgModule({
@@ -24,14 +19,9 @@ import { NzMessageModule } from 'ng-zorro-antd/message';
     BrowserModule,
     AppRoutingModule,
     BrowserAnimationsModule,
-    MatButtonModule,
-    MatCheckboxModule,
-    MatSidenavModule,
-    MatIconModule,
     PagesModule,
     FormsModule,
     HttpClientModule,
-    CountdownModule,
     NzNotificationModule,
     NzMessageModule
   ],

src/app/pages/audit/audit-ing/audit-ing.component.html

@@ -10,7 +10,7 @@
                     <th>审批类型</th>
                     <th>加油站名称</th>
                     <th [nzWidth]="'16%'">区域名称</th>
-                    <th>省公司名称</th>
+                    <th>公司名称</th>
                     <!-- <th>提交时间</th> -->
                     <th>审批状态</th>
                     <th>审批</th>

src/app/pages/audit/audit-record/audit-record.component.html

@@ -1,18 +1,10 @@
 <div class="box" id="inform">
     <div class="search">
         <form nz-form [formGroup]="validateForm" class="login-form" (ngSubmit)="submitForm()">
-            <nz-form-item class="searchParams searchParamsLong">
-                <nz-form-control>
-                    <nz-select nzAllowClear formControlName="type" nzPlaceHolder="审批类型" [nzLoading]="typeLoading">
-                        <nz-option *ngFor="let item of typeList" [nzValue]="item.licenseName"
-                            [nzLabel]="item.licenseName"></nz-option>
-                    </nz-select>
-                </nz-form-control>
-            </nz-form-item>
-
             <nz-form-item class="searchParams">
                 <nz-form-control>
-                    <nz-select nzAllowClear formControlName="info" nzPlaceHolder="审批信息">
+                    <nz-select nzAllowClear formControlName="info" nzPlaceHolder="审批信息"
+                        (ngModelChange)="infoChange($event)">
                         <nz-option nzValue="0" nzLabel="油站信息"></nz-option>
                         <nz-option nzValue="1" nzLabel="经营类证照提醒时间"></nz-option>
                         <nz-option nzValue="2" nzLabel="经营类证照"></nz-option>
@@ -21,6 +13,15 @@
                 </nz-form-control>
             </nz-form-item>
 
+            <nz-form-item class="searchParams searchParamsLong">
+                <nz-form-control>
+                    <nz-select nzAllowClear formControlName="type" nzPlaceHolder="审批类型" [nzLoading]="typeLoading">
+                        <nz-option *ngFor="let item of typeList" [nzValue]="item.licenseName"
+                            [nzLabel]="item.licenseName"></nz-option>
+                    </nz-select>
+                </nz-form-control>
+            </nz-form-item>
+
             <nz-form-item class="searchParams searchParamsLong">
                 <nz-form-control>
                     <nz-tree-select [nzAllowClear]="false" [nzDropdownClassName]="'maxHeightTreeSelect'" nzShowSearch
@@ -47,7 +48,7 @@
                 </nz-form-control>
             </nz-form-item>
 
-            <nz-form-item class="searchParams">
+            <!-- <nz-form-item class="searchParams">
                 <nz-form-control>
                     <nz-select nzAllowClear formControlName="level" nzPlaceHolder="审批级别">
                         <nz-option nzValue="1" nzLabel="总公司"></nz-option>
@@ -56,14 +57,14 @@
                         <nz-option nzValue="4" nzLabel="油站"></nz-option>
                     </nz-select>
                 </nz-form-control>
-            </nz-form-item>
+            </nz-form-item> -->
             <nz-form-item class="searchParams">
                 <nz-form-control>
                     <nz-select nzAllowClear formControlName="state" nzPlaceHolder="审批状态">
-                        <nz-option nzValue="1" nzLabel="审核中"></nz-option>
-                        <nz-option nzValue="2" nzLabel="审核通过"></nz-option>
+                        <nz-option nzValue="2" nzLabel="审核中"></nz-option>
+                        <!-- <nz-option nzValue="2" nzLabel="审核通过"></nz-option> -->
                         <nz-option nzValue="3" nzLabel="审核驳回"></nz-option>
-                        <nz-option nzValue="4" nzLabel="已撤销审核"></nz-option>
+                        <!-- <nz-option nzValue="4" nzLabel="已撤销审核"></nz-option> -->
                         <nz-option nzValue="5" nzLabel="审核完成"></nz-option>
                     </nz-select>
                 </nz-form-control>
@@ -71,13 +72,15 @@
 
             <nz-form-item class="btn">
                 <nz-form-control>
-                    <button nz-button type="submit" class="submit" [nzLoading]="tableSpin"><i nz-icon [nzType]="'search'"></i>查询</button>
+                    <button nz-button type="submit" class="submit" [nzLoading]="tableSpin"><i nz-icon
+                            [nzType]="'search'"></i>查询</button>
                 </nz-form-control>
             </nz-form-item>
 
             <nz-form-item class="btn">
                 <nz-form-control>
-                    <button nz-button type="button" class="reset" (click)="resetForm($event)" [nzLoading]="tableSpin"><i nz-icon [nzType]="'sync'"></i>重置</button>
+                    <button nz-button type="button" class="reset" (click)="resetForm($event)" [nzLoading]="tableSpin"><i
+                            nz-icon [nzType]="'sync'"></i>重置</button>
                 </nz-form-control>
             </nz-form-item>
         </form>
@@ -93,7 +96,7 @@
                     <th>审批信息</th>
                     <!-- <th>加油站名称</th>
                     <th [nzWidth]="'16%'">区域</th> -->
-                    <th>省公司</th>
+                    <th>公司名称</th>
                     <th>申请人</th>
                     <th>审批时间</th>
                     <th>审批人</th>
@@ -103,8 +106,9 @@
             </thead>
             <tbody id="table">
                 <tr *ngFor="let item of headerTable.data;let key = index">
-                    <td>
-                        <span style="margin-left: 30px;">{{item.auditTitle || ''}}</span>
+                    <td nzEllipsis>
+                        <span style="margin-left: 30px;" [title]="item.auditTitle || ''">{{item.auditTitle ||
+                            ''}}</span>
                     </td>
                     <td>
                         <span *ngIf="item.auditType == 0">油站信息</span>
@@ -114,16 +118,18 @@
                     </td>
                     <!-- <td><label *ngIf="item.gasStation">{{item.gasStation.stationName}}</label></td>
                     <td><label *ngIf="item.gasStation">{{item.gasStation.locationName}}</label></td> -->
-                    <td>
+                    <td nzEllipsis>
                         <ng-container *ngIf="item.gasStation; else elseTemplate">
-                            <label>{{item.gasStation.companyName}}</label>
+                            <label [title]="item.gasStation.companyName">{{item.gasStation.companyName}}</label>
                         </ng-container>
                         <ng-template #elseTemplate>
-                            <label>{{item.organization ? item.organization.displayName : null}}</label>
+                            <label [title]="item.organization.displayName">{{item.organization ?
+                                item.organization.displayName : null}}</label>
                         </ng-template>
                     </td>
                     <td><span *ngIf="item.creatorUser">{{item.creatorUser.name || ''}}</span></td>
-                    <td>{{item.auditTime | date:"yyyy/MM/dd HH:mm:ss"}}</td>
+                    <td nzEllipsis [title]="item.auditTime | date:'yyyy/MM/dd HH:mm:ss'">{{item.auditTime |
+                        date:"yyyy/MM/dd HH:mm:ss"}}</td>
                     <td><span *ngIf="item.auditUser">{{item.auditUser.name || ''}}</span></td>
                     <td>{{item.auditStatusDesc}}</td>
                     <td class="operation">

src/app/pages/audit/audit-record/audit-record.component.ts

@@ -31,15 +31,13 @@ export class AuditRecordComponent implements OnInit {
     this.resizeListener = fromEvent(window, 'resize').pipe(debounceTime(100)).subscribe((event) => {
       let tableHeader = this.element.nativeElement.querySelector(`.ant-table-header`).clientHeight
       this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader - 30) + 'px'
-
-      console.log('页面尺寸变化', this.tableScrollHeight)
     });
     this.validateForm = this.fb.group({
       type: [null],
       info: [null],
       organization: [null],
       datePicker: [null],
-      level: [null],
+      // level: [null],
       state: [null],
     });
     //当前日期
@@ -121,6 +119,11 @@ export class AuditRecordComponent implements OnInit {
   //证照类型
   typeLoading
   typeList
+
+
+  typeListOfStationData
+  typeListOfUpdate
+  typeListOfFile
   getTypeList() {
     this.typeLoading = true
     let promiseArr = []
@@ -146,18 +149,29 @@ export class AuditRecordComponent implements OnInit {
     });
 
     Promise.all(promiseArr).then((result) => {
-
-      let arr = [{ licenseName: '油站信息' }]
-      result.forEach(item => {
-        arr = arr.concat(item.result.items)
-      });
+      // console.log('审批类型', result)
+      this.typeListOfStationData = [{ licenseName: '油站信息' }]
+      this.typeListOfUpdate = result[0].result.items
+      this.typeListOfFile = result[1].result.items
+      this.typeList = [...this.typeListOfStationData, ...this.typeListOfUpdate, ...this.typeListOfFile]
       this.typeLoading = false
-      this.typeList = arr
     }).catch((error) => {
 
     })
   }
-
+  infoChange(e) {
+    if (e == '0') {
+      this.typeList = this.typeListOfStationData
+    } else if (e == '1') {
+      this.typeList = this.typeListOfUpdate
+    } else if (e == '2') {
+      this.typeList = this.typeListOfUpdate
+    } else if (e == '3') {
+      this.typeList = this.typeListOfFile
+    } else {
+      this.typeList = [...this.typeListOfStationData, ...this.typeListOfUpdate, ...this.typeListOfFile]
+    }
+  }
   //历史记录列表
   totalCount//列表总数
   tableSpin = true
@@ -176,7 +190,7 @@ export class AuditRecordComponent implements OnInit {
       StartTime: this.validateForm.value.datePicker[0],
       EndTime: endTime,
       AuditStatuses: this.validateForm.value.state,
-      AuditLevel: this.validateForm.value.level,
+      // AuditLevel: this.validateForm.value.level,
       Sorting: null,
       SkipCount: this.SkipCount,
       MaxResultCount: this.MaxResultCount,
@@ -253,7 +267,7 @@ export class AuditRecordComponent implements OnInit {
       let params = { id: item.itemId }
       this.http.get(url, { params }).subscribe((data: any) => {
         let auditLog = { rejectReason: item.rejectReason }
-        let organization = { displayName: item.organization? item.organization.displayName : "" }
+        let organization = { displayName: item.organization ? item.organization.displayName : "" }
         if (item.auditType == 1) {
           data.result.auditLog = auditLog
           data.result.organization = organization

src/app/pages/audit/gas-base-info/gas-base-info.component.html

@@ -20,7 +20,7 @@
     <div class="cutoffrule"></div>
     <p>
         <label class="marginLeft">区域: &nbsp;&nbsp;{{baseInfo.locationName}}</label>
-        <label>所属公司: &nbsp;&nbsp;{{baseInfo.companyName}}</label>
+        <label>公司名称: &nbsp;&nbsp;{{baseInfo.companyName}}</label>
     </p>
     <div class="cutoffrule"></div>
     <p>

src/app/pages/audit/gas-base-info/gas-base-info.component.ts

@@ -17,7 +17,6 @@ export class GasBaseInfoComponent implements OnInit {
   ngOnInit(): void {
     if (this.data.id === undefined) { //详情
       this.isDetails = true
-      //this.getAuditLogging()
     }
     this.getBaseInfo()
   }

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

@@ -44,7 +44,7 @@ export class HomePageComponent implements OnInit {
     series: [
       {
         type: 'pie',
-        radius: ['65%', '75%'],
+        radius: ['65%', '85%'],
         // top: '2%',
         avoidLabelOverlap: false,//防止标签重叠策略
         emphasis: {//中间高亮区域

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

@@ -13,7 +13,6 @@
       </li>
     </div>
     <div class="libox" *ngIf="isGasStationNav">
-
       <ng-container *ngIf="isGasStationBack; else elseTemplate">
         <li [routerLink]="['/plan/petrolStation']" routerLinkActive="router-link-active">
           数字油站

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

@@ -69,8 +69,6 @@ export class HomeComponent implements OnInit {
     this.router.navigate([item.url])
   }
 
-
-  selectedMenuObj
   ngOnInit(): void {
 
     if (sessionStorage.getItem('selectedMenu')) {
@@ -133,7 +131,6 @@ export class HomeComponent implements OnInit {
   ngAfterViewInit() {
     SignalRAspNetCoreHelper.initSignalR();
     abp.event.on('abp.notifications.received', this.reloadPage);
-    this.selectedMenuObj.unsubscribe()
   }
   //初次登陆修改密码弹窗
   isVisible = false

src/app/pages/init3D.guard.ts

@@ -5,12 +5,13 @@ import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, Router } from
 import { ModeManager } from '../babylon/controller/mode-manager';
 import { NzMessageService } from 'ng-zorro-antd/message';
 
+
 @Injectable({
   providedIn: 'root'
 })
 export class init3DGuard implements CanActivate {
 
-  constructor(private router: Router, private http: HttpClient, private message: NzMessageService,) { }
+  constructor(private router: Router, private http: HttpClient, private message: NzMessageService) { }
 
   // 路由守卫
   canActivate(next: ActivatedRouteSnapshot, state: RouterStateSnapshot,): Promise<boolean> {

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

@@ -9,7 +9,7 @@
         <p class="text"><img src="../../../assets/images/baseInfo/building.png" class="textIcon">{{baseInfo.locationName || '暂无数据'}}</p>
         <p class="text"><img src="../../../assets/images/baseInfo/date.png" class="textIcon">{{baseInfo.openTime | date:"yyyy/MM/dd" || ''}}   开业</p>
         <p class="text"><img src="../../../assets/images/baseInfo/road.png" class="textIcon">{{baseInfo.laneCount || '0'}}   车道</p>
-        <p class="text">所属公司:     {{baseInfo.companyName || '暂无数据'}}</p>
+        <p class="text">公司名称:     {{baseInfo.companyName || '暂无数据'}}</p>
         <p class="text">联系人:     {{baseInfo.leaderName || '暂无数据'}}</p>
         <p class="text">联系电话:     {{baseInfo.leaderContact || '暂无数据'}}</p>
         <p class="text">油站等级:     {{baseInfo.stationLevel || '暂无数据'}}</p>

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

@@ -69,7 +69,7 @@
                 </td> -->
             </tr>
             <tr>
-              <td class="head">区域</td>
+              <td class="head">区域名称</td>
               <td class="text">
                 <nz-form-item>
                   <nz-form-control>
@@ -79,7 +79,7 @@
                   </nz-form-control>
                 </nz-form-item>
               </td>
-              <td class="head">所属公司<span style="color: red;">*</span></td>
+              <td class="head">公司名称<span style="color: red;">*</span></td>
               <td class="text">
                 <nz-form-item>
                   <nz-form-control>

src/app/pages/plan-admin/file-license-list/file-license-list.component.ts

@@ -153,11 +153,11 @@ export class FileLicenseListComponent implements OnInit {
           let newArr = []
           for (let index = 0; index < newElement.length; index++) {
             const item = newElement[index];
-            if (item.name == '省公司') {
+            if (item.name == '公司名称') {
               newArr[0] = item
               newElement.splice(index--, 1)
             }
-            if (item.name == '区域') {
+            if (item.name == '区域名称') {
               newArr[1] = item
               newElement.splice(index--, 1)
             }

src/app/pages/plan-admin/oil-station-list/oil-station-list.component.html

@@ -34,8 +34,8 @@
 
                         </div>加油站名称
                     </th>
-                    <th>区域</th>
-                    <th>所属公司</th>
+                    <th>区域名称</th>
+                    <th>公司名称</th>
                     <th style="text-align: center;">联系人</th>
                     <th style="text-align: center;">联系电话</th>
                     <th style="text-align: center;">油站等级</th>

src/app/pages/plan-admin/oil-station-list/oil-station-list.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, ViewChild, ElementRef } from '@angular/core';
+import { Component, OnInit, ViewChild, ElementRef, ViewContainerRef } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { TreeService } from 'src/app/service/tree.service';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
@@ -8,6 +8,8 @@ import { Router } from '@angular/router';
 import { NavChangeService } from 'src/app/service/navChange.service';
 import { fromEvent } from 'rxjs';
 import { debounceTime } from 'rxjs/operators';
+import { GasBaseInfoComponent } from '../../audit/gas-base-info/gas-base-info.component';
+import { NzModalService } from 'ng-zorro-antd/modal';
 
 @Component({
   selector: 'app-oil-station-list',
@@ -16,7 +18,7 @@ import { debounceTime } from 'rxjs/operators';
 })
 export class OilStationListComponent implements OnInit {
   validateForm!: FormGroup;
-  constructor(private element: ElementRef, private navChangeService: NavChangeService, private http: HttpClient, private toTree: TreeService, private fb: FormBuilder, private nzContextMenuService: NzContextMenuService, private router: Router) { }
+  constructor(private element: ElementRef, private navChangeService: NavChangeService, private http: HttpClient, private toTree: TreeService, private fb: FormBuilder, private nzContextMenuService: NzContextMenuService, private router: Router, private modal: NzModalService, private viewContainerRef: ViewContainerRef) { }
 
   tableScrollHeight
   resizeListener
@@ -86,6 +88,32 @@ export class OilStationListComponent implements OnInit {
       name: 'oilstation'
     }
     this.navChangeService.sendMessage(obj);//发布一条消息
+
+    let params = { organizationUnitId: item.organizationUnitId }
+    this.http.get('/api/services/app/GasStation/Get', { params: params }).subscribe((data: any) => {
+      if (!data.result.hasBuildingInfo) {
+        this.modal.create({
+          nzContent: GasBaseInfoComponent,
+          nzViewContainerRef: this.viewContainerRef,
+          nzWidth: 700,
+          nzBodyStyle: {
+            'border': '1px solid #91CCFF',
+            'border-radius': '0px',
+            'padding': '7px',
+            'box-shadow': '0 0 8px 0 #fff',
+            'background-image': 'linear-gradient(#003665, #000f25)'
+          },
+          nzStyle: {
+            'top': '50px',
+          },
+          nzComponentParams: {
+            data: { organizationId: (JSON.parse(sessionStorage.getItem('userdataOfgasstation'))).organization.id }
+          },
+          nzFooter: null,
+          nzClosable: false,
+        });
+      }
+    })
   }
 
   tableSpin: boolean

src/app/pages/plan-admin/update-license-list/update-license-list.component.ts

@@ -149,11 +149,11 @@ export class UpdateLicenseListComponent implements OnInit {
           let newArr = []
           for (let index = 0; index < newElement.length; index++) {
             const item = newElement[index];
-            if (item.name == '省公司') {
+            if (item.name == '公司名称') {
               newArr[0] = item
               newElement.splice(index--, 1)
             }
-            if (item.name == '区域') {
+            if (item.name == '区域名称') {
               newArr[1] = item
               newElement.splice(index--, 1)
             }

src/app/pages/records/criminal-records-admin/criminal-records-admin.component.html

@@ -163,8 +163,8 @@
             <th>预警级别</th>
             <th>预警类型</th>
             <th>预警事件</th>
-            <th>所属公司</th>
-            <th>管理区域</th>
+            <th>公司名称</th>
+            <th>区域名称</th>
             <th>加油站</th>
             <th>预警区域</th>
             <th>摄像头名称</th>

src/app/pages/records/criminal-records-admin/criminal-records-admin.component.scss

@@ -65,8 +65,6 @@
     }
 
   }
-
-
 }
 
 .content {

src/app/pages/records/criminal-records/criminal-records.component.html

@@ -141,7 +141,7 @@
             <th>预警级别</th>
             <th>预警类型</th>
             <th>预警事件</th>
-            <th>管理区域</th>
+            <th>区域名称</th>
             <th>预警区域</th>
             <th>摄像头名称</th>
             <th>预警时间</th>

src/app/pages/records/oil-unloading-process-list/oil-unloading-process-list.component.html

@@ -106,7 +106,7 @@
                         <th nzWidth="5%" style="text-align: center;">序号</th>
                         <th>油站名称</th>
                         <th>公司名称</th>
-                        <th>区域</th>
+                        <th>区域名称</th>
                         <th>卸油开始时间</th>
                         <th>卸油结束时间</th>
                         <th>卸油准备</th>

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

@@ -122,10 +122,10 @@
         预警事件
       </div>
       <div nz-col nzSpan="2">
-        所属公司
+        公司名称
       </div>
       <div nz-col nzSpan="3">
-        管理区域
+        区域名称
       </div>
       <div nz-col nzSpan="2">
         加油站

src/app/system-management/navigation/navigation.component.html

@@ -26,7 +26,7 @@
   </nz-sider>
   <nz-layout>
     <nz-header>
-      <span>Hey，欢迎登录加油站智能安全管理系统</span>
+      <span>Hey,欢迎登录加油站智能安全管理系统</span>
       <a nz-dropdown [nzDropdownMenu]="menu" [nzTrigger]="'click'" [nzBackdrop]='false'>
         <i nz-icon nzType="setting"></i>
       </a>

src/theme.less

@@ -499,7 +499,8 @@
   ::-webkit-scrollbar-track {
     background-color: #061d3c;
   }
-  ::-webkit-scrollbar-corner{
+
+  ::-webkit-scrollbar-corner {
     background-color: #061d3c;
   }
 
@@ -684,6 +685,10 @@
     color: #fff;
   }
 
+  .ant-select-selection-item-content {
+    max-width: 66px;
+  }
+
   .ant-select-selection-item-remove {
     color: #fff;
   }