From e4164883cb4906ccdfe498bb8bbe10ffb387051a Mon Sep 17 00:00:00 2001 From: chenjingyu Date: Wed, 28 Jul 2021 17:17:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E9=A2=84=E6=A1=88?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86=E5=A4=8D=E5=88=B6=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AF=B9=E6=8E=A5=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../create-plan-online-five.component.html | 6 ++- .../create-plan-online-five.component.scss | 1 + .../plan-template/plan-template.component.ts | 43 +++++++++++++++++-- 3 files changed, 44 insertions(+), 6 deletions(-) diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html index 0fd53d0..201d674 100644 --- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html @@ -711,7 +711,8 @@ - {{info.olddata||'无原数据'}} + +
- {{info.olddata||'无原数据'}} + + @@ -414,7 +414,7 @@ @@ -440,11 +440,11 @@ + text-align: center; white-space:pre-wrap; width: 185px;">{{itemthj.head}} + text-align: center;white-space:pre-wrap;width: 185px;">{{itemthj.body}}
{ + this.newleftTabledata[this.newleftTabledata.length-1].id='' + this.newleftTabledata[this.newleftTabledata.length-1].id=data.id + let body={ + id:data.id, + basicCategoryId:result.basicCategoryId, + buildingTypeId:result.buildingTypeId, + planCategory:Number(result.planCategory), + data:JSON.stringify(this.newleftTabledata[this.leftclicki].data) + } + this.http.put(`/api/PlanTemplate/${data.id}`,body).subscribe((data:any)=>{ + this.snackBar.open('复制成功!','确定',config); + console.log(data) + }) + this.getLeftdata() + }) } } From 0a047a17ff790342fc1269701e348d61eb32c800 Mon Sep 17 00:00:00 2001 From: chenjingyu Date: Thu, 29 Jul 2021 17:21:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E5=BE=85=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E9=A1=B5=E9=9D=A2=E5=9C=A8=E7=BA=BF=E7=BC=96=E5=88=B6?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E9=A2=84=E6=A1=88=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/app-routing.module.ts | 4 +++- .../wait-examineer/wait-examineer.component.ts | 6 ++++-- .../create-plan-online-five.component.html | 2 +- .../create-plan-online-five.component.ts | 4 +++- .../entry-plan-look/entry-plan-look.component.html | 4 ++-- .../entry-plan-look/entry-plan-look.component.ts | 14 +++++++++----- 6 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index e82830c..db22b94 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2021-01-11 14:48:03 * @LastEditors: sueRimn - * @LastEditTime: 2021-03-26 15:18:46 + * @LastEditTime: 2021-07-29 10:26:58 */ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; @@ -19,6 +19,7 @@ import {MTokenK1Component} from './m-token-k1/m-token-k1.component' //K1秘钥 import {ViewUnitDetailsPlanComponent} from './key-unit/view-unit-details-plan/view-unit-details-plan.component' import { TestComponent } from './test/test.component'; import { ExternalLinksPlanComponent } from './external-links-plan/external-links-plan.component'; +import { CreatePlanOnlineFiveComponent } from './plan-management/create-plan-online-five/create-plan-online-five.component' const routes: Routes = [ @@ -42,6 +43,7 @@ const routes: Routes = [ {path:'planAudit/planpass', component: PlanPassComponent , canActivate: [AuthGuard]}, {path:'test', component: TestComponent }, {path:'linksPlan', component: ExternalLinksPlanComponent }, + {path:'CreatePlanOnlineFive',component:CreatePlanOnlineFiveComponent} ]; @NgModule({ 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 2ffe814..90bfc74 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-07-24 14:34:24 + * @LastEditTime: 2021-07-29 10:27:36 */ import { Component, Inject, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; @@ -296,8 +296,10 @@ export class WaitExamineerComponent implements OnInit { this.companyName = data.companyName if (data.planType != 2 && data.planType != 1) { if (data.planMode == 2) { + this.showtype = 0 this.bianzhi = true - this.src = `/planManagement/createplanonlinefive?navIsOpen=false&companyId=${data.companyId}&planName=${data.name}&unitName=${data.companyName}&planCategory=${data.planCategory}&planId=${data.id}&unitTypeId=${data.company.buildingTypes[0].id}&orName=${data.company.organizationName}&orId=${data.company.organizationId}&pattern=false` + this.src = `/CreatePlanOnlineFive?navIsOpen=false&companyId=${data.companyId}&planName=${data.name}&unitName=${data.companyName}&planCategory=${data.planCategory}&planId=${data.id}&unitTypeId=${data.company.buildingTypes[0].id}&orName=${data.company.organizationName}&orId=${data.company.organizationId}&pattern=false` + this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(this.src); //this.src=`/keyUnit/viewunitinfoplan?id=${data.companyId}&orName=${data.company.organizationId}&orId=${data.company.organizationName}` } else { this.bianzhi = false diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html index 201d674..5995682 100644 --- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html @@ -15,7 +15,7 @@ -
diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts index 242ec7f..41860be 100644 --- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2021-06-16 13:56:54 * @LastEditors: sueRimn - * @LastEditTime: 2021-07-08 09:36:32 + * @LastEditTime: 2021-07-29 14:12:18 */ import { HttpClient } from '@angular/common/http'; import { Component, Inject, OnInit, Renderer2, ViewChild, Input } from '@angular/core'; @@ -24,10 +24,12 @@ export class CreatePlanOnlineFiveComponent implements OnInit { planLevel: string//预案级别 + blockyl=true ngOnInit(): void { this.planLevel = this.route.snapshot.queryParams.planCategory if(this.route.snapshot.queryParams.pattern=='false'){ this.pattern='look' + this.blockyl=false }else{ this.pattern='edit' } diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html index c2464a5..61276b8 100644 --- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html +++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-24 10:59:48 * @LastEditors: sueRimn - * @LastEditTime: 2021-07-24 16:58:31 + * @LastEditTime: 2021-07-29 10:44:58 -->
@@ -86,7 +86,7 @@ 删除 审批结果 提交审核 + *ngIf="element.auditStatus==8">提交审核 撤销审核 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 6caf765..b7977e0 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 @@ -108,7 +108,10 @@ export class EntryPlanLookComponent implements OnInit { lookPlan(e) { console.log(e) if (e.planType == 16 || e.planType == 4 || e.planType == 8) { - var index = e.attachmentUrls[0].indexOf("\/") + if (e.planType == 16&&e.attachmentUrls == null){ + window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=false`) + }else{ + var index = e.attachmentUrls[0].indexOf("\/") if (e.attachmentUrls[0].substr(0, index) == 'psw') { const dialogRef = this.dialog.open(PsViewer, { width: '1500px', @@ -123,6 +126,7 @@ export class EntryPlanLookComponent implements OnInit { dialogRef.afterClosed().subscribe(); } else { let fetchUrl = e.attachmentUrls[0] + //console.log(fetchUrl) if (fetchUrl) { let suffix = fetchUrl.split('.')[fetchUrl.split('.').length - 1].toLowerCase() if (suffix == 'docx' || suffix == 'doc') { @@ -137,10 +141,10 @@ export class EntryPlanLookComponent implements OnInit { config.duration = 3000 this.snackBar.open('该文件类型暂不支持在线查看', '确定', config); } - } else { - window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}`) - } + } + } } + } if (e.planType == 1) { //如果是在线编辑 let id = e.id @@ -179,7 +183,7 @@ export class EntryPlanLookComponent implements OnInit { } else if (e.planType == 16) { if (e.attachmentUrls == null) { - window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}`) + window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=true`) } else { let body = {}; From 1c5af7166751bc96353e1b3ed4524d099d2aca05 Mon Sep 17 00:00:00 2001 From: chenjingyu Date: Fri, 30 Jul 2021 15:26:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E9=A2=84=E6=A1=88?= =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=BC=96=E5=88=B6=E8=A1=A8=E6=A0=BC=E5=9B=BA?= =?UTF-8?q?=E5=AE=9A=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../create-plan-online-five.component.html | 8 ++++---- .../create-plan-online-five.component.ts | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html index 5995682..428438f 100644 --- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html @@ -395,7 +395,7 @@
+ text-align: center;width: 185px;" > {{element.tableth[tablethi]}} + text-align: center;width: 185px;"> {{itemtr.tabletd[tabletdi]}}
{{itemthj.head}} {{itemthj.body}}
diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts index 41860be..b1906fa 100644 --- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2021-06-16 13:56:54 * @LastEditors: sueRimn - * @LastEditTime: 2021-07-29 14:12:18 + * @LastEditTime: 2021-07-30 14:56:55 */ import { HttpClient } from '@angular/common/http'; import { Component, Inject, OnInit, Renderer2, ViewChild, Input } from '@angular/core'; @@ -563,7 +563,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { } //生成word generatingDoc() { - changeImgToDataurl() + /* changeImgToDataurl() function changeImgToDataurl() { let charImg = document.getElementsByTagName("img"); console.log(charImg) @@ -591,7 +591,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { } function condataurl(dataURL, charImg) { charImg.src = dataURL; - } + } */ $(".mainbox").wordExport('word文档'); }