shaojiahao
/
Sinopec-Anxin
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[完善]完善6.25号文档内容

beijing
邵佳豪 2 years ago
parent
09b6934b93
commit
95d5bc65cf
10 changed files with 29 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/app/pages/records/criminal-records-admin/criminal-records-admin.component.html
  2. 6
      src/app/pages/records/criminal-records/criminal-records.component.html
  3. 8
      src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html
  4. 1
      src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html
  5. 5
      src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.scss
  6. 4
      src/app/system-management/push/push.component.html
  7. 3
      src/app/system-management/user/adduser/adduser.component.ts
  8. 3
      src/app/system-management/user/edituser/edituser.component.ts
  9. 12
      src/app/system-management/user/user.component.html
  10. 4
      src/app/system-management/user/user.component.ts

6
src/app/pages/records/criminal-records-admin/criminal-records-admin.component.html
Unescape View File

@ -203,8 +203,10 @@
误报
</ng-container>
<ng-template #elseTemplate>
<span *ngIf="item.handleTime">已处置</span>
<span *ngIf="!item.handleTime" style="color: #FF4B65;">未处置</span>
<!-- <span *ngIf="item.handleTime">已处置</span>
<span *ngIf="!item.handleTime" style="color: #FF4B65;">未处置</span> -->
<span
[ngClass]="{'greenColor': item.handleStateStr=='已处置','yellowColor': item.handleStateStr=='处置中','redColor': item.handleStateStr=='未处置'}">{{item.handleStateStr}}</span>
</ng-template>
</td>
<td>

6
src/app/pages/records/criminal-records/criminal-records.component.html
Unescape View File

@ -177,8 +177,10 @@
误报
</ng-container>
<ng-template #elseTemplate>
<span *ngIf="item.handleTime">已处置</span>
<span *ngIf="!item.handleTime" style="color: #FF4B65;">未处置</span>
<!-- <span *ngIf="item.handleTime">已处置</span>
<span *ngIf="!item.handleTime" style="color: #FF4B65;">未处置</span> -->
<span
[ngClass]="{'greenColor': item.handleStateStr=='已处置','yellowColor': item.handleStateStr=='处置中','redColor': item.handleStateStr=='未处置'}">{{item.handleStateStr}}</span>
</ng-template>
</td>
<td>

8
src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html
Unescape View File

@ -183,7 +183,6 @@
{{item.violatedItemSnapshotObj.YearlyCheckDate ?
(item.violatedItemSnapshotObj.YearlyCheckDate | date:"yyyy-MM-dd") : '/'}}
</ng-template>
</ng-container>
<ng-template #elseTemplate>
<ng-container *ngIf="item.desc == '维保'; else elseTemplate2">
@ -195,11 +194,12 @@
(item.violatedItemSnapshotObj.validityEndTime | date:"yyyy-MM-dd") : '/'}}
</ng-template>
</ng-template>
</td>
<td nzEllipsis>
<span *ngIf="item.handleTime">已处置</span>
<span *ngIf="!item.handleTime" style="color: #FF4B65;">未处置</span>
<!-- <span *ngIf="item.handleTime">已处置</span>
<span *ngIf="!item.handleTime" style="color: #FF4B65;">未处置</span> -->
<span
[ngClass]="{'greenColor': item.handleStateStr=='已处置','yellowColor': item.handleStateStr=='处置中','redColor': item.handleStateStr=='未处置'}">{{item.handleStateStr}}</span>
</td>
<td>
<span style="cursor: pointer;color: #36A2FF;" (click)="look(item)">查看</span>

1
src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html
Unescape View File

@ -42,7 +42,6 @@
<div class="title">
<span>处置内容</span>
<ng-container *ngIf="!data.positive; else elseTemplate">
<span style="color: #4BFFD4;cursor: default;">已进行误报处置</span>
</ng-container>
<ng-template #elseTemplate>

5
src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.scss
Unescape View File

