From 8d8098bb60a51a73bcb56dbfef6750d8bd74d0a7 Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Sun, 24 Apr 2022 14:43:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=89=B9=E5=AE=9A=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=B8=89=E7=BB=B4=E5=9C=BA=E6=99=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/gis-management/gis-labeling/gis-labeling.component.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/gis-management/gis-labeling/gis-labeling.component.ts b/src/app/gis-management/gis-labeling/gis-labeling.component.ts
index 5ec48ec..334d5b4 100644
--- a/src/app/gis-management/gis-labeling/gis-labeling.component.ts
+++ b/src/app/gis-management/gis-labeling/gis-labeling.component.ts
@@ -1235,7 +1235,9 @@ export class GisLabelingComponent implements OnInit {
 
   //三维场景
   threeeScene (e) {
-    window.open('http://39.106.78.171:8088/%E6%BC%94%E7%A4%BA%E6%A1%88%E4%BE%8B/--SHGJHYZX/')
+    if (e.name && e.name == "株洲铭逸酒店") {
+      window.open('http://39.106.78.171:8088/%E6%BC%94%E7%A4%BA%E6%A1%88%E4%BE%8B/--SHGJHYZX/')
+    }
   }
 
   //查看预案

From 2ebf5df542555a49173d77c714f6688a5de34c27 Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Tue, 26 Apr 2022 09:59:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3echarts=20BUG=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../real-monitoring.component.ts              | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/app/statistic-analysis/real-monitoring/real-monitoring.component.ts b/src/app/statistic-analysis/real-monitoring/real-monitoring.component.ts
index dc192cf..28e8785 100644
--- a/src/app/statistic-analysis/real-monitoring/real-monitoring.component.ts
+++ b/src/app/statistic-analysis/real-monitoring/real-monitoring.component.ts
@@ -150,6 +150,7 @@ export class RealMonitoringComponent implements OnInit {
         this.leftzhutu.dispose()
         this.dateyue = []
         this.dateNum = []
+        this.indexData = []
         //this.zhiNameData = []
         //this.zhiNumData = []
         //this.addyuan = []
@@ -240,6 +241,11 @@ export class RealMonitoringComponent implements OnInit {
           symbolSize: [65, 65],
           data: this.EchartsData.qipao(this.tiaoshiPao, this.dateNum, this.dateyue)
         },
+        itemStyle: {
+          normal:{
+           color: "#3E91F9" 
+          }
+        },
         backgroundStyle: {
           color: 'rgba(220, 220, 220, 0.8)'
         },
@@ -292,6 +298,9 @@ export class RealMonitoringComponent implements OnInit {
   lengthdata = ['二维预案', '三维预案', '文本预案', '其他预案']
   rightbingtu() {
     this.rightbing = echarts.init(document.getElementById('rightecharts'), 'walden');
+    if (!this.indexData.length) {
+      return
+    }
     this.optionRightbing = {
       /* title: {
         text: `建筑类型统计（${this.count}家）`,
@@ -327,6 +336,7 @@ export class RealMonitoringComponent implements OnInit {
         },
         data: this.lengthdata
       },
+      color: ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'],
       series: [
         {
           top: '0',
@@ -392,10 +402,10 @@ export class RealMonitoringComponent implements OnInit {
               color:'#000000'
             },
             interval: 0,
-            //rotate:38
+            rotate: this.zhiNumData.length >= 10? 60 : 0, 
         formatter:function(value){
           var ret = "";//拼接加\n返回的类目项 
-          var maxLength = 3;//每项显示文字个数
+          var maxLength = 9;//每项显示文字个数
           var valLength = value.length;//X轴类目项的文字个数
           var rowN = Math.ceil(valLength / maxLength); //类目项需要换行的行数
           if (rowN > 1) { //如果类目项的文字大于3,
@@ -446,8 +456,12 @@ export class RealMonitoringComponent implements OnInit {
           symbolSize: [65, 65],
           data: this.EchartsData.qipao(this.tiaoshiPao, this.zhiNumData, this.zhiNameData)
         },
-         
-          barWidth :'38',
+        itemStyle: {
+          normal:{
+           color: "#3E91F9" 
+          }
+        },
+        barWidth :'38',
           //label: this.topTextlabel
         }]
       };