UI update

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

@@ -58,7 +58,7 @@
             nzPlaceHolder="结束时间"></nz-date-picker>
   </div>
 </div>
-<div nz-row class="search-form" style="border-top: none;padding: 0 0 15px 0;">
+<div nz-row class="search-form">
   <div nz-col nzSpan="16">
     <input style="width: 15%;" [(ngModel)]="obj.name" nz-input placeholder="告警信息">
     <button (click)="searchValue()" nz-button nzType="default"><i class="anticon anticon-search"></i>搜索</button>

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

@@ -48,7 +48,7 @@
     <th>发送方式</th>
     <th nzWidth="15%">发送对象</th>
     <th nzWidth="15%">生成事件</th>
-    <th style="text-align: center">操作</th>
+    <th>操作</th>
   </tr>
   </thead>
   <tbody>
@@ -71,9 +71,9 @@
     <td><ng-container *ngIf="data.event">
         {{data.event.title}}
       </ng-container></td>
-    <td class="handle text-center main-color">
+    <td class="handle main-color">
       <span (click)="showEditModal(data)">编辑</span>
-      <span (click)="deleteAlarm(data)">删除</span>
+      <span class="handle-delete" (click)="deleteAlarm(data)">删除</span>
       <span *ngIf="data.status == 1" (click)="changeStatus('启用','0',data)">启用</span>
       <span *ngIf="data.status == 0" (click)="changeStatus('暂停','1',data)">暂停</span>
     </td>

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

@@ -29,7 +29,7 @@
         <button [nzLoading]="isDownload" (click)="downLoadExcel()" nz-button nzType="default"><i class="anticon anticon-download"></i>下载</button>
     </div>
 </div>
-<div class="tag-warn tag-form handle">
+<div class="search-form tag-form handle">
     <ng-container *ngFor="let item of warnCountList">
         <span [ngClass]="{'select-border': selectHostId == item.hostid}" (click)="search(item.hostid)">
             <nz-tag *ngIf="item.level == 4 || item.level == 5" class="tag-red" [nzColor]="color.red"></nz-tag>
@@ -42,4 +42,4 @@
 
 <smart-warn-list #warnList (total)="getTotal($event)"></smart-warn-list>
 
-<smart-send-log #sendLog></smart-send-log>
+<smart-send-log #sendLog></smart-send-log>
\ No newline at end of file

src/main/webapp/app/alarm/send-set/send-set.component.html

@@ -17,7 +17,7 @@
     <smart-full-screen></smart-full-screen>
   </div>
 </div>
-<div nz-row class="search-form" style="border-top: none;padding: 0 0 15px 0;">
+<div nz-row class="search-form">
   <button (click)="showAddModal()" nz-button nzType="default"><i class="anticon anticon-plus-circle-o"></i>新增发送方式</button>
 </div>
 
@@ -29,7 +29,7 @@
     <th>用于告警推送</th>
     <th>状态</th>
     <th nzWidth="25%">细节</th>
-    <th style="text-align: center">操作</th>
+    <th>操作</th>
   </tr>
   </thead>
   <tbody>
@@ -56,9 +56,9 @@
       <span *ngIf="data.type == 3">Jabber 标识符："{{data.username}}"</span>
       <span *ngIf="data.type == 100">用户名称："{{data.username}}"</span>
     </td>
-    <td class="handle text-center main-color">
+    <td class="handle main-color">
       <span (click)="showEditModal(data)">编辑</span>
-      <span (click)="deleteSend(data)">删除</span>
+      <span class="handle-delete" (click)="deleteSend(data)">删除</span>
       <span (click)="operationSend('启用',0,data)" *ngIf="data.status == 1">启用</span>
       <span (click)="operationSend('暂停',1,data)" *ngIf="data.status == 0">暂停</span>
     </td>
@@ -67,4 +67,4 @@
 </nz-table>
 
 <!--新增发送方式-->
-<smart-media-type #smartMediaType (done)="getList()"></smart-media-type>
+<smart-media-type #smartMediaType (done)="getList()"></smart-media-type>
\ No newline at end of file

src/main/webapp/app/infomationResource/asset-manage/asset-manage.component.html

@@ -93,7 +93,7 @@
         <th>内部ip地址</th>
         <th>cpu核数</th>
         <th>内存数</th>
-        <th style="text-align: center">操作</th>
+        <th>操作</th>
     </tr>
     </thead>
     <tbody>
@@ -107,10 +107,10 @@
         <td>{{data.ipInternalAddress}}</td>
         <td>{{data.cpuMultiNumber}}</td>
         <td>{{data.memoryCount}}</td>
-        <td class="handle text-center main-color">
+        <td class="handle main-color">
             <span *ngIf="data.status == 1" (click)="lookEvent(data)">查看</span>
             <span (click)="showEditModal(data)">编辑</span>
-            <span (click)="deleteHandle(data)">删除</span>
+            <span class="handle-delete" (click)="deleteHandle(data)">删除</span>
         </td>
     </tr>
     </tbody>

src/main/webapp/app/knowladge/common-problem/common-problem.component.html

