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

非煤矿山灾害智能感知和预警系统
jingbowen 3 years ago
parent
2663a3a6e4 0dc718a7e4
commit
e251f7b48e
10 changed files with 355 additions and 179 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. 6
      src/app/home/home.module.ts
  2. 2
      src/app/home/task/station-task-apply/station-task-apply.component.scss
  3. 2
      src/app/home/task/station-task-execution/station-task-execution.component.scss
  4. 2
      src/app/home/task/station-weekly-plan/station-weekly-plan.component.scss
  5. 25
      src/app/home/task/zhi-audit/look-task/look-task.component.html
  6. 3
      src/app/home/task/zhi-audit/look-task/look-task.component.scss
  7. 15
      src/app/home/task/zhi-audit/look-task/look-task.component.ts
  8. 365
      src/app/home/task/zhi-audit/zhi-audit.component.html
  9. 93
      src/app/home/task/zhi-audit/zhi-audit.component.scss
  10. 21
      src/app/home/task/zhi-audit/zhi-audit.component.ts

6
src/app/home/home.module.ts
Unescape View File

@ -51,6 +51,7 @@ import { NzRadioModule } from 'ng-zorro-antd/radio';
import { ApplyComponent } from './task/station-task-apply/apply/apply.component';
import { ApplyLookComponent } from './task/station-task-apply/apply-look/apply-look.component';
import { NzDatePickerModule } from 'ng-zorro-antd/date-picker';
import { LookTaskComponent } from './task/zhi-audit/look-task/look-task.component';
@NgModule({
declarations: [
NavComponent,
@ -79,7 +80,8 @@ import { NzDatePickerModule } from 'ng-zorro-antd/date-picker';
EditorComponent,
AddUnitComponent,
ApplyComponent,
ApplyLookComponent
ApplyLookComponent,
LookTaskComponent
],
imports: [
CommonModule,
@ -109,6 +111,6 @@ import { NzDatePickerModule } from 'ng-zorro-antd/date-picker';
NzRadioModule,
NzDatePickerModule
],
entryComponents: [AddroleComponent, EditroleComponent, AdduserComponent, EdituserComponent, AddorComponent, EditorComponent, ApplyComponent, ApplyLookComponent]
entryComponents: [AddroleComponent, EditroleComponent, AdduserComponent, EdituserComponent, AddorComponent, EditorComponent, ApplyComponent, ApplyLookComponent, LookTaskComponent]
})
export class HomeModule { }

2
src/app/home/task/station-task-apply/station-task-apply.component.scss
Unescape View File

@ -4,7 +4,7 @@
color: #303133;
box-sizing: border-box;
padding: 18px;
padding: 20px;
.fffbox {

2
src/app/home/task/station-task-execution/station-task-execution.component.scss
Unescape View File

@ -4,7 +4,7 @@
color: #303133;
box-sizing: border-box;
padding: 18px;
padding: 20px;
.fffbox {

2
src/app/home/task/station-weekly-plan/station-weekly-plan.component.scss
Unescape View File

@ -4,7 +4,7 @@
color: #303133;
box-sizing: border-box;
padding: 18px;
padding: 20px;
.fffbox {

25
src/app/home/task/zhi-audit/look-task/look-task.component.html
Unescape View File

@ -0,0 +1,25 @@
<div class="box">
<div class="header">
<div>
</div>
<span>
开发区B消防救援站
</span>
<span>
单位总数:9/8
</span>
</div>
<div>
<p>协助任务</p>
<div>
<span>熟悉演练</span>
<span>|</span>
<span>历下区大队</span>
<span>|</span>
<span>
千佛山大厦（融通地产物业管理有限公司山东分公司)
</span>
</div>
</div>
</div>

3
src/app/home/task/zhi-audit/look-task/look-task.component.scss
Unescape View File

@ -0,0 +1,3 @@
.box{
}

15
src/app/home/task/zhi-audit/look-task/look-task.component.ts
Unescape View File

@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-look-task',
templateUrl: './look-task.component.html',
styleUrls: ['./look-task.component.scss']
})
export class LookTaskComponent implements OnInit {
constructor() { }
ngOnInit(): void {
}
}

