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

[修改]毕升服务器地址改为内网ip

zhuzhou
chenjingyu 4 years ago
parent
be69798887
commit
d5f5e59e98
15 changed files with 53 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/app/data-collection/fire-force/fire-force.component.ts
  2. 2
      src/app/data-collection/linkage-forces/linkage-forces.component.ts
  3. 2
      src/app/plan-audit/fireforce-audit/fireforce-audit.component.ts
  4. 2
      src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.ts
  5. 4
      src/app/plan-audit/plan-record/plan-record.component.ts
  6. 4
      src/app/plan-audit/wait-examineer/wait-examineer.component.ts
  7. 25
      src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
  8. 3
      src/app/plan-management/meet-plan/meet-plan.component.html
  9. 7
      src/app/plan-management/meet-plan/meet-plan.component.ts
  10. 2
      src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts
  11. 2
      src/app/plan-management/open-plan/open-plan.component.ts
  12. 2
      src/app/plan-management/pass-plan/pass-plan.component.ts
  13. 2
      src/app/plan-management/type-plan/type-plan.component.ts
  14. 26
      src/app/statistic-analysis/all-plan/all-plan.component.ts
  15. 12
      src/app/statistic-analysis/state/page-one/page-one.component.ts

2
src/app/data-collection/fire-force/fire-force.component.ts
Unescape View File

