From ef955232c0964ff1e7b6f79d71334ac532950782 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Mon, 8 Mar 2021 15:02:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=B6=88=E9=98=B2=E5=8A=9B=E9=87=8F=E5=AE=A1=E6=A0=B8=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fire-force/fire-force.component.ts | 6 +-- .../linkage-forces.component.ts | 2 +- .../water-collection.component.ts | 1 + .../fireforce-audit.component.ts | 54 ++++++------------- .../wait-examineer.component.html | 2 +- .../wait-examineer.component.ts | 19 +++++-- 6 files changed, 35 insertions(+), 49 deletions(-) diff --git a/src/app/data-collection/fire-force/fire-force.component.ts b/src/app/data-collection/fire-force/fire-force.component.ts index 1b0db2b..2c5373a 100644 --- a/src/app/data-collection/fire-force/fire-force.component.ts +++ b/src/app/data-collection/fire-force/fire-force.component.ts @@ -6,7 +6,6 @@ import { Component, OnInit } from '@angular/core'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree'; -import { NzTreeNode } from 'ng-zorro-antd/tree'; import { TreeService } from 'src/app/http-interceptors/tree.service'; import Viewer from 'viewerjs' declare var CryptoJS @@ -45,8 +44,8 @@ export class FireForceComponent implements OnInit { {id:3,name:'中队(消防站)',isChecked:false}, {id:4,name:'其他消防队伍',isChecked:false} ] - //勾选力量类型checkbox在地图上显示marker - checkBoxChange(){ + //勾选力量类型checkbox在地图上显示marker + checkBoxChange(){ let Levels = [] this.checkBoxList.forEach(item =>{ if(item.isChecked){ @@ -559,6 +558,7 @@ export class FireForceComponent implements OnInit { // this.positionLngLat.x = 0 // this.positionLngLat.y = 0 // this.map.setCity('上海市'); + this.selectedFireForce.contentVerify = null this.clearData() } } diff --git a/src/app/data-collection/linkage-forces/linkage-forces.component.ts b/src/app/data-collection/linkage-forces/linkage-forces.component.ts index 8e2d53c..a536e34 100644 --- a/src/app/data-collection/linkage-forces/linkage-forces.component.ts +++ b/src/app/data-collection/linkage-forces/linkage-forces.component.ts @@ -401,7 +401,7 @@ export class LinkageForcesComponent implements OnInit { this.LinkageForceDetailInfo.linkageForceType = data this.newPositionMarker ? this.map.remove(this.newPositionMarker) : null this.map.setCity('上海市'); - + this.LinkageForceDetailInfo.contentVerify = null } } ) 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 c5cad6e..1a250d3 100644 --- a/src/app/data-collection/water-collection/water-collection.component.ts +++ b/src/app/data-collection/water-collection/water-collection.component.ts @@ -402,6 +402,7 @@ export class WaterCollectionComponent implements OnInit { this.positionLngLat.y = 0 this.map.setCity('上海市'); this.clearData() + this.waterData.contentVerify = null } } ); diff --git a/src/app/plan-audit/fireforce-audit/fireforce-audit.component.ts b/src/app/plan-audit/fireforce-audit/fireforce-audit.component.ts index f118381..fd531cc 100644 --- a/src/app/plan-audit/fireforce-audit/fireforce-audit.component.ts +++ b/src/app/plan-audit/fireforce-audit/fireforce-audit.component.ts @@ -1,5 +1,5 @@ import { HttpClient } from '@angular/common/http'; -import { Component, OnInit } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; import Viewer from 'viewerjs' @@ -12,36 +12,10 @@ declare var AMap: any; styleUrls: ['./fireforce-audit.component.scss'] }) export class FireforceAuditComponent implements OnInit { - + @Input() public FireForceDetailInfo: any;//data名字根据引用场景自定义 + @Input() public level: any;//data名字根据引用场景自定义 constructor(public snackBar: MatSnackBar,private http:HttpClient,public dialog: MatDialog) { } - selectedFireForceLevel:any = 0 - - FireForceDetailInfo:any = { - id: "600144ffe7036e11b8121684", - stationName: "上海总队", - isIndependentAlarm: true, - phoneNumber: "13864340193", - faxNumber: "120", - jurisdictionArea: 999, - remark: "暂无备注", - address: "齐鲁树谷", - location: { - x:0, - y:0 - }, - personCountData: "[{\"PropertyName\":\"现役官兵人数\",\"PropertyValue\":\"1\"},{\"PropertyName\":\"政府专职消防员数\",\"PropertyValue\":\"2\"},{\"PropertyName\":\"消防文员数\",\"PropertyValue\":\"3\"}]", - personCountItems: null, - contactData: "[{\"PropertyName\":\"总队长名称\",\"PropertyValue\":\"4\"},{\"PropertyName\":\"总队长联系方式\",\"PropertyValue\":\"5\"},{\"PropertyName\":\"总队政委名称\",\"PropertyValue\":\"6\"},{\"PropertyName\":\"总队政委联系方式\",\"PropertyValue\":\"7\"}]", - contactItems: null, - dutyForceData: null, - dutyForceItems: null, - relevantInfomationData: null, - integrityScore: 0, - integrityTotalCount: 0, - integrityNotEmptyCount: 0, - RelevantInfomationData:"[{\"objectName\":\"FireForce/1/601b69697cea2c03587c4c6d.png\",\"fileName\":\"楼层区域.png\",\"fileLength\":4079},{\"objectName\":\"FireForce/1/601b696e7cea2c03587c4c6e.mp4\",\"fileName\":\"李志 《天空之城》.mp4\",\"fileLength\":56362628},{\"objectName\":\"FireForce/1/601b69867cea2c03587c4c6f.docx\",\"fileName\":\"完整度规划20200724.docx\",\"fileLength\":16480}]" - } - + selectedFireForceLevel:any ZongpersonCountData ZongcontactData ZhicontactData @@ -51,15 +25,17 @@ export class FireforceAuditComponent implements OnInit { otherpersonCountData AttachmentArr ngOnInit(): void { - this.ZongpersonCountData = JSON.parse(this.FireForceDetailInfo.personCountData) - this.ZongcontactData = JSON.parse(this.FireForceDetailInfo.contactData) - this.ZhicontactData = JSON.parse(this.FireForceDetailInfo.contactData) - this.DaZhongpersonCountData = JSON.parse(this.FireForceDetailInfo.personCountData) - this.DaZhongcontactData = JSON.parse(this.FireForceDetailInfo.contactData) - this.othercontactData = JSON.parse(this.FireForceDetailInfo.contactData) - this.otherpersonCountData = JSON.parse(this.FireForceDetailInfo.personCountData) - this.AttachmentArr = JSON.parse(this.FireForceDetailInfo.RelevantInfomationData) - + // console.log(12345,this.FireForceDetailInfo) + this.selectedFireForceLevel = this.level + this.FireForceDetailInfo.personCountData ? this.ZongpersonCountData = JSON.parse(this.FireForceDetailInfo.personCountData): null + this.FireForceDetailInfo.contactData ? this.ZongcontactData = JSON.parse(this.FireForceDetailInfo.contactData): null + this.FireForceDetailInfo.contactData ? this.ZhicontactData = JSON.parse(this.FireForceDetailInfo.contactData): null + this.FireForceDetailInfo.personCountData ? this.DaZhongpersonCountData = JSON.parse(this.FireForceDetailInfo.personCountData): null + this.FireForceDetailInfo.contactData ? this.DaZhongcontactData = JSON.parse(this.FireForceDetailInfo.contactData): null + this.FireForceDetailInfo.contactData ? this.othercontactData = JSON.parse(this.FireForceDetailInfo.contactData): null + this.FireForceDetailInfo.personCountData ? this.otherpersonCountData = JSON.parse(this.FireForceDetailInfo.personCountData): null + this.FireForceDetailInfo.RelevantInfomationData ? this.AttachmentArr = JSON.parse(this.FireForceDetailInfo.RelevantInfomationData) : null + console.log(789,this.ZongcontactData) setTimeout(() => { this.map = new AMap.Map('container', { zoom:18 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 4c17a2c..a627a7c 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html @@ -274,7 +274,7 @@
- +
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 eb986b5..9f6da9a 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts @@ -155,9 +155,10 @@ export class WaitExamineerComponent implements OnInit { viewer//全景图对象 waterData:any//需要传递给子组件的水源信息 LinkageForceDetailInfo:any//需要传递给子组件的联动力量信息 + fireForceDetailInfo:any//需要传递给子组件的消防力量信息 + postlevel:any radioClick(e,item){ this.showtype = -1 - console.log(item) this.organizationName='' this.id=item.id this.fetchUrl='' @@ -170,19 +171,26 @@ export class WaitExamineerComponent implements OnInit { }else if(item.contentType == 12){ //水源 this.http.get(`/api/WaterSources/${item.itemId}`).subscribe((data)=>{ - console.log('水源',data) this.waterData = data this.showtype = 12 }) }else if(item.contentType == 13){ //消防力量 - this.http.get(`/api/LinkageForces/${item.itemId}`).subscribe((data)=>{ - console.log('消防力量',data) + this.http.get(`/api/CustomFireForce/${item.itemId}`).subscribe((data:any)=>{ + if(data.forceType != 0){//如果是其他消防力量 + this.postlevel = 4 + }else{ + this.postlevel = data.level + } + console.log('xxx',this.postlevel) + data.fireForceDetailInfo.location ? null : data.fireForceDetailInfo.location={x:null,y:null} + this.fireForceDetailInfo = data.fireForceDetailInfo + this.showtype = 13 }) }else if(item.contentType == 14){ //联动力量 this.http.get(`/api/LinkageForces/${item.itemId}`).subscribe((data:any)=>{ - console.log('联动力量',data) + data.location ? null : data.location={x:null,y:null} this.LinkageForceDetailInfo = data this.showtype = 14 @@ -360,6 +368,7 @@ export class WaitExamineerComponent implements OnInit { this.getAlltabledate() }) }else if(this.shenheTable[0].contentType == 12 || this.shenheTable[0].contentType == 13 || this.shenheTable[0].contentType == 14){ + console.log(1111,this.shenheTable[0]) let body:any = { id:this.shenheTable[0].id, itemId:this.shenheTable[0].itemId, From 2c1aeee4df81271e5fc65445d2248ca05d4c31ee Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Mon, 8 Mar 2021 16:11:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=B4=A0=E6=9D=90=E5=BA=93=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collection-tools.component.html | 46 ++++++++++++------- .../collection-tools.component.ts | 19 +++++++- .../ui/collection-tools-building/panel.scss | 12 +++++ .../collection-tools.component.html | 43 ++++++++++------- .../collection-tools.component.ts | 17 +++++++ src/app/ui/collection-tools-plan/panel.scss | 12 +++++ .../collection-tools.component.html | 44 +++++++++++------- .../collection-tools.component.ts | 17 +++++++ src/app/ui/collection-tools/panel.scss | 12 +++++ 9 files changed, 172 insertions(+), 50 deletions(-) diff --git a/src/app/ui/collection-tools-building/collection-tools.component.html b/src/app/ui/collection-tools-building/collection-tools.component.html index d253c0f..b79704f 100644 --- a/src/app/ui/collection-tools-building/collection-tools.component.html +++ b/src/app/ui/collection-tools-building/collection-tools.component.html @@ -61,7 +61,7 @@
-
+
@@ -125,23 +125,35 @@
- - - - - - -
-
- -

{{items.name}}

-
+
+ +
+
+ +

{{items.name}}

- - - +
+
+ + + + + + + +
+
+ +

{{items.name}}

+
+
+ + + +
diff --git a/src/app/ui/collection-tools-building/collection-tools.component.ts b/src/app/ui/collection-tools-building/collection-tools.component.ts index fe08f8b..8339bb4 100644 --- a/src/app/ui/collection-tools-building/collection-tools.component.ts +++ b/src/app/ui/collection-tools-building/collection-tools.component.ts @@ -692,7 +692,7 @@ export class CollectionToolsBuildingComponent implements OnInit { let that = this window.setTimeout(()=>{ - document.getElementById("functionalDomainContent").oncontextmenu = function (event) { + document.getElementById("functionalDomainContentTwo").oncontextmenu = function (event) { // that.canvas.cancelPaint() that.selectImageIndex = -1 event.preventDefault(); @@ -2039,6 +2039,23 @@ export class CollectionToolsBuildingComponent implements OnInit { selectLibrary:any; //选中的素材库 selectImage:any; //选中的素材库图片 selectImageIndex:number; //选中的素材库图片index + searchSettimeout:any; //延时器 + searchInput:string = null; //模糊搜索 input + searchLibrary:any = []; //模糊搜索 素材 + + //输入框 输入事件 + libraryChange () { + window.clearTimeout(this.searchSettimeout) + this.searchSettimeout = window.setTimeout(()=>{ + if (this.searchInput === "") { + this.searchLibrary = [] + } else { + this.http.get(`/api/Assets?assetName=${this.searchInput}`).subscribe((data:any)=>{ + this.searchLibrary = data + }) + } + },500) + } //获取素材库 getAllLibrary (type:string='input') { diff --git a/src/app/ui/collection-tools-building/panel.scss b/src/app/ui/collection-tools-building/panel.scss index fe2f0b7..2b1fed4 100644 --- a/src/app/ui/collection-tools-building/panel.scss +++ b/src/app/ui/collection-tools-building/panel.scss @@ -212,6 +212,18 @@ box-sizing: border-box; margin-left: 10px; } +//模糊搜索 input +.searchLibrary { + display: block; + border: 1px solid rgb(219, 212, 212); + border-radius: 5px; + outline: none; + box-sizing: border-box; + margin: 5px auto; + padding-left: 5px; + width: 95%; + height: 30px; +} .panelLibraryFlex { display: flex; flex-direction: row; diff --git a/src/app/ui/collection-tools-plan/collection-tools.component.html b/src/app/ui/collection-tools-plan/collection-tools.component.html index 0fdc889..9cc69c0 100644 --- a/src/app/ui/collection-tools-plan/collection-tools.component.html +++ b/src/app/ui/collection-tools-plan/collection-tools.component.html @@ -103,23 +103,34 @@
- - - - - - -
-
- -

{{items.name}}

-
+
+ +
+
+ +

{{items.name}}

- - - +
+
+ + + + + + + +
+
+ +

{{items.name}}

+
+
+ + + +
diff --git a/src/app/ui/collection-tools-plan/collection-tools.component.ts b/src/app/ui/collection-tools-plan/collection-tools.component.ts index 5bd8a51..79f35e0 100644 --- a/src/app/ui/collection-tools-plan/collection-tools.component.ts +++ b/src/app/ui/collection-tools-plan/collection-tools.component.ts @@ -2043,6 +2043,23 @@ export class CollectionToolsPlanComponent implements OnInit { selectLibrary:any; //选中的素材库 selectImage:any; //选中的素材库图片 selectImageIndex:number; //选中的素材库图片index + searchSettimeout:any; //延时器 + searchInput:string = null; //模糊搜索 input + searchLibrary:any = []; //模糊搜索 素材 + + //输入框 输入事件 + libraryChange () { + window.clearTimeout(this.searchSettimeout) + this.searchSettimeout = window.setTimeout(()=>{ + if (this.searchInput === "") { + this.searchLibrary = [] + } else { + this.http.get(`/api/Assets?assetName=${this.searchInput}`).subscribe((data:any)=>{ + this.searchLibrary = data + }) + } + },500) + } //获取素材库 getAllLibrary (type:string='input') { diff --git a/src/app/ui/collection-tools-plan/panel.scss b/src/app/ui/collection-tools-plan/panel.scss index 822d0e6..09b8ceb 100644 --- a/src/app/ui/collection-tools-plan/panel.scss +++ b/src/app/ui/collection-tools-plan/panel.scss @@ -212,6 +212,18 @@ box-sizing: border-box; margin-left: 10px; } +//模糊搜索 input +.searchLibrary { + display: block; + border: 1px solid rgb(219, 212, 212); + border-radius: 5px; + outline: none; + box-sizing: border-box; + margin: 5px auto; + padding-left: 5px; + width: 95%; + height: 30px; +} .panelLibraryFlex { display: flex; flex-direction: row; diff --git a/src/app/ui/collection-tools/collection-tools.component.html b/src/app/ui/collection-tools/collection-tools.component.html index 921ba69..21f7a4b 100644 --- a/src/app/ui/collection-tools/collection-tools.component.html +++ b/src/app/ui/collection-tools/collection-tools.component.html @@ -202,23 +202,35 @@
- - - - - - -
-
- -

{{items.name}}

-
+
+ +
+
+ +

{{items.name}}

- - - +
+
+ + + + + + + +
+
+ +

{{items.name}}

+
+
+ + + +
diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts index 4c19b08..9502f08 100644 --- a/src/app/ui/collection-tools/collection-tools.component.ts +++ b/src/app/ui/collection-tools/collection-tools.component.ts @@ -2092,6 +2092,23 @@ export class CollectionToolsComponent implements OnInit { selectLibrary:any; //选中的素材库 selectImage:any; //选中的素材库图片 selectImageIndex:number; //选中的素材库图片index + searchSettimeout:any; //延时器 + searchInput:string = null; //模糊搜索 input + searchLibrary:any = []; //模糊搜索 素材 + + //输入框 输入事件 + libraryChange () { + window.clearTimeout(this.searchSettimeout) + this.searchSettimeout = window.setTimeout(()=>{ + if (this.searchInput === "") { + this.searchLibrary = [] + } else { + this.http.get(`/api/Assets?assetName=${this.searchInput}`).subscribe((data:any)=>{ + this.searchLibrary = data + }) + } + },500) + } //获取素材库 getAllLibrary (type:string='input') { diff --git a/src/app/ui/collection-tools/panel.scss b/src/app/ui/collection-tools/panel.scss index dc0e63c..666a2ad 100644 --- a/src/app/ui/collection-tools/panel.scss +++ b/src/app/ui/collection-tools/panel.scss @@ -209,6 +209,18 @@ box-sizing: border-box; margin-left: 10px; } +//模糊搜索 input +.searchLibrary { + display: block; + border: 1px solid rgb(219, 212, 212); + border-radius: 5px; + outline: none; + box-sizing: border-box; + margin: 5px auto; + padding-left: 5px; + width: 95%; + height: 30px; +} .panelLibraryFlex { display: flex; flex-direction: row;