@@ -20,7 +20,7 @@
 
 <div nz-row class="search-form">
   <div nz-col nzSpan="16">
-    <button (click)="importFile()" nz-button nzType="default">导入文件</button>
+    <button (click)="importFile()" nz-button nzType="default"><i class="anticon anticon-download"></i>导入文件</button>
   </div>
   <div nz-col nzSpan="8" class="text-right">
   </div>
@@ -40,7 +40,7 @@
     <td class="handle main-color">
       <span (click)="preview(data)">预览</span>
       <span (click)="download(data)">下载</span>
-      <span (click)="deleteFile(data)">删除</span>
+      <span class="handle-delete" (click)="deleteFile(data)">删除</span>
     </td>
   </tr>
   </tbody>

src/main/webapp/app/knowladge/information-tech/information-tech.component.html

@@ -20,7 +20,7 @@
 
 <div nz-row class="search-form">
   <div nz-col nzSpan="16">
-    <button (click)="importFile()" nz-button nzType="default">导入文件</button>
+    <button (click)="importFile()" nz-button nzType="default"><i class="anticon anticon-download"></i>导入文件</button>
   </div>
   <div nz-col nzSpan="8" class="text-right">
   </div>
@@ -40,7 +40,7 @@
     <td class="handle main-color">
       <span (click)="preview(data)">预览</span>
       <span (click)="download(data)">下载</span>
-      <span (click)="deleteFile(data)">删除</span>
+      <span class="handle-delete" (click)="deleteFile(data)">删除</span>
     </td>
   </tr>
   </tbody>

src/main/webapp/app/knowladge/management-system/management-system.component.html

@@ -20,7 +20,7 @@
 
 <div nz-row class="search-form">
     <div nz-col nzSpan="16">
-        <button (click)="importFile()" nz-button nzType="default">导入文件</button>
+        <button (click)="importFile()" nz-button nzType="default"><i class="anticon anticon-download"></i>导入文件</button>
     </div>
     <div nz-col nzSpan="8" class="text-right">
     </div>
@@ -40,7 +40,7 @@
         <td class="handle main-color">
             <span (click)="preview(data)">预览</span>
             <span (click)="download(data)">下载</span>
-            <span (click)="deleteFile(data)">删除</span>
+            <span class="handle-delete" (click)="deleteFile(data)">删除</span>
         </td>
     </tr>
     </tbody>

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

@@ -32,7 +32,7 @@
         <th>路径URL</th>
         <th>图标</th>
         <th>排序</th>
-        <th nzWidth="10%" class="text-center">操作</th>
+        <th nzWidth="10%">操作</th>
     </tr>
     </thead>
     <tbody>

src/main/webapp/app/overAll/basic/basic-detail/basic-detail.component.html

@@ -28,28 +28,6 @@
             <button (click)="showDeleteConfirm()" nz-button nzType="default">删除资源</button>
         </div>
         <div class="releative" #checkEle>
-            <div #colorEle class="checkTags tag-form">
-                <span [ngClass]="{'select-border': changeStates == '正常'}" (click)="changeState('正常')">
-                    <nz-tag class="tag-green" [nzColor]="color.green"></nz-tag>
-                     <i *ngIf="!checkStatus.normal && checkStatus.normal !=0"
-                        class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>{{checkStatus.normal}}
-                </span>
-                <span [ngClass]="{'select-border': changeStates == '告警'}" (click)="changeState('告警')"> <nz-tag class="tag-yellow" [nzColor]="color.yellow"></nz-tag>
-                     <i *ngIf="!checkStatus.warning && checkStatus.warning !=0"
-                        class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>
-                    {{checkStatus.warning}}
-                </span>
-                <span [ngClass]="{'select-border': changeStates == '严重'}" (click)="changeState('严重')"> <nz-tag class="tag-red"  [nzColor]="color.red"></nz-tag>
-                     <i *ngIf="!checkStatus.high && checkStatus.high !=0" class="anticon anticon-spin anticon-loading"
-                        style="font-size: 15px;"></i>
-                    {{checkStatus.high}}
-                </span>
-                <span [ngClass]="{'select-border': changeStates == '禁用'}" (click)="changeState('禁用')"> <nz-tag class="tag-gray" [nzColor]="color.gray"></nz-tag>
-                     <i *ngIf="!checkStatus.disabled && checkStatus.disabled !=0"
-                        class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>
-                    {{checkStatus.disabled}}
-                </span>
-            </div>
             <nz-tabset [nzType]="'card'" [nzSelectedIndex]="tabNum" class="tabs-smart">
                 <nz-tab nzTitle="资源详情">
                     <section>
@@ -122,9 +100,36 @@
                     </section>
                 </nz-tab>
                 <nz-tab nzTitle="监测点列表">