@ -1151,7 +1151,7 @@ export class FireForceComponent implements OnInit {
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/apps/editor/openPreview?data=${base64}`)
window.open(`http://172.26.166.38:18080/apps/editor/openPreview?data=${base64}`)
}
if(suffix == 'mp4'){
const dialogRef = this.dialog.open(ViewDetails, {//调用open方法打开对话框并且携带参数过去

2
src/app/data-collection/linkage-forces/linkage-forces.component.ts
Unescape View File

@ -885,7 +885,7 @@ export class LinkageForcesComponent implements OnInit {
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/apps/editor/openPreview?data=${base64}`)
window.open(`http://172.26.166.38:18080/apps/editor/openPreview?data=${base64}`)
}
if(suffix == 'mp4'){
const dialogRef = this.dialog.open(ViewDetails2, {//调用open方法打开对话框并且携带参数过去

2
src/app/plan-audit/fireforce-audit/fireforce-audit.component.ts
Unescape View File

@ -186,7 +186,7 @@ export class FireforceAuditComponent implements OnInit {
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/apps/editor/openPreview?data=${base64}`)
window.open(`http://172.26.166.38:18080/apps/editor/openPreview?data=${base64}`)
}
if(suffix == 'mp4'){
const dialogRef = this.dialog.open(ViewDetailsComponent, {//调用open方法打开对话框并且携带参数过去

2
src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.ts
Unescape View File

@ -196,7 +196,7 @@ export class LinkageforcesAuditComponent implements OnInit {
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/apps/editor/openPreview?data=${base64}`)
window.open(`http://172.26.166.38:18080/apps/editor/openPreview?data=${base64}`)
}
if(suffix == 'mp4'){
const dialogRef = this.dialog.open(ViewDetailsComponent, {//调用open方法打开对话框并且携带参数过去

4
src/app/plan-audit/plan-record/plan-record.component.ts
Unescape View File

@ -260,9 +260,9 @@ export class PlanRecordComponent implements OnInit {
var stringjson=JSON.stringify(json)
var wordArray = CryptoJS.enc.Utf8.parse(stringjson);
var base64 = CryptoJS.enc.Base64.stringify(wordArray);
this.src=`http://121.5.10.84/apps/editor/openPreview?data=${base64}`
this.src=`http://172.26.166.38:18080/apps/editor/openPreview?data=${base64}`
this.iframeSrc=this.sanitizer.bypassSecurityTrustResourceUrl(this.src);
//window.open(`http://121.5.10.84/apps/editor/openPreview?data=${base64}`)
//window.open(`http://172.26.166.38:18080/apps/editor/openPreview?data=${base64}`)
})
}
//查看按钮跳转

4
src/app/plan-audit/wait-examineer/wait-examineer.component.ts
Unescape View File

@ -289,9 +289,9 @@ export class WaitExamineerComponent implements OnInit {
var stringjson=JSON.stringify(json)
var wordArray = CryptoJS.enc.Utf8.parse(stringjson);
var base64 = CryptoJS.enc.Base64.stringify(wordArray);
this.src=`http://121.5.10.84/apps/editor/openPreview?data=${base64}`
this.src=`http://172.26.166.38:18080/apps/editor/openPreview?data=${base64}`
this.iframeSrc=this.sanitizer.bypassSecurityTrustResourceUrl(this.src);
//window.open(`http://121.5.10.84/apps/editor/openPreview?data=${base64}`)
//window.open(`http://172.26.166.38:18080/apps/editor/openPreview?data=${base64}`)
})
}
//查看按钮跳转

25
src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
Unescape View File

@ -103,7 +103,7 @@ export class EntryPlanLookComponent implements OnInit {
}
//查看预案
lookPlan(e){
if(e.planMode == 0){
if(e.planType == 16||e.planType == 4){
// console.log(e.attachmentUrls)
var index=e.attachmentUrls[0].indexOf("\/")
if(e.attachmentUrls[0].substr(0,index)=='psw'){
@ -146,17 +146,21 @@ export class EntryPlanLookComponent implements OnInit {
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/apps/editor/openPreview?data=${base64}`)
window.open(`http://172.26.166.38:18080/apps/editor/openPreview?data=${base64}`)
})
}
}
if(e.planMode == 1){
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('查看导入word文件','确定',config);
}
if(e.planMode == 2){ //如果是在线编辑
/* 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)
sessionStorage.setItem("companyId",this.companyId)
@ -166,7 +170,7 @@ export class EntryPlanLookComponent implements OnInit {
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.planMode == 3){ //如果是跳转网页
if(e.planType == 2){ //如果是跳转网页
sessionStorage.setItem("url",e.url)
window.open(`/planManagement/webLook`)
}
@ -784,6 +788,7 @@ export class AddPlanone {
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}

3
src/app/plan-management/meet-plan/meet-plan.component.html
Unescape View File

@ -96,6 +96,7 @@
<div class="newadd">
<div>
<button *ngIf="levels=='0'" mat-raised-button color="primary" (click)='addunit()'><img style="margin-bottom: 3px;" src="../../../assets/images/newadd.png"> 新增</button>
<!-- <button mat-raised-button color="primary" (click)='word("table","ceshi.doc")'></button> -->
</div>
<div class="progressBox" style="margin-left: 100px;" *ngIf="downloadisLoading">
@ -107,7 +108,7 @@
</div>
</div>
<div class="body">
<div class="tablebox">
<div class="tablebox" id="table">
<table mat-table [dataSource]="tabledataSource" class="mat-elevation-z8">
<ng-container matColumnDef="unitname">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">预案名称</th>

7
src/app/plan-management/meet-plan/meet-plan.component.ts
Unescape View File

@ -61,12 +61,11 @@ export class MeetPlanComponent implements OnInit {
}
this.getAlltabledate()
}
//生产word
//生成word
word(id,fileName){
/* id ：文档dom节点 fileName：文件名称(.doc) */
var header = "<html xmlns:o='urn:schemas-microsoft-com:office:office' " +
"xmlns:w='urn:schemas-microsoft-com:office:word' " +
"xmlns='http://www.w3.org/TR/REC-html40'>" +
"xmlns:w='urn:schemas-microsoft-com:office:word' >" +
"<head><meta charset='utf-8'><title>Export HTML to Word Document with JavaScript</title></head><body>"
var footer = '</body></html>'
var sourceHTML = header + document.getElementById(id).innerHTML + footer
@ -249,7 +248,7 @@ export class MeetPlanComponent implements OnInit {
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/apps/editor/openPreview?data=${base64}`)
window.open(`http://172.26.166.38:18080/apps/editor/openPreview?data=${base64}`)
})
}

2
src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts
Unescape View File

@ -257,7 +257,7 @@ export class OnetwoEntryPlanComponent implements OnInit {
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/apps/editor/openPreview?data=${base64}`)
window.open(`http://172.26.166.38:18080/apps/editor/openPreview?data=${base64}`)
})

2
src/app/plan-management/open-plan/open-plan.component.ts
Unescape View File

@ -236,7 +236,7 @@ export class OpenPlanComponent implements OnInit {
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/apps/editor/openPreview?data=${base64}`)
window.open(`http://172.26.166.38:18080/apps/editor/openPreview?data=${base64}`)
})
}
}

2
src/app/plan-management/pass-plan/pass-plan.component.ts
Unescape View File

@ -383,7 +383,7 @@ export class PassPlanComponent implements OnInit {
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/apps/editor/openPreview?data=${base64}`)
window.open(`http://172.26.166.38:18080/apps/editor/openPreview?data=${base64}`)
})
}
}

2
src/app/plan-management/type-plan/type-plan.component.ts
Unescape View File

@ -238,7 +238,7 @@ export class TypePlanComponent implements OnInit {
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/apps/editor/openPreview?data=${base64}`)
window.open(`http://172.26.166.38:18080/apps/editor/openPreview?data=${base64}`)
})

