update

src/main/webapp/app/analysis/resource-alarm/resource-alarm.component.ts

@@ -2,7 +2,7 @@ import {Component, OnInit} from '@angular/core';
 import {AnalysisService} from '../analysis.service';
 import {NzMessageService} from 'ng-zorro-antd';
 import {DatePipe} from '@angular/common';
-import {pageSize} from '../../app.constants';
+import {color, pageSize} from '../../app.constants';
 import {OverAllService} from '../../overAll/overAll.service';
 
 @Component({
@@ -13,6 +13,7 @@ import {OverAllService} from '../../overAll/overAll.service';
 export class ResourceAlarmComponent implements OnInit {
 
     timeType = '1';
+    color = color;
     startTime;
     endTime;
     groupList;
@@ -103,6 +104,7 @@ export class ResourceAlarmComponent implements OnInit {
                 data: data.map(e=>{
                     return e.size;
                 }),
+                color: [this.color.yellow],
                 type: 'bar'
             }]
         };

src/main/webapp/app/app.constants.ts

@@ -17,3 +17,4 @@ export const color = {
 };
 //图片地址
 export const imgUrl = "http://10.10.38.99:8282/file/icon/";
+export const fileUrl = "http://10.10.38.99:8282/file/";

src/main/webapp/app/system/group/group.component.html

@@ -74,7 +74,6 @@
         </td>
         <td class="handle">
           <span (click)="grantRole(data)">授权</span>
-          <span>查看</span>
           <span (click)="showEditModal(data)">编辑</span>
           <span (click)="deleteUser(data)">删除</span>
         </td>

src/main/webapp/app/system/modal/group-modal/group-modal.component.ts

@@ -84,6 +84,10 @@ export class GroupModalComponent implements OnInit {
     }
 
     update(){
+        if(this.validateForm.value.parentId == this.orgId){
+            this.message.error("不能将当前部门作为上级部门");
+            return false;
+        }
         this.validateForm.addControl("id",new FormControl(this.orgId));
         this.systemSer.updateOrganization(this.validateForm.value).subscribe(
             (res)=>{

src/main/webapp/app/system/modal/user/user.component.html

@@ -3,7 +3,7 @@
     <nz-form-item>
       <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="name">用户姓名</nz-form-label>
       <nz-form-control [nzSm]="14" [nzXs]="24">
-        <input nz-input formControlName="name" id="name">
+        <input nz-input formControlName="name" id="userName">
         <nz-form-explain *ngIf="validateForm.get('name').dirty && validateForm.get('name').errors">用户姓名不能为空!</nz-form-explain>
       </nz-form-control>
     </nz-form-item>

src/main/webapp/app/system/system.service.ts

@@ -75,7 +75,7 @@ export class SystemService {
         return this.http.post(SERVER_API_URL_COMS + '/user/batchDeleteUser' ,data);
     }
 
-    //组织结构列表  /organization/updateOrganization
+    //组织结构列表
     organization(): Observable<any>{
         return this.http.get(SERVER_API_URL_COMS + '/organization/getAll',);
     }

src/main/webapp/app/work/modal/look-plan/look-plan.component.html

@@ -96,9 +96,7 @@
       <nz-form-item>
         <nz-form-label [nzSpan]="7" nzRequired nzFor="group">附件</nz-form-label>
         <nz-form-control [nzSpan]="12">
-            <button nz-button>
-              <i class="anticon anticon-upload"></i><span>下载</span>
-            </button>
+          <a href="{{url}}{{plan?.file}}" download>下载</a>
         </nz-form-control>
       </nz-form-item>
 

src/main/webapp/app/work/modal/look-plan/look-plan.component.ts

 import { Component, OnInit } from '@angular/core';
 import {WorkService} from '../../work.service';
+import {fileUrl} from '../../../app.constants';
 
 @Component({
   selector: 'smart-look-plan',
@@ -11,6 +12,7 @@ export class LookPlanComponent implements OnInit {
   isVisible = false;
   title;
   plan;
+  url = fileUrl + "/planFile/";
 
   constructor(private workSer:WorkService) { }
 

src/main/webapp/app/work/modal/type-asets/type-asets.component.html

@@ -4,11 +4,11 @@
     <nz-form-item>
       <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="name">分类类型</nz-form-label>
       <nz-form-control [nzSm]="14" [nzXs]="24">
-        <nz-tag nzMode="checkable" [nzChecked]="!isChildren" (nzCheckedChange)="checkChange('parent')">父分类</nz-tag>
-        <nz-tag nzMode="checkable" [nzChecked]="isChildren" (nzCheckedChange)="checkChange('children')">子分类</nz-tag>
+        <button nz-button [nzType]="isParent" (click)="checkChange('parent')">父分类</button>
+        <button nz-button [nzType]="isChildren" (click)="checkChange('children')">子分类</button>
       </nz-form-control>
     </nz-form-item>
-    <nz-form-item *ngIf="isChildren">
+    <nz-form-item *ngIf="isChildren == 'primary'">
       <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="status" nzRequired nzFor="parentid">选择父分类</nz-form-label>
       <nz-form-control [nzSm]="14" [nzXs]="24">
         <nz-select style="width: 100%;" formControlName="parentid" name="parentid" id="parentid" nzPlaceHolder="选择父分类" (ngModelChange)="changeType($event)">

src/main/webapp/app/work/modal/type-asets/type-asets.component.ts

@@ -15,7 +15,8 @@ export class TypeAsetsComponent implements OnInit {
     title;
     isVisible;
     parentList;
-    isChildren = false;
+    isChildren = 'primary';
+    isParent = 'default';
     validateForm:FormGroup;
 
     updateId;
@@ -26,11 +27,13 @@ export class TypeAsetsComponent implements OnInit {
 
     checkChange(e){
         if(e == 'parent'){
-            this.isChildren = false;
+            this.isParent = 'primary';
+            this.isChildren = 'default';
             this.validateForm.get("parentid").clearValidators();
         }
         if(e == "children"){
-            this.isChildren = true;
+            this.isParent = 'default';
+            this.isChildren = 'primary';
             this.validateForm.get('parentid').setValidators(Validators.required);
         }
     }
@@ -52,7 +55,8 @@ export class TypeAsetsComponent implements OnInit {
     }
 
     initForm(){
-        this.isChildren = false;
+        this.isParent = 'primary';
+        this.isChildren = 'default';
         this.validateForm = this.fb.group(
             {
                 parentid:[null],
@@ -77,7 +81,8 @@ export class TypeAsetsComponent implements OnInit {
         this.workSer.findType(id).subscribe(
             (res)=>{
                 if(res.data.parentid){
-                    this.isChildren = true;
+                    this.isParent = 'default';
+                    this.isChildren = 'primary';
                 }
                 this.validateForm.patchValue(res.data);
             }

src/main/webapp/app/work/work-handle/handle-detail/handle-detail.component.html

@@ -59,19 +59,22 @@
 
     <h2>处理结果</h2>
     <div nz-row>
-      <div nz-col nzSpan="5">处理结果</div>
+      <div nz-col nzSpan="4">处理结果</div>
+      <div nz-col nzSpan="1"></div>
       <div nz-col nzSpan="19">
-
+    {{event?.operateStatus}}
       </div>
     </div>
     <div nz-row>
-      <div nz-col nzSpan="5">完成时间</div>
+      <div nz-col nzSpan="4">完成时间</div>
+      <div nz-col nzSpan="1"></div>
       <div nz-col nzSpan="19">
-
+        {{event?.completeTime | date:"yyyy-MM-dd HH:mm:ss"}}
       </div>
     </div>
     <div nz-row>
-      <div nz-col nzSpan="5">关联资产</div>
+      <div nz-col nzSpan="4">关联资产</div>
+      <div nz-col nzSpan="1"></div>
       <div nz-col nzSpan="19">
         <p *ngFor="let item of linkList;">
           <span>资产编号</span>
@@ -81,9 +84,10 @@
       </div>
     </div>
     <div nz-row>
-      <div nz-col nzSpan="5">处理情况</div>
+      <div nz-col nzSpan="4">处理情况</div>
+      <div nz-col nzSpan="1"></div>
       <div nz-col nzSpan="19">
-
+        {{event?.operateResult}}
       </div>
     </div>