@ -95,7 +95,7 @@
.disposebox {
width: 100%;
height: 95px;
// height: 95px;
box-sizing: border-box;
padding: 5px 12px;
display: flex;
@ -125,10 +125,11 @@
textarea {
width: 100%;
height: 40px;
height: 45px;
color: #C4E2FC;
border: 1px solid #91CCFF;
background-color: #172c45;
margin-bottom: 12px;
}
span {

4
src/app/system-management/push/push.component.html
Unescape View File

@ -21,16 +21,16 @@
<div class="tablebox">
<table>
<tr>
<th style="width: 20%;">预警类别</th>
<th style="width: 20%;">预警/分析事件</th>
<th style="width: 20%;">预警类别</th>
<th style="width: 25%;">预警推送范围</th>
<!-- <th style="width: 25%;">预警处置范围</th> -->
<th style="width: 25%;">短信推送范围</th>
<th style="width: 10%;">操作</th>
</tr>
<tr *ngFor="let item of list">
<td>{{item.violationType}}</td>
<td>{{item.eventSystemName}}</td>
<td>{{item.violationType}}</td>
<td>
<span class="name" *ngFor="let i of item.pushRoleNames">{{i}}</span>
</td>

3
src/app/system-management/user/adduser/adduser.component.ts
Unescape View File

@ -37,7 +37,8 @@ export class AdduserComponent implements OnInit {
getAllRoles() {
let params = {
SkipCount: '0',
MaxResultCount: '999'
MaxResultCount: '999',
ContainsBuiltins: 'true'
}
this.http.get('/api/services/app/Role/GetAll', {
params: params

3
src/app/system-management/user/edituser/edituser.component.ts
Unescape View File

@ -44,7 +44,8 @@ export class EdituserComponent implements OnInit {
async getAllRoles() {
let params = {
SkipCount: '0',
MaxResultCount: '999'
MaxResultCount: '999',
ContainsBuiltins: 'true'
}
await new Promise<void>((resolve, reject) => {
this.http.get('/api/services/app/Role/GetAll', {

12
src/app/system-management/user/user.component.html
Unescape View File

@ -2,7 +2,7 @@
<div class="orbox">
<div class="topbox2">
<div class="lefttop">
<span>组织机构列表</span>
<span>组织机构</span>
</div>
<div class="righttop">
<nz-input-group nzPrefixIcon="search">
@ -14,15 +14,9 @@
<span>组织机构</span>
</div>
<div class="treebox">
<nz-tree [nzSearchValue]="searchValue" #nzTreeComponent [nzData]="nodes" [nzExpandAll]="nzExpandAll"
[nzExpandedKeys]="defaultExpandedKeys" [nzSelectedKeys]='nzSelectedKeys' (nzClick)="nzClick($event)"
[nzTreeTemplate]="nzTreeTemplate" [nzExpandedIcon]="multiExpandedIconTpl">
<nz-tree [nzSearchValue]="searchValue" #nzTreeComponent [nzData]="nodes"
[nzExpandedKeys]="defaultExpandedKeys" [nzSelectedKeys]='nzSelectedKeys' (nzClick)="nzClick($event)" [nzExpandedIcon]="multiExpandedIconTpl" [nzHideUnMatched]="true">
</nz-tree>
<ng-template #nzTreeTemplate let-node let-origin="origin">
<div class="nodebox">
<span class="name">{{ node.title }}</span>
</div>
</ng-template>
<ng-template #multiExpandedIconTpl let-node let-origin="origin">
<ng-container *ngIf="node.children.length == 0; else elseTemplate">

4
src/app/system-management/user/user.component.ts
Unescape View File

@ -31,7 +31,6 @@ export class UserComponent implements OnInit {
nzSelectedKeys: any[] = []
defaultExpandedKeys = [];
searchValue = '';
nzExpandAll = false;
totalCount: string
//获取所有用户
usersLIst: any = []
@ -68,7 +67,8 @@ export class UserComponent implements OnInit {
async getAllRoles() {
let params = {
SkipCount: '0',
MaxResultCount: '999'
MaxResultCount: '999',
ContainsBuiltins: 'true'
}
await new Promise<void>((resolve, reject) => {
this.http.get('/api/services/app/Role/GetAll', {

Write Preview
Loading…
Cancel
Save