From 13647ee38180ff1e97455cde253cb798a6900ac1 Mon Sep 17 00:00:00 2001 From: chenjingyu Date: Fri, 29 Jan 2021 15:54:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E6=94=BE=E5=BC=80?= =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plan-record/plan-record.component.ts | 4 +- .../wait-examineer.component.html | 7 +- .../wait-examineer.component.scss | 6 ++ .../wait-examineer.component.ts | 72 ++++++++++++------- .../entry-plan-look.component.ts | 4 +- .../meet-plan/meet-plan.component.ts | 4 +- .../onetwo-entry-plan.component.ts | 6 +- .../pass-plan/pass-plan.component.ts | 2 +- .../type-plan/type-plan.component.ts | 6 +- 9 files changed, 68 insertions(+), 43 deletions(-) diff --git a/src/app/plan-audit/plan-record/plan-record.component.ts b/src/app/plan-audit/plan-record/plan-record.component.ts index 93550be..d8b671e 100644 --- a/src/app/plan-audit/plan-record/plan-record.component.ts +++ b/src/app/plan-audit/plan-record/plan-record.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-25 10:19:31 * @LastEditors: sueRimn - * @LastEditTime: 2021-01-28 13:40:31 + * @LastEditTime: 2021-01-29 15:45:34 */ import { Component, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; @@ -131,7 +131,7 @@ export class PlanRecordComponent implements OnInit { docId: item.id, title: filename, //title: filename, - fetchUrl: "http://39.106.78.171:8000/api/Objects/PlanPlatform/"+fetchUrl + fetchUrl: `http://${location.host}/api/Objects/PlanPlatform/`+fetchUrl }, user: { uid: "test", diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.html b/src/app/plan-audit/wait-examineer/wait-examineer.component.html index 87f144e..fde7857 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html @@ -87,7 +87,7 @@ - + @@ -141,7 +141,7 @@ --> -
+
@@ -240,9 +240,10 @@
-
+
+
diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.scss b/src/app/plan-audit/wait-examineer/wait-examineer.component.scss index bb36e86..f454837 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.scss +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.scss @@ -105,6 +105,11 @@ overflow-y: auto; } } + #viewer{ + margin: 10px 10px 10px 10px; + width: 97%; + height: 91%; + } } } th,td{ @@ -201,3 +206,4 @@ th,td{ ::-webkit-scrollbar-thumb{ background-color: #2196F3; } + diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts index 847e82d..7e4efb9 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-25 16:13:50 * @LastEditors: sueRimn - * @LastEditTime: 2021-01-28 11:30:48 + * @LastEditTime: 2021-01-29 15:45:27 */ import { Component, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; @@ -12,6 +12,7 @@ import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import { HttpClient } from '@angular/common/http' import CryptoJS from 'crypto-js/crypto-js' import { DomSanitizer } from '@angular/platform-browser'; +import { Viewer } from 'photo-sphere-viewer'; declare var echarts: any; @Component({ @@ -101,6 +102,7 @@ export class WaitExamineerComponent implements OnInit { chuorzhong//判断初审还是终审 radioid//选中的id shenheTable=[]//选中要审核的对象 + showAllimg=false //获取表格数据 getAlltabledate(){ @@ -144,36 +146,52 @@ export class WaitExamineerComponent implements OnInit { //radio点击事件 radioClick(e,item){ //e.target.parentElement.bgColor='#2196F3' - console.log(e,item) + //console.log(e,item) let filename:string let fetchUrl this.http.get(`/api/PlanComponents/${item.itemId}`).subscribe((data:any)=>{ fetchUrl=data.attachmentUrls[0] - this.http.get(`/api/ObjectMetadata/PlanPlatform/${fetchUrl}`).subscribe((data:any)=>{ - filename=data.fileName - let json={ - doc: { - docId: item.id, - title: filename, - //title: filename, - fetchUrl: "http://39.106.78.171:8000/api/Objects/PlanPlatform/"+fetchUrl - }, - user: { - uid: "test", - nickName: "test", - avatar: "", - privilege: [ - 'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT' - ], - }, - } - var stringjson=JSON.stringify(json) - var wordArray = CryptoJS.enc.Utf8.parse(stringjson); - var base64 = CryptoJS.enc.Base64.stringify(wordArray); - this.src=`http://121.5.10.84/apps/editor/openPreview?data=${base64}` - this.iframeSrc=this.sanitizer.bypassSecurityTrustResourceUrl(this.src); - //window.open(`http://121.5.10.84/apps/editor/openPreview?data=${base64}`) - }) + if(fetchUrl.substr(0,3)=='psw'){ + this.wordShow=false + this.showAllimg=true + window.setTimeout(()=>{ + const viewer = new Viewer({ + container: document.querySelector('#viewer'), + panorama:'/api/Objects/PlanPlatform/'+ fetchUrl, + + }); + }) + + }else{ + this.wordShow=true + this.showAllimg=false + this.http.get(`/api/ObjectMetadata/PlanPlatform/${fetchUrl}`).subscribe((data:any)=>{ + filename=data.fileName + let json={ + doc: { + docId: item.id, + title: filename, + //title: filename, + fetchUrl: `http://${location.host}/api/Objects/PlanPlatform/`+fetchUrl + }, + user: { + uid: "test", + nickName: "test", + avatar: "", + privilege: [ + 'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT' + ], + }, + } + var stringjson=JSON.stringify(json) + var wordArray = CryptoJS.enc.Utf8.parse(stringjson); + var base64 = CryptoJS.enc.Base64.stringify(wordArray); + this.src=`http://121.5.10.84/apps/editor/openPreview?data=${base64}` + this.iframeSrc=this.sanitizer.bypassSecurityTrustResourceUrl(this.src); + //window.open(`http://121.5.10.84/apps/editor/openPreview?data=${base64}`) + }) + } + }) if(e.checked){ diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts index dfcb011..ef3ad02 100644 --- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts +++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts @@ -122,14 +122,14 @@ export class EntryPlanLookComponent implements OnInit { docId: e.id, title: filename, //title: filename, - fetchUrl: "http://39.106.78.171:8000/api/Objects/PlanPlatform/"+fetchUrl + fetchUrl: `http://${location.host}/api/Objects/PlanPlatform/`+fetchUrl }, user: { uid: "test", nickName: "test", avatar: "", privilege: [ - 'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT' + 'FILE_READ','FILE_WRITE','FILE_DOWNLOAD', 'FILE_PRINT' ], }, } diff --git a/src/app/plan-management/meet-plan/meet-plan.component.ts b/src/app/plan-management/meet-plan/meet-plan.component.ts index 286cc16..5720ba3 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.ts +++ b/src/app/plan-management/meet-plan/meet-plan.component.ts @@ -178,14 +178,14 @@ export class MeetPlanComponent implements OnInit { docId: element.id, title: filename, //title: filename, - fetchUrl: "http://39.106.78.171:8000/api/Objects/PlanPlatform/"+fetchUrl + fetchUrl: `http://${location.host}/api/Objects/PlanPlatform/`+fetchUrl }, user: { uid: "test", nickName: "test", avatar: "", privilege: [ - 'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT' + 'FILE_READ','FILE_WRITE','FILE_DOWNLOAD', 'FILE_PRINT' ], }, } diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts index 8922a76..d1ab396 100644 --- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts +++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-24 14:15:10 * @LastEditors: sueRimn - * @LastEditTime: 2021-01-28 14:07:24 + * @LastEditTime: 2021-01-29 15:42:53 */ import { Component, OnInit, ViewChild, Inject } from '@angular/core'; import { HttpClient } from '@angular/common/http' @@ -199,14 +199,14 @@ export class OnetwoEntryPlanComponent implements OnInit { docId: element.id, title: filename, //title: filename, - fetchUrl: "http://39.106.78.171:8000/api/Objects/PlanPlatform/"+fetchUrl + fetchUrl: `http://${location.host}/api/Objects/PlanPlatform/`+fetchUrl }, user: { uid: "test", nickName: "test", avatar: "", privilege: [ - 'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT' + 'FILE_READ','FILE_WRITE','FILE_DOWNLOAD', 'FILE_PRINT' ], }, } diff --git a/src/app/plan-management/pass-plan/pass-plan.component.ts b/src/app/plan-management/pass-plan/pass-plan.component.ts index 0212d39..4888968 100644 --- a/src/app/plan-management/pass-plan/pass-plan.component.ts +++ b/src/app/plan-management/pass-plan/pass-plan.component.ts @@ -305,7 +305,7 @@ export class PassPlanComponent implements OnInit { docId: element.id, title: filename, //title: filename, - fetchUrl: "http://39.106.78.171:8000/api/Objects/PlanPlatform/"+fetchUrl + fetchUrl: `http://${location.host}/api/Objects/PlanPlatform/`+fetchUrl }, user: { uid: "test", diff --git a/src/app/plan-management/type-plan/type-plan.component.ts b/src/app/plan-management/type-plan/type-plan.component.ts index 76dfee7..1920cdf 100644 --- a/src/app/plan-management/type-plan/type-plan.component.ts +++ b/src/app/plan-management/type-plan/type-plan.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2021-01-06 09:47:43 * @LastEditors: sueRimn - * @LastEditTime: 2021-01-27 15:49:53 + * @LastEditTime: 2021-01-29 15:42:14 */ import { Component, OnInit, ViewChild, Inject } from '@angular/core'; import { HttpClient } from '@angular/common/http' @@ -183,14 +183,14 @@ export class TypePlanComponent implements OnInit { docId: element.id, title: filename, //title: filename, - fetchUrl: "http://39.106.78.171:8000/api/Objects/PlanPlatform/"+fetchUrl + fetchUrl: `http://${location.host}/api/Objects/PlanPlatform/`+fetchUrl }, user: { uid: "test", nickName: "test", avatar: "", privilege: [ - 'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT' + 'FILE_READ','FILE_WRITE','FILE_DOWNLOAD', 'FILE_PRINT' ], }, } From 0f606ae4613ef3c7d1de6867bcd6d950e234fe6e Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Fri, 29 Jan 2021 16:11:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=90=8E=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=88=86?= =?UTF-8?q?=E6=95=B0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../key-unit-management.component.ts | 2 +- src/app/tabbar/tabbar.component.ts | 21 +++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.ts b/src/app/key-unit/key-unit-management/key-unit-management.component.ts index 90b7e9a..75909dc 100644 --- a/src/app/key-unit/key-unit-management/key-unit-management.component.ts +++ b/src/app/key-unit/key-unit-management/key-unit-management.component.ts @@ -636,7 +636,7 @@ export class KeyUnitManagementComponent implements OnInit { sessionStorage.setItem("companyName",data.name) sessionStorage.setItem("editable","1") sessionStorage.setItem("companyId",data.id) - window.open(`/keyUnit/editplaninfo?id=${data.id}`); + window.open(`/keyUnit/editplaninfo?id=${data.id}&usci=${data.usci}`); } } ); diff --git a/src/app/tabbar/tabbar.component.ts b/src/app/tabbar/tabbar.component.ts index d96b5a0..436254b 100644 --- a/src/app/tabbar/tabbar.component.ts +++ b/src/app/tabbar/tabbar.component.ts @@ -61,14 +61,21 @@ export class TabbarComponent implements OnInit { // this.companyIntegrityScore = obj this.getIntegrityScore() this.tabbarService.getMessage().subscribe((message: any)=>{ - console.log(789,message);//send a message this.getIntegrityScore() }); } this.getUserInfo() } - + //根据usci获取当前单位的分数信息 + getIntegrityScore(){ + let params:any = { + USCI : this.route.snapshot.queryParams.usci + } + this.http.get('/api/Companies',{params:params}).subscribe((data:any) => { + this.companyIntegrityScore = data.items[0].companyIntegrityScore + }) + } isSpinner:boolean = false//下载帮助文档进度 //下载帮助文档 downloadHelpFile () { @@ -151,15 +158,7 @@ export class TabbarComponent implements OnInit { } //for循环 } - //根据usci获取当前单位的分数信息 - getIntegrityScore(){ - let params:any = { - USCI : this.route.snapshot.queryParams.usci - } - this.http.get('/api/Companies',{params:params}).subscribe((data:any) => { - this.companyIntegrityScore = data.items[0].companyIntegrityScore - }) - } + ngOnDestroy(){ this.routerEventsListener.unsubscribe()