-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ 单位名称:
+ {{compantData.name?compantData.name : '暂无数据'}}
+
+
+ 消防救援站:
+ {{organizationName}}
-
-
-
+
+ 单位类型:
+ {{compantData.buildingTypes.length?compantData.buildingTypes[0].name : '暂无数据'}}
+
+
+ 单位地址:
+ {{compantData.address?compantData.address : '暂无数据'}}
+
+
+ 查看详情
-
-
-
-
+
+
-
-
-
-
-
-
- 基本信息
-
-
-
-
-
-
-
- 
修改-沃尔玛（上海）职业发展有限公司
-
-
-
-
- | 单位地址 ： |
- 由 上海市上海市黄浦区武胜路333号变更为
- 上海市上海市黄浦区金陵西路28号 |
-
-
- | 联系电话 ： |
- 由15069853369变更为
- 13869877764 |
-
-
- | 始建于（年）： |
- 由1991变更为
- 2003 |
-
-
-
-
-
-
-
-
-
- 基本信息
-
-
-
-
-
-
-
- 修改-沃尔玛（上海）职业发展有限公司
-
-
-
-
- | 单位地址 ： |
- 由 上海市上海市黄浦区武胜路333号变更为
- 上海市上海市黄浦区金陵西路28号 |
-
-
- | 联系电话 ： |
- 由15069853369变更为
- 13869877764 |
-
-
- | 始建于（年）： |
- 由1991变更为
- 2003 |
-
-
-
-
-
-
-
-
-
- 四周毗邻
-
-
-
-
-
-
-
- 一号建筑
-
-
-
-
- 一号建筑：
-
-
-
由
-
变更为
-
-
-
-
-
-
-
-
-
- 单位名称:
- {{compantData.name?compantData.name : '暂无数据'}}
-
-
- 消防救援站:
- {{organizationName}}
-
-
- 单位类型:
- {{compantData.buildingTypes.length?compantData.buildingTypes[0].name : '暂无数据'}}
-
-
- 单位地址:
- {{compantData.address?compantData.address : '暂无数据'}}
-
-
- 查看详情
-
-
+ 该提交内容为空，从未保存过，请驳回该审核
+
+
-
+
+
\ No newline at end of file
diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.scss b/src/app/plan-audit/wait-examineer/wait-examineer.component.scss
index 21613c6..6221e8a 100644
--- a/src/app/plan-audit/wait-examineer/wait-examineer.component.scss
+++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.scss
@@ -1,217 +1,214 @@
-.box{
+.box {
height: 100%;
width: 100%;
display: flex;
- .boxleft{
+ .boxleft {
height: 100%;
width: 45%;
- background-color: #FFFFFF;
+ background-color: #ffffff;
display: flex;
flex-direction: column;
overflow: auto;
- .lefthead{
+ .lefthead {
display: flex;
flex-direction: column;
- .headdiv{
- @media screen and (min-device-width:1400px){
+ .headdiv {
+ @media screen and (min-device-width: 1400px) {
margin: 0 0 0 28px;
}
- @media screen and (max-device-width:1400px) and (min-device-width:1200px){
+ @media screen and (max-device-width: 1400px) and (min-device-width: 1200px) {
margin-left: 15px;
}
- @media screen and (max-device-width:1200px){
+ @media screen and (max-device-width: 1200px) {
margin-left: 5px;
}
height: 40px;
display: flex;
flex-direction: row;
- .radio{
+ .radio {
height: 10px;
}
- span{
- @media screen and (min-device-width:1400px){
+ span {
+ @media screen and (min-device-width: 1400px) {
font-size: 16px;
}
- @media screen and (max-device-width:1400px) and (min-device-width:1200px){
+ @media screen and (max-device-width: 1400px) and (min-device-width: 1200px) {
font-size: 16px;
}
- @media screen and (max-device-width:1200px){
+ @media screen and (max-device-width: 1200px) {
font-size: 14px;
}
margin-left: 3px;
}
- input{
+ input {
position: relative;
- @media screen and (min-device-width:1400px){
+ @media screen and (min-device-width: 1400px) {
margin-left: 50px;
top: 6px;
}
- @media screen and (max-device-width:1200px){
+ @media screen and (max-device-width: 1200px) {
margin-left: 8px;
top: 4px;
}
- @media screen and (max-device-width:1400px) and (min-device-width:1200px){
+ @media screen and (max-device-width: 1400px) and (min-device-width: 1200px) {
margin-left: 8px;
top: 6px;
}
-
}
- .count{
- @media screen and (min-device-width:1400px){
+ .count {
+ @media screen and (min-device-width: 1400px) {
margin-left: 110px;
}
- @media screen and (max-device-width:1200px){
+ @media screen and (max-device-width: 1200px) {
margin-left: 20px;
position: relative;
bottom: 3px;
}
- @media screen and (max-device-width:1400px) and (min-device-width:1200px){
+ @media screen and (max-device-width: 1400px) and (min-device-width: 1200px) {
margin-left: 20px;
/* position: relative;
bottom: 3px; */
}
}
}
- .headthree{
- @media screen and (min-device-width:1400px){
+ .headthree {
+ @media screen and (min-device-width: 1400px) {
margin-left: 30px;
}
- @media screen and (max-device-width:1200px){
+ @media screen and (max-device-width: 1200px) {
margin-left: 7px;
font-size: 14px;
- mat-form-field{
+ mat-form-field {
width: 120px;
}
}
- @media screen and (max-device-width:1400px) and (min-device-width:1200px){
+ @media screen and (max-device-width: 1400px) and (min-device-width: 1200px) {
margin-left: 15px;
//font-size: 14px;
- mat-form-field{
+ mat-form-field {
width: 140px;
}
}
-
- button{
-
- @media screen and (min-device-width:1400px){
+
+ button {
+ @media screen and (min-device-width: 1400px) {
margin-left: 30px;
font-size: 16px;
width: 80px;
height: 36px;
}
- @media screen and (max-device-width:1400px){
+ @media screen and (max-device-width: 1400px) {
margin-left: 90px;
font-size: 14px;
-
}
}
- img{
- @media screen and (min-device-width:1400px){
+ img {
+ @media screen and (min-device-width: 1400px) {
height: 14px;
width: 14px;
}
- @media screen and (max-device-width:1400px){
+ @media screen and (max-device-width: 1400px) {
height: 12px;
width: 12px;
}
-
}
-
}
}
- .tablediv{
+ .tablediv {
width: 100%;
height: 100%;
- .tbodycss{
- @media screen and (min-device-width:1400px){
+ .tbodycss {
+ @media screen and (min-device-width: 1400px) {
overflow-y: auto;
}
-
+
height: 650px;
width: 100%;
- .selectedTr{
+ .selectedTr {
background-color: #b3d3ee;
}
- td{
- font-weight:10;
- @media screen and (min-device-width:1200px){
+ td {
+ font-weight: 10;
+ @media screen and (min-device-width: 1200px) {
font-size: 16px;
}
- @media screen and (max-device-width:1200px){
+ @media screen and (max-device-width: 1200px) {
font-size: 14px;
}
}
}
- table{
- margin-left:10px;
+ table {
+ margin-left: 10px;
margin-right: 10px;
width: 97.5%;
//margin-bottom: 10px;
- thead{
- height:48px;
- color: #FFFFFF;
- background-color: #2196F3;
+ thead {
+ height: 48px;
+ color: #ffffff;
+ background-color: #2196f3;
//font-size: 10px;
- th{
- font-weight:10;
- @media screen and (min-device-width:1200px){
+ th {
+ font-weight: 10;
+ @media screen and (min-device-width: 1200px) {
font-size: 16px;
}
- @media screen and (max-device-width:1200px){
+ @media screen and (max-device-width: 1200px) {
font-size: 14px;
}
}
}
-
- tr:nth-child(odd){
- background: #FAFAFA;
- }
+
+ tr:nth-child(odd) {
+ background: #fafafa;
+ }
}
}
}
- .boxright{
+ .boxright {
height: 100%;
- @media screen and (max-device-width:1400px){
+ width: 53%;
+ @media screen and (max-device-width: 1400px) {
overflow-y: auto;
}
- width: 53%;
+
flex: 1;
- background-color: #FFFFFF;
+ background-color: #ffffff;
margin-left: 10px;
display: flex;
flex-direction: column;
- .company{
+ .company {
//margin-left: 20px;
- @media screen and (min-device-width:1400px){
+ @media screen and (min-device-width: 1400px) {
overflow-y: auto;
}
flex: 1;
//overflow-y: auto;
margin-top: 10px;
}
- .righthead{
+ .righthead {
width: 100%;
display: flex;
height: 50px;
align-items: center;
flex-direction: row-reverse;
- button{
+ button {
margin-left: 10px;
font-size: 16px;
}
- .rightheadone{
+ .rightheadone {
width: 40%;
margin-right: 7%;
}
- .rightheadtwo{
+ .rightheadtwo {
width: 60%;
margin-right: 2%;
}
}
- .word{
+
+ .word {
width: 100%;
height: 100%;
- iframe{
+ iframe {
height: 95%;
width: 97%;
margin: 10px 10px 10px 10px;
@@ -219,82 +216,97 @@
border: medium none;
}
}
- #viewer{
+ #viewer {
margin: 10px 10px 10px 10px;
width: 97%;
height: 93%;
}
- .waterAudit,.fireForceAudit,.LinkageForcesAudit{
+ .waterAudit,
+ .fireForceAudit,
+ .LinkageForcesAudit {
flex: 1;
width: 100%;
height: 100%;
box-sizing: border-box;
}
- .emptyContent{
+ .emptyContent {
width: 100%;
text-align: center;
}
}
}
-th,td{
- height:48px;
- @media screen and (min-device-width:1400px){
+th,
+td {
+ height: 43px;
+ @media screen and (min-device-width: 1400px) {
font-size: 16px;
}
- @media screen and (max-device-width:1400px){
+ @media screen and (max-device-width: 1400px) {
font-size: 14px;
}
text-align: center;
//white-space: nowrap;
}
-.green{color: #00C756;}
-.red{color: #FF4D4D;}
-.blue{color: #2196F3;}
-.accordingin{
+.green {
+ color: #00c756;
+}
+.red {
+ color: #ff4d4d;
+}
+.blue {
+ color: #2196f3;
+}
+.accordingin {
margin: 5px;
- .panelhead{
- background-color:#E8F4FE;
- color: #2196F3;
+ .panelhead {
+ background-color: #e8f4fe;
+ color: #2196f3;
font-size: 16px;
- span{
+ span {
margin-left: 10px;
}
}
- table{
+ table {
margin: 5px 0;
width: 100%;
- th{
- background-color: #FAFAFA;
+ th {
+ background-color: #fafafa;
width: 30%;
font-size: 16px;
text-align: right;
}
- td{
+ td {
text-align: left;
font-size: 16px;
margin-left: 3px;
+ .spantext{
+ margin-left: 7px;
+ }
+ .buleColor{
+ color: #2196f3;
+ }
}
}
- .onebuilding{
+ .onebuilding {
display: flex;
margin: 5px 0;
width: 100%;
- .accordingleft{
- background-color: #FAFAFA;
+ .accordingleft {
+ background-color: #fafafa;
width: 30%;
height: 120px;
font-size: 16px;
text-align: right;
}
- .accordingright{
+ .accordingright {
margin: 7px;
height: 100px;
font-size: 16px;
- img{
+ img {
margin-left: 10px;
//height: 80px;
}
- span{
+ span {
margin-left: 10px;
position: relative;
bottom: 90px;
@@ -302,7 +314,7 @@ th,td{
}
}
}
-.echarts{
+.echarts {
width: 480px;
height: 304px;
display: flex;
@@ -312,13 +324,13 @@ th,td{
top: 13%;
left: 55%;
z-index: 100;
- .bar{
+ .bar {
height: 100%;
width: 40%;
opacity: 1;
//margin: 40px 30px;
}
- .zhu{
+ .zhu {
margin-bottom: 100px;
margin-right: 20px;
height: 95%;
@@ -333,51 +345,53 @@ th,td{
flex-direction: column;
align-items: left;
.planBox {
- margin: 30px 30px;
- color: black;
- :first-child {margin-right: 10px;}
+ margin: 30px 30px;
+ color: black;
+ :first-child {
+ margin-right: 10px;
+ }
}
- }
+}
//滚动条样式
-::-webkit-scrollbar{
+::-webkit-scrollbar {
width: 6px;
background-color: white;
- }
- ::-webkit-scrollbar-thumb{
- background-color: #2196F3;
- }
+}
+::-webkit-scrollbar-thumb {
+ background-color: #2196f3;
+}
- .remarkbox{
- width: 100%;
- height: 100%;
- display: flex;
- flex-direction: column;
- .remarkhead{
- width: 100%;
- span{
- font-size: 20px;
- text-align: center;
- width: 80px;
- margin-left: 40%;
- }
- }
- .remarktext{
- width: 100%;
- margin-top: 20px;
- textarea{
- width: 420px;
- height: 110px;
- outline:none;
- }
- }
- .remarkbottom{
- width: 100%;
- margin-top: 22px;
- button{
- width: 100px;
- height: 36px;
- font-size: 17px;
- }
- }
- }
+.remarkbox {
+ width: 100%;
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ .remarkhead {
+ width: 100%;
+ span {
+ font-size: 20px;
+ text-align: center;
+ width: 80px;
+ margin-left: 40%;
+ }
+ }
+ .remarktext {
+ width: 100%;
+ margin-top: 20px;
+ textarea {
+ width: 420px;
+ height: 110px;
+ outline: none;
+ }
+ }
+ .remarkbottom {
+ width: 100%;
+ margin-top: 22px;
+ button {
+ width: 100px;
+ height: 36px;
+ font-size: 17px;
+ }
+ }
+}
diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts
index a13eeda..5ba1b6a 100644
--- a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts
+++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts
@@ -9,7 +9,7 @@
import { Component, Inject, OnInit } 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'
declare var CryptoJS
import { DomSanitizer } from '@angular/platform-browser';
@@ -23,90 +23,69 @@ declare var echarts: any;
})
export class WaitExamineerComponent 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) {
+ }
+ preparelevels: any//编制级别下拉框
ngOnInit(): void {
- sessionStorage.setItem('gisplan','look')
+ sessionStorage.setItem('gisplan', 'look')
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" }
]
- //this.PlanLevel=0
}
- 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" }
]
- //this.PlanLevel=1
}
- if(level == "2"){//如果是大队
+ if (level == "2") {//如果是大队
this.preparelevels = [
- {name:"大队",value:"2"},
- {name:"中队",value:"3"}
+ { name: "大队", value: "2" },
+ { name: "中队", value: "3" }
]
- //this.PlanLevel=2
}
- if(level == "3"){//如果是中队
+ if (level == "3") {//如果是中队
this.preparelevels = [
- {name:"中队",value:"3"}
+ { name: "中队", value: "3" }
]
- //this.PlanLevel=3
}
- var scrollflaga = true;
- var win=document.getElementById('tbodydiv')
- /* window.setTimeout(()=>{
- var a = document.getElementById("table").offsetTop;
- window.onscroll=function(){
- if(scrollflaga){
- if(a>=win.scrollTop&&a<(win.scrollTop+win.offsetHeight)){
- scrollflaga=false
- this.getAlltabledate()
- }
- }
- }
- }) */
-
- this.getAlltabledate()
- this.iframeSrc=this.sanitizer.bypassSecurityTrustResourceUrl(this.src);
+ this.getAlltabledate()
+ // this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(this.src);
}
- planTypeIndex //平面图类型 是总平面图还是层平面图
- selectedIndexChange(e){
+ planTypeIndex //平面图类型 选择是总平面图还是层平面图
+ selectedIndexChange(e) {
this.selected.setValue(e)
- // console.log(6666,e)
- if(e == 1){
+ if (e == 1) {
this.planTypeIndex = 'zong'
- }else if(e == 2){
+ } else if (e == 2) {
this.planTypeIndex = 'ceng'
}
}
- ngOnDestroy () {
- /* this.indexbar.clear()
- this.indexbar.dispose() */
-
- }
- iframeSrc
- src=''
+ src: any //毕生word文档地址
+ iframeSrc: any //毕生word文档地址 ---> 主要转成frame安全链接
+
+
- preparelevels:any
selected = new FormControl(0); //选项卡 实例
- level=''//操作类型
+
+ level = ''//操作类型
js//组织机构
addtime//时间
projectlevel//预案级别
- previewshow=false//预览得分是否显示
+ previewshow = false//预览得分是否显示
tableDate
- isallDate=true//是否显示完成数据，默认显示
- companyBuiltInGrouping=["基本信息","四周毗邻","消防设施"]
+ isallDate = true//是否显示完成数据，默认显示
+ companyBuiltInGrouping = ["基本信息", "四周毗邻", "消防设施"]
indexbar //饼状图实例
indexzhu
PlanLevel//编制级别
@@ -114,9 +93,9 @@ export class WaitExamineerComponent implements OnInit {
checked//是否选中
chuorzhong//判断初审还是终审
radioid//选中的id
- shenheTable=[]//选中要审核的对象
- showtype=-1//0:word,1:全景图，2:二维三维，3:重点单位
- compantData={name:'',buildingTypes:[],address:''}
+ shenheTable = []//选中要审核的对象
+ showtype = -1//0:word,1:全景图，2:二维三维，3:重点单位
+ compantData = { name: '', buildingTypes: [], address: '' }
organizationName
planData
id
@@ -126,176 +105,211 @@ export class WaitExamineerComponent implements OnInit {
companyName
//获取表格数据
- getAlltabledate(){
- let paramsdata:any = {
- Operation:this.level||[],
- ContentType:Number(this.projectlevel)||[],
- Level:this.PlanLevel||[],
- verifyState:[0,3]
+ getAlltabledate() {
+ let paramsdata: any = {
+ Operation: this.level || [],
+ ContentType: Number(this.projectlevel) || [],
+ Level: this.PlanLevel || [],
+ verifyState: [0, 3]
}
- this.http.get("/api/ContentVerifies",{params:paramsdata}).subscribe((data:any)=>{
- this.tableDate=data.items
- this.count=data.totalCount
+ this.http.get("/api/ContentVerifies", { params: paramsdata }).subscribe((data: any) => {
+ this.tableDate = data.items
+ this.count = data.totalCount
})
}
//提交查询
- onSubmit(value){
+ onSubmit(value) {
this.getAlltabledate()
}
//刷新
- record(){
- this.level=''
- this.projectlevel=''
- this.PlanLevel=''
+ record() {
+ this.level = ''
+ this.projectlevel = ''
+ this.PlanLevel = ''
let level = sessionStorage.getItem("level");
this.getAlltabledate()
}
+
+
//radio点击事件
viewer//全景图对象
- waterData:any//需要传递给子组件的水源信息
- LinkageForceDetailInfo:any//需要传递给子组件的联动力量信息
- fireForceDetailInfo:any//需要传递给子组件的消防力量信息
- postlevel:any
- radioClick(e,item){
+ waterData: any//需要传递给子组件的水源信息
+ LinkageForceDetailInfo: any//需要传递给子组件的联动力量信息
+ fireForceDetailInfo: any//需要传递给子组件的消防力量信息
+ postlevel: any
+ selectedItem: any
+
+ differentContent: any//当前单位变更数据
+ differentContentOfUnitInfo: any//当前单位变更数据 之 单位信息
+ differentContentOfBuildingsInfo: any//当前单位变更数据 之 建筑信息
+ differentContentOfFunction: any = []//当前单位变更数据 之 功能分区
+ differentContentOfPicture: any//当前单位变更数据 之 实景图
+ radioClick(e, item) {
+ this.selectedItem = item
+ // console.log('当前选择的单位',this.selectedItem)
+ // console.log('当前选择的信息',JSON.parse(this.selectedItem.differentContent) )
+ let differentContent = JSON.parse(this.selectedItem.differentContent)
+ // 单位信息
+ this.differentContentOfUnitInfo = differentContent.filter(item => item.propertyName == 'basicInfo')
+
+ // 实景图
+ this.differentContentOfPicture = differentContent.filter(item => item.propertyName == 'realityImageGroups')
+ //建筑信息
+ this.differentContentOfBuildingsInfo = JSON.parse(JSON.stringify(differentContent.filter(item => item.propertyName == 'buildings')[0]))
+ this.differentContentOfBuildingsInfo.childrens.forEach(element => {
+ element.childrens = element.childrens.filter(item => item.isObj == false)
+ });
+
+ //功能分区
+ let differentContentOfFunction = JSON.parse(JSON.stringify(differentContent.filter(item => item.propertyName == 'buildings')[0]))
+ this.differentContentOfFunction = []
+ differentContentOfFunction.childrens.forEach(item => {
+ item.childrens.forEach(i => {
+ if (i.propertyName == "buildingFunctionalDivisions") {
+ i.propertyName = item.propertyName
+ this.differentContentOfFunction.push(i)
+ }
+ });
+ });
+ 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){
- window.setTimeout(()=>{
+ this.organizationName = ''
+ this.itemid = item.itemId
+ this.id = item.id
+ this.fetchUrl = ''
+ this.viewer = {}
+ if (item.contentType == 11) {
+ window.setTimeout(() => {
this.showtype = 3
- sessionStorage.setItem('companyId',item.itemId)
- },0)
- }else if(item.contentType == 12){
+ sessionStorage.setItem('companyId', item.itemId)
+ }, 0)
+ } else if (item.contentType == 12) {
//水源
- 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){
+ } else if (item.contentType == 13) {
//消防力量
- 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
}
- if(data.fireForceDetailInfo && data.fireForceDetailInfo.location){
+ if (data.fireForceDetailInfo && data.fireForceDetailInfo.location) {
this.fireForceDetailInfo = data.fireForceDetailInfo
this.showtype = 13
- }else if(!data.fireForceDetailInfo){
+ } else if (!data.fireForceDetailInfo) {
//提示 该提交内容为空，从未保存过，请驳回该审核
this.showtype = 666
} else {
- data.fireForceDetailInfo.location={x:null,y:null}
+ data.fireForceDetailInfo.location = { x: null, y: null }
this.fireForceDetailInfo = data.fireForceDetailInfo
this.showtype = 13
}
-
+
})
- }else if(item.contentType == 14){
+ } else if (item.contentType == 14) {
//联动力量
- 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.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.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(()=>{
+ 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
{
- filename=data.fileName
- let json={
- doc: {
- docId: docId,
- title: filename,
- //title: filename,
- fetchUrl: `http://${location.host}/api/Objects/PlanPlatform/`+this.fetchUrl
- },
- user: {
- uid: identityJsonparse.sub,
- nickName: identityJsonparse.name,
- avatar: "",
- privilege: [
- 'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT'
- ],
- },
- }
- 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:80/apps/editor/openPreview?data=${base64}`
- this.iframeSrc=this.sanitizer.bypassSecurityTrustResourceUrl(this.src);
- //window.open(`http://121.5.10.84:80/apps/editor/openPreview?data=${base64}`)
- })
+ let identityJsonparse = JSON.parse(identityJson)
+ let filename: string
+ this.http.get(`/api/ObjectMetadata/PlanPlatform/${this.fetchUrl}`).subscribe((data: any) => {
+ filename = data.fileName
+ let json = {
+ doc: {
+ docId: docId,
+ title: filename,
+ //title: filename,
+ fetchUrl: `http://${location.host}/api/Objects/PlanPlatform/` + this.fetchUrl
+ },
+ user: {
+ uid: identityJsonparse.sub,
+ nickName: identityJsonparse.name,
+ avatar: "",
+ privilege: [
+ 'FILE_READ', 'FILE_DOWNLOAD', 'FILE_PRINT'
+ ],
+ },
+ }
+ 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:80/apps/editor/openPreview?data=${base64}`
+ this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(this.src);
+ })
}
//查看按钮跳转
- lookNew(){
+ lookNew() {
window.open(this.src)
}
@@ -303,36 +317,36 @@ export class WaitExamineerComponent implements OnInit {
thirdPartyURL
planType
twoOrthree
- handleData () {
- this.compantData={name:'',buildingTypes:[],address:''}
+ handleData() {
+ this.compantData = { name: '', buildingTypes: [], address: '' }
this.planType = this.planData.planMode
let data = this.planData
- if(data.planType==1){
- this.twoOrthree=2
- }else if(data.planType==2){
- this.twoOrthree=3
+ if (data.planType == 1) {
+ this.twoOrthree = 2
+ } else if (data.planType == 2) {
+ this.twoOrthree = 3
}
- if (this.planData.planMode==0) { //预案planMode=0时, 查看word
+ if (this.planData.planMode == 0) { //预案planMode=0时, 查看word
//this.lookWord()
- } else if (this.planData.planMode==1) { //预案planMode=1时, 解析文档
+ } else if (this.planData.planMode == 1) { //预案planMode=1时, 解析文档
- } else if (this.planData.planMode==2) { //预案planMode=2时, 跳查看页面组件
- this.showtype=2
- this.http.get(`/api/Plans/${data.companyId}`).subscribe((data:any)=>{
- data && data.company? this.compantData = data.company : null
+ } else if (this.planData.planMode == 2) { //预案planMode=2时, 跳查看页面组件
+ this.showtype = 2
+ this.http.get(`/api/Plans/${data.companyId}`).subscribe((data: any) => {
+ data && data.company ? this.compantData = data.company : null
})
- sessionStorage.setItem("buildingTypeId", this.compantData.buildingTypes.length? this.compantData.buildingTypes[0].id: undefined);
- sessionStorage.setItem("companyId",this.companyId);
- sessionStorage.setItem("planId",this.itemid);
- sessionStorage.setItem("editable",'0');
- sessionStorage.setItem("planName",data.name)
+ sessionStorage.setItem("buildingTypeId", this.compantData.buildingTypes.length ? this.compantData.buildingTypes[0].id : undefined);
+ sessionStorage.setItem("companyId", this.companyId);
+ sessionStorage.setItem("planId", this.itemid);
+ sessionStorage.setItem("editable", '0');
+ sessionStorage.setItem("planName", data.name)
let companyId = sessionStorage.getItem("companyId")
- this.thirdPartyURL=this.sanitizer.bypassSecurityTrustResourceUrl(`/keyUnit/viewunitinfoplans?id=${companyId}`);
+ this.thirdPartyURL = this.sanitizer.bypassSecurityTrustResourceUrl(`/keyUnit/viewunitinfoplans?id=${companyId}`);
//window.open(`/keyUnit/viewunitinfoplan?id=${companyId}`)
- } else if (this.planData.planMode==3) { //预案planMode=3时, 第三方网址'
- this.showtype=2
- this.http.get(`/api/Plans/${data.companyId}`).subscribe((data:any)=>{
- data && data.company? this.compantData = data.company : null
+ } else if (this.planData.planMode == 3) { //预案planMode=3时, 第三方网址'
+ this.showtype = 2
+ this.http.get(`/api/Plans/${data.companyId}`).subscribe((data: any) => {
+ data && data.company ? this.compantData = data.company : null
})
//this.dialog.open(show3D,{width:'1350px',height:'700px',data:{url:data.url}}); //打开图片弹窗
this.thirdPartyURL = this.sanitizer.bypassSecurityTrustResourceUrl(data.url)
@@ -341,46 +355,51 @@ export class WaitExamineerComponent implements OnInit {
}
//打开三维预案弹窗
- oopen3Dshow(){
- this.dialog.open(show3D,{width:'1650px',height:'850px',data:{url:this.thirdPartyURL,twoOrthree:this.twoOrthree,radioid:this.radioid}});
+ oopen3Dshow() {
+ this.dialog.open(show3D, { width: '1650px', height: '850px', data: { url: this.thirdPartyURL, twoOrthree: this.twoOrthree, radioid: this.radioid } });
}
+
+
//变更数据和全部数据切换按钮
- buttonChange(){
- this.isallDate=!this.isallDate
- this.previewshow=false
+
+ buttonChange() {
+ this.isallDate = !this.isallDate
+ this.previewshow = false
}
+
+
//同意操作
- agree(){
- var agreeList=[]
- var companyAgreeList=[]
+ agree() {
+ var agreeList = []
+ var companyAgreeList = []
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
- if(this.shenheTable.length==0){
- this.snackBar.open('请勾选要审核的条目!','确定',config);
+ if (this.shenheTable.length == 0) {
+ this.snackBar.open('请勾选要审核的条目!', '确定', config);
}
- else{
- const dialogRef =this.dialog.open(remark,{width:'460px',height:'290px',data:{shenhedata:this.shenheTable,type:1,radioid:this.radioid}});
+ else {
+ const dialogRef = this.dialog.open(remark, { width: '460px', height: '290px', data: { shenhedata: this.shenheTable, type: 1, radioid: this.radioid } });
dialogRef.afterClosed().subscribe(result => {
this.shenheTable = []
this.showtype = -1
this.getAlltabledate()
});
}
-
+
}
//拒绝操作
- refuse(){
+ refuse() {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
var refuseList = []
- var companyrefuseList=[]
- if(this.shenheTable.length==0){
- this.snackBar.open('请选择要审核的预案!','确定',config);
+ var companyrefuseList = []
+ if (this.shenheTable.length == 0) {
+ this.snackBar.open('请选择要审核的预案!', '确定', config);
}
- else{
- const dialogRef =this.dialog.open(remark,{width:'460px',height:'290px',data:{shenhedata:this.shenheTable,type:2,radioid:this.radioid}});
+ else {
+ const dialogRef = this.dialog.open(remark, { width: '460px', height: '290px', data: { shenhedata: this.shenheTable, type: 2, radioid: this.radioid } });
dialogRef.afterClosed().subscribe(result => {
this.shenheTable = []
this.showtype = -1
@@ -391,139 +410,139 @@ export class WaitExamineerComponent implements OnInit {
}
//分数饼状图
- bar(){
+ bar() {
var ec = echarts as any;
- this.indexbar=ec.init(document.getElementById('indexbar'),'light');
+ this.indexbar = ec.init(document.getElementById('indexbar'), 'light');
var option = {
tooltip: {
- trigger: 'item',
- formatter: '{a}
{b}: {c} ({d}%)'
+ trigger: 'item',
+ formatter: '{a}
{b}: {c} ({d}%)'
},
title: {
text: '总分',
left: 'center',
- bottom:70,
- textStyle:{
- color:'#FFFFFF',
- fontSize:16
+ bottom: 70,
+ textStyle: {
+ color: '#FFFFFF',
+ fontSize: 16
}
- },
+ },
series: [
- {
- name: '分数',
- type: 'pie',
- radius: ['50%', '70%'],
- bottom:50,
- avoidLabelOverlap: false,
- label: {
- show: true,
- position: 'center',
- fontSize:16,
- color:'#FFFFFF'
- },
-
- labelLine: {
- show: false
- },
- data: [
- {value: 93, name: '93分', itemStyle:{color:'#2196F3'}},
- {value:7, itemStyle:{color:'#FFFFFF'}}
- ]
- }
+ {
+ name: '分数',
+ type: 'pie',
+ radius: ['50%', '70%'],
+ bottom: 50,
+ avoidLabelOverlap: false,
+ label: {
+ show: true,
+ position: 'center',
+ fontSize: 16,
+ color: '#FFFFFF'
+ },
+
+ labelLine: {
+ show: false
+ },
+ data: [
+ { value: 93, name: '93分', itemStyle: { color: '#2196F3' } },
+ { value: 7, itemStyle: { color: '#FFFFFF' } }
+ ]
+ }
]
- };
- this.indexbar.setOption(option);
+ };
+ this.indexbar.setOption(option);
}
//分数柱状图
- zhu(){
+ zhu() {
var ec = echarts as any;
- this.indexzhu=ec.init(document.getElementById('zhu'),'light');
- var option={
+ this.indexzhu = ec.init(document.getElementById('zhu'), 'light');
+ var option = {
grid: {
left: '3%',
right: '4%',
bottom: '3%',
containLabel: true
- },
- xAxis: {
+ },
+ xAxis: {
type: 'value',
- show:false,
- axisLine:{
- show:false
+ show: false,
+ axisLine: {
+ show: false
},
- splitLine:{
- show:false
+ splitLine: {
+ show: false
},
- axisTick:{
- show:false
+ axisTick: {
+ show: false
},
- },
- yAxis: {
+ },
+ yAxis: {
type: 'category',
- axisTick:{
- show:false
+ axisTick: {
+ show: false
},
- axisLine:{
- show:false
+ axisLine: {
+ show: false
},
- axisLabel:{
- color:"#FFFFFF",
- fontSize:16
+ axisLabel: {
+ color: "#FFFFFF",
+ fontSize: 16
},
- data: ['实战演练记录', '六熟悉记录', '上传CAD', '实景图', '功能分区', '重点单位', '消防设施','四周毗邻','基本信息']
- },
- series: [
+ data: ['实战演练记录', '六熟悉记录', '上传CAD', '实景图', '功能分区', '重点单位', '消防设施', '四周毗邻', '基本信息']
+ },
+ series: [
{
-
- type: 'bar',
- stack: '总量',
- showBackground: true,
- backgroundStyle: {
- color: '#FFFFFF'
- },
- label: {
- show: true,
- position: 'inside',
- fontSize:14,
- formatter: '{c}分'
- },
- data: [
- {value:18, itemStyle:{color:'#58D091'}},
- {value:16, itemStyle:{color:'#58D091'}},
- {value:19, itemStyle:{color:'#58D091'}},
- {value:16, itemStyle:{color:'#58D091'}},
- {value:16, itemStyle:{color:'#58D091'}},
- {value:13, itemStyle:{color:'#FFCC00'}},
- {value:6, itemStyle:{color:'#FF4D4D'}},
- {value:19, itemStyle:{color:'#58D091'}},
- {value:16, itemStyle:{color:'#58D091'}},
- ]
+
+ type: 'bar',
+ stack: '总量',
+ showBackground: true,
+ backgroundStyle: {
+ color: '#FFFFFF'
+ },
+ label: {
+ show: true,
+ position: 'inside',
+ fontSize: 14,
+ formatter: '{c}分'
+ },
+ data: [
+ { value: 18, itemStyle: { color: '#58D091' } },
+ { value: 16, itemStyle: { color: '#58D091' } },
+ { value: 19, itemStyle: { color: '#58D091' } },
+ { value: 16, itemStyle: { color: '#58D091' } },
+ { value: 16, itemStyle: { color: '#58D091' } },
+ { value: 13, itemStyle: { color: '#FFCC00' } },
+ { value: 6, itemStyle: { color: '#FF4D4D' } },
+ { value: 19, itemStyle: { color: '#58D091' } },
+ { value: 16, itemStyle: { color: '#58D091' } },
+ ]
},
{
-
- type: 'bar',
- stack: '总量',
- label: {
- show: false,
- position: 'insideRight'
- },
- data: [2, 4, 1, 4, 4, 7, 14,1,4],
- itemStyle:{
- color:"#FFFFFF",
- },
+
+ type: 'bar',
+ stack: '总量',
+ label: {
+ show: false,
+ position: 'insideRight'
+ },
+ data: [2, 4, 1, 4, 4, 7, 14, 1, 4],
+ itemStyle: {
+ color: "#FFFFFF",
+ },
},
-
- ]
+
+ ]
}
this.indexzhu.setOption(option);
}
- preview(){
- this.previewshow=!this.previewshow
- if(this.previewshow){
- window.setTimeout(()=>{
+ preview() {
+ this.previewshow = !this.previewshow
+ if (this.previewshow) {
+ window.setTimeout(() => {
this.bar()
this.zhu()
- },0)
+ }, 0)
}
}
@@ -535,10 +554,10 @@ export class WaitExamineerComponent implements OnInit {
templateUrl: './show3D.html',
styleUrls: ['./wait-examineer.component.scss']
})
-export class show3D{
- constructor(private sanitizer: DomSanitizer,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data,public dialog: MatDialog) {}
+export class show3D {
+ constructor(private sanitizer: DomSanitizer, public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data, public dialog: MatDialog) { }
ngOnInit(): void {
- this.threedUrl=this.sanitizer.bypassSecurityTrustResourceUrl(this.data.url.changingThisBreaksApplicationSecurity)
+ this.threedUrl = this.sanitizer.bypassSecurityTrustResourceUrl(this.data.url.changingThisBreaksApplicationSecurity)
}
threedUrl
}
@@ -549,211 +568,211 @@ export class show3D{
templateUrl: './remark.html',
styleUrls: ['./wait-examineer.component.scss']
})
-export class remark{
- constructor(private http:HttpClient,private sanitizer: DomSanitizer,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data,public dialog: MatDialog,public snackBar: MatSnackBar) {}
+export class remark {
+ constructor(private http: HttpClient, private sanitizer: DomSanitizer, public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data, public dialog: MatDialog, public snackBar: MatSnackBar) { }
ngOnInit(): void {
- this.shenheTable=this.data.shenhedata
- this.radioid=this.data.radioid
+ this.shenheTable = this.data.shenhedata
+ this.radioid = this.data.radioid
}
- companyrefuseList=[]
- refuseList=[]
- shenheTable=[]
- companyAgreeList=[]
- agreeList=[]
+ companyrefuseList = []
+ refuseList = []
+ shenheTable = []
+ companyAgreeList = []
+ agreeList = []
remark
radioid
//取消
- close(){
+ close() {
this.dialogRef.close()
}
//确定
- define(){
+ define() {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
- if(this.data.type==1){
+ if (this.data.type == 1) {
//同意操作
// console.log(this.shenheTable)
//单个审核
- if(this.shenheTable.length == 1){
- //重点单位审核
- if(this.shenheTable[0].contentType == 11){
- let body:any = {
- id:this.shenheTable[0].id,
- itemId:this.shenheTable[0].itemId,
- verifyState:4,
- contentType:11,
- remark:this.remark||'',
- title:this.shenheTable[0].title+'基本信息'
- }
- this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{
- this.snackBar.open('操作成功!','确定',config);
- this.dialogRef.close()
- //this.getAlltabledate()
- })
- }else if(this.shenheTable[0].contentType == 12 || this.shenheTable[0].contentType == 13 || this.shenheTable[0].contentType == 14){
- let body:any = {
- id:this.shenheTable[0].id,
- itemId:this.shenheTable[0].itemId,
- verifyState:4,
- contentType:this.shenheTable[0].contentType,
- remark:this.remark||'',
- title:this.shenheTable[0].title
- }
- this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{
- this.snackBar.open('操作成功!','确定',config);
- this.dialogRef.close()
- })
- }else{
- //预案审核
- if(this.shenheTable[0].verifyState==0){
- let body:any={
- auditStatus:16,
- auditOpinion:this.remark||''
+ if (this.shenheTable.length == 1) {
+ //重点单位审核
+ if (this.shenheTable[0].contentType == 11) {
+ let body: any = {
+ id: this.shenheTable[0].id,
+ itemId: this.shenheTable[0].itemId,
+ verifyState: 4,
+ contentType: 11,
+ remark: this.remark || '',
+ title: this.shenheTable[0].title + '基本信息'
}
- this.http.put(`/api/PlanAudits/${this.shenheTable[0].itemId}/First`,body).subscribe(data=>{
- this.snackBar.open('操作成功!','确定',config);
+ this.http.put(`/api/ContentVerifies`, body).subscribe(data => {
+ this.snackBar.open('操作成功!', '确定', config);
this.dialogRef.close()
//this.getAlltabledate()
})
- }else if(this.shenheTable[0].verifyState==3){
- let body:any={
- auditStatus:2,
- auditOpinion:this.remark||''
+ } else if (this.shenheTable[0].contentType == 12 || this.shenheTable[0].contentType == 13 || this.shenheTable[0].contentType == 14) {
+ let body: any = {
+ id: this.shenheTable[0].id,
+ itemId: this.shenheTable[0].itemId,
+ verifyState: 4,
+ contentType: this.shenheTable[0].contentType,
+ remark: this.remark || '',
+ title: this.shenheTable[0].title
}
- this.http.put(`/api/PlanAudits/${this.radioid}`,body).subscribe(data=>{
- this.snackBar.open('操作成功!','确定',config);
+ this.http.put(`/api/ContentVerifies`, body).subscribe(data => {
+ this.snackBar.open('操作成功!', '确定', config);
this.dialogRef.close()
- //this.getAlltabledate()
})
+ } else {
+ //预案审核
+ if (this.shenheTable[0].verifyState == 0) {
+ let body: any = {
+ auditStatus: 16,
+ auditOpinion: this.remark || ''
+ }
+ this.http.put(`/api/PlanAudits/${this.shenheTable[0].itemId}/First`, body).subscribe(data => {
+ this.snackBar.open('操作成功!', '确定', config);
+ this.dialogRef.close()
+ //this.getAlltabledate()
+ })
+ } else if (this.shenheTable[0].verifyState == 3) {
+ let body: any = {
+ auditStatus: 2,
+ auditOpinion: this.remark || ''
+ }
+ this.http.put(`/api/PlanAudits/${this.radioid}`, body).subscribe(data => {
+ this.snackBar.open('操作成功!', '确定', config);
+ this.dialogRef.close()
+ //this.getAlltabledate()
+ })
+ }
}
+ this.shenheTable = []
+
+
}
- this.shenheTable=[]
-
-
- }
- //批量审核
- else{
- if(this.shenheTable[0].contentType==11||this.shenheTable[0].contentType==12){ //批量审批水源和重点单位
- for(var i=0;i{
- this.snackBar.open('操作成功!','确定',config);
- this.dialogRef.close()
- })
- }else{ //批量审核预案
- for(var i=0;i {
+ this.snackBar.open('操作成功!', '确定', config);
+ this.dialogRef.close()
+ })
+ } else { //批量审核预案
+ for (var i = 0; i < this.shenheTable.length; i++) {
+ var cart = {
+ planComponentId: this.shenheTable[i].itemId,
+ auditStatus: this.shenheTable[i].verifyState == 3 ? 2 : 16,
+ auditOpinion: this.remark || ''
+ }
+ this.agreeList.push(cart)
}
- this.agreeList.push(cart)
+ this.http.put(`/api/PlanAudits/Batch`, this.agreeList).subscribe(data => {
+ this.snackBar.open('操作成功!', '确定', config);
+ this.dialogRef.close()
+ })
}
- this.http.put(`/api/PlanAudits/Batch`,this.agreeList).subscribe(data=>{
- this.snackBar.open('操作成功!','确定',config);
- this.dialogRef.close()
- })
+ this.shenheTable = []
}
- this.shenheTable=[]
- }
}
- else{
+ else {
//单个审核拒绝
- if(this.shenheTable.length==1){
- //重点单位审核拒绝
- if(this.shenheTable[0].contentType == 11){
- let body:any = {
- id:this.shenheTable[0].id,
- itemId:this.shenheTable[0].itemId,
- verifyState:5,
- contentType:11,
- remark:this.remark,
- title:this.shenheTable[0].title+'基本信息'
- }
- this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{
- this.snackBar.open('操作成功!','确定',config);
- this.dialogRef.close()
- //this.getAlltabledate()
- })
- }else if(this.shenheTable[0].contentType == 12 || this.shenheTable[0].contentType == 13 || this.shenheTable[0].contentType == 14){
- let body:any = {
- id:this.shenheTable[0].id,
- itemId:this.shenheTable[0].itemId,
- verifyState:5,
- contentType:this.shenheTable[0].contentType,
- remark:this.remark,
- title:this.shenheTable[0].title
- }
- this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{
- this.snackBar.open('操作成功!','确定',config);
- this.dialogRef.close()
- })
- }else{
- //预案审核拒绝
- if(this.shenheTable[0].verifyState==0){
- let refbody={
- auditOpinion:this.remark,
- auditStatus:32
+ if (this.shenheTable.length == 1) {
+ //重点单位审核拒绝
+ if (this.shenheTable[0].contentType == 11) {
+ let body: any = {
+ id: this.shenheTable[0].id,
+ itemId: this.shenheTable[0].itemId,
+ verifyState: 5,
+ contentType: 11,
+ remark: this.remark,
+ title: this.shenheTable[0].title + '基本信息'
}
- this.http.put(`/api/PlanAudits/${this.shenheTable[0].itemId}/First`,refbody).subscribe(data=>{
- this.snackBar.open('操作成功!','确定',config);
+ this.http.put(`/api/ContentVerifies`, body).subscribe(data => {
+ this.snackBar.open('操作成功!', '确定', config);
this.dialogRef.close()
+ //this.getAlltabledate()
})
- }else if(this.shenheTable[0].verifyState==3){
- let refbody={
- auditOpinion:this.remark,
- auditStatus:4
+ } else if (this.shenheTable[0].contentType == 12 || this.shenheTable[0].contentType == 13 || this.shenheTable[0].contentType == 14) {
+ let body: any = {
+ id: this.shenheTable[0].id,
+ itemId: this.shenheTable[0].itemId,
+ verifyState: 5,
+ contentType: this.shenheTable[0].contentType,
+ remark: this.remark,
+ title: this.shenheTable[0].title
}
- this.http.put(`/api/PlanAudits/${this.radioid}`,refbody).subscribe(data=>{
- this.snackBar.open('操作成功!','确定',config);
+ this.http.put(`/api/ContentVerifies`, body).subscribe(data => {
+ this.snackBar.open('操作成功!', '确定', config);
this.dialogRef.close()
})
+ } else {
+ //预案审核拒绝
+ if (this.shenheTable[0].verifyState == 0) {
+ let refbody = {
+ auditOpinion: this.remark,
+ auditStatus: 32
+ }
+ this.http.put(`/api/PlanAudits/${this.shenheTable[0].itemId}/First`, refbody).subscribe(data => {
+ this.snackBar.open('操作成功!', '确定', config);
+ this.dialogRef.close()
+ })
+ } else if (this.shenheTable[0].verifyState == 3) {
+ let refbody = {
+ auditOpinion: this.remark,
+ auditStatus: 4
+ }
+ this.http.put(`/api/PlanAudits/${this.radioid}`, refbody).subscribe(data => {
+ this.snackBar.open('操作成功!', '确定', config);
+ this.dialogRef.close()
+ })
+ }
}
+ this.shenheTable = []
+
}
- this.shenheTable=[]
-
- }
- //批量审核
- else{
- if(this.shenheTable[0].contentType==11||this.shenheTable[0].contentType==12){ //批量审批水源和重点单位
- for(var i=0;i{
- this.snackBar.open('操作成功!','确定',config);
- this.dialogRef.close()
- })
- }else{
- for(var i=0;i {
+ this.snackBar.open('操作成功!', '确定', config);
+ this.dialogRef.close()
+ })
+ } else {
+ for (var i = 0; i < this.shenheTable.length; i++) {
+ var carts = {
+ planComponentId: this.shenheTable[i].itemId,
+ auditStatus: this.shenheTable[i].verifyState == 3 ? 4 : 32,
+ auditOpinion: this.remark
+ }
+ this.refuseList.push(carts)
}
- this.refuseList.push(carts)
+ this.http.put(`/api/PlanAudits/Batch`, this.refuseList).subscribe(data => {
+ this.snackBar.open('操作成功!', '确定', config);
+ this.dialogRef.close()
+ })
}
- this.http.put(`/api/PlanAudits/Batch`,this.refuseList).subscribe(data=>{
- this.snackBar.open('操作成功!','确定',config);
- this.dialogRef.close()
- })
+ this.shenheTable = []
+
}
- this.shenheTable=[]
-
- }
}
}
}
\ No newline at end of file
diff --git a/src/app/plan-management/entry-plan/entry-plan.component.html b/src/app/plan-management/entry-plan/entry-plan.component.html
index ff40734..274a12b 100644
--- a/src/app/plan-management/entry-plan/entry-plan.component.html
+++ b/src/app/plan-management/entry-plan/entry-plan.component.html
@@ -160,9 +160,9 @@
- {{(element.company.companyIntegrityScore.basicInfoScore * 5).toFixed(1)}}分
+ {{(element.company.companyIntegrityScore.basicInfoScore * 5).toFixed(1)}}%