shaojiahao
/
ShangHaiYuan-AnXin
2
0
Fork 0
Code Issues 11 Pull Requests Projects Releases Wiki Activity
Browse Source

[完善]修改bug

guangxi
邵佳豪 2 years ago
parent
8c9a026fb4
commit
ff10a9cce6
3 changed files with 117 additions and 97 deletions
Unified View
  1. 12
      proxy.config.json
  2. 192
      src/app/external-links-plan/external-links-plan.component.ts
  3. 10
      src/index.html

12
proxy.config.json
Unescape View File

@ -1,7 +1,7 @@
{ {
"/api": { "/api": {
"target": "http://121.36.37.70:8201/", "target": "http://10.81.73.39:8000/",
"secure": false, "secure": false,
"changeOrigin": true "changeOrigin": true
} }
} }

192
src/app/external-links-plan/external-links-plan.component.ts
Unescape View File

@ -1,120 +1,138 @@
import { HttpClient } from '@angular/common/http'; import { HttpClient } from "@angular/common/http";
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from "@angular/core";
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute } from "@angular/router";
import { CacheTokenService } from '../http-interceptors/cache-token.service'; import { CacheTokenService } from "../http-interceptors/cache-token.service";
import { Viewer } from 'photo-sphere-viewer'; import { Viewer } from "photo-sphere-viewer";
import { DomSanitizer } from '@angular/platform-browser'; import { DomSanitizer } from "@angular/platform-browser";
declare var CryptoJS declare var CryptoJS;
@Component({ @Component({
selector: 'app-external-links-plan', selector: "app-external-links-plan",
templateUrl: './external-links-plan.component.html', templateUrl: "./external-links-plan.component.html",
styleUrls: ['./external-links-plan.component.scss'] styleUrls: ["./external-links-plan.component.scss"],
}) })
export class ExternalLinksPlanComponent implements OnInit { export class ExternalLinksPlanComponent implements OnInit {
constructor(
constructor(private http: HttpClient, private token: CacheTokenService, public route: ActivatedRoute, private sanitizer: DomSanitizer) { } private http: HttpClient,
planId: any//预案id private token: CacheTokenService,
viewer//全景图对象 public route: ActivatedRoute,
fetchUrl//预案文件地址 private sanitizer: DomSanitizer
showType//预案类型 1：全景图 ) {}
planData//预案信息 planId: any; //预案id
viewer; //全景图对象
fetchUrl; //预案文件地址
showType; //预案类型 1：全景图
planData; //预案信息
async ngOnInit(): Promise<void> { async ngOnInit(): Promise<void> {
await this.login()//登录存储token await this.login(); //登录存储token
this.route.queryParams.subscribe(paramsData => { this.route.queryParams.subscribe((paramsData) => {
this.planId = paramsData.planId this.planId = paramsData.planId;
let planId = paramsData.planId this.http
this.http.get(`/api/PlanComponents/${planId}`).subscribe((data: any) => { .get(`/api/PlanComponents/${this.planId}`)
console.log('单个预案详细信息', data) .subscribe((data: any) => {
this.planData = data console.log("单个预案详细信息", data);
if (data.planType != 1 && data.planType != 2) { this.planData = data;
this.fetchUrl = data.attachmentUrls[0] if (data.planType != 1 && data.planType != 2) {
var index = this.fetchUrl.indexOf("\/") this.fetchUrl = data.attachmentUrls[0];
if (this.fetchUrl.substr(0, index) == 'psw') { var index = this.fetchUrl.indexOf("/");
this.showType = 1 if (this.fetchUrl.substr(0, index) == "psw") {
var obj = document.getElementById('viewer') this.showType = 1;
if (obj != null) { var obj = document.getElementById("viewer");
obj.innerHTML = '' if (obj != null) {
} obj.innerHTML = "";
window.setTimeout(() => { }
this.viewer = new Viewer({ window.setTimeout(() => {
container: document.querySelector('#viewer'), this.viewer = new Viewer({
panorama: '/api/Objects/PlanPlatform/' + this.fetchUrl, container: document.querySelector("#viewer"),
panorama: "/api/Objects/PlanPlatform/" + this.fetchUrl,
});
}); });
}) } else {
//毕生
this.lookWord();
}
} else { } else {
//毕生 // 二维三维预案
this.lookWord() this.handleData();
} }
} else { });
// 二维三维预案 });
this.handleData()
}
})
})
} }
async login() { async login() {
await new Promise((resolve, reject) => { await new Promise((resolve, reject) => {
this.http.post('/api/Account/SignIn', { this.http
name: 'zhuzhouyuanchakan', .post("/api/Account/SignIn", {
password: '12345678' name: "zhuzhouyuanchakan",
}).subscribe((data: any) => { password: "12345678",
sessionStorage.setItem("level", data.level); })
sessionStorage.setItem("token", data.token); .subscribe((data: any) => {
sessionStorage.setItem("refreshToken", data.refreshToken); sessionStorage.setItem("level", data.level);
console.log('登录成功', data) sessionStorage.setItem("token", data.token);
resolve(data) sessionStorage.setItem("refreshToken", data.refreshToken);
this.token.startUp() console.log("登录成功", data);
}) resolve(data);
}) this.token.startUp();
});
});
} }
iframeSrc//毕生服务器链接 iframeSrc; //毕生服务器链接
src//文件存储地址 src; //文件存储地址
lookWord() { lookWord() {
this.showType = 0 this.showType = 0;
let src let src;
let suffix = this.fetchUrl.split('.')[this.fetchUrl.split('.').length - 1].toLowerCase() let suffix = this.fetchUrl
if (suffix == 'docx' || suffix == 'doc') { .split(".")
let arr = this.fetchUrl.split('.') [this.fetchUrl.split(".").length - 1].toLowerCase();
arr[arr.length - 1] = 'pdf' if (suffix == "docx" || suffix == "doc") {
src = `/api/Objects/PlanPlatform/` + arr.join('.') let arr = this.fetchUrl.split(".");
} else if (suffix == 'pdf') { arr[arr.length - 1] = "pdf";
src = `/api/Objects/PlanPlatform/` + this.fetchUrl src = `/api/Objects/PlanPlatform/` + arr.join(".");
} else if (suffix == "pdf") {
src = `/api/Objects/PlanPlatform/` + this.fetchUrl;
} }
this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(src); this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(src);
} }
companyData//当前公司信息 companyData; //当前公司信息
thirdPartyURL thirdPartyURL;
threedUrl: any threedUrl: any;
handleData() { handleData() {
let data = this.planData let data = this.planData;
if (this.planData.planMode == 1 || this.planData.planMode == 2) { //预案planMode=2时, 跳查看页面组件 if (this.planData.planMode == 1 || this.planData.planMode == 2) {
//预案planMode=2时, 跳查看页面组件
this.http.get(`/api/Plans/${data.companyId}`).subscribe((data: any) => { this.http.get(`/api/Plans/${data.companyId}`).subscribe((data: any) => {
console.log(data) console.log(data);
data && data.company ? this.companyData = data.company : null data && data.company ? (this.companyData = data.company) : null;
sessionStorage.setItem("buildingTypeId", this.companyData.buildingTypes.length ? this.companyData.buildingTypes[0].id : undefined); sessionStorage.setItem(
"buildingTypeId",
this.companyData.buildingTypes.length
? this.companyData.buildingTypes[0].id
: undefined
);
sessionStorage.setItem("companyId", data.companyId); sessionStorage.setItem("companyId", data.companyId);
sessionStorage.setItem("planId", this.planId); sessionStorage.setItem("planId", this.planId);
sessionStorage.setItem("editable", '0'); sessionStorage.setItem("editable", "0");
sessionStorage.setItem("planName", this.planData.name) sessionStorage.setItem("planName", this.planData.name);
this.showType = 3 this.showType = 3;
// this.threedUrl = this.sanitizer.bypassSecurityTrustResourceUrl(`/keyUnit/viewunitinfoplans?id=${data.companyId}`) // this.threedUrl = this.sanitizer.bypassSecurityTrustResourceUrl(`/keyUnit/viewunitinfoplans?id=${data.companyId}`)
}) });
} else if (this.planData.planMode == 3) { //预案planMode=3时, 第三方网址' } else if (this.planData.planMode == 3) {
//预案planMode=3时, 第三方网址'
// this.http.get(`/api/Plans/${data.companyId}`).subscribe((data: any) => { // this.http.get(`/api/Plans/${data.companyId}`).subscribe((data: any) => {
// data && data.company ? this.companyData = data.company : null // data && data.company ? this.companyData = data.company : null
// this.threedUrl = this.sanitizer.bypassSecurityTrustResourceUrl(data.url) // this.threedUrl = this.sanitizer.bypassSecurityTrustResourceUrl(data.url)
// this.showType = 2 // this.showType = 2
// }) // })
let localhostPath = window.document.location.href.substring(0, window.document.location.href.indexOf(window.document.location.pathname)) let localhostPath = window.document.location.href.substring(
0,
window.document.location.href.indexOf(window.document.location.pathname)
);
//localhostPath : http://39.106.78.171:8000/ //localhostPath : http://39.106.78.171:8000/
let url = data.url let url = data.url;
if (url.indexOf(localhostPath) != -1) { if (url.indexOf(localhostPath) != -1) {
window.location.href = `${url}?unitId=${data.company.id}&unitName=${data.company.name}&editMode=false` window.location.href = `${url}?unitId=${data.company.id}&unitName=${data.company.name}&editMode=false`;
} else { } else {
// let substr = url.split('/').splice(3,url.split('/').length) // let substr = url.split('/').splice(3,url.split('/').length)
// let port = url.split(':')[2] // let port = url.split(':')[2]
@ -127,7 +145,7 @@ export class ExternalLinksPlanComponent implements OnInit {
// // console.log('xxx',newurl) // // console.log('xxx',newurl)
// window.location.href = `${newurl}?unitId=${data.company.id}&unitName=${data.company.name}&editMode=false` // window.location.href = `${newurl}?unitId=${data.company.id}&unitName=${data.company.name}&editMode=false`
window.location.href = `${url}?unitId=${data.company.id}&unitName=${data.company.name}&editMode=false` window.location.href = `${url}?unitId=${data.company.id}&unitName=${data.company.name}&editMode=false`;
} }
} }
} }

10
src/index.html
Unescape View File

@ -25,16 +25,18 @@
</body> </body>
<!-- <script type="text/javascript" src="./assets/kmap/kmap-service-main-kd.js"></script> --> <!-- <script type="text/javascript" src="./assets/kmap/kmap-service-main-kd.js"></script> -->
<!-- <script src="http://10.81.73.39:8000/webapi/maps?v=2.0&key=e4b359dc7b03f9418b7497f807131346&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
<script src="http://10.81.73.39:8000/webapi/ui/1.1/main.js"></script> -->
<script type="text/javascript"> <script type="text/javascript">
window._AMapSecurityConfig = { window._AMapSecurityConfig = {
securityJsCode: '0afa0b144398727fad2ca06f5f7156b3' securityJsCode: '0afa0b144398727fad2ca06f5f7156b3'
} }
</script> </script>
<script <script
src="http://10.81.73.39:8000/webapi/maps?v=2.0&key=17bb9b27e49451cde8f2e6655b11ff1a&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
<script src="http://10.81.73.39:8000/webapi/ui/1.1/main.js"></script>
<!-- <script
src="https://webapi.amap.com/maps?v=2.0&key=17bb9b27e49451cde8f2e6655b11ff1a&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script> src="https://webapi.amap.com/maps?v=2.0&key=17bb9b27e49451cde8f2e6655b11ff1a&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
<script src="https://webapi.amap.com/ui/1.1/main.js"></script> <script src="https://webapi.amap.com/ui/1.1/main.js"></script> -->
<script src="/assets/html2canvas.js"></script> <script src="/assets/html2canvas.js"></script>
<script type="text/javascript" src="/assets/wordexport/jquery.js"></script> <script type="text/javascript" src="/assets/wordexport/jquery.js"></script>
<script type="text/javascript" src="/assets/wordexport/FileSaver.js"></script> <script type="text/javascript" src="/assets/wordexport/FileSaver.js"></script>

Write Preview
Loading…
Cancel
Save