From c07a2c6f21dc9a58a3c8027b92aa37dd1e39b3a2 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Thu, 28 Apr 2022 17:16:52 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E8=AF=81=E4=BB=B6-?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=E7=B1=BB=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../details-file-category.component.html | 57 +++++++- .../details-file-category.component.scss | 60 +++++++++ .../details-file-category.component.ts | 36 ++++- .../edit-file-category.component.html | 45 ++++++- .../edit-file-category.component.scss | 127 ++++++++++++++++++ .../edit-file-category.component.ts | 105 ++++++++++++++- .../file-category.component.html | 40 +++++- .../file-category.component.scss | 23 ++++ .../file-category/file-category.component.ts | 116 +++++++++++++++- .../pdf-word-look.component.html | 12 ++ .../pdf-word-look.component.scss | 38 ++++++ .../pdf-word-look/pdf-word-look.component.ts | 28 ++++ .../details-update-category.component.html | 28 ++-- .../details-update-category.component.scss | 5 + .../edit-update-category.component.html | 4 +- .../update-category.component.html | 12 +- .../update-category.component.ts | 49 ++++++- src/app/pages/pages.module.ts | 6 +- src/app/service/objectsSimple.service.ts | 5 +- src/assets/images/license/pdf.png | Bin 0 -> 1092 bytes src/assets/images/license/word.png | Bin 0 -> 1310 bytes src/theme.less | 15 ++- 22 files changed, 774 insertions(+), 37 deletions(-) create mode 100644 src/app/pages/license/pdf-word-look/pdf-word-look.component.html create mode 100644 src/app/pages/license/pdf-word-look/pdf-word-look.component.scss create mode 100644 src/app/pages/license/pdf-word-look/pdf-word-look.component.ts create mode 100644 src/assets/images/license/pdf.png create mode 100644 src/assets/images/license/word.png diff --git a/src/app/pages/license/file-category/details-file-category/details-file-category.component.html b/src/app/pages/license/file-category/details-file-category/details-file-category.component.html index 9fad21e..42ed216 100644 --- a/src/app/pages/license/file-category/details-file-category/details-file-category.component.html +++ b/src/app/pages/license/file-category/details-file-category/details-file-category.component.html @@ -1 +1,56 @@ -

details-file-category works!

+
+
+
+ 详情 +
+ +
+ +
+

证件名称:   建设用地规划许可证

+
+

有效期类型:   1523天

+
+

是否年检:   是

+
+

证件图片:   

+
+

+ 审核记录 + + + 审核次数：6 + + + 驳回次数：2 + + +

