diff --git a/src/app/key-unit/basicinfo/basicinfo.component.html b/src/app/key-unit/basicinfo/basicinfo.component.html index da45f5b..f4d62ab 100644 --- a/src/app/key-unit/basicinfo/basicinfo.component.html +++ b/src/app/key-unit/basicinfo/basicinfo.component.html @@ -50,17 +50,16 @@ * 联系电话： - -
电话号码格式不正确
-
+ -->
* diff --git a/src/app/navigation/navigation.component.html b/src/app/navigation/navigation.component.html index 1a14c5d..a6e14b4 100644 --- a/src/app/navigation/navigation.component.html +++ b/src/app/navigation/navigation.component.html @@ -1,6 +1,6 @@ - +
diff --git a/src/app/navigation/navigation.component.ts b/src/app/navigation/navigation.component.ts index 41f64a4..3ca0cf8 100644 --- a/src/app/navigation/navigation.component.ts +++ b/src/app/navigation/navigation.component.ts @@ -1,13 +1,14 @@ -import { Component, OnInit,Inject } from '@angular/core'; -import {MatTreeFlatDataSource, MatTreeFlattener} from '@angular/material/tree'; -import {FlatTreeControl} from '@angular/cdk/tree'; -import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog'; -import {FormControl} from '@angular/forms'; +import { Component, OnInit, Inject } from '@angular/core'; +import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree'; +import { FlatTreeControl } from '@angular/cdk/tree'; +import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { FormControl } from '@angular/forms'; import { HttpClient } from '@angular/common/http'; import { TreeService } from '../http-interceptors/tree.service' import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; -import {CacheTokenService} from '../http-interceptors/cache-token.service'//引入服务 -import { Router,ActivatedRoute } from '@angular/router' +import { CacheTokenService } from '../http-interceptors/cache-token.service'//引入服务 +import { Router, ActivatedRoute, ParamMap } from '@angular/router' +import { is } from 'date-fns/locale'; @@ -17,25 +18,35 @@ import { Router,ActivatedRoute } from '@angular/router' styleUrls: ['./navigation.component.scss'] }) export class NavigationComponent implements OnInit { - - constructor(public navmenus:CacheTokenService,private http: HttpClient,public dialog: MatDialog,private tree:TreeService,public snackBar: MatSnackBar, - private router:Router,private route:ActivatedRoute) { } - treedata:any - isgrey:boolean - olddata:any - oldtreedata:any + constructor(public navmenus: CacheTokenService, private http: HttpClient, public dialog: MatDialog, private tree: TreeService, public snackBar: MatSnackBar, + private router: Router, private route: ActivatedRoute) { } - ngOnInit () { - this.http.get('/api/Account/NavMenus').subscribe((data:any)=>{ + treedata: any + isgrey: boolean + olddata: any + oldtreedata: any + + navIsOpen: any + ngOnInit() { + this.route.queryParamMap.subscribe((params: ParamMap) => { + if (params.get('navIsOpen') == 'false') { + this.navIsOpen = 'false' + } else { + this.navIsOpen = 'true' + } + }); + + + this.http.get('/api/Account/NavMenus').subscribe((data: any) => { this.olddata = data this.oldtreedata = data - let _data = this.tree.toTree(this.oldtreedata) + let _data = this.tree.toTree(this.oldtreedata) this.treedata = _data }) } - - ngOnDestroy () { + + ngOnDestroy() { } @@ -44,11 +55,11 @@ export class NavigationComponent implements OnInit { this.darktheme = dark; } - defaulttheme(){ + defaulttheme() { this.darktheme = false } - redtheme(){ + redtheme() { this.darktheme = true } 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 new file mode 100644 index 0000000..7cd8d90 --- /dev/null +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html @@ -0,0 +1,130 @@ +
+
+
+
+ 1.封面 +
+
+ {{key + 2}}.{{item.groupName}} +
+
+
+ + +
+
+
+
+ +
+
+ +
+

+ 预案编号: +

+

民航大厦

+
    +
  • +
    + 对象名称： +
    +
    + 民航大厦 +
    +
    • +
  • +
    + 单位性质： +
    +
    + 高层公共建筑 +
    +
    • +
  • +
    + *预案级别： +
    +
    + V级 +
    +
    • +
  • +
    + *灾害类型： +
    +
    + +
    +
    • +
  • +
    + 防火级别： +
    +
    + 二级+ +
    +
    • +
  • +
    + 防火管辖： +
    +
    + 上海市某某区某消防大队 +
    +
    • +
  • +
    + 灭火责任队站： +
    +
    + 上海市某某区某消防救援大队 +
    +
    • +
  • +
    + 制作人职务/姓名： +
    +
    + + +
    +
    • +
  • +
    + 审核人职务/姓名： +
    +
    + +
    +
    • +
  • +
    + 审核时间： +
    +
    + +
    +
    • +
+
+ +
+
+

{{item.groupName}}

