From aaf470cb14aee4f0e3a09d6d8f457b78e2ef788c Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Tue, 2 Mar 2021 11:20:43 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E5=AE=A1=E6=A0=B8=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=B0=B4=E6=BA=90=E5=AE=A1=E6=A0=B8=E7=9A=84=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../water-collection.component.html | 12 +++--- .../water-collection.component.ts | 4 +- .../wait-examineer.component.html | 24 +++++------ .../wait-examineer.component.ts | 19 +++++--- .../water-audit/water-audit.component.ts | 43 ++++++++++--------- 5 files changed, 56 insertions(+), 46 deletions(-) diff --git a/src/app/data-collection/water-collection/water-collection.component.html b/src/app/data-collection/water-collection/water-collection.component.html index dcf1d2b..2782ab8 100644 --- a/src/app/data-collection/water-collection/water-collection.component.html +++ b/src/app/data-collection/water-collection/water-collection.component.html @@ -79,13 +79,13 @@
- (待审核) - (审核通过) - (审核驳回) + (待审核) + (审核通过) + (审核驳回) - open_in_browser提交审核 - 撤销审核 - save保存 + open_in_browser提交审核 + 撤销审核 + save保存 close关闭
diff --git a/src/app/data-collection/water-collection/water-collection.component.ts b/src/app/data-collection/water-collection/water-collection.component.ts index 402fa6a..4f14906 100644 --- a/src/app/data-collection/water-collection/water-collection.component.ts +++ b/src/app/data-collection/water-collection/water-collection.component.ts @@ -441,11 +441,11 @@ export class WaterCollectionComponent implements OnInit { operation: this.waterData.verifyState == -1 ? 0 : 1,//操作方式 contentType: 12,//水源类型 itemId: this.waterData.id, - verifyState: 0, + verifyState: 3, } this.http.post('/api/ContentVerifies',body).subscribe((data) => { console.log('提交成功',data) - this.waterData.verifyState = 0 + this.waterData.verifyState = 3 }) } diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.html b/src/app/plan-audit/wait-examineer/wait-examineer.component.html index 4db6b3b..a8fd8c8 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html @@ -90,7 +90,7 @@
- + @@ -134,7 +134,7 @@
-
+
@@ -242,11 +242,11 @@
-
+
-
-
+
+
单位名称: {{compantData.name?compantData.name : '暂无数据'}} @@ -268,17 +268,17 @@
- +
+ +
- +
- +
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 951c367..80263a3 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts @@ -153,17 +153,27 @@ export class WaitExamineerComponent implements OnInit { } //radio点击事件 viewer//全景图对象 + waterData:any//需要传递给子组件的水源信息 radioClick(e,item){ - this.showtype=-1 + this.showtype = -1 //e.target.parentElement.bgColor='#2196F3' console.log(e,item) this.organizationName='' this.id=item.id this.fetchUrl='' this.viewer={} - if(item.contentType==11){ - this.showtype=3 + if(item.contentType == 11){ + this.showtype = 3 sessionStorage.setItem('companyId',item.itemId) + }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 @@ -200,7 +210,7 @@ export class WaitExamineerComponent implements OnInit { } - }) + }) } @@ -347,7 +357,6 @@ export class WaitExamineerComponent implements OnInit { }) } } - } //批量审核 else{ diff --git a/src/app/plan-audit/water-audit/water-audit.component.ts b/src/app/plan-audit/water-audit/water-audit.component.ts index ed885ad..3e51e5d 100644 --- a/src/app/plan-audit/water-audit/water-audit.component.ts +++ b/src/app/plan-audit/water-audit/water-audit.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; declare var AMap: any; @Component({ selector: 'app-water-audit', @@ -6,7 +6,7 @@ declare var AMap: any; styleUrls: ['./water-audit.component.scss'] }) export class WaterAuditComponent implements OnInit { - + @Input() public waterData: any;//data名字根据引用场景自定义 constructor() { } map:any newPositionMarker:any @@ -15,6 +15,7 @@ export class WaterAuditComponent implements OnInit { ' ' + '
' ngOnInit(): void { + console.log(7777,this.waterData) this.waterData.detailData = JSON.parse(this.waterData.detailData) this.fireCockData = this.waterData.detailData console.log(789, this.fireCockData) @@ -42,23 +43,23 @@ export class WaterAuditComponent implements OnInit { fireCockData:any = []//消火栓详情 poolData:any = []//水池详情 naturalWaterData:any = []//天然水源详情 - waterData:any = { - id: "60125d31d31fab7de81c56b0", - name: "上海中心消火栓01", - administrativeRegion: "上海区", - governmentLevel: "1", - village: "小高社区", - address: "国际会议中心", - location: { - x: 121.496717, - y: 31.239452 - }, - detailData: "[{\"PropertyName\":\"可用状态\",\"PropertyValue\":\"1\"},{\"PropertyName\":\"放置形式\",\"PropertyValue\":\"1\"},{\"PropertyName\":\"管网形式\",\"PropertyValue\":\"2\"},{\"PropertyName\":\"管网直径\",\"PropertyValue\":\"2\"},{\"PropertyName\":\"管网压力类型\",\"PropertyValue\":\"1\"},{\"PropertyName\":\"管网压力范围\",\"PropertyValue\":\"2222\"},{\"PropertyName\":\"接口形式\",\"PropertyValue\":\"1\"},{\"PropertyName\":\"接口口径\",\"PropertyValue\":\"3\"},{\"PropertyName\":\"最大流量\",\"PropertyValue\":\"333\"},{\"PropertyName\":\"供水单位\",\"PropertyValue\":\"剃剃头\"},{\"PropertyName\":\"联系方式\",\"PropertyValue\":\"119\"},{\"PropertyName\":\"备注\",\"PropertyValue\":\"突突突突突突\"}]", - detailItems: null, - createTime: "2021-02-03T02:36:57.451Z", - creatorId: "5e8eced2aaca5f7c1025309b", - deleted: false, - waterSourceType: 0, - integrityScore: 0.21052632 - } + // waterData:any = { + // id: "60125d31d31fab7de81c56b0", + // name: "上海中心消火栓01", + // administrativeRegion: "上海区", + // governmentLevel: "1", + // village: "小高社区", + // address: "国际会议中心", + // location: { + // x: 121.496717, + // y: 31.239452 + // }, + // detailData: "[{\"PropertyName\":\"可用状态\",\"PropertyValue\":\"1\"},{\"PropertyName\":\"放置形式\",\"PropertyValue\":\"1\"},{\"PropertyName\":\"管网形式\",\"PropertyValue\":\"2\"},{\"PropertyName\":\"管网直径\",\"PropertyValue\":\"2\"},{\"PropertyName\":\"管网压力类型\",\"PropertyValue\":\"1\"},{\"PropertyName\":\"管网压力范围\",\"PropertyValue\":\"2222\"},{\"PropertyName\":\"接口形式\",\"PropertyValue\":\"1\"},{\"PropertyName\":\"接口口径\",\"PropertyValue\":\"3\"},{\"PropertyName\":\"最大流量\",\"PropertyValue\":\"333\"},{\"PropertyName\":\"供水单位\",\"PropertyValue\":\"剃剃头\"},{\"PropertyName\":\"联系方式\",\"PropertyValue\":\"119\"},{\"PropertyName\":\"备注\",\"PropertyValue\":\"突突突突突突\"}]", + // detailItems: null, + // createTime: "2021-02-03T02:36:57.451Z", + // creatorId: "5e8eced2aaca5f7c1025309b", + // deleted: false, + // waterSourceType: 0, + // integrityScore: 0.21052632 + // } }