bug 修复

src/main/webapp/app/alarm/alarm-list/alarm-list.component.html

@@ -17,7 +17,7 @@
     <smart-full-screen></smart-full-screen>
   </div>
 </div>
-<div nz-row [nzGutter]="4" class="search-form">
+<div nz-row class="search-form">
   <div nz-col nzSpan="3">
     <nz-select style="width: 100%;" nzShowSearch nzAllowClear nzPlaceHolder="选择级别" [(ngModel)]="obj.priorityName">
       <nz-option nzLabel="告警" nzValue="告警"></nz-option>

src/main/webapp/app/analysis/operation-work/operation-work.component.html

@@ -27,17 +27,19 @@
         </nz-select>
     </div>
 </div>
-<!--解决状态-->
-<ng-container *ngIf="type == '1'">
+<div class="padding-top-10 padding-bottom-10">
+    <!--解决状态-->
+    <ng-container *ngIf="type == '1'">
         <smart-analysis-status #smartAnalysisstatus></smart-analysis-status>
-</ng-container>
+    </ng-container>
 
-<!--事件分类统计-->
-<ng-container *ngIf="type == '2'">
+    <!--事件分类统计-->
+    <ng-container *ngIf="type == '2'">
         <smart-analysis-event #smartAnalysisEvent></smart-analysis-event>
-</ng-container>
+    </ng-container>
 
-<!--处理人统计-->
-<ng-container *ngIf="type == '3'">
+    <!--处理人统计-->
+    <ng-container *ngIf="type == '3'">
         <smart-analysis-deal #smartAnalysisDeal></smart-analysis-deal>
-</ng-container>
+    </ng-container>
+</div>

src/main/webapp/app/analysis/sys-change-count/sys-change-count.component.ts

