Browse Source

[完善]非重点单位预案审核中队直接终审

master
邵佳豪 1 year ago
parent
commit
e4b418048d
  1. 2
      proxy.config.json
  2. 1
      src/app/plan-audit/plan-record/plan-record.component.ts
  3. 21
      src/app/plan-audit/wait-examineer/wait-examineer.component.html
  4. 66
      src/app/plan-audit/wait-examineer/wait-examineer.component.ts
  5. 4
      src/index.html

2
proxy.config.json

@ -1,6 +1,6 @@
{
"/api": {
"target": "http://10.81.73.39:8000/",
"target": "http://121.36.37.70:8201/",
"生产": "http://10.81.73.39:8000/",
"测试": "http://121.36.37.70:8201/",
"生产2": "http://183.194.244.232:8088/",

1
src/app/plan-audit/plan-record/plan-record.component.ts

@ -206,6 +206,7 @@ export class PlanRecordComponent implements OnInit {
this.http
.get(`/api/PlanComponents/${item.itemId}`)
.subscribe((data: any) => {
this.companyId = data.companyId;
this.companyName = data.companyName;
//this.bianzhi = false

21
src/app/plan-audit/wait-examineer/wait-examineer.component.html

@ -90,7 +90,6 @@
{{item.itemMaintenanceState=='0'?'新增':'维护'}}
</td>
<td style="width: 10%;">
{{item.contentType=='1'?'Ⅰ级预案':item.contentType=='2'?'Ⅱ级预案':item.contentType=='3'?'Ⅲ级预案':item.contentType=='4'?'Ⅳ级预案':item.contentType=='5'?
'Ⅴ级预案':item.contentType=='6'?'应急预案(国家级)':item.contentType=='7'?'应急预案(市级)':item.contentType=='8'?'类型预案':item.contentType=='11'?'重点单位':item.contentType=='12'?'水源':item.contentType=='13'?'消防力量':item.contentType=='14'?'联动力量':'未知'}}
</td>
@ -102,10 +101,16 @@
[ngClass]="{'green': item.operation == '0','red':item.operation == '2','yellow':item.operation == '1'}">
{{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}}</td>
<td style="width: 20%;">{{item.organizationName}}</td>
<td style="width: 10%;"
[ngClass]="{'green': item.verifyState == '1'||item.verifyState == '4','red':item.verifyState == '2'||item.verifyState == '5'}">
{{item.verifyState=='0'?'待初审':item.verifyState=='1'?
'初审通过':item.verifyState=='2'?'初审驳回':item.verifyState=='3'?'待终审':item.verifyState=='4'?'终审通过':'终审驳回'}}
<td style="width: 10%;">
<span
*ngIf="item.verifyState=='0' && (item.contentType == 3 || item.contentType == 4 || item.contentType == 5) && item.itemObj.isFollowed">待初审</span>
<span
*ngIf="item.verifyState=='0' && (item.contentType == 3 || item.contentType == 4 || item.contentType == 5) && !item.itemObj.isFollowed">待终审</span>
<span class="green" *ngIf="item.verifyState=='1'">初审通过</span>
<span class="red" *ngIf="item.verifyState=='2'">初审驳回</span>
<span *ngIf="item.verifyState=='3'">待终审</span>
<span class="green" *ngIf="item.verifyState=='4'">终审通过</span>
<span class="red" *ngIf="item.verifyState=='5'">终审驳回</span>
</td>
<td style="width: 7%;">{{item.creatorName}}</td>
<td style="width: 13%;">{{item.createTime|date:'yyyy-MM-dd'}}</td>
@ -133,8 +138,6 @@
</div>
<div class="rightheadone" style="display: block;" *ngIf="showtype == 3">
<button mat-raised-button color="primary" (click)="buttonChange()">{{isallDate?'显示变更数据':'显示完整数据'}} </button>
<!-- <button mat-raised-button *ngIf="isallDate" style="background-color: #FFCC00; color: #FFFFFF;"
(click)="preview()"><img src="../../../assets/images/change.png" style="margin-bottom: 2px;"> 预览得分</button> -->
</div>
</div>
@ -332,13 +335,15 @@
<!-- 点击每条表格右边显示内容 -->
<div style="height: 100%;" *ngIf="isallDate">
<!-- word文档 -->
<!-- 在新编辑或自定义预案 -->
<div class="word" *ngIf="showtype == 0">
<div class="shadow" *ngIf="!iftrue">
<mat-spinner [diameter]="30"></mat-spinner>
</div>
<iframe [src]='iframeSrc' (load)='ifranmeLoad()' id="myiframe"></iframe>
</div>
<!-- 图片 -->
<img [src]="src" alt="" *ngIf="showtype == 'img'">
<!-- 全景图 -->
<div id="viewer" *ngIf="showtype == 1"></div>
<div class="twoD" *ngIf="showtype == 2">

66
src/app/plan-audit/wait-examineer/wait-examineer.component.ts

@ -101,7 +101,7 @@ export class WaitExamineerComponent implements OnInit {
chuorzhong; //判断初审还是终审
radioid; //选中的id
shenheTable = []; //选中要审核的对象
showtype = -1; //0:word,1:全景图,2:二维三维,3:重点单位
showtype: any = -1; //0:word,1:全景图,2:二维三维,3:重点单位
compantData = { name: "", buildingTypes: [], address: "" };
organizationName;
planData;
@ -111,7 +111,7 @@ export class WaitExamineerComponent implements OnInit {
fetchUrl;
companyName;
plantypes;
IsNewData:any = [true, false];
IsNewData: any = [true, false];
//获取表格数据
PageNumber = 1;
@ -196,14 +196,18 @@ export class WaitExamineerComponent implements OnInit {
differentContentOfPicture: any; //当前单位变更数据 之 实景图
bianzhi = false;
radioClick(e, item) {
console.log(item);
//重置状态
this.showtype = -1;
this.selectedItem = item;
// console.log('当前选择的信息',JSON.parse(this.selectedItem.differentContent) )
this.organizationName = "";
this.itemid = item.itemId;
this.id = item.id;
this.fetchUrl = "";
this.viewer = {};
// 单位信息审核并且与上次有差异
if (item.contentType == 11 && this.selectedItem.differentContent) {
let differentContent = JSON.parse(this.selectedItem.differentContent);
//console.log('差异信息', differentContent)
// 单位信息
this.differentContentOfUnitInfo = differentContent.filter(
(item) => item.propertyName == "basicInfo"
@ -272,16 +276,7 @@ export class WaitExamineerComponent implements OnInit {
});
}
}
// console.log('功能分区', this.differentContentOfFunction)
this.showtype = -1;
this.organizationName = "";
this.itemid = item.itemId;
this.id = item.id;
this.fetchUrl = "";
this.viewer = {};
// 单位信息审核
if (item.contentType == 11) {
this.bianzhi = false;
window.setTimeout(() => {
@ -330,13 +325,17 @@ export class WaitExamineerComponent implements OnInit {
this.showtype = 14;
});
} else {
// 预案相关审核
this.http
.get(`/api/PlanComponents/${item.itemId}`)
.subscribe((data: any) => {
//console.log('预案信息',data)
console.log("预案信息", data);
item.planData = data;
this.companyId = data.companyId;
this.companyName = data.companyName;
if (data.planType != 2 && data.planType != 1) {
// 不是二维也不是三维预案
if (data.planType != 1 && data.planType != 2) {
//在线编辑或者自定义编辑预案
if (data.planMode == 2 || data.planMode == 4) {
this.showtype = 0;
this.bianzhi = true;
@ -344,11 +343,11 @@ export class WaitExamineerComponent implements OnInit {
this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(
this.src
);
//this.src=`/keyUnit/viewunitinfoplan?id=${data.companyId}&orName=${data.company.organizationId}&orId=${data.company.organizationName}`
} else {
this.bianzhi = false;
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");
@ -362,10 +361,12 @@ export class WaitExamineerComponent implements OnInit {
});
});
} else {
//其余格式的文件
this.lookWord();
}
}
} else {
//二三维预案查看
this.bianzhi = false;
this.organizationName = item.organizationName;
this.planData = data;
@ -388,9 +389,7 @@ export class WaitExamineerComponent implements OnInit {
//毕升
lookWord() {
console.log("lookWord");
this.showtype = 0;
//let src
let suffix = this.fetchUrl
.split(".")
[this.fetchUrl.split(".").length - 1].toLowerCase();
@ -400,7 +399,12 @@ export class WaitExamineerComponent implements OnInit {
this.src = `/api/Objects/PlanPlatform/` + arr.join(".");
} else if (suffix == "pdf") {
this.src = `/api/Objects/PlanPlatform/` + this.fetchUrl;
} else {
this.showtype = "img";
this.src = `/api/Objects/PlanPlatform/` + this.fetchUrl;
}
console.log("查看附件111", this.fetchUrl);
console.log("查看附件222", this.src);
this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(this.src);
}
//查看按钮跳转
@ -726,12 +730,14 @@ export class remark {
}
//确定
define() {
console.log(this.data);
// return;
//type == 1同意 type == 12拒绝
const config = new MatSnackBarConfig();
config.verticalPosition = "top";
config.duration = 3000;
//同意操作
if (this.data.type == 1) {
//同意操作
// console.log(this.shenheTable)
//单个审核
if (this.shenheTable.length == 1) {
//重点单位审核
@ -746,8 +752,7 @@ export class remark {
};
this.http.put(`/api/ContentVerifies`, body).subscribe((data) => {
this.snackBar.open("操作成功!", "确定", config);
this.dialogRef.close();
//this.getAlltabledate()
this.dialogRef.close("操作成功!");
});
} else if (
this.shenheTable[0].contentType == 12 ||
@ -769,8 +774,8 @@ export class remark {
});
} else {
//预案审核
//verifyState == 0待初审
if (this.shenheTable[0].verifyState == 0) {
//待初审
let body: any = {
auditStatus: 16, //初审通过,待终审
auditOpinion: this.remark || "",
@ -781,14 +786,17 @@ export class remark {
this.snackBar.open("操作成功!", "确定", config);
this.dialogRef.close();
});
} else if (this.shenheTable[0].verifyState == 3) {
} else if (
//verifyState == 3待终审
this.shenheTable[0].verifyState == 3
) {
//待终审
let body: any = {
auditStatus: 2, //审核(终审)通过
auditOpinion: this.remark || "",
};
this.http
.put(`/api/PlanAudits/${this.radioid}`, body)
.put(`/api/PlanAudits/${this.shenheTable[0].itemId}`, body)
.subscribe((data) => {
this.snackBar.open("操作成功!", "确定", config);
this.dialogRef.close();

4
src/index.html

@ -19,14 +19,14 @@
<!-- <script type="text/javascript" src="./assets/kmap/kmap-service-main-kd.js"></script> -->
<script type="text/javascript">
<!-- <script type="text/javascript">
window._AMapSecurityConfig = {
securityJsCode: '0afa0b144398727fad2ca06f5f7156b3'
}
</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="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>
<script src="https://webapi.amap.com/ui/1.1/main.js"></script> -->

Loading…
Cancel
Save