[新增]更改资源路径，适配油站油库共用一个域名

angular.json

@@ -18,7 +18,7 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "baseHref": "/",
+            "baseHref": "/youzhan/",
             "outputPath": "dist/anxin119",
             "index": "src/index.html",
             "main": "src/main.ts",

proxy.config.json

@@ -1,6 +1,6 @@
 {
   "/api": {
-    "target": "https://znaq.sinochemoilmarketing.com/",
+    "target": "http://121.36.37.70:8906/",
     "测试1": "http://121.36.37.70:8906/",
     "测试2": "https://znaq.sinochemoilmarketing.com/",
     "测试3": "https://gas.anxincloud.cn/",
@@ -9,7 +9,7 @@
     "changeOrigin": true
   },
   "/signalr": {
-    "target": "https://znaq.sinochemoilmarketing.com/",
+    "target": "http://121.36.37.70:8906/",
     "secure": false,
     "ws": true,
     "logLevel": "debug"

src/app/http-interceptors/base-interceptor.ts

@@ -20,8 +20,8 @@ export class BaseInterceptor implements HttpInterceptor {
   constructor(private router: Router, private message: NzMessageService) {}
 
   intercept(req, next: HttpHandler) {
-    // req.url = "/youzhan" + req.url;
+    req.url = "/youzhan" + req.url;
-    // req.urlWithParams = "/youzhan" + req.urlWithParams;
+    req.urlWithParams = "/youzhan" + req.urlWithParams;
     let params = req.params;
     for (const key of req.params.keys()) {
       if (params.get(key) === undefined || params.get(key) === null) {

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

@@ -110,27 +110,27 @@
             <img *ngIf="data.getData.imageUrl && getFileType(data.getData.imageUrl) == 'img'"
                 [src]="data.getData.imageUrl" (click)="viewImg(data.getData.imageUrl)">
             <img *ngIf="data.getData.imageUrl && getFileType(data.getData.imageUrl) == 'word'"
-                src="../../../../assets/images/license/word.png" (click)="lookFile(data.getData.imageUrl)">
+                src="assets/images/license/word.png" (click)="lookFile(data.getData.imageUrl)">
             <img *ngIf="data.getData.imageUrl && getFileType(data.getData.imageUrl) == 'pdf'"
-                src="../../../../assets/images/license/pdf.png" (click)="lookFile(data.getData.imageUrl)">
+                src="assets/images/license/pdf.png" (click)="lookFile(data.getData.imageUrl)">
         </p>
         <div class="cutoffrule" [hidden]="data.getData.imageUrl === undefined"></div>
         <p *ngIf="data.getData.hasAttachmentDefault && data.getData.attachment">附件副本: &nbsp;&nbsp;
             <img *ngIf="data.getData.attachment && getFileType(data.getData.attachment) == 'img'"
                 [src]="data.getData.attachment" (click)="viewImg(data.getData.attachment)">
             <img *ngIf="data.getData.attachment && getFileType(data.getData.attachment) == 'word'"
-                src="../../../../assets/images/license/word.png" (click)="lookFile(data.getData.attachment)">
+                src="assets/images/license/word.png" (click)="lookFile(data.getData.attachment)">
             <img *ngIf="data.getData.attachment && getFileType(data.getData.attachment) == 'pdf'"
-                src="../../../../assets/images/license/pdf.png" (click)="lookFile(data.getData.attachment)">
+                src="assets/images/license/pdf.png" (click)="lookFile(data.getData.attachment)">
         </p>
         <div class="cutoffrule" *ngIf="data.getData.hasAttachmentDefault && data.getData.attachment"></div>
         <p *ngIf="data.getData.yearlyCheckAttachment">年检更新附件: &nbsp;&nbsp;
             <img *ngIf="data.getData.yearlyCheckAttachment && getFileType(data.getData.yearlyCheckAttachment) == 'img'"
                 [src]="data.getData.yearlyCheckAttachment" (click)="viewImg(data.getData.yearlyCheckAttachment)">
             <img *ngIf="data.getData.yearlyCheckAttachment && getFileType(data.getData.yearlyCheckAttachment) == 'word'"
-                src="../../../../assets/images/license/word.png" (click)="lookFile(data.getData.yearlyCheckAttachment)">
+                src="assets/images/license/word.png" (click)="lookFile(data.getData.yearlyCheckAttachment)">
             <img *ngIf="data.getData.yearlyCheckAttachment && getFileType(data.getData.yearlyCheckAttachment) == 'pdf'"
-                src="../../../../assets/images/license/pdf.png" (click)="lookFile(data.getData.yearlyCheckAttachment)">
+                src="assets/images/license/pdf.png" (click)="lookFile(data.getData.yearlyCheckAttachment)">
         </p>
         <div class="cutoffrule" *ngIf="data.getData.yearlyCheckAttachment"></div>
         <p *ngIf="data.getData.yearlyCheckDescription">年检更新说明: &nbsp;&nbsp;

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

@@ -1,7 +1,7 @@
 <div class="audit" id="audit">
     <div class="title">
         <div class="titlebox">
-            <img src="../../../assets/images/logosm.png" alt="">
+            <img src="assets/images/logosm.png" alt="">
             <div class="nav">
                 <div class="navitem">
                     <span *ngFor="let item of menu" [ngClass]="{'grey': selectedItem != item}"

src/app/pages/home-page-comprehensive/home-page-comprehensive.component.html

@@ -2,13 +2,13 @@
 
     <div class="informbox">
         <div class="warningnumber">
-            <img src="../../../assets/images/warningnum.png" alt="">
+            <img src="assets/images/warningnum.png" alt="">
             <span class="num">{{totalCount}}</span>
             <span class="today" (click)="getUnreadNotification()">今日预警</span>
         </div>
         <div class="inform">
             <div class="infologo">
-                <img src="../../../assets/images/inform.png" alt="">
+                <img src="assets/images/inform.png" alt="">
                 通知
             </div>
             <!-- 循环轮播信息 -->
@@ -17,7 +17,7 @@
                     <ul class="notice-list" id="notice-list">
                         <li class="info" *ngFor="let item of unreadMessageList;let key = index">
                             <div class="infoitem">
-                                <img src="../../../assets/images/warning1.png" alt="">
+                                <img src="assets/images/warning1.png" alt="">
                                 您有一条新的预警信息!{{item.notification.data.violationName}}
                             </div>
                             <div class="btn">
@@ -44,7 +44,7 @@
                 <nz-spin *ngIf="isSpin" nzSimple class="nzspin"></nz-spin>
             </div>
             <div class="leftitem ranking">
-                <span class="itemname">油站近30天事件排名</span>
+                <span class="itemname">近30天事件排名</span>
                 <div class="box eventbox">
                     <div class="eventboxitem" *ngFor="let item of HomeAggregatioData.violationNameAgg;let key = index">
                         <div class="eventname" [title]="item.eventSystemName">
@@ -106,21 +106,21 @@
 
             <div class="rightitem">
                 <div class="numlistbox">
-                    <img src="../../../assets/images/stationNum.png" alt="">
+                    <img src="assets/images/stationNum.png" alt="">
                     <div class="content">
                         <span class="lightspan lightspan1">{{HomeAggregatioData.dev.stationCount}}</span>
                         <span>接入油站(个)</span>
                     </div>
                 </div>
                 <div class="numlistbox">
-                    <img src="../../../assets/images/modelNum.png" alt="">
+                    <img src="assets/images/modelNum.png" alt="">
                     <div class="content">
                         <span class="lightspan lightspan2">{{HomeAggregatioData.dev.violationCount}}</span>
                         <span>预警分析模型(个)</span>
                     </div>
                 </div>
                 <div class="numlistbox">
-                    <img src="../../../assets/images/cameraNum.png" alt="">
+                    <img src="assets/images/cameraNum.png" alt="">
                     <div class="content">
                         <span class="lightspan lightspan3">{{HomeAggregatioData.dev.cameraCount}}</span>
                         <span>摄像头(个)</span>
@@ -134,15 +134,14 @@
         </div>
         <div class="content_box">
             <div class="leftitem leftitemlimit">
-                <div class="eventechartpieAll" id="eventechartpieAll_YK">
+                <div class="eventechartpieAll" id="eventechartpieAll">
                 </div>
-                <nz-spin *ngIf="isSpin_YK" nzSimple class="nzspin"></nz-spin>
+                <nz-spin *ngIf="isSpin" nzSimple class="nzspin"></nz-spin>
             </div>
             <div class="leftitem ranking">
-                <span class="itemname">油库近30天事件排名</span>
+                <span class="itemname">近30天事件排名</span>
                 <div class="box eventbox">
-                    <div class="eventboxitem"
+                    <div class="eventboxitem" *ngFor="let item of HomeAggregatioData.violationNameAgg;let key = index">
-                        *ngFor="let item of HomeAggregatioData_YK.violationNameAgg;let key = index">
                         <div class="eventname" [title]="item.eventSystemName">
                             <div class="block" [ngClass]="{'yellow': key < 3,'blue': key > 2}">
                                 <ng-container *ngIf="key != 9; else elseTemplate">
@@ -157,7 +156,7 @@
                         <div class="progressbox">
                             <div class="progress">
                                 <div class="colorbar"
-                                    [ngStyle]="width(item.count,HomeAggregatioData_YK.violationNameAgg[0].count)"
+                                    [ngStyle]="width(item.count,HomeAggregatioData.violationNameAgg[0].count)"
                                     [ngClass]="{'yellow': key < 3,'blue': key > 2}">
                                 </div>
                             </div>
@@ -168,12 +167,12 @@
                     </div>
                 </div>
 
-                <nz-spin *ngIf="isSpin_YK" nzSimple class="nzspin"></nz-spin>
+                <nz-spin *ngIf="isSpin" nzSimple class="nzspin"></nz-spin>
             </div>
             <div class="leftitem ranking" style="margin-left: 50px;">
-                <span class="itemname">近30天油库排名</span>
+                <span class="itemname">近30天油站排名</span>
                 <div class="box eventbox">
-                    <div class="eventboxitem" *ngFor="let item of HomeAggregatioData_YK.stationAgg;let key = index">
+                    <div class="eventboxitem" *ngFor="let item of HomeAggregatioData.stationAgg;let key = index">
                         <div class="eventname" [title]="item.companyName + item.stationName">
                             <div class="block" [ngClass]="{'yellow': key < 3,'blue': key > 2}">
                                 <ng-container *ngIf="key != 9; else elseTemplate">
@@ -188,7 +187,7 @@
                         <div class="progressbox">
                             <div class="progress">
                                 <div class="colorbar"
-                                    [ngStyle]="width(item.count,HomeAggregatioData_YK.stationAgg[0].count)"
+                                    [ngStyle]="width(item.count,HomeAggregatioData.stationAgg[0].count)"
                                     [ngClass]="{'yellow': key < 3,'blue': key > 2}">
                                 </div>
                             </div>
@@ -199,28 +198,28 @@
                     </div>
                 </div>
 
-                <nz-spin *ngIf="isSpin_YK" nzSimple class="nzspin"></nz-spin>
+                <nz-spin *ngIf="isSpin" nzSimple class="nzspin"></nz-spin>
             </div>
 
             <div class="rightitem">
                 <div class="numlistbox">
-                    <img src="../../../assets/images/stationNum.png" alt="">
+                    <img src="assets/images/stationNum.png" alt="">
                     <div class="content">
-                        <span class="lightspan lightspan1">{{HomeAggregatioData_YK.dev.stationCount}}</span>
+                        <span class="lightspan lightspan1">{{HomeAggregatioData.dev.stationCount}}</span>
-                        <span>接入油库(个)</span>
+                        <span>接入油站(个)</span>
                     </div>
                 </div>
                 <div class="numlistbox">
-                    <img src="../../../assets/images/modelNum.png" alt="">
+                    <img src="assets/images/modelNum.png" alt="">
                     <div class="content">
-                        <span class="lightspan lightspan2">{{HomeAggregatioData_YK.dev.violationCount}}</span>
+                        <span class="lightspan lightspan2">{{HomeAggregatioData.dev.violationCount}}</span>
                         <span>预警分析模型(个)</span>
                     </div>
                 </div>
                 <div class="numlistbox">
-                    <img src="../../../assets/images/cameraNum.png" alt="">
+                    <img src="assets/images/cameraNum.png" alt="">
                     <div class="content">
-                        <span class="lightspan lightspan3">{{HomeAggregatioData_YK.dev.cameraCount}}</span>
+                        <span class="lightspan lightspan3">{{HomeAggregatioData.dev.cameraCount}}</span>
                         <span>摄像头(个)</span>
                     </div>
                 </div>
@@ -253,13 +252,13 @@
             <div class="bottomitemcontent bottomitemcontent2">
                 <div class="bottomitemchartboxspecial">
                     <span class="bartitle">油库近30天预警事件统计</span>
-                    <div class="eventechartpie" id="eventechartpie_YK"></div>
+                    <div class="eventechartpie" id="eventechartpie"></div>
-                    <div class="eventechartline" id="eventechartline_YK"></div>
+                    <div class="eventechartline" id="eventechartline"></div>
                     <div class="angle-border left-top-border"></div>
                     <div class="angle-border right-top-border"></div>
                     <div class="angle-border left-bottom-border"></div>
                     <div class="angle-border right-bottom-border"></div>
-                    <nz-spin *ngIf="isSpinOfEventWarning_YK" nzSimple class="nzspin"></nz-spin>
+                    <nz-spin *ngIf="isSpinOfEventWarning" nzSimple class="nzspin"></nz-spin>
                 </div>
             </div>  
         </div>
@@ -298,27 +297,27 @@
             <div class="bottomitemcontent bottomitemcontent4">
                 <div class="bottomitemchartboxspecial">
                     <span class="bartitle">油库近30天发油预警走势</span>
-                    <div class="eventechartpie" id="oilechartpie_YK"></div>
+                    <div class="eventechartpie" id="oilechartpie"></div>
-                    <div style="height: 80%;" class="eventechartline" id="oilechartline_YK"></div>
+                    <div style="height: 80%;" class="eventechartline" id="oilechartline"></div>
                     <div class="angle-border left-top-border"></div>
                     <div class="angle-border right-top-border"></div>
                     <div class="angle-border left-bottom-border"></div>
                     <div class="angle-border right-bottom-border"></div>
-                    <nz-spin *ngIf="isSpinOfOilDischarge_YK" nzSimple class="nzspin"></nz-spin>
+                    <nz-spin *ngIf="isSpinOfOilDischarge" nzSimple class="nzspin"></nz-spin>
                     <div class="oilNum">
                         <div class="oilNumItem">
                             <div class="pointbox">
                                 <div class="point"></div>
                                 <span>累计发油总车次</span>
                             </div>
-                            {{HomeAggregatioData_YK.ouViolationType.ouTotalCount}}
+                            {{HomeAggregatioData.ouViolationType.ouTotalCount}}
                         </div>
                         <div class="oilNumItem">
                             <div class="pointbox">
                                 <div class="point"></div>
                                 <span>累计发油预警车次</span>
                             </div>
-                            {{HomeAggregatioData_YK.ouViolationType.ouNotCorrectCount}}
+                            {{HomeAggregatioData.ouViolationType.ouNotCorrectCount}}
                         </div>
                     </div>
                 </div>

src/app/pages/home-page-nologin/home-page-nologin.component.html

@@ -1,13 +1,13 @@
 <div class="homepagebox">
     <div class="informbox">
         <div class="warningnumber">
-            <img src="../../../assets/images/warningnum.png" alt="">
+            <img src="assets/images/warningnum.png" alt="">
             <span class="num">{{totalCount}}</span>
             <span class="today" (click)="getUnreadNotification()">今日预警</span>
         </div>
         <div class="inform">
             <div class="infologo">
-                <img src="../../../assets/images/inform.png" alt="">
+                <img src="assets/images/inform.png" alt="">
                 通知
             </div>
             <!-- 循环轮播信息 -->
@@ -16,7 +16,7 @@
                     <ul class="notice-list" id="notice-list">
                         <li class="info" *ngFor="let item of unreadMessageList;let key = index">
                             <div class="infoitem">
-                                <img src="../../../assets/images/warning1.png" alt="">
+                                <img src="assets/images/warning1.png" alt="">
                                 您有一条新的预警信息!{{item.notification.data.violationName}}
                             </div>
                             <div class="btn">
@@ -42,8 +42,8 @@
                         <h1>{{HomeAggregatioData.recordCount}}</h1>
                         <span>累计预警</span>
                     </div>
-                    <img class="bucket" src="../../../assets/images/bucket.png" alt="">
+                    <img class="bucket" src="assets/images/bucket.png" alt="">
-                    <img class="circle" src="../../../assets/images/circle.png" alt=""> -->
+                    <img class="circle" src="assets/images/circle.png" alt=""> -->
                     <div class="eventechartpieAll" id="eventechartpieAll">
 
 
@@ -180,35 +180,35 @@
             <div class="rightboxcontent">
                 <div class="rightitem">
                     <div class="numlistbox">
-                        <img src="../../../assets/images/stationNum.png" alt="">
+                        <img src="assets/images/stationNum.png" alt="">
                         <div class="content">
                             <span class="lightspan lightspan1">{{HomeAggregatioData.dev.stationCount}}</span>
                             <span>接入油站(个)</span>
                         </div>
                     </div>
                     <div class="numlistbox">
-                        <img src="../../../assets/images/modelNum.png" alt="">
+                        <img src="assets/images/modelNum.png" alt="">
                         <div class="content">
                             <span class="lightspan lightspan2">{{HomeAggregatioData.dev.violationCount}}</span>
                             <span>预警分析模型(个)</span>
                         </div>
                     </div>
                     <div class="numlistbox">
-                        <img src="../../../assets/images/cameraNum.png" alt="">
+                        <img src="assets/images/cameraNum.png" alt="">
                         <div class="content">
                             <span class="lightspan lightspan3">{{HomeAggregatioData.dev.cameraCount}}</span>
                             <span>摄像头(个)</span>
                         </div>
                     </div>
                     <!-- <div class="numlistbox">
-                        <img src="../../../assets/images/licenseNum.png" alt="">
+                        <img src="assets/images/licenseNum.png" alt="">
                         <div class="content">
                             <span class="lightspan lightspan3">{{HomeAggregatioData.licenseViolationCount}}</span>
                             <span>证照预警数量</span>
                         </div>
                     </div>
                     <div class="numlistbox">
-                        <img src="../../../assets/images/fireNum.png" alt="">
+                        <img src="assets/images/fireNum.png" alt="">
                         <div class="content">
                             <span class="lightspan lightspan3">{{HomeAggregatioData.deviceViolationCount}}</span>
                             <span>消防设备预警数量</span>

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

@@ -2,13 +2,13 @@
     
     <div class="informbox">
         <div class="warningnumber">
-            <img src="../../../assets/images/warningnum.png" alt="">
+            <img src="assets/images/warningnum.png" alt="">
             <span class="num">{{totalCount}}</span>
             <span class="today" (click)="getUnreadNotification()">今日预警</span>
         </div>
         <div class="inform">
             <div class="infologo">
-                <img src="../../../assets/images/inform.png" alt="">
+                <img src="assets/images/inform.png" alt="">
                 通知
             </div>
             <!-- 循环轮播信息 -->
@@ -17,7 +17,7 @@
                     <ul class="notice-list" id="notice-list">
                         <li class="info" *ngFor="let item of unreadMessageList;let key = index">
                             <div class="infoitem">
-                                <img src="../../../assets/images/warning1.png" alt="">
+                                <img src="assets/images/warning1.png" alt="">
                                 您有一条新的预警信息!{{item.notification.data.violationName}}
                             </div>
                             <div class="btn">
@@ -44,9 +44,9 @@
                         <h1>{{HomeAggregatioData.recordCount}}</h1>
                         <span>累计预警</span>
                     </div>
-                    <img class="bucket" src="../../../assets/images/bucket.png" alt="">
+                    <img class="bucket" src="assets/images/bucket.png" alt="">
-                    <img class="circle" src="../../../assets/images/circle.png" alt=""> -->
+                    <img class="circle" src="assets/images/circle.png" alt=""> -->
-                    <div class="eventechartpieAll" id="eventechartpieAll_YZ">
+                    <div class="eventechartpieAll" id="eventechartpieAll">
 
 
                     </div>
@@ -182,35 +182,35 @@
             <div class="rightboxcontent">
                 <div class="rightitem">
                     <div class="numlistbox">
-                        <img src="../../../assets/images/stationNum.png" alt="">
+                        <img src="assets/images/stationNum.png" alt="">
                         <div class="content">
                             <span class="lightspan lightspan1">{{HomeAggregatioData.dev.stationCount}}</span>
                             <span>接入油站(个)</span>
                         </div>
                     </div>
                     <div class="numlistbox">
-                        <img src="../../../assets/images/modelNum.png" alt="">
+                        <img src="assets/images/modelNum.png" alt="">
                         <div class="content">
                             <span class="lightspan lightspan2">{{HomeAggregatioData.dev.violationCount}}</span>
                             <span>预警分析模型(个)</span>
                         </div>
                     </div>
                     <div class="numlistbox">
-                        <img src="../../../assets/images/cameraNum.png" alt="">
+                        <img src="assets/images/cameraNum.png" alt="">
                         <div class="content">
                             <span class="lightspan lightspan3">{{HomeAggregatioData.dev.cameraCount}}</span>
                             <span>摄像头(个)</span>
                         </div>
                     </div>
                     <!-- <div class="numlistbox">
-                        <img src="../../../assets/images/licenseNum.png" alt="">
+                        <img src="assets/images/licenseNum.png" alt="">
                         <div class="content">
                             <span class="lightspan lightspan3">{{HomeAggregatioData.licenseViolationCount}}</span>
                             <span>证照预警数量</span>
                         </div>
                     </div>
                     <div class="numlistbox">
-                        <img src="../../../assets/images/fireNum.png" alt="">
+                        <img src="assets/images/fireNum.png" alt="">
                         <div class="content">
                             <span class="lightspan lightspan3">{{HomeAggregatioData.deviceViolationCount}}</span>
                             <span>消防设备预警数量</span>
@@ -233,11 +233,11 @@
             <div class="bottomitemcontent bottomitemcontent1">
                 <div class="bottomitemchartboxspecial">
                     <span class="bartitle">近30天预警事件统计</span>
-                    <div class="eventechartpie" id="eventechartpie_YZ">
+                    <div class="eventechartpie" id="eventechartpie">
 
 
                     </div>
-                    <div class="eventechartline" id="eventechartline_YZ">
+                    <div class="eventechartline" id="eventechartline">
 
                     </div>
                     <div class="angle-border left-top-border"></div>
@@ -255,10 +255,10 @@
             <div class="bottomitemcontent bottomitemcontent1">
                 <div class="bottomitemchartboxspecial">
                     <span class="bartitle">近30天卸油预警走势</span>
-                    <div class="eventechartpie" id="oilechartpie_YZ">
+                    <div class="eventechartpie" id="oilechartpie">
 
                     </div>
-                    <div style="height: 80%;" class="eventechartline" id="oilechartline_YZ">
+                    <div style="height: 80%;" class="eventechartline" id="oilechartline">
 
                     </div>
                     <div class="angle-border left-top-border"></div>

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

@@ -533,14 +533,14 @@ export class HomePageComponent implements OnInit {
 
     // 饼图
     this.warningechartpieAll = echarts.init(
-      document.getElementById("eventechartpieAll_YZ"),
+      document.getElementById("eventechartpieAll"),
       null,
       { devicePixelRatio: 2 }
     );
     // this.equipmentechart = echarts.init(document.getElementById('equipmentechart'));
     // 预警饼图
     this.warningechartpie = echarts.init(
-      document.getElementById("eventechartpie_YZ"),
+      document.getElementById("eventechartpie"),
       null,
       { devicePixelRatio: 2 }
     );
@@ -556,12 +556,12 @@ export class HomePageComponent implements OnInit {
     });
     // 预警线图
     this.warningechartbar = echarts.init(
-      document.getElementById("eventechartline_YZ")
+      document.getElementById("eventechartline")
     );
 
     // 卸油饼图
     this.oilchartpie = echarts.init(
-      document.getElementById("oilechartpie_YZ"),
+      document.getElementById("oilechartpie"),
       null,
       { devicePixelRatio: 2 }
     );
@@ -576,7 +576,7 @@ export class HomePageComponent implements OnInit {
       this.get30daysViolate(false, arr);
     });
     // 卸油线图
-    this.oilchartbar = echarts.init(document.getElementById("oilechartline_YZ"));
+    this.oilchartbar = echarts.init(document.getElementById("oilechartline"));
 
     window.onresize = () => {
       setTimeout(() => {

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

@@ -1,27 +1,15 @@
 <div class="box">
   <div class="menu">
     <div class="boxleft">
-      <img *ngIf="isProd" src="../../../assets/images/logo2.png" alt="">
+      <img *ngIf="isProd" src="assets/images/logo2.png" alt="">
     </div>
-
+    <div class="libox" *ngIf="!isGasStationNav">
-    <div class="libox" *ngIf="!isGasStationNav && isComprehensive">
-      <li class="router-link-active">
-        AI视频预警统计
-      </li>
-    </div>
-    <div class="libox" *ngIf="!isGasStationNav && !isComprehensive">
       <li *ngFor="let item of menuList1" (click)="routerChange(item)"
         [ngClass]="{'router-link-active': item.name == selectedItem}">
         {{item.name}}
       </li>
     </div>
-
+    <div class="libox" *ngIf="isGasStationNav">
-    <div class="libox" *ngIf="isGasStationNav && isComprehensive">
-      <li class="router-link-active">
-        AI视频预警统计
-      </li>
-    </div>
-    <div class="libox" *ngIf="isGasStationNav && !isComprehensive">
       <ng-container *ngIf="isGasStationBack; else elseTemplate">
         <li [routerLink]="['/plan/petrolStation']" routerLinkActive="router-link-active">
           数字油站
@@ -59,9 +47,9 @@
       </i>
 
       <img *ngIf="!isfullscreen" (click)="fullscreenToggle()" style="margin-right: 8px;cursor: pointer;"
-        src="../../../assets/images/fullscreen.png" alt="" title="全屏">
+        src="assets/images/fullscreen.png" alt="" title="全屏">
       <img *ngIf="isfullscreen" (click)="closefullscreen()" style="margin-right: 8px;cursor: pointer;"
-        src="../../../assets/images/fullscreen.png" alt="" title="全屏">
+        src="assets/images/fullscreen.png" alt="" title="全屏">
 
       <span class="time">
         {{time}}
@@ -72,10 +60,10 @@
       <span style="margin-right: 8px;"> {{surname}} </span>
 
       <a nz-dropdown [nzDropdownMenu]="menu" [nzTrigger]="'click'" [nzBackdrop]='false'>
-        <img src="../../../assets/images/head.png" alt="">
+        <img src="assets/images/head.png" alt="">
       </a>
       <nz-dropdown-menu #menu="nzDropdownMenu">
-        <ul nz-menu nzSelectable *ngIf="isZT ==='false'">
+        <ul nz-menu nzSelectable>
           <li *ngIf="isGasStation" nz-menu-item (click)="navChange('/oliStationInfo')">基本信息</li>
           <li *ngIf="isGasStation" nz-menu-item (click)="navChange('/equipmentInfo')">器材信息</li>
           <li nz-menu-item (click)="changePassword()">修改密码</li>
@@ -85,7 +73,7 @@
       </nz-dropdown-menu>
 
       <span style="margin: 0 12px;" *ngIf="isGasStationBack">|</span>
-      <img style="cursor: pointer;" *ngIf="isGasStationBack" src="../../../assets/images/goback.png" alt=""
+      <img style="cursor: pointer;" *ngIf="isGasStationBack" src="assets/images/goback.png" alt=""
         (click)="goback()">
 
     </div>
@@ -99,7 +87,7 @@
 <ng-template #warning let-item="data">
   <div class="topbox">
     <div>
-      <img src="../assets/images/warning.png" alt="">
+      <img src="assets/images/warning.png" alt="">
     </div>
     <div class="text">
       <span class="name">您有一条新的预警提醒!</span>

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

@@ -102,7 +102,6 @@ export class HomeComponent implements OnInit {
   selectedItem;
 
   isZT = sessionStorage.getItem("isZT") || "false";
-  isComprehensive = false;
   routerChange(item) {
     if (
       JSON.parse(sessionStorage.getItem("isGasStation")) &&
@@ -132,11 +131,6 @@ export class HomeComponent implements OnInit {
         { name: "证照管理", url: "/audit" },
       ];
     }
-    //油站人员进入油站
-    if (this.router.url.indexOf("comprehensive") != -1) {
-      //控制返回按钮显示
-      this.isComprehensive = true;
-    }
 
     this.isProd = this.patternService.isProd;
     this.initSelectedItem(this.router);
@@ -394,23 +388,23 @@ export class HomeComponent implements OnInit {
     // let violationName =
     //   userNotification.notification.data.properties.ViolationName;
     // const soundMap = {
-    //   油罐区非工作人员闯入: "../../../assets/sound/chuangru.mp3",
+    //   油罐区非工作人员闯入: "assets/sound/chuangru.mp3",
-    //   进出口长时间停放车辆: "../../../assets/sound/jinchukou.mp3",
+    //   进出口长时间停放车辆: "assets/sound/jinchukou.mp3",
-    //   前庭有顾客疑似抽烟: "../../../assets/sound/chouyan.mp3",
+    //   前庭有顾客疑似抽烟: "assets/sound/chouyan.mp3",
-    //   前庭有顾客接打电话: "../../../assets/sound/dadianhua.mp3",
+    //   前庭有顾客接打电话: "assets/sound/dadianhua.mp3",
-    //   卸油前未按规定设置隔离: "../../../assets/sound/xygeli.mp3",
+    //   卸油前未按规定设置隔离: "assets/sound/xygeli.mp3",
-    //   卸油后未按规定拆除卸油管: "../../../assets/sound/xychaichuxyguan.mp3",
+    //   卸油后未按规定拆除卸油管: "assets/sound/xychaichuxyguan.mp3",
-    //   卸油前未按规定连接静电接地: "../../../assets/sound/xyjiedi.mp3",
+    //   卸油前未按规定连接静电接地: "assets/sound/xyjiedi.mp3",
-    //   卸油前未按规定放置灭火器: "../../../assets/sound/xymiehuoqi.mp3",
+    //   卸油前未按规定放置灭火器: "assets/sound/xymiehuoqi.mp3",
-    //   卸油后长时间未清理现场: "../../../assets/sound/xyxianchang.mp3",
+    //   卸油后长时间未清理现场: "assets/sound/xyxianchang.mp3",
-    //   油罐车长时间无人卸油: "../../../assets/sound/xywuren.mp3",
+    //   油罐车长时间无人卸油: "assets/sound/xywuren.mp3",
-    //   卸油前未按规定连接卸油管: "../../../assets/sound/xyxieyouguan.mp3",
+    //   卸油前未按规定连接卸油管: "assets/sound/xyxieyouguan.mp3",
-    //   卸油中未按规定全程监卸: "../../../assets/sound/xyjianxie.mp3",
+    //   卸油中未按规定全程监卸: "assets/sound/xyjianxie.mp3",
-    //   疑似烟雾: "../../../assets/sound/yanwu.mp3",
+    //   疑似烟雾: "assets/sound/yanwu.mp3",
-    //   疑似明火: "../../../assets/sound/minghuo.mp3",
+    //   疑似明火: "assets/sound/minghuo.mp3",
     //   "收银员未穿工装/非工作人员闯入收银区":
-    //     "../../../assets/sound/gongzhuang.mp3",
+    //     "assets/sound/gongzhuang.mp3",
-    //   default: "../../../assets/sound/warning.mp3",
+    //   default: "assets/sound/warning.mp3",
     // };
     // const audioUrl = soundMap[violationName] || soundMap.default;
     // var player = new Audio(audioUrl);

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

@@ -7,13 +7,13 @@
         <p class="title">{{baseInfo.stationName || '暂无数据'}}<button class="titleBotton"><label
               *ngIf="baseInfo.stationType == 0">自营</label><label *ngIf="baseInfo.stationType == 1">加盟</label><label
               *ngIf="baseInfo.stationType != 0 && baseInfo.stationType != 1">其他</label></button></p>
-        <p class="text"><img src="../../../assets/images/baseInfo/position.png" class="textIcon">{{baseInfo.address ||
+        <p class="text"><img src="assets/images/baseInfo/position.png" class="textIcon">{{baseInfo.address ||
           '暂无数据'}}</p>
-        <p class="text"><img src="../../../assets/images/baseInfo/building.png" class="textIcon">{{baseInfo.locationName
+        <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 |
+        <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 ||
+        <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.leaderName || '暂无数据'}}</p>
@@ -25,35 +25,35 @@
       </div>
       <div class="interval" *ngIf="baseInfo.govUnitDetail && baseInfo.govUnitDetail.policeStation">
         <p class="title">辖区派出所</p>
-        <p class="text"><img src="../../../assets/images/baseInfo/police.png"
+        <p class="text"><img src="assets/images/baseInfo/police.png"
             class="textIcon">{{baseInfo.govUnitDetail.policeStation.name || '暂无数据'}}</p>
-        <p class="text"><img src="../../../assets/images/baseInfo/position.png"
+        <p class="text"><img src="assets/images/baseInfo/position.png"
             class="textIcon">{{baseInfo.govUnitDetail.policeStation.address || '暂无数据'}}</p>
-        <p class="text"><img src="../../../assets/images/baseInfo/phone.png"
+        <p class="text"><img src="assets/images/baseInfo/phone.png"
             class="textIcon">{{baseInfo.govUnitDetail.policeStation.contactInformation || '暂无数据'}}</p>
-        <p class="text"><img src="../../../assets/images/baseInfo/road.png"
+        <p class="text"><img src="assets/images/baseInfo/road.png"
             class="textIcon">{{baseInfo.govUnitDetail.policeStation.distance || '0公里'}}</p>
       </div>
       <div class="interval" *ngIf="baseInfo.govUnitDetail && baseInfo.govUnitDetail.hospital">
         <p class="title">辖区医院</p>
-        <p class="text"><img src="../../../assets/images/baseInfo/hospital.png"
+        <p class="text"><img src="assets/images/baseInfo/hospital.png"
             class="textIcon">{{baseInfo.govUnitDetail.hospital.name || '暂无数据'}}</p>
-        <p class="text"><img src="../../../assets/images/baseInfo/position.png"
+        <p class="text"><img src="assets/images/baseInfo/position.png"
             class="textIcon">{{baseInfo.govUnitDetail.hospital.address || '暂无数据'}}</p>
-        <p class="text"><img src="../../../assets/images/baseInfo/phone.png"
+        <p class="text"><img src="assets/images/baseInfo/phone.png"
             class="textIcon">{{baseInfo.govUnitDetail.hospital.contactInformation || '暂无数据'}}</p>
-        <p class="text"><img src="../../../assets/images/baseInfo/road.png"
+        <p class="text"><img src="assets/images/baseInfo/road.png"
             class="textIcon">{{baseInfo.govUnitDetail.hospital.distance || '0公里'}}</p>
       </div>
       <div class="interval" *ngIf="baseInfo.govUnitDetail && baseInfo.govUnitDetail.fireBrigade">
         <p class="title">辖区消防队</p>
-        <p class="text"><img src="../../../assets/images/baseInfo/police.png"
+        <p class="text"><img src="assets/images/baseInfo/police.png"
             class="textIcon">{{baseInfo.govUnitDetail.fireBrigade.name || '暂无数据'}}</p>
-        <p class="text"><img src="../../../assets/images/baseInfo/position.png"
+        <p class="text"><img src="assets/images/baseInfo/position.png"
             class="textIcon">{{baseInfo.govUnitDetail.fireBrigade.address || '暂无数据'}}</p>
-        <p class="text"><img src="../../../assets/images/baseInfo/phone.png"
+        <p class="text"><img src="assets/images/baseInfo/phone.png"
             class="textIcon">{{baseInfo.govUnitDetail.fireBrigade.contactInformation || '暂无数据'}}</p>
-        <p class="text"><img src="../../../assets/images/baseInfo/road.png"
+        <p class="text"><img src="assets/images/baseInfo/road.png"
             class="textIcon">{{baseInfo.govUnitDetail.fireBrigade.distance || '0公里'}}</p>
       </div>
       <div class="interval baseInfoImg" *ngIf="baseInfo.businessLicenseImage">

src/app/pages/license/file-category/details-file-category/details-file-category.component.html

@@ -18,9 +18,9 @@
             <img *ngIf="data.imageUrl && getFileType(data.imageUrl) == 'img'" [src]="data.imageUrl"
                 (click)="viewImg(data.imageUrl)">
             <img *ngIf="data.imageUrl && getFileType(data.imageUrl) == 'word'"
-                src="../../../../assets/images/license/word.png" (click)="lookFile(data)">
+                src="assets/images/license/word.png" (click)="lookFile(data)">
             <img *ngIf="data.imageUrl && getFileType(data.imageUrl) == 'pdf'"
-                src="../../../../assets/images/license/pdf.png" (click)="lookFile(data)">
+                src="assets/images/license/pdf.png" (click)="lookFile(data)">
         </p>
         <div class="cutoffrule"></div>
         <p>说明: &nbsp;&nbsp;{{data.remark}}</p>

src/app/pages/license/file-category/edit-file-category/edit-file-category.component.html

@@ -27,8 +27,8 @@
         <div class="uploadDivbox">
             <div class="uploadDiv" style="margin-right: 12px;">
                 <img *ngIf="data2.imageUrl && getFileType(data2.imageUrl) == 'img'" style="width: 100%;height: 100%;cursor: pointer;" [src]="data2.imageUrl" (click)="viewImg(data2.imageUrl)">
-                <img *ngIf="data2.imageUrl && getFileType(data2.imageUrl) == 'word'" src="../../../../assets/images/license/word.png" (click)="lookFile(data2)">
+                <img *ngIf="data2.imageUrl && getFileType(data2.imageUrl) == 'word'" src="assets/images/license/word.png" (click)="lookFile(data2)">
-                <img *ngIf="data2.imageUrl && getFileType(data2.imageUrl) == 'pdf'" src="../../../../assets/images/license/pdf.png" (click)="lookFile(data2)">
+                <img *ngIf="data2.imageUrl && getFileType(data2.imageUrl) == 'pdf'" src="assets/images/license/pdf.png" (click)="lookFile(data2)">
 
                 <input *ngIf="!data2.imageUrl" (change)="filechange($event)" class="fileinput" type="file" name="" id="">
                 <button *ngIf="!data2.imageUrl" nz-button [nzLoading]="isLoadingSave"><i nz-icon nzType="upload" nzTheme="outline"></i>上传附件</button>

src/app/pages/license/file-category/file-category.component.html

@@ -30,8 +30,8 @@
                     </td>
                     <td>
                         <img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'img'" [src]="item.imageUrl" (click)="viewImg(item.imageUrl)">
-                        <img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'word'" src="../../../../assets/images/license/word.png" (click)="lookFile(item)">
+                        <img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'word'" src="assets/images/license/word.png" (click)="lookFile(item)">
-                        <img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'pdf'" src="../../../../assets/images/license/pdf.png" (click)="lookFile(item)">
+                        <img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'pdf'" src="assets/images/license/pdf.png" (click)="lookFile(item)">
                     </td>
                     <td class="operation">
                         <span class="blueColor" (click)="edit(item)">编辑</span>

src/app/pages/license/nav-bar/nav-bar.component.html

@@ -1,7 +1,7 @@
 <div class="license" id="license">
     <div class="title">
         <div class="titlebox">
-            <img src="../../../assets/images/logosm.png" alt="">
+            <img src="assets/images/logosm.png" alt="">
             <div class="nav">
                 <div class="navitem">
                     <span *ngFor="let item of menu" [ngClass]="{'grey': selectedItem != item}"

src/app/pages/license/update-category/details-update-category/details-update-category.component.html

@@ -30,27 +30,27 @@
             <img *ngIf="data.imageUrl && getFileType(data.imageUrl) == 'img'" [src]="data.imageUrl"
                 (click)="viewImg(data.imageUrl)">
             <img *ngIf="data.imageUrl && getFileType(data.imageUrl) == 'word'"
-                src="../../../../assets/images/license/word.png" (click)="lookFile(data.imageUrl)">
+                src="assets/images/license/word.png" (click)="lookFile(data.imageUrl)">
             <img *ngIf="data.imageUrl && getFileType(data.imageUrl) == 'pdf'"
-                src="../../../../assets/images/license/pdf.png" (click)="lookFile(data.imageUrl)">
+                src="assets/images/license/pdf.png" (click)="lookFile(data.imageUrl)">
         </p>
         <div class="cutoffrule"></div>
         <p *ngIf="data.hasAttachmentDefault && data.attachment">附件副本: &nbsp;&nbsp;
             <img *ngIf="data.attachment && getFileType(data.attachment) == 'img'" [src]="data.attachment"
                 (click)="viewImg(data.attachment)">
             <img *ngIf="data.attachment && getFileType(data.attachment) == 'word'"
-                src="../../../../assets/images/license/word.png" (click)="lookFile(data.attachment)">
+                src="assets/images/license/word.png" (click)="lookFile(data.attachment)">
             <img *ngIf="data.attachment && getFileType(data.attachment) == 'pdf'"
-                src="../../../../assets/images/license/pdf.png" (click)="lookFile(data.attachment)">
+                src="assets/images/license/pdf.png" (click)="lookFile(data.attachment)">
         </p>
         <div class="cutoffrule" *ngIf="data.hasAttachmentDefault && data.attachment"></div>
         <p *ngIf="data.yearlyCheckAttachment">年检更新附件: &nbsp;&nbsp;
             <img *ngIf="data.yearlyCheckAttachment && getFileType(data.yearlyCheckAttachment) == 'img'"
                 [src]="data.yearlyCheckAttachment" (click)="viewImg(data.yearlyCheckAttachment)">
             <img *ngIf="data.yearlyCheckAttachment && getFileType(data.yearlyCheckAttachment) == 'word'"
-                src="../../../../assets/images/license/word.png" (click)="lookFile(data.yearlyCheckAttachment)">
+                src="assets/images/license/word.png" (click)="lookFile(data.yearlyCheckAttachment)">
             <img *ngIf="data.yearlyCheckAttachment && getFileType(data.yearlyCheckAttachment) == 'pdf'"
-                src="../../../../assets/images/license/pdf.png" (click)="lookFile(data.yearlyCheckAttachment)">
+                src="assets/images/license/pdf.png" (click)="lookFile(data.yearlyCheckAttachment)">
         </p>
         <div *ngIf="data.yearlyCheckAttachment" class="cutoffrule"></div>
         <p *ngIf="data.yearlyCheckDescription">年检更新说明: &nbsp;&nbsp;{{data.yearlyCheckDescription || ''}}</p>

src/app/pages/license/update-category/edit-update-category/edit-update-category.component.html

@@ -47,9 +47,9 @@
                     style="width: 100%;height: 100%;cursor: pointer;" [src]="data2.imageUrl"
                     (click)="viewImg(data2.imageUrl)">
                 <img *ngIf="data2.imageUrl && getFileType(data2.imageUrl) == 'word'"
-                    src="../../../../assets/images/license/word.png" (click)="lookFile(data2.imageUrl)">
+                    src="assets/images/license/word.png" (click)="lookFile(data2.imageUrl)">
                 <img *ngIf="data2.imageUrl && getFileType(data2.imageUrl) == 'pdf'"
-                    src="../../../../assets/images/license/pdf.png" (click)="lookFile(data2.imageUrl)">
+                    src="assets/images/license/pdf.png" (click)="lookFile(data2.imageUrl)">
 
                 <input *ngIf="!data2.imageUrl" (change)="filechange($event,0)" class="fileinput" type="file" name=""
                     id="">
@@ -67,9 +67,9 @@
                     style="width: 100%;height: 100%;cursor: pointer;" [src]="data2.attachment"
                     (click)="viewImg(data2.attachment)">
                 <img *ngIf="data2.attachment && getFileType(data2.attachment) == 'word'"
-                    src="../../../../assets/images/license/word.png" (click)="lookFile(data2.attachment)">
+                    src="assets/images/license/word.png" (click)="lookFile(data2.attachment)">
                 <img *ngIf="data2.attachment && getFileType(data2.attachment) == 'pdf'"
-                    src="../../../../assets/images/license/pdf.png" (click)="lookFile(data2.attachment)">
+                    src="assets/images/license/pdf.png" (click)="lookFile(data2.attachment)">
 
                 <input *ngIf="!data2.attachment" (change)="filechange($event,1)" class="fileinput" type="file" name=""
                     id="">
@@ -96,10 +96,10 @@
                         style="width: 100%;height: 100%;cursor: pointer;" [src]="data2.yearlyCheckAttachment"
                         (click)="viewImg(data2.yearlyCheckAttachment)">
                     <img *ngIf="data2.yearlyCheckAttachment && getFileType(data2.yearlyCheckAttachment) == 'word'"
-                        src="../../../../assets/images/license/word.png"
+                        src="assets/images/license/word.png"
                         (click)="lookFile(data2.yearlyCheckAttachment)">
                     <img *ngIf="data2.yearlyCheckAttachment && getFileType(data2.yearlyCheckAttachment) == 'pdf'"
-                        src="../../../../assets/images/license/pdf.png" (click)="lookFile(data2.yearlyCheckAttachment)">
+                        src="assets/images/license/pdf.png" (click)="lookFile(data2.yearlyCheckAttachment)">
 
                     <input *ngIf="!data2.yearlyCheckAttachment" (change)="filechange($event,2)" class="fileinput"
                         type="file" name="" id="">

src/app/pages/license/update-category/update-category.component.html

@@ -62,25 +62,25 @@
                         <img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'img'" [src]="item.imageUrl"
                             (click)="viewImg(item.imageUrl)">
                         <img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'word'"
-                            src="../../../../assets/images/license/word.png" (click)="lookFile(item.imageUrl)">
+                            src="assets/images/license/word.png" (click)="lookFile(item.imageUrl)">
                         <img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'pdf'"
-                            src="../../../../assets/images/license/pdf.png" (click)="lookFile(item.imageUrl)">
+                            src="assets/images/license/pdf.png" (click)="lookFile(item.imageUrl)">
                         <label *ngIf="item.attachment && item.hasAttachmentDefault" style="margin-left: 10px;">
                             <img *ngIf="item.attachment && getFileType(item.attachment) == 'img'"
                                 [src]="item.attachment" (click)="viewImg(item.attachment)">
                             <img *ngIf="item.attachment && getFileType(item.attachment) == 'word'"
-                                src="../../../../assets/images/license/word.png" (click)="lookFile(item.attachment)">
+                                src="assets/images/license/word.png" (click)="lookFile(item.attachment)">
                             <img *ngIf="item.attachment && getFileType(item.attachment) == 'pdf'"
-                                src="../../../../assets/images/license/pdf.png" (click)="lookFile(item.attachment)">
+                                src="assets/images/license/pdf.png" (click)="lookFile(item.attachment)">
                         </label>
                         <label *ngIf="item.yearlyCheckAttachment" style="margin-left: 10px;">
                             <img *ngIf="item.yearlyCheckAttachment && getFileType(item.yearlyCheckAttachment) == 'img'"
                                 [src]="item.yearlyCheckAttachment" (click)="viewImg(item.yearlyCheckAttachment)">
                             <img *ngIf="item.yearlyCheckAttachment && getFileType(item.yearlyCheckAttachment) == 'word'"
-                                src="../../../../assets/images/license/word.png"
+                                src="assets/images/license/word.png"
                                 (click)="lookFile(item.yearlyCheckAttachment)">
                             <img *ngIf="item.yearlyCheckAttachment && getFileType(item.yearlyCheckAttachment) == 'pdf'"
-                                src="../../../../assets/images/license/pdf.png"
+                                src="assets/images/license/pdf.png"
                                 (click)="lookFile(item.yearlyCheckAttachment)">
                         </label>
                     </td>

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

@@ -707,7 +707,7 @@
           <button [nzLoading]="isLoadingSave" nz-button type="button" (click)="submitForm()"
             *ngIf="httpBody.auditStatus != 1">保存</button>
           <button (click)="exportExcel()" nz-button type="button"><img style="vertical-align: top;margin-right: 6px;"
-              src="../../../assets/images/excel.png" alt=""> 导出Excel</button>
+              src="assets/images/excel.png" alt=""> 导出Excel</button>
         </div>
       </form>
     </div>

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

@@ -19,48 +19,48 @@
                         ? (data[0]?.violateTime | date:"MM-dd HH:mm:ss") : '/'}}</span>
                     <div class="img" (click)="lookImg(data[0])"
                         [ngClass]="{'selectedimg': !data[0]?.violateImage}">
-                        <img [src]="data[0]?.violateImage ? data[0]?.violateImage : '../../../../assets/images/nopng.png'"
+                        <img [src]="data[0]?.violateImage ? data[0]?.violateImage : 'assets/images/nopng.png'"
                             alt="">
-                        <img *ngIf="!data[0]?.isCorrect" class="err" src="../../../../assets/images/err.png" alt="">
+                        <img *ngIf="!data[0]?.isCorrect" class="err" src="assets/images/err.png" alt="">
                     </div>
                     <span class="name" [ngClass]="{'isForceMake': data[0]?.isForceMake && isSuperAdmin}">油罐车进场</span>
                 </div>
-                <img class="rightArrow" src="../../../assets/images/rightArrow.png" alt="">
+                <img class="rightArrow" src="assets/images/rightArrow.png" alt="">
                 <div class="imgbox">
                     <span class="timespan" [ngClass]="{'timespanerr': !data[1]?.isCorrect}"><i nz-icon
                             nzType="clock-circle" nzTheme="outline"></i>{{data[1]?.violateTime
                         ? (data[1]?.violateTime | date:"MM-dd HH:mm:ss") : '/'}}</span>
                     <div class="img" (click)="lookImg(data[1])"
                         [ngClass]="{'selectedimg': !data[1]?.violateImage}">
-                        <img [src]="data[1]?.violateImage ? data[1]?.violateImage : '../../../../assets/images/nopng.png'"
+                        <img [src]="data[1]?.violateImage ? data[1]?.violateImage : 'assets/images/nopng.png'"
                             alt="">
-                        <img *ngIf="!data[1]?.isCorrect" class="err" src="../../../../assets/images/err.png" alt="">
+                        <img *ngIf="!data[1]?.isCorrect" class="err" src="assets/images/err.png" alt="">
                     </div>
                     <span class="name" [ngClass]="{'isForceMake': data[1]?.isForceMake && isSuperAdmin}">设置隔离区域</span>
                 </div>
-                <img class="rightArrow" src="../../../assets/images/rightArrow.png" alt="">
+                <img class="rightArrow" src="assets/images/rightArrow.png" alt="">
                 <div class="imgbox">
                     <span class="timespan" [ngClass]="{'timespanerr': !data[2]?.isCorrect}"><i nz-icon
                             nzType="clock-circle" nzTheme="outline"></i>{{data[2]?.violateTime
                         ? (data[2]?.violateTime | date:"MM-dd HH:mm:ss") : '/'}}</span>
                     <div class="img" (click)="lookImg(data[2])"
                         [ngClass]="{'selectedimg': !data[2]?.violateImage}">
-                        <img [src]="data[2]?.violateImage ? data[2]?.violateImage : '../../../../assets/images/nopng.png'"
+                        <img [src]="data[2]?.violateImage ? data[2]?.violateImage : 'assets/images/nopng.png'"
                             alt="">
-                        <img *ngIf="!data[2]?.isCorrect" class="err" src="../../../../assets/images/err.png" alt="">
+                        <img *ngIf="!data[2]?.isCorrect" class="err" src="assets/images/err.png" alt="">
                     </div>
                     <span class="name" [ngClass]="{'isForceMake': data[2]?.isForceMake && isSuperAdmin}">连接静电接地</span>
                 </div>
-                <img class="rightArrow" src="../../../assets/images/rightArrow.png" alt="">
+                <img class="rightArrow" src="assets/images/rightArrow.png" alt="">
                 <div class="imgbox">
                     <span class="timespan" [ngClass]="{'timespanerr': !data[3]?.isCorrect}"><i nz-icon
                             nzType="clock-circle" nzTheme="outline"></i>{{data[3]?.violateTime
                         ? (data[3]?.violateTime | date:"MM-dd HH:mm:ss") : '/'}}</span>
                     <div class="img" (click)="lookImg(data[3])"
                         [ngClass]="{'selectedimg': !data[3]?.violateImage}">
-                        <img [src]="data[3]?.violateImage ? data[3]?.violateImage : '../../../../assets/images/nopng.png'"
+                        <img [src]="data[3]?.violateImage ? data[3]?.violateImage : 'assets/images/nopng.png'"
                             alt="">
-                        <img *ngIf="!data[3]?.isCorrect" class="err" src="../../../../assets/images/err.png" alt="">
+                        <img *ngIf="!data[3]?.isCorrect" class="err" src="assets/images/err.png" alt="">
                     </div>
                     <span class="name" [ngClass]="{'isForceMake': data[3]?.isForceMake && isSuperAdmin}">放置消防器材</span>
                 </div>
@@ -68,7 +68,7 @@
         </div>
 
 
-        <img class="bottomArrow" src="../../../assets/images/bottomArrow.png" alt="">
+        <img class="bottomArrow" src="assets/images/bottomArrow.png" alt="">
 
 
         <div class="bottombox">
@@ -84,48 +84,48 @@
                             (data[4]?.violateTime | date:"MM-dd HH:mm:ss") : '/'}}</span>
                         <div class="img" (click)="lookImg(data[4])"
                             [ngClass]="{'selectedimg': !data[4]?.violateImage}">
-                            <img [src]="data[4]?.violateImage ? data[4]?.violateImage : '../../../../assets/images/nopng.png'"
+                            <img [src]="data[4]?.violateImage ? data[4]?.violateImage : 'assets/images/nopng.png'"
                                 alt="">
-                            <img *ngIf="!data[4]?.isCorrect" class="err" src="../../../../assets/images/err.png" alt="">
+                            <img *ngIf="!data[4]?.isCorrect" class="err" src="assets/images/err.png" alt="">
                         </div>
                         <span class="name" [ngClass]="{'isForceMake': data[4]?.isForceMake && isSuperAdmin}">连接卸油管</span>
                     </div>
-                    <img class="rightArrow" src="../../../assets/images/rightArrow.png" alt="">
+                    <img class="rightArrow" src="assets/images/rightArrow.png" alt="">
                     <div class="imgbox">
                         <span class="timespan" [ngClass]="{'timespanerr': !data[5]?.isCorrect}"><i nz-icon
                                 nzType="clock-circle" nzTheme="outline"></i>{{data[5]?.violateTime ?
                             (data[5]?.violateTime | date:"MM-dd HH:mm:ss") : '/'}}</span>
                         <div class="img" (click)="lookImg(data[5])"
                             [ngClass]="{'selectedimg': !data[5]?.violateImage}">
-                            <img [src]="data[5]?.violateImage ? data[5]?.violateImage : '../../../../assets/images/nopng.png'"
+                            <img [src]="data[5]?.violateImage ? data[5]?.violateImage : 'assets/images/nopng.png'"
                                 alt="">
-                            <img *ngIf="!data[5]?.isCorrect" class="err" src="../../../../assets/images/err.png" alt="">
+                            <img *ngIf="!data[5]?.isCorrect" class="err" src="assets/images/err.png" alt="">
                         </div>
                         <span class="name" [ngClass]="{'isForceMake': data[5]?.isForceMake && isSuperAdmin}">全程监卸</span>
                     </div>
-                    <img class="rightArrow" src="../../../assets/images/rightArrow.png" alt="">
+                    <img class="rightArrow" src="assets/images/rightArrow.png" alt="">
                     <div class="imgbox">
                         <span class="timespan" [ngClass]="{'timespanerr': !data[6]?.isCorrect}"><i nz-icon
                                 nzType="clock-circle" nzTheme="outline"></i>{{data[6]?.violateTime ?
                             (data[6]?.violateTime | date:"MM-dd HH:mm:ss") : '/'}}</span>
                         <div class="img" (click)="lookImg(data[6])"
                             [ngClass]="{'selectedimg': !data[6]?.violateImage}">
-                            <img [src]="data[6]?.violateImage ? data[6]?.violateImage : '../../../../assets/images/nopng.png'"
+                            <img [src]="data[6]?.violateImage ? data[6]?.violateImage : 'assets/images/nopng.png'"
                                 alt="">
-                            <img *ngIf="!data[6]?.isCorrect" class="err" src="../../../../assets/images/err.png" alt="">
+                            <img *ngIf="!data[6]?.isCorrect" class="err" src="assets/images/err.png" alt="">
                         </div>
                         <span class="name" [ngClass]="{'isForceMake': data[6]?.isForceMake && isSuperAdmin}">拆除卸油管</span>
                     </div>
-                    <img class="rightArrow" src="../../../assets/images/rightArrow.png" alt="">
+                    <img class="rightArrow" src="assets/images/rightArrow.png" alt="">
                     <div class="imgbox">
                         <span class="timespan" [ngClass]="{'timespanerr': !data[7]?.isCorrect}"><i nz-icon
                                 nzType="clock-circle" nzTheme="outline"></i>{{data[7]?.violateTime ?
                             (data[7]?.violateTime | date:"MM-dd HH:mm:ss") : '/'}}</span>
                         <div class="img" (click)="lookImg(data[7])"
                             [ngClass]="{'selectedimg': !data[7]?.violateImage}">
-                            <img [src]="data[7]?.violateImage ? data[7]?.violateImage : '../../../../assets/images/nopng.png'"
+                            <img [src]="data[7]?.violateImage ? data[7]?.violateImage : 'assets/images/nopng.png'"
                                 alt="">
-                            <img *ngIf="!data[7]?.isCorrect" class="err" src="../../../../assets/images/err.png" alt="">
+                            <img *ngIf="!data[7]?.isCorrect" class="err" src="assets/images/err.png" alt="">
                         </div>
                         <span class="name" [ngClass]="{'isForceMake': data[7]?.isForceMake && isSuperAdmin}">油罐车离场</span>
                     </div>

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

@@ -51,7 +51,7 @@
                     <td nzEllipsis [title]="item.stationName">
                         <div
                             style="width: 20px;height: 20px;display: inline-block;margin-left: 20px;margin-right: 6px;">
-                            <img src="../../../assets/images/3d.png" alt="" *ngIf="item.hasBuildingInfo">
+                            <img src="assets/images/3d.png" alt="" *ngIf="item.hasBuildingInfo">
                         </div>
                         {{item.stationName}}
                     </td>

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

@@ -10,19 +10,19 @@
         [nzTreeTemplate]="nzTreeTemplate" [nzMultiple]="false"></nz-tree>
       <ng-template #nzTreeTemplate let-node let-origin="origin">
         <ng-container *ngIf="node.origin.parentId == null; else elseTemplate">
-          <img style="vertical-align: bottom;" src="../../../assets/images/flower.png" alt="">
+          <img style="vertical-align: bottom;" src="assets/images/flower.png" alt="">
         </ng-container>
         <ng-template #elseTemplate>
-          <img src="../../../assets/images/point.png" alt="">
+          <img src="assets/images/point.png" alt="">
         </ng-template>
         <span>{{ node.title }}
           <span *ngIf="!node.origin.isGasStation">({{node.origin.products?node.origin.products.stationsCount
             :0}})</span>
         </span>
         <img (click)="expand($event,node)" *ngIf="node.isExpanded && node.children.length != 0 "
-          src="../../../assets/images/expand.png" alt="">
+          src="assets/images/expand.png" alt="">
         <img (click)="expand($event,node)" *ngIf="!node.isExpanded && node.children.length != 0"
-          src="../../../assets/images/unexpand.png" alt="">
+          src="assets/images/unexpand.png" alt="">
       </ng-template>
     </div>
     <nz-spin *ngIf="orSpin" nzSimple class="nzspin"></nz-spin>
@@ -30,7 +30,7 @@
   <div class="stationList">
     <div class="title">
       <div class="titlebox">
-        <img src="../../../assets/images/logosm.png" alt="">
+        <img src="assets/images/logosm.png" alt="">
         <div class="content">
           <div class="contentitem">
             <span class="grey" [ngClass]="{'selectedItem': selectedTab == 0}">油站管理</span>

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

@@ -17,21 +17,21 @@
       </ul>
     </nz-dropdown-menu>
     <div class="rightFence">
-      <img src="../../../assets/images/awningShow.png" [hidden]="!isOpenAwning" (click)="toggleHeaderAwning(false)">
+      <img src="assets/images/awningShow.png" [hidden]="!isOpenAwning" (click)="toggleHeaderAwning(false)">
-      <img src="../../../assets/images/awningHide.png" [hidden]="isOpenAwning" (click)="toggleHeaderAwning(true)">
+      <img src="assets/images/awningHide.png" [hidden]="isOpenAwning" (click)="toggleHeaderAwning(true)">
-      <img src="../../../assets/images/rangeFinding.png" title="测量距离" [hidden]="selectMeasure === 1"
+      <img src="assets/images/rangeFinding.png" title="测量距离" [hidden]="selectMeasure === 1"
         (click)="toggleMeasure(1)">
-      <img src="../../../assets/images/selectRangeFinding.png" title="测量距离" [hidden]="selectMeasure != 1"
+      <img src="assets/images/selectRangeFinding.png" title="测量距离" [hidden]="selectMeasure != 1"
         (click)="toggleMeasure(1)">
-      <img src="../../../assets/images/heightFinding.png" title="测量高度" [hidden]="selectMeasure === 2"
+      <img src="assets/images/heightFinding.png" title="测量高度" [hidden]="selectMeasure === 2"
         (click)="toggleMeasure(2)">
-      <img src="../../../assets/images/selectHeightFinding.png" title="测量高度" [hidden]="selectMeasure != 2"
+      <img src="assets/images/selectHeightFinding.png" title="测量高度" [hidden]="selectMeasure != 2"
         (click)="toggleMeasure(2)">
-      <img src="../../../assets/images/measuredArea.png" title="测量面积" [hidden]="selectMeasure === 3"
+      <img src="assets/images/measuredArea.png" title="测量面积" [hidden]="selectMeasure === 3"
         (click)="toggleMeasure(3)">
-      <img src="../../../assets/images/selectMeasuredArea.png" title="测量面积" [hidden]="selectMeasure != 3"
+      <img src="assets/images/selectMeasuredArea.png" title="测量面积" [hidden]="selectMeasure != 3"
         (click)="toggleMeasure(3)">
-      <img src="../../../assets/images/save3DPlan.png" title="保存" (click)="preserve(true)" *ngIf="editMode">
+      <img src="assets/images/save3DPlan.png" title="保存" (click)="preserve(true)" *ngIf="editMode">
     </div>
   </div>
 
@@ -139,7 +139,7 @@
             [disabled]="!editMode"></div>
         <div class="flowPower">
           <div>
-            <img src="../../../assets/images/flow.png">
+            <img src="assets/images/flow.png">
             <label>
               <p>流量</p>
               <p><input type="text" [(ngModel)]="beforeOnePropertyData.getPropertyData().flow" [disabled]="!editMode">
@@ -147,7 +147,7 @@
             </label>
           </div>
           <div>
-            <img src="../../../assets/images/power.png">
+            <img src="assets/images/power.png">
             <label>
               <p>功率</p>
               <p><input type="text" [(ngModel)]="beforeOnePropertyData.getPropertyData().power" [disabled]="!editMode">
@@ -243,7 +243,7 @@
           </div>
           <a href="javascript:;" class="bottomPlanUpload" *ngIf="editMode && !beforePlanNode.texture"><input type="file"
               accept="image/*" (change)='uploadImgVideo($event, false)'><img
-              src="../../../assets/images/uploadImg.png"></a>
+              src="assets/images/uploadImg.png"></a>
         </div>
         <div class="planHeaderVideo">
           <video [src]="beforePlanNode.video" [hidden]="!beforePlanNode.video"
@@ -255,7 +255,7 @@
           </div>
           <a href="javascript:;" class="bottomPlanUpload" style="width: 100px;"
             *ngIf="editMode && !beforePlanNode.video"><input type="file" accept=".mp4,.ogg,.webm"
-              (change)='uploadImgVideo($event, true)'><img src="../../../assets/images/uploadVideo.png"></a>
+              (change)='uploadImgVideo($event, true)'><img src="assets/images/uploadVideo.png"></a>
         </div>
       </div>
       <div style="height: 5px;"></div>
@@ -272,7 +272,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" nz-popconfirm nzPopconfirmTitle="切换节点后,没保存的信息将会丢失!"
+              <img src="assets/images/stepIcon.png" nz-popconfirm nzPopconfirmTitle="切换节点后,没保存的信息将会丢失!"
                 [nzCondition]="!editMode" (nzOnConfirm)="changePlanNode(key)">
               <div>
                 <nz-progress [nzShowInfo]="false" [nzPercent]="progressList[key]" nzStrokeColor="#1890FF"></nz-progress>

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

@@ -1,16 +1,16 @@
 <div class="recordsboxadmin" id="recordsboxadmin">
   <div class="content">
     <ng-container *ngIf="isEcharts; else elseTemplate">
-      <img (click)="isEchartsShow()" class="packup" src="../../../assets/images/packup.png" alt="">
+      <img (click)="isEchartsShow()" class="packup" src="assets/images/packup.png" alt="">
     </ng-container>
     <ng-template #elseTemplate>
-      <img (click)="isEchartsShow()" class="packup" src="../../../assets/images/packdown.png" alt="">
+      <img (click)="isEchartsShow()" class="packup" src="assets/images/packdown.png" alt="">
     </ng-template>
     <div class="chartsbox" [hidden]="!isEcharts">
       <div class="chart">
         <div class="leftbox" style="position: relative;">
           <span class="chartname">
-            <img src="../../../assets/images/flower.png" alt="">
+            <img src="assets/images/flower.png" alt="">
             预警类别统计
           </span>
           <div class="centerContent">
@@ -24,7 +24,7 @@
         </div>
         <div class="rightbox" style="position: relative;">
           <span class="chartname">
-            <img src="../../../assets/images/flower.png" alt="">
+            <img src="assets/images/flower.png" alt="">
             近30天预警统计
           </span>
           <div class="btnbox">
@@ -196,10 +196,10 @@
               {{key + 1}}
             </td>
             <td nzEllipsis [title]="item.locationName">
-              <img *ngIf="item.violation.level == 1" src="../../../assets/images/level1.png" alt="">
+              <img *ngIf="item.violation.level == 1" src="assets/images/level1.png" alt="">
-              <img *ngIf="item.violation.level == 2" src="../../../assets/images/level2.png" alt="">
+              <img *ngIf="item.violation.level == 2" src="assets/images/level2.png" alt="">
-              <img *ngIf="item.violation.level == 3" src="../../../assets/images/level3.png" alt="">
+              <img *ngIf="item.violation.level == 3" src="assets/images/level3.png" alt="">
-              <img *ngIf="item.violation.level == 4" src="../../../assets/images/level4.png" alt="">
+              <img *ngIf="item.violation.level == 4" src="assets/images/level4.png" alt="">
               <span *ngIf="item.violation.level == 1">Ⅰ级</span>
               <span *ngIf="item.violation.level == 2">Ⅱ级</span>
               <span *ngIf="item.violation.level == 3">Ⅲ级</span>

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

@@ -662,13 +662,6 @@ export class CriminalRecordsAdminComponent implements OnInit {
         params: params,
       })
       .subscribe((data: any) => {
-        data.result.items = data.result.items.filter((item) => {
-          return (
-            item.violation.violationType != "证照资质" ||
-            (item.violation.violationType == "证照资质" &&
-              item.gasStation.companyName.includes("延长"))
-          );
-        });
         this.list = this.list.concat(data.result.items);
         this.list = [...this.list];
         this.totalCount = data.result.totalCount;

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

@@ -2,16 +2,16 @@
 
   <div class="content">
     <ng-container *ngIf="isEcharts; else elseTemplate">
-      <img (click)="isEchartsShow()" class="packup" src="../../../assets/images/packup.png" alt="">
+      <img (click)="isEchartsShow()" class="packup" src="assets/images/packup.png" alt="">
     </ng-container>
     <ng-template #elseTemplate>
-      <img (click)="isEchartsShow()" class="packup" src="../../../assets/images/packdown.png" alt="">
+      <img (click)="isEchartsShow()" class="packup" src="assets/images/packdown.png" alt="">
     </ng-template>
     <div class="chartsbox" [hidden]="!isEcharts">
       <div class="chart">
         <div class="leftbox" style="position: relative;">
           <span class="chartname">
-            <img src="../../../assets/images/flower.png" alt="">
+            <img src="assets/images/flower.png" alt="">
             预警类别统计
           </span>
           <div class="centerContent">
@@ -25,7 +25,7 @@
         </div>
         <div class="rightbox" style="position: relative;">
           <span class="chartname">
-            <img src="../../../assets/images/flower.png" alt="">
+            <img src="assets/images/flower.png" alt="">
             近30天预警统计
           </span>
           <div class="btnbox">
@@ -168,10 +168,10 @@
               {{key + 1}}
             </td>
             <td nzEllipsis [title]="item.locationName">
-              <img *ngIf="item.violation.level == 1" src="../../../assets/images/level1.png" alt="">
+              <img *ngIf="item.violation.level == 1" src="assets/images/level1.png" alt="">
-              <img *ngIf="item.violation.level == 2" src="../../../assets/images/level2.png" alt="">
+              <img *ngIf="item.violation.level == 2" src="assets/images/level2.png" alt="">
-              <img *ngIf="item.violation.level == 3" src="../../../assets/images/level3.png" alt="">
+              <img *ngIf="item.violation.level == 3" src="assets/images/level3.png" alt="">
-              <img *ngIf="item.violation.level == 4" src="../../../assets/images/level4.png" alt="">
+              <img *ngIf="item.violation.level == 4" src="assets/images/level4.png" alt="">
               <span *ngIf="item.violation.level == 1">Ⅰ级</span>
               <span *ngIf="item.violation.level == 2">Ⅱ级</span>
               <span *ngIf="item.violation.level == 3">Ⅲ级</span>

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

@@ -2,16 +2,16 @@
 
     <div class="content">
         <ng-container *ngIf="isEcharts; else elseTemplate">
-            <img (click)="isEchartsShow()" class="packup" src="../../../assets/images/packup.png" alt="">
+            <img (click)="isEchartsShow()" class="packup" src="assets/images/packup.png" alt="">
         </ng-container>
         <ng-template #elseTemplate>
-            <img (click)="isEchartsShow()" class="packup" src="../../../assets/images/packdown.png" alt="">
+            <img (click)="isEchartsShow()" class="packup" src="assets/images/packdown.png" alt="">
         </ng-template>
         <div class="chartsbox" [hidden]="!isEcharts">
             <div class="chart">
                 <div class="leftbox" style="position: relative;">
                     <span class="chartname">
-                        <img src="../../../assets/images/flower.png" alt="">
+                        <img src="assets/images/flower.png" alt="">
                         卸油预警统计
                     </span>
                     <div class="centerContent">
@@ -26,7 +26,7 @@
                 </div>
                 <div class="rightbox" style="position: relative;">
                     <span class="chartname">
-                        <img src="../../../assets/images/flower.png" alt="">
+                        <img src="assets/images/flower.png" alt="">
                         近30天卸油作业走势
                     </span>
                     <div class="barchart" id="barchart">

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

@@ -1,7 +1,7 @@
 <div class="box">
     <div class="title">
         <div class="titlebox">
-            <img src="../../../assets/images/logosm.png" alt="">
+            <img src="assets/images/logosm.png" alt="">
             <div class="content">
                 <div class="contentitem">
                     <span (click)="selectMenu(item)" *ngFor="let item of menu"

src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html

@@ -1,16 +1,16 @@
 <div class="recordsbox" id="recordsbox">
     <div class="content">
         <ng-container *ngIf="isEcharts; else elseTemplate">
-            <img (click)="isEchartsShow()" class="packup" src="../../../assets/images/packup.png" alt="">
+            <img (click)="isEchartsShow()" class="packup" src="assets/images/packup.png" alt="">
         </ng-container>
         <ng-template #elseTemplate>
-            <img (click)="isEchartsShow()" class="packup" src="../../../assets/images/packdown.png" alt="">
+            <img (click)="isEchartsShow()" class="packup" src="assets/images/packdown.png" alt="">
         </ng-template>
         <div class="chartsbox" [hidden]="!isEcharts">
             <div class="chart">
                 <div class="leftbox" style="position: relative;">
                     <span class="chartname">
-                        <img src="../../../assets/images/flower.png" alt="">
+                        <img src="assets/images/flower.png" alt="">
                         预警统计
                     </span>
                     <div class="centerContent">
@@ -24,7 +24,7 @@
                 </div>
                 <div class="rightbox" style="position: relative;">
                     <span class="chartname">
-                        <img src="../../../assets/images/flower.png" alt="">
+                        <img src="assets/images/flower.png" alt="">
                         近30天预警走势
                     </span>
                     <div class="barchart" id="barchart">

src/app/pages/register/register.component.html

@@ -83,7 +83,7 @@
               <div class="contactUs">
                 <label
                   style="font-size: 14px; text-align: center; width: 100%; display: block; color: #fff;">安信科创QQ号</label>
-                <img src="../../../assets/images/AnXinQQ.jpg">
+                <img src="assets/images/AnXinQQ.jpg">
               </div>
             </a>
           </div>

src/app/pages/register/register.component.scss

@@ -1,7 +1,7 @@
 .login {
   width: 100%;
   height: 100%;
-  // background: url('../../../assets/images/caiji.jpg');
+  // background: url('assets/images/caiji.jpg');
   background-size:100% 100%;
 }
 .loginBox {

src/app/pages/singlelogin/singlelogin.component.html

@@ -0,0 +1,121 @@
+<!-- <nz-modal nzWidth="1300px" [(nzVisible)]="isVisible" nzMaskClosable="false" nzTitle="请绑定用户"
+    (nzOnCancel)="handleCancel()" (nzOnOk)="handleOk()" :nzFooter=" " nzClosable="false" nzKeyboard="false">
+    <ng-container *nzModalContent>
+        <div class="userBox">
+            <div class="orbox">
+                <div class="topbox2">
+                    <div class="lefttop">
+                        组织机构
+                    </div>
+                    <div class="righttop">
+                        <nz-input-group nzPrefixIcon="search">
+                            <input type="text" nz-input placeholder="请输入机构名称" [(ngModel)]="searchValue" />
+                        </nz-input-group>
+                    </div>
+                </div>
+
+                <div class="treeTitle">
+                    <span>组织机构</span>
+                    <label nz-checkbox [(ngModel)]="IsContainsChildren"
+                        (ngModelChange)="getAllOrganization()">包含子节点</label>
+                </div>
+                <div class="treebox">
+                    <nz-tree [nzSearchValue]="searchValue" #nzTreeComponent [nzData]="nodes"
+                        [nzExpandedKeys]="defaultExpandedKeys" [nzSelectedKeys]='nzSelectedKeys'
+                        (nzClick)="nzClick($event)" [nzExpandedIcon]="multiExpandedIconTpl" [nzHideUnMatched]="true"
+                        [nzTreeTemplate]="nzTreeTemplate">
+                    </nz-tree>
+                    <ng-template #nzTreeTemplate let-node let-origin="origin">
+                        <div class="nodebox">
+                            <span class="name">{{ node.title }}</span>
+                            <span class="name">({{node.origin.products? node.origin.products.usersCount : 0}})</span>
+                        </div>
+                    </ng-template>
+                    <ng-template #multiExpandedIconTpl let-node let-origin="origin">
+                        <ng-container *ngIf="node.children.length == 0; else elseTemplate">
+
+                        </ng-container>
+
+                        <ng-template #elseTemplate>
+                            <i nz-icon [nzType]="node.isExpanded ? 'caret-down' : 'caret-right'"
+                                class="ant-tree-switcher-line-icon"></i>
+                        </ng-template>
+                    </ng-template>
+                </div>
+
+            </div>
+            <div class="box">
+                <div class="topbox">
+                    <div class="lefttop">
+                        <span>用户列表</span>
+                        <span><i nz-icon nzType="search"></i> {{usersNum}}名用户</span>
+                    </div>
+                    <div class="righttop">
+                        <form nz-form [formGroup]="validateForm" (ngSubmit)="submitForm()">
+                            <nz-form-item>
+                                <nz-form-control>
+                                    <nz-input-group nzPrefixIcon="search">
+                                        <input type="text" nz-input placeholder="请输入用户名" formControlName="search" />
+                                    </nz-input-group>
+                                </nz-form-control>
+                                <button style="display: none;" type="submit"></button>
+                            </nz-form-item>
+                        </form>
+
+                    </div>
+                </div>
+                <div class="tablebox" #tablebox>
+                    <nz-table #basicTable [nzLoading]="loading" [nzData]="usersLIst" [nzShowPagination]='false'
+                        [nzPageSize]='16'>
+                        <thead>
+                            <tr>
+                                <th></th>
+                                <th>账号</th>
+                                <th>姓名</th>
+                                <th>角色/预警接收级别</th>
+                                <th [width]="'13%'">所属机构</th>
+                                <th [width]="'8%'">用户状态</th>
+                                <th [width]="'8%'">备注</th>
+                                <th [width]="'10%'">操作</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr *ngFor="let data of basicTable.data">
+                                <td><img src="assets/images/user.png" alt=""></td>
+                                <td>{{ data.userName }}</td>
+                                <td>{{ data.name }}</td>
+                                <td nzBreakWord>
+                                    <span style="margin-right: 8px;"
+                                        *ngFor="let item of data.roleDisplayNames">{{item}}</span>
+                                </td>
+                                <td>
+                                    {{data.organizationName}}
+                                </td>
+                                <td>
+                                    <ng-container *ngIf="data.isActive; else elseTemplate">
+                                        <span class="greenColor2">已启用</span>
+                                    </ng-container>
+                                    <ng-template #elseTemplate>
+                                        <span class="redColor">已停用</span>
+                                    </ng-template>
+                                </td>
+                                <td>
+                                    {{data.note}}
+                                </td>
+                                <td class="operation">
+                                   <span class="blue">绑定</span>
+                                </td>
+                            </tr>
+                        </tbody>
+                    </nz-table>
+                </div>
+                <div class="pagination">
+                    <nz-pagination [nzHideOnSinglePage]="false" [nzPageIndex]="1" [nzTotal]="usersNum" [nzPageSize]="16"
+                        [nzShowTotal]="totalTemplate" nzShowQuickJumper (nzPageIndexChange)="pageChange($event)">
+                    </nz-pagination>
+                    <ng-template #totalTemplate let-total> 16条/页,共{{usersNum}}条 </ng-template>
+                </div>
+            </div>
+        </div>
+    </ng-container>
+</nz-modal> -->

src/app/pages/singlelogin/singlelogin.component.scss

@@ -0,0 +1,234 @@
+.userBox {
+  width: 100%;
+  height: 100%;
+  min-height: 600px;
+  background: #ffffff;
+  box-sizing: border-box;
+  padding: 20px;
+  overflow: hidden;
+  display: flex;
+  position: relative;
+
+  .treebox {
+    display: flex;
+    flex: 1;
+    overflow: auto;
+    flex-direction: column;
+    box-sizing: border-box;
+    padding: 10px 0;
+  }
+
+  .check {
+    width: 100%;
+    float: right;
+  }
+
+  .topbox2 {
+    width: 100%;
+    height: 36px;
+    display: flex;
+    align-items: center;
+    margin-top: 20px;
+
+    .lefttop {
+      height: 36px;
+      line-height: 36px;
+      color: #000;
+      margin-right: 10px;
+      font-size: 15px;
+    }
+
+    .righttop {
+      flex: 1;
+      height: 36px;
+      display: flex;
+
+      nz-input-group {
+        height: 36px;
+      }
+    }
+  }
+
+  .orbox {
+    width: 260px;
+    min-width: 250px;
+    overflow-y: auto;
+    margin-right: 10px;
+    display: flex;
+    flex-direction: column;
+  }
+
+  .treeTitle {
+    width: 100%;
+    height: 55px;
+    line-height: 55px;
+    margin-top: 12px;
+    display: flex;
+    justify-content: space-between;
+    color: #000d21;
+    box-sizing: border-box;
+    padding: 0 10px;
+    background: rgba(145, 204, 255, 0.2);
+    border: 1px solid rgba(145, 204, 255, 0.2);
+
+    span {
+      font-size: 14px;
+    }
+
+    div {
+      flex: 1;
+      width: 100px;
+      margin-left: 55px;
+    }
+  }
+
+  .nodebox {
+    display: flex;
+    justify-content: space-between;
+  }
+
+  tbody {
+    tr {
+      td:nth-child(1) {
+        text-align: right;
+      }
+    }
+
+    .operation {
+      i {
+        cursor: pointer;
+        margin-right: 8px;
+      }
+    }
+  }
+}
+
+.box {
+  flex: 1;
+  // overflow: auto;
+  padding-top: 20px;
+  overflow-y: auto;
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+
+.topbox {
+  width: 100%;
+  height: 36px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 12px;
+
+  .lefttop {
+    span:nth-child(1) {
+      color: #000d21;
+      margin-right: 16px;
+    }
+
+    span:nth-child(2) {
+      color: rgba(36, 36, 36, 0.24);
+    }
+  }
+
+  .righttop {
+    display: flex;
+
+    button {
+      margin-left: 16px;
+    }
+
+    nz-input-group {
+      height: 32px;
+    }
+  }
+}
+
+.tablebox {
+  flex: 1;
+  overflow-y: auto;
+  overflow: auto;
+}
+
+.pagination {
+  margin: 15px 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.ortype {
+  width: 36px;
+  height: 20px;
+  background: #2399ff;
+  opacity: 1;
+  border-radius: 2px;
+  font-size: 12px;
+  margin-right: 8px;
+  color: #fff;
+  text-align: center;
+}
+
+.resetPasswordContent {
+  z-index: 999;
+  width: 380px;
+  height: 138px;
+  position: absolute;
+  left: 30%;
+  top: 30%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  box-sizing: border-box;
+  padding-left: 40px;
+  color: #000;
+  border-radius: 5px;
+  border-radius: 2px;
+  box-shadow: 0 3px 6px -4px rgb(0 0 0 / 12%), 0 6px 16px 0 rgb(0 0 0 / 8%),
+    0 9px 28px 8px rgb(0 0 0 / 5%);
+  background: #fff;
+
+  .titlebox {
+    display: flex;
+    align-items: center;
+    position: relative;
+
+    span {
+      font-size: 18px;
+      font-weight: 600;
+    }
+
+    i {
+      font-size: 26px;
+      margin-right: 6px;
+    }
+
+    .close {
+      position: absolute;
+      right: 2px;
+      top: -22px;
+      font-size: 16px;
+      cursor: pointer;
+    }
+
+    .move {
+      position: absolute;
+      left: -32px;
+      top: -22px;
+      cursor: move;
+    }
+  }
+
+  .message {
+    margin-top: 20px;
+
+    i {
+      cursor: pointer;
+    }
+
+    i:hover {
+      color: #18bb18;
+    }
+  }
+}

src/app/pages/singlelogin/singlelogin.component.ts

@@ -25,6 +25,11 @@ export class SingleloginComponent implements OnInit {
   async ngOnInit(): Promise<void> {
     console.log("查询参数", this.route.snapshot.queryParams.page);
     this.pageType = this.route.snapshot.queryParams.page;
+    // let obj = {
+    //   SAG_USER_TOKEN:
+    //     "hrtwsc5737z6LYr67e2e0PvinLXvo0Pk8ffAp8qxOLXt9CtSLGg61cZv9IDjKybQ%3D%3D",
+    // };
+    // this.setCookie(obj);
 
     let token = this.getCookie("SAG_USER_TOKEN");
     if (!token) {
@@ -123,48 +128,48 @@ export class SingleloginComponent implements OnInit {
     });
   }
 
-  downloadAsTxt(obj) {
+  //确认中化是否绑定了我们的用户
-    // 将对象转换为 JSON 字符串
+  // getSinochemUsers(Keyword) {
-    const jsonString = JSON.stringify(obj, null, 2);
+  //   return new Promise<void>((resolve, reject) => {
-
+  //     this.http
-    // 创建 Blob 对象
+  //       .get("/api/services/app/User/GetSinochemUsers", {
-    const blob = new Blob([jsonString], { type: "text/plain" });
+  //         params: {
-
+  //           Keyword: Keyword,
-    // 创建下载链接
+  //         },
-    const link = document.createElement("a");
+  //       })
-    link.href = URL.createObjectURL(blob);
+  //       .subscribe(
-    link.download = "错误参数.txt"; // 文件名为 data.txt
+  //         (data: any) => {
-    link.click(); // 触发下载
+  //           console.log("中化用户信息", data);
-    // 释放 URL 对象
+  //           resolve(data);
-    URL.revokeObjectURL(link.href);
+  //         },
-  }
+  //         (err) => {
+  //           reject();
+  //         }
+  //       );
+  //   });
+  // }
 
   //中化用户登录获得自己的token信息
   SinochemLogin() {
     return new Promise<void>((resolve, reject) => {
       this.CurrentUserInfo.data.userId = this.CurrentUserInfo.data.id;
       delete this.CurrentUserInfo.data.id;
-      delete this.CurrentUserInfo.data.permissions;
       let body = {
         user: this.CurrentUserInfo.data,
         org: this.AuthOrganInfos.data[0],
         sinochemOrgs: this.AuthOrganInfos.data,
-        userDetail: JSON.stringify(this.CurrentUserInfo.data),
       };
       this.http.post("/api/TokenAuth/SinochemLogin", body).subscribe(
         (data: any) => {
-          sessionStorage.setItem("isZT", "true");
           if (this.pageType == "ai") {
             this.enterPage(data);
-          } else if (this.pageType == "comprehensive") {
-            this.enterComprehensive(data);
           } else {
             this.enterPageSystem(data);
           }
+
           resolve();
         },
         (err) => {
-          this.downloadAsTxt(body);
           alert(err?.error?.error?.message || "SinochemLogin接口请求失败");
           reject();
         }
@@ -261,7 +266,7 @@ export class SingleloginComponent implements OnInit {
             "userdataOfgasstation",
             JSON.stringify(data.result.user)
           );
-
+          sessionStorage.setItem("isZT", "true");
           if (data.result.user.menus.length == 0) {
             alert("当前用户未分配菜单");
             return;
@@ -293,30 +298,6 @@ export class SingleloginComponent implements OnInit {
         }
       );
   }
-  enterComprehensive(tokenData) {
-    sessionStorage.setItem("token", tokenData.result.accessToken);
-    sessionStorage.setItem(
-      "encryptedAccessToken",
-      tokenData.result.encryptedAccessToken
-    );
-    this.http
-      .get("/api/services/app/Session/GetCurrentLoginInformations")
-      .subscribe(
-        async (data: any) => {
-          sessionStorage.setItem("userdata", JSON.stringify(data.result.user));
-          sessionStorage.setItem(
-            "userdataOfgasstation",
-            JSON.stringify(data.result.user)
-          );
-          //跳转页面
-          sessionStorage.setItem("isGasStation", "false");
-          this.router.navigate(["/comprehensive"]);
-        },
-        (err) => {
-          alert("获取用户信息错误");
-        }
-      );
-  }
 
   menu1 = [
     { name: "首页", url: "/homepage" },

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

@@ -2,7 +2,7 @@
   <div class="title">
     <app-title [name]="'当日预警事件列表'"></app-title>
     <div class="warningnumber">
-      <img src="../../../assets/images/warningnum.png" alt="">
+      <img src="assets/images/warningnum.png" alt="">
       <span class="today">今日预警</span>
       <span class="num">{{totalCount}}</span>
     </div>
@@ -166,17 +166,17 @@
     <div nz-row class="listitem" *ngFor="let item of list">
       <div nz-col nzSpan="2" class="imgbox">
         <span *ngIf="item.violation.violationType == '卸油作业检查'">
-          <img src="../../../assets/images/warning2.png">
+          <img src="assets/images/warning2.png">
         </span>
         <span
           *ngIf="item.violation.violationType != '卸油作业检查' && item.violation.violationType != '证照资质' && item.violation.violationType != '设备监测' ">
-          <img src=" ../../../assets/images/warning1.png">
+          <img src=" assets/images/warning1.png">
         </span>
         <span *ngIf="item.violation.violationType === '证照资质'">
-          <img src="../../../assets/images/warning3.png">
+          <img src="assets/images/warning3.png">
         </span>
         <span *ngIf="item.violation.violationType === '设备监测'">
-          <img src="../../../assets/images/warning3.png">
+          <img src="assets/images/warning3.png">
         </span>
         <span *ngIf="item.violation.level == 1">
           Ⅰ级

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

@@ -287,13 +287,6 @@ export class TodayWarningAdminComponent implements OnInit {
         params: params,
       })
       .subscribe((data: any) => {
-        data.result.items = data.result.items.filter((item) => {
-          return (
-            item.violation.violationType != "证照资质" ||
-            (item.violation.violationType == "证照资质" &&
-              item.gasStation.companyName.includes("延长"))
-          );
-        });
         this.list = data.result.items;
         this.totalCount = data.result.totalCount;
         console.log("预警列表", this.list);

src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts

@@ -74,7 +74,6 @@ export class GetOutOfLineDetailsComponent implements OnInit {
     { id: 22, name: "山西高速工装", color: "red" },
   ];
   userName; //登录账号的用户名
-  name; //登录账号的真实名
   isShowAxOtherRegion; //控制哪些用户可以看到ax全部
 
   isCarStop = false;
@@ -84,7 +83,6 @@ export class GetOutOfLineDetailsComponent implements OnInit {
     console.log("传进来的信息", this.data);
     // 安信框选
     this.userName = JSON.parse(sessionStorage.getItem("userdata")).userName;
-    this.name = JSON.parse(sessionStorage.getItem("userdata")).name;
     if (this.userName === "admin" || this.userName === "superadmin") {
       this.isShowAxOtherRegion = true;
     } else {
@@ -470,7 +468,6 @@ export class GetOutOfLineDetailsComponent implements OnInit {
         this.message.create("success", "处置成功!");
         this.data.handleTime = new Date();
         this.data.handleStateStr = "已处置";
-        this.data.handleUserName = this.name;
         this.data.handleRecord = this.content;
       });
   }

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

@@ -2,7 +2,7 @@
   <div class="title">
     <app-title [name]="'当日预警事件列表'"></app-title>
     <div class="warningnumber">
-      <img src="../../../assets/images/warningnum.png" alt="">
+      <img src="assets/images/warningnum.png" alt="">
       <span class="today">今日预警</span>
       <span class="num">{{totalCount}}</span>
     </div>
@@ -135,17 +135,17 @@
     <div nz-row class="listitem" *ngFor="let item of list">
       <div nz-col nzSpan="3" class="imgbox">
         <span *ngIf="item.violation.violationType == '卸油作业检查'">
-          <img src="../../../assets/images/warning2.png">
+          <img src="assets/images/warning2.png">
         </span>
         <span
           *ngIf="item.violation.violationType != '卸油作业检查' && item.violation.violationType != '证照资质' && item.violation.violationType != '设备监测' ">
-          <img src=" ../../../assets/images/warning1.png">
+          <img src=" assets/images/warning1.png">
         </span>
         <span *ngIf="item.violation.violationType === '证照资质'">
-          <img src="../../../assets/images/warning3.png">
+          <img src="assets/images/warning3.png">
         </span>
         <span *ngIf="item.violation.violationType === '设备监测'">
-          <img src="../../../assets/images/warning3.png">
+          <img src="assets/images/warning3.png">
         </span>
         <span *ngIf="item.violation.level == 1">
           Ⅰ级

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

@@ -230,13 +230,6 @@ export class TodayWarningComponent implements OnInit {
         params: params,
       })
       .subscribe((data: any) => {
-        data.result.items = data.result.items.filter((item) => {
-          return (
-            item.violation.violationType != "证照资质" ||
-            (item.violation.violationType == "证照资质" &&
-              item.gasStation.companyName.includes("延长"))
-          );
-        });
         this.list = data.result.items;
         this.totalCount = data.result.totalCount;
         console.log("预警列表", this.list);

src/app/system-management/algorithm-config/algorithm-config.component.html

@@ -63,18 +63,18 @@
                             || (key == hoverKey && k <= hoverK),'dataItemLevek':level === 1}">
                             <div class="hover">
                                 <div class="on" (click)="change(i,false)">
-                                    <img src="../../../assets/images/icon/on.png" alt="">
+                                    <img src="assets/images/icon/on.png" alt="">
                                 </div>
                                 <div class="off" (click)="change(i,true)">
-                                    <img src="../../../assets/images/icon/off.png" alt="">
+                                    <img src="assets/images/icon/off.png" alt="">
                                 </div>
                             </div>
                             <div class="item">
                                 <ng-container *ngIf="i.disabled; else elseTemplate">
-                                    <img src="../../../assets/images/icon/off.png" alt="">
+                                    <img src="assets/images/icon/off.png" alt="">
                                 </ng-container>
                                 <ng-template #elseTemplate>
-                                    <img src="../../../assets/images/icon/on.png" alt="">
+                                    <img src="assets/images/icon/on.png" alt="">
                                 </ng-template>
                             </div>
 

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

@@ -2,7 +2,7 @@
     <div class="topbox">
       <div class="lefttop">
         <span>菜单列表</span>
-        <span><img style="vertical-align: top;" src="../../../assets/images/icon/orgrey.png" alt="">
+        <span><img style="vertical-align: top;" src="assets/images/icon/orgrey.png" alt="">
           {{totalCount}}个</span>
       </div>
       <div class="righttop">

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

@@ -2,15 +2,15 @@
 <nz-layout>
   <nz-sider [nzWidth]='220'>
     <div class="logo">
-      <img *ngIf="isProd" style="width: 154px;" src="../../../assets/images/logo2.png" alt="">
+      <img *ngIf="isProd" style="width: 154px;" src="assets/images/logo2.png" alt="">
     </div>
     <div class="headPortrait">
       <div class="photograph">
-        <img src="../../../assets/images/userbig.png" alt="">
+        <img src="assets/images/userbig.png" alt="">
       </div>
       <!-- <span>Administrator</span> -->
       <span class="namebox">
-        <img src="../../../assets/images/icon/admin.png" alt="">
+        <img src="assets/images/icon/admin.png" alt="">
         <span class="name">{{name}}</span>
       </span>
     </div>
@@ -25,7 +25,7 @@
   <nz-layout>
     <nz-header>
       <span>Hey,欢迎登录加油站智能安全管理系统</span>
-      <a nz-dropdown [nzDropdownMenu]="menu" [nzTrigger]="'click'" [nzBackdrop]='false' *ngIf="isZT ==='false'">
+      <a nz-dropdown [nzDropdownMenu]="menu" [nzTrigger]="'click'" [nzBackdrop]='false'>
         <i nz-icon nzType="setting"></i>
       </a>
       <nz-dropdown-menu #menu="nzDropdownMenu">

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

@@ -9,7 +9,6 @@ import { PatternService } from "src/app/service/pattern.service";
 })
 export class NavigationComponent implements OnInit {
   constructor(private router: Router, private patternService: PatternService) {}
-  isZT = sessionStorage.getItem("isZT") || "false";
   userMenu = [];
   menu = [];
   tap = [];
@@ -26,57 +25,57 @@ export class NavigationComponent implements OnInit {
     {
       name: "组织机构管理",
       url: "/system/organization",
-      img: "../../../assets/images/icon/organization.png",
+      img: "assets/images/icon/organization.png",
     },
     {
       name: "用户管理",
       url: "/system/user",
-      img: "../../../assets/images/icon/user.png",
+      img: "assets/images/icon/user.png",
     },
     {
       name: "角色管理",
       url: "/system/role",
-      img: "../../../assets/images/icon/role.png",
+      img: "assets/images/icon/role.png",
     },
     {
       name: "分析主机管理",
       url: "/system/host",
-      img: "../../../assets/images/icon/host.png",
+      img: "assets/images/icon/host.png",
     },
     {
       name: "推送管理",
       url: "/system/push",
-      img: "../../../assets/images/icon/push.png",
+      img: "assets/images/icon/push.png",
     },
     {
       name: "经营类证照管理",
       url: "/system/updateOfLicense",
-      img: "../../../assets/images/icon/license.png",
+      img: "assets/images/icon/license.png",
     },
     {
       name: "资产类证照管理",
       url: "/system/fileOfLicense",
-      img: "../../../assets/images/icon/license.png",
+      img: "assets/images/icon/license.png",
     },
     {
       name: "菜单管理",
       url: "/system/menu",
-      img: "../../../assets/images/icon/license.png",
+      img: "assets/images/icon/license.png",
     },
     {
       name: "算法配置管理",
       url: "/system/algorithm",
-      img: "../../../assets/images/icon/license.png",
+      img: "assets/images/icon/license.png",
     },
     {
       name: "中台用户绑定",
       url: "/system/userbinding",
-      img: "../../../assets/images/icon/license.png",
+      img: "assets/images/icon/license.png",
     },
     {
       name: "中台机构绑定",
       url: "/system/orbinding",
-      img: "../../../assets/images/icon/license.png",
+      img: "assets/images/icon/license.png",
     },
   ];
 

src/app/system-management/organization/change-or/change-or.component.html

@@ -1,4 +0,0 @@
-<div class="box">
-    <nz-tree #nzTreeComponent [nzSelectedKeys]="defaultSelectedKeys" [nzData]="nodes"
-        [nzExpandedKeys]="defaultExpandedKeys"></nz-tree>
-</div>

src/app/system-management/organization/change-or/change-or.component.scss

@@ -1,5 +0,0 @@
-.box {
-    max-height: 500px;
-    overflow-y: auto;
-  }
-  

src/app/system-management/organization/change-or/change-or.component.ts

@@ -1,55 +0,0 @@
-import { Component, Input, OnInit, ViewChild } from "@angular/core";
-import { NzModalRef } from "ng-zorro-antd/modal";
-import { FormBuilder, FormGroup, Validators } from "@angular/forms";
-import { HttpClient } from "@angular/common/http";
-import { TreeService } from "src/app/service/tree.service";
-import { NzTreeComponent } from "ng-zorro-antd/tree";
-
-@Component({
-  selector: "app-change-or",
-  templateUrl: "./change-or.component.html",
-  styleUrls: ["./change-or.component.scss"],
-})
-export class ChangeOrComponent implements OnInit {
-  @Input() data?: any;
-  @ViewChild("nzTreeComponent", { static: false })
-  nzTreeComponent!: NzTreeComponent;
-  constructor(
-    private modal: NzModalRef,
-    private fb: FormBuilder,
-    private http: HttpClient,
-    private toTree: TreeService
-  ) {}
-
-  defaultExpandedKeys = [];
-  defaultSelectedKeys = [];
-  ngOnInit(): void {
-    this.getAllOrganization();
-    // this.nzTreeComponent.getCheckedNodeList()
-  }
-
-  allOrList: any;
-  nodes: any;
-  getAllOrganization() {
-    let params = {
-      IsContainsChildren: "true",
-    };
-    this.http
-      .get("/api/services/app/Organization/GetAll", {
-        params: params,
-      })
-      .subscribe((data: any) => {
-        console.log(data);
-        data.result.items.forEach((element) => {
-          element.key = element.id;
-          element.title = element.displayName;
-        });
-        this.allOrList = data.result.items.filter((v) => !v.isGasStation);
-        this.nodes = [...this.toTree.toTree(this.allOrList)];
-      });
-  }
-
-  destroyModal(): void {
-    this.modal.destroy({ data: "this the result data" });
-  }
-}

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

@@ -5,7 +5,7 @@
   <div class="topbox">
     <div class="lefttop">
       <span>组织机构列表</span>
-      <span><img style="vertical-align: top;" src="../../../assets/images/icon/orgrey.png" alt="">
+      <span><img style="vertical-align: top;" src="assets/images/icon/orgrey.png" alt="">
         {{totalCount}}个单位</span>
     </div>
     <div class="righttop">
@@ -21,8 +21,8 @@
     <span>操作</span>
   </div>
   <nz-tree [nzHideUnMatched]='true' [nzSearchValue]="searchValue" #nzTreeComponent [nzData]="nodes"
-    [nzExpandAll]="nzExpandAll" [nzExpandedKeys]="defaultExpandedKeys" [nzTreeTemplate]="nzTreeTemplate" nzBlockNode
+    [nzExpandAll]="nzExpandAll" [nzExpandedKeys]="defaultExpandedKeys" [nzTreeTemplate]="nzTreeTemplate"
-    [nzExpandedIcon]="multiExpandedIconTpl">
+    nzBlockNode [nzExpandedIcon]="multiExpandedIconTpl">
   </nz-tree>
   <ng-template #nzTreeTemplate let-node let-origin="origin">
     <div class="nodebox">
@@ -34,7 +34,6 @@
       <span class="operation" *ngIf="level === 1 && isAdmin">
         <span (click)="addOr(node)" *ngIf="!node.origin.isGasStation">新增</span>
         <span (click)="waring(node)" *ngIf="node.origin.isGasStation">配置预警事件</span>
-        <span class="blue" (click)="changeOr(node)">修改所属机构</span>
         <span (click)="editOr(node)">编辑</span>
         <span [ngClass]="{'grey':node.origin.children && node.origin.children.length != 0}"
           (click)="deleteOr(node)">删除</span>

src/app/system-management/organization/organization.component.ts

@@ -22,7 +22,6 @@ import { NzFormatBeforeDropEvent } from "ng-zorro-antd/tree";
 import { Observable, of } from "rxjs";
 import { delay } from "rxjs/operators";
 import { WarningEventsComponent } from "./warning-events/warning-events.component";
-import { ChangeOrComponent } from "./change-or/change-or.component";
 @Component({
   selector: "app-organization",
   templateUrl: "./organization.component.html",
@@ -430,48 +429,4 @@ export class OrganizationComponent implements OnInit {
       return of(true);
     }
   };
-
-  changeOr(node) {
-    const modal = this.modal.create({
-      nzTitle: "修改所属组织机构",
-      nzContent: ChangeOrComponent,
-      nzViewContainerRef: this.viewContainerRef,
-      nzWidth: 500,
-      nzComponentParams: {
-        data: this.allOrList,
-      },
-      nzOnOk: async () => {
-        let selectedNode =
-          instance.nzTreeComponent.getSelectedNodeList()[0].key;
-
-        if (selectedNode) {
-          await new Promise((resolve) => {
-            let body = {
-              id: node.origin.id,
-              parentId: selectedNode,
-              displayName: node.origin.displayName,
-              isGasStation: node.origin.isGasStation,
-              isSkipAudit: node.origin.isSkipAudit,
-              level: node.origin.level,
-            };
-            this.http
-              .put(`/api/services/app/Organization/Update`, body)
-              .subscribe((data) => {
-                resolve(data);
-                this.message.create("success", "修改成功！");
-                this.nzTreeComponent.getExpandedNodeList().forEach((item) => {
-                  this.defaultExpandedKeys.push(item.key);
-                });
-                this.getAllOrganization();
-                return true;
-              });
-          });
-        } else {
-          this.message.create("warning", "请选择机构！");
-          return false;
-        }
-      },
-    });
-    const instance = modal.getContentComponent();
-  }
 }

src/app/system-management/system-management.module.ts

@@ -55,7 +55,6 @@ import { UserBindingComponent } from "./user-binding/user-binding.component";
 import { BindingComponent } from "./user-binding/binding/binding.component";
 import { OrBindingComponent } from './or-binding/or-binding.component';
 import { OrBindingModelComponent } from './or-binding/or-binding-model/or-binding-model.component';
-import { ChangeOrComponent } from './organization/change-or/change-or.component';
 @NgModule({
   declarations: [
     OrganizationComponent,
@@ -91,7 +90,6 @@ import { ChangeOrComponent } from './organization/change-or/change-or.component'
     BindingComponent,
     OrBindingComponent,
     OrBindingModelComponent,
-    ChangeOrComponent,
   ],
   imports: [
     CommonModule,

src/app/system-management/user-binding/binding/binding.component.html

@@ -76,7 +76,7 @@
                 </thead>
                 <tbody>
                     <tr *ngFor="let data of basicTable.data">
-                        <td><img src="../../../assets/images/user.png" alt=""></td>
+                        <td><img src="assets/images/user.png" alt=""></td>
                         <td>{{ data.userName }}</td>
                         <td>{{ data.name }}</td>
                         <!-- <td nzBreakWord>

src/app/system-management/user-binding/user-binding.component.html

@@ -75,7 +75,7 @@
         </thead>
         <tbody>
           <tr *ngFor="let data of basicTable.data">
-            <td><img src="../../../assets/images/user.png" alt=""></td>
+            <td><img src="assets/images/user.png" alt=""></td>
             <td>{{ data.loginName }}</td>
             <td>{{ data.userId }}</td>
             <td>

src/app/system-management/user/edituser/edituser.component.ts

@@ -150,8 +150,6 @@ export class EdituserComponent implements OnInit {
   isLoading = false;
   //确定
   async ok() {
-    // console.log(this.validateForm);
-    // return;
     this.isLoading = true;
     if (this.validateForm.valid) {
       return await new Promise((resolve) => {
@@ -172,12 +170,12 @@ export class EdituserComponent implements OnInit {
         ];
         let body = {
           id: this.data.id,
-          userName: this.validateForm.controls.account.value,
+          userName: this.validateForm.value.account,
-          name: this.validateForm.controls.name.value,
+          name: this.validateForm.value.name,
-          organizationUnitId: this.validateForm.controls.organization.value,
+          organizationUnitId: this.validateForm.value.organization,
           roleNames: roleNames,
-          phoneNumber: this.validateForm.controls.phonenum.value,
+          phoneNumber: this.validateForm.value.phonenum,
-          note: this.validateForm.controls.note.value,
+          note: this.validateForm.value.note,
           isActive: true,
         };
         this.http.put(this.editUrl, body).subscribe(

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

@@ -103,7 +103,7 @@
         </thead>
         <tbody>
           <tr *ngFor="let data of basicTable.data">
-            <td><img src="../../../assets/images/user.png" alt=""></td>
+            <td><img src="assets/images/user.png" alt=""></td>
             <td>{{ data.userName }}</td>
             <td>{{ data.name }}</td>
             <td nzBreakWord>

src/app/ui/title/title.component.html

@@ -1,5 +1,5 @@
 <div class="titlebox">
-  <img src="../../../assets/images/logosm.png" alt="">
+  <img src="assets/images/logosm.png" alt="">
   <div class="content">
     <div class="contentitem">
       <span>{{name}}</span>

tsconfig.json

@@ -23,7 +23,8 @@
       "@abp/*": [ "../node_modules/abp-ng2-module/dist/src/*" ],
       "@app/*": [ "./app/*" ],
       "@shared/*": [ "./shared/*" ],
-      "@node_modules/*": [ "../node_modules/*" ]
+      "@node_modules/*": [ "../node_modules/*" ],
+      "@src/*": [ "src/*" ]
     }
   },
   "angularCompilerOptions": {