-                    <div class="padding-8-0">
-                        <input (keyup.enter)="getCheckList()" style="width: 200px;" type="text" nz-input [(ngModel)]="searchName" placeholder="输入监测点名称">
-                        <button (click)="getCheckList()" nz-button nzType="default"><i class="anticon anticon-search" style="color: #6097b7"></i>搜索</button>
+                    <div nz-row [nzGutter]="4" class="padding-15-0">
+                        <div nz-col nzSpan="16">
+                            <div #colorEle class="checkTags tag-form">
+                                <span>{{hostName}}:</span>
+                                <span [ngClass]="{'select-border': changeStates == '正常'}" (click)="changeState('正常')">
+                                    <nz-tag class="tag-green" [nzColor]="color.green"></nz-tag>
+                                     <i *ngIf="!checkStatus.normal && checkStatus.normal !=0"
+                                        class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>{{checkStatus.normal}}
+                                </span>
+                                                <span [ngClass]="{'select-border': changeStates == '告警'}" (click)="changeState('告警')"> <nz-tag class="tag-yellow" [nzColor]="color.yellow"></nz-tag>
+                                     <i *ngIf="!checkStatus.warning && checkStatus.warning !=0"
+                                        class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>
+                                                    {{checkStatus.warning}}
+                                </span>
+                                                <span [ngClass]="{'select-border': changeStates == '严重'}" (click)="changeState('严重')"> <nz-tag class="tag-red"  [nzColor]="color.red"></nz-tag>
+                                     <i *ngIf="!checkStatus.high && checkStatus.high !=0" class="anticon anticon-spin anticon-loading"
+                                        style="font-size: 15px;"></i>
+                                                    {{checkStatus.high}}
+                                </span>
+                                                <span [ngClass]="{'select-border': changeStates == '禁用'}" (click)="changeState('禁用')"> <nz-tag class="tag-gray" [nzColor]="color.gray"></nz-tag>
+                                     <i *ngIf="!checkStatus.disabled && checkStatus.disabled !=0"
+                                        class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>
+                                                    {{checkStatus.disabled}}
+                                </span>
+                            </div>
+                        </div>
+                        <div nz-col class="text-right" nzSpan="8">
+                            <input (keyup.enter)="getCheckList()" style="width: 200px;" type="text" nz-input [(ngModel)]="searchName" placeholder="输入监测点名称">
+                            <button (click)="getCheckList()" nz-button nzType="default"><i class="anticon anticon-search" style="color: #6097b7"></i>搜索</button>
+                        </div>
                     </div>
                     <div class="padding-15-0">
                         <nz-radio-group [(ngModel)]="itemTypeValue">
@@ -134,14 +139,14 @@
                     <nz-table #checkTable [nzData]="checkList" [nzFrontPagination]="false" [nzTotal]="totalNum" [nzPageIndex]="pageIndex" [nzPageSize]="pageSize" (nzPageIndexChange)="change($event)" [nzLoading]="loading">
                         <thead>
                         <tr>
-                            <th nzWidth="20%">监测点名称</th>
+                            <th nzWidth="15%">监测点名称</th>
                             <th nzWidth="10%">最新数据</th>
                             <th nzWidth="15%">最新数据时间</th>
                             <th nzWidth="10%">监测点分类</th>
                             <th nzWidth="10%">更新时间间隔</th>
                             <th nzWidth="5%">图表</th>
-                            <th nzWidth="15%">状态</th>
                             <th nzWidth="5%">信息</th>
+                            <th nzWidth="20%">操作</th>
                         </tr>
                         </thead>
                         <tbody>
@@ -167,19 +172,6 @@
                             <td class="main-color cursor main-color">
                                 <span *ngIf="data.value_type == 0 || data.value_type == 3" (click)="showImageModal(data)">图表</span>
                             </td>
-                            <td class="handle cursor main-color">
-                                <ng-container *ngIf="!data.flags">
-                                    <span (click)="showEditModal(data)">编辑监测点</span>
-                                    <span (click)="deleteCheckItem(data)">删除监测点</span>
-                                    <br>
-                                    <span *ngIf="data.triggerCount == 0" (click)="showAddThresholdModal(data)">添加阈值</span>
-                                    <span *ngIf="data.triggerCount > 0" (click)="showEditThresholdModal(data)">编辑阈值</span>
-                                </ng-container>
-                                <span *ngIf="data.status == 0 && data.state==0" (click)="updateItem(data.itemid,1)" style="color: green">已启用</span>
-                                <span *ngIf="data.status == 0 && data.state==1" (click)="updateItem(data.itemid,1)" style="color: red">不支持的</span>
-                                <span *ngIf="data.status == 1 && data.state==0" (click)="updateItem(data.itemid,0)" style="color: red">停用的</span>
-                                <span *ngIf="data.status == 1 && data.state==1" (click)="updateItem(data.itemid,0)" style="color: green">停用的</span>
-                            </td>
                             <td>
                                 <ng-container *ngIf="data.error">
                                     <nz-tooltip [nzTitle]="data.error">
@@ -193,6 +185,19 @@
                                     </nz-tooltip>
                                 </ng-container>
                             </td>