@@ -201,7 +201,7 @@ export class SysChangeCountComponent implements OnInit {
 
     //时间改变
     changeType() {
-        if(this.timeType =='99') return ;
+        if (this.timeType == '99') return;
         this.obj.startTime = this.commonSer.getTimeByType(this.timeType).startTime;
         this.obj.endTime = this.commonSer.getTimeByType(this.timeType).endTime;
     }
@@ -222,6 +222,8 @@ export class SysChangeCountComponent implements OnInit {
         this.isDownload = true;
         //下载文件
         const d = {
+            startTime: this.obj.startTime,
+            endTime: this.obj.endTime,
             format: 'excel'
         };
         this.systemChangeSer.sysChangeExport(d).subscribe(

src/main/webapp/app/home/home.component.html

@@ -8,7 +8,6 @@
         </nz-breadcrumb>
     </div>
     <div nz-col nzSpan="8" class="text-right">
-        <button nzType="primary" (click)="returnBack()" nz-button>返回上一页</button>
         <button (click)="ngOnInit()" nz-button nzType="primary"><i class="anticon anticon-sync"></i></button>
         <smart-full-screen></smart-full-screen>
     </div>

src/main/webapp/app/netTopology/flow-trend/flow-trend.component.html

@@ -42,11 +42,10 @@
         <button (click)="search()" nz-button nzType="default"><i class="anticon anticon-search" style="color: #6097b7"></i>搜索</button>
     </div>
 </div>
-<div nz-row [nzGutter]="4" style="padding-bottom: 10px">
+<div nz-row [nzGutter]="4" class="padding-top-10 padding-bottom-10">
     <div nz-col nzSpan="7">
         <ng-container *ngIf="echartType == 'history'">
-            <nz-radio-group style="width: 100%;" [(ngModel)]="timeType" (ngModelChange)="changeType()"
-                            [nzButtonStyle]="'solid'">
+            <nz-radio-group style="width: 100%;" [(ngModel)]="timeType" (ngModelChange)="changeType()">
                 <label nz-radio-button nzValue="1">今天</label>
                 <label nz-radio-button nzValue="2">昨天</label>
                 <label nz-radio-button nzValue="3">三天</label>

src/main/webapp/app/work/modal/link-inventory/link-inventory.component.html

 <!--选择资产-->
-<nz-modal [nzMaskClosable]="false" [nzWidth]="880" [(nzVisible)]="isVisiable" [nzTitle]="title" (nzOnCancel)="handleEditCancel()" (nzOnOk)="handEditleOk()">
-  <div nz-form class="ant-advanced-search-form form-select">
+<nz-modal [nzMaskClosable]="false" [nzWidth]="880" [(nzVisible)]="isVisiable" [nzTitle]="title"
+          (nzOnCancel)="handleEditCancel()" (nzOnOk)="handEditleOk()">
+    <div style="padding:10px 15px" class="ant-advanced-search-form form-select">
         <div nz-row [nzGutter]="24">
             <div nz-col [nzSpan]="8">
                 <nz-tree #nzTree
@@ -10,7 +11,7 @@
                          [nzCheckStrictly]="true"
                          (nzCheckBoxChange)="selectCheckTree($event)"
                          (nzClick)="mouseAction('click',$event)"
-                 (nzExpandChange)="mouseAction('expand',$event)" >
+                         (nzExpandChange)="mouseAction('expand',$event)">
                 </nz-tree>
             </div>
 
@@ -23,7 +24,8 @@
                         <th>资产编号</th>
                         <th>资产分类</th>
                         <th>资产名称</th>
-            <th nzShowCheckbox [(nzChecked)]="allChecked" [nzIndeterminate]="indeterminate" (nzCheckedChange)="checkAll($event)"></th>
+                        <th nzShowCheckbox [(nzChecked)]="allChecked" [nzIndeterminate]="indeterminate"
+                            (nzCheckedChange)="checkAll($event)"></th>
                     </tr>
                     </thead>
                     <tbody>
@@ -31,7 +33,8 @@
                         <td>{{data.inventoryNo}}</td>
                         <td>{{data.invertoryname}}</td>
                         <td>{{data.name}}</td>
-            <td nzShowCheckbox [(nzChecked)]="data.checked" (nzCheckedChange)="selectItem(data,$event)"></td>
+                        <td nzShowCheckbox [(nzChecked)]="data.checked"
+                            (nzCheckedChange)="selectItem(data,$event)"></td>
                     </tr>
                     </tbody>
                 </nz-table>

src/main/webapp/app/work/modal/link-inventory/link-inventory.component.ts

@@ -24,7 +24,10 @@ export class LinkInventoryComponent implements OnInit {
     }
 
     checkAll(value: boolean): void {
-        this.invertoryList.forEach(data => data.checked = value);
+        this.invertoryList.forEach(data => {
+            data.checked = value;
+            this.selectList.push(data);
+        });
         this.refreshStatus();
     }
 
@@ -35,15 +38,15 @@ export class LinkInventoryComponent implements OnInit {
         this.indeterminate = (!allChecked) && (!allUnChecked);
     }
 
-    selectItem(item,e){
-        if(e){
+    selectItem(item, e) {
+        if (e) {
             this.selectList.push(item);
-        }else{
-            this.selectList.forEach((value,index)=>{
-                if(value.id == item.id){
-                    this.selectList.splice(index,1)
+        } else {
+            this.selectList.forEach((value, index) => {
+                if (value.id == item.id) {
+                    this.selectList.splice(index, 1);
                 }
-            })
+            });
         }
         this.refreshStatus();
     }
@@ -78,9 +81,9 @@ export class LinkInventoryComponent implements OnInit {
 
     //获取下级---子分类
     mouseAction(name: string, event: NzFormatEmitEvent) {
-        if(name == "click"){
+        if (name == 'click') {
             this.selectCheckTree(event);
-        }else{
+        } else {
             const index = <any>event.node.key - 1;
             const pId = event.node.origin.id;
             this.workSer.findByParentidCount(pId).subscribe(
@@ -120,12 +123,12 @@ export class LinkInventoryComponent implements OnInit {
         this.title = title;
     }
 
-    handleEditCancel(){
+    handleEditCancel() {
         this.selectList = [];
         this.isVisiable = false;
     }
 
-    handEditleOk(){
+    handEditleOk() {
         this.isVisiable = false;
         this.done.emit(this.selectList);
     }

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

@@ -40,7 +40,7 @@ export class LookPlanComponent implements OnInit {
     downLoad() {
         this.workSer.downloadTemplate('plan', this.planId).subscribe(
             (data) => {
-                this.commonSer.downloadFile(this.plan.fileName+".xlsx", data);
+                this.commonSer.downloadFile(this.plan.fileName, data);
             }
         );
     }

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

@@ -42,7 +42,7 @@ export class PlanModalComponent implements OnInit {
         this.participantsList = [];
         this.principalsList = [];
         this.validateForm = this.fb.group({
-            title: ['', [Validators.required],Validators.maxLength(20)],
+            title: ['', [Validators.required, Validators.maxLength(20)]],
             typeId: [null, [Validators.required]],
             startTime: [null, [Validators.required]],
             endTime: [null, [Validators.required]],
@@ -50,7 +50,7 @@ export class PlanModalComponent implements OnInit {
             cycleNum: ['1'],
             number: [null, [Validators.required]],
             workload: [null],
-            description: [null,Validators.maxLength(100)],
+            description: [null, Validators.maxLength(100)],
             principals: [null, [Validators.required]],   //负责人
             participants: [null, [Validators.required]],   //参与人
         });

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

@@ -78,9 +78,9 @@
             <div nz-col nzSpan="4">处理结果</div>
             <div nz-col nzSpan="1"></div>
             <div nz-col nzSpan="19">
-                <span *ngIf="event?.operateStatus == '0'">未解决</span>
-                <span *ngIf="event?.operateStatus == '1'">部分解决</span>
-                <span *ngIf="event?.operateStatus == '2'">已解决</span>
+                <nz-tag *ngIf="event?.operateStatus == '0'" [nzColor]="'#f50'">未解决</nz-tag>
+                <nz-tag *ngIf="event?.operateStatus == '1'" [nzColor]="'orange'">部分解决</nz-tag>
+                <nz-tag *ngIf="event?.operateStatus == '2'" [nzColor]="'green'">已解决</nz-tag>
             </div>
         </div>
         <div nz-row>
@@ -93,36 +93,67 @@
         <div nz-row>
             <div nz-col nzSpan="4">关联资产</div>
             <div nz-col nzSpan="1"></div>
-            <div nz-col nzSpan="19">
-                <p *ngFor="let item of event?.inventorys;">
-                    <span style="margin-right: 5px">{{item.inventoryNo}}</span>
-                    <span style="margin-right: 5px">{{item.name}}</span>
-                    <span>{{item.typeName}}</span>
-                </p>
+            <div nz-col nzSpan="12">
+                <table border="1" class="table-demo">
+                    <thead>
+                    <tr>
+                        <th>资产编号</th>
+                        <th>资产名称</th>
+                        <th>资产类型</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr *ngFor="let item of event?.inventorys;">
+                        <td>{{item.inventoryNo}}</td>
+                        <td>{{item.name}}</td>
+                        <td>{{item.typeName}}</td>
+                    </tr>
+                    </tbody>
+                </table>
             </div>
         </div>
         <div nz-row>
             <div nz-col nzSpan="4">关联费用</div>
             <div nz-col nzSpan="1"></div>
-            <div nz-col nzSpan="19">
-                <p class="margin-bottom-10" *ngFor="let item of event?.eventCostList;let i = index">
-                    <span class="margin-right-5">
+            <div nz-col nzSpan="12">
+                <table border="1" class="table-demo">
+                    <thead>
+                    <tr>
+                        <th>费用类别</th>
+                        <th>费用金额</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr *ngFor="let item of event?.eventCostList;">
+                        <td>
                             <ng-container *ngIf="item.costTypeId == '0'">委外费用</ng-container>
                             <ng-container *ngIf="item.costTypeId == '1'">物料费用</ng-container>
                             <ng-container *ngIf="item.costTypeId == '2'">其他</ng-container>
-                    </span>
-                    <span class="margin-right-5">{{item.amount}}</span>
-                </p>
+                        </td>
+                        <td>{{item.amount}}</td>
+                    </tr>
+                    </tbody>
+                </table>
             </div>
         </div>
         <div nz-row>
             <div nz-col nzSpan="4">违规通报</div>
             <div nz-col nzSpan="1"></div>
-            <div nz-col nzSpan="19">
-                <p class="margin-bottom-10" *ngFor="let item of event?.eventViolationVOList;let i = index">
-                    <span class="margin-right-5">{{item.title}}</span>
-                    <span class="margin-right-5">{{item.projectName}}</span>
-                </p>
+            <div nz-col nzSpan="12">
+                <table border="1" class="table-demo">
+                    <thead>
+                    <tr>
+                        <th>标题</th>
+                        <th>通报内容</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr *ngFor="let item of event?.eventViolationVOList;">
+                        <td>{{item.title}}</td>
+                        <td>{{item.content}}</td>
+                    </tr>
+                    </tbody>
+                </table>
             </div>
         </div>
         <div nz-row>

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

@@ -57,22 +57,13 @@ export class HandleDetailComponent implements OnInit {
     ngOnInit() {
         this.userName = this.$localStorage.retrieve('userInfo').userName;
         this.getDetail();
-        this.findTransferAndInventory();
-    }
-
-    //详情
-    getDetail() {
-        this.workSer.findByNo(this.eventId).subscribe(
-            (res) => {
-                this.event = res.data;
-            }
-        );
     }
 
     //查询事件流转信息
-    findTransferAndInventory() {
+    getDetail(){
         this.workSer.findTransferAndInventory(this.eventId).subscribe(
             (res) => {
+                this.event = res.data;
                 this.transforsList = res.data.transfers;
                 this.transforsList.forEach(e => {
                     e.operatorInfo = e.operatorInfo.replace(/\"/g, '').replace('{', '').replace('}', '').split(':');
@@ -128,7 +119,7 @@ export class HandleDetailComponent implements OnInit {
     }
 
     //返回上一页
-    returnBack(){
+    returnBack() {
         this.location.back();
     }
 }

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

@@ -99,40 +99,74 @@
         </div>
         <div nz-row>
             <div nz-col nzSpan="5" class="line-height-32">关联资产:</div>
-            <div nz-col nzSpan="19">
+            <div nz-col nzSpan="12">
                 <button (click)="showInventoryModal()" nz-button><span>选择</span></button>
-                <p class="margin-top-10" *ngFor="let item of linkList;let i = index">
-                    <span class="margin-right-5">{{item.inventoryNo}}</span>
-                    <span class="margin-right-5">{{item.name}}</span>
-                    <span>{{item.typename}}</span>
-                    <i (click)="deleteInventory(i)" class="anticon anticon-close margin-right-5"></i>
-                </p>
+                <table *ngIf="linkList.length > 0" border="1" class="table-demo margin-top-10">
+                    <thead>
+                    <tr>
+                        <th>资产编号</th>
+                        <th>资产名称</th>
+                        <th>操作</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr *ngFor="let item of linkList;let i = index">
+                        <td>{{item.inventoryNo}}</td>
+                        <td>{{item.name}}</td>
+                        <td><i (click)="deleteInventory(i)" class="anticon anticon-close-circle handle-delete"></i></td>
+                    </tr>
+                    </tbody>
+                </table>
             </div>
         </div>
         <div nz-row>
             <div nz-col nzSpan="5" class="line-height-32">关联费用:</div>
-            <div nz-col nzSpan="19">
+            <div nz-col nzSpan="12">
                 <button (click)="showCostModal()" nz-button><span>添加</span></button>
-                <p class="margin-top-10" *ngFor="let item of eventCostList;let i = index">
-                    <span class="margin-right-5">
+                <table *ngIf="eventCostList.length > 0" border="1" class="table-demo margin-top-10">
+                    <thead>
+                    <tr>
+                        <th>费用类别</th>
+                        <th>费用金额</th>
+                        <th>操作</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr *ngFor="let item of eventCostList;let i = index">
+                        <td>
                             <ng-container *ngIf="item.costTypeId == '0'">委外费用</ng-container>
                             <ng-container *ngIf="item.costTypeId == '1'">物料费用</ng-container>
                             <ng-container *ngIf="item.costTypeId == '2'">其他</ng-container>
-                    </span>
-                    <span class="margin-right-5">{{item.amount}}</span>
-                    <i (click)="deleteCost(i)" class="anticon anticon-close margin-right-5"></i>
-                </p>
+                        </td>
+                        <td>{{item.amount}}</td>
+                        <td><i (click)="deleteCost(i)" class="anticon anticon-close-circle handle-delete"></i></td>
+                    </tr>
+                    </tbody>
+                </table>
             </div>
         </div>
         <div nz-row>
             <div nz-col nzSpan="5" class="line-height-32">违规通报:</div>
-            <div nz-col nzSpan="19">
+            <div nz-col nzSpan="12">
                 <button (click)="showNotiModal()" nz-button><span>添加</span></button>
-                <p class="margin-top-10" *ngFor="let item of eventViolationVOList;let i = index">
-                    <span class="margin-right-5">{{item.title}}</span>
-                    <span class="margin-right-5">{{item.projectName}}</span>
-                    <i (click)="deleteNoti(i)" class="anticon anticon-close margin-right-5"></i>
-                </p>
+                <table *ngIf="eventViolationVOList.length > 0" border="1" class="table-demo margin-top-10">
+                    <thead>
+                    <tr>
+                        <th>通报标题</th>
+                        <th>关联项目</th>
+                        <th>通报内容</th>
+                        <th>操作</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr *ngFor="let item of eventViolationVOList;let i = index">
+                        <td>{{item.title}}</td>
+                        <td>{{item.projectName}}</td>
+                        <td>{{item.content}}</td>
+                        <td><i (click)="deleteNoti(i)" class="anticon anticon-close-circle handle-delete"></i></td>
+                    </tr>
+                    </tbody>
+                </table>
             </div>
         </div>
         <div nz-row>

src/main/webapp/app/work/work-handle/handle-event/handle-event.component.ts

@@ -61,22 +61,13 @@ export class HandleEventComponent implements OnInit {
 
     ngOnInit() {
         this.getDetail();
-        this.findTransferAndInventory();
-    }
-
-    //事件详情
-    getDetail() {
-        this.workSer.findByNo(this.eventId).subscribe(
-            (res) => {
-                this.event = res.data;
-            }
-        );
     }
 
     //查询事件流转信息
-    findTransferAndInventory() {
+    getDetail() {
         this.workSer.findTransferAndInventory(this.eventId).subscribe(
             (res) => {
+                this.event = res.data;
                 this.transforsList = res.data.transfers;
                 this.transforsList.forEach(e => {
                     e.operatorInfo = e.operatorInfo.replace(/\"/g, '').replace('{', '').replace('}', '').split(':');
@@ -207,8 +198,9 @@ export class HandleEventComponent implements OnInit {
     deleteNoti(i) {
         this.eventViolationVOList.splice(i, 1);
     }
+
     //返回上一页
-    returnBack(){
+    returnBack() {
         this.location.back();
     }
 }

src/main/webapp/content/css/global.css

@@ -277,23 +277,7 @@ ui bootstrap tweaks
     background-size: cover;
 }
 
-@keyframes rotateplane {
-    0% {
-        transform: rotateX(0);
-    }
-    25% {
-        transform: rotateX(90deg);
-    }
-    50% {
-        transform: rotateY(0deg);
-    }
-    75% {
-        transform: rotateY(90deg);
-    }
-    100% {
-        transform: rotate3d(0, 0, 0, 0);
-    }
-}
+
 
 /* jhipster-needle-css-add-main JHipster will add new css style */
 .padding-0 {
@@ -468,4 +452,38 @@ ui bootstrap tweaks
 .ant-modal-body > .ant-tabs {
     margin: 15px;
 }
+.has-error .ant-form-explain, .has-error .ant-form-split{
+    font-size:12px;
+}
+table.table-demo {
+    width: 100%;
+}
+.table-demo  td {
+  text-align: center;
+   height: 30px;
+   padding: 2px;
+}
+
+.table-demo  th {
+    text-align: center;
+    height: 30px;
+    padding: 2px;
+}
 
+@keyframes rotateplane {
+    0% {
+        transform: rotateX(0);
+    }
+    25% {
+        transform: rotateX(90deg);
+    }
+    50% {
+        transform: rotateY(0deg);
+    }
+    75% {
+        transform: rotateY(90deg);
+    }
+    100% {
+        transform: rotate3d(0, 0, 0, 0);
+    }
+}