365
src/app/home/task/zhi-audit/zhi-audit.component.html
Unescape View File

@ -11,205 +11,234 @@
</div>
</div>
<div class="content" cdkScrollable>
<!-- 双随机 -->
<div class="panel">
<div class="panelheader">
<div class="panelheaderleft">
<div class="panelheadername panelheadernameblue">
<img src="../../../../assets/images/icon/suiji.png" alt="">
双随机
<div class="cardcontent">
<!-- 双随机 -->
<div class="panel">
<div class="panelheader">
<div class="panelheaderleft">
<div class="panelheadername panelheadernameblue">
<img src="../../../../assets/images/icon/suiji.png" alt="">
双随机
</div>
<span>
已选择: <span class="blue">15</span> 家单位
</span>
<span class="spanline">|</span>
<span>
已分配: <span class="blue">14</span> 家单位
</span>
<span class="spanline">|</span>
<span>
已通过: <span class="blue">14/15</span> 家单位
</span>
</div>
<div class="panelheaderright">
<button nz-button style="background: #42B983;color: white;">同意</button>
<button nz-button style="background: #FF0000;color: white;margin-left: 20px;">驳回</button>
<span (click)="expand(doubleRandom)" class="expand blue">
{{doubleRandom.isExpand ? '收起' :'展开'}}
<i nz-icon [nzType]="doubleRandom.isExpand ? 'down' : 'up'" nzTheme="outline"></i>
</span>
</div>
<span>
已选择: <span class="blue">15</span> 家单位
</span>
<span class="spanline">|</span>
<span>
已分配: <span class="blue">14</span> 家单位
</span>
<span class="spanline">|</span>
<span>
已通过: <span class="blue">14/15</span> 家单位
</span>
</div>
<div class="panelheaderright">
<button nz-button style="background: #42B983;color: white;">同意</button>
<button nz-button style="background: #FF0000;color: white;margin-left: 20px;">驳回</button>
<span (click)="expand(doubleRandom)" class="expand blue">
{{doubleRandom.isExpand ? '收起' :'展开'}}
<i nz-icon [nzType]="doubleRandom.isExpand ? 'down' : 'up'" nzTheme="outline"></i>
</span>
<div class="panelcontent" *ngIf="doubleRandom.isExpand">
<nz-table #colSpanTable [nzData]="doubleRandom.data" nzBordered nzSize="small"
[nzShowPagination]="false">
<thead>
<tr>
<th nzWidth="18%">责任机构</th>
<th nzWidth="8%">任务额</th>
<th nzWidth="25%">单位名称</th>
<th nzWidth="15%">监督员</th>
<th>说明</th>
<th nzWidth="8%">操作</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let item of colSpanTable.data; index as i">
<td>访客</td>
<td>2021-11-19</td>
<td>
22
</td>
<td>
22
</td>
<td class="explain">
一段简短的说明文字...
<img src="../../../../assets/images/icon/agree.png" alt="">
<!-- <img src="../../../../assets/images/icon/reject.png" alt=""> -->
</td>
<td>
<span class="green" style="margin-right: 16px;">同意</span>
<span class="red">驳回</span>
</td>
</tr>
</tbody>
</nz-table>
</div>
</div>
<div class="panelcontent" *ngIf="doubleRandom.isExpand">
<nz-table #colSpanTable [nzData]="doubleRandom.data" nzBordered nzSize="small"
[nzShowPagination]="false">
<thead>
<tr>
<th nzWidth="18%">责任机构</th>
<th nzWidth="8%">任务额</th>
<th nzWidth="25%">单位名称</th>
<th nzWidth="15%">监督员</th>
<th>说明</th>
<th nzWidth="8%">操作</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let item of colSpanTable.data; index as i">
<td>访客</td>
<td>2021-11-19</td>
<td>
22
</td>
<td>
22
</td>
<td class="explain">
一段简短的说明文字...
<img src="../../../../assets/images/icon/agree.png" alt="">
<!-- <img src="../../../../assets/images/icon/reject.png" alt=""> -->
</td>
<td>
<span class="green" style="margin-right: 16px;">同意</span>
<span class="red">驳回</span>
</td>
</tr>
</tbody>
</nz-table>
</div>
</div>
<!-- 熟悉演练 -->
<div class="panel">
<div class="panelheader">
<div class="panelheaderleft">
<div class="panelheadername panelheadernamepurple">
<img src="../../../../assets/images/icon/yanlian.png" alt="">
熟悉演练
<!-- 熟悉演练 -->
<div class="panel">
<div class="panelheader">
<div class="panelheaderleft">
<div class="panelheadername panelheadernamepurple">
<img src="../../../../assets/images/icon/yanlian.png" alt="">
熟悉演练
</div>
<span>
已选择: <span class="blue">15</span> 家单位
</span>
<span class="spanline">|</span>
<span>
已分配: <span class="blue">14</span> 家单位
</span>
<span class="spanline">|</span>
<span>
已通过: <span class="blue">14/15</span> 家单位
</span>
</div>
<div class="panelheaderright">
<button nz-button style="background: #42B983;color: white;">同意</button>
<button nz-button style="background: #FF0000;color: white;margin-left: 20px;">驳回</button>
<span (click)="expand(rehearsal)" class="expand blue">
{{rehearsal.isExpand ? '收起' :'展开'}}
<i nz-icon [nzType]="rehearsal.isExpand ? 'down' : 'up'" nzTheme="outline"></i>
</span>
</div>
<span>
已选择: <span class="blue">15</span> 家单位
</span>
<span class="spanline">|</span>
<span>
已分配: <span class="blue">14</span> 家单位
</span>
<span class="spanline">|</span>
<span>
已通过: <span class="blue">14/15</span> 家单位
</span>
</div>
<div class="panelheaderright">
<button nz-button style="background: #42B983;color: white;">同意</button>
<button nz-button style="background: #FF0000;color: white;margin-left: 20px;">驳回</button>
<span (click)="expand(rehearsal)" class="expand blue">
{{rehearsal.isExpand ? '收起' :'展开'}}
<i nz-icon [nzType]="rehearsal.isExpand ? 'down' : 'up'" nzTheme="outline"></i>
</span>
<div class="panelcontent" *ngIf="rehearsal.isExpand">
<nz-table #colSpanTable [nzData]="rehearsal.data" nzBordered nzSize="small"
[nzShowPagination]="false">
<thead>
<tr>
<th nzWidth="18%">责任机构</th>
<th nzWidth="8%">任务额</th>
<th nzWidth="25%">单位名称</th>
<th nzWidth="15%">监督员</th>
<th>说明</th>
<th nzWidth="8%">操作</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let item of colSpanTable.data; index as i">
<td>访客</td>
<td>2021-11-19</td>
<td>
22
</td>
<td>
22
</td>
<td class="explain">
一段简短的说明文字...
<img src="../../../../assets/images/icon/agree.png" alt="">
<!-- <img src="../../../../assets/images/icon/reject.png" alt=""> -->
</td>
<td>
<span class="green" style="margin-right: 16px;">同意</span>
<span class="red">驳回</span>
</td>
</tr>
</tbody>
</nz-table>
</div>
</div>
<div class="panelcontent" *ngIf="rehearsal.isExpand">
<nz-table #colSpanTable [nzData]="rehearsal.data" nzBordered nzSize="small" [nzShowPagination]="false">
<thead>
<tr>
<th nzWidth="18%">责任机构</th>
<th nzWidth="8%">任务额</th>
<th nzWidth="25%">单位名称</th>
<th nzWidth="15%">监督员</th>
<th>说明</th>
<th nzWidth="8%">操作</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let item of colSpanTable.data; index as i">
<td>访客</td>
<td>2021-11-19</td>
<td>
22
</td>
<td>
22
</td>
<td class="explain">
一段简短的说明文字...
<img src="../../../../assets/images/icon/agree.png" alt="">
<!-- <img src="../../../../assets/images/icon/reject.png" alt=""> -->
</td>
<td>
<span class="green" style="margin-right: 16px;">同意</span>
<span class="red">驳回</span>
</td>
</tr>
</tbody>
</nz-table>
</div>
</div>
<div class="panel">
<div class="panelheader">
<div class="panelheaderleft">
<div class="panelheadername panelheadernameor">
<img src="../../../../assets/images/icon/huodong.png" alt="">
重大活动
<div class="panel">
<div class="panelheader">
<div class="panelheaderleft">
<div class="panelheadername panelheadernameor">
<img src="../../../../assets/images/icon/huodong.png" alt="">
重大活动
</div>
<button nz-button nzType="primary">选择单位</button>
<span>
已分配: <span class="blue">0/0</span> 家单位
</span>
</div>
<button nz-button nzType="primary">选择单位</button>
<span>
已分配: <span class="blue">0/0</span> 家单位
</span>
</div>
<div class="panelheaderright">
<!-- <button nz-button nzType="primary">提交审核</button>
<div class="panelheaderright">
<!-- <button nz-button nzType="primary">提交审核</button>
<span class="expand blue">
收起
<i nz-icon nzType="down" nzTheme="outline"></i>
</span> -->
</div>
</div>
</div>
</div>
<div class="panel">
<div class="panelheader">
<div class="panelheaderleft">
<div class="panelheadername panelheadernameor2">
<img src="../../../../assets/images/icon/xuanchuan.png" alt="">
消防宣传
<div class="panel">
<div class="panelheader">
<div class="panelheaderleft">
<div class="panelheadername panelheadernameor2">
<img src="../../../../assets/images/icon/xuanchuan.png" alt="">
消防宣传
</div>
<button nz-button nzType="primary">选择单位</button>
<span>
已分配: <span class="blue">0/0</span> 家单位
</span>
</div>
<button nz-button nzType="primary">选择单位</button>
<span>
已分配: <span class="blue">0/0</span> 家单位
</span>
</div>
<div class="panelheaderright">
<!-- <button nz-button nzType="primary">提交审核</button>
<div class="panelheaderright">
<!-- <button nz-button nzType="primary">提交审核</button>
<span class="expand blue">
收起
<i nz-icon nzType="down" nzTheme="outline"></i>
</span> -->
</div>
</div>
</div>
</div>
<div class="panel">
<div class="panelheader">
<div class="panelheaderleft">
<div class="panelheadername panelheadernamered">
<img src="../../../../assets/images/icon/huozai.png" alt="">
火灾调查
<div class="panel">
<div class="panelheader">
<div class="panelheaderleft">
<div class="panelheadername panelheadernamered">
<img src="../../../../assets/images/icon/huozai.png" alt="">
火灾调查
</div>
<button nz-button nzType="primary">选择单位</button>
<span>
已分配: <span class="blue">0/0</span> 家单位
</span>
</div>
<button nz-button nzType="primary">选择单位</button>
<span>
已分配: <span class="blue">0/0</span> 家单位
</span>
</div>
<div class="panelheaderright">
<!-- <button nz-button nzType="primary">提交审核</button>
<div class="panelheaderright">
<!-- <button nz-button nzType="primary">提交审核</button>
<span class="expand blue">
收起
<i nz-icon nzType="down" nzTheme="outline"></i>
</span> -->
</div>
</div>
</div>
</div>
<div class="applycontent">
<p>任务列表</p>
<div class="taskcard">
<div class="taskcarditem">
<div class="circlebox">
<div class="circle">
申请
</div>
</div>
<div class="flexcol name">
<span>熟悉演练</span>
<span>任务名称</span>
</div>
<div class="flexcol">
<span>高新技术产业开发区大队</span>
<span>申请人</span>
</div>
<div class="flexcol flexcol1">
<span>开发区A消防救援站</span>
<span>责任机构</span>
</div>
<div>
<button nz-button nzType="primary" (click)="lookTask()">查看</button>
</div>
<img src="../../../../assets/images/icon/agree.png" alt="">
</div>
</div>
</div>
</div>
</div>