+                            <td class="handle cursor main-color">
+                                <ng-container *ngIf="!data.flags">
+                                    <span (click)="showEditModal(data)">编辑监测点</span>
+                                    <span (click)="deleteCheckItem(data)">删除监测点</span>
+                                    <br>
+                                    <span *ngIf="data.triggerCount == 0" (click)="showAddThresholdModal(data)">添加阈值</span>
+                                    <span *ngIf="data.triggerCount > 0" (click)="showEditThresholdModal(data)">编辑阈值</span>
+                                </ng-container>
+                                <span *ngIf="data.status == 0 && data.state==0" (click)="updateItem(data.itemid,1)" style="color: green">已启用</span>
+                                <span *ngIf="data.status == 0 && data.state==1" (click)="updateItem(data.itemid,1)" style="color: red">不支持的</span>
+                                <span *ngIf="data.status == 1 && data.state==0" (click)="updateItem(data.itemid,0)" style="color: red">停用的</span>
+                                <span *ngIf="data.status == 1 && data.state==1" (click)="updateItem(data.itemid,0)" style="color: green">停用的</span>
+                            </td>
                         </tr>
                         </tbody>
                     </nz-table>

src/main/webapp/app/overAll/basic/basic-detail/basic-detail.component.ts

@@ -15,11 +15,8 @@ import {ThresholdComponent} from '../../../modal/threshold/threshold.component';
     templateUrl: './basic-detail.component.html',
     styles: [
             `
-            .checkTags {
-                position: absolute;
-                top: 12px;
-                left: 233px;
-                z-index: 989;
+            .checkTags span{
+                margin-right: 10px;
             }
             .time-select{
                 position: absolute;
@@ -33,12 +30,6 @@ import {ThresholdComponent} from '../../../modal/threshold/threshold.component';
                 padding: 2px;
                 margin-right: 5px;
             }
-            :host ::ng-deep .tabs-smart .ant-tabs-nav-scroll div.ant-tabs-tab:nth-child(3){
-                margin-right: 180px !important;
-            }
-            :host ::ng-deep .ant-radio-button-wrapper{
-                margin: 4px;
-            }
         `
     ]
 })
