Browse Source

[完善]油站信息图片兼容

beijing
邵佳豪 2 years ago
parent
commit
caf18a9a5c
  1. 4
      proxy.config.json
  2. 6
      src/app/pages/audit/gas-base-info/gas-base-info.component.html
  3. 21
      src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html
  4. 4
      src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.html

4
proxy.config.json

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

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

@ -122,7 +122,8 @@
</p>
<p>
<label class="marginLeft2">设计图纸: &nbsp;&nbsp;
<img (click)="viewImg(item.designPaper)" [src]="item.designPaper" alt="">
<img *ngIf="item.designPaper" (click)="viewImg(item.designPaper)" [src]="item.designPaper" alt="">
<span *ngIf="!item.designPaper">暂未上传附件</span>
</label>
</p>
<div class="cutoffrule"></div>
@ -143,7 +144,8 @@
</p>
<p>
<label class="marginLeft2">设计图纸: &nbsp;&nbsp;
<img (click)="viewImg(item.designPaper)" [src]="item.designPaper" alt="">
<img *ngIf="item.designPaper" (click)="viewImg(item.designPaper)" [src]="item.designPaper" alt="">
<span *ngIf="!item.designPaper">暂未上传附件</span>
</label>
</p>
<div class="cutoffrule"></div>

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

@ -119,16 +119,16 @@
<thead>
<tr>
<th nzWidth="5%" style="text-align: center;">序号</th>
<th>预警类别</th>
<th>预警内容</th>
<th nzWidth="6%">预警类别</th>
<th nzWidth="11%">预警内容</th>
<th>公司名称</th>
<th>区域名称</th>
<th nzWidth="12%">油站名称</th>
<th nzWidth="16%">证照/消防设施名称</th>
<th nzWidth="8%" >有效期限</th>
<th nzWidth="8%">有效期限</th>
<th>预警时间</th>
<th nzWidth="5%" >状态</th>
<th nzWidth="5%" >操作</th>
<th nzWidth="5%">状态</th>
<th nzWidth="5%">操作</th>
</tr>
</thead>
<tbody id="table">
@ -147,14 +147,7 @@
</ng-template>
</td>
<td nzEllipsis>
<ng-container *ngIf="item.numberOfTimes; else elseTemplate2">
<span *ngIf="item.numberOfTimes == 1">{{item.desc}}办理提醒</span>
<span *ngIf="item.numberOfTimes == 2">{{item.desc}}临期提醒</span>
<span *ngIf="item.numberOfTimes == 3">{{item.desc}}逾期报警</span>
</ng-container>
<ng-template #elseTemplate2>
消防设备逾期报警
</ng-template>
{{item.violation.eventSystemName}}
</td>
<td nzEllipsis [title]="item.gasStation.companyName">
{{item.gasStation.companyName ? item.gasStation.companyName : '/'}}
@ -197,7 +190,7 @@
</ng-template>
</td>
<td nzEllipsis>
{{item.violateTime | date:"yyyy-MM-dd hh:mm:ss"}}
{{item.violateTime | date:"yyyy-MM-dd HH:mm:ss"}}
</td>
<td nzEllipsis>
<span

4
src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.html

@ -66,7 +66,7 @@
</tbody>
</nz-table>
</div>
<div class="topbox" style="margin-top: 20px;">
<!-- <div class="topbox" style="margin-top: 20px;">
<div class="lefttop">
<span>{{selectedOilStation ? selectedOilStation.displayName : '加油站'}} 摄像头列表
</span>
@ -98,6 +98,6 @@
</tr>
</tbody>
</nz-table>
</div>
</div> -->
</div>
</div>
Loading…
Cancel
Save