From bdc4b6ced98bd15afe597379a2d003c6251cd75c Mon Sep 17 00:00:00 2001 From: Sjh <55341701@qq.com> Date: Thu, 28 Sep 2023 16:07:30 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 28 +- proxy.config.json | 2 +- .../basicinfo-look/basicinfo.component.html | 4 +- .../basicinfo/basicinfo.component.html | 4 +- .../edit-plan-info.component.html | 23 +- .../createunit.component.html | 8 +- .../key-unit-management.component.html | 271 ++---------------- .../key-unit-management.component.scss | 2 +- .../key-unit-management.component.ts | 93 ++---- .../view-unit-details-plan.component.html | 8 +- .../view-unit-details.component.html | 8 +- .../detachment-level.component.html | 4 +- .../plan-audit/plan-audit.component.html | 4 +- .../plan-pass/plan-pass.component.html | 2 +- .../plan-record/plan-record.component.html | 2 +- .../wait-examineer.component.html | 2 +- .../entry-plan-look.component.html | 2 +- .../entry-plan/entry-plan.component.html | 229 +-------------- .../entry-plan/entry-plan.component.ts | 3 - .../maintain-up/maintain-up.component.html | 6 +- .../pass-plan/pass-plan.component.html | 4 +- .../plan-deduction.component.html | 2 +- .../reinforce-plan.component.html | 4 +- .../add-unit-one/add-unit-one.component.ts | 18 +- .../add-unit-two-type-statistics.component.ts | 24 +- .../combined-query.component.html | 6 +- .../combined-query.component.ts | 8 +- .../compang-info/compang-info.component.html | 2 +- .../home/home.component.html | 63 +--- .../home/home.component.scss | 42 +-- .../statistic-analysis/home/home.component.ts | 45 ++- .../plan-analysis-by-synthesis.component.html | 2 +- src/app/tabbar/tabbar.component.html | 210 +------------- .../addunitinfo.component.html | 2 +- src/assets/css/newStyle.css | 2 +- yarn.lock | 16 +- 36 files changed, 210 insertions(+), 945 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0c633da..9bc51c4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8464,11 +8464,11 @@ } }, "node_modules/echarts": { - "version": "4.1.0", - "resolved": "https://registry.npmmirror.com/echarts/-/echarts-4.1.0.tgz", - "integrity": "sha512-gP1e1fNnAj9KJpTDLXV21brklbfJlqeINmpQDJCDta9TX3cPoqyQOiDVcEPzbOVHqgBRgTOwNxC5iGwJ89014A==", + "version": "4.9.0", + "resolved": "https://registry.npmmirror.com/echarts/-/echarts-4.9.0.tgz", + "integrity": "sha512-+ugizgtJ+KmsJyyDPxaw2Br5FqzuBnyOWwcxPKO6y0gc5caYcfnEUIlNStx02necw8jmKmTafmpHhGo4XDtEIA==", "dependencies": { - "zrender": "4.0.4" + "zrender": "4.3.2" } }, "node_modules/ee-first": { @@ -19244,9 +19244,9 @@ "integrity": "sha1-Z8oISzEW/DP8QENeDV6kCiB+OS4=" }, "node_modules/zrender": { - "version": "4.0.4", - "resolved": "https://registry.npmmirror.com/zrender/-/zrender-4.0.4.tgz", - "integrity": "sha512-03Vd/BDl/cPXp8E61f5+Xbgr/a4vDyFA+uUtUc1s+5KgcPbyY2m+78R/9LQwkR6QwFYHG8qk25Q8ESGs/qpkZw==" + "version": "4.3.2", + "resolved": "https://registry.npmmirror.com/zrender/-/zrender-4.3.2.tgz", + "integrity": "sha512-bIusJLS8c4DkIcdiK+s13HiQ/zjQQVgpNohtd8d94Y2DnJqgM1yjh/jpDb8DoL6hd7r8Awagw8e3qK/oLaWr3g==" } }, "dependencies": { @@ -26715,11 +26715,11 @@ } }, "echarts": { - "version": "4.1.0", - "resolved": "https://registry.npmmirror.com/echarts/-/echarts-4.1.0.tgz", - "integrity": "sha512-gP1e1fNnAj9KJpTDLXV21brklbfJlqeINmpQDJCDta9TX3cPoqyQOiDVcEPzbOVHqgBRgTOwNxC5iGwJ89014A==", + "version": "4.9.0", + "resolved": "https://registry.npmmirror.com/echarts/-/echarts-4.9.0.tgz", + "integrity": "sha512-+ugizgtJ+KmsJyyDPxaw2Br5FqzuBnyOWwcxPKO6y0gc5caYcfnEUIlNStx02necw8jmKmTafmpHhGo4XDtEIA==", "requires": { - "zrender": "4.0.4" + "zrender": "4.3.2" } }, "ee-first": { @@ -35780,9 +35780,9 @@ "integrity": "sha1-Z8oISzEW/DP8QENeDV6kCiB+OS4=" }, "zrender": { - "version": "4.0.4", - "resolved": "https://registry.npmmirror.com/zrender/-/zrender-4.0.4.tgz", - "integrity": "sha512-03Vd/BDl/cPXp8E61f5+Xbgr/a4vDyFA+uUtUc1s+5KgcPbyY2m+78R/9LQwkR6QwFYHG8qk25Q8ESGs/qpkZw==" + "version": "4.3.2", + "resolved": "https://registry.npmmirror.com/zrender/-/zrender-4.3.2.tgz", + "integrity": "sha512-bIusJLS8c4DkIcdiK+s13HiQ/zjQQVgpNohtd8d94Y2DnJqgM1yjh/jpDb8DoL6hd7r8Awagw8e3qK/oLaWr3g==" } } } diff --git a/proxy.config.json b/proxy.config.json index cd21ac5..aea7da2 100644 --- a/proxy.config.json +++ b/proxy.config.json @@ -1,6 +1,6 @@ { "/api": { - "target": "http://192.168.1.51:8201/", + "target": "http://111.33.20.154:8201/", "secure": false, "changeOrigin": true } diff --git a/src/app/key-unit/basicinfo-look/basicinfo.component.html b/src/app/key-unit/basicinfo-look/basicinfo.component.html index 4406039..648069d 100644 --- a/src/app/key-unit/basicinfo-look/basicinfo.component.html +++ b/src/app/key-unit/basicinfo-look/basicinfo.component.html @@ -12,7 +12,7 @@
-
+
* 单位类型： diff --git a/src/app/key-unit/basicinfo/basicinfo.component.html b/src/app/key-unit/basicinfo/basicinfo.component.html index d32a479..0c66a3b 100644 --- a/src/app/key-unit/basicinfo/basicinfo.component.html +++ b/src/app/key-unit/basicinfo/basicinfo.component.html @@ -13,7 +13,7 @@
-
+
* 单位类型： diff --git a/src/app/key-unit/edit-plan-info/edit-plan-info.component.html b/src/app/key-unit/edit-plan-info/edit-plan-info.component.html index 49eecf9..7b83845 100644 --- a/src/app/key-unit/edit-plan-info/edit-plan-info.component.html +++ b/src/app/key-unit/edit-plan-info/edit-plan-info.component.html @@ -1,4 +1,4 @@ -
+ @@ -45,16 +45,6 @@ - @@ -65,14 +55,9 @@ - + + --> \ No newline at end of file diff --git a/src/app/key-unit/key-unit-management/createunit.component.html b/src/app/key-unit/key-unit-management/createunit.component.html index 0e4aa3f..c2ce360 100644 --- a/src/app/key-unit/key-unit-management/createunit.component.html +++ b/src/app/key-unit/key-unit-management/createunit.component.html @@ -8,11 +8,11 @@ ngModel #name="ngModel" placeholder="请输入单位名称"> - + @@ -24,7 +24,7 @@ + [(ngModel)]="js" placeholder="所属消防救援支队" readonly> @@ -38,7 +38,7 @@
- 请选择所属消防救援站 + 请选择所属消防救援支队 diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.html b/src/app/key-unit/key-unit-management/key-unit-management.component.html index f8ed90c..09ad650 100644 --- a/src/app/key-unit/key-unit-management/key-unit-management.component.html +++ b/src/app/key-unit/key-unit-management/key-unit-management.component.html @@ -10,31 +10,6 @@
- - - - - 更多筛选条件 - 收起 -
- -
- - -
-
- - - - 一般单位 - 重点单位 - - - -
-
@@ -43,23 +18,12 @@ - 更多筛选条件 - 收起
-
- - -
- -
- +
+ - + 包含下级 @@ -88,38 +52,9 @@
-
- - - - 从高到低 - 从低到高 - - -
-
- - - - - arrow forward - 🠊 - - - -
-
- - - - +
+ +
@@ -149,20 +84,18 @@ - star - - + 单位名称 @@ -170,154 +103,12 @@ create - - - 信息完整度 - -
- - {{(element.companyIntegrityScore.totalScore.toFixed(2) * 100).toFixed()}}% - -
-
-
-
- 分类名称 - 占比 - 总占比 -
-
-
    -
  • -
    单位信息
    -
    -
    -
    -
    -
    - {{(element.companyIntegrityScore.basicInfoScore * - 5).toFixed(1)}}% -
    -
    5%
    -
    • -
  • -
    建筑信息
    -
    -
    -
    -
    -
    - {{(element.companyIntegrityScore.buildingInfoScore * - 10).toFixed(1)}}% -
    -
    10%
    -
    • -
  • -
    平面图
    -
    -
    -
    -
    -
    - {{(element.companyIntegrityScore.planImageScore * - 10).toFixed(1)}}% -
    -
    10%
    -
    • -
  • -
    四周毗邻
    -
    -
    -
    -
    -
    - {{(element.companyIntegrityScore.adjoinScore * - 10).toFixed(1)}}% -
    -
    10%
    -
    • -
  • -
    消防设施
    -
    -
    -
    -
    -
    - {{(element.companyIntegrityScore.facilityScore * - 25).toFixed(1)}}% -
    -
    25%
    -
    • -
  • -
    重点部位
    -
    -
    -
    -
    -
    - {{(element.companyIntegrityScore.importantLocationScore * - 10).toFixed(1)}}% -
    -
    10%
    -
    • -
  • -
    功能分区
    -
    -
    -
    -
    -
    - {{(element.companyIntegrityScore.functionalDivisionScore * - 10).toFixed(1)}}% -
    -
    10%
    -
    • -
  • -
    实景图
    -
    -
    -
    -
    -
    - {{(element.companyIntegrityScore.realityImageScore * - 10).toFixed(1)}}% -
    -
    10%
    -
    • -
  • -
    CAD上传
    -
    -
    -
    -
    -
    - {{(element.companyIntegrityScore.cadScore * - 10).toFixed(1)}}% -
    -
    10%
    -
    • -
-
-
- 仅供参考 -
-
-
- + + 单位地址 + {{element.address}} - - 消防救援站 + 所属消防救援支队 {{element.organizationName}} @@ -326,44 +117,14 @@ {{element.buildingTypes.length != 0 ? element.buildingTypes[0].name : ''}} - - 统一社会信用代码 - {{element.usci}} - - - 修改时间 - - {{element.modifiedTime|date:'yyyy-MM-dd'}} - - - - 新增审核 - - {{element.newVerifyState}} - - - - - 维护审核 - - {{element.maintenanceVerifyState}} - + + 联系电话 + {{element.phone}} 操作 - 查看详情 - 提交审核 - 撤销审核 - 审批结果 - 重点单位 - 一般单位 diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.scss b/src/app/key-unit/key-unit-management/key-unit-management.component.scss index 933eb9d..ac36105 100644 --- a/src/app/key-unit/key-unit-management/key-unit-management.component.scss +++ b/src/app/key-unit/key-unit-management/key-unit-management.component.scss @@ -150,7 +150,7 @@ .treebox{ float: left; width: 325px; - height: 350px; + height: 310px; overflow: auto; .organizationlist{ list-style: none diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.ts b/src/app/key-unit/key-unit-management/key-unit-management.component.ts index 050b9a6..850f4d7 100644 --- a/src/app/key-unit/key-unit-management/key-unit-management.component.ts +++ b/src/app/key-unit/key-unit-management/key-unit-management.component.ts @@ -93,15 +93,11 @@ export class KeyUnitManagementComponent implements OnInit { displayedColumns: string[] = [ "checked", "Follow", - "state", "unitname", - "integrity", + "address", "jurisdictionsquadron", "unittype", - "scc", - "time", - "addstate", - "weihustate", + "phone", "operation", ]; tabledataSource: any; @@ -476,14 +472,10 @@ export class KeyUnitManagementComponent implements OnInit { console.log(data); this.length = data.totalCount; this.allKeyUnitInfo = data; - // data.items.sort( (a,b) => { - // return a.usci - b.usci - // }) data.items.forEach((item, index) => { item.integrity = this.wanzhengduArr[index]; }); - //console.log(789,data.items) - this.tabledataSource = data.items; + this.tabledataSource = [...data.items]; }); } //得到当前单位信息 @@ -647,14 +639,12 @@ export class KeyUnitManagementComponent implements OnInit { //删除单位信息 deleteAudia = []; //批量删除提交数组 deleteunit() { - this.deleteAudia = []; - const config = new MatSnackBarConfig(); - config.verticalPosition = "top"; - config.duration = 3000; - //console.log(this.deleteAll) - if (this.verifyState == 0 || this.verifyState == 3) { - this.snackBar.open("审核中，不能删除", "确定", config); - } else { + var result = confirm("确认要执删除选中单位吗？"); + if (result) { + this.deleteAudia = []; + const config = new MatSnackBarConfig(); + config.verticalPosition = "top"; + config.duration = 3000; let selectedunitArr = []; this.allKeyUnitInfo.items.forEach((item) => { if (item.checked) { @@ -664,61 +654,20 @@ export class KeyUnitManagementComponent implements OnInit { if (selectedunitArr.length == 0) { this.snackBar.open("请先选择要删除的单位", "确定", config); + return; } - /* if(selectedunitArr.length != 1 && selectedunitArr.length != 0){ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('只能选择一个单位删除','确定',config); - } */ - if (this.deleteAll.length == 1) { - //带着id跳到删除页面 - let isTrue = confirm("重点单位删除需审核员审核，审核通过方可删除"); - if (isTrue) { - let body: any = { - title: this.deleteAll[0].name, - Operation: 2, - itemId: this.deleteAll[0].id, - verifyState: 3, - contentType: 11, - }; - this.http.post(`/api/ContentVerifies`, body).subscribe( - (data) => { - this.snackBar.open("操作成功", "确定", config); - this.getAllKeyUnit(); - }, - (err) => { - this.snackBar.open(err, "确定", config); - } - ); - } - } else if (this.deleteAll.length > 1) { - let isTrue = confirm("重点单位删除需审核员审核，审核通过方可删除"); - if (isTrue) { - for (var i = 0; i < this.deleteAll.length; i++) { - let body: any = { - title: this.deleteAll[i].name, - Operation: 2, - itemId: this.deleteAll[i].id, - verifyState: 3, - contentType: 11, - }; - this.deleteAudia.push(body); - } + console.log("删除的单位列表", selectedunitArr); - this.http - .post(`/api/ContentVerifies/Batch`, this.deleteAudia) - .subscribe( - (data) => { - this.snackBar.open("操作成功", "确定", config); - this.getAllKeyUnit(); - this.deleteAll = []; - }, - (err) => { - this.snackBar.open(err, "确定", config); - } - ); - } + let num = 0; + for (let index = 0; index < selectedunitArr.length; index++) { + const element = selectedunitArr[index]; + this.http.delete(`/api/Companies/${element}`).subscribe((data) => { + num++; + if (num === selectedunitArr.length) { + this.snackBar.open("删除成功", "确定", config); + this.getAllKeyUnit(); + } + }); } } } diff --git a/src/app/key-unit/view-unit-details-plan/view-unit-details-plan.component.html b/src/app/key-unit/view-unit-details-plan/view-unit-details-plan.component.html index e1cf0d4..b1966f0 100644 --- a/src/app/key-unit/view-unit-details-plan/view-unit-details-plan.component.html +++ b/src/app/key-unit/view-unit-details-plan/view-unit-details-plan.component.html @@ -1,4 +1,4 @@ - + @@ -44,12 +44,12 @@ - + + diff --git a/src/app/key-unit/view-unit-details/view-unit-details.component.html b/src/app/key-unit/view-unit-details/view-unit-details.component.html index 5e87bd8..22fb35c 100644 --- a/src/app/key-unit/view-unit-details/view-unit-details.component.html +++ b/src/app/key-unit/view-unit-details/view-unit-details.component.html @@ -1,4 +1,4 @@ -
+ @@ -64,11 +64,11 @@ - + -
+
@@ -122,16 +94,7 @@
-
- - - - 从高到低 - 从低到高 - - -
-
+
@@ -140,7 +103,7 @@
-
+
@@ -149,7 +112,7 @@
-
+
@@ -158,14 +121,10 @@
-
@@ -174,177 +133,17 @@
- - - - - - - - - - - - - - + diff --git a/src/app/plan-management/entry-plan/entry-plan.component.ts b/src/app/plan-management/entry-plan/entry-plan.component.ts index f494d86..1385d8b 100644 --- a/src/app/plan-management/entry-plan/entry-plan.component.ts +++ b/src/app/plan-management/entry-plan/entry-plan.component.ts @@ -68,10 +68,7 @@ export class EntryPlanComponent implements OnInit { IsNewCompanyData = ""; //单位维护更新或者新增 displayedColumns: string[] = [ - "state", - "isFollowed", "unitname", - "integrity", "level", "jurisdictionsquadron", "unittype", diff --git a/src/app/plan-management/maintain-up/maintain-up.component.html b/src/app/plan-management/maintain-up/maintain-up.component.html index fb1ea18..585da66 100644 --- a/src/app/plan-management/maintain-up/maintain-up.component.html +++ b/src/app/plan-management/maintain-up/maintain-up.component.html @@ -11,9 +11,9 @@
- + - 包含下级 @@ -296,7 +296,7 @@ -
+ diff --git a/src/app/plan-management/pass-plan/pass-plan.component.html b/src/app/plan-management/pass-plan/pass-plan.component.html index 8214f73..818e841 100644 --- a/src/app/plan-management/pass-plan/pass-plan.component.html +++ b/src/app/plan-management/pass-plan/pass-plan.component.html @@ -11,9 +11,9 @@
- + - 包含下级 diff --git a/src/app/plan-management/plan-deduction/plan-deduction.component.html b/src/app/plan-management/plan-deduction/plan-deduction.component.html index 54f3951..35e1cb4 100644 --- a/src/app/plan-management/plan-deduction/plan-deduction.component.html +++ b/src/app/plan-management/plan-deduction/plan-deduction.component.html @@ -11,7 +11,7 @@
- 创建人(消防救援站): + 创建人(所属消防救援支队): diff --git a/src/app/plan-management/reinforce-plan/reinforce-plan.component.html b/src/app/plan-management/reinforce-plan/reinforce-plan.component.html index 1cb4035..6eb8a89 100644 --- a/src/app/plan-management/reinforce-plan/reinforce-plan.component.html +++ b/src/app/plan-management/reinforce-plan/reinforce-plan.component.html @@ -11,9 +11,9 @@
- + - + 包含下级 更多筛选条件 diff --git a/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts b/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts index 0003d87..ff266dd 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts +++ b/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts @@ -107,27 +107,13 @@ export class AddUnitOneComponent implements OnInit { }, position:this.echartsData.tableTooltipNoShow2 }, - legend: { - //type: tid=="pieone"?'scroll':'', - //orient: 'vertical', - //left: tid=="pieone"?0:650, - //right:30, - //top:100, - //bottom:tid=="pieone"?600:500, - bottom: 90, - left: 'center', - textStyle:{ - fontSize:14, - color:"#000000" - }, - data: tid=="pieone"?this.lengthOrData:this.lengthBuildData - }, + series: [ { name: '访问来源', type: 'pie', radius:this.padHw?'42%':'50%', - center: ['48%', '53%'], + center: ['48%', '60%'], bottom:130, left:30, label:{ diff --git a/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts b/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts index 96b4379..7bf89d3 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts +++ b/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts @@ -54,11 +54,12 @@ export class AddUnitTwoTypeStatisticsComponent implements OnInit { location.reload(); } this.route.queryParams.subscribe((param) => { - this.headname = param.level; - this.lastId = param.id; - this.zhiorbuild = param.type; - this.year = param.year || null; - this.month = param.month.substring(0, 1) || null; + console.log("param", param); + param.level ? (this.headname = param.level) : null; + param.id ? (this.lastId = param.id) : null; + param.type ? (this.zhiorbuild = param.type) : null; + param.year ? (this.year = param.year || null) : null; + param.month ? (this.month = param.month.substring(0, 1) || null) : null; }); console.log(this.month); this.setTimeoutObj = window.setTimeout(() => { @@ -520,7 +521,6 @@ export class AddUnitTwoTypeStatisticsComponent implements OnInit { item.echart.setOption(option); item.echart.getZr().on("click", (params) => { const pointInPixel = [params.offsetX, params.offsetY]; - console.log(this.data.level); if (item.echart.containPixel("grid", pointInPixel)) { let xIndex = item.echart.convertFromPixel({ seriesIndex: 0 }, [ params.offsetX, @@ -531,7 +531,6 @@ export class AddUnitTwoTypeStatisticsComponent implements OnInit { (this.data.level == "0" || this.data.level == "1") && this.tabledata[0].buildingTypes[xIndex].organizations.length >= 1 ) { - console.log("走这里了吗"); // 总队，支队跳转 this.router.navigate( ["/statisticanalysis/addUnit_one/addUnit_two_typeDetails"], @@ -556,6 +555,17 @@ export class AddUnitTwoTypeStatisticsComponent implements OnInit { }); } } else { + // console.log(this.data.level) + // console.log(this.tabledata[0].organizations[xIndex].subOrganizations) + // this.router.navigate(["/statisticanalysis/CompangInfo"], { + // queryParams: { + // name: option.xAxis.data[xIndex], + // type: 1, + // jsid: option.xAxis.id[xIndex], + // buildid: this.lastId, + // }, + // }); + // return if ( (this.data.level == "0" || this.data.level == "1") && this.tabledata[0].organizations[xIndex].subOrganizations.length >= 1 diff --git a/src/app/statistic-analysis/combined-query/combined-query.component.html b/src/app/statistic-analysis/combined-query/combined-query.component.html index 84d1914..0af8acb 100644 --- a/src/app/statistic-analysis/combined-query/combined-query.component.html +++ b/src/app/statistic-analysis/combined-query/combined-query.component.html @@ -8,11 +8,11 @@
- + - - {{element.modifiedTime|date:'yyyy-MM-dd'}} -
+ diff --git a/src/app/statistic-analysis/home/home.component.html b/src/app/statistic-analysis/home/home.component.html index 527bcfa..b011951 100644 --- a/src/app/statistic-analysis/home/home.component.html +++ b/src/app/statistic-analysis/home/home.component.html @@ -2,58 +2,18 @@
-
-
- -
+
-
-
-
年度完成情况
-
-
-
-
-
当月完成情况
-
-
{{completeProgress.monthlyCompleteProgress}}%
-
-
-
-
-
-
-
年计划完成率
-
-
{{completeProgress.yearlyCompleteProgress}}%
-
-
-
-
-
- -
-
-
-
-
+
+ +
预案编制总量
    @@ -62,23 +22,19 @@
-
+ +
-->
-
+
- +
@@ -136,4 +92,5 @@
+
\ No newline at end of file diff --git a/src/app/statistic-analysis/home/home.component.scss b/src/app/statistic-analysis/home/home.component.scss index 7b361e2..7de7dd0 100644 --- a/src/app/statistic-analysis/home/home.component.scss +++ b/src/app/statistic-analysis/home/home.component.scss @@ -1,26 +1,30 @@ @import "../../../assets/css/newStyle.css"; -.main-center{ - position: relative; +// .main{ + +// } +.main-center { + position: relative; } -#chartMap{ - margin-left: 5px; - // border: 1px solid red; +#chartMap { + margin-left: 5px; } -.number-area{ - position: absolute; - top: 0; - display: block; - width:80%; +.number-area { + position: absolute; + top: 0; + display: block; + width: 80%; } -.total-item{ - z-index: 200; - cursor: pointer; +.total-item { + z-index: 200; + cursor: pointer; } -.total-item div{ - height: 23px!important; - line-height: 23px!important; +.total-item div { + height: 23px !important; + line-height: 23px !important; } -.xxx div{ - height: 20px!important; - line-height: 20px!important; +.xxx div { + height: 20px !important; + line-height: 20px !important; } + + diff --git a/src/app/statistic-analysis/home/home.component.ts b/src/app/statistic-analysis/home/home.component.ts index f08dca0..b3f4bdf 100644 --- a/src/app/statistic-analysis/home/home.component.ts +++ b/src/app/statistic-analysis/home/home.component.ts @@ -1,9 +1,16 @@ -import { Component, OnInit, Renderer2, ElementRef } from "@angular/core"; +import { + Component, + OnInit, + Renderer2, + ElementRef, + ViewChild, +} from "@angular/core"; import { HttpClient } from "@angular/common/http"; import { Router } from "@angular/router"; import { EchartsDataService } from "../echarts-data.service"; import { MapFactory } from "@src/modules/map/declare/factory"; import { IMap } from "@src/modules/map/declare/map"; +import { tr } from "date-fns/locale"; declare var echarts: any; // import "../../../assets/echarts/tianjin.js"; // import * as echarts from "echarts"; @@ -14,6 +21,7 @@ declare var echarts: any; styleUrls: ["./home.component.scss"], }) export class HomeComponent implements OnInit { + @ViewChild("chartContainer") chartContainer: ElementRef; mapData; constructor( private http: HttpClient, @@ -27,20 +35,24 @@ export class HomeComponent implements OnInit { yuandata; ngOnInit() { this.getechartsdata(); - this.getYearlyCompleteProgress(); + // this.getYearlyCompleteProgress(); + } + ngAfterViewInit() { setTimeout(() => { this.http.get("assets/echarts/tianjin.json").subscribe((res) => { this.mapData = res; this.echartsMap(); - console.log("--- result :: ", res); }); }, 0); } + myChart: any; echartsMap() { - console.log(999); - let myChart = echarts.init(document.getElementById("chartMap")); - let option = { + this.myChart = echarts.init(document.getElementById("chartMap")); + let option: any = { + // tooltip: { + // show: true, + // }, geo: { map: "tianjin", //这里的名称需要和shandong.js: echarts.registerMap('shandong',{})中的名称一致 // label: { show: true }, //显示地点 @@ -72,14 +84,25 @@ export class HomeComponent implements OnInit { borderType: "dotted", // 描边类型。 }, }, + tooltip: { + tooltip: { + trigger: "item", + formatter: function (params) { + return params.name ; + }, + }, + }, }, series: [], }; - + this.myChart.on("click", (params) => { + console.log("点击区域", params); + // this.showTooltip(params); + }); echarts.registerMap("tianjin", this.mapData); - myChart.setOption(option); - window.addEventListener("resize", function () { - myChart.resize(); + this.myChart.setOption(option); + window.addEventListener("resize", () => { + this.myChart.resize(); }); } @@ -221,8 +244,6 @@ export class HomeComponent implements OnInit { cPlan = "0"; dPlan = "0"; ePlan = "0"; - ngAfterViewInit(): void {} - planState; //预案状态统计 diff --git a/src/app/statistic-analysis/plan-analysis-by-synthesis/plan-analysis-by-synthesis.component.html b/src/app/statistic-analysis/plan-analysis-by-synthesis/plan-analysis-by-synthesis.component.html index 329f4e5..d27f4df 100644 --- a/src/app/statistic-analysis/plan-analysis-by-synthesis/plan-analysis-by-synthesis.component.html +++ b/src/app/statistic-analysis/plan-analysis-by-synthesis/plan-analysis-by-synthesis.component.html @@ -14,7 +14,7 @@
- 包含下级 diff --git a/src/app/tabbar/tabbar.component.html b/src/app/tabbar/tabbar.component.html index 27ba2c0..b822fa5 100644 --- a/src/app/tabbar/tabbar.component.html +++ b/src/app/tabbar/tabbar.component.html @@ -1,217 +1,13 @@ -

{{title}} {{title}} : {{planName}}

- -
- {{(companyIntegrityScore.totalScore.toFixed(2) * 100).toFixed()}} % -
-
-
- 分类名称 - 占比 - 总占比 -
-
-
    -
  • -
    单位信息
    -
    -
    -
    -
    -
    - {{(companyIntegrityScore.basicInfoScore * 5).toFixed(1)}}% -
    -
    5%
    -
    • -
  • -
    建筑信息
    -
    -
    -
    -
    -
    - {{(companyIntegrityScore.buildingInfoScore * 10).toFixed(1)}}% -
    -
    10%
    -
    • -
  • -
    平面图
    -
    -
    -
    -
    -
    - {{(companyIntegrityScore.planImageScore * 10).toFixed(1)}}% -
    -
    10%
    -
    • -
  • -
    四周毗邻
    -
    -
    -
    -
    -
    - {{(companyIntegrityScore.adjoinScore * 10).toFixed(1)}}% -
    -
    10%
    -
    • -
  • -
    消防设施
    -
    -
    -
    -
    -
    - {{(companyIntegrityScore.facilityScore * 25).toFixed(1)}}% -
    -
    25%
    -
    • -
  • -
    重点部位
    -
    -
    -
    -
    -
    - {{(companyIntegrityScore.importantLocationScore * 10).toFixed(1)}}% -
    -
    10%
    -
    • -
  • -
    功能分区
    -
    -
    -
    -
    -
    - {{(companyIntegrityScore.functionalDivisionScore * 10).toFixed(1)}}% -
    -
    10%
    -
    • -
  • -
    实景图
    -
    -
    -
    -
    -
    - {{(companyIntegrityScore.realityImageScore * 10).toFixed(1)}}% -
    -
    10%
    -
    • -
  • -
    CAD上传
    -
    -
    -
    -
    - {{(companyIntegrityScore.cadScore * 10).toFixed(1)}}% -
    -
    10%
    -
    • -
-
-
- 仅供参考 - 关闭 -
-
+

欢迎您, {{realName}}

-
- - 信息完整度规则 - -
-
- 信息完整度规则   - - - - - - clear - -
-
-
单位状态 - 新增 - 维护更新 - 重点单位 - - star - - 单位名称 {{element.company.name}} 信息完整度 -
- - {{(element.company.companyIntegrityScore.totalScore.toFixed(2) * 100).toFixed()}}% - -
-
-
-
- 分类名称 - 占比 - 总占比 -
-
-
    -
  • -
    单位信息
    -
    -
    -
    -
    -
    - {{(element.company.companyIntegrityScore.basicInfoScore * - 5).toFixed(1)}}% -
    -
    5%
    -
    • -
  • -
    建筑信息
    -
    -
    -
    -
    -
    - {{(element.company.companyIntegrityScore.buildingInfoScore * - 10).toFixed(1)}}% -
    -
    10%
    -
    • -
  • -
    平面图
    -
    -
    -
    -
    -
    - {{(element.company.companyIntegrityScore.planImageScore * - 10).toFixed(1)}}% -
    -
    10%
    -
    • -
  • -
    四周毗邻
    -
    -
    -
    -
    -
    - {{(element.company.companyIntegrityScore.adjoinScore * - 10).toFixed(1)}}% -
    -
    10%
    -
    • -
  • -
    消防设施
    -
    -
    -
    -
    -
    - {{(element.company.companyIntegrityScore.facilityScore * - 25).toFixed(1)}}% -
    -
    25%
    -
    • -
  • -
    重点部位
    -
    -
    -
    -
    -
    - {{(element.company.companyIntegrityScore.importantLocationScore * - 10).toFixed(1)}}% -
    -
    10%
    -
    • -
  • -
    功能分区
    -
    -
    -
    -
    -
    - {{(element.company.companyIntegrityScore.functionalDivisionScore * - 10).toFixed(1)}}% -
    -
    10%
    -
    • -
  • -
    实景图
    -
    -
    -
    -
    -
    - {{(element.company.companyIntegrityScore.realityImageScore * - 10).toFixed(1)}}% -
    -
    10%
    -
    • -
  • -
    CAD上传
    -
    -
    -
    -
    -
    - {{(element.company.companyIntegrityScore.cadScore * - 10).toFixed(1)}}% -
    -
    10%
    -
    • -
-
-
- 仅供参考 -
-
-
- 		预案级别 {{element.planCategory}} 消防救援站所属消防救援支队 {{element.company.organizationName}} 消防救援站所属消防救援支队 {{element.organizationName}} 消防救援站所属消防救援支队 {{element.organizationName}}
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
名称占比规则说明
单位信息5%填写项平分该项占比分值，信息填写完整即可
建筑信息10%根据创建的建筑个数平分该分值，每个建筑根据实际填写的完整度再进行评判
平面图10%总平面图1张，层平面图1张
四周毗邻10%按4个方向均分，每个方向的属性信息要填写完整，并且包含图片
消防设施25%消防水源占30%   安全疏散设施/消防泡沫系统/安全疏散模块占30%
消防水系统/自动消防设施/消防设施/消防灭火给水系统/消火栓系统模块占30% -     内部消防力量占10%
重点部位10%层平面图中重点部位数量大于1个，并且属性信息填写完整（包含图片）
功能分区10%任意建筑下功能分区信息填写两条以上并且信息填写完整
实景图10%外观，保证有2张照片（占30%）; - 重点部位，保证有2张照片（占30%）;安全出口，保证有2张照片（占40%）
CAD上传10%保证至少有1个文件，格式不限
-
-
-
+
- 新增单位信息 + 新增模板信息 =3.1.1": - "integrity" "sha512-gP1e1fNnAj9KJpTDLXV21brklbfJlqeINmpQDJCDta9TX3cPoqyQOiDVcEPzbOVHqgBRgTOwNxC5iGwJ89014A==" - "resolved" "https://registry.npmmirror.com/echarts/-/echarts-4.1.0.tgz" - "version" "4.1.0" + "integrity" "sha512-+ugizgtJ+KmsJyyDPxaw2Br5FqzuBnyOWwcxPKO6y0gc5caYcfnEUIlNStx02necw8jmKmTafmpHhGo4XDtEIA==" + "resolved" "https://registry.npmmirror.com/echarts/-/echarts-4.9.0.tgz" + "version" "4.9.0" dependencies: - "zrender" "4.0.4" + "zrender" "4.3.2" "ee-first@1.1.1": "integrity" "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" @@ -11607,7 +11607,7 @@ "resolved" "https://registry.npm.taobao.org/zone.js/download/zone.js-0.10.2.tgz" "version" "0.10.2" -"zrender@4.0.4": - "integrity" "sha512-03Vd/BDl/cPXp8E61f5+Xbgr/a4vDyFA+uUtUc1s+5KgcPbyY2m+78R/9LQwkR6QwFYHG8qk25Q8ESGs/qpkZw==" - "resolved" "https://registry.npmmirror.com/zrender/-/zrender-4.0.4.tgz" - "version" "4.0.4" +"zrender@4.3.2": + "integrity" "sha512-bIusJLS8c4DkIcdiK+s13HiQ/zjQQVgpNohtd8d94Y2DnJqgM1yjh/jpDb8DoL6hd7r8Awagw8e3qK/oLaWr3g==" + "resolved" "https://registry.npmmirror.com/zrender/-/zrender-4.3.2.tgz" + "version" "4.3.2"