@@ -47,7 +38,6 @@ export class BasicDetailComponent implements OnInit, AfterViewInit {
     @ViewChild('smartThreshold') smartThreshold: ThresholdComponent;
     @ViewChild('thirdTabs') thirdTabs: ElementRef;
     @ViewChild('warnList') warnList: WarnListComponent;
-    @ViewChild('colorEle') colorEle:ElementRef;
     @ViewChild('checkEle') checkEle:ElementRef;
     color = color;
     loading = false;
@@ -157,7 +147,6 @@ export class BasicDetailComponent implements OnInit, AfterViewInit {
     }
 
     ngAfterViewInit() {
-        this.checkEle.nativeElement.children[1].children[0].children[0].children[2].children[0].children[0].children[2].style.marginRight = this.colorEle.nativeElement.offsetWidth +'px';
     }
 
     //平均响应时间

src/main/webapp/app/overAll/basic/basic.component.html

@@ -192,7 +192,7 @@
             <td class="handle main-color">
                 <span (click)="showBasicCheckModal(item.hostid,item.host)">添加监测点</span>
                 <span (click)="editBasicModal(item)">编辑</span>
-                <span (click)="showDeleteConfirm(item)">删除</span>
+                <span class="handle-delete" (click)="showDeleteConfirm(item)">删除</span>
                 <nz-dropdown [nzTrigger]="'click'" class="table-dropdown">
                     <a nz-dropdown>更多 <i class="anticon anticon-down main-color"></i>
                     </a>

src/main/webapp/app/overAll/network-check/network-check.component.html

@@ -94,7 +94,7 @@
             <td>{{item.headers}}</td>
             <td class="handle main-color">
                 <span (click)="editBasicModal(item)">编辑</span>
-                <span (click)="showDeleteConfirm(item)">删除</span>
+                <span class="handle-delete" (click)="showDeleteConfirm(item)">删除</span>
                 <nz-dropdown [nzTrigger]="'click'" class="table-dropdown">
                     <a nz-dropdown>更多 <i class="anticon anticon-down main-color"></i>
                     </a>

src/main/webapp/app/overAll/template/check-list/check-list.component.html

@@ -59,7 +59,7 @@
     </td>
     <td class="main-color cursor">
       <span (click)="showEditModal(data)">编辑</span>
-      <span (click)="deleteCheck(data)">删除</span>
+      <span class="handle-delete"(click)="deleteCheck(data)">删除</span>
     </td>
   </tr>
   </tbody>

src/main/webapp/app/overAll/template/discovery-list/discovery-list.component.html

@@ -59,11 +59,11 @@
     </td>
     <td class="main-color cursor">
       <span (click)="showEditModal(data)">编辑</span>
-      <span (click)="deleteDiscovery(data)">删除</span>
+      <span class="handle-delete" (click)="deleteDiscovery(data)">删除</span>
     </td>
   </tr>
   </tbody>
 </nz-table>
 
 <!--自动发现-->
-<smart-discovery #smartDiscovery  (done)="getList()"></smart-discovery>
+<smart-discovery #smartDiscovery  (done)="getList()"></smart-discovery>
\ No newline at end of file

src/main/webapp/app/overAll/template/list/tri-list/tri-list.component.html

@@ -57,7 +57,7 @@
     <td>{{data.expression}}</td>
     <td class="cursor main-color">
       <span (click)="showEditModal(data)">编辑</span>
-      <span (click)="deleteTrigger(data)">删除</span>
+      <span class="handle-delete" (click)="deleteTrigger(data)">删除</span>
     </td>
   </tr>
   </tbody>

src/main/webapp/app/overAll/template/template.component.html

@@ -91,12 +91,12 @@
             <ng-container *ngIf="!item.level">
               <span (click)="showTempAddModal(item)">添加模版</span>
               <span (click)="updateGroup(item)">编辑</span>
-              <span (click)="showDeleteGroupConfirm(item)">删除</span>
+              <span class="handle-delete" (click)="showDeleteGroupConfirm(item)">删除</span>
             </ng-container>
             <ng-container *ngIf="item.level">
               <span (click)="cloneTemp(item)">克隆</span>
               <span (click)="showTempEditModal(item)">编辑</span>
-              <span (click)="showDeleteConfirm(item)">删除</span>
+              <span class="handle-delete" (click)="showDeleteConfirm(item)">删除</span>
             </ng-container>
           </td>
         </tr>
@@ -126,7 +126,7 @@
         <td class="handle main-color">
           <span (click)="cloneTemp(item)">克隆</span>
           <span (click)="showTempEditModal(item)">编辑</span>
-          <span (click)="showDeleteConfirm(item)">删除</span>
+          <span class="handle-delete" (click)="showDeleteConfirm(item)">删除</span>
         </td>
       </tr>
     </ng-container>
@@ -152,4 +152,4 @@
 <!--监控策略-->
 <smart-strategy #smartStrategy (done)="handleOk($event)"></smart-strategy>
 <!--导入文件-->
-<smart-upload #smartUpload></smart-upload>
+<smart-upload #smartUpload></smart-upload>
\ No newline at end of file

src/main/webapp/app/overAll/template/trigger-list/trigger-list.component.html

@@ -58,7 +58,7 @@
         <td>{{data.expression}}</td>
         <td class="cursor main-color">
             <span (click)="showEditModal(data)">编辑</span>
-            <span (click)="deleteTrigger(data)">删除</span>
+            <span class="handle-delete" (click)="deleteTrigger(data)">删除</span>
         </td>
     </tr>
     </tbody>

src/main/webapp/app/overview/overview.constans.ts

@@ -5,7 +5,7 @@ export const msg_status = [
 
 export const time_type = [
     {label: '今日', value: '1'},
-    {label: '本周', value: '2'},
-    {label: '本月', value: '3'},
+    {label: '本周', value: '4'},
+    {label: '本月', value: '5'},
     {label: '自定义', value: '99'},
 ];

src/main/webapp/app/overview/work-reminder/work-reminder.component.html

@@ -34,16 +34,16 @@
         </button>
     </div>
 </div>
-<div nz-row [nzGutter]="4" class="padding-15-0">
+<div nz-row [nzGutter]="4" class="search-form">
     <div nz-col nzSpan="16">
-        <span class="main-color margin-right-15">更新时间:</span>
-        <nz-radio-group [(ngModel)]="obj.updateSearch">
+        <span class="main-color margin-right-15">提醒时间:</span>
+        <nz-radio-group [(ngModel)]="time.type">
             <label *ngFor="let item of timeType" (click)="changeTimeType()" nz-radio-button
                    [nzValue]="item.value">{{item.label}}</label>
         </nz-radio-group>
     </div>
     <div nz-col nzSpan="8">
-        <ng-container *ngIf="obj.updateSearch == '99'">
+        <ng-container *ngIf="time.type == '99'">
             <nz-date-picker
                     [nzFormat]="timeFormat"
                     [(ngModel)]="time.startTime"

src/main/webapp/app/overview/work-reminder/work-reminder.component.ts

@@ -82,8 +82,8 @@ export class WorkReminderComponent implements OnInit {
 
     changeTimeType() {
         if (this.time.type == '99') return;
-        this.obj.createTimeStart = this.commonSer.getTimeByType(this.time.type).startTime;
-        this.obj.createTimeEnd = this.commonSer.getTimeByType(this.time.type).endTime;
+        this.obj.createTimeStart = new Date( this.commonSer.getTimeByType(this.time.type).startTime ).getTime();
+        this.obj.createTimeEnd = new Date( this.commonSer.getTimeByType(this.time.type).endTime ).getTime();
         this.page.pageNum = 1;
         this.getList();
     }
@@ -91,8 +91,8 @@ export class WorkReminderComponent implements OnInit {
     //搜索
     search() {
         if(this.time.type == '99'){
-            this.obj.createTimeStart = new Date(this.obj.createTimeStart).getTime();
-            this.obj.createTimeEnd = new Date(this.obj.createTimeEnd).getTime();
+            this.obj.createTimeStart = new Date(this.time.startTime).getTime();
+            this.obj.createTimeEnd = new Date(this.time.endTime).getTime();
         }
         this.page.pageNum = 1;
         this.getList();
@@ -114,7 +114,7 @@ export class WorkReminderComponent implements OnInit {
             (res) => {
                 if (res.errCode == 10000) {
                     this.getList();
-                    this.message.success('已读');
+                    if (type == 'not') this.message.success('已读');
                     if (type == 'go') this.router.navigate([`app/main/${data.url}`]);
                 }
             }

src/main/webapp/app/project-manager/opr-company/opr-company.component.html

@@ -64,7 +64,7 @@
     </td>
     <td>{{data.projectNum}}</td>
     <td>{{data.totalAmount}}</td>
-    <td class="handle text-center main-color">
+    <td class="handle main-color">
       <span (click)="handleEditModa(data)">编辑</span>
       <span>查看</span>
     </td>

src/main/webapp/app/project-manager/opr-cost/opr-cost.component.html

@@ -40,7 +40,7 @@
     </button>
   </div>
 </div>
-<div nz-row [nzGutter]="4" class="padding-15-0">
+<div nz-row [nzGutter]="4" class="search-form">
   <div nz-col nzSpan="9">
     <span class="main-color margin-right-15">时&nbsp;&nbsp;&nbsp;&nbsp;间:</span>
     <nz-radio-group [(ngModel)]="time.type">

src/main/webapp/app/project-manager/opr-project/opr-project.component.html

@@ -39,7 +39,7 @@
         </nz-select>
     </div>
 </div>
-<div nz-row [nzGutter]="4" class="padding-15-0">
+<div nz-row [nzGutter]="4" class="search-form">
     <div nz-col nzSpan="8">
         <input type="text" (keyup.enter)="search()" nz-input [(ngModel)]="obj.keyword" placeholder="项目名称、甲方名称、乙方名称、甲方负责人">
     </div>

src/main/webapp/app/shared/common/common.service.ts

@@ -183,7 +183,7 @@ export class CommonService implements OnInit {
     getTimeByType(timeType) {
         const nowDate = new Date().getTime();
         let day1, day2; //当作变量使用
-        let obj = {startTime: '', endTime: ''};
+        let obj = {startTime: null, endTime: null};
         switch (timeType) {
             case'0': {   //最近一小时
                 day1 = nowDate - 1 * 60 * 60 * 1000;

src/main/webapp/app/system-change/change-manage/change-manage.component.html

@@ -34,7 +34,7 @@
         </button>
     </div>
 </div>
-<div nz-row [nzGutter]="4" class="padding-15-0">
+<div nz-row [nzGutter]="4" class="search-form">
     <div nz-col nzSpan="10">
         <span class="main-color margin-right-15">时间: </span>
         <nz-radio-group [(ngModel)]="time.type">
@@ -111,7 +111,7 @@
             <span (click)="showTransforModal(data)" *ngIf="data.status == 3 || data.status == 6">任务转派</span>
             <span (click)="handleEditModal(data)" *ngIf="data.status == 4 || data.status == 1">编辑</span>
             <span (click)="showChangeModal(data)" *ngIf="data.status == 6">处理</span>
-            <span (click)="deleteChange(data)"
+            <span class="handle-delete" (click)="deleteChange(data)"
                   *ngIf="data.status == 1 || data.status == 2 || data.status == 6 || data.status == 3
                 || data.status == 4 || data.status == 7">删除</span>
         </td>

src/main/webapp/app/system-change/change-params/change-params.component.html

@@ -44,7 +44,7 @@
             <div class="handle" *ngFor="let item of eventList;">
                 <span>{{item.label}}</span>
                 <span class="main-color" (click)="showEditModal('编辑变更类型','sys_change_type',item)">编辑</span>
-                <span class="main-color" (click)="deleteItem(item)">删除</span>
+                <span class="handle-delete main-color" (click)="deleteItem(item)">删除</span>
             </div>
         </div>
     </div>
@@ -61,7 +61,7 @@
             <div class="handle" *ngFor="let item of levelList;">
                 <span>{{item.label}}</span>
                 <span class="main-color" (click)="showEditModal('编辑变更级别','sys_change_level',item)">编辑</span>
-                <span class="main-color" (click)="deleteItem(item)">删除</span>
+                <span class="handle-delete main-color" (click)="deleteItem(item)">删除</span>
             </div>
         </div>
     </div>

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

@@ -21,7 +21,7 @@
 <div nz-row [nzGutter]="12">
   <div nz-col nzSpan="8" >
     <div class="padding-15-0">
-      <button (click)="showGroupModal()" nz-button nzType="primary">新增组织</button>
+      <button (click)="showGroupModal()" nz-button nzType="primary"><i class="anticon anticon-plus-circle-o"></i>新增组织</button>
     </div>
     <div class="tree-left">
       <nz-tree [(ngModel)]="nodes" [nzShowLine]="true">
@@ -39,12 +39,12 @@
   </div>
   <div nz-col nzSpan="16">
     <div class="padding-15-0">
-      <button (click)="showUserModal()" nz-button nzType="primary">新增用户</button>
-      <button (click)="batchDelete()" nz-button nzType="default">批量删除</button>
+      <button (click)="showUserModal()" nz-button nzType="default"><i class="anticon anticon-plus-circle-o"></i>新增用户</button>
+      <button (click)="batchDelete()" nz-button nzType="default"><i class="anticon anticon-close-circle-o"></i>批量删除</button>
       <!--<button nz-button nzType="default">批量修改</button>-->
-      <button (click)="downLoad()" nz-button nzType="default">下载模版</button>
-      <button (click)="showUploadModalOrg()" nz-button nzType="default">导入组织</button>
-      <button (click)="showUploadModalUser()" nz-button nzType="default">导入用户</button>
+      <button (click)="downLoad()" nz-button nzType="default"><i class="anticon anticon-download"></i>下载模版</button>
+      <button (click)="showUploadModalOrg()" nz-button nzType="default"><i class="anticon anticon-download"></i>导入组织</button>
+      <button (click)="showUploadModalUser()" nz-button nzType="default"><i class="anticon anticon-download"></i>导入用户</button>
       <button style="float: right" (click)="search()" nz-button nzType="default"><i class="anticon anticon-search"></i>搜索</button>
       <input  style="display: inline-block;width: 150px;margin-right: 10px;float: right" nz-input placeholder="姓名/手机号码" (keyup.enter)="search()" [(ngModel)]="name">
     </div>
@@ -71,7 +71,7 @@
         <td class="handle main-color">
           <span (click)="grantRole(data)">授权</span>
           <span (click)="showEditModal(data)">编辑</span>
-          <span (click)="deleteUser(data)">删除</span>
+          <span class="handle-delete" (click)="deleteUser(data)">删除</span>
         </td>
       </tr>
       </tbody>

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

@@ -54,7 +54,7 @@
             <span (click)="grantUser(data)">授予用户</span>
             <!--<span (click)="lookRole(data)">查看</span>-->
             <span (click)="showEditModal(data)">编辑</span>
-            <span (click)="deleteRole(data)">删除</span>
+            <span class="handle-delete" (click)="deleteRole(data)">删除</span>
         </td>
     </tr>
     </tbody>

src/main/webapp/app/work/asset-part/asset-part.component.html

@@ -55,7 +55,7 @@
         <th>维修</th>
         <th>报废</th>
         <th>关联事件</th>
-        <th style="text-align: center">操作</th>
+        <th>操作</th>
     </tr>
     </thead>
     <tbody>
@@ -80,7 +80,7 @@
         <td>{{data.eventSum}}</td>
         <td class="handle text-center main-color">
             <span (click)="goToChild(data)">明细</span>
-            <span (click)="deleteChildType(data)">删除</span>
+            <span class="handle-delete" (click)="deleteChildType(data)">删除</span>
         </td>
     </tr>
     </tbody>

src/main/webapp/app/work/asset-part/assets-detail/assets-detail.component.html

@@ -218,7 +218,7 @@
                     <th>事件分类</th>
                     <th>处理人</th>
                     <th>状态</th>
-                    <th style="text-align: center">操作</th>
+                    <th>操作</th>
                 </tr>
                 </thead>
                 <tbody>

src/main/webapp/app/work/asset-part/child-assets/child-assets.component.html

@@ -74,7 +74,7 @@
         <th>维修</th>
         <th>报废</th>
         <th>关联事件</th>
-        <th style="text-align: center">操作</th>
+        <th>操作</th>
     </tr>
     </thead>
     <tbody>
@@ -89,9 +89,9 @@
         <td>{{data.repaircount}}</td>
         <td>{{data.scrapcount}}</td>
         <td>{{data.eventSum}}</td>
-        <td class="handle text-center main-color">
+        <td class="handle  main-color">
             <span (click)="goToDetail(data)">查看</span>
-            <span (click)="deleteInVentory(data)">删除</span>
+            <span class="handle-delete" (click)="deleteInVentory(data)">删除</span>
         </td>
     </tr>
     </tbody>

src/main/webapp/app/work/inspect-plan-config/inspect-plan-config.component.html

@@ -39,7 +39,7 @@
         </button>
     </div>
 </div>
-<div nz-row [nzGutter]="4" class="padding-15-0">
+<div nz-row [nzGutter]="4" class="search-form">
     <div nz-col nzSpan="9">
         <span class="main-color margin-right-15">执行时间:</span>
         <nz-radio-group [(ngModel)]="time.type">
@@ -99,7 +99,7 @@
         <td>{{data.outsourcingnum}}</td>
         <td class="handle main-color">
             <span *ngIf="data.status != 2" (click)="editPlan(data.id)">编辑</span>
-            <span (click)="deletePlan(data)">删除</span>
+            <span class="handle-delete" (click)="deletePlan(data)">删除</span>
         </td>
     </tr>
     </tbody>

src/main/webapp/app/work/inspect-plan/inspect-plan.component.html

@@ -56,7 +56,7 @@
         <!--<th>计划工作量</th>-->
         <th>开始日期</th>
         <th>计划状态</th>
-        <th style="text-align: center">操作</th>
+        <th>操作</th>
     </tr>
     </thead>
     <tbody>
@@ -85,10 +85,10 @@
             <span *ngIf="data.status == 1">进行中</span>
             <span *ngIf="data.status == 2">已结束</span>
         </td>
-        <td class="handle text-center main-color">
+        <td class="handle main-color">
             <span (click)="lookPlan(data.id,data.title)">查看</span>
             <span *ngIf="data.status != 2" (click)="editPlan(data.id)">编辑</span>
-            <span (click)="deletePlan(data)">删除</span>
+            <span class="handle-delete" (click)="deletePlan(data)">删除</span>
         </td>
     </tr>
     </tbody>
@@ -98,4 +98,4 @@
 <smart-plan-modal #smartPlanMoadl (done)="getList()"></smart-plan-modal>
 
 <!--查看计划-->
-<smart-look-plan #smartLookPlan></smart-look-plan>
+<smart-look-plan #smartLookPlan></smart-look-plan>
\ No newline at end of file

src/main/webapp/app/work/pararms/pararms.component.html

@@ -43,7 +43,7 @@
       <div class="handle" *ngFor="let item of eventList;">
         <span>{{item.name}}</span>
         <span class="main-color" (click)="showEditModal('编辑事件分类',1,item)">编辑</span>
-        <span class="main-color" (click)="deleteItem(item)">删除</span>
+        <span class="handle-delete main-color" (click)="deleteItem(item)">删除</span>
       </div>
     </div>
   </div>
@@ -60,7 +60,7 @@
       <div class="handle" *ngFor="let item of planList;">
         <span>{{item.name}}</span>
         <span class="main-color" (click)="showEditModal('编辑计划分类',1,item)">编辑</span>
-        <span class="main-color" (click)="deleteItem(item)">删除</span>
+        <span class="handle-delete main-color" (click)="deleteItem(item)">删除</span>
       </div>
     </div>
   </div>

src/main/webapp/app/work/spare-parts-management/spare-parts-management.component.html

@@ -55,7 +55,7 @@
         <th>安装地点</th>
         <th>领用数量</th>
         <th>领用数量相关设施</th>
-        <th style="text-align: center">操作</th>
+        <th>操作</th>
     </tr>
     </thead>
     <tbody>
@@ -71,9 +71,9 @@
         <td>{{data.installLocation}}</td>
         <td>{{data.receiveNum}}</td>
         <td>{{data.relateFacility}}</td>
-        <td class="handle text-center main-color">
+        <td class="handle main-color">
             <span (click)="editData(data.id)">编辑</span>
-            <span (click)="deleteData(data)">删除</span>
+            <span class="handle-delete" (click)="deleteData(data)">删除</span>
         </td>
     </tr>
     </tbody>

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

@@ -71,7 +71,7 @@
     <th>事件分类</th>
     <th nzWidth="15%">处理人</th>
     <th>状态</th>
-    <th style="text-align: center">操作</th>
+    <th>操作</th>
   </tr>
   </thead>
   <tbody>
@@ -98,12 +98,12 @@
       <span *ngIf="data.status == 2">待确认</span>
       <span *ngIf="data.status == 1">已结束</span>
     </td>
-    <td class="handle text-center main-color">
+    <td class="handle main-color">
       <span *ngIf="data.status == 1" (click)="lookEvent(data)">查看</span>
       <span *ngIf="data.status == 0" (click)="goToHandle(data)">处理</span>
       <span *ngIf="data.status == 2" (click)="lookEvent(data)">确认评价</span>
       <span *ngIf="data.status == 0" (click)="showTransforModal(data)">转派</span>
-      <span (click)="deleteHandle(data)">删除</span>
+      <span class="handle-delete" (click)="deleteHandle(data)">删除</span>
     </td>
   </tr>
   </tbody>

src/main/webapp/content/css/documentation.css

@@ -72,9 +72,13 @@
 }
 
 .search-form {
-    padding: 15px 0;
+    padding: 15px;
     border-top: 1px solid #dddddd;
 }
+.search-form + .search-form{
+    border-top: none;
+    padding-top: 0;
+}
 
 .search-form .ant-input {
     width: 100%;
@@ -361,3 +365,7 @@
     -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=20)";
     filter: alpha(opacity=20);
 }
+.ant-table-wrapper{
+    padding: 15px;
+    background-color: #fff;
+}

src/main/webapp/content/scss/style.scss

@@ -71,7 +71,7 @@
 
 .container {
   height: 100%;
-  padding: 0 16px;
+  padding: 0 16px 16px;
 }
 
 nz-header {

src/main/webapp/content/scss/white.scss

@@ -2,12 +2,15 @@
   .ant-layout-header {
     background-color: #fff;
     border-bottom: 1px solid #eeeeee;
-
+    box-shadow:0px 1px 6px 0px rgba(0, 0, 0, 0.16);
   }
   nz-header {
     background: #ffffff;
     padding: 0 16px;
   }
+  .ant-table-thead > tr > th{
+    background-color: #e1e9f0;
+  }
 
 
 
@@ -17,6 +20,14 @@
     background-color: #414852;
   }
 
+  .container{
+    background-color: #ebedf0;
+  }
+
+  .search-form{
+    background-color: #e1e9f0;
+  }
+
   .userName {
     color: #4D5259;
   }
@@ -131,6 +142,9 @@
     color: #1b6b5b;
     margin-left: 10px
   }
+  .handle-delete{
+    color: #fc3869;
+  }
 }