page update

src/main/webapp/app/app.main.module.ts

@@ -120,6 +120,11 @@ import {MineComponent} from './mine/mine.component';
 import {CommonProblemComponent} from './knowladge/common-problem/common-problem.component';
 import {InformationTechComponent} from './knowladge/information-tech/information-tech.component';
 import {ManagementSystemComponent} from './knowladge/management-system/management-system.component';
+import {OprTeamComponent} from './project-manager/opr-team/opr-team.component';
+import {OprProjectComponent} from './project-manager/opr-project/opr-project.component';
+import {OprCostComponent} from './project-manager/opr-cost/opr-cost.component';
+import {OprCompanyComponent} from './project-manager/opr-company/opr-company.component';
+import {ProjectService} from './project-manager/project.service';
 
 @NgModule({
     imports: [
@@ -242,6 +247,10 @@ import {ManagementSystemComponent} from './knowladge/management-system/managemen
         CommonProblemComponent,
         InformationTechComponent,
         ManagementSystemComponent,
+        OprTeamComponent,
+        OprProjectComponent,
+        OprCostComponent,
+        OprCompanyComponent,
     ],
     providers: [
         OverAllService,
@@ -251,6 +260,7 @@ import {ManagementSystemComponent} from './knowladge/management-system/managemen
         AnalysisService,
         WorkService,
         BusinessService,
+        ProjectService,
         {provide: NZ_I18N, useValue: zh_CN},
     ],
     exports: [

src/main/webapp/app/app.route.ts

@@ -51,6 +51,10 @@ import {CommentStmt} from '@angular/compiler';
 import {CommonProblemComponent} from './knowladge/common-problem/common-problem.component';
 import {InformationTechComponent} from './knowladge/information-tech/information-tech.component';
 import {ManagementSystemComponent} from './knowladge/management-system/management-system.component';
+import {OprCompanyComponent} from './project-manager/opr-company/opr-company.component';
+import {OprCostComponent} from './project-manager/opr-cost/opr-cost.component';
+import {OprProjectComponent} from './project-manager/opr-project/opr-project.component';
+import {OprTeamComponent} from './project-manager/opr-team/opr-team.component';
 
 export const route: Routes = [
     {path: '', redirectTo: 'app/main/home', pathMatch: 'prefix'},  //空路由定向
@@ -107,6 +111,10 @@ export const route: Routes = [
                     {path: 'commonProblem', component: CommonProblemComponent, data: {breadcrumb: '常见问题'},},
                     {path: 'informationTech', component: InformationTechComponent, data: {breadcrumb: '信息技术'},},
                     {path: 'managementSystem', component: ManagementSystemComponent, data: {breadcrumb: '管理制度'},},
+                    {path: 'oprCompany', component: OprCompanyComponent, data: {breadcrumb: '运维公司'},},
+                    {path: 'oprCost', component: OprCostComponent, data: {breadcrumb: '运维费用'},},
+                    {path: 'oprProject', component: OprProjectComponent, data: {breadcrumb: '运维项目'},},
+                    {path: 'oprTeam', component: OprTeamComponent, data: {breadcrumb: '运维团队'},},
                     {path: 'mine', component: MineComponent, data: {breadcrumb: '菜单栏'},},
                 ]
             },

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

-<p>
-  opr-project works!
-</p>
+<div nz-row class="breadcrumbs">
+    <div nz-col nzSpan="16">
+        <nz-breadcrumb class="padding-8-0">
+            <nz-breadcrumb-item>
+                首页
+            </nz-breadcrumb-item>
+            <nz-breadcrumb-item>
+                <a>项目管理</a>
+            </nz-breadcrumb-item>
+            <nz-breadcrumb-item>
+                运维项目
+            </nz-breadcrumb-item>
+        </nz-breadcrumb>
+    </div>
+    <div nz-col nzSpan="8" class="text-right">
+        <button (click)="ngOnInit()" nz-button nzType="primary"><i class="anticon anticon-sync"></i></button>
+        <smart-full-screen></smart-full-screen>
+    </div>
+</div>
+<div nz-row [nzGutter]="4" class="search-form">
+    <div nz-col nzSpan="3">
+        <button (click)="showAddModal()" nz-button nzType="default"><i class="anticon anticon-plus-circle-o"></i>新增事件
+        </button>
+    </div>
+    <div nz-col nzSpan="5">
+        <nz-select nzAllowClear style="width: 100%;" [(ngModel)]="obj.type" nzPlaceHolder="项目单位">
+            <ng-container *ngFor="let item of eventTypeList">
+                <nz-option [nzLabel]="item.name" [nzValue]="item.id"></nz-option>
+            </ng-container>
+        </nz-select>
+    </div>
+    <div nz-col nzSpan="8">
+        <nz-date-picker
+                [nzFormat]="timeFormat"
+                [(ngModel)]="startTime"
+                nzPlaceHolder="项目年度"></nz-date-picker>
+    </div>
+    <div nz-col nzSpan="4">
+        <input type="text" nz-input [(ngModel)]="obj.searchStr" placeholder="项目名称、甲方名称、乙方名称、甲方负责人">
+    </div>
+    <div nz-col nzSpan="2">
+        <button (click)="search()"
+                nz-button nzType="default"><i class="anticon anticon-search" style="color: #6097b7"></i>搜索
+        </button>
+    </div>
+</div>
+<div nz-row [nzGutter]="4" class="search-form">
+    <div nz-col nzSpan="5">
+        项目状态:
+    </div>
+    <div nz-col nzSpan="3">
+        <button (click)="showAddModal()" nz-button nzType="default"><i class="anticon anticon-plus-circle-o"></i>新增运维项目
+        </button>
+    </div>
+    <div nz-col nzSpan="2">
+        <button (click)="search()"
+                nz-button nzType="default"><i class="anticon anticon-search" style="color: #6097b7"></i>导出
+        </button>
+    </div>
+</div>
+<nz-table #nzTable [nzData]="page.list" [nzLoading]="page.isLoading" [nzFrontPagination]="false"
+          [nzTotal]="page.totalNum"
+          [nzPageIndex]="page.pageNum" [nzPageSize]="page.pageCount" (nzPageIndexChange)="change($event)">
+    <thead>
+    <tr>
+        <th>项目单位</th>
+        <th>项目名称</th>
+        <th>项目负责人</th>
+        <th>项目年度</th>
+        <th>项目状态</th>
+        <th>乙方公司</th>
+        <th>乙方维护组长</th>
+        <th>项目金额</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr *ngFor="let data of nzTable.data">
+        <td class="round-tag tag-form">
+            {{data.id}}
+        </td>
+        <td>
+            {{data.title}}
+        </td>
+        <td>{{data.createTime | date:"yyyy-MM-dd HH:mm:ss"}}</td>
+        <td>
+            <span *ngIf="data.source == 0">系统告警</span>
+            <span *ngIf="data.source == 1">手动新增</span>
+        </td>
+        <td>{{data.typeName}}</td>
+        <td>
+      <span style="margin-right: 5px;" *ngFor="let item of data?.operators">
+        {{item.username}}
+      </span>
+        </td>
+        <td>
+            <span *ngIf="data.status == 0">待处理</span>
+            <span *ngIf="data.status == 2">待确认</span>
+            <span *ngIf="data.status == 1">已结束</span>
+        </td>
+        <td class="handle text-center main-color">
+            <span *ngIf="data.status == 1" (click)="lookEvent(data)">查看</span>
+            <span *ngIf="data.status == 0 || data.status == 2" (click)="goToHandle(data)">处理</span>
+            <span *ngIf="data.status == 0 " (click)="showTransforModal(data)">转派</span>
+            <span (click)="deleteHandle(data)">删除</span>
+        </td>
+    </tr>
+    </tbody>
+</nz-table>

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

-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit, ViewChild} from '@angular/core';
+import {EventComponent} from '../../work/work-handle/Event/event.component';
+import {TransforComponent} from '../../work/modal/transfor/transfor.component';
+import {SelectPersonComponent} from '../../modal/select-person/select-person.component';
+import {pageSize} from '../../app.constants';
+import {WorkService} from '../../work/work.service';
+import {NzMessageService} from 'ng-zorro-antd';
+import {Router} from '@angular/router';
+import {CommonService} from '../../shared/common/common.service';
+import {DatePipe} from '@angular/common';
+import {ProjectService} from '../project.service';
 
 @Component({
     selector: 'app-opr-project',
@@ -7,9 +17,103 @@ import { Component, OnInit } from '@angular/core';
 })
 export class OprProjectComponent implements OnInit {
 
-  constructor() { }
+    timeFormat = 'yyyy';
+
+    statusList = [{key: '全部', value: null}, {key: '执行中', value: 0}, {key: '已完成', value: 1}, {key: '待执行', value: 2}];
+
+    page = {
+        list: [],
+        isLoading: false,
+        pageCount: pageSize,
+        pageNum: 1,
+        totalNum: null
+    };
+
+    obj = {
+        yearly: null,
+        officeName: null,
+        status: '',
+        companyName: null,
+        keyword: ''
+    };
+
+    constructor(private workSer: WorkService, private message: NzMessageService,private projectSer:ProjectService,
+                private router: Router, private commonSer: CommonService, private datePipe: DatePipe) {
+    }
 
     ngOnInit() {
+        this.getList();
+    }
+
+    //获取列表
+    getList() {
+        this.page.isLoading = true;
+        const obj = {
+            obj: this.obj,
+            pageNum: this.page.pageNum,
+            pageCount: this.page.pageCount
+        };
+        this.projectSer.selectMaintainProject(obj).subscribe(
+            (res) => {
+                if (res.errCode == 10000) {
+                    this.page.list = res.data.data;
+                    this.page.totalNum = res.data.totalNum;
+                    this.page.isLoading = false;
+                }
+            }
+        );
+    }
+
+    //翻页
+    change(e) {
+        this.page.pageNum = e;
+        this.getList();
+    }
+
+    //查看详情
+    lookEvent(item) {
+        this.router.navigate(['app/main/handleDetail'], {
+            queryParams: {
+                eventId: item.id
+            }
+        });
+    }
+
+    //处理事件
+    goToHandle(item) {
+        this.router.navigate(['app/main/handleEvent'], {
+            queryParams: {
+                eventId: item.id
+            }
+        });
+    }
+
+    //删除事件
+    deleteHandle(data) {
+        const arr = {
+            ids: []
+        };
+        arr.ids.push(data.id);
+        this.commonSer.confirmThing('删除', '确定删除该事件', () => {
+            this.workSer.deleteEvent(arr).subscribe(
+                (res) => {
+                    if (res.errCode == 10000) {
+                        this.message.success('删除成功');
+                        this.getList();
+                    } else {
+                        this.message.error(res.errMsg);
+                    }
+                }
+            );
+        });
+    }
+
+    //搜索
+    search() {
+        this.page.pageNum = 1;
+        // this.obj.startTime = this.datePipe.transform(this.startTime, 'yyyy-MM-dd HH:mm:ss');
+        // this.obj.endTime = this.datePipe.transform(this.endTime, 'yyyy-MM-dd HH:mm:ss');
+        this.getList();
     }
 
 }

src/main/webapp/app/project-manager/project.service.ts

 import {HttpClient} from '@angular/common/http';
 import {Observable} from 'rxjs/Rx';
 import {Injectable} from '@angular/core';
-import {SERVER_API_URL, SERVER_API_URL_COMS} from '../app.constants';
+import {SERVER_API_URL} from '../app.constants';
 import {CommonService} from '../shared/common/common.service';
 import {LocalStorageService, SessionStorageService} from 'ngx-webstorage';
-import {Http, RequestOptions, ResponseContentType, ResponseOptions} from '@angular/http';
 
 @Injectable()
 export class ProjectService {
@@ -12,112 +11,112 @@ export class ProjectService {
     headers;
     options;
 
-    constructor(private http: HttpClient, private commonSer: CommonService, private http1: Http,
+    constructor(private http: HttpClient, private commonSer: CommonService,
                 private localStorage: LocalStorageService, private sessionStorage: SessionStorageService) {
     }
 
     //修改运维公司
     updateMaintainCompany(data): Observable<any> {
-        return this.http.post(SERVER_API_URL_COMS + '/maintainCompany/updateMaintainCompany', data);
+        return this.http.post(SERVER_API_URL + '/maintainCompany/updateMaintainCompany', data);
     }
 
     //删除运维公司
     deleteMaintainCompany(data): Observable<any> {
-        return this.http.post(SERVER_API_URL_COMS + '/maintainCompany/deleteMaintainCompany', data);
+        return this.http.post(SERVER_API_URL + '/maintainCompany/deleteMaintainCompany', data);
     }
 
     //增加运维公司
     addMaintainCompany(data): Observable<any> {
-        return this.http.post(SERVER_API_URL_COMS + '/maintainCompany/addMaintainCompany', data);
+        return this.http.post(SERVER_API_URL + '/maintainCompany/addMaintainCompany', data);
     }
 
     //查询运维公司
     selectMaintainCompany(data): Observable<any> {
-        return this.http.post(SERVER_API_URL_COMS + '/maintainCompany/selectMaintainCompany', data);
+        return this.http.post(SERVER_API_URL + '/maintainCompany/selectMaintainCompany', data);
     }
 
     //查询运维公司
     selectMaintainCompanyCountsById(data): Observable<any> {
-        return this.http.post(SERVER_API_URL_COMS + '/maintainCompany/selectMaintainCompanyCountsById', data);
+        return this.http.post(SERVER_API_URL + '/maintainCompany/selectMaintainCompanyCountsById', data);
     }
 
     //修改运维团队
     updateMaintainTeam(data): Observable<any> {
-        return this.http.post(SERVER_API_URL_COMS + '/maintainTeam/updateMaintainTeam', data);
+        return this.http.post(SERVER_API_URL + '/maintainTeam/updateMaintainTeam', data);
     }
 
     //创建运维团队
     addMaintainTeam(data): Observable<any> {
-        return this.http.post(SERVER_API_URL_COMS + '/maintainTeam/addMaintainTeam', data);
+        return this.http.post(SERVER_API_URL + '/maintainTeam/addMaintainTeam', data);
     }
 
     //删除运维团队
     deleteMaintainTeam(data): Observable<any> {
-        return this.http.post(SERVER_API_URL_COMS + '/maintainTeam/deleteMaintainTeam', data);
+        return this.http.post(SERVER_API_URL + '/maintainTeam/deleteMaintainTeam', data);
     }
 
     //查询运维团队数量
     selectTeamCountById(data): Observable<any> {
-        return this.http.post(SERVER_API_URL_COMS + '/maintainTeam/selectTeamCountById', data);
+        return this.http.post(SERVER_API_URL + '/maintainTeam/selectTeamCountById', data);
     }
 
     //查询运维团队
     selectMaintainTeam(data): Observable<any> {
-        return this.http.post(SERVER_API_URL_COMS + '/maintainTeam/selectMaintainTeam', data);
+        return this.http.post(SERVER_API_URL + '/maintainTeam/selectMaintainTeam', data);
     }
 
     //修改运维团队成员
     updateMaintainTeamUser(data): Observable<any> {
-        return this.http.post(SERVER_API_URL_COMS + '/maintainTeamUser/updateMaintainTeamUser', data);
+        return this.http.post(SERVER_API_URL + '/maintainTeamUser/updateMaintainTeamUser', data);
     }
 
     //创建运维成员
     addMaintainTeamUser(data): Observable<any> {
-        return this.http.post(SERVER_API_URL_COMS + '/maintainTeamUser/addMaintainTeamUser', data);
+        return this.http.post(SERVER_API_URL + '/maintainTeamUser/addMaintainTeamUser', data);
     }
 
     //删除运维团队成员
     deleteMaintainTeamUser(data): Observable<any> {
-        return this.http.post(SERVER_API_URL_COMS + '/maintainTeamUser/deleteMaintainTeamUser', data);
+        return this.http.post(SERVER_API_URL + '/maintainTeamUser/deleteMaintainTeamUser', data);
     }
 
     //查询运维团队成员数量
     selectTeamUserCount(data): Observable<any> {
-        return this.http.post(SERVER_API_URL_COMS + '/maintainTeamUser/selectTeamUserCount', data);
+        return this.http.post(SERVER_API_URL + '/maintainTeamUser/selectTeamUserCount', data);
     }
 
     //查询运维成员
     selectMaintainTeamUser(data): Observable<any> {
-        return this.http.post(SERVER_API_URL_COMS + '/maintainTeamUser/selectMaintainTeamUser', data);
+        return this.http.post(SERVER_API_URL + '/maintainTeamUser/selectMaintainTeamUser', data);
     }
 
     //修改运维项目
     updateMaintainProject(data): Observable<any> {
-        return this.http.post(SERVER_API_URL_COMS + '/maintainProject/updateMaintainProject', data);
+        return this.http.post(SERVER_API_URL + '/maintainProject/updateMaintainProject', data);
     }
 
     //创建运维项目
     addMaintainProject(data): Observable<any> {
-        return this.http.post(SERVER_API_URL_COMS + '/maintainProject/addMaintainProject', data);
+        return this.http.post(SERVER_API_URL + '/maintainProject/addMaintainProject', data);
     }
 
     //删除运维项目
     deleteMaintainProject(data): Observable<any> {
-        return this.http.post(SERVER_API_URL_COMS + '/maintainProject/deleteMaintainProject', data);
+        return this.http.post(SERVER_API_URL + '/maintainProject/deleteMaintainProject', data);
     }
 
     //查询运维项目
     selectMaintainProject(data): Observable<any> {
-        return this.http.post(SERVER_API_URL_COMS + '/maintainProject/selectMaintainProject', data);
+        return this.http.post(SERVER_API_URL + '/maintainProject/selectMaintainProject', data);
     }
 
     //查询运维项目数量
     selectProjectCount(data): Observable<any> {
-        return this.http.post(SERVER_API_URL_COMS + '/maintainProject/selectProjectCount', data);
+        return this.http.post(SERVER_API_URL + '/maintainProject/selectProjectCount', data);
     }
 
     //跟踪记录查询
     selectProjectCount1(data): Observable<any> {
-        return this.http.post(SERVER_API_URL_COMS + '/maintainProject/selectProjectCount', data);
+        return this.http.post(SERVER_API_URL + '/maintainProject/selectProjectCount', data);
     }
 }