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

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

@@ -23,9 +23,9 @@
                     </td>
                     <td>
                         <span *ngIf="item.auditType == 0">油站信息</span>
-                        <span *ngIf="item.auditType == 1">更新类证照提醒时间</span>
+                        <span *ngIf="item.auditType == 1">经营类证照提醒时间</span>
-                        <span *ngIf="item.auditType == 2">更新类证照</span>
+                        <span *ngIf="item.auditType == 2">经营类证照</span>
-                        <span *ngIf="item.auditType == 3">档案类证照</span>
+                        <span *ngIf="item.auditType == 3">资产类证照</span>
                     </td>
                     <td><label *ngIf="item.gasStation">{{item.gasStation.stationName}}</label></td>
                     <td><label *ngIf="item.gasStation">{{item.gasStation.locationName}}</label></td>

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

@@ -14,9 +14,9 @@
                 <nz-form-control>
                     <nz-select nzAllowClear formControlName="info" nzPlaceHolder="审批信息">
                         <nz-option nzValue="0" nzLabel="油站信息"></nz-option>
-                        <nz-option nzValue="1" nzLabel="更新类证照提醒时间"></nz-option>
+                        <nz-option nzValue="1" 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="3" nzLabel="资产类证照"></nz-option>
                     </nz-select>
                 </nz-form-control>
             </nz-form-item>
@@ -108,9 +108,9 @@
                     </td>
                     <td>
                         <span *ngIf="item.auditType == 0">油站信息</span>
-                        <span *ngIf="item.auditType == 1">更新类证照提醒时间</span>
+                        <span *ngIf="item.auditType == 1">经营类证照提醒时间</span>
-                        <span *ngIf="item.auditType == 2">更新类证照</span>
+                        <span *ngIf="item.auditType == 2">经营类证照</span>
-                        <span *ngIf="item.auditType == 3">档案类证照</span>
+                        <span *ngIf="item.auditType == 3">资产类证照</span>
                     </td>
                     <!-- <td><label *ngIf="item.gasStation">{{item.gasStation.stationName}}</label></td>
                     <td><label *ngIf="item.gasStation">{{item.gasStation.locationName}}</label></td> -->

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

@@ -31,8 +31,8 @@
         <div class="content">
           <div class="contentitem">
             <span class="grey" (click)="selectTab(0)" [ngClass]="{'selectedItem': selectedTab == 0}">油站管理</span>
-            <span class="grey" (click)="selectTab(1)" [ngClass]="{'selectedItem': selectedTab == 1}">更新类证照</span>
+            <span class="grey" (click)="selectTab(1)" [ngClass]="{'selectedItem': selectedTab == 1}">经营类证照</span>
-            <span class="grey" (click)="selectTab(2)" [ngClass]="{'selectedItem': selectedTab == 2}">档案类证照</span>
+            <span class="grey" (click)="selectTab(2)" [ngClass]="{'selectedItem': selectedTab == 2}">资产类证照</span>
           </div>
         </div>
       </div>

src/app/system-management/file-of-license/file-of-license.component.html

@@ -1,7 +1,7 @@
 <div class="licenseBox" id="licenseBox">
     <div class="topbox">
         <div class="lefttop">
-            <span>档案类证件列表</span>
+            <span>资产类证件列表</span>
         </div>
         <div class="righttop">
             <button nz-button nzType="primary" (click)="addRole()"><i nz-icon nzType="plus-circle"
@@ -12,7 +12,7 @@
         <nz-table #basicTable [nzData]="listOfData" [nzShowPagination]='false' [nzPageSize]='999' [nzLoading]="isLoading">
             <thead>
                 <tr>
-                    <th style="padding-left: 40px;">档案类证件</th>
+                    <th style="padding-left: 40px;">资产类证件</th>
                     <th>操作</th>
                 </tr>
             </thead>

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

@@ -18,8 +18,8 @@
         <li [routerLink]="['/system/role']"  routerLinkActive="router-link-active"><img src="../../../assets/images/icon/role.png" alt="">角色管理</li>
         <li [routerLink]="['/system/host']"  routerLinkActive="router-link-active"><img src="../../../assets/images/icon/host.png" alt="">分析主机管理</li>
         <li [routerLink]="['/system/push']"  routerLinkActive="router-link-active"><img src="../../../assets/images/icon/push.png" alt="">推送管理</li>
-        <li [routerLink]="['/system/updateOfLicense']"  routerLinkActive="router-link-active"><img src="../../../assets/images/icon/license.png" alt="">更新类证照管理</li>
+        <li [routerLink]="['/system/updateOfLicense']"  routerLinkActive="router-link-active"><img src="../../../assets/images/icon/license.png" alt="">经营类证照管理</li>
-        <li [routerLink]="['/system/fileOfLicense']"  routerLinkActive="router-link-active"><img src="../../../assets/images/icon/license.png" alt="">档案类证照管理</li>
+        <li [routerLink]="['/system/fileOfLicense']"  routerLinkActive="router-link-active"><img src="../../../assets/images/icon/license.png" alt="">资产类证照管理</li>
       </ul>
     </div>
   </nz-sider>