Browse Source

[新增]重点单位审核结果查看

zhuzhou
chenjingyu 4 years ago
parent
commit
e634be6810
  1. 7
      src/app/key-unit/key-unit-management/key-unit-management.component.html
  2. 8
      src/app/key-unit/key-unit-management/key-unit-management.component.scss
  3. 78
      src/app/key-unit/key-unit-management/key-unit-management.component.ts
  4. 27
      src/app/key-unit/key-unit-management/resultcompanyPlan.html
  5. 5
      src/app/key-unit/key-unit.module.ts
  6. 98
      src/app/plan-audit/plan-record/plan-record.component.html
  7. 87
      src/app/plan-audit/plan-record/plan-record.component.ts
  8. 2
      src/app/plan-audit/wait-examineer/wait-examineer.component.html
  9. 10
      src/app/plan-audit/wait-examineer/wait-examineer.component.ts

7
src/app/key-unit/key-unit-management/key-unit-management.component.html

@ -104,7 +104,7 @@
<th mat-header-cell *matHeaderCellDef>
</th>
<td mat-cell *matCellDef="let element">
<mat-checkbox color="primary" (change)="checkChange($event,element)"></mat-checkbox>
<mat-checkbox color="primary" (change)="checkChange($event,element)" [disabled]="element.contentVerify!=null&&(element.contentVerify.verifyState==0||element.contentVerify.verifyState==3)" (click)='checkClick(element)'></mat-checkbox>
</td>
</ng-container>
<ng-container matColumnDef="Follow">
@ -264,8 +264,9 @@
<th mat-header-cell *matHeaderCellDef>操作</th>
<td mat-cell *matCellDef="let element" class="operation">
<span (click)="unitdetails(element)" >查看详情</span>
<span style="color: blue;margin-left: 4px;" *ngIf="element.contentVerify==null||element.contentVerify.verifyState==-1" (click)='submitAudit(element)'>提交审核</span>
<span style="color: blue;margin-left: 4px;" *ngIf="element.contentVerify!=null&&element.contentVerify.verifyState==3" (click)="cancelAudit(element)">撤销审核</span>
<span style="color: blue;margin-left: 4px;" *ngIf="element.contentVerify==null||element.contentVerify.verifyState==-1||element.contentVerify.verifyState==1||element.contentVerify.verifyState==2||element.contentVerify.verifyState==4||element.contentVerify.verifyState==5" (click)='submitAudit(element)'>提交审核</span>
<span style="color: blue;margin-left: 4px;" *ngIf="element.contentVerify!=null&&(element.contentVerify.verifyState==0||element.contentVerify.verifyState==3) " (click)="cancelAudit(element)">撤销审核</span>
<span style="color: blue;margin-left: 4px;" (click)="auditResult(element)">审批结果</span>
<span (click)="Follow(element)" *ngIf="!element.isFollowed">关注单位</span>
<span (click)="unFollow(element)" *ngIf="element.isFollowed">取消关注</span>
</td>

8
src/app/key-unit/key-unit-management/key-unit-management.component.scss

@ -263,4 +263,12 @@
.excellent{
// background : #32cd32;
// background-image: linear-gradient(to right, #e2e7ee ,#FF4500, #FF8C00,#32cd32);
}
//审核结果
.auditDiv{
p{
margin: 8px 0;
margin-left: 16px;
}
}

78
src/app/key-unit/key-unit-management/key-unit-management.component.ts

