From 2c965de92016180eb260480cff72e076df1cf466 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Sat, 17 Sep 2022 17:24:49 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84ui?= =?UTF-8?q?=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home/home.component.scss | 1 - .../apply/apply.component.html | 6 ++-- .../apply/apply.component.ts | 5 ++++ .../station-task-apply.component.scss | 2 +- .../station-task-execution.component.html | 2 +- .../station-task-execution.component.scss | 2 +- .../upload/upload.component.html | 5 +++- .../upload/upload.component.scss | 28 +++++++++++++------ .../upload/upload.component.ts | 16 +++++++++-- 9 files changed, 49 insertions(+), 18 deletions(-) diff --git a/src/app/home/statistic-analysis/home/home.component.scss b/src/app/home/statistic-analysis/home/home.component.scss index ffe3a27..277d39d 100644 --- a/src/app/home/statistic-analysis/home/home.component.scss +++ b/src/app/home/statistic-analysis/home/home.component.scss @@ -322,5 +322,4 @@ .bottombox { flex: 0.9; - } diff --git a/src/app/home/task/station-task-apply/apply/apply.component.html b/src/app/home/task/station-task-apply/apply/apply.component.html index 5311375..1d989f1 100644 --- a/src/app/home/task/station-task-apply/apply/apply.component.html +++ b/src/app/home/task/station-task-apply/apply/apply.component.html @@ -143,13 +143,13 @@ 检查人员 - - + + - + diff --git a/src/app/home/task/station-task-apply/apply/apply.component.ts b/src/app/home/task/station-task-apply/apply/apply.component.ts index fe878bf..b54c282 100644 --- a/src/app/home/task/station-task-apply/apply/apply.component.ts +++ b/src/app/home/task/station-task-apply/apply/apply.component.ts @@ -27,10 +27,15 @@ export class ApplyComponent implements OnInit { taskType newTree OrganizationId + userId + supervisorListAll = [] ngOnInit(): void { this.OrganizationId = JSON.parse(sessionStorage.getItem('userData')).organizationId + + this.userId = JSON.parse(sessionStorage.getItem('userData')).id console.log('mainsupervisorList', this.mainsupervisorList) console.log('assitantsupervisorList', this.assitantsupervisorList) + this.supervisorListAll = [...this.mainsupervisorList, ...this.assitantsupervisorList] this.validateForm = this.fb.group({ taskname: [null, [Validators.required]], organization: [null, [Validators.required]], diff --git a/src/app/home/task/station-task-apply/station-task-apply.component.scss b/src/app/home/task/station-task-apply/station-task-apply.component.scss index 621940a..70e4eb6 100644 --- a/src/app/home/task/station-task-apply/station-task-apply.component.scss +++ b/src/app/home/task/station-task-apply/station-task-apply.component.scss @@ -165,7 +165,7 @@ padding: 12px 20px; border: 1px solid #C7CAD0; justify-content: space-around; - padding-left: 80px; + padding-left: 50px; margin-bottom: 10px; div { diff --git a/src/app/home/task/station-task-execution/station-task-execution.component.html b/src/app/home/task/station-task-execution/station-task-execution.component.html index f4139f9..c8c7bf1 100644 --- a/src/app/home/task/station-task-execution/station-task-execution.component.html +++ b/src/app/home/task/station-task-execution/station-task-execution.component.html @@ -90,7 +90,7 @@
- + {{item.lastModificationTime | date:"yyyy-MM-dd"}} diff --git a/src/app/home/task/station-task-execution/station-task-execution.component.scss b/src/app/home/task/station-task-execution/station-task-execution.component.scss index 7753b3b..96cdb68 100644 --- a/src/app/home/task/station-task-execution/station-task-execution.component.scss +++ b/src/app/home/task/station-task-execution/station-task-execution.component.scss @@ -164,7 +164,7 @@ padding: 12px 20px; border: 1px solid #C7CAD0; justify-content: space-around; - padding-left: 80px; + padding-left: 50px; margin: 10px 0; div { diff --git a/src/app/home/task/station-task-execution/upload/upload.component.html b/src/app/home/task/station-task-execution/upload/upload.component.html index a1bacce..89ae1fb 100644 --- a/src/app/home/task/station-task-execution/upload/upload.component.html +++ b/src/app/home/task/station-task-execution/upload/upload.component.html @@ -20,7 +20,10 @@
    -
  • {{item | fileName}}
    • +
  • + {{item | fileName}} + x +
diff --git a/src/app/home/task/station-task-execution/upload/upload.component.scss b/src/app/home/task/station-task-execution/upload/upload.component.scss index f362eae..b4df551 100644 --- a/src/app/home/task/station-task-execution/upload/upload.component.scss +++ b/src/app/home/task/station-task-execution/upload/upload.component.scss @@ -24,14 +24,26 @@ ul { margin-bottom: 0; - li{ - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - } - li:hover { - text-decoration: underline; - cursor: pointer; + + li { + + display: flex; + justify-content: space-between; + span{ + cursor: pointer; + } + .filename { + flex: 1; + display: inline-block; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + .filename:hover { + text-decoration: underline; + cursor: pointer; + } } } } diff --git a/src/app/home/task/station-task-execution/upload/upload.component.ts b/src/app/home/task/station-task-execution/upload/upload.component.ts index 445a36f..64ed8d7 100644 --- a/src/app/home/task/station-task-execution/upload/upload.component.ts +++ b/src/app/home/task/station-task-execution/upload/upload.component.ts @@ -1,7 +1,7 @@ import { HttpClient } from '@angular/common/http'; import { Component, Input, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { NzModalRef } from 'ng-zorro-antd/modal'; +import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; import { ObjectsSimpleService } from 'src/app/service/objectsSimple.service'; import Viewer from 'viewerjs'; @Component({ @@ -12,7 +12,7 @@ import Viewer from 'viewerjs'; export class UploadComponent implements OnInit { @Input() data?: any; validateForm!: FormGroup; - constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient, private objectsSrv: ObjectsSimpleService) { } + constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient, private objectsSrv: ObjectsSimpleService, private modal2: NzModalService) { } ngOnInit(): void { console.log(this.data) @@ -124,4 +124,16 @@ export class UploadComponent implements OnInit { node.click(); }, 0); } + delete(fileList, key) { + this.modal2.confirm({ + nzTitle: `确定要删除这个文件吗?`, + nzOkText: '确定', + nzOkType: 'primary', + nzOnOk: () => { + fileList.splice(key, 1) + }, + nzCancelText: '取消' + }); + + } }