Skip to content

S
smart
Commit 530a943b authored by wangqinghua's avatar wangqinghua
Browse files
Options

update

parent bfb21d9e
Show whitespace changes
Inline Side-by-side
Showing with 44 additions and 19 deletions
.idea/.gitignore 0 → 100644
View file @ 530a943b
# Default ignored files
/workspace.xml
README.md
View file @ 530a943b
......@@ -20,6 +20,8 @@ Enum ng g enum my-new-enum
Module ng g module my-module
拓扑图想优化的话 就换插件吧
http://topology.le5le.com/ 这个不错
#上传文件到服务器
scp -r 22 build/master root@10.10.38.99:/home/nginx/www/ 监控2.0
......
package-lock.json
View file @ 530a943b
......@@ -6726,7 +6726,8 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"aproba": {
"version": "1.2.0",
......@@ -6747,12 +6748,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
......@@ -6767,17 +6770,20 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
......@@ -6894,7 +6900,8 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"ini": {
"version": "1.3.5",
......@@ -6906,6 +6913,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
......@@ -6920,6 +6928,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
......@@ -6927,12 +6936,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"minipass": {
"version": "2.2.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.1",
"yallist": "^3.0.0"
......@@ -6951,6 +6962,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
......@@ -7031,7 +7043,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
......@@ -7043,6 +7056,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
......@@ -7128,7 +7142,8 @@
"safe-buffer": {
"version": "5.1.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"safer-buffer": {
"version": "2.1.2",
......@@ -7164,6 +7179,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
......@@ -7183,6 +7199,7 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
......@@ -7226,12 +7243,14 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"yallist": {
"version": "3.0.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
}
}
},
......@@ -9898,13 +9917,15 @@
"version": "1.36.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.36.0.tgz",
"integrity": "sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==",
"dev": true
"dev": true,
"optional": true
},
"mime-types": {
"version": "2.1.20",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.20.tgz",
"integrity": "sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==",
"dev": true,
"optional": true,
"requires": {
"mime-db": "~1.36.0"
}
......
src/main/webapp/app/modal/alarm-modal/alarm-modal.component.html
View file @ 530a943b
......@@ -26,7 +26,7 @@
<span class="custom-node" draggable="true" aria-grabbed="true"
[class.active]="node.isSelected">
<label [(ngModel)]="node.isChecked" *ngIf="node.level == 0"
> {{node.title}}</label>
nz-checkbox> {{node.title}}</label>
<label [(ngModel)]="node.isChecked" [nzDisabled]="node.origin.disabled"
(click)="selectCheckTree(node)" *ngIf="node.level == 1"
nz-checkbox> {{node.title}}</label>
......
src/main/webapp/app/overAll/basic/basic.component.html
View file @ 530a943b
......@@ -28,7 +28,6 @@
</nz-select>
<nz-select *ngIf="selectedValue == 'type'" style="width: 200px;" nzPlaceHolder="所有设备类型" nzShowSearch nzAllowClear
(ngModelChange)="changeEquiment($event)" [(ngModel)]="equipmentTypeid">
<nz-option nzLabel="全部" [nzValue]="null"></nz-option>
<ng-container *ngFor="let item of equipmentList">
<nz-option [nzLabel]="item.equipmentType" [nzValue]="item.equipmentTypeId"></nz-option>
</ng-container>
......
src/main/webapp/app/overAll/basic/basic.component.ts
View file @ 530a943b
......@@ -230,6 +230,7 @@ export class BasicComponent implements OnInit {
this.pageNum = 1;
this.groupid = null;
this.equipmentTypeid = e;
console.log(e);
this.searchRe();
}
......
src/main/webapp/app/project-manager/modal/team-people/team-people.component.ts
View file @ 530a943b
......@@ -11,8 +11,8 @@ import {ProjectService} from '../../project.service';
templateUrl: './team-people.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;
}
`
......@@ -47,7 +47,7 @@ export class TeamPeopleComponent implements OnInit {
gender: [null],
phone: [null],
principal: [null],
arrivalDate: [null],
arrivalDate: [null, [Validators.required]],
});
}
......@@ -76,7 +76,7 @@ export class TeamPeopleComponent implements OnInit {
}
create() {
this.validateForm.patchValue({arrivalDate: new Date(this.validateForm.value.arrivalDate).getTime() });
this.validateForm.patchValue({arrivalDate: new Date(this.validateForm.value.arrivalDate).getTime()});
this.projectSer.addMaintainTeamUser(this.validateForm.value).subscribe(
(res) => {
if (res.errCode == 10000) {
......
src/main/webapp/app/work/modal/plan-modal/plan-modal.component.ts
View file @ 530a943b
......@@ -42,7 +42,7 @@ export class PlanModalComponent implements OnInit {
this.participantsList = [];
this.principalsList = [];
this.validateForm = this.fb.group({
title: [null, [Validators.required],Validators.maxLength(20)],
title: ['', [Validators.required],Validators.maxLength(20)],
typeId: [null, [Validators.required]],
startTime: [null, [Validators.required]],
endTime: [null, [Validators.required]],
......
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