shaojiahao
/
Jinan_project
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://121.36.37.70:3000/shaojiahao/Jinan_project

非煤矿山灾害智能感知和预警系统
邵佳豪 3 years ago
parent
0f897ff73b b67313aaf4
commit
32dc4625ed
6 changed files with 11292 additions and 142 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11068
      package-lock.json
  2. 3
      package.json
  3. 110
      src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.html
  4. 69
      src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.scss
  5. 4
      src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.ts

11068
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

3
package.json
Unescape View File

@ -19,11 +19,13 @@
"@angular/platform-browser-dynamic": "~13.1.0",
"@angular/router": "~13.1.0",
"@types/file-saver": "^2.0.5",
"echarts": "^5.3.3",
"file-saver": "^2.0.5",
"js-base64": "^3.7.2",
"moment": "^2.29.4",
"ng-zorro-antd": "^13.0.1",
"ngx-cookie-service": "^13.1.2",
"ngx-echarts": "^14.0.0",
"rxjs": "~7.4.0",
"tslib": "^2.3.0",
"zone.js": "~0.11.4"
@ -41,6 +43,7 @@
"karma-coverage": "~2.1.0",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "~1.7.0",
"resize-observer-polyfill": "^1.5.1",
"typescript": "~4.5.2"
}
}

110
src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.html
Unescape View File

@ -95,6 +95,7 @@
<span>{{i.company.companyName}}</span>
</div>
<div class="info">
<div >
<span>
<img src="../../../../assets/images/icon/main.png" alt="">
{{i.mainSupervisor ? i.mainSupervisor.name : '未分配'}}
@ -108,17 +109,20 @@
<span>申请人: {{i.organization.name}}</span>
<!-- <span class="blue">修改</span> -->
</div>
</div>
<!-- <div class="btn">
<button [ngClass]="{'forbidbtn': i.approvalStatus}" [disabled]="i.approvalStatus"
nz-button (click)="agree(i)">同意</button>
<button [ngClass]="{'forbidbtn': i.approvalStatus}" [disabled]="i.approvalStatus"
nz-button (click)="reject(i)">驳回</button>
</div> -->
<img *ngIf="i.approvalStatus == 'reject'" class="auditimg"
<div class="img">
<img class="auditimg" *ngIf="i.approvalStatus == '驳回'"
src="../../../../assets/images/icon/reject.png" alt="">
<img *ngIf="i.approvalStatus == 'approved'" class="auditimg"
<img *ngIf="i.approvalStatus == '通过'" class="auditimg"
src="../../../../assets/images/icon/agree.png" alt="">
</div>
</div>
</div>
</div>
@ -137,41 +141,123 @@
</div>
<div class="deploycontent" *ngIf="isdeployboxExpanded">
<div class="deploycontentitem">
<div class="aaa">
<div class="title">
月计划统计
任务总数
</div>
<div class="details">
<div class="detailsname">
月计划总数
<span style="font-weight: 18;font-size: 26px;margin-left: 10px;">15</span>
完成
<!-- <span style="font-weight: 18;font-size: 26px;margin-left: 10px;">15</span> -->
</div>
<span>已完成 15</span>
<span class="progresssquare">
<span>完成率</span>
<!-- <span>完成率</span> -->
<nz-progress nzStrokeLinecap="square" style="width: 70%;margin-bottom: 3px;"
[nzPercent]="75" nzStrokeColor="#42B983" [nzShowInfo]="false" [nzStrokeWidth]="18">
</nz-progress>
<span>75%</span>
</span>
</div>
</div>
<div class="percentage">
<nz-progress [nzWidth]="80" nz-tooltip nzType="circle"
[nzPercent]="70" nzStrokeLinecap="square" [nzShowInfo]="false" [nzSuccessPercent]="40"></nz-progress>
<div class="typebox">
<div class="type">
<div class="tips" style="background: #42B983;"></div>
<div style="font-size: 13px;"><span style="margin-right: 5px;">上级指派</span><span>46%</span></div>
</div>
<div class="type">
<div class="tips" style="background: #1890FF;"></div>
<div style="font-size: 13px;"><span style="margin-right: 5px;">自主任务</span><span>46%</span></div>
</div>
<div class="type">
<div class="tips" style="background: #fff;"></div>
<div style="font-size: 13px;"><span style="margin-right: 5px;">申领任务</span><span>46%</span></div>
</div>
</div>
</div>
</div>
<div class="deploycontentitem">
<div class="aaa">
<div class="title">
周计划统计
任务总数
</div>
<div class="details">
<div class="detailsname">
周计划总数
<span style="font-weight: 18;font-size: 26px;margin-left: 10px;">15</span>
完成
<!-- <span style="font-weight: 18;font-size: 26px;margin-left: 10px;">15</span> -->
</div>
<span>已完成 15</span>
<span class="progresssquare">
<span>完成率</span>
<!-- <span>完成率</span> -->
<nz-progress nzStrokeLinecap="square" style="width: 70%;margin-bottom: 3px;"
[nzPercent]="75" nzStrokeColor="#42B983" [nzShowInfo]="false" [nzStrokeWidth]="18">
</nz-progress>
<span>75%</span>
</span>
</div>
</div>
<div class="percentage">
<nz-progress [nzWidth]="80" nz-tooltip nzType="circle"
[nzPercent]="70" nzStrokeColor="#42B983" nzStrokeLinecap="square" [nzShowInfo]="false" ></nz-progress>
<div class="typebox">
<div class="type">
<div class="tips" style="background: #42B983;"></div>
<div style="font-size: 13px;"><span style="margin-right: 5px;">自主任务</span><span>46%</span></div>
</div>
<div class="type">
<div class="tips" style="background: #fff;"></div>
<div style="font-size: 13px;"><span style="margin-right: 5px;">申领任务</span><span>46%</span></div>
</div>
</div>
</div>
</div>
<div class="deploycontentitem">
<div class="aaa">
<div class="title">
任务总数
</div>
<div class="details">
<div class="detailsname">
完成
<!-- <span style="font-weight: 18;font-size: 26px;margin-left: 10px;">15</span> -->
</div>
<span class="progresssquare">
<!-- <span>完成率</span> -->
<nz-progress nzStrokeLinecap="square" style="width: 70%;margin-bottom: 3px;"
[nzPercent]="75" nzStrokeColor="#E6D91D" [nzShowInfo]="false" [nzStrokeWidth]="18">
</nz-progress>
<span>75%</span>
</span>
</div>
</div>
<div class="percentage">
<nz-progress [nzWidth]="80" nz-tooltip nzType="circle"
[nzPercent]="50" nzStrokeColor="#E6D91D" [nzShowInfo]="false" ></nz-progress>
<div class="typebox">
<div class="type">
<div class="tips" style="background: #E6D91D;"></div>
<div style="font-size: 13px;"><span style="margin-right: 5px;">自主任务</span><span>46%</span></div>
</div>
<div class="type">
<div class="tips" style="background: #fff;"></div>
<div style="font-size: 13px;"><span style="margin-right: 5px;">申领任务</span><span>46%</span></div>
</div>
</div>
</div>
</div>
</div>

69
src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.scss
Unescape View File

@ -276,11 +276,14 @@
}
.unitname {
flex: 3;
width: 30%;
}
.info {
flex: 6;
flex: 1;
display: flex;
justify-content: center;
align-items: center;
span {
margin-right: 20px;
@ -302,6 +305,9 @@
}
}
.img {
width: 30%;
.auditimg {
position: absolute;
right: 18%;
@ -309,6 +315,8 @@
}
}
}
.greencard {
background: rgba(66, 185, 131, 0.0400);
border: 1px solid rgba(66, 185, 131, 0.1600);
@ -327,6 +335,10 @@
}
}
.ant-progress-circle .ant-progress-text {
color: #fff !important;
}
.deploybox {
box-sizing: border-box;
padding: 18px;
@ -346,7 +358,7 @@
justify-content: space-between;
.deploycontentitem {
width: 49.5%;
width: 32%;
height: 110px;
background: linear-gradient(180deg, #7AA3FC 0%, #2C4DC0 100%);
box-shadow: 0px 3px 8px 1px rgba(0, 0, 0, 0.0800);
@ -354,10 +366,16 @@
opacity: 1;
box-sizing: border-box;
padding: 18px 18px;
display: flex;
// flex-direction: column;
// justify-content: space-around;
color: #fff;
.aaa {
display: flex;
flex-direction: column;
justify-content: space-around;
color: #fff;
flex: 1;
.title {
text-align: left;
@ -371,10 +389,13 @@
.detailsname {
display: flex;
align-items: center;
margin-right: 5px;
width: 40px;
}
.progresssquare {
width: 60%;
width: 90%;
// flex: 1;
display: flex;
color: #fff;
align-items: center;
@ -384,12 +405,43 @@
}
span:last-child {
margin-left: 16px;
margin-left: 5px;
}
}
}
}
.percentage {
width: 50%;
// flex: 1;
display: flex;
.typebox {
width: 60%;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
.type {
margin: 5px 0;
display: flex;
justify-content: center;
align-items: center;
}
.tips {
width: 10px;
height: 10px;
border-radius: 10px;
margin-right: 5px;
}
}
}
}
.deploycontentitem:nth-child(1) {
background: linear-gradient(180deg, #7AA3FC 0%, #2C4DC0 100%);
}
@ -398,6 +450,11 @@
background: linear-gradient(180deg, #56C5FF 0%, #005DFF 100%);
}
.deploycontentitem:nth-child(3) {
background: linear-gradient(180deg, #73D9AA 0%, #42B983 100%);
}
}
}

4
src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.ts
Unescape View File

@ -3,7 +3,6 @@ import { Component, OnInit, ViewContainerRef } from '@angular/core';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalService } from 'ng-zorro-antd/modal';
import { AllotPersonComponent } from '../da-subordinate-audit/allot-person/allot-person.component';
@Component({
selector: 'app-da-monthly-task-overview',
templateUrl: './da-monthly-task-overview.component.html',
@ -13,7 +12,6 @@ export class DaMonthlyTaskOverviewComponent implements OnInit {
constructor(private http: HttpClient, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private message: NzMessageService) { }
selectedMonth
selectedYear = 2022
selectedTime
@ -160,6 +158,8 @@ export class DaMonthlyTaskOverviewComponent implements OnInit {
next: async (data) => {
this.message.create('success', '分配成功');
resolve(data)
console.log(data);
this.getTaskList()
return true
},

Write Preview
Loading…
Cancel
Save