用户管理页面样式优化

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

@@ -183,21 +183,25 @@
                         <img src="../../../assets/images/stationNum.png" alt="">
                         <div class="content">
                             <span class="lightspan lightspan1">{{HomeAggregatioData.dev.stationCount}}</span>
-                            <span>接入油站（个）</span>
+                            <span>接入油站(个)</span>
                         </div>
                     </div>
                     <div class="numlistbox">
                         <img src="../../../assets/images/modelNum.png" alt="">
                         <div class="content">
                             <span class="lightspan lightspan2">{{HomeAggregatioData.dev.violationCount}}</span>
+<<<<<<< HEAD
                             <span>预警分析模型（个）</span>
+=======
+                            <span>预警分析模型(个)</span>
+>>>>>>> 5d6008ac406e0fecb3c5dca4e0b3eceef5bc4fac
                         </div>
                     </div>
                     <div class="numlistbox">
                         <img src="../../../assets/images/cameraNum.png" alt="">
                         <div class="content">
                             <span class="lightspan lightspan3">{{HomeAggregatioData.dev.cameraCount}}</span>
-                            <span>摄像头（个）</span>
+                            <span>摄像头(个)</span>
                         </div>
                     </div>
                     <!-- <div class="numlistbox">

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

@@ -757,6 +757,11 @@ export class HomePageComponent implements OnInit {
 
   look(item) {
     console.log('消息item', item)
+    item.notification.data.violation = {}
+    item.notification.data.violation.violationType = item.notification.data.violationType
+    item.notification.data.violation.violationSubType = item.notification.data.violationSubType
+    item.notification.data.violation.violationName = item.notification.data.violationName
+    item.notification.data.violation.eventSystemName = item.notification.data.eventSystemName
     if (item.notification.data.eventSystemName == '设备报废临期提醒' || item.notification.data.eventSystemName == '设备报废逾期报警'
       || item.notification.data.eventSystemName == '设备维保临期提醒'
       || item.notification.data.eventSystemName == '设备维保逾期报警'

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

@@ -17,8 +17,9 @@
       <div><label nz-checkbox [(ngModel)]="IsContainsChildren" (ngModelChange)="getAllUsers()">是否包含子节点</label></div>
     </div>
     <div class="treebox">
-      <nz-tree [nzSearchValue]="searchValue" #nzTreeComponent [nzData]="nodes"
-        [nzExpandedKeys]="defaultExpandedKeys" [nzSelectedKeys]='nzSelectedKeys' (nzClick)="nzClick($event)" [nzExpandedIcon]="multiExpandedIconTpl" [nzHideUnMatched]="true">
+      <nz-tree [nzSearchValue]="searchValue" #nzTreeComponent [nzData]="nodes" [nzExpandedKeys]="defaultExpandedKeys"
+        [nzSelectedKeys]='nzSelectedKeys' (nzClick)="nzClick($event)" [nzExpandedIcon]="multiExpandedIconTpl"
+        [nzHideUnMatched]="true">
       </nz-tree>
       <ng-template #multiExpandedIconTpl let-node let-origin="origin">
         <ng-container *ngIf="node.children.length == 0; else elseTemplate">
@@ -59,9 +60,10 @@
             <th></th>
             <th>账号</th>
             <th>姓名</th>
-            <th style="width:45%;">角色</th>
+            <th [width]="'30%'">角色</th>
             <th>所属机构</th>
-            <th>操作</th>
+            <th>状态</th>
+            <th [width]="'20%'">操作</th>
           </tr>
         </thead>
         <tbody>
@@ -73,15 +75,19 @@
               <span style="margin-right: 8px;" *ngFor="let item of data.roleDisplayNames">{{item}}</span>
             </td>
             <td>
-              <!-- <div class="ortype">
-                自营
-              </div> -->
               {{data.organizationName}}
             </td>
+            <td>
+              状态
+            </td>
             <td class="operation">
               <a (click)="editUser(data)">编辑</a>
               <a (click)="resetPassword(data)">重置密码</a>
-              <a (click)="delete(data)">删除</a>
+              <a (click)="audit(data,true)">提交审核</a>
+              <a (click)="audit(data,false)">撤销审核</a>
+              <a class="redColor" (click)="cancel(data,true)">注销</a>
+              <a class="greenColor2" (click)="cancel(data,false)">启用</a>
+              <!-- <a (click)="delete(data)">删除</a> -->
             </td>
           </tr>
         </tbody>

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

@@ -91,13 +91,8 @@
 
     .operation {
       a {
-        color: #2399FF;
         margin-right: 12px;
       }
-
-      a:last-child {
-        color: rgba(0, 13, 33, 0.48);
-      }
     }
   }
 }

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

@@ -256,4 +256,28 @@ export class UserComponent implements OnInit {
       }
     });
   }
+
+
+  audit(data, type) {
+
+  }
+  cancel(data, type) {
+    this.modal.confirm({
+      nzTitle: `判定要注销${data.userName}用户吗?`,
+      nzOkText: '确定',
+      nzOkType: 'danger',
+      nzOnOk: () => {
+        let body = {
+          // id: this.data.id,
+        }
+        this.http.post('/api/services/app/ViolateRecordVerification/VerifyViolateRecord', body).subscribe(data => {
+          this.message.create('success', '已注销');
+        }, err => {
+          this.message.create('error', '注销失败');
+        })
+      },
+      nzCancelText: '取消',
+      nzOnCancel: () => console.log('Cancel')
+    });
+  }
 }

src/theme.less

@@ -18,10 +18,22 @@
   color: #4BFFD4;
 }
 
+.greenColor2 {
+  color: rgb(24, 187, 24);
+}
+
 .redColor {
   color: #FF4B65;
 }
 
+.redColor:hover {
+  color: #FF4B65;
+}
+
+.blueColor {
+  color: #2399FF;
+}
+
 //分页器
 #recordsboxadmin,
 #recordsbox,