+ + + 2022.04.02 + 审核完成 + + + 2022.04.02 + 审核完成 + + + 2022.04.02 + 审核完成 + + + 2022.04.02 + 审核完成 + + + +
+ +
+ +
+ + +
\ No newline at end of file diff --git a/src/app/pages/license/file-category/details-file-category/details-file-category.component.scss b/src/app/pages/license/file-category/details-file-category/details-file-category.component.scss index e69de29..b5b9ea1 100644 --- a/src/app/pages/license/file-category/details-file-category/details-file-category.component.scss +++ b/src/app/pages/license/file-category/details-file-category/details-file-category.component.scss @@ -0,0 +1,60 @@ +.box { + .title { + font-family: sybold; + width: 100%; + height: 48px; + background: linear-gradient(270deg, rgba(35, 153, 255, 0) 0%, rgba(35, 153, 255, 0.57) 50%, rgba(35, 153, 255, 0) 100%); + display: flex; + align-items: center; + position: relative; + + .titlecontent { + width: 100%; + height: 32px; + line-height: 32px; + background: linear-gradient(270deg, rgba(35, 153, 255, 0) 0%, rgba(35, 153, 255, 0.57) 50%, rgba(35, 153, 255, 0) 100%); + text-align: center; + color: #91CCFF; + font-size: 16px; + } + + i { + position: absolute; + right: 12px; + color: #fff; + font-size: 18px; + cursor: pointer; + } + } + + .content { + box-sizing: border-box; + padding: 0 15px; + max-height: 580px; + overflow-y: auto; + + .circle { + width: 8px; + height: 8px; + background: linear-gradient(180deg, #36A2FF 0%, #FFFFFF 100%); + opacity: 1; + } + .recordP{ + display: flex; + justify-content: space-between; + align-items: center; + } + } + + p { + margin-bottom: 0; + color: #C4E2FC; + margin: 12px 0; + + img { + width: 88px; + height: 56px; + cursor: pointer; + } + } +} diff --git a/src/app/pages/license/file-category/details-file-category/details-file-category.component.ts b/src/app/pages/license/file-category/details-file-category/details-file-category.component.ts index 6d5bd0f..878358a 100644 --- a/src/app/pages/license/file-category/details-file-category/details-file-category.component.ts +++ b/src/app/pages/license/file-category/details-file-category/details-file-category.component.ts @@ -1,5 +1,9 @@ -import { Component, OnInit } from '@angular/core'; - +import { Component, OnInit, Input } from '@angular/core'; +import { NzModalRef } from 'ng-zorro-antd/modal'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { HttpClient } from '@angular/common/http'; +import { ObjectsSimpleService } from 'src/app/service/objectsSimple.service'; +import Viewer from 'viewerjs'; @Component({ selector: 'app-details-file-category', templateUrl: './details-file-category.component.html', @@ -7,9 +11,35 @@ import { Component, OnInit } from '@angular/core'; }) export class DetailsFileCategoryComponent implements OnInit { - constructor() { } + @Input() data?: any; + constructor(private modal: NzModalRef) { } + ngOnInit(): void { } + + destroyModal() { + this.modal.destroy({ data: 'this the result data' }); + } + //查看图片 + viewImg(url) { + // url.split('?')[0] + let dom = document.getElementById(`viewerjs`) + let pObjs = dom.childNodes; + let node = document.createElement("img") + node.style.display = "none"; + node.src = url; + node.id = 'img' + dom.appendChild(node) + setTimeout(() => { + let viewer = new Viewer(document.getElementById(`viewerjs`), { + hidden: () => { + dom.removeChild(pObjs[0]); + viewer.destroy(); + } + }); + node.click(); + }, 0); + } } diff --git a/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.html b/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.html index 4b2f754..836a1cd 100644 --- a/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.html +++ b/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.html @@ -1 +1,44 @@ -

edit-file-category works!

+
+
+
+ 编辑 +
+ +
+
+

证件名称: 建设用地规划许可证

+ +
+ +

有效期类型*

+ + + + + + + + + +

附件上传（图片格式、pdf格式、word格式）

+ +
+
+ + + +
+
+ + +
+
+ +
+ + +
+
+
\ No newline at end of file diff --git a/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.scss b/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.scss index e69de29..75ccce6 100644 --- a/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.scss +++ b/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.scss @@ -0,0 +1,127 @@ +.box { + .title { + font-family: sybold; + width: 100%; + height: 48px; + background: linear-gradient(270deg, rgba(35, 153, 255, 0) 0%, rgba(35, 153, 255, 0.57) 50%, rgba(35, 153, 255, 0) 100%); + display: flex; + align-items: center; + position: relative; + + .titlecontent { + width: 100%; + height: 32px; + line-height: 32px; + background: linear-gradient(270deg, rgba(35, 153, 255, 0) 0%, rgba(35, 153, 255, 0.57) 50%, rgba(35, 153, 255, 0) 100%); + text-align: center; + color: #91CCFF; + font-size: 16px; + } + + i { + position: absolute; + right: 12px; + color: #fff; + font-size: 18px; + cursor: pointer; + } + } + + p { + margin-bottom: 0; + color: #C4E2FC; + margin: 12px 0; + } + + .form { + box-sizing: border-box; + padding: 0 17px; + + label { + color: #C4E2FC; + margin-right: 6px; + } + + + + .validity { + display: flex; + align-items: center; + } + + nz-date-picker { + flex: .5; + } + + nz-range-picker { + flex: 1; + } + + .btnbox { + width: 100%; + margin-top: 24px; + margin-bottom: 17px; + display: flex; + justify-content: flex-end; + + button { + border-radius: 0px; + color: #91CCFF; + } + + button:nth-child(2) { + margin-left: 16px; + } + + .ok { + background: rgba(0, 129, 255, 0.4); + } + + .cancel { + border: 1px solid #C4E2FC; + background: #0c1e38; + color: rgba(99, 102, 105, 0.6); + box-shadow: 0 0 3px 0 #fff inset; + } + } + } + + .uploadDivbox { + width: 100%; + height: 80px; + display: flex; + align-items: center; + position: relative; + margin: 5px 0; + + .uploadDiv { + width: 120px; + height: 80px; + display: flex; + align-items: center; + justify-content: center; + position: relative; + + .fileinput { + width: 114px; + height: 32px; + position: absolute; + z-index: 100; + opacity: 0; + top: 23px; + cursor: pointer; + } + + button { + z-index: 99; + width: 114px; + height: 32px; + background: rgba(0, 129, 255, 0.3); + border: 1px solid #36A2FF; + opacity: 1; + border-radius: 0px; + color: #91CCFF; + } + } + } +} diff --git a/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.ts b/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.ts index 94a231e..3701930 100644 --- a/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.ts +++ b/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.ts @@ -1,5 +1,9 @@ -import { Component, OnInit } from '@angular/core'; - +import { Component, OnInit, Input } from '@angular/core'; +import { NzModalRef } from 'ng-zorro-antd/modal'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { HttpClient } from '@angular/common/http'; +import { ObjectsSimpleService } from 'src/app/service/objectsSimple.service'; +import Viewer from 'viewerjs'; @Component({ selector: 'app-edit-file-category', templateUrl: './edit-file-category.component.html', @@ -7,9 +11,104 @@ import { Component, OnInit } from '@angular/core'; }) export class EditFileCategoryComponent implements OnInit { - constructor() { } + @Input() data?: any; + + validateForm!: FormGroup; + constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient, private objectsSrv: ObjectsSimpleService) { } + + data2 ngOnInit(): void { + this.validateForm = this.fb.group({ + type: [null, [Validators.required]] + }); + this.data2 = JSON.parse(JSON.stringify(this.data)) + } + + isLongTerm = false + imageUrl = '/api/Objects/sinochemweb/stationPhotos/175/timg.jpg' + validityChange($event) { + console.log($event) + this.isLongTerm = $event + } + + destroyModal() { + this.modal.destroy({ data: 'this the result data' }); + } + ok() { + this.modal.triggerOk() + } + + + + isLoadingSave: boolean = false + uploadIndex: string + filechange(e) { + let oilStationId = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id + let file = e.target.files[0] || null //获取上传的文件 + this.openFileSelect(file, `stationPhotos/${oilStationId}/`) + } + //设置文件路径并上传 + postFilePath + async openFileSelect(file: File, extensionPath: string) { + this.postFilePath = extensionPath; + let fileSize = file.size || null //上传文件的总大小 + let shardSize = 5 * 1024 * 1024 //5MB 超过5MB要分块上传 + if (fileSize >= shardSize) // 超过5MB要分块上传 + { + await this.postFileByMul(file); + } + else //普通上传 + { + await this.postFile(file); + } + } + //上传文件 + async postFile(file: File) { + await new Promise((resolve, reject) => { + this.objectsSrv.postFile(this.postFilePath, file).subscribe(data => { + let dataObj = data as any; + let filePath: string = ObjectsSimpleService.baseUrl + dataObj.objectName; + this.imageUrl = filePath + console.log('上传成功', filePath) + resolve('success') + }); + }) + } + + /** + * 分块上传 + * @param file + */ + postFileByMul(file: File) { + this.objectsSrv.postFile_MultipartUpload(this.postFilePath, file).then((value) => { + let dataObj = value as any; + let filePath = dataObj.filePath + this.imageUrl = filePath + console.log('上传成功', filePath) + }); + + } + + //查看图片 + viewImg(url) { + // url.split('?')[0] + let dom = document.getElementById(`viewerjs`) + let pObjs = dom.childNodes; + let node = document.createElement("img") + node.style.display = "none"; + node.src = url; + node.id = 'img' + dom.appendChild(node) + setTimeout(() => { + let viewer = new Viewer(document.getElementById(`viewerjs`), { + hidden: () => { + dom.removeChild(pObjs[0]); + viewer.destroy(); + } + }); + node.click(); + }, 0); } } diff --git a/src/app/pages/license/file-category/file-category.component.html b/src/app/pages/license/file-category/file-category.component.html index 80c3b7e..3839e04 100644 --- a/src/app/pages/license/file-category/file-category.component.html +++ b/src/app/pages/license/file-category/file-category.component.html @@ -1 +1,39 @@ -

file-category works!

+
+
+ + + + + 证件名称 + + 有效期类型 + 图片 + 提交时间 + 审核状态 + 操作 + + + + + + 证件名称 + + 有效期类型 + + + + 提交时间 + 审核状态 + + 编辑 + 详情 + 提交审核 + + + + + +
+
\ No newline at end of file diff --git a/src/app/pages/license/file-category/file-category.component.scss b/src/app/pages/license/file-category/file-category.component.scss index e69de29..7b92f86 100644 --- a/src/app/pages/license/file-category/file-category.component.scss +++ b/src/app/pages/license/file-category/file-category.component.scss @@ -0,0 +1,23 @@ +.box { + width: 100%; + height: 100%; +} + +.tablebox { + width: 100%; + height: 100%; + + .operation { + span { + margin-right: 6px; + } + } + + #table { + img { + width: 30px; + height: 30px; + cursor: pointer; + } + } +} diff --git a/src/app/pages/license/file-category/file-category.component.ts b/src/app/pages/license/file-category/file-category.component.ts index 6ce7054..052d489 100644 --- a/src/app/pages/license/file-category/file-category.component.ts +++ b/src/app/pages/license/file-category/file-category.component.ts @@ -1,5 +1,13 @@ -import { Component, OnInit } from '@angular/core'; - +import { Component, OnInit, ViewContainerRef } from '@angular/core'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { Observable, fromEvent } from 'rxjs'; +import { debounceTime } from 'rxjs/operators'; +import Viewer from 'viewerjs'; +import * as moment from 'moment'; +import { NzMessageService } from 'ng-zorro-antd/message'; +import { HttpClient } from '@angular/common/http'; +import { EditFileCategoryComponent } from './edit-file-category/edit-file-category.component'; +import { DetailsFileCategoryComponent } from './details-file-category/details-file-category.component'; @Component({ selector: 'app-file-category', templateUrl: './file-category.component.html', @@ -7,9 +15,111 @@ import { Component, OnInit } from '@angular/core'; }) export class FileCategoryComponent implements OnInit { - constructor() { } + constructor(private modal: NzModalService, private viewContainerRef: ViewContainerRef, private message: NzMessageService, private http: HttpClient) { } + tableSpin = false + list = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] + tableScrollHeight ngOnInit(): void { + this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - 42) + 'px' + // 页面监听 + fromEvent(window, 'resize').pipe(debounceTime(100)).subscribe((event) => { + this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - 42) + 'px' + }); + } + //查看图片 + viewImg(url) { + // url.split('?')[0] + let dom = document.getElementById(`viewerjs`) + let pObjs = dom.childNodes; + let node = document.createElement("img") + node.style.display = "none"; + node.src = url; + node.id = 'img' + dom.appendChild(node) + setTimeout(() => { + let viewer = new Viewer(document.getElementById(`viewerjs`), { + hidden: () => { + dom.removeChild(pObjs[0]); + viewer.destroy(); + } + }); + node.click(); + }, 0); + } + + dispose() { + console.log('处置') } + edit(item) { + console.log('item', item) + const modal = this.modal.create({ + nzContent: EditFileCategoryComponent, + nzViewContainerRef: this.viewContainerRef, + nzWidth: 750, + nzBodyStyle: { + 'border': '1px solid #91CCFF', + 'border-radius': '0px', + 'padding': '7px', + 'box-shadow': '0 0 8px 0 #fff', + 'background-image': 'linear-gradient(#003665, #000f25)' + }, + nzComponentParams: { + data: item + }, + nzFooter: null, + nzClosable: false, + nzOnOk: async () => { + if (instance.validateForm.valid) { + await new Promise(resolve => { + let body = { + id: item.id, + name: instance.validateForm.value.name, + storageLocation: instance.validateForm.value.storageLocation, + productionDate: moment(instance.validateForm.value.productionDate).format('yyyy-MM-DD'), + maintenanceDate: moment(instance.validateForm.value.maintenanceDate).format('yyyy-MM-DD'), + validityEndTime: moment(instance.validateForm.value.validityEndTime).format('yyyy-MM-DD'), + organizationUnitId: item.organizationUnitId + } + // this.http.put('/api/services/app/FireEquipment/Update', body).subscribe(data => { + // resolve(data) + // this.message.create('success', '修改成功！'); + // return true + // }) + }) + } else { + this.message.create('warning', '请填写完整！'); + return false + } + } + }); + const instance = modal.getContentComponent(); + modal.afterClose.subscribe(result => { }); + } + details(item) { + console.log('item', item) + const modal = this.modal.create({ + nzContent: DetailsFileCategoryComponent, + nzViewContainerRef: this.viewContainerRef, + nzWidth: 450, + nzBodyStyle: { + 'border': '1px solid #91CCFF', + 'border-radius': '0px', + 'padding': '7px', + 'box-shadow': '0 0 8px 0 #fff', + 'background-image': 'linear-gradient(#003665, #000f25)' + }, + nzComponentParams: { + data: item + }, + nzFooter: null, + nzClosable: false, + nzOnOk: async () => { + + } + }); + const instance = modal.getContentComponent(); + modal.afterClose.subscribe(result => { }); + } } diff --git a/src/app/pages/license/pdf-word-look/pdf-word-look.component.html b/src/app/pages/license/pdf-word-look/pdf-word-look.component.html new file mode 100644 index 0000000..b8db427 --- /dev/null +++ b/src/app/pages/license/pdf-word-look/pdf-word-look.component.html @@ -0,0 +1,12 @@ +
+
+
+ 详情 +
+ +
+ +
+ +
+
\ No newline at end of file diff --git a/src/app/pages/license/pdf-word-look/pdf-word-look.component.scss b/src/app/pages/license/pdf-word-look/pdf-word-look.component.scss new file mode 100644 index 0000000..96c259d --- /dev/null +++ b/src/app/pages/license/pdf-word-look/pdf-word-look.component.scss @@ -0,0 +1,38 @@ +.box { + .title { + font-family: sybold; + width: 100%; + height: 48px; + background: linear-gradient(270deg, rgba(35, 153, 255, 0) 0%, rgba(35, 153, 255, 0.57) 50%, rgba(35, 153, 255, 0) 100%); + display: flex; + align-items: center; + position: relative; + + .titlecontent { + width: 100%; + height: 32px; + line-height: 32px; + background: linear-gradient(270deg, rgba(35, 153, 255, 0) 0%, rgba(35, 153, 255, 0.57) 50%, rgba(35, 153, 255, 0) 100%); + text-align: center; + color: #91CCFF; + font-size: 16px; + } + + i { + position: absolute; + right: 12px; + color: #fff; + font-size: 18px; + cursor: pointer; + } + } + + .content { + box-sizing: border-box; + padding: 0 15px; + max-height: 580px; + overflow-y: auto; + + } + +} diff --git a/src/app/pages/license/pdf-word-look/pdf-word-look.component.ts b/src/app/pages/license/pdf-word-look/pdf-word-look.component.ts new file mode 100644 index 0000000..505bdac --- /dev/null +++ b/src/app/pages/license/pdf-word-look/pdf-word-look.component.ts @@ -0,0 +1,28 @@ +import { Component, OnInit, Input } from '@angular/core'; +import { NzModalRef } from 'ng-zorro-antd/modal'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { HttpClient } from '@angular/common/http'; +import { ObjectsSimpleService } from 'src/app/service/objectsSimple.service'; +import Viewer from 'viewerjs'; +@Component({ + selector: 'app-pdf-word-look', + templateUrl: './pdf-word-look.component.html', + styleUrls: ['./pdf-word-look.component.scss'] +}) +export class PdfWordLookComponent implements OnInit { + + @Input() data?: any; + constructor(private modal: NzModalRef) { } + + + ngOnInit(): void { + console.log('文档地址',this.data.url) + } + + + destroyModal() { + this.modal.destroy({ data: 'this the result data' }); + } + + +} diff --git a/src/app/pages/license/update-category/details-update-category/details-update-category.component.html b/src/app/pages/license/update-category/details-update-category/details-update-category.component.html index 3904c3f..c9ab387 100644 --- a/src/app/pages/license/update-category/details-update-category/details-update-category.component.html +++ b/src/app/pages/license/update-category/details-update-category/details-update-category.component.html @@ -1,28 +1,38 @@
- 编辑 + 详情
-

证件名称: 营业执照

+

证件名称:   营业执照

-

证件编号: Z201800041501

+

证件编号:   Z201800041501

-

证件有效期: 2018.12.02—2025.01.12

+

证件有效期:   2018.12.02—2025.01.12

-

办理类型: 年度公示

+

办理类型:   年度公示

-

有效期类型: 1523天

+

有效期类型:   1523天

-

是否年检: 是

+

是否年检:   是

-

证件图片: 证件图片:   

-

审核记录

+

+ 审核记录 + + + 审核次数：6 + + + 驳回次数：2 + + +

2022.04.02 diff --git a/src/app/pages/license/update-category/details-update-category/details-update-category.component.scss b/src/app/pages/license/update-category/details-update-category/details-update-category.component.scss index 010499b..ff540a7 100644 --- a/src/app/pages/license/update-category/details-update-category/details-update-category.component.scss +++ b/src/app/pages/license/update-category/details-update-category/details-update-category.component.scss @@ -38,6 +38,11 @@ background: linear-gradient(180deg, #36A2FF 0%, #FFFFFF 100%); opacity: 1; } + .recordP{ + display: flex; + justify-content: space-between; + align-items: center; + } } p { diff --git a/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.html b/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.html index 2628d7b..c34cd30 100644 --- a/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.html +++ b/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.html @@ -44,7 +44,7 @@ -

证件图片

+

附件上传（图片格式、pdf格式、word格式）

@@ -52,7 +52,7 @@ + nzTheme="outline">上传附件
diff --git a/src/app/pages/license/update-category/update-category.component.html b/src/app/pages/license/update-category/update-category.component.html index caf5061..2a487c5 100644 --- a/src/app/pages/license/update-category/update-category.component.html +++ b/src/app/pages/license/update-category/update-category.component.html @@ -9,7 +9,7 @@ 证件编号 证件有效期 - 图片 + 附件 有效期类型 办理类型 是否年检 @@ -27,8 +27,12 @@ 证件编号 证件有效期 - + + 有效期类型 办理类型 @@ -46,6 +50,4 @@
-
- - +
\ No newline at end of file diff --git a/src/app/pages/license/update-category/update-category.component.ts b/src/app/pages/license/update-category/update-category.component.ts index d11dcc9..4e97a8e 100644 --- a/src/app/pages/license/update-category/update-category.component.ts +++ b/src/app/pages/license/update-category/update-category.component.ts @@ -8,6 +8,7 @@ import * as moment from 'moment'; import { NzMessageService } from 'ng-zorro-antd/message'; import { HttpClient } from '@angular/common/http'; import { DetailsUpdateCategoryComponent } from './details-update-category/details-update-category.component'; +import { PdfWordLookComponent } from '../pdf-word-look/pdf-word-look.component'; @Component({ selector: 'app-update-category', templateUrl: './update-category.component.html', @@ -17,7 +18,11 @@ export class UpdateCategoryComponent implements OnInit { constructor(private modal: NzModalService, private viewContainerRef: ViewContainerRef, private message: NzMessageService, private http: HttpClient) { } tableSpin = false - list = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] + list = [ + { url: '/api/Objects/sinochemweb/stationPhotos/175/timg.jpg', type: 'img' }, + { url: '/api/Objects/sinochemweb/stationPhotos/853/完整度规划20200724.docx', type: 'word' }, + { url: '/api/Objects/sinochemweb/stationPhotos/853/10.6 MB.pdf', type: 'pdf' }, + ] tableScrollHeight ngOnInit(): void { @@ -26,6 +31,8 @@ export class UpdateCategoryComponent implements OnInit { fromEvent(window, 'resize').pipe(debounceTime(100)).subscribe((event) => { this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - 42) + 'px' }); + let xxx = '/api/Objects/sinochemweb/stationPhotos/853/10.6 MB.pdf' + // console.log(666,xxx.split('.')[xxx.split('.').length - 1]) } //查看图片 viewImg(url) { @@ -47,7 +54,47 @@ export class UpdateCategoryComponent implements OnInit { node.click(); }, 0); } + //查看文件 + lookFile(item) { + console.log('item', item) + + let suffix = item.url.split('.')[item.url.split('.').length - 1].toLowerCase() + if (item.type == 'word') { + let arr = item.url.split('.') + arr[arr.length - 1] = 'pdf' + window.open(arr.join('.')) + } else if (item.type == 'pdf') { + window.open(item.url) + } else { + // let config = new MatSnackBarConfig(); + // config.verticalPosition = 'top'; + // config.duration = 3000 + // this.snackBar.open('该文件类型暂不支持在线查看', '确定', config); + } + // const modal = this.modal.create({ + // nzContent: PdfWordLookComponent, + // nzViewContainerRef: this.viewContainerRef, + // nzWidth: 850, + // nzBodyStyle: { + // 'border': '1px solid #91CCFF', + // 'border-radius': '0px', + // 'padding': '7px', + // 'box-shadow': '0 0 8px 0 #fff', + // 'background-image': 'linear-gradient(#003665, #000f25)' + // }, + // nzComponentParams: { + // data: item + // }, + // nzFooter: null, + // nzClosable: false, + // nzOnOk: async () => { + + // } + // }); + // const instance = modal.getContentComponent(); + // modal.afterClose.subscribe(result => { }); + } dispose() { console.log('处置') } diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts index f0c6be5..d7c58aa 100644 --- a/src/app/pages/pages.module.ts +++ b/src/app/pages/pages.module.ts @@ -69,10 +69,12 @@ import { DetailsUpdateCategoryComponent } from './license/update-category/detail import { EditFileCategoryComponent } from './license/file-category/edit-file-category/edit-file-category.component'; import { DetailsFileCategoryComponent } from './license/file-category/details-file-category/details-file-category.component'; import { NzTimelineModule } from 'ng-zorro-antd/timeline'; +import { PdfWordLookComponent } from './license/pdf-word-look/pdf-word-look.component'; + @NgModule({ declarations: [LoginComponent, RegisterComponent, HomeComponent, PlanComponent, TodayWarningComponent, CriminalRecordsComponent, TodayWarningAdminComponent, CriminalRecordsAdminComponent, LeftDomainComponent, EquipmentInfoComponent, OilStationInfoComponent, - AddequipmentComponent, EditequipmentComponent, PlanAdminComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, HomePageComponent, OilUnloadingProcessListComponent, ChangePasswordComponent, FacilitySortPipe, WarningStatisticsListComponent, DisposeequipmentComponent, NavBarComponent, InformComponent, UpdateCategoryComponent, FileCategoryComponent, HistoriesComponent, EditUpdateCategoryComponent, DetailsUpdateCategoryComponent, EditFileCategoryComponent, DetailsFileCategoryComponent], + AddequipmentComponent, EditequipmentComponent, PlanAdminComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, HomePageComponent, OilUnloadingProcessListComponent, ChangePasswordComponent, FacilitySortPipe, WarningStatisticsListComponent, DisposeequipmentComponent, NavBarComponent, InformComponent, UpdateCategoryComponent, FileCategoryComponent, HistoriesComponent, EditUpdateCategoryComponent, DetailsUpdateCategoryComponent, EditFileCategoryComponent, DetailsFileCategoryComponent,PdfWordLookComponent], imports: [ @@ -116,7 +118,7 @@ import { NzTimelineModule } from 'ng-zorro-antd/timeline'; NzToolTipModule, NzTimelineModule ], - entryComponents: [AddequipmentComponent, EditequipmentComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, ChangePasswordComponent, DisposeequipmentComponent, EditUpdateCategoryComponent, DetailsUpdateCategoryComponent, EditFileCategoryComponent, DetailsFileCategoryComponent], + entryComponents: [AddequipmentComponent, EditequipmentComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, ChangePasswordComponent, DisposeequipmentComponent, EditUpdateCategoryComponent, DetailsUpdateCategoryComponent, EditFileCategoryComponent, DetailsFileCategoryComponent, PdfWordLookComponent], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) diff --git a/src/app/service/objectsSimple.service.ts b/src/app/service/objectsSimple.service.ts index 25a5fcf..609be78 100644 --- a/src/app/service/objectsSimple.service.ts +++ b/src/app/service/objectsSimple.service.ts @@ -48,7 +48,7 @@ export class ObjectsSimpleService { let fileSize = file.size || null //上传文件的总大小 let shardSize = 5 * 1024 * 1024 //5MB一个分片 let allSlice = Math.ceil(fileSize / shardSize) //总文件/5MB===共分多少段 - + console.log('共分多少段' + allSlice) for (let i = 0; i < allSlice; i++) { //循环分段上传 let start = i * shardSize //切割文件开始位置 let end = Math.min(fileSize, start + shardSize); //切割文件结束位置 @@ -66,13 +66,14 @@ export class ObjectsSimpleService { PartNumberETag.push(result) if (PartNumberETag.length === allSlice) { //分块上传完成 + let data = PartNumberETag let paramsData = { uploadId: uploadId }; let path = ObjectsSimpleService.c_apiRoot_Multipart + 'CompleteMultipartUpload/sinochemweb/' + objectName; this.http.post(path, data, { params: paramsData }).subscribe(data => { let objData: any = new Object(); objData.fileName = file.name; - objData.filePath = (ObjectsSimpleService.baseUrl + objectName).replace(file.name, ""); + objData.filePath = ObjectsSimpleService.baseUrl + objectName resolve(objData) }) } diff --git a/src/assets/images/license/pdf.png b/src/assets/images/license/pdf.png new file mode 100644 index 0000000000000000000000000000000000000000..0fbbf86760f29688de22b9c785eb23c72be91289 GIT binary patch literal 1092 zcmV-K1iSl*P)W^00004b3#c}2nYxW zd12 zgF&yKN{JAH2r4Lgv!H?!Aw}z3D{kF#innn-*TyHNz&vZ2kVR}L&(~zU;SmOD0ndNf`c>g(J_j{+MM*(Kuc5<;C$dk z1J1z5Dx=D_W~*QLQ(jcy1QsC*;$oxp{@_Ii&cG+cE6O!l>Cb#AFG}!0;6)40z$Yd~ zRpe%>^YYW2{Hhb+A1hXtG@9rpF;Gs~Gqta0Z%u7c=joaa^r4N+4ZH|1Hbr}#1eO_qZ=V6);fGS> zI~iAPawqII01W+bUh_7GjDG)uKR8x^#tpo*2H@~1M-pO+Xn@o#2Ylm6fJ^rQa`Qb? zx7-DIdB<@*kU0Us^8?rGoS}D@15}&=I9CQxdDa2$I$qo8xJz|=0LDig;KUkE1c2vz zO7P(1*4H-p2AAWza=R0t6Cdt~>Vkrk(qK%p4cG8b46b*Ufve(7c`zyqS}Fu|4maac zQ{f-cfz>3<$w2u7S0&+wW<97SVuZap8*n3fOX3Zjl*+9RfYaY{cWP#;#p5hZwuYIWCTfF4Y?F zk*kQKpRm(uc!lUP?PjpS4NOvue}Gb0B0t$_n8q^yRMP)W^00004b3#c}2nYxW zdGfS9;sp3*jWo+MfG7=Xd_k|D1E%D-ff3Jmb$P2)_Y{IkEcnd^R#V27h33)G{l7 zb#wi^ul3~6#)!xSUhhPGSP7j@H*sV0>m4TweAw&TAQZ7%Z^C$STJTK3=L|eu_?&{L1D|tn313uP z_)KG6)q(4^s3E}hz#9f!!k5^rD;Lx{zeuLMp}-kd2op+6tSgei8xCB;m)Q$f*Vj~i z7EgIYf?p53VZkMQdAW7n{CUpqNabUJucwo9PqM|4YX3xF5*IEGry2%}B`;iJFL2Ix zI{!#`lSM~+hYrBN=#B?p5TVp>P<%;FXl%O=k1vIhBrG zIR#INSYE7%H4caE(_7%W)YB7mQ!Czk=C2o=j>7l!2$QXt^COoxx7Jm}Uz}wdK5u`h zy1Z@orj{qO1)(Qz`-eXr_~ESQhMgmU6A~FqLV+SVa zR^(#p_fjcomJs~42Z5q|;3c=3^MfaV06}TrpSS?*I|DRV0BSWm12Gy1-5^$ z{+F>$cTBVO4*@SzUY;c9)%J0|kA6}6;5({p$PPwZPWn zD%`;~;OIHvol|PxTZ@4TS}HP@;rcHDy9kKI_+%;I{!_hP+jpl`jUA+l@x*k2vx@IO z4m|L&s_4f1fSOWZ3&FA)UlA-%Vo4RSiYB>C^Q#C0a6eD1kASss45O`PWS<;&`N8;> zOX_i{YSZoN+}Xo@RA%<@i!CbbCYn$aO>E1tnfh>rSkWG;1jDh4Toum2B5Xeiu+<{L zwbkTF$7)HzxuonlR+W8MO^UPX49)=T_juquX@-;Fl~e_;6z7niGgMZd6^X@s@7IO@{^*_J(SQMB`rNo_sSp>5gTw5U?2;pBTr9(S0R^_W$iCxU>YhslO~| z>#5r<#s5_x%H!wG4{j?iDtJ3Bg)$s$5_q<(tmI2=+9>ee{?o7AeOKiUv&od<;q|4v z779%c`}|Kg)Xtsp{67l(yORSQ^vwEshrQG{%aS)+-*B0UnhXYmUZ20ngz(mf7rNXD z7610ffksnE3}j~L%w!3h71yJ!uAdWvb0@1F7IWY-$AB4S{ U3DV|+QUCw|07*qoM6N<$g0hi};s5{u literal 0 HcmV?d00001 diff --git a/src/theme.less b/src/theme.less index 42a2414..885e0f5 100644 --- a/src/theme.less +++ b/src/theme.less @@ -171,7 +171,9 @@ #addequipment, #disposeequipment, #editupdatecategory, -#detailsupdatecategory { +#detailsupdatecategory, +#editfilecategory, +#detailsfilecategory { nz-input-group, input { @@ -201,7 +203,9 @@ #stationPlanBox, #disposeequipment, #editupdatecategory, -#detailsupdatecategory { +#detailsupdatecategory, +#editfilecategory, +#detailsfilecategory { ::-webkit-input-placeholder { /* WebKit browsers */ color: #345d85; @@ -244,7 +248,9 @@ //证件弹出框 #editupdatecategory, -#detailsupdatecategory { +#detailsupdatecategory, +#editfilecategory, +#detailsfilecategory { nz-form-item { margin-bottom: 0; @@ -344,7 +350,8 @@ //蓝色 表格 tree #stationPlanBox, #inform, -#updateLicense { +#updateLicense, +#fileLicense { ::-webkit-input-placeholder { /* WebKit browsers */ color: #345d85;