+
+
+
+
+ +
+
+
\ No newline at end of file diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss new file mode 100644 index 0000000..5458381 --- /dev/null +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss @@ -0,0 +1,119 @@ +.bigbox { + width: 100%; + height: 100%; + transform: translate(0, 0); + background: #f2f4f5; + .titlebox { + width: 100%; + height: 50px; + background-color: white; + position: fixed; + top: 8px; + display: flex; + justify-content: center; + align-items: center; + .titleitembox { + display: flex; + .item { + cursor: pointer; + height: 36px; + line-height: 36px; + background: #e8e9e9; + border-radius: 40px; + color: #8b8c8c; + margin: 0 3px; + text-align: center; + box-sizing: border-box; + padding: 0 10px; + font-size: 14px; + } + .item:hover { + background: #e8f4fe; + color: #2196f3; + } + .selectedItem { + background: #e8f4fe; + color: #2196f3; + } + } + .btnbox { + position: absolute; + right: 24px; + top: 7px; + button { + margin-left: 10px; + mat-icon { + font-size: 21px; + width: 22px; + height: 22px; + } + } + } + } + .contentbox { + height: 100%; + box-sizing: border-box; + padding-top: 66px; + overflow-y: auto; + + .leftbox { + position: fixed; + width: 14%; + height: 85%; + background-color: white; + top: 66px; + } + .mainbox { + background-color: white; + width: 745px; + margin: 0 auto; + min-height: 97%; + box-sizing: border-box; + padding: 10px 10px 0; + .cover { + width: 100%; + input, + select { + border: 1px solid #ebebeb; + border-radius: 4px; + height: 28px; + line-height: 28px; + } + p { + height: 28px; + line-height: 28px; + } + h1 { + font-size: 46px; + color: #2196f3; + text-align: center; + font-weight: 600; + height: 230px; + display: flex; + justify-content: center; + align-items: center; + } + li { + width: 100%; + display: flex; + div { + height: 38px; + line-height: 38px; + nz-select { + width: 150px; + height: 33px; + } + } + div:first-child { + width: 45%; + text-align: right; + } + div:last-child { + width: 55%; + text-align: left; + } + } + } + } + } +} diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.spec.ts b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.spec.ts new file mode 100644 index 0000000..9ada9a7 --- /dev/null +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CreatePlanOnlineFiveComponent } from './create-plan-online-five.component'; + +describe('CreatePlanOnlineFiveComponent', () => { + let component: CreatePlanOnlineFiveComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ CreatePlanOnlineFiveComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CreatePlanOnlineFiveComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); 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 new file mode 100644 index 0000000..4648c18 --- /dev/null +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts @@ -0,0 +1,32 @@ +import { HttpClient } from '@angular/common/http'; +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-create-plan-online-five', + templateUrl: './create-plan-online-five.component.html', + styleUrls: ['./create-plan-online-five.component.scss'] +}) +export class CreatePlanOnlineFiveComponent implements OnInit { + + constructor(private http: HttpClient) { } + + ngOnInit(): void { + this.getTemplateData() + } + + selectedItem:string = '封面' + clickTitleItem(item){ + item == '封面' ? this.selectedItem = '封面' : this.selectedItem = item.groupName + } + planTemplateData: any + //获得模板信息 + getTemplateData() { + this.http.get('/api/PlanTemplate').subscribe(data => { + this.planTemplateData = JSON.parse(data[2].data).filter(item => + item.completed == true + ) + console.log(this.planTemplateData) + }) + } + +} diff --git a/src/app/plan-management/create-plan-online-three/create-plan-online-three.component.html b/src/app/plan-management/create-plan-online-three/create-plan-online-three.component.html new file mode 100644 index 0000000..f968961 --- /dev/null +++ b/src/app/plan-management/create-plan-online-three/create-plan-online-three.component.html @@ -0,0 +1 @@ +

create-plan-online-three works!

diff --git a/src/app/plan-management/create-plan-online-three/create-plan-online-three.component.scss b/src/app/plan-management/create-plan-online-three/create-plan-online-three.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/plan-management/create-plan-online-three/create-plan-online-three.component.spec.ts b/src/app/plan-management/create-plan-online-three/create-plan-online-three.component.spec.ts new file mode 100644 index 0000000..e103c63 --- /dev/null +++ b/src/app/plan-management/create-plan-online-three/create-plan-online-three.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CreatePlanOnlineThreeComponent } from './create-plan-online-three.component'; + +describe('CreatePlanOnlineThreeComponent', () => { + let component: CreatePlanOnlineThreeComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ CreatePlanOnlineThreeComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CreatePlanOnlineThreeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/plan-management/create-plan-online-three/create-plan-online-three.component.ts b/src/app/plan-management/create-plan-online-three/create-plan-online-three.component.ts new file mode 100644 index 0000000..6c59c08 --- /dev/null +++ b/src/app/plan-management/create-plan-online-three/create-plan-online-three.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-create-plan-online-three', + templateUrl: './create-plan-online-three.component.html', + styleUrls: ['./create-plan-online-three.component.scss'] +}) +export class CreatePlanOnlineThreeComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} 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 786cab4..9f95239 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 @@ -1,18 +1,18 @@ import { Component, OnInit, ViewChild, Inject } from '@angular/core'; -import { HttpClient,HttpHeaders,HttpErrorResponse } from '@angular/common/http' +import { HttpClient, HttpHeaders, HttpErrorResponse } from '@angular/common/http' import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree'; import { MatPaginator } from '@angular/material/paginator'; import { FlatTreeControl } from '@angular/cdk/tree'; import { FormControl } from '@angular/forms'; -import { Router,ActivatedRoute } from '@angular/router' +import { Router, ActivatedRoute } from '@angular/router' import { PageEvent } from '@angular/material/paginator'; import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import { TreeService } from '../../http-interceptors/tree.service' -import {FormBuilder, FormGroup, Validators} from '@angular/forms'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { async } from '@angular/core/testing'; import { Viewer } from 'photo-sphere-viewer'; -import {STEPPER_GLOBAL_OPTIONS} from '@angular/cdk/stepper'; +import { STEPPER_GLOBAL_OPTIONS } from '@angular/cdk/stepper'; import Swiper from 'swiper'; declare var CryptoJS @Component({ @@ -21,7 +21,7 @@ declare var CryptoJS styleUrls: ['./entry-plan-look.component.scss'] }) export class EntryPlanLookComponent implements OnInit { - constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,private tree: TreeService,public dialog: MatDialog,public snackBar: MatSnackBar) { } + constructor(private http: HttpClient, private router: Router, private route: ActivatedRoute, private tree: TreeService, public dialog: MatDialog, public snackBar: MatSnackBar) { } pageEvent: PageEvent; private _transformer = (node, level: number) => { //初始化tree return { @@ -39,122 +39,124 @@ export class EntryPlanLookComponent implements OnInit { myControl = new FormControl(); hasChild = (_: number, node: any) => node.expandable; - displayedColumns: string[] = ['planname', 'addpeople', 'addtime','plantype','auditstate', 'isopen','preparethelevel','operation']; - tabledataSource:any + displayedColumns: string[] = ['planname', 'addpeople', 'addtime', 'plantype', 'auditstate', 'isopen', 'preparethelevel', 'operation']; + tabledataSource: any //分页 - @ViewChild(MatPaginator, {static: true}) + @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; - length:any; //共多少条数据 - pageSize:any; //每页条数 + length: any; //共多少条数据 + pageSize: any; //每页条数 pageSizeOptions: number[] = [10] //设置每页条数 - PageNumber:any = 1; //第几页 + PageNumber: any = 1; //第几页 - unitdata:any = {} + unitdata: any = {} - unittypeId:any //单位类型id - + unittypeId: any //单位类型id + //获取当前单位信息 - compantData:any - getCompanyData () { + compantData: any + getCompanyData() { let CompanyName = sessionStorage.getItem("companyName") - let header = { + let header = { CompanyName: CompanyName || '', } - this.http.get('/api/Plans',{params:header}).subscribe((data:any)=>{ + this.http.get('/api/Plans', { params: header }).subscribe((data: any) => { data.items.forEach(element => { - if (element.companyId===this.route.snapshot.queryParams.unitId) { - this.compantData = element.company - return } }); - // console.log(123,this.compantData) - this.unitdata.unitname = this.compantData.name - this.unitdata.organizationName = this.compantData.organizationName - this.unitdata.unittype = this.compantData.buildingTypes[0].name - this.unitdata.unitaddress = this.compantData.address - this.unittypeId = this.compantData.buildingTypes[0].id + if (element.companyId === this.route.snapshot.queryParams.unitId) { + this.compantData = element.company + return + } + }); + // console.log(123,this.compantData) + this.unitdata.unitname = this.compantData.name + this.unitdata.organizationName = this.compantData.organizationName + this.unitdata.unittype = this.compantData.buildingTypes[0].name + this.unitdata.unitaddress = this.compantData.address + this.unittypeId = this.compantData.buildingTypes[0].id }) } //跳转单位信息 - lookUnitData(){ - sessionStorage.setItem("editable","0") - sessionStorage.setItem("companyName",this.route.snapshot.queryParams.unitName) - sessionStorage.setItem("companyId",this.route.snapshot.queryParams.unitId) + lookUnitData() { + sessionStorage.setItem("editable", "0") + sessionStorage.setItem("companyName", this.route.snapshot.queryParams.unitName) + sessionStorage.setItem("companyId", this.route.snapshot.queryParams.unitId) // sessionStorage.setItem(element.id,JSON.stringify(element.companyIntegrityScore)) window.open(`/keyUnit/viewunitinfo?id=${this.route.snapshot.queryParams.unitId}&usci=${this.route.snapshot.queryParams.usci}`) } - //分页事件 - changePage(e){ - this.PageNumber = e.pageIndex+1 + //分页事件 + changePage(e) { + this.PageNumber = e.pageIndex + 1 this.getAllPlanComponents() } - isoperation:any //判断预案录入 和 审核公开预案 区别变量 + isoperation: any //判断预案录入 和 审核公开预案 区别变量 ngOnInit(): void { this.tabledataSource = [ ] // this.getCompanyData() this.isoperation = this.route.snapshot.queryParams.operation - this.unitdata.unitname = this.route.snapshot.queryParams.unitName - this.unitdata.organizationName = this.route.snapshot.queryParams.orName - this.unitdata.unittype = this.route.snapshot.queryParams.unitType - this.unitdata.unitaddress = this.route.snapshot.queryParams.unitAdd + this.unitdata.unitname = this.route.snapshot.queryParams.unitName + this.unitdata.organizationName = this.route.snapshot.queryParams.orName + this.unitdata.unittype = this.route.snapshot.queryParams.unitType + this.unitdata.unitaddress = this.route.snapshot.queryParams.unitAdd this.companyId = this.route.snapshot.queryParams.unitId this.unittypeId = this.route.snapshot.queryParams.unitTypeId this.getAllPlanComponents() } //查看预案 - lookPlan(e){ - if(e.planType == 16||e.planType == 4||e.planType == 8){ + lookPlan(e) { + if (e.planType == 16 || e.planType == 4 || e.planType == 8) { // console.log(e.attachmentUrls) - var index=e.attachmentUrls[0].indexOf("\/") - if(e.attachmentUrls[0].substr(0,index)=='psw'){ + var index = e.attachmentUrls[0].indexOf("\/") + if (e.attachmentUrls[0].substr(0, index) == 'psw') { const dialogRef = this.dialog.open(PsViewer, { width: '1500px', - height:'800px', + height: '800px', data: e.attachmentUrls[0] }); - }else if(e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='JPG'||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='png'||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='jpeg'||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='jpg'){ + } else if (e.attachmentUrls[0].substr(e.attachmentUrls[0].length - 3, e.attachmentUrls[0].length) == 'JPG' || e.attachmentUrls[0].substr(e.attachmentUrls[0].length - 3, e.attachmentUrls[0].length) == 'png' || e.attachmentUrls[0].substr(e.attachmentUrls[0].length - 3, e.attachmentUrls[0].length) == 'jpeg' || e.attachmentUrls[0].substr(e.attachmentUrls[0].length - 3, e.attachmentUrls[0].length) == 'jpg') { let data = e - const dialogRef = this.dialog.open(ImgDetails, {//调用open方法打开对话框并且携带参数过去 - data:data.attachmentUrls, - }); - dialogRef.afterClosed().subscribe(); + const dialogRef = this.dialog.open(ImgDetails, {//调用open方法打开对话框并且携带参数过去 + data: data.attachmentUrls, + }); + dialogRef.afterClosed().subscribe(); } else /* if(e.attachmentUrls[0].substr(e.attachmentUrls[0].length-4,e.attachmentUrls[0].length-1)=='docx'||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='pdf' ||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='doc'||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='DOC' - ||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='txt'||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='JPG') */{ - let filename:string - let fetchUrl = e.attachmentUrls[0] - let docIdWordArray = CryptoJS.enc.Utf8.parse(`PlanPlatform/` + fetchUrl); - let docId = CryptoJS.enc.Base64.stringify(docIdWordArray); - let jwt = sessionStorage.getItem("token"); - let rawJwt = CryptoJS.enc.Base64.parse(jwt.split('.')[1]); - let identityJson = CryptoJS.enc.Utf8.stringify(rawJwt); - let identityJsonparse=JSON.parse(identityJson) - this.http.get(`/api/ObjectMetadata/PlanPlatform/${fetchUrl}`).subscribe((data:any)=>{ - filename=data.fileName - let json={ - doc: { - docId: docId, - title: filename, - fetchUrl: `http://39.106.78.171:8000/api/Objects/PlanPlatform/`+fetchUrl, - }, - user: { - uid: identityJsonparse.sub, - nickName: identityJsonparse.name, - avatar: "", - privilege: e.auditStatus!='1'&&e.auditStatus!='16'?[ - 'FILE_READ','FILE_WRITE','FILE_DOWNLOAD', 'FILE_PRINT' - ]:[ - '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); - window.open(`http://121.5.10.84:80/apps/editor/openPreview?data=${base64}`) - }) + ||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='txt'||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='JPG') */ { + let filename: string + let fetchUrl = e.attachmentUrls[0] + let docIdWordArray = CryptoJS.enc.Utf8.parse(`PlanPlatform/` + fetchUrl); + let docId = CryptoJS.enc.Base64.stringify(docIdWordArray); + let jwt = sessionStorage.getItem("token"); + let rawJwt = CryptoJS.enc.Base64.parse(jwt.split('.')[1]); + let identityJson = CryptoJS.enc.Utf8.stringify(rawJwt); + let identityJsonparse = JSON.parse(identityJson) + this.http.get(`/api/ObjectMetadata/PlanPlatform/${fetchUrl}`).subscribe((data: any) => { + filename = data.fileName + let json = { + doc: { + docId: docId, + title: filename, + fetchUrl: `http://39.106.78.171:8000/api/Objects/PlanPlatform/` + fetchUrl, + }, + user: { + uid: identityJsonparse.sub, + nickName: identityJsonparse.name, + avatar: "", + privilege: e.auditStatus != '1' && e.auditStatus != '16' ? [ + 'FILE_READ', 'FILE_WRITE', 'FILE_DOWNLOAD', 'FILE_PRINT' + ] : [ + '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); + window.open(`http://121.5.10.84:80/apps/editor/openPreview?data=${base64}`) + }) } } /* if(e.planType == 4){ @@ -167,39 +169,39 @@ export class EntryPlanLookComponent implements OnInit { }); } } */ - if(e.planType == 1){ //如果是在线编辑 - let id = e.id - sessionStorage.setItem("planId",id) - sessionStorage.setItem("companyId",this.companyId) - sessionStorage.setItem("buildingTypeId",this.unittypeId) - sessionStorage.setItem("editable","0") - sessionStorage.setItem("planName",e.name) + if (e.planType == 1) { //如果是在线编辑 + let id = e.id + sessionStorage.setItem("planId", id) + sessionStorage.setItem("companyId", this.companyId) + sessionStorage.setItem("buildingTypeId", this.unittypeId) + sessionStorage.setItem("editable", "0") + sessionStorage.setItem("planName", e.name) let companyId = sessionStorage.getItem("companyId") window.open(`/keyUnit/viewunitinfoplan?id=${companyId}&orName=${this.route.snapshot.queryParams.orName}&orId=${this.route.snapshot.queryParams.orId}`); } - if(e.planType == 2){ //如果是跳转网页 - sessionStorage.setItem("url",e.url) + if (e.planType == 2) { //如果是跳转网页 + sessionStorage.setItem("url", e.url) window.open(`/planManagement/webLook`) } } //编辑预案 - editPlan(e){ + editPlan(e) { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 let isTrue = confirm('编辑后审核状态会成为未审核状态，您确定要编辑吗') - if (isTrue){ - if(e.planType == 1){ //如果是在线编辑 - let id = e.id - sessionStorage.setItem("planId",id) - sessionStorage.setItem("companyId",this.companyId) - sessionStorage.setItem("buildingTypeId",this.unittypeId) - sessionStorage.setItem("editable","1") - sessionStorage.setItem("planName",e.name) + if (isTrue) { + if (e.planType == 1) { //如果是在线编辑 + let id = e.id + sessionStorage.setItem("planId", id) + sessionStorage.setItem("companyId", this.companyId) + sessionStorage.setItem("buildingTypeId", this.unittypeId) + sessionStorage.setItem("editable", "1") + sessionStorage.setItem("planName", e.name) let companyId = sessionStorage.getItem("companyId") window.open(`/keyUnit/editunitinfo?id=${companyId}&orName=${this.route.snapshot.queryParams.orName}&orId=${this.route.snapshot.queryParams.orId}`); } - else if(e.planType==16){ + else if (e.planType == 16) { this.lookPlan(e) // let body={ // // id:e.planId, @@ -207,194 +209,194 @@ export class EntryPlanLookComponent implements OnInit { // "" // } let body = JSON.stringify(""); - let resetAudit=true + let resetAudit = true let headers = new HttpHeaders({ 'Content-Type': 'text/json' }); let options = { headers }; - this.http.put(`/api/PlanComponents/${e.id}?resetAudit=${resetAudit}`, body, options).subscribe(data=>{ + this.http.put(`/api/PlanComponents/${e.id}?resetAudit=${resetAudit}`, body, options).subscribe(data => { this.getAllPlanComponents() - },err => { - this.snackBar.open(err,'确定',config); + }, err => { + this.snackBar.open(err, '确定', config); }) } - else{ - - this.snackBar.open('只有二维预案和文本预案可以编辑!','确定',config); + else { + + this.snackBar.open('只有二维预案和文本预案可以编辑!', '确定', config); } } - + } - allPlanComponents:any //所有预案组件 - companyId : any //新建预案需要使用的id - planId : any //统一预案id + allPlanComponents: any //所有预案组件 + companyId: any //新建预案需要使用的id + planId: any //统一预案id lookUrl //查看文件路径 //改名 - changeName(element){ + changeName(element) { // console.log(element) const dialogRef = this.dialog.open(ChangeName, { - data: {element:element} + data: { element: element } }); dialogRef.afterClosed().subscribe( - data=>{ - if(data){ + data => { + if (data) { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - this.snackBar.open('修改成功!','确定',config); + this.snackBar.open('修改成功!', '确定', config); this.getAllPlanComponents() - } + } } ); } //获得所有预案组件 - getAllPlanComponents(){ - let pagetype = this.route.snapshot.queryParams.pagetype - let unitId = this.route.snapshot.queryParams.unitId - let paramsData:any - if(pagetype == 'entryplan'){ + getAllPlanComponents() { + let pagetype = this.route.snapshot.queryParams.pagetype + let unitId = this.route.snapshot.queryParams.unitId + let paramsData: any + if (pagetype == 'entryplan') { paramsData = { - companyId:unitId, + companyId: unitId, pageNumber: this.PageNumber, pageSize: "", sort: "" } } - if(pagetype == 'passplan'){ + if (pagetype == 'passplan') { paramsData = { - companyId:unitId, + companyId: unitId, pageNumber: this.PageNumber, pageSize: "", - AuditStatus:2, + AuditStatus: 2, sort: "" } } - if(pagetype == 'openplan'){ + if (pagetype == 'openplan') { paramsData = { - companyId:unitId, + companyId: unitId, pageNumber: this.PageNumber, pageSize: "", - IsPublic:true, + IsPublic: true, sort: "" } } - - this.http.get("/api/PlanComponents",{params:paramsData}).subscribe((data:any)=>{ + + this.http.get("/api/PlanComponents", { params: paramsData }).subscribe((data: any) => { this.length = data.totalCount this.allPlanComponents = data this.tabledataSource = data.items }) } //删除预案 - deletePlan(plandata){ - + deletePlan(plandata) { + const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 let isTrue = confirm('您确定要删除吗') if (isTrue) { - if(plandata.planType == 1){//如果删除的是二维预案 - this.http.delete(`/api/PlanComponents2D/${plandata.id}`).subscribe(data=>{ - this.snackBar.open('删除成功!','确定',config); + if (plandata.planType == 1) {//如果删除的是二维预案 + this.http.delete(`/api/PlanComponents2D/${plandata.id}`).subscribe(data => { + this.snackBar.open('删除成功!', '确定', config); this.getAllPlanComponents() }) - }else{ - this.http.delete(`/api/PlanComponents/${plandata.id}`).subscribe(data=>{ + } else { + this.http.delete(`/api/PlanComponents/${plandata.id}`).subscribe(data => { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - this.snackBar.open('删除成功!','确定',config); + this.snackBar.open('删除成功!', '确定', config); this.getAllPlanComponents() }) } } - + } //提交审核 - submitAudit(element){ + submitAudit(element) { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - /* if(element.auditStatus == 4){ - this.snackBar.open('审核退回的预案需要修改后方可再次提交审核!','确定',config); - } */ - if(element.planType == 1){//如果提交审核的是二维预案 - if(element.auditStatus ==8){ - this.http.put(`/api/PlanComponents2D/${element.id}/Commit`,"").subscribe(data=>{ - this.getAllPlanComponents() - },err => { - this.snackBar.open(err,'确定',config); - }) - } - else{ - this.snackBar.open('审核退回的预案需要修改后方可再次提交审核!','确定',config); - } - }else{ - this.http.put(`/api/PlanComponents/${element.id}/Commit`,"").subscribe(data=>{ + /* if(element.auditStatus == 4){ + this.snackBar.open('审核退回的预案需要修改后方可再次提交审核!','确定',config); + } */ + if (element.planType == 1) {//如果提交审核的是二维预案 + if (element.auditStatus == 8) { + this.http.put(`/api/PlanComponents2D/${element.id}/Commit`, "").subscribe(data => { this.getAllPlanComponents() - },err => { - this.snackBar.open(err,'确定',config); + }, err => { + this.snackBar.open(err, '确定', config); }) } - - + else { + this.snackBar.open('审核退回的预案需要修改后方可再次提交审核!', '确定', config); + } + } else { + this.http.put(`/api/PlanComponents/${element.id}/Commit`, "").subscribe(data => { + this.getAllPlanComponents() + }, err => { + this.snackBar.open(err, '确定', config); + }) + } + + } //撤销审核 - cancelAudit(element){ - if(element.planType == 1){//如果撤销审核的是二维预案 - this.http.put(`/api/PlanComponents2D/${element.id}/Cancel`,"").subscribe(data=>{ + cancelAudit(element) { + if (element.planType == 1) {//如果撤销审核的是二维预案 + this.http.put(`/api/PlanComponents2D/${element.id}/Cancel`, "").subscribe(data => { this.getAllPlanComponents() }) - }else{ - this.http.put(`/api/PlanComponents/${element.id}/Cancel`,"").subscribe(data=>{ + } else { + this.http.put(`/api/PlanComponents/${element.id}/Cancel`, "").subscribe(data => { this.getAllPlanComponents() - },err => { + }, err => { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - this.snackBar.open(err,'确定',config); + this.snackBar.open(err, '确定', config); }) } } //审核结果 - auditResult(element){ + auditResult(element) { // console.log(element) const dialogRef = this.dialog.open(AuditResult, { - width:"395px", - data: {element:element} + width: "395px", + data: { element: element } }); dialogRef.afterClosed().subscribe( - data=>{ - if(data){ - - } + data => { + if (data) { + + } } ); } //下载↓ - selectDownloadFile:any; //选择下载的文件 - download:any; //下载文件元数据 - downloadisLoading:boolean = false; //进度条loading加载 - downloadProgress:number=0; //进度条进度 - downloadFileName:any + selectDownloadFile: any; //选择下载的文件 + download: any; //下载文件元数据 + downloadisLoading: boolean = false; //进度条loading加载 + downloadProgress: number = 0; //进度条进度 + downloadFileName: any - uploadFileLonging:any + uploadFileLonging: any //读取下载文件信息 - readFile (element) { + readFile(element) { this.uploadFileLonging = element const dialogRef = this.dialog.open(DownloadFile, { - width:"435px", + width: "435px", // height:"410px", - data: {fileUrls:element.attachmentUrls,compantData:this.unitdata.unitname,element:element} + data: { fileUrls: element.attachmentUrls, compantData: this.unitdata.unitname, element: element } }); dialogRef.afterClosed().subscribe( - data=>{ - if(data){ + data => { + if (data) { this.downloadFileName = data.fileName this.download = data this.downloadFile() @@ -404,30 +406,30 @@ export class EntryPlanLookComponent implements OnInit { } //初始化下载 - downloadFile () { + downloadFile() { this.downloadProgress = 0 let file = this.download let fileSize = file.fileLength//下载文件的总大小 let shardSize = 10 * 1024 * 1024 //文件大小是否大于10MB - if (file && fileSize<=shardSize) { //<=10MB时直接下载 + if (file && fileSize <= shardSize) { //<=10MB时直接下载 this.downloadisLoading = true // this.setFileLoading() - this.http.get(`/api/Objects/PlanPlatform/${file.objectName}`,{responseType: 'blob'},).subscribe(data=>{ + this.http.get(`/api/Objects/PlanPlatform/${file.objectName}`, { responseType: 'blob' },).subscribe(data => { let url = window.URL.createObjectURL(new Blob([data])); //createObjectURL创建一个下载Blob的url地址 let link = document.createElement("a"); link.style.display = "none"; link.href = url; - let suffix = file.objectName.substring(file.objectName.lastIndexOf(".")+1,file.objectName.length) ; - link.setAttribute("download", file.fileName ? file.fileName : this.unitdata.unitname + "-" +this.uploadFileLonging.name + "." + suffix); + let suffix = file.objectName.substring(file.objectName.lastIndexOf(".") + 1, file.objectName.length); + link.setAttribute("download", file.fileName ? file.fileName : this.unitdata.unitname + "-" + this.uploadFileLonging.name + "." + suffix); document.body.appendChild(link); link.click(); this.downloadisLoading = false // this.setFileLoading() }) - } else if (file && fileSize > shardSize) { //>10MB时分块下载 + } else if (file && fileSize > shardSize) { //>10MB时分块下载 this.blockingDownload() //分段下载 this.downloadisLoading = true // this.setFileLoading() @@ -436,31 +438,32 @@ export class EntryPlanLookComponent implements OnInit { } //分段下载并合并 - async blockingDownload () { + async blockingDownload() { let file = this.download let fileSize = file.fileLength //下载文件的总大小 let shardSize = 3 * 1024 * 1024 //3MB一个分片 let allSlice = Math.ceil(fileSize / shardSize) //总文件/3MB===共分多少段 - let allFile:any = [] //所有的file分段 + let allFile: any = [] //所有的file分段 - for (let i=0;i{ - this.http.get(`/api/Objects/PlanPlatform/${file.objectName}`,{headers:{'range':`bytes= ${start}-${end}`},responseType:'blob'}).subscribe(data=>{ - result(data) }) + let result = await new Promise((result, reject) => { + this.http.get(`/api/Objects/PlanPlatform/${file.objectName}`, { headers: { 'range': `bytes= ${start}-${end}` }, responseType: 'blob' }).subscribe(data => { + result(data) + }) }) allFile.push(result) - this.downloadProgress = Number((i/allSlice).toFixed(2))*100 + this.downloadProgress = Number((i / allSlice).toFixed(2)) * 100 if (allFile.length === allSlice) { //合并文件输出给浏览器 let url = window.URL.createObjectURL(new Blob(allFile)); //createObjectURL创建一个下载Blob的url地址 let link = document.createElement("a"); link.style.display = "none"; link.href = url; - let suffix = file.objectName.substring(file.objectName.lastIndexOf(".")+1,file.objectName.length) ; - link.setAttribute("download", file.fileName ? file.fileName : this.unitdata.unitname + "-" +this.uploadFileLonging.name + "." + suffix); + let suffix = file.objectName.substring(file.objectName.lastIndexOf(".") + 1, file.objectName.length); + link.setAttribute("download", file.fileName ? file.fileName : this.unitdata.unitname + "-" + this.uploadFileLonging.name + "." + suffix); document.body.appendChild(link); link.click(); // this.downloadProgress = 0 @@ -473,11 +476,11 @@ export class EntryPlanLookComponent implements OnInit { } //取消分块下载 - cancelDowload () { + cancelDowload() { } //封装函数设置当前文件loading状态 - setFileLoading () { + setFileLoading() { // let id = this.selectDownloadFile.id // this.CADList.forEach(element => { // if (element.id === id) { element.loading = !element.loading } @@ -485,28 +488,28 @@ export class EntryPlanLookComponent implements OnInit { } //新建预案弹出框 - addplan () { + addplan() { const dialogRef = this.dialog.open(AddPlanone, { - width:"585px", - height:"430px", - data: {companyId:this.companyId}, - disableClose:true + width: "585px", + height: "430px", + data: { companyId: this.companyId }, + disableClose: true }); dialogRef.afterClosed().subscribe( - data=>{ - if(data){ + data => { + if (data) { // this.route.snapshot.queryParams.id = data.planId this.planId = data.planId this.getAllPlanComponents() - if(data.planMode == 2){//如果添加方式为在线编辑 - sessionStorage.setItem("planId",data.id); - sessionStorage.setItem("companyId",this.companyId) - sessionStorage.setItem("buildingTypeId",this.unittypeId) - sessionStorage.setItem("editable","1") + if (data.planMode == 2) {//如果添加方式为在线编辑 + sessionStorage.setItem("planId", data.id); + sessionStorage.setItem("companyId", this.companyId) + sessionStorage.setItem("buildingTypeId", this.unittypeId) + sessionStorage.setItem("editable", "1") let companyId = sessionStorage.getItem("companyId") window.open(`/keyUnit/editunitinfo?id=${companyId}`); } - } + } } ); } @@ -518,18 +521,18 @@ export class EntryPlanLookComponent implements OnInit { selector: 'AddPlanone', templateUrl: './AddPlanone.html', styleUrls: ['./entry-plan-look.component.scss'], - + }) export class AddPlanone { isLinear = true; //是否为线性步进器 firstFormGroup: FormGroup; secondFormGroup: FormGroup; - constructor(private _formBuilder: FormBuilder,private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar,private tree: TreeService) {} - - - + constructor(private _formBuilder: FormBuilder, private http: HttpClient, public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data, public snackBar: MatSnackBar, private tree: TreeService) { } + + + ngOnInit(): void { - this.levels=sessionStorage.getItem("level") + this.levels = sessionStorage.getItem("level") this.firstFormGroup = this._formBuilder.group({ firstCtrlone: ['', Validators.required], firstCtrltwo: ['', Validators.required], @@ -538,133 +541,135 @@ export class AddPlanone { this.secondFormGroup = this._formBuilder.group({ secondCtrl: ['', Validators.required] }); - + } onNoClick(): void { this.dialogRef.close(); } levels// - isup:boolean = true //上传input框是否显示 - isweb:boolean = false //web输入框是否显示 - isinput:boolean = false //导入是否显示 + isup: boolean = true //上传input框是否显示 + isweb: boolean = false //web输入框是否显示 + isinput: boolean = false //导入是否显示 defaultisshow = '0' //默认显示上传input框 - pswShow=false //是否为全景图选项默认不显示 + pswShow = false //是否为全景图选项默认不显示 psw//是否为全景图 cadPlan//是否为卡片预案 //选择radio - selectradio(e){ - if(e.value == "0"){ //如果点击本地上传 + selectradio(e) { + if (e.value == "0") { //如果点击本地上传 this.isup = true this.isinput = false this.isweb = false this.webaddress = "" } - if(e.value == "1"){ //如果点击导入word文档 + if (e.value == "1") { //如果点击导入word文档 this.isinput = true this.isup = false this.isweb = false this.webaddress = "" } - if(e.value == "2"){ //如果点击在线编辑 + if (e.value == "2") { //如果点击在线编辑 this.isinput = false this.isup = false this.isweb = false this.webaddress = "" } - if(e.value == "3"){ //如果点击输入网址 + if (e.value == "3") { //如果点击输入网址 this.isweb = true this.isup = false this.isinput = false this.webaddress = "" } } - file2:any = null; //导入的文件 - webaddress:any = "" //输入的网页地址 + file2: any = null; //导入的文件 + webaddress: any = "" //输入的网页地址 //上传文件↓ - file:any; //上传的文件 - fileName:any; //上传文件name - uploadisLoading:boolean = false; //进度条loading加载 - uploadProgress:number=0; //进度条进度 - objectName:any; //上传对象名 - uploadId:any; //上传分块上传事件编号 - //上传文件input - filechange(e){ - this.psw=false - this.file = e.target.files[0] || null //上传的文件 - if(this.selectedPLanType=='4'&&this.file.type!=null&&this.file.type!=undefined){ - if(this.file.type=='image/png'||this.file.type=='image/jpeg'){ - this.pswShow=true - }else{this.pswShow=false} - }else{this.pswShow=false} - - // this.startUploading() -} + file: any; //上传的文件 + fileName: any; //上传文件name + uploadisLoading: boolean = false; //进度条loading加载 + uploadProgress: number = 0; //进度条进度 + objectName: any; //上传对象名 + uploadId: any; //上传分块上传事件编号 + //上传文件input + filechange(e) { + this.psw = false + this.file = e.target.files[0] || null //上传的文件 + if (this.selectedPLanType == '4' && this.file.type != null && this.file.type != undefined) { + if (this.file.type == 'image/png' || this.file.type == 'image/jpeg') { + this.pswShow = true + } else { this.pswShow = false } + } else { this.pswShow = false } + + // this.startUploading() + } //上传文件 - startUploading (planType) { + startUploading(planType) { let file = this.file || null //获取上传的文件 let fileSize = file.size || null //上传文件的总大小 let shardSize = 5 * 1024 * 1024 //5MB一个分片 // console.log(this.psw) - if (file && fileSize<=shardSize) { //上传文件<=5MB时 + if (file && fileSize <= shardSize) { //上传文件<=5MB时 let formData = new FormData() - formData.append("file",file) - this.http.post(this.psw?'/api/Objects/PlanPlatform/psw': `/api/Objects/PlanPlatform/${this.data.companyId}/2D`,formData).subscribe((data:any)=>{ + formData.append("file", file) + this.http.post(this.psw ? '/api/Objects/PlanPlatform/psw' : `/api/Objects/PlanPlatform/${this.data.companyId}/2D`, formData).subscribe((data: any) => { this.objectName = data.objectName const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - this.snackBar.open('上传成功!','确定',config); + this.snackBar.open('上传成功!', '确定', config); this.uploadover = true let level = sessionStorage.getItem("level") // console.log(level) - let PlanLevel - if(level == '0'){ - PlanLevel = 1 + let PlanLevel + if (level == '0') { + PlanLevel = 1 } - if(level == '1'){ - PlanLevel = 2 + if (level == '1') { + PlanLevel = 2 } - if(level == '2'){ - PlanLevel = 4 + if (level == '2') { + PlanLevel = 4 } - if(level == '3'){ - PlanLevel = 8 + if (level == '3') { + PlanLevel = 8 } let uploadUrl - if(planType == "非二维"){ + if (planType == "非二维") { uploadUrl = "/api/PlanComponents" - }else{ + } else { uploadUrl = "/api/PlanComponents2D" } - if(this.uploadover){ - this.http.post(uploadUrl,{ + if (this.uploadover) { + this.http.post(uploadUrl, { id: "", name: this.selectedPLanName, - planType:Number(this.selectedPLanType), + planType: Number(this.selectedPLanType), planMode: Number(this.defaultisshow), planLevel: PlanLevel, planCategory: Number(this.selectedPLanLevel), url: "", attachmentUrls: [`${this.objectName}`] - },{params:{ - companyId : this.data.companyId - }}).subscribe(data=>{ + }, { + params: { + companyId: this.data.companyId + } + }).subscribe(data => { this.dialogRef.close(data); }) - }else{ + } else { console.log("上传出错") } - + }) - } else if (file && fileSize>shardSize) { //上传文件>5MB时,分块上传 - let data = {filename: file.name} + } else if (file && fileSize > shardSize) { //上传文件>5MB时,分块上传 + let data = { filename: file.name } this.uploadisLoading = true - this.http.post(this.psw?'/api/NewMultipartUpload/PlanPlatform/psw':`/api/NewMultipartUpload/PlanPlatform/${this.data.companyId}/2D`,{},{params:data}).subscribe((data:any)=>{ //初始化分段上传 + this.http.post(this.psw ? '/api/NewMultipartUpload/PlanPlatform/psw' : `/api/NewMultipartUpload/PlanPlatform/${this.data.companyId}/2D`, {}, { params: data }).subscribe((data: any) => { //初始化分段上传 this.objectName = data.objectName this.uploadId = data.uploadId this.subsectionUploading(planType) @@ -672,206 +677,210 @@ export class AddPlanone { } } - - PartNumberETag:any=[]; //每次返回需要保存的信息 + + PartNumberETag: any = []; //每次返回需要保存的信息 //开始分段上传 - async subsectionUploading (planType) { + async subsectionUploading(planType) { let file = this.file || null //获取上传的文件 let fileSize = file.size || null //上传文件的总大小 let shardSize = 5 * 1024 * 1024 //5MB一个分片 let allSlice = Math.ceil(fileSize / shardSize) //总文件/5MB===共分多少段 向上取整 - for (let i = 0;i < allSlice;i++) { //循环分段上传 - let start = i * shardSize //切割文件开始位置 - let end = Math.min(fileSize, start + shardSize); //切割文件结束位置 （对比取小数） - let formData = new FormData() - formData.append("file",file.slice(start, end)) - - //同步写法实现异步调用 - let result = await new Promise((resolve, reject) => { - // await 需要后面返回一个 promise 对象 - this.http.post(`/api/MultipartUpload/PlanPlatform/${this.objectName}?uploadId=${this.uploadId}&partNumber=${i+1}`,formData).subscribe((data:any)=>{ - let msg = { - "partNumber":data.partNumber || null, - "eTag": data.eTag || null} - resolve(msg) // 调用 promise 内置方法处理成功 - }) - }); - this.PartNumberETag.push(result) - this.uploadProgress = Number((i/allSlice).toFixed(2))*100 + for (let i = 0; i < allSlice; i++) { //循环分段上传 + let start = i * shardSize //切割文件开始位置 + let end = Math.min(fileSize, start + shardSize); //切割文件结束位置 （对比取小数） + let formData = new FormData() + formData.append("file", file.slice(start, end)) + + //同步写法实现异步调用 + let result = await new Promise((resolve, reject) => { + // await 需要后面返回一个 promise 对象 + this.http.post(`/api/MultipartUpload/PlanPlatform/${this.objectName}?uploadId=${this.uploadId}&partNumber=${i + 1}`, formData).subscribe((data: any) => { + let msg = { + "partNumber": data.partNumber || null, + "eTag": data.eTag || null + } + resolve(msg) // 调用 promise 内置方法处理成功 + }) + }); + this.PartNumberETag.push(result) + this.uploadProgress = Number((i / allSlice).toFixed(2)) * 100 - if (this.PartNumberETag.length === allSlice) { - this.uploadProgress = 100 - this.endUploading(planType)} + if (this.PartNumberETag.length === allSlice) { + this.uploadProgress = 100 + this.endUploading(planType) + } }//for循环 } - uploadover:any = false //上传完成之后提示 + uploadover: any = false //上传完成之后提示 //完成分块上传 - endUploading (planType) { + endUploading(planType) { let data = this.PartNumberETag - let paramsData = {uploadId:this.uploadId} - this.http.post(`/api/CompleteMultipartUpload/PlanPlatform/${this.objectName}`,data,{params:paramsData}).subscribe(data=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('上传成功!','确定',config); - this.uploadProgress = 0; - this.uploadisLoading = false - this.PartNumberETag =[] //清空保存返回的信息 - this.uploadover = true - let level = sessionStorage.getItem("level") - // console.log(level) - let PlanLevel - if(level == '0'){ - PlanLevel = 1 - } - if(level == '1'){ - PlanLevel = 2 - } - if(level == '2'){ - PlanLevel = 4 - } - if(level == '3'){ - PlanLevel = 8 - } - let uploadUrl - if(planType == "非二维"){ - uploadUrl = "/api/PlanComponents" - }else{ - uploadUrl = "/api/PlanComponents2D" - } - if(this.uploadover){//如果上次成功了才创建 - this.http.post(uploadUrl,{ - id: "", - name: this.selectedPLanName, - planType:Number(this.selectedPLanType), - planMode: Number(this.defaultisshow), - planLevel: PlanLevel, - planCategory: Number(this.selectedPLanLevel), - url: "", - attachmentUrls: [`${this.objectName}`] - },{params:{ - companyId : this.data.companyId - }}).subscribe(data=>{ - this.dialogRef.close(data); - }) - }else{ - console.log("上传出错！") - } - + let paramsData = { uploadId: this.uploadId } + this.http.post(`/api/CompleteMultipartUpload/PlanPlatform/${this.objectName}`, data, { params: paramsData }).subscribe(data => { + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('上传成功!', '确定', config); + this.uploadProgress = 0; + this.uploadisLoading = false + this.PartNumberETag = [] //清空保存返回的信息 + this.uploadover = true + let level = sessionStorage.getItem("level") + // console.log(level) + let PlanLevel + if (level == '0') { + PlanLevel = 1 + } + if (level == '1') { + PlanLevel = 2 + } + if (level == '2') { + PlanLevel = 4 + } + if (level == '3') { + PlanLevel = 8 + } + let uploadUrl + if (planType == "非二维") { + uploadUrl = "/api/PlanComponents" + } else { + uploadUrl = "/api/PlanComponents2D" + } + if (this.uploadover) {//如果上次成功了才创建 + this.http.post(uploadUrl, { + id: "", + name: this.selectedPLanName, + planType: Number(this.selectedPLanType), + planMode: Number(this.defaultisshow), + planLevel: PlanLevel, + planCategory: Number(this.selectedPLanLevel), + url: "", + attachmentUrls: [`${this.objectName}`] + }, { + params: { + companyId: this.data.companyId + } + }).subscribe(data => { + this.dialogRef.close(data); + }) + } else { + console.log("上传出错！") + } + }) } - + //取消分块上传 - cancel () { - this.http.delete(`/api/MultipartUpload/PlanPlatform/${this.objectName}?uploadId=${this.uploadId}`).subscribe(data=>{ + cancel() { + this.http.delete(`/api/MultipartUpload/PlanPlatform/${this.objectName}?uploadId=${this.uploadId}`).subscribe(data => { this.uploadProgress = 0; - this.uploadisLoading= false; - (document.getElementById('uploadFile')).value = null - this.PartNumberETag =[] //清空保存返回的信息 + this.uploadisLoading = false; + (document.getElementById('uploadFile')).value = null + this.PartNumberETag = [] //清空保存返回的信息 const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - this.snackBar.open('取消上传成功!','确定',config); + this.snackBar.open('取消上传成功!', '确定', config); this.uploadover = false this.file = null }) } - - + + //导入word文件 - fileInput(e){ + fileInput(e) { this.file2 = e.target.files[0] } //点击下一步 - selectedPLanType:any//所选预案类型 - selectedPLanName:any//所选预案名称 - selectedPLanLevel:any//所选预案级别 - localup:boolean = false //本地上传 - inputword:boolean = false //导入文档 - onlineedit:boolean = false //在线编辑 - website:boolean = false //网页地址 - next(formdata){ + selectedPLanType: any//所选预案类型 + selectedPLanName: any//所选预案名称 + selectedPLanLevel: any//所选预案级别 + localup: boolean = false //本地上传 + inputword: boolean = false //导入文档 + onlineedit: boolean = false //在线编辑 + website: boolean = false //网页地址 + next(formdata) { //console.log(formdata.value.firstCtrlthree) //console.log(this.file) - this.psw=false + this.psw = false this.selectedPLanName = formdata.value.firstCtrlone this.selectedPLanType = formdata.value.firstCtrltwo - this.selectedPLanLevel= formdata.value.firstCtrlthree - if(formdata.value.firstCtrltwo=='16'){ //如果是卡片预案 + this.selectedPLanLevel = formdata.value.firstCtrlthree + if (formdata.value.firstCtrltwo == '16') { //如果是卡片预案 this.localup = true this.inputword = true this.onlineedit = false this.website = false } - if(formdata.value.firstCtrltwo=='1'){ //如果是2D预案 + if (formdata.value.firstCtrltwo == '1') { //如果是2D预案 this.localup = true this.inputword = false this.onlineedit = true this.website = true - } - if(formdata.value.firstCtrltwo=='2' || formdata.value.firstCtrltwo=='4'){ + } + if (formdata.value.firstCtrltwo == '2' || formdata.value.firstCtrltwo == '4') { this.localup = true this.inputword = false this.onlineedit = false this.website = true - this.pswShow=true - } - if(this.selectedPLanType=='4'&&this.file!=undefined&&this.file.type!=null){ - if(this.file.type=='image/png'||this.file.type=='image/jpeg'){ - this.pswShow=true - this.website=false - }else{this.pswShow=false} - }else{this.pswShow=false} - + this.pswShow = true + } + if (this.selectedPLanType == '4' && this.file != undefined && this.file.type != null) { + if (this.file.type == 'image/png' || this.file.type == 'image/jpeg') { + this.pswShow = true + this.website = false + } else { this.pswShow = false } + } else { this.pswShow = false } + } - setttt(){ - this.pswShow=false - this.psw=false + setttt() { + this.pswShow = false + this.psw = false } - closediv(){ + closediv() { //console.log(this.file) - if(this.file!=undefined){ + if (this.file != undefined) { this.cancel(); } - + this.dialogRef.close(); } - + // 提交创建 - onSubmit(value){ + onSubmit(value) { let level = sessionStorage.getItem("level") // console.log(level) - let PlanLevel - if(level == '0'){ - PlanLevel = 1 + let PlanLevel + if (level == '0') { + PlanLevel = 1 } - if(level == '1'){ - PlanLevel = 2 + if (level == '1') { + PlanLevel = 2 } - if(level == '2'){ - PlanLevel = 4 + if (level == '2') { + PlanLevel = 4 } - if(level == '3'){ - PlanLevel = 8 + if (level == '3') { + PlanLevel = 8 } - if(this.selectedPLanType != "1"){//如果创建的不是二维预案 - if(this.defaultisshow == '0' && this.file == null){ //如果是本地上传 + if (this.selectedPLanType != "1") {//如果创建的不是二维预案 + if (this.defaultisshow == '0' && this.file == null) { //如果是本地上传 const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - this.snackBar.open('请先上传文件','确定',config); + this.snackBar.open('请先上传文件', '确定', config); } - if(this.defaultisshow == '0' && this.file){ //如果是本地上传并且有文件 + if (this.defaultisshow == '0' && this.file) { //如果是本地上传并且有文件 //先上传成功 this.startUploading("非二维") - + //再创建预案 // this.http.post("/api/PlanComponents",{ // id: "", @@ -888,26 +897,25 @@ export class AddPlanone { // }) } - if(this.defaultisshow == '1'){//如果是导入则很复杂 + if (this.defaultisshow == '1') {//如果是导入则很复杂 const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - this.snackBar.open('暂不支持导入','确定',config); + this.snackBar.open('暂不支持导入', '确定', config); } - if(this.defaultisshow == '3' && (this.webaddress == "" || this.webaddress == null)){ //如果是填写网址 + if (this.defaultisshow == '3' && (this.webaddress == "" || this.webaddress == null)) { //如果是填写网址 const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - this.snackBar.open('请先输入网址','确定',config); + this.snackBar.open('请先输入网址', '确定', config); } - if(this.defaultisshow == '3' && this.webaddress){ //如果是填写网址 - // console.log(99999,this.selectedPLanType) - var reg = new RegExp('(http|https):\/\/([\w.!@#$%^&*()_+-=])*\s*') - if(reg.test(this.webaddress)){ - let body = { + if (this.defaultisshow == '3' && this.webaddress) { //如果是填写网址 + var reg = new RegExp('(http|https):\/\/([\w.!@#$%^&*()_+-=])*\s*') + if (reg.test(this.webaddress)) { + let body = { id: "", name: this.selectedPLanName, - planType:Number(this.selectedPLanType), + planType: Number(this.selectedPLanType), planMode: Number(this.defaultisshow), planCategory: Number(this.selectedPLanLevel), planLevel: PlanLevel, @@ -915,28 +923,29 @@ export class AddPlanone { attachmentUrls: null } //console.log(body) - this.http.post("/api/PlanComponents",body,{params:{ - companyId : this.data.companyId - }}).subscribe(data=>{ - // console.log("创建成功") + this.http.post("/api/PlanComponents", body, { + params: { + companyId: this.data.companyId + } + }).subscribe(data => { this.dialogRef.close(data); }) - }else{ + } else { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - this.snackBar.open('请填写正确网址格式，需以http://或者https://开头的正确网址','确定',config); + this.snackBar.open('请填写正确网址格式，需以http://或者https://开头的正确网址', '确定', config); } } - }else{ //如果创建的是二维预案 - if(this.defaultisshow == '0' && this.file == null){ //如果是本地上传 + } else { //如果创建的是二维预案 + if (this.defaultisshow == '0' && this.file == null) { //如果是本地上传 const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - this.snackBar.open('请先上传文件','确定',config); + this.snackBar.open('请先上传文件', '确定', config); } - if(this.defaultisshow == '0' && this.file){ + if (this.defaultisshow == '0' && this.file) { this.startUploading("二维") // let body = { // id: "", @@ -954,38 +963,40 @@ export class AddPlanone { // this.dialogRef.close(data); // }) } - if(this.defaultisshow == '2'){ //如果是在线编辑------>跳转编制工具 - let body = { + if (this.defaultisshow == '2') { //如果是在线编辑------>跳转编制工具 + let body = { id: "", name: this.selectedPLanName, - planType:Number(this.selectedPLanType), + planType: Number(this.selectedPLanType), planMode: Number(this.defaultisshow), planLevel: PlanLevel, - planCategory:Number(this.selectedPLanLevel), + planCategory: Number(this.selectedPLanLevel), url: "", attachmentUrls: null } - this.http.post("/api/PlanComponents2D",body,{params:{ - companyId : this.data.companyId - }}).subscribe(data=>{ + this.http.post("/api/PlanComponents2D", body, { + params: { + companyId: this.data.companyId + } + }).subscribe(data => { // console.log("创建成功") this.dialogRef.close(data); }) } - if(this.defaultisshow == '3' && (this.webaddress == "" || this.webaddress == null)){ //如果是填写网址 + if (this.defaultisshow == '3' && (this.webaddress == "" || this.webaddress == null)) { //如果是填写网址 const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - this.snackBar.open('请先输入网址','确定',config); + this.snackBar.open('请先输入网址', '确定', config); } - if(this.defaultisshow == '3' && this.webaddress){ //如果是填写网址 + if (this.defaultisshow == '3' && this.webaddress) { //如果是填写网址 - var reg = new RegExp('(http|https):\/\/([\w.!@#$%^&*()_+-=])*\s*') - if(reg.test(this.webaddress)){ - let body = { + var reg = new RegExp('(http|https):\/\/([\w.!@#$%^&*()_+-=])*\s*') + if (reg.test(this.webaddress)) { + let body = { id: "", name: this.selectedPLanName, - planType:Number(this.selectedPLanType), + planType: Number(this.selectedPLanType), planMode: Number(this.defaultisshow), planCategory: Number(this.selectedPLanLevel), planLevel: PlanLevel, @@ -993,28 +1004,30 @@ export class AddPlanone { attachmentUrls: null } //console.log(body) - this.http.post("/api/PlanComponents2D",body,{params:{ - companyId : this.data.companyId - }}).subscribe(data=>{ + this.http.post("/api/PlanComponents2D", body, { + params: { + companyId: this.data.companyId + } + }).subscribe(data => { // console.log("创建成功") this.dialogRef.close(data); }) - }else{ + } else { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - this.snackBar.open('请填写正确网址格式，需以http://或者https://开头的正确网址','确定',config); + this.snackBar.open('请填写正确网址格式，需以http://或者https://开头的正确网址', '确定', config); } - + } - + } } - onSubmit2(value){ + onSubmit2(value) { // console.log(this.webaddress) - var reg = new RegExp('(http|https):\/\/([\w.!@#$%^&*()_+-=])*\s*') + var reg = new RegExp('(http|https):\/\/([\w.!@#$%^&*()_+-=])*\s*') //console.log(reg.test(this.webaddress)) } @@ -1035,20 +1048,20 @@ export class AddPlanone { styleUrls: ['./entry-plan-look.component.scss'] }) export class DownloadFile { - - constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {} - fileUrls:any //当前预案附件地址 - fileDatas:any = [] - selectedFileIndex : any = 0 - selectedFileData : any - - name2:any //如果真实姓名为空时 + + constructor(private http: HttpClient, public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data, public snackBar: MatSnackBar) { } + fileUrls: any //当前预案附件地址 + fileDatas: any = [] + selectedFileIndex: any = 0 + selectedFileData: any + + name2: any //如果真实姓名为空时 ngOnInit(): void { this.name2 = this.data.element.name this.fileUrls = this.data.fileUrls - this.fileUrls.forEach(item=>{ - this.http.get('/api/ObjectMetadata/PlanPlatform/'+item).subscribe((data:any)=>{ - data.filePige = (data.fileLength / (1024*1024)).toFixed(2) + this.fileUrls.forEach(item => { + this.http.get('/api/ObjectMetadata/PlanPlatform/' + item).subscribe((data: any) => { + data.filePige = (data.fileLength / (1024 * 1024)).toFixed(2) this.fileDatas.push(data) this.selectedFileData = data }) @@ -1058,12 +1071,12 @@ export class DownloadFile { this.dialogRef.close(); } - confirm(){ + confirm() { this.dialogRef.close(this.selectedFileData); } - + //点击想要下载的文件 - addurl(item,key){ + addurl(item, key) { // console.log(item,key) this.selectedFileIndex = key this.selectedFileData = item @@ -1078,18 +1091,18 @@ export class DownloadFile { styleUrls: ['./entry-plan-look.component.scss'] }) export class AuditResult { - - constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {} - planName:any = this.data.element.name - commitTime:any = this.data.element.committedTime - commitOrganizationName:any = this.data.element.committerOrganizationName + constructor(private http: HttpClient, public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data, public snackBar: MatSnackBar) { } + + planName: any = this.data.element.name + commitTime: any = this.data.element.committedTime + commitOrganizationName: any = this.data.element.committerOrganizationName - auditOrganizationName:any = this.data.element.auditorOrganizationName - auditResult:any = this.data.element.auditStatus - auditOpinion:any = this.data.element.auditOpinion + auditOrganizationName: any = this.data.element.auditorOrganizationName + auditResult: any = this.data.element.auditStatus + auditOpinion: any = this.data.element.auditOpinion ngOnInit(): void { - + } onNoClick(): void { this.dialogRef.close(); @@ -1104,16 +1117,16 @@ export class AuditResult { styleUrls: ['./entry-plan-look.component.scss'] }) export class ChangeName { - - constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {} - planName:any//预案名称 + + constructor(private http: HttpClient, public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data, public snackBar: MatSnackBar) { } + planName: any//预案名称 ngOnInit(): void { this.planName = this.data.element.name } onNoClick(): void { this.dialogRef.close(); } - onSubmit(value){ + onSubmit(value) { let headers = new HttpHeaders({ 'Content-Type': 'text/json' }); @@ -1121,12 +1134,12 @@ export class ChangeName { headers }; let body = JSON.stringify(value.name); - if(this.data.element.planType == 1){//如果是二维预案 - this.http.put(`/api/PlanComponents2D/${this.data.element.id}`,body,options).subscribe(data=>{ + if (this.data.element.planType == 1) {//如果是二维预案 + this.http.put(`/api/PlanComponents2D/${this.data.element.id}`, body, options).subscribe(data => { this.dialogRef.close("success"); }) - }else{ - this.http.put(`/api/PlanComponents/${this.data.element.id}`,body,options).subscribe(data=>{ + } else { + this.http.put(`/api/PlanComponents/${this.data.element.id}`, body, options).subscribe(data => { this.dialogRef.close("success"); }) } @@ -1139,14 +1152,14 @@ export class ChangeName { templateUrl: './Photo-Sphere-Viewer.html', styleUrls: ['./entry-plan-look.component.scss'] }) -export class PsViewer{ - constructor(private router:Router,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data: any) {} +export class PsViewer { + constructor(private router: Router, private http: HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: any) { } ngOnInit(): void { // console.log(this.data) const viewer = new Viewer({ container: document.querySelector('#viewer'), - panorama:'/api/Objects/PlanPlatform/'+ this.data, - + panorama: '/api/Objects/PlanPlatform/' + this.data, + }); } } @@ -1157,41 +1170,41 @@ export class PsViewer{ templateUrl: './previewImg.html', styleUrls: ['./entry-plan-look.component.scss'] }) -export class ImgDetails{ - constructor(private http:HttpClient,public dialog: MatDialog,public dialogRef: MatDialogRef, +export class ImgDetails { + constructor(private http: HttpClient, public dialog: MatDialog, public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data) { } - testSwiper: Swiper; - - ngOnInit(): void { - //console.log(this.data) - this.allImages = [] - this.data.forEach(element => { - element = `/api/Objects/PlanPlatform/${element}?x-oss-process=image/auto-orient,1` - this.allImages.push(element) - }); - //this.allImages.push(`${this.data.attachmentUrls[0]}?x-oss-process=image/auto-orient,1`) - } - - ngAfterViewInit() { - this.testSwiper = new Swiper('.swiper-container', { - lazy: true, - direction: 'horizontal', - loop: false, - - // 如果需要前进后退按钮 - navigation: { - nextEl: '.swiper-button-next', - prevEl: '.swiper-button-prev', - } - }); - } - - allImages:any; //展示所有的图片 - rotationAngle:number=0; //旋转角度 - - //旋转图片 - rotate () { - this.rotationAngle = this.rotationAngle+90 - if (this.rotationAngle === 360) {this.rotationAngle = 0} - } + testSwiper: Swiper; + + ngOnInit(): void { + //console.log(this.data) + this.allImages = [] + this.data.forEach(element => { + element = `/api/Objects/PlanPlatform/${element}?x-oss-process=image/auto-orient,1` + this.allImages.push(element) + }); + //this.allImages.push(`${this.data.attachmentUrls[0]}?x-oss-process=image/auto-orient,1`) + } + + ngAfterViewInit() { + this.testSwiper = new Swiper('.swiper-container', { + lazy: true, + direction: 'horizontal', + loop: false, + + // 如果需要前进后退按钮 + navigation: { + nextEl: '.swiper-button-next', + prevEl: '.swiper-button-prev', + } + }); + } + + allImages: any; //展示所有的图片 + rotationAngle: number = 0; //旋转角度 + + //旋转图片 + rotate() { + this.rotationAngle = this.rotationAngle + 90 + if (this.rotationAngle === 360) { this.rotationAngle = 0 } + } } \ No newline at end of file diff --git a/src/app/plan-management/plan-management-routing.module.ts b/src/app/plan-management/plan-management-routing.module.ts index 4a3d6d8..46fda67 100644 --- a/src/app/plan-management/plan-management-routing.module.ts +++ b/src/app/plan-management/plan-management-routing.module.ts @@ -19,6 +19,7 @@ import { TypePlanComponent } from './type-plan/type-plan.component' import { MaintainUpComponent } from './maintain-up/maintain-up.component' import { from } from 'rxjs'; import { ReinforcePlanComponent } from './reinforce-plan/reinforce-plan.component'; +import { CreatePlanOnlineFiveComponent } from './create-plan-online-five/create-plan-online-five.component'; const routes: Routes = [ { path: 'entryPlan', component: EntryPlanComponent}, @@ -32,7 +33,8 @@ const routes: Routes = [ { path: 'MeetPlan',component:MeetPlanComponent},//应急预案 { path: 'typePlan',component:TypePlanComponent},//类型预案 { path: 'maintainup',component:MaintainUpComponent},//维护更新 - { path: 'reinforceplan',component:ReinforcePlanComponent}//增援预案 + { path: 'reinforceplan',component:ReinforcePlanComponent},//增援预案 + { path: 'createplanonlinefive',component:CreatePlanOnlineFiveComponent},//在线编制五级预案 ]; @NgModule({ diff --git a/src/app/plan-management/plan-management.module.ts b/src/app/plan-management/plan-management.module.ts index 9022c43..0609579 100644 --- a/src/app/plan-management/plan-management.module.ts +++ b/src/app/plan-management/plan-management.module.ts @@ -63,14 +63,14 @@ import { typeAuditResult } from './type-plan/type-plan.component'; import { MaintainUpComponent } from './maintain-up/maintain-up.component' import { GkPsViewer } from './pass-plan/pass-plan.component' import { GkhtmlPsViewer } from './open-plan/open-plan.component'; -import { ReinforcePlanComponent } from './reinforce-plan/reinforce-plan.component' - - +import { ReinforcePlanComponent } from './reinforce-plan/reinforce-plan.component'; +import { CreatePlanOnlineFiveComponent } from './create-plan-online-five/create-plan-online-five.component'; +import { CreatePlanOnlineThreeComponent } from './create-plan-online-three/create-plan-online-three.component' @NgModule({ declarations: [EntryPlanComponent, PassPlanComponent, OpenPlanComponent, EntryPlanLookComponent, AddPlanone, PlanType, AuditSatus, PlanLevel, DownloadFile, AuditResult, ChangeName, WebLookComponent, OnetwoEntryPlanComponent, newunitComponent, MeetPlanComponent, newunitMeet, TypePlanComponent, newunitType, PsViewer, onetwoAuditResult, meetAuditResult, - typeAuditResult, MaintainUpComponent, GkPsViewer, GkhtmlPsViewer, UnitInfo, ReinforcePlanComponent, state, ImgDetails], + typeAuditResult, MaintainUpComponent, GkPsViewer, GkhtmlPsViewer, UnitInfo, ReinforcePlanComponent, state, ImgDetails, CreatePlanOnlineFiveComponent, CreatePlanOnlineThreeComponent], imports: [ CommonModule, PlanManagementRoutingModule, diff --git a/src/app/ui/plan-template/plan-template.component.html b/src/app/ui/plan-template/plan-template.component.html index bded489..cdf9866 100644 --- a/src/app/ui/plan-template/plan-template.component.html +++ b/src/app/ui/plan-template/plan-template.component.html @@ -7,83 +7,98 @@ * @LastEditTime: 2021-06-09 16:29:26 -->
-
-
-
- 预案列表 -
-
- - 新增 -
+
+
+
+ 预案列表 +
+
+ + 新增 +
+
+
+
+
+ {{item.unitname}}
-
-
-
- {{item.unitname}} -
-
- {{item.planCategory==3?'Ⅲ级':item.planCategory==4?'Ⅳ级':'Ⅴ级'}} - 复制 - - -
-
+
+ {{item.planCategory==3?'Ⅲ级':item.planCategory==4?'Ⅳ级':'Ⅴ级'}} + 复制 + +
+
-
-
-
- {{unitName}} -
-
- - -
-
-
- - - - - -
- {{item.groupName}} -
- -
- - 编辑 +
+
+
+
+ {{unitName}} +
+
+ + +
+
+
+ + + + + +
+ {{item.groupName}} +
+ +
+ + 编辑 +
+
+ + 删除 +
+ + + + +
+ + + + +
+
+ {{element.surveyName}}
-
- - 删除 +
+ +
- - - - -
- - - - -
-
- {{element.surveyName}} -
-
- - -
-
- - - - -
- +
+ + + + + + + + + + + + + + +
名称类型操作
{{attinf.propertyName}} + {{attinf.propertyType==0?'单行文本':attinf.propertyType==1?'多行文本':'数值'}} 删除
+
+ +
+ + + + +
+
+ {{attinf.name}} +
+
+ + +
+
+ + +
@@ -122,119 +180,101 @@ - - - - + + + +
名称操作
{{attinf.propertyName}}{{attinf.propertyType==0?'单行文本':attinf.propertyType==1?'多行文本':'数值'}} 删除
+ {{facilityItems.name}} + 文本类型 + + 删除
-
- -
- - - - -
-
- {{attinf.name}} -
-
- - -
-
- - -
- - - - - - - - - - - - - -
名称类型操作
{{facilityItems.name}}文本类型 删除
-
- - -
- -
-
-
-
- -
-
- - - - -
-
-
-
-
- - -
-
-
-
- - - -
- -
-
-
-
- -
-
- - - - - -
- - - -
-
-
- - -
-
-
- -
- -
-
-
-
- - -
+ + +
+ +
+
+
+
+ +
+
+ + + + +
+
+
+
+
+ +
- - - -
+
+ + + +
+ +
+
+
+
+ +
+
+ + + + + +
+ + + +
+
+
+ + +
+
+
+ +
+ +
+
+
+
+
+ + +
+
+
+
+ + +
-
+
+
\ No newline at end of file diff --git a/src/app/ui/plan-template/plan-template.component.scss b/src/app/ui/plan-template/plan-template.component.scss index 3f3de2f..765abe4 100644 --- a/src/app/ui/plan-template/plan-template.component.scss +++ b/src/app/ui/plan-template/plan-template.component.scss @@ -6,89 +6,98 @@ * @LastEditors: sueRimn * @LastEditTime: 2021-06-08 15:03:02 */ -.box{ - height: 97%; +.box { + height: 100%; width: 100%; padding: 10px; - background-color: #F7F8FA; + box-sizing: border-box; + background-color: #f7f8fa; display: flex; - .boxleft{ + .boxleft { width: 20%; height: 100%; - background-color: #FFFFFF; + background-color: #ffffff; display: flex; flex-direction: column; - .lefthead{ + .lefthead { height: 50px; width: 100%; display: flex; justify-content: space-between; - border-bottom: 1px solid #F7F8FA; - span{ + border-bottom: 1px solid #f7f8fa; + span { font-size: 16px; } - .leftheadone{ + .leftheadone { width: 60%; height: 100%; - span{ + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + span { margin: 10px 10px; height: 50px; line-height: 50px; } } - .leftheadtwo{ + .leftheadtwo { width: 30%; height: 100%; cursor: pointer; - img{ + overflow-x: auto; + img { position: relative; top: 2px; } - span{ + span { margin-left: 2px; //margin: 10px 10px; height: 50px; line-height: 50px; - color: #2196F3; + color: #2196f3; } } } - .leftbox{ + .leftbox { height: 100%; width: 100%; display: flex; flex-direction: column; - .selectedTr{ - background-color: #E1F1FF; - span{ - color: #2196F3; + .selectedTr { + background-color: #e1f1ff; + span { + color: #2196f3; } } - .leftbody{ + .leftbody { width: 100%; height: 40px; display: flex; justify-content: space-between; cursor: pointer; - .bodyname{ + .bodyname { height: 40px; width: 60%; - span{ + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + span { font-size: 16px; height: 40px; line-height: 40px; margin-left: 10px; } } - .bodycz{ + .bodycz { height: 40px; width: 40%; - img{ + overflow-y: auto; + img { margin-left: 10px; cursor: pointer; } - span{ - color: #B2BEC7; + span { + color: #b2bec7; font-size: 16px; height: 40px; line-height: 40px; @@ -98,91 +107,92 @@ } } } - .boxright{ + .boxright { margin-left: 10px; height: 100%; - width: 78%; - background-color: #FFFFFF; + width: 80%; + background-color: #ffffff; display: flex; flex-direction: column; - .righthead{ + .righthead { height: 50px; width: 100%; display: flex; justify-content: space-between; - border-bottom: 1px solid #F7F8FA; - span{ + border-bottom: 1px solid #f7f8fa; + span { font-size: 16px; } - .rightheadone{ + .rightheadone { width: 50%; height: 100%; - span{ + span { margin: 10px 10px; height: 50px; line-height: 50px; } } - .rightheadtwo{ + .rightheadtwo { width: 50%; height: 100%; - button{ - //margin-left: 70%; + button { + float: right; margin-top: 5px; + margin-right: 15px; } } } - .rightbody{ + .rightbody { width: 100%; overflow: auto; - .panelhead{ - background-color: #E1F1FF; + .panelhead { + background-color: #e1f1ff; height: 50px; - .paneltitle{ + .paneltitle { width: 100%; font-size: 16px; - color: #2196F3; + color: #2196f3; display: flex; //justify-content: space-around; - .groupName{ + .groupName { width: 100px; } - .addinfo{ + .addinfo { cursor: pointer; height: 100%; width: 75px; margin-left: 75%; - span{ + span { position: relative; bottom: 2px; } } - .delinfo{ + .delinfo { cursor: pointer; height: 100%; width: 75px; - span{ + span { position: relative; bottom: 2px; } } - .dwgk{ + .dwgk { height: 100%; width: 100%; display: flex; - .attname{ + .attname { height: 100%; width: 40%; - span{ + span { font-size: 16px; line-height: 50px; height: 50px; } } - .caozuo{ + .caozuo { height: 100%; width: 60%; - button{ + button { font-size: 16px; width: 80px; height: 34px; @@ -190,48 +200,47 @@ float: right; margin-top: 8px; } - img{ + img { position: relative; bottom: 2px; } } } - } } - .table{ + .table { width: 100%; - table{ + table { width: 100%; font-size: 16px; - th{ + th { height: 40px; font-size: 16px; text-align: center; - background-color: #F7F8FA; + background-color: #f7f8fa; } - td{ + td { height: 40px; text-align: center; font-size: 16px; } } } - .attack{ + .attack { width: 100%; display: flex; flex-direction: row; - .attackLeft{ + .attackLeft { width: 70%; display: flex; flex-direction: column; - .attackleftHead{ + .attackleftHead { width: 100%; height: 40px; - background-color: #FFD91D; - input{ - background-color: #FFD91D; - color: #B99A00; + background-color: #ffd91d; + input { + background-color: #ffd91d; + color: #b99a00; text-align: center; height: 100%; width: 100%; @@ -240,18 +249,18 @@ outline: none; } } - .attackleftTable{ + .attackleftTable { width: 100%; - thead,table{ + thead, + table { width: 100%; - } - th{ - background-color: #E8E9E9; + th { + background-color: #e8e9e9; height: 40px; font-size: 16px; text-align: center; - input{ + input { //background-color: #FFFFFF; text-align: center; height: 100%; @@ -261,22 +270,22 @@ outline: none; } } - textarea{ + textarea { width: 100%; } - .inputtext{ + .inputtext { width: 100%; height: 100%; display: flex; flex-direction: column; - input{ + input { //width: 100%; height: 40px; font-size: 16px; border: none; outline: none; } - .inputj{ + .inputj { width: 100%; height: 100%; display: flex; @@ -284,9 +293,9 @@ } } } - .attackRight{ + .attackRight { width: 30%; - .rightButton{ + .rightButton { margin-top: 20px; margin-left: 40%; } @@ -306,24 +315,24 @@ .example-tree-invisible { display: none; - } - .example-tree ul, - .example-tree li { +} +.example-tree ul, +.example-tree li { margin-top: 0; margin-bottom: 0; list-style-type: none; - } - /* +} +/* * This padding sets alignment of the nested nodes. */ - .example-tree .mat-nested-tree-node div[role=group] { +.example-tree .mat-nested-tree-node div[role="group"] { padding-left: 40px; - } - /* +} +/* * Padding for leaf nodes. * Leaf nodes need to have padding so as to align with other non-leaf nodes * under the same parent. */ - .example-tree div[role=group] > .mat-tree-node { +.example-tree div[role="group"] > .mat-tree-node { padding-left: 40px; - } \ No newline at end of file +} diff --git a/src/styles.scss b/src/styles.scss index c7e8d36..9952dc1 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1,7 +1,7 @@ @import './app/theme.scss'; @import "./app/ngZorroTree.css"; /* 引入组件样式 */ - +// @import "~ng-zorro-antd/select/style/index.min.css"; /* 引入组件样式 */ @font-face { font-family: Regular;