Skip to content

S
smart
Commit 9c5d2c6a authored by wangqinghua's avatar wangqinghua
Browse files
Options

bug update

parent 328dfc33
Hide whitespace changes
Inline Side-by-side
Showing with 146 additions and 89 deletions
README.md
View file @ 9c5d2c6a
......@@ -55,9 +55,9 @@ Module ng g module my-module
v2.0.1 修复选择节点之后 流量查询不出来
#上传文件到服务器
scp -r 22 build/master root@10.10.38.99:/home/nginx/www/
scp -r 22 build/master root@10.10.38.99:/home/nginx/www/ 监控2.0
scp -r 22 build/wx root@10.10.38.99:/home/nginx/html/www/
scp -r 22 build/wx root@10.10.38.99:/home/nginx/html/www/ 监控1.0
#git 命令：
创建分支 git checkout -b test
......
src/main/webapp/app/analysis/sys-change-count/sys-change-count.component.html
View file @ 9c5d2c6a
......@@ -9,7 +9,7 @@
<a>统计分析</a>
</nz-breadcrumb-item>
<nz-breadcrumb-item>
资源可用性统计
系统变更统计
</nz-breadcrumb-item>
</nz-breadcrumb>
</div>
......@@ -20,14 +20,14 @@
</div>
<div nz-row [nzGutter]="4" class="search-form">
<div nz-col nzSpan="3">
<nz-select style="width: 100%;" nzPlaceHolder="变更级别" nzShowSearch [(ngModel)]="obj.type">
<nz-select style="width: 100%;" nzPlaceHolder="变更级别" nzShowSearch nzAllowClear [(ngModel)]="obj.type">
<ng-container *ngFor="let item of change_level">
<nz-option [nzLabel]="item.label" [nzValue]="item.value"></nz-option>
</ng-container>
</nz-select>
</div>
<div nz-col nzSpan="3">
<nz-select style="width: 100%;" nzPlaceHolder="变更类型" nzShowSearch [(ngModel)]="obj.classifyId">
<nz-select style="width: 100%;" nzPlaceHolder="变更类型" nzShowSearch nzAllowClear [(ngModel)]="obj.classifyId">
<ng-container *ngFor="let item of typeList">
<nz-option [nzLabel]="item.label" [nzValue]="item.id"></nz-option>
</ng-container>
......
src/main/webapp/app/app.main.module.ts
View file @ 9c5d2c6a
......@@ -179,6 +179,8 @@ import {BreadcrumbComponent} from './layouts/breadcrumb/breadcrumb.component';
import {EarlyWarningModule} from './early-warning/early-warning.module';
import {InformationProjectModule} from './information-project/information-project.module';
import {NotationComponent} from './early-warning/modal/notation/notation.component';
import {LookCompanyComponent} from './project-manager/modal/look-company/look-company.component';
import {LookProjectComponent} from './project-manager/modal/look-project/look-project.component';
@NgModule({
imports: [
......@@ -352,6 +354,8 @@ import {NotationComponent} from './early-warning/modal/notation/notation.compone
OnlineWorkModalComponent,
VideoMeetModalComponent,
BreadcrumbComponent,
LookCompanyComponent,
LookProjectComponent,
],
providers: [
OverAllService,
......
src/main/webapp/app/early-warning/modal/notation/notation.component.html
View file @ 9c5d2c6a
......@@ -65,7 +65,7 @@
</nz-card>
</div>
</div>
<div class="padding-15-0 text-center">
<div class="padding-15-0 text-center" *ngIf="modal.type == 'add'">
<button nz-button [nzLoading]="modal.isOkLoading" (click)="saveNotation()" nzType="primary">保存</button>
<button nz-button (click)="handleCancel()" nzType="primary">取消</button>
</div>
......
src/main/webapp/app/early-warning/modal/notation/notation.component.ts
View file @ 9c5d2c6a
......@@ -37,6 +37,7 @@ export class NotationComponent implements OnInit {
this.modal.isVisible = true;
this.modal.type = 'add';
this.msgId = item.id;
this.smartWarningTrackInfo.outGet(item.id);
this.getDetail();
}
......@@ -45,6 +46,7 @@ export class NotationComponent implements OnInit {
this.modal.isVisible = true;
this.modal.type = 'look';
this.msgId = item.id;
this.smartWarningTrackInfo.outGet(item.id);
this.getDetail();
}
......@@ -92,6 +94,7 @@ export class NotationComponent implements OnInit {
this.modal.isOkLoading = false;
this.modal.isVisible = false;
this.newestRemark = '';
this.tabNum = 0;
}
//切换tab
......
src/main/webapp/app/early-warning/modal/warnging-rule/warnging-rule.component.html
View file @ 9c5d2c6a
......@@ -6,13 +6,14 @@
<p>基本信息</p>
<form nz-form [formGroup]="validateForm">
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6" nzFor="name">规则名称
<nz-form-label [nzSpan]="6" nzRequired nzFor="name">规则名称
</nz-form-label>
<nz-form-control [nzSpan]="18">
<input id="name" placeholder="规则名称" name="name"
type="text"
nz-input
formControlName="name">
<nz-form-explain *ngIf="validateForm.get('name').dirty && validateForm.get('name').errors">请输入规则名称</nz-form-explain>
</nz-form-control>
</nz-form-item>
<nz-form-item nzFlex>
......
src/main/webapp/app/early-warning/modal/warnging-rule/warnging-rule.component.ts
View file @ 9c5d2c6a
......@@ -83,6 +83,13 @@ export class WarngingRuleComponent implements OnInit {
//添加批注
saveNotation() {
for (let i in this.validateForm.controls) {
this.validateForm.controls[i].markAsDirty();
this.validateForm.controls[i].updateValueAndValidity();
}
if (this.validateForm.invalid) {
return false;
}
this.modal.isOkLoading = true;
this.earlySer.addWarningRule(this.validateForm.value).subscribe(
(res) => {
......
src/main/webapp/app/early-warning/modal/warning-track-info/warning-track-info.component.ts
View file @ 9c5d2c6a
......@@ -8,8 +8,6 @@ import {NzMessageService} from 'ng-zorro-antd';
styles: []
})
export class WarningTrackInfoComponent implements OnInit {
@Input() msgId;
@Input() title;
warnList = [];
......@@ -20,6 +18,7 @@ export class WarningTrackInfoComponent implements OnInit {
totalNum: 0,
loading: false,
};
msgId;
constructor(public warningSer: EarlyWarningService, public message: NzMessageService,
) {
......@@ -29,8 +28,9 @@ export class WarningTrackInfoComponent implements OnInit {
this.getList()
}
outGet() {
outGet(id) {
this.page.pageNum = 1;
this.msgId = id;
this.getList();
}
......
src/main/webapp/app/early-warning/role-warning/role-warning.component.html
View file @ 9c5d2c6a
......@@ -30,7 +30,7 @@
</button>
</div>
<div nz-col nzSpan="5">
<input type="text" (keyup.enter)="search()" nz-input [(ngModel)]="obj.keyword" placeholder="预警名称、预警内容、触发规则、创建人">
<input type="text" (keyup.enter)="search()" nz-input [(ngModel)]="obj.keyword" placeholder="预警名称、预警内容、创建人">
</div>
<div nz-col nzSpan="2">
<button (click)="search()"
......
src/main/webapp/app/overview/my-follow/my-follow.component.html
View file @ 9c5d2c6a
......@@ -140,20 +140,18 @@
[nzLoading]="loading.spareLoading">
<thead>
<tr>
<th>编号</th>
<th nzWidth="30%">名称</th>
<th>品牌</th>
<th>型号</th>
<th>序列号</th>
<th>备件编号</th>
<th nzWidth="30%">备件名称</th>
<th>所属类型</th>
<th>归属项目</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let data of nzTable4.data">
<td>{{data.versionNo}}</td>
<td>{{data.name}}</td>
<td>{{data.brand}}</td>
<td>{{data.model}}</td>
<td>{{data.serialNo}}</td>
<td>{{data.inventoryNo}}</td>
<td>{{data.inventoryName}}</td>
<td>{{data.inventoryType}}</td>
<td>{{data.belongObject}}</td>
</tr>
</tbody>
</nz-table>
......
src/main/webapp/app/project-manager/modal/create-company/create-company.component.html
View file @ 9c5d2c6a
......@@ -6,7 +6,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" placeholder="公司名称">
<input nz-input formControlName="name" id="name" placeholder="公司名称">
<nz-form-explain *ngIf="validateForm.get('name').dirty && validateForm.get('name').errors">
请输入公司名称
</nz-form-explain>
......@@ -15,7 +15,7 @@
<nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24" nzFor="principal">维护负责人</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24">
<input nz-input formControlName="principal" id="principal" placeholder="维护负责人">
<input nz-input formControlName="principal" id="principal" placeholder="维护负责人">
<nz-form-explain *ngIf="validateForm.get('principal').dirty && validateForm.get('principal').errors">
请输入维护负责人
</nz-form-explain>
......@@ -24,7 +24,7 @@
<nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24" nzFor="phone">联系电话1</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24">
<input nz-input formControlName="phone" id="phone" placeholder="联系电话">
<input nz-input formControlName="phone" id="phone" placeholder="联系电话">
<nz-form-explain *ngIf="validateForm.get('phone').dirty && validateForm.get('phone').errors">手机号码错误!
</nz-form-explain>
</nz-form-control>
......@@ -32,7 +32,7 @@
<nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24" nzFor="phone2">联系电话2</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24">
<input nz-input formControlName="phone2" id="phone2" placeholder="联系电话">
<input nz-input formControlName="phone2" id="phone2" placeholder="联系电话">
<nz-form-explain *ngIf="validateForm.get('phone2').dirty && validateForm.get('phone2').errors">手机号码错误!
</nz-form-explain>
</nz-form-control>
......@@ -40,7 +40,7 @@
<nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="type">维护类型</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24">
<nz-select name="type" formControlName="type" id="type" nzPlaceHolder="选择设备类型">
<nz-select name="type" formControlName="type" id="type" nzPlaceHolder="选择设备类型">
<ng-container *ngFor="let item of opr_company_type">
<nz-option [nzLabel]="item.label" [nzValue]="item.value"></nz-option>
</ng-container>
......@@ -50,19 +50,7 @@
<nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24" nzFor="description">职责描述</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24">
<textarea formControlName="description" nz-input rows="2" placeholder="职责描述"></textarea>
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24" nzFor="group">相关附件</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24">
<nz-upload
[nzBeforeUpload]="beforeUpload"
[(nzFileList)]="fileList">
<button nz-button>
<i class="anticon anticon-upload"></i><span>上传</span>
</button>
</nz-upload>
<textarea formControlName="description" nz-input rows="2" placeholder="职责描述"></textarea>
</nz-form-control>
</nz-form-item>
</form>
......
src/main/webapp/app/project-manager/modal/create-company/create-company.component.ts
View file @ 9c5d2c6a
......@@ -32,6 +32,7 @@ export class CreateCompanyComponent implements OnInit {
opr_company_type = opr_company_type;
cID;
type = '';
constructor(private fb: FormBuilder, private systemSer: SystemService,
private message: NzMessageService, private projectSer: ProjectService) {
......@@ -68,6 +69,13 @@ export class CreateCompanyComponent implements OnInit {
this.validateForm.patchValue(data);
}
showLookModal(data) {
this.isVisible = true;
this.title = data.name;
this.type = 'look';
this.validateForm.patchValue(data);
}
handleCancel() {
this.isVisible = false;
this.initForm();
......
src/main/webapp/app/project-manager/modal/create-project/create-project.component.html
View file @ 9c5d2c6a
......@@ -7,7 +7,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" placeholder="项目名称">
<input nz-input formControlName="name" id="name" placeholder="项目名称">
<nz-form-explain *ngIf="validateForm.get('name').dirty && validateForm.get('name').errors">
请输入项目名称
</nz-form-explain>
......@@ -16,7 +16,7 @@
<nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="type">项目类型</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24">
<nz-select name="type" formControlName="type" id="type" nzPlaceHolder="项目类型">
<nz-select name="type" formControlName="type" id="type" nzPlaceHolder="项目类型">
<ng-container *ngFor="let item of opr_company_type">
<nz-option [nzLabel]="item.label" [nzValue]="item.value"></nz-option>
</ng-container>
......@@ -26,15 +26,15 @@
<nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24" nzFor="officeName">项目单位</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24">
<input nz-input formControlName="officeName" id="officeName" placeholder="项目名称">
<input nz-input formControlName="officeName" id="officeName" placeholder="项目名称">
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24" nzFor="companyName">乙方名称</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24">
<input disabled nz-input formControlName="companyName" style="width: 85%;display: inline-block"
placeholder="项目名称" id="companyName">
<button nz-button nzType="primary" (click)="showProjectmodal()">选择</button>
placeholder="乙方名称" id="companyName">
<button *ngIf="type != 'look'" nz-button nzType="primary" (click)="showProjectmodal()">选择</button>
</nz-form-control>
</nz-form-item>
<nz-form-item>
......@@ -58,13 +58,13 @@
<nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24" nzFor="amount">项目金额</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24">
<input nz-input formControlName="amount" id="amount" placeholder="项目金额">
<input nz-input formControlName="amount" id="amount" placeholder="项目金额">
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24" nzFor="officePrincipal">单位负责人</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24">
<input nz-input formControlName="officePrincipal" placeholder="单位负责人" id="officePrincipal">
<input nz-input formControlName="officePrincipal" placeholder="单位负责人" id="officePrincipal">
</nz-form-control>
</nz-form-item>
<nz-form-item>
......@@ -73,7 +73,7 @@
<input disabled nz-input formControlName="bprincipalName"
style="width: 85%;display: inline-block"
id="bprincipalName" placeholder="乙方维护组长">
<button nz-button nzType="primary" (click)="showSelectPeople()">选择</button>
<button *ngIf="type != 'look'" nz-button nzType="primary" (click)="showSelectPeople()">选择</button>
</nz-form-control>
</nz-form-item>
</form>
......
src/main/webapp/app/project-manager/modal/create-project/create-project.component.ts
View file @ 9c5d2c6a
......@@ -14,9 +14,9 @@ import {WorkService} from '../../../work/work.service';
selector: 'smart-create-project',
templateUrl: './create-project.component.html',
styles: [
`
:host ::ng-deep .ant-input-disabled{
color: rgba(0,0,0,.65);
`
:host ::ng-deep .ant-input-disabled {
color: rgba(0, 0, 0, .65);
background-color: #fff;
}
`
......@@ -39,9 +39,10 @@ export class CreateProjectComponent implements OnInit {
opr_company_type = project_type;
cID;
type = '';
constructor(private fb: FormBuilder, private systemSer: SystemService,
private workSer:WorkService,
private workSer: WorkService,
private message: NzMessageService, private projectSer: ProjectService) {
}
......@@ -84,6 +85,13 @@ export class CreateProjectComponent implements OnInit {
this.validateForm.patchValue(data);
}
showLookModal(data) {
this.isVisible = true;
this.title = data.name;
this.type = 'look';
this.validateForm.patchValue(data);
}
handleCancel() {
this.isVisible = false;
this.isOkLoading = false;
......@@ -182,7 +190,7 @@ export class CreateProjectComponent implements OnInit {
this.message.info('请选择乙方公司');
return;
}
this.smartTeamModal.showModal(this.validateForm.value.companyId,'乙方维护组长');
this.smartTeamModal.showModal(this.validateForm.value.companyId, '乙方维护组长');
}
setPeople(e) {
......
src/main/webapp/app/project-manager/opr-company/opr-company.component.html
View file @ 9c5d2c6a
......@@ -65,11 +65,13 @@
<td>{{data.projectNum}}</td>
<td>{{data.totalAmount}}</td>
<td class="handle main-color">
<span (click)="handleEditModa(data)">编辑</span>
<span (click)="handleDelete(data)">删除</span>
<span (click)="handleLook(data)">查看</span>
<span *ngIf="userId == data.createUserId" (click)="handleEditModa(data)">编辑</span>
<span *ngIf="userId == data.createUserId" (click)="handleDelete(data)">删除</span>
</td>
</tr>
</tbody>
</nz-table>
<smart-create-company #smartCreateCompany (done)="getList()"></smart-create-company>
<smart-look-company #smartLookCompany></smart-look-company>
src/main/webapp/app/project-manager/opr-company/opr-company.component.ts
View file @ 9c5d2c6a
......@@ -8,6 +8,8 @@ import {Router} from '@angular/router';
import {CommonService} from '../../shared/common/common.service';
import {DatePipe} from '@angular/common';
import {CreateCompanyComponent} from '../modal/create-company/create-company.component';
import {LocalStorageService} from 'ngx-webstorage';
import {LookCompanyComponent} from '../modal/look-company/look-company.component';
@Component({
selector: 'app-opr-company',
......@@ -17,6 +19,7 @@ import {CreateCompanyComponent} from '../modal/create-company/create-company.com
export class OprCompanyComponent implements OnInit {
@ViewChild('smartCreateCompany') smartCreateCompany: CreateCompanyComponent;
@ViewChild('smartLookCompany') smartLookCompany: LookCompanyComponent;
companyType = [{label: '全部', value: null}, ...opr_company_type];
page = {
......@@ -31,12 +34,15 @@ export class OprCompanyComponent implements OnInit {
name: '',
type: null
};
userId;
constructor(private workSer: WorkService, private message: NzMessageService, private projectSer: ProjectService,
private $localStorage: LocalStorageService,
private router: Router, private commonSer: CommonService, private datePipe: DatePipe) {
}
ngOnInit() {
this.userId = this.$localStorage.retrieve('userInfo').userId;
this.getList();
}
......@@ -61,7 +67,7 @@ export class OprCompanyComponent implements OnInit {
//翻页
change(e) {
if(e > 0){
if (e > 0) {
this.page.pageNum = e;
this.getList();
}
......@@ -82,21 +88,26 @@ export class OprCompanyComponent implements OnInit {
this.smartCreateCompany.showEditModal(item, '编辑运维公司');
}
//查看
handleLook(item){
this.smartLookCompany.showModal(item);
}
//删除
handleDelete(item){
this.commonSer.confirmThing('删除',"确定删除该公司?",()=>{
handleDelete(item) {
this.commonSer.confirmThing('删除', '确定删除该公司?', () => {
const data = {
id:item.id
id: item.id
};
this.projectSer.deleteMaintainCompany(data).subscribe(
(res)=>{
if(res.errCode == 10000){
(res) => {
if (res.errCode == 10000) {
this.message.success('删除成功!');
this.getList();
}
}
)
})
);
});
}
}
src/main/webapp/app/project-manager/opr-cost/opr-cost.component.html
View file @ 9c5d2c6a
......@@ -44,8 +44,8 @@
[nzValue]="item.value">{{item.label}}</label>
</nz-radio-group>
</div>
<div nz-col nzSpan="6">
<ng-container *ngIf="time.type == '7'">
<div nz-col nzSpan="8">
<ng-container *ngIf="time.type == '99'">
<nz-date-picker
[nzFormat]="timeFormat"
[(ngModel)]="time.startTime"
......@@ -88,7 +88,7 @@
<td>{{data.othernum}}项/{{data.othermoney}}元</td>
<td class="handle main-color">
<span (click)="lookCostModal(data)">查看</span>
<span (click)="handleDelete(data)">删除</span>
<span *ngIf="userId == data.createUserId" (click)="handleDelete(data)">删除</span>
</td>
</tr>
</tbody>
......
src/main/webapp/app/project-manager/opr-cost/opr-cost.component.ts
View file @ 9c5d2c6a
......@@ -8,6 +8,7 @@ import {Router} from '@angular/router';
import {CommonService} from '../../shared/common/common.service';
import {DatePipe} from '@angular/common';
import {CostModalComponent} from '../modal/cost-modal/cost-modal.component';
import {LocalStorageService} from 'ngx-webstorage';
@Component({
selector: 'app-opr-cost',
......@@ -42,12 +43,15 @@ export class OprCostComponent implements OnInit {
startTime: null, //开始时间
endTime: null //结束时间
};
userId;
constructor(private workSer: WorkService, private message: NzMessageService, private projectSer: ProjectService,
private $localStorage: LocalStorageService,
private router: Router, private commonSer: CommonService, private datePipe: DatePipe) {
}
ngOnInit() {
this.userId = this.$localStorage.retrieve('userInfo').userId;
this.getList();
}
......@@ -79,7 +83,7 @@ export class OprCostComponent implements OnInit {
}
changeTimeType() {
if (this.time.type == '7') return;
if (this.time.type == '99') return;
this.obj.startTime = this.commonSer.getTimeByType(this.time.type).startTime;
this.obj.endTime = this.commonSer.getTimeByType(this.time.type).endTime;
console.log(this.obj);
......@@ -90,6 +94,10 @@ export class OprCostComponent implements OnInit {
//搜索
search() {
this.page.pageNum = 1;
if (this.time.type == '99') {
this.obj.startTime = this.datePipe.transform(this.time.startTime, 'yyyy-MM-dd') +' 00:00:00';
this.obj.endTime = this.datePipe.transform(this.time.endTime, 'yyyy-MM-dd') +' 23:59:59';
}
this.getList();
}
......
src/main/webapp/app/project-manager/opr-project/opr-project.component.html
View file @ 9c5d2c6a
......@@ -97,11 +97,12 @@
</td>
<td>{{data.amount}}</td>
<td class="handle main-color">
<span (click)="handleEdit(data)">编辑</span>
<span (click)="handleDelete(data)">删除</span>
<span (click)="handleLook(data)">查看</span>
<span *ngIf="userId == data.createUserId" (click)="handleEdit(data)">编辑</span>
<span *ngIf="userId == data.createUserId" (click)="handleDelete(data)">删除</span>
</td>
</tr>
</tbody>
</nz-table>
<smart-look-project #smartLookProject></smart-look-project>
<smart-create-project #smartCreateProject (done)="getList()"></smart-create-project>
src/main/webapp/app/project-manager/opr-project/opr-project.component.ts
View file @ 9c5d2c6a
......@@ -11,6 +11,8 @@ import {DatePipe} from '@angular/common';
import {ProjectService} from '../project.service';
import {project_status} from '../project.constants';
import {CreateProjectComponent} from '../modal/create-project/create-project.component';
import {LocalStorageService} from 'ngx-webstorage';
import {LookProjectComponent} from '../modal/look-project/look-project.component';
@Component({
selector: 'app-opr-project',
......@@ -19,6 +21,7 @@ import {CreateProjectComponent} from '../modal/create-project/create-project.com
})
export class OprProjectComponent implements OnInit {
@ViewChild('smartCreateProject') smartCreateProject: CreateProjectComponent;
@ViewChild('smartLookProject') smartLookProject: LookProjectComponent;
timeFormat = 'yyyy';
......@@ -41,12 +44,15 @@ export class OprProjectComponent implements OnInit {
};
yearList = [];
userId;
constructor(private workSer: WorkService, private message: NzMessageService, private projectSer: ProjectService,
private $localStorage:LocalStorageService,
private router: Router, private commonSer: CommonService, private datePipe: DatePipe) {
}
ngOnInit() {
this.userId = this.$localStorage.retrieve('userInfo').userId;
let nowYear = new Date().getFullYear();
for (let i = nowYear; i > 2000; i--) {
const y = {
......@@ -88,8 +94,6 @@ export class OprProjectComponent implements OnInit {
//搜索
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();
}
......@@ -103,6 +107,11 @@ export class OprProjectComponent implements OnInit {
this.smartCreateProject.showEditModal(data, '编辑运维项目');
}
//查看
handleLook(data){
this.smartLookProject.showModal(data);
}
//删除
handleDelete(item){
this.commonSer.confirmThing('删除',"确定删除该项目?",()=>{
......
src/main/webapp/app/project-manager/opr-team/opr-team.component.html
View file @ 9c5d2c6a
......@@ -63,9 +63,10 @@
<td>{{data.projectName}}</td>
<td>{{data.principal}}</td>
<td class="handle main-color">
<span (click)="handleEdit(data)">更新团队信息</span>
<span (click)="handleUpdateTeam(data)">编辑团队成员</span>
<span (click)="handleDelete(data)">删除</span>
<span>查看</span>
<span *ngIf="userId == data.createUserId" (click)="handleEdit(data)">更新团队信息</span>
<span *ngIf="userId == data.createUserId" (click)="handleUpdateTeam(data)">编辑团队成员</span>
<span *ngIf="userId == data.createUserId" (click)="handleDelete(data)">删除</span>
</td>
</tr>
</tbody>
......
src/main/webapp/app/project-manager/opr-team/opr-team.component.ts
View file @ 9c5d2c6a
......@@ -10,6 +10,7 @@ import {DatePipe} from '@angular/common';
import {CreateTeamComponent} from '../modal/create-team/create-team.component';
import {TeamPeopleComponent} from '../modal/team-people/team-people.component';
import {TeamModalComponent} from '../modal/team-modal/team-modal.component';
import {LocalStorageService} from 'ngx-webstorage';
@Component({
selector: 'app-opr-team',
......@@ -33,12 +34,15 @@ export class OprTeamComponent implements OnInit {
name: '',
type: null
};
userId;
constructor(private workSer: WorkService, private message: NzMessageService, private projectSer: ProjectService,
private $localStorage:LocalStorageService,
private router: Router, private commonSer: CommonService, private datePipe: DatePipe) {
}
ngOnInit() {
this.userId = this.$localStorage.retrieve('userInfo').userId;
this.getList();
}
......
src/main/webapp/app/project-manager/project.constants.ts
View file @ 9c5d2c6a
......@@ -41,7 +41,7 @@ export const opr_time_type = [
{value: '4', label: '本周'},
{value: '5', label: '本月'},
{value: '6', label: '本年'},
{value: '7', label: '自定义'},
{value: '99', label: '自定义'},
];
//人员职称
......
src/main/webapp/app/project-manager/project.service.ts
View file @ 9c5d2c6a
......@@ -111,13 +111,8 @@ export class ProjectService {
}
//查询运维项目数量
selectProjectCount(data): Observable<any> {
return this.http.post(SERVER_API_URL + '/maintainProject/selectProjectCount', data);
}
//跟踪记录查询
selectProjectCount1(data): Observable<any> {
return this.http.post(SERVER_API_URL + '/maintainProject/selectProjectCount', data);
selectProjectCount(params): Observable<any> {
return this.http.get(SERVER_API_URL + '/maintainProject/selectProjectCount/' + params);
}
//费用记录
......
src/main/webapp/app/system-change/change-manage/change-manage.component.html
View file @ 9c5d2c6a
......@@ -76,7 +76,7 @@
<th>提交时间</th>
<th>负责人</th>
<th>变更级别</th>
<th>变更内容</th>
<th nzWidth="20%">变更内容</th>
<th>审核人</th>
<th>审核意见</th>
<th>状态</th>
......@@ -114,8 +114,7 @@
<span (click)="showChangeModal(data)" *ngIf="(data.status == 2 && userInfo.userId == data.verifyUserId)">审核</span>
<span (click)="showChangeModal(data)" *ngIf="data.status == 6">处理</span>
<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>
>删除</span>
</td>
</tr>
</tbody>
......
src/main/webapp/app/system/modal/group-modal/group-modal.component.ts
View file @ 9c5d2c6a
......@@ -67,7 +67,7 @@ export class GroupModalComponent implements OnInit {
}
this.isOkLoading = true;
if(this.title == "新增部门"){
// this.create();
this.create();
}
if(this.title == "编辑部门"){
this.update();
......
src/main/webapp/app/work/work-handle/handle-detail/handle-detail.component.html
View file @ 9c5d2c6a
......@@ -105,14 +105,24 @@
<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">
<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>
</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>
</div>
<div nz-row>
......
tsconfig.json
View file @ 9c5d2c6a
......@@ -10,7 +10,7 @@
"noImplicitAny": false,
"skipLibCheck": true,
"suppressImplicitAnyIndexErrors": true,
"outDir": "build/www/app",
"outDir": "build/master/app",
"lib": ["es7", "dom"],
"typeRoots": [
"node_modules/@types"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment