|
|||
基本信息
导航
全景漫游
三维场景
查看预案
分享基本信息导航全景漫游三维场景查看预案分享分享
' +
- '' +
+ 'pages works!
+ diff --git a/src/app/plan-audit/fireforce-audit/fireforce-audit.component.ts b/src/app/plan-audit/fireforce-audit/fireforce-audit.component.ts index d75ec80..e7b08f5 100644 --- a/src/app/plan-audit/fireforce-audit/fireforce-audit.component.ts +++ b/src/app/plan-audit/fireforce-audit/fireforce-audit.component.ts @@ -2,10 +2,12 @@ import { HttpClient } from '@angular/common/http'; import { Component, Input, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { MapFactory } from '@src/modules/map/declare/factory'; +import { IMap, IMarker } from '@src/modules/map/declare/map'; import Viewer from 'viewerjs' import { ViewDetailsComponent } from '../view-details/view-details.component'; declare var CryptoJS -declare var AMap: any; + @Component({ selector: 'app-fireforce-audit', templateUrl: './fireforce-audit.component.html', @@ -37,16 +39,16 @@ export class FireforceAuditComponent implements OnInit { this.FireForceDetailInfo.RelevantInfomationData ? this.AttachmentArr = JSON.parse(this.FireForceDetailInfo.RelevantInfomationData) : null console.log(789,this.ZongcontactData) setTimeout(() => { - this.map = new AMap.Map('container', { + this.map = MapFactory.MapInstance('container', { zoom:18 }) if(this.FireForceDetailInfo.location && this.FireForceDetailInfo.location.x){ this.map.setCenter([this.FireForceDetailInfo.location.x,this.FireForceDetailInfo.location.y]); - this.newPositionMarker = new AMap.Marker({ + this.newPositionMarker = MapFactory.MarkerInstance({ position: [this.FireForceDetailInfo.location.x,this.FireForceDetailInfo.location.y], content: this.newPositionMarkerContent, - offset: new AMap.Pixel(-10, -12) + offset: MapFactory.PixelInstance(-10, -12) }) // 将 markers 添加到地图 this.map.add(this.newPositionMarker); @@ -56,8 +58,8 @@ export class FireforceAuditComponent implements OnInit { }, 0); } - map:any - newPositionMarker:any + map:IMap + newPositionMarker:IMarker newPositionMarkerContent:any = '' +
@@ -161,32 +163,13 @@ export class FireforceAuditComponent implements OnInit {
}
if(suffix == 'docx' || suffix == 'doc' || suffix == 'pdf'){
let fetchUrl = item.objectName
- 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)
- let json={
- doc: {
- docId: docId,
- title: item.fileName,
- fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/`+fetchUrl
- },
- user: {
- uid: identityJsonparse.sub,
- nickName: identityJsonparse.name,
- avatar: "",
- privilege: [
- 'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT'
- ],
- },
+ if (suffix == 'docx' || suffix == 'doc') {
+ let arr = fetchUrl.split('.')
+ arr[arr.length - 1] = 'pdf'
+ window.open(`/api/Objects/PlanPlatform/` + arr.join('.'))
+ }else if (suffix == 'pdf') {
+ window.open(`/api/Objects/PlanPlatform/` + fetchUrl)
}
- var stringjson=JSON.stringify(json)
- var wordArray = CryptoJS.enc.Utf8.parse(stringjson);
- var base64 = CryptoJS.enc.Base64.stringify(wordArray);
- window.open(`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`)
}
if(suffix == 'mp4'){
const dialogRef = this.dialog.open(ViewDetailsComponent, {//调用open方法打开对话框并且携带参数过去
diff --git a/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.ts b/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.ts
index ff71078..3ddc08d 100644
--- a/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.ts
+++ b/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.ts
@@ -4,8 +4,10 @@ import { ViewDetailsComponent } from '../view-details/view-details.component';
import Viewer from 'viewerjs'
import { MatSnackBar } from '@angular/material/snack-bar';
import { MatDialog } from '@angular/material/dialog';
+import { MapFactory } from '@src/modules/map/declare/factory';
+import { IMap, IMarker } from '@src/modules/map/declare/map';
declare var CryptoJS
-declare var AMap: any;
+
@Component({
selector: 'app-linkageforces-audit',
templateUrl: './linkageforces-audit.component.html',
@@ -33,8 +35,8 @@ export class LinkageforcesAuditComponent implements OnInit {
{id:14,name:'住建',imgUrl:'/assets/linkageForces/zhujian.png',isChecked:false}
]
AttachmentArr:any//附件
- map:any
- newPositionMarker:any
+ map:IMap
+ newPositionMarker:IMarker
newPositionMarkerContent:any =
'' +
@@ -43,16 +45,16 @@ export class LinkageforcesAuditComponent implements OnInit {
this.AttachmentArr = JSON.parse(this.LinkageForceDetailInfo.relevantInfomationData)
this.LinkageForceDetailInfo.location ? null : this.LinkageForceDetailInfo.location={x:null,y:null}
setTimeout(() => {
- this.map = new AMap.Map('container', {
+ this.map = MapFactory.MapInstance('container', {
zoom:18
})
if(this.LinkageForceDetailInfo.location && this.LinkageForceDetailInfo.location.x){
this.map.setCenter([this.LinkageForceDetailInfo.location.x,this.LinkageForceDetailInfo.location.y]);
- this.newPositionMarker = new AMap.Marker({
+ this.newPositionMarker = MapFactory.MarkerInstance({
position: [this.LinkageForceDetailInfo.location.x,this.LinkageForceDetailInfo.location.y],
content: this.newPositionMarkerContent,
- offset: new AMap.Pixel(-10, -12)
+ offset: MapFactory.PixelInstance(-10, -12)
})
// 将 markers 添加到地图
this.map.add(this.newPositionMarker);
@@ -171,32 +173,13 @@ export class LinkageforcesAuditComponent implements OnInit {
}
if(suffix == 'docx' || suffix == 'doc' || suffix == 'pdf'){
let fetchUrl = item.objectName
- 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)
- let json={
- doc: {
- docId: docId,
- title: item.fileName,
- fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/`+fetchUrl
- },
- user: {
- uid: identityJsonparse.sub,
- nickName: identityJsonparse.name,
- avatar: "",
- privilege: [
- 'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT'
- ],
- },
+ if (suffix == 'docx' || suffix == 'doc') {
+ let arr = fetchUrl.split('.')
+ arr[arr.length - 1] = 'pdf'
+ window.open(`/api/Objects/PlanPlatform/` + arr.join('.'))
+ }else if (suffix == 'pdf') {
+ window.open(`/api/Objects/PlanPlatform/` + fetchUrl)
}
- var stringjson=JSON.stringify(json)
- var wordArray = CryptoJS.enc.Utf8.parse(stringjson);
- var base64 = CryptoJS.enc.Base64.stringify(wordArray);
- window.open(`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`)
}
if(suffix == 'mp4'){
const dialogRef = this.dialog.open(ViewDetailsComponent, {//调用open方法打开对话框并且携带参数过去
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 3aa2230..2b0e425 100644
--- a/src/app/plan-audit/plan-record/plan-record.component.ts
+++ b/src/app/plan-audit/plan-record/plan-record.component.ts
@@ -6,10 +6,10 @@
* @LastEditors: sueRimn
* @LastEditTime: 2021-07-08 09:35:53
*/
-import { Component, OnInit,Inject } from '@angular/core';
+import { Component, OnInit, Inject } from '@angular/core';
import { FormControl } from '@angular/forms';
import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
-import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog';
+import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { HttpClient } from '@angular/common/http'
import { DomSanitizer } from '@angular/platform-browser';
import { Viewer } from 'photo-sphere-viewer';
@@ -22,69 +22,69 @@ declare var CryptoJS
})
export class PlanRecordComponent implements OnInit {
- constructor(private http:HttpClient,public snackBar: MatSnackBar,private sanitizer: DomSanitizer,public dialog: MatDialog) { }
+ constructor(private http: HttpClient, public snackBar: MatSnackBar, private sanitizer: DomSanitizer, public dialog: MatDialog) { }
pcshow
ngOnInit(): void {
- if(window.matchMedia("(max-width: 1300px)").matches){
- this.pcshow=false
- }else{
- this.pcshow=true
+ if (window.matchMedia("(max-width: 1300px)").matches) {
+ this.pcshow = false
+ } else {
+ this.pcshow = true
}
let level = sessionStorage.getItem("level");
- if(level == "0"){//如果是总队
+ if (level == "0") {//如果是总队
this.preparelevels = [
- {name:"总队",value:"0"},
- {name:"支队",value:"1"},
- {name:"大队",value:"2"},
- {name:"中队",value:"3"}
+ { name: "总队", value: "0" },
+ { name: "支队", value: "1" },
+ { name: "大队", value: "2" },
+ { name: "中队", value: "3" }
]
-
+
}
- if(level == "1"){//如果是支队
+ if (level == "1") {//如果是支队
this.preparelevels = [
- {name:"支队",value:"1"},
- {name:"大队",value:"2"},
- {name:"中队",value:"3"}
+ { name: "支队", value: "1" },
+ { name: "大队", value: "2" },
+ { name: "中队", value: "3" }
]
-
+
}
- if(level == "2"){//如果是大队
+ if (level == "2") {//如果是大队
this.preparelevels = [
- {name:"大队",value:"2"},
- {name:"中队",value:"3"}
+ { name: "大队", value: "2" },
+ { name: "中队", value: "3" }
]
-
+
}
- if(level == "3"){//如果是中队
+ if (level == "3") {//如果是中队
this.preparelevels = [
- {name:"中队",value:"3"}
+ { name: "中队", value: "3" }
]
-
+
}
- this.iframeSrc=this.sanitizer.bypassSecurityTrustResourceUrl(this.src);
+ this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(this.src);
this.getAlltabledate()
}
- wordShow=true
+ wordShow = true
iframeSrc
- src=''
+ src = ''
selected = new FormControl(0); //选项卡 实例
- preparelevels:any
- level=''//类型
- verifyState=''//审核状态
+ preparelevels: any
+ level = ''//类型
+ verifyState = ''//审核状态
projectlevel//组织机构
PlanLevel//编制级别
addtime//时间
endtime//结束时间
count//一共多少条
tableDate
- showPvt=false//全景图是否显示
- shenheTable=[]//选中要审核的对象
+ showPvt = false//全景图是否显示
+ shenheTable = []//选中要审核的对象
chuorzhong//判断初审还是终审
radioid//选中的id
- showtype=-1//0:word,1:全景图，2:二维三维，3:重点单位
- compantData={name:'',buildingTypes:[],address:''}
+ showtype = -1//0:word,1:全景图，2:二维三维，3:重点单位
+ compantData = { name: '', buildingTypes: [], address: '' }
organizationName
planData
id
@@ -94,192 +94,170 @@ export class PlanRecordComponent implements OnInit {
companyName
//获取表格数据
- getAlltabledate(){
-
- let paramsdata:any = {
- Operation:this.level||[],
- ContentType:Number(this.projectlevel)||[],
- Level:this.PlanLevel||[],
- verifyState:this.verifyState||[1,2,4,5],
- QueryStartTime:this.addtime||'',
- QueryEndTime:this.endtime||''
+ getAlltabledate() {
+
+ let paramsdata: any = {
+ Operation: this.level || [],
+ ContentType: Number(this.projectlevel) || [],
+ Level: this.PlanLevel || [],
+ verifyState: this.verifyState || [1, 2, 4, 5],
+ QueryStartTime: this.addtime || '',
+ QueryEndTime: this.endtime || ''
}
- this.http.get("/api/ContentVerifies",{params:paramsdata}).subscribe((data:any)=>{
+ this.http.get("/api/ContentVerifies", { params: paramsdata }).subscribe((data: any) => {
//console.log(data)
- this.tableDate=data.items
- this.count=data.totalCount
+ this.tableDate = data.items
+ this.count = data.totalCount
})
}
//提交查询
- onSubmit(value){
+ onSubmit(value) {
//console.log(value)
this.getAlltabledate()
}
//刷新
- record(){
- this.verifyState=''
- this.level=''
- this.projectlevel=''
- this.addtime=''
- this.endtime=''
+ record() {
+ this.verifyState = ''
+ this.level = ''
+ this.projectlevel = ''
+ this.addtime = ''
+ this.endtime = ''
let level = sessionStorage.getItem("level");
- this.PlanLevel=''
+ this.PlanLevel = ''
this.getAlltabledate()
}
//表格点击事件
viewer//全景图对象
- waterData:any//需要传递给子组件的水源信息
- LinkageForceDetailInfo:any//需要传递给子组件的联动力量信息
- fireForceDetailInfo:any//需要传递给子组件的消防力量信息
- postlevel:any
- bianzhi=false
- tableClick(e,item){
+ waterData: any//需要传递给子组件的水源信息
+ LinkageForceDetailInfo: any//需要传递给子组件的联动力量信息
+ fireForceDetailInfo: any//需要传递给子组件的消防力量信息
+ postlevel: any
+ bianzhi = false
+ tableClick(e, item) {
this.showtype = -1
//e.target.parentElement.bgColor='#2196F3'
// console.log(item)
- this.organizationName=''
- this.itemid=item.itemId
- this.id=item.id
- this.fetchUrl=''
- this.viewer={}
- if(item.contentType == 11){
- this.bianzhi=false
- window.setTimeout(()=>{
+ this.organizationName = ''
+ this.itemid = item.itemId
+ this.id = item.id
+ this.fetchUrl = ''
+ this.viewer = {}
+ if (item.contentType == 11) {
+ this.bianzhi = false
+ window.setTimeout(() => {
this.showtype = 3
- sessionStorage.setItem('companyId',item.itemId)
- },0)
- }else if(item.contentType == 12){
- this.bianzhi=false
+ sessionStorage.setItem('companyId', item.itemId)
+ }, 0)
+ } else if (item.contentType == 12) {
+ this.bianzhi = false
//水源
- this.http.get(`/api/WaterSources/${item.itemId}`).subscribe((data)=>{
+ this.http.get(`/api/WaterSources/${item.itemId}`).subscribe((data) => {
this.waterData = data
this.showtype = 12
})
- }else if(item.contentType == 13){
- this.bianzhi=false
+ } else if (item.contentType == 13) {
+ this.bianzhi = false
//消防力量
- this.http.get(`/api/CustomFireForce/${item.itemId}`).subscribe((data:any)=>{
- if(data.forceType != 0){//如果是其他消防力量
+ this.http.get(`/api/CustomFireForce/${item.itemId}`).subscribe((data: any) => {
+ if (data.forceType != 0) {//如果是其他消防力量
this.postlevel = 4
- }else{
+ } else {
this.postlevel = data.level
}
// console.log('xxx',data)
- data.fireForceDetailInfo.location ? null : data.fireForceDetailInfo.location={x:null,y:null}
+ data.fireForceDetailInfo.location ? null : data.fireForceDetailInfo.location = { x: null, y: null }
this.fireForceDetailInfo = data.fireForceDetailInfo
this.showtype = 13
})
- }else if(item.contentType == 14){
- this.bianzhi=false
+ } else if (item.contentType == 14) {
+ this.bianzhi = false
//联动力量
- this.http.get(`/api/LinkageForces/${item.itemId}`).subscribe((data:any)=>{
+ this.http.get(`/api/LinkageForces/${item.itemId}`).subscribe((data: any) => {
- data.location ? null : data.location={x:null,y:null}
+ data.location ? null : data.location = { x: null, y: null }
this.LinkageForceDetailInfo = data
this.showtype = 14
})
- }else{
- this.http.get(`/api/PlanComponents/${item.itemId}`).subscribe((data:any)=>{
- this.companyId=data.companyId
- this.companyName=data.companyName
- if(data.planMode==2){
- 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`
+ } else {
+ this.http.get(`/api/PlanComponents/${item.itemId}`).subscribe((data: any) => {
+ this.companyId = data.companyId
+ this.companyName = data.companyName
+ if (data.planMode == 2) {
+ 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=`/keyUnit/viewunitinfoplan?id=${data.companyId}&orName=${data.company.organizationId}&orId=${data.company.organizationName}`
- }else{
- this.bianzhi=false
- if(data.planType!=2&&data.planType!=1){
- this.fetchUrl=data.attachmentUrls[0]
- var index=this.fetchUrl.indexOf("\/")
- if(this.fetchUrl.substr(0,index)=='psw'){
- this.showtype=1
- var obj=document.getElementById('viewer')
- if(obj!=null){
- obj.innerHTML=''
+ } else {
+ this.bianzhi = false
+ if (data.planType != 2 && data.planType != 1) {
+ this.fetchUrl = data.attachmentUrls[0]
+ var index = this.fetchUrl.indexOf("\/")
+ if (this.fetchUrl.substr(0, index) == 'psw') {
+ this.showtype = 1
+ var obj = document.getElementById('viewer')
+ if (obj != null) {
+ obj.innerHTML = ''
}
- window.setTimeout(()=>{
+ window.setTimeout(() => {
this.viewer = new Viewer({
container: document.querySelector('#viewer'),
- panorama:'/api/Objects/PlanPlatform/'+ this.fetchUrl,
-
+ panorama: '/api/Objects/PlanPlatform/' + this.fetchUrl,
+
});
})
-
- }else{
+
+ } else {
this.lookWord()
}
- }else{
- this.organizationName=item.organizationName
+ } else {
+ this.organizationName = item.organizationName
this.planData = data
this.handleData()
return
-
+
//this.src=`/planAudit/planpass?id=${data.companyId}&companyName=${data.companyName}&auditPlanId=${data.id}&auditStatus=${data.auditStatus}&planType=1`
//this.iframeSrc=this.sanitizer.bypassSecurityTrustResourceUrl(this.src);
//window.open(`/planAudit/planpass?id=${data.companyId}&companyName=${data.companyName}&auditPlanId=${data.id}&auditStatus=${data.auditStatus}&planType=1`)
}
}
-
-
-
- })
+
+
+
+ })
}
-
-
-
- if(e.checked){
+
+
+
+ if (e.checked) {
this.shenheTable.push(item)
}
- else{
- for(var i=0;i' +
@@ -22,16 +24,16 @@ export class WaterAuditComponent implements OnInit {
this.poolData = this.waterData.detailData
this.naturalWaterData = this.waterData.detailData
setTimeout(() => {
- this.map = new AMap.Map('container', {
+ this.map = MapFactory.MapInstance('container', {
zoom:18
})
if(this.waterData.location && this.waterData.location.x){
this.map.setCenter([this.waterData.location.x,this.waterData.location.y]);
- this.newPositionMarker = new AMap.Marker({
+ this.newPositionMarker = MapFactory.MarkerInstance({
position: [this.waterData.location.x,this.waterData.location.y],
content: this.newPositionMarkerContent,
- offset: new AMap.Pixel(-10, -12)
+ offset: MapFactory.PixelInstance(-10, -12)
})
// 将 markers 添加到地图
this.map.add(this.newPositionMarker);
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 5fbbb6b..b46cfdd 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
@@ -80,7 +80,7 @@
改名
编辑
- 查看
+ 查看
下载
删除
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 ef49dae..6caf765 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
@@ -106,8 +106,8 @@ export class EntryPlanLookComponent implements OnInit {
}
//查看预案
lookPlan(e) {
+ console.log(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') {
const dialogRef = this.dialog.open(PsViewer, {
@@ -121,54 +121,27 @@ export class EntryPlanLookComponent implements OnInit {
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
+ } else {
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://172.18.0.1: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'
- ],
- },
+ if (fetchUrl) {
+ let suffix = fetchUrl.split('.')[fetchUrl.split('.').length - 1].toLowerCase()
+ if (suffix == 'docx' || suffix == 'doc') {
+ let arr = fetchUrl.split('.')
+ arr[arr.length - 1] = 'pdf'
+ window.open(`/api/Objects/PlanPlatform/` + arr.join('.'))
+ } else if (suffix == 'pdf') {
+ window.open(`/api/Objects/PlanPlatform/` + fetchUrl)
+ } else {
+ let config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('该文件类型暂不支持在线查看', '确定', config);
}
- var stringjson = JSON.stringify(json)
- var wordArray = CryptoJS.enc.Utf8.parse(stringjson);
- var base64 = CryptoJS.enc.Base64.stringify(wordArray);
- window.open(`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`)
- })
+ } 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 == 4){
- var index=e.attachmentUrls[0].indexOf("\/")
- if(e.attachmentUrls[0].substr(0,index)=='psw'){
- const dialogRef = this.dialog.open(PsViewer, {
- width: '1500px',
- height:'800px',
- data: e.attachmentUrls[0]
- });
- }
- } */
if (e.planType == 1) { //如果是在线编辑
let id = e.id
sessionStorage.setItem("planId", id)
@@ -193,7 +166,7 @@ export class EntryPlanLookComponent implements OnInit {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
- if(e.auditStatus==8){
+ if (e.auditStatus == 8) {
if (e.planType == 1) { //如果是在线编辑
let id = e.id
sessionStorage.setItem("planId", id)
@@ -206,7 +179,6 @@ export class EntryPlanLookComponent implements OnInit {
}
else if (e.planType == 16) {
if (e.attachmentUrls == null) {
- console.log(this.compantData)
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}`)
}
else {
@@ -231,49 +203,49 @@ export class EntryPlanLookComponent implements OnInit {
this.snackBar.open('只有二维预案和文本预案可以编辑!', '确定', config);
}
- }else{
+ } else {
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)
- 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) {
- if (e.attachmentUrls == null) {
- console.log(this.compantData)
- 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 (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 {
- let body = {};
- 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.getAllPlanComponents()
- this.lookPlan(e)
- }/* ,err => {
+ else if (e.planType == 16) {
+ if (e.attachmentUrls == null) {
+ console.log(this.compantData)
+ 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}`)
+ }
+ else {
+ let body = {};
+ 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.getAllPlanComponents()
+ this.lookPlan(e)
+ }/* ,err => {
this.snackBar.open(err,'确定',config);
} */)
- }
+ }
- }
- else {
+ }
+ else {
- this.snackBar.open('只有二维预案和文本预案可以编辑!', '确定', config);
+ this.snackBar.open('只有二维预案和文本预案可以编辑!', '确定', config);
+ }
}
}
- }
-
+
}
allPlanComponents: any //所有预案组件
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 27d97c6..d3c689c 100644
--- a/src/app/plan-management/meet-plan/meet-plan.component.ts
+++ b/src/app/plan-management/meet-plan/meet-plan.component.ts
@@ -4,7 +4,7 @@ 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';
@@ -17,56 +17,56 @@ declare var CryptoJS
})
export class MeetPlanComponent 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) { }
ngOnInit(): void {
//console.log(window.matchMedia("(max-width: 1300px)").matches&&window.matchMedia("(max-height: 700px)").matches)
- if(window.matchMedia("(max-width: 1400px)").matches){
- this.pcMore=false
- this.padMore=true
- this.pcfind=false
- this.padjt=true
- }else{
- this.pcfind=true
- this.pcMore=true
- this.padMore=false
- this.padjt=false
+ if (window.matchMedia("(max-width: 1400px)").matches) {
+ this.pcMore = false
+ this.padMore = true
+ this.pcfind = false
+ this.padjt = true
+ } else {
+ this.pcfind = true
+ this.pcMore = true
+ this.padMore = false
+ this.padjt = false
}
this.levels = sessionStorage.getItem("level");
- if(this.levels == "0"){//如果是总队
+ if (this.levels == "0") {//如果是总队
this.preparelevels = [
- {name:"总队",value:"1"},
- {name:"支队",value:"2"},
- {name:"大队",value:"4"},
- {name:"中队",value:"8"}
+ { name: "总队", value: "1" },
+ { name: "支队", value: "2" },
+ { name: "大队", value: "4" },
+ { name: "中队", value: "8" }
]
}
- if(this.levels == "1"){//如果是支队
+ if (this.levels == "1") {//如果是支队
this.preparelevels = [
- {name:"支队",value:"2"},
- {name:"大队",value:"4"},
- {name:"中队",value:"8"}
+ { name: "支队", value: "2" },
+ { name: "大队", value: "4" },
+ { name: "中队", value: "8" }
]
}
- if(this.levels == "2"){//如果是大队
+ if (this.levels == "2") {//如果是大队
this.preparelevels = [
- {name:"大队",value:"4"},
- {name:"中队",value:"8"}
+ { name: "大队", value: "4" },
+ { name: "中队", value: "8" }
]
}
- if(this.levels == "3"){//如果是中队
+ if (this.levels == "3") {//如果是中队
this.preparelevels = [
- {name:"中队",value:"8"}
+ { name: "中队", value: "8" }
]
}
this.getAlltabledate()
}
//生成word
- word(id,fileName){
+ word(id, fileName) {
/* id ：文档dom节点 fileName：文件名称(.doc) */
var header = "" +
- "欢迎您, {{realName}}
-