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

2 years ago · 95d5bc65cf
10 changed files with 29 additions and 29 deletions
--- a/src/app/pages/records/criminal-records-admin/criminal-records-admin.component.html
+++ b/src/app/pages/records/criminal-records-admin/criminal-records-admin.component.html
@ -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>
--- a/src/app/pages/records/criminal-records/criminal-records.component.html
+++ b/src/app/pages/records/criminal-records/criminal-records.component.html
@ -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>
--- a/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html
+++ b/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html
@ -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>
--- a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html
+++ b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html
@ -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>
--- a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.scss
+++ b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.scss
@ -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 {
--- a/src/app/system-management/push/push.component.html
+++ b/src/app/system-management/push/push.component.html
@ -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>
--- a/src/app/system-management/user/adduser/adduser.component.ts
+++ b/src/app/system-management/user/adduser/adduser.component.ts
@ -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
--- a/src/app/system-management/user/edituser/edituser.component.ts
+++ b/src/app/system-management/user/edituser/edituser.component.ts
@ -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', {
--- a/src/app/system-management/user/user.component.html
+++ b/src/app/system-management/user/user.component.html
@ -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">

--- a/src/app/system-management/user/user.component.ts
+++ b/src/app/system-management/user/user.component.ts
@ -31,7 +31,6 @@ export class UserComponent implements OnInit {
  nzSelectedKeys: any[] = []
  defaultExpandedKeys = [];
  searchValue = '';
-  nzExpandAll = false;
  totalCount: string
  //获取所有用户
  usersLIst: any = []
@ -39,7 +38,7 @@ export class UserComponent implements OnInit {
  OrganizationUnitId
  loading: boolean;
  getAllUsers() {
-    this.loading=true
+    this.loading = true
    let params = {
      Keyword: this.validateForm.value.search ? this.validateForm.value.search : '',
      SkipCount: String(this.SkipCount),
@ -53,7 +52,7 @@ export class UserComponent implements OnInit {
      this.usersLIst = data.result.items
      this.usersNum = data.result.totalCount
      console.log('所有用户', this.usersLIst)
-      this.loading=false
+      this.loading = false
    })
  }
  SkipCount: number = 0  //0 16 32 48 
@ -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', {
@ -102,7 +102,7 @@ export class UserComponent implements OnInit {
        resolve(data)
        this.defaultExpandedKeys = [this.nodes[0].id]
        this.nzSelectedKeys = [this.nodes[0].id]
-        this.OrganizationUnitId=[this.nodes[0].id]
+        this.OrganizationUnitId = [this.nodes[0].id]
        this.getAllUsers()
      })
    })