26
src/app/statistic-analysis/all-plan/all-plan.component.ts
Unescape View File

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2021-03-15 11:32:30
* @LastEditors: sueRimn
* @LastEditTime: 2021-04-20 17:14:54
* @LastEditTime: 2021-04-28 15:33:00
*/
import { Component, OnInit, ViewChild, Inject } from '@angular/core';
import { HttpClient } from '@angular/common/http'
@ -82,7 +82,7 @@ export class AllPlanComponent implements OnInit {
//查看详情
lookPlan(e){
if(e.planMode == 0){
if(e.planType == 16||e.planType == 4){
var index=e.attachmentUrls[0].indexOf("\/")
if(e.attachmentUrls[0].substr(0,index)=='psw'){
const dialogRef = this.dialog.open(PsViewer, {
@ -122,17 +122,21 @@ export class AllPlanComponent implements OnInit {
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/apps/editor/openPreview?data=${base64}`)
window.open(`http://172.26.166.38:18080/apps/editor/openPreview?data=${base64}`)
})
}
}
if(e.planMode == 1){
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('查看导入word文件','确定',config);
}
if(e.planMode == 2){ //如果是在线编辑
/* 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)
sessionStorage.setItem("companyId",e.company.id)
@ -142,7 +146,7 @@ export class AllPlanComponent implements OnInit {
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.planMode == 3){ //如果是跳转网页
if(e.planType == 2){ //如果是跳转网页
sessionStorage.setItem("url",e.url)
window.open(`/planManagement/webLook`)
}

12
src/app/statistic-analysis/state/page-one/page-one.component.ts
Unescape View File

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-09-01 15:24:39
* @LastEditors: sueRimn
* @LastEditTime: 2021-04-22 09:52:50
* @LastEditTime: 2021-04-29 09:11:46
*/
import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router';
@ -116,11 +116,11 @@ export class PageOneComponent implements OnInit {
},
data:tid=='pieone'?[
{value:this.tabledata[0].planCategoryStatistics.planCategories[0].count, name: 'Ⅰ级预案',planStatusName:this.tabledata[0].planCategoryStatistics.planCategories[0].planCategoryName,type:1},
{value:this.tabledata[0].planCategoryStatistics.planCategories[1].count, name: 'Ⅱ级预案',planStatusName:this.tabledata[0].planCategoryStatistics.planCategories[1].planCategoryName,type:2},
{value:this.tabledata[0].planCategoryStatistics.planCategories[2].count, name: 'Ⅲ级预案',planStatusName:this.tabledata[0].planCategoryStatistics.planCategories[2].planCategoryName,type:3},
{value:this.tabledata[0].planCategoryStatistics.planCategories[3].count, name: 'Ⅳ级预案',planStatusName:this.tabledata[0].planCategoryStatistics.planCategories[3].planCategoryName,type:4},
{value:this.tabledata[0].planCategoryStatistics.planCategories[4].count, name: 'Ⅴ级预案',planStatusName:this.tabledata[0].planCategoryStatistics.planCategories[4].planCategoryName,type:5},
{value:this.tabledata[0].planCategoryStatistics.planCategories[0]!=undefined? this.tabledata[0].planCategoryStatistics.planCategories[0].count:0, name: 'Ⅰ级预案', planStatusName:this.tabledata[0].planCategoryStatistics.planCategories[0]!=undefined? this.tabledata[0].planCategoryStatistics.planCategories[0].planCategoryName:'',type:1},
{value:this.tabledata[0].planCategoryStatistics.planCategories[1]!=undefined? this.tabledata[0].planCategoryStatistics.planCategories[1].count:0, name: 'Ⅱ级预案', planStatusName:this.tabledata[0].planCategoryStatistics.planCategories[1]!=undefined? this.tabledata[0].planCategoryStatistics.planCategories[1].planCategoryName:'',type:2},
{value:this.tabledata[0].planCategoryStatistics.planCategories[2]!=undefined? this.tabledata[0].planCategoryStatistics.planCategories[2].count:0, name: 'Ⅲ级预案', planStatusName:this.tabledata[0].planCategoryStatistics.planCategories[2]!=undefined? this.tabledata[0].planCategoryStatistics.planCategories[2].planCategoryName:'',type:3},
{value:this.tabledata[0].planCategoryStatistics.planCategories[3]!=undefined? this.tabledata[0].planCategoryStatistics.planCategories[3].count:0, name: 'Ⅳ级预案', planStatusName:this.tabledata[0].planCategoryStatistics.planCategories[3]!=undefined? this.tabledata[0].planCategoryStatistics.planCategories[3].planCategoryName:'',type:4},
{value:this.tabledata[0].planCategoryStatistics.planCategories[4]!=undefined? this.tabledata[0].planCategoryStatistics.planCategories[4].count:0, name: 'Ⅴ级预案', planStatusName:this.tabledata[0].planCategoryStatistics.planCategories[4]!=undefined? this.tabledata[0].planCategoryStatistics.planCategories[4].planCategoryName:'',type:5},
]: [
{value:this.tabledata[0].planStatusStatistics.planStatuses[0]!=undefined? this.tabledata[0].planStatusStatistics.planStatuses[0].count:0, name: '预案新增',type:1,planStatusName:this.tabledata[0].planStatusStatistics.planStatuses[0]!=undefined?this.tabledata[0].planStatusStatistics.planStatuses[0].planStatusName:''},
{value:this.tabledata[0].planStatusStatistics.planStatuses[2]!=undefined? this.tabledata[0].planStatusStatistics.planStatuses[2].count:0, name: '预案审核通过',type:3,planStatusName:this.tabledata[0].planStatusStatistics.planStatuses[2]!=undefined? this.tabledata[0].planStatusStatistics.planStatuses[2].planStatusName:''},

Write Preview
Loading…
Cancel
Save