93
src/app/home/task/zhi-audit/zhi-audit.component.scss
Unescape View File

@ -42,13 +42,96 @@
}
.content {
box-sizing: border-box;
padding: 20px;
flex: 1;
overflow-y: auto;
color: #606266;
}
.cardcontent {
box-sizing: border-box;
padding: 20px;
}
.applycontent {
box-sizing: border-box;
padding: 20px;
border-bottom: 1px dashed #C7CAD0;
border-top: 1px dashed #C7CAD0;
text-align: left;
p {
margin-bottom: 18px;
}
.taskcarditem {
width: 100%;
height: 100px;
background: #FFFFFF;
box-shadow: 0px 3px 8px 1px rgba(0, 0, 0, 0.0800);
border-radius: 4px 4px 4px 4px;
opacity: 1;
margin-bottom: 18px;
display: flex;
align-items: center;
position: relative;
.circlebox {
display: flex;
align-items: center;
justify-content: center;
width: 6%;
.circle {
width: 48px;
height: 48px;
text-align: center;
line-height: 48px;
color: #fff;
border-radius: 50%;
background: linear-gradient(180deg, #8FF6D2 0%, #29CB92 100%);
opacity: 1;
}
}
.circlebox,
.name {
background: rgba(157, 128, 255, 0.1600);
height: 100%;
}
.flexcol {
width: 25%;
display: flex;
flex-direction: column;
justify-content: center;
box-sizing: border-box;
padding-left: 60px;
span:nth-child(1) {
color: #303133;
margin-bottom: 6px;
}
span:nth-child(2) {
color: #C7CAD0;
}
}
.flexcol1{
width: 50%;
}
.name {
width: 12%;
box-sizing: border-box;
padding-left: 0;
}
img{
position: absolute;
right: 22%;
top: 25px;
}
}
}
.panel {
margin-bottom: 16px;
@ -93,9 +176,11 @@
nz-table {
margin-top: 16px;
}
.explain{
.explain {
position: relative;
img{
img {
width: 36px;
height: 36px;
position: absolute;

21
src/app/home/task/zhi-audit/zhi-audit.component.ts
Unescape View File

@ -1,7 +1,9 @@
import { HttpClient } from '@angular/common/http';
import { Component, OnInit, ViewChild } from '@angular/core';
import { Component, OnInit, ViewChild, ViewContainerRef } from '@angular/core';
import { FormBuilder, FormGroup } from '@angular/forms';
import { NzModalService } from 'ng-zorro-antd/modal';
import { TreeService } from 'src/app/service/tree.service';
import { LookTaskComponent } from './look-task/look-task.component';
@Component({
selector: 'app-zhi-audit',
templateUrl: './zhi-audit.component.html',
@ -11,7 +13,7 @@ export class ZhiAuditComponent implements OnInit {
validateForm!: FormGroup;
constructor(private fb: FormBuilder, private http: HttpClient, private toTree: TreeService) { }
constructor(private fb: FormBuilder, private http: HttpClient, private toTree: TreeService, private modal: NzModalService, private viewContainerRef: ViewContainerRef) { }
months = [
{ name: '1月', isable: true },
@ -116,4 +118,19 @@ export class ZhiAuditComponent implements OnInit {
}
console.log(data.search2Value)
}
lookTask() {
const modal = this.modal.create({
nzTitle: '任务详情',
nzContent: LookTaskComponent,
nzViewContainerRef: this.viewContainerRef,
nzFooter: null,
nzOnOk: () => new Promise(resolve => setTimeout(resolve, 1000))
});
const instance = modal.getContentComponent();
modal.afterOpen.subscribe(() => console.log('[afterOpen] emitted!'));
// Return a result when closed
modal.afterClose.subscribe(result => console.log('[afterClose] The result is:', result));
}
}

Write Preview
Loading…
Cancel
Save