@ -353,7 +353,6 @@ export class KeyUnitManagementComponent implements OnInit {
IntegrityScoreMax:this.integrityScoreMax/100||1
}
this.http.get("/api/Companies",{params:paramsdata}).subscribe((data:any)=>{
console.log(data)
this.length = data.totalCount
this.allKeyUnitInfo = data
// data.items.sort( (a,b) => {
@ -429,11 +428,33 @@ export class KeyUnitManagementComponent implements OnInit {
}
selectedunitArr:any =[] //选中单位的数组
//勾选框事件
verifyState //判断是否可以修改
checkChange(e,element){
console.log(element)
if(element.contentVerify!=null){
this.verifyState=element.contentVerify.verifyState
}else{
this.verifyState=null
}
element.checked = e.checked
}
checkClick(element){
if(element.contentVerify!=null){
if(element.contentVerify.verifyState==0||element.contentVerify.verifyState==3){
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('该单位正在审核不能选中','确定',config);
}
}
}
//编辑单位信息
editunit(){
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
let selectedunitArr = []
let selectedunitobj = []
this.allKeyUnitInfo.items.forEach(item => {
@ -444,9 +465,6 @@ export class KeyUnitManagementComponent implements OnInit {
});
if(selectedunitArr.length == 0){
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('请先选择要修改的单位','确定',config);
}
if(selectedunitArr.length != 1 && selectedunitArr.length != 0){
@ -492,7 +510,13 @@ export class KeyUnitManagementComponent implements OnInit {
}
//删除单位信息
deleteunit(){
let selectedunitArr = []
if(this.verifyState==0||this.verifyState==3){
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('审核中,不能删除','确定',config);
}else{
let selectedunitArr = []
this.allKeyUnitInfo.items.forEach(item => {
if(item.checked){
selectedunitArr.push(item.id)
@ -524,6 +548,8 @@ export class KeyUnitManagementComponent implements OnInit {
}
}
}
}
@ -666,10 +692,20 @@ export class KeyUnitManagementComponent implements OnInit {
verifyState:-1,
contentType:11
}
this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{
this.http.delete(`/api/ContentVerifies/${element.contentVerify.id}`).subscribe(data=>{
this.getAllKeyUnit()
})
}
//审核结果
auditResult(element){
// console.log(element)
const dialogRef = this.dialog.open(companyAuditResult, {
width:"400px",
//height:"300px",
data: {element:element}
});
}
}
@ -791,4 +827,34 @@ export class upname{
}
}
}
//查看审核结果
@Component({
selector: 'resultmeet',
templateUrl: './resultcompanyPlan.html',
styleUrls: ['./key-unit-management.component.scss']
})
export class companyAuditResult{
constructor(private http: HttpClient,public dialogRef: MatDialogRef<companyAuditResult>,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {}
planName:any = this.data.element.name
createTime=''
organizationName=this.data.element.organizationName
verifyTime=''
remark=''
verifyOrganizationName
verifyState=100
ngOnInit(): void {
if(this.data.element.contentVerify!=null){
this.createTime=this.data.element.contentVerify.createTime
//this.organizationName=this.data.element.organizationName
this.verifyTime=this.data.element.contentVerify.verifyTime
this.remark=this.data.element.remark
this.verifyState=this.data.element.contentVerify.verifyState
this.verifyOrganizationName=this.data.element.contentVerify.verifyOrganizationName
}
}
onNoClick(): void {
this.dialogRef.close();
}
}

27
src/app/key-unit/key-unit-management/resultcompanyPlan.html

@ -0,0 +1,27 @@
<!--
* @Descripttion:
* @version:
* @Author: sueRimn
* @Date: 2021-01-20 09:31:24
* @LastEditors: sueRimn
* @LastEditTime: 2021-03-03 11:03:19
-->
<div style="text-align: center;">
<span mat-dialog-title>审批结果</span>
</div>
<div class="auditDiv">
<p>预案名称:{{planName}}</p>
<p>提交时间:{{createTime| date:'yyyy-MM-dd HH:mm:ss'||''}}</p>
<p>发起申请:{{organizationName ||''}}</p>
<mat-divider></mat-divider>
<p>审核时间:{{verifyTime| date:'yyyy-MM-dd HH:mm:ss'||''}}</p>
<p>审核机构:{{verifyOrganizationName||''}}</p>
<p>审核意见:{{remark||''}}</p>
<p>审核结果:{{verifyState==4?'审核通过':verifyState==5?'审核退回':''||''}}</p>
</div>
<div style="text-align: center;margin-top: 18px; ">
<button mat-raised-button (click)="onNoClick()">关闭</button>
</div>

5
src/app/key-unit/key-unit.module.ts

@ -84,10 +84,11 @@ import { WaterRoadComponent } from './water-road/water-road.component';
import { PhotoofthesceneComponent } from './photoofthescene/photoofthescene.component';
import { KnowRouteComponent } from './know-route/know-route.component';
import { FindProblemComponent } from './find-problem/find-problem.component';
import { upname } from './key-unit-management/key-unit-management.component'
import { upname } from './key-unit-management/key-unit-management.component';
import { companyAuditResult } from './key-unit-management/key-unit-management.component'
@NgModule({
declarations: [KeyUnitManagementComponent, EditUnitInfoComponent, ViewUnitDetailsComponent,CreateUnit,BasicinfoComponent,LookMaster,AddHouseInfo, EditPlanInfoComponent,BasicinfoLookComponent, ViewUnitDetailsPlanComponent,FunctionDivisionComponent,addPartition,addPartitionAttribute,AllaroundComponent,ImgDetails,RealisticPictureComponent,previewImg,addRealPicture,editRealPicture,KeySiteComponent,KeyImgDetail,KeySiteImgs,UploadingCADComponent,readFile,editFile,KeySiteLookComponent,KeySiteImgs2,FunctionDivisionLookComponent,RealisticPictureLookComponent,previewImg3,UploadingCADLookComponent,FireFightingDeviceComponent,ImagesData,previewBigImg,ImgsDataDetail,FireFightingDeviceLookComponent,ImagesData2,ImgsDataDetail2,previewBigImg2,LookMaster2,addPartitionAttribute2, SixFamiliarityComponent, ActualCombatDrillComponent,routerMapComponent, SixFamiliarListComponent,TrainingRecordinfoComponent,RouterGISComponent,WaterRoadComponent,PhotoofthesceneComponent,KnowRouteComponent,FindProblemComponent,upname],
declarations: [KeyUnitManagementComponent, EditUnitInfoComponent, ViewUnitDetailsComponent,CreateUnit,BasicinfoComponent,LookMaster,AddHouseInfo, EditPlanInfoComponent,BasicinfoLookComponent, ViewUnitDetailsPlanComponent,FunctionDivisionComponent,addPartition,addPartitionAttribute,AllaroundComponent,ImgDetails,RealisticPictureComponent,previewImg,addRealPicture,editRealPicture,KeySiteComponent,KeyImgDetail,KeySiteImgs,UploadingCADComponent,readFile,editFile,KeySiteLookComponent,KeySiteImgs2,FunctionDivisionLookComponent,RealisticPictureLookComponent,previewImg3,UploadingCADLookComponent,FireFightingDeviceComponent,ImagesData,previewBigImg,ImgsDataDetail,FireFightingDeviceLookComponent,ImagesData2,ImgsDataDetail2,previewBigImg2,LookMaster2,addPartitionAttribute2, SixFamiliarityComponent, ActualCombatDrillComponent,routerMapComponent, SixFamiliarListComponent,TrainingRecordinfoComponent,RouterGISComponent,WaterRoadComponent,PhotoofthesceneComponent,KnowRouteComponent,FindProblemComponent,upname,companyAuditResult],
exports:[ViewUnitDetailsPlanComponent],
imports: [
CommonModule,

98
src/app/plan-audit/plan-record/plan-record.component.html

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-12-25 10:19:31
* @LastEditors: sueRimn
* @LastEditTime: 2021-02-20 10:40:25
* @LastEditTime: 2021-03-03 13:54:44
-->
<div class="box">
<div class="boxleft">
@ -118,60 +118,48 @@
</div>
<div class="boxright">
<mat-tab-group *ngIf="showtype==3" style="flex: 1;overflow-y: auto;" [selectedIndex]="selected.value" (selectedIndexChange)="selected.setValue($event)">
<mat-tab label="基本信息">
<ng-template matTabContent>
<app-basic-info></app-basic-info>
</ng-template>
</mat-tab>
<mat-tab label="平面图">
<ng-template matTabContent>
平面图
</ng-template>
</mat-tab>
<mat-tab label="四周毗邻">
<ng-template matTabContent>
四周毗邻
</ng-template>
</mat-tab>
<mat-tab label="消防设施">
<ng-template matTabContent>
消防设施
</ng-template>
</mat-tab>
<mat-tab label="重点部位">
<ng-template matTabContent>
重点部位
</ng-template>
</mat-tab>
<mat-tab label="功能分区">
<ng-template matTabContent>
功能分区
</ng-template>
</mat-tab>
<mat-tab label="实景图">
<ng-template matTabContent>
实景图
</ng-template>
</mat-tab>
<mat-tab label="CAD">
<ng-template matTabContent>
cad
</ng-template>
</mat-tab>
<!-- <mat-tab label="六熟悉">
<ng-template matTabContent>
六熟悉
</ng-template>
</mat-tab>
<mat-tab label="实战演练">
<ng-template matTabContent>
实战演练
</ng-template>
</mat-tab> -->
</mat-tab-group>
<mat-tab-group *ngIf="showtype == 3" style="flex: 1;overflow-y: auto;margin-top: 10px;" [selectedIndex]="selected.value" (selectedIndexChange)="selected.setValue($event)">
<mat-tab label="基本信息">
<ng-template matTabContent>
<app-basic-info></app-basic-info>
</ng-template>
</mat-tab>
<mat-tab label="平面图">
<ng-template matTabContent>
<app-plan-list></app-plan-list>
</ng-template>
</mat-tab>
<mat-tab label="四周毗邻">
<ng-template matTabContent>
<app-allaround></app-allaround>
</ng-template>
</mat-tab>
<mat-tab label="消防设施">
<ng-template matTabContent>
<app-fire-facilities></app-fire-facilities>
</ng-template>
</mat-tab>
<mat-tab label="重点部位">
<ng-template matTabContent>
<app-key-site-look></app-key-site-look>
</ng-template>
</mat-tab>
<mat-tab label="功能分区">
<ng-template matTabContent>
<app-function-partition></app-function-partition>
</ng-template>
</mat-tab>
<mat-tab label="实景图">
<ng-template matTabContent>
<app-realistic-picture-look></app-realistic-picture-look>
</ng-template>
</mat-tab>
<mat-tab label="CAD">
<ng-template matTabContent>
<app-cad-draw></app-cad-draw>
</ng-template>
</mat-tab>
</mat-tab-group>
<div class="word" *ngIf="showtype==0">
<iframe [src]='iframeSrc'></iframe>
</div>

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

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-12-25 10:19:31
* @LastEditors: sueRimn
* @LastEditTime: 2021-02-22 10:49:38
* @LastEditTime: 2021-03-03 14:01:47
*/
import { Component, OnInit,Inject } from '@angular/core';
import { FormControl } from '@angular/forms';
@ -133,48 +133,67 @@ export class PlanRecordComponent implements OnInit {
//表格点击事件
viewer//全景图对象
tableClick(e,item){
this.showtype = -1
//e.target.parentElement.bgColor='#2196F3'
//console.log(e,item)
this.organizationName=''
this.id=item.id
this.fetchUrl=''
this.http.get(`/api/PlanComponents/${item.itemId}`).subscribe((data:any)=>{
this.companyId=data.companyId
this.companyName=data.companyName
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=''
this.viewer={}
if(item.contentType == 11){
window.setTimeout(()=>{
this.showtype = 3
sessionStorage.setItem('companyId',item.itemId)
},0)
}else if(item.contentType == 12){
//水源
this.showtype = 12
}else if(item.contentType == 13){
//消防力量
this.showtype = 13
}else if(item.contentType == 14){
//联动力量
this.showtype = 14
}else{
this.http.get(`/api/PlanComponents/${item.itemId}`).subscribe((data:any)=>{
this.companyId=data.companyId
this.companyName=data.companyName
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(()=>{
this.viewer = new Viewer({
container: document.querySelector('#viewer'),
panorama:'/api/Objects/PlanPlatform/'+ this.fetchUrl,
});
})
}else{
this.lookWord()
}
window.setTimeout(()=>{
this.viewer = new Viewer({
container: document.querySelector('#viewer'),
panorama:'/api/Objects/PlanPlatform/'+ this.fetchUrl,
});
})
}else{
this.lookWord()
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`)
}
}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){
this.shenheTable.push(item)

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

@ -82,7 +82,7 @@
<button mat-raised-button style="color: #FFFFFF;background-color: #FF7161;float: right;" (click)='refuse()'>拒绝</button>
<button mat-raised-button style="color: #FFFFFF;background-color: #38D984;float: right;" (click)='agree()'>同意</button>
</div>
<div class="rightheadone" *ngIf="showtype==3">
<div class="rightheadone" style="display: none;">
<button mat-raised-button color="primary" (click)="buttonChange()"><img src="../../../assets/images/preview.png" style="margin-right: 3px;margin-bottom: 3px;display: none;">{{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>

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

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-12-25 16:13:50
* @LastEditors: sueRimn
* @LastEditTime: 2021-03-02 15:12:43
* @LastEditTime: 2021-03-03 14:35:23
*/
import { Component, Inject, OnInit } from '@angular/core';
import { FormControl } from '@angular/forms';
@ -163,8 +163,10 @@ export class WaitExamineerComponent implements OnInit {
this.fetchUrl=''
this.viewer={}
if(item.contentType == 11){
this.showtype = 3
sessionStorage.setItem('companyId',item.itemId)
window.setTimeout(()=>{
this.showtype = 3
sessionStorage.setItem('companyId',item.itemId)
},0)
}else if(item.contentType == 12){
//水源
this.showtype = 12
@ -440,7 +442,7 @@ export class WaitExamineerComponent implements OnInit {
var body={
id:this.shenheTable[i].id,
itemId:this.shenheTable[i].itemId,
verifyState:4
verifyState:5
}
companyrefuseList.push(body)
}

Loading…
Cancel
Save