From cae22678298c260f432776fe08ab8f643159ec9d Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Thu, 25 May 2023 17:35:12 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91-=E7=A6=85=E9=81=93bug?=
 =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard/screen/iso/MeetingCalendar.vue      |  4 ++++
 .../screen/iso/MeetingInformationChart.vue        | 15 +++------------
 .../dashboard/screen/wp29/ExpertQuantityChart.vue |  7 ++++---
 .../dashboard/screen/wp29/MeetingCalendar.vue     |  4 ++++
 .../screen/wp29/MeetingInformationChart.vue       | 15 +++------------
 src/views/screen/iso/MeetingCalendar.vue          |  4 ++++
 src/views/screen/wp29/MeetingCalendar.vue         |  4 ++++
 7 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/src/views/dashboard/screen/iso/MeetingCalendar.vue b/src/views/dashboard/screen/iso/MeetingCalendar.vue
index 2d94e6e..428a31c 100644
--- a/src/views/dashboard/screen/iso/MeetingCalendar.vue
+++ b/src/views/dashboard/screen/iso/MeetingCalendar.vue
@@ -359,6 +359,8 @@ export default {
     font-family: PingFang SC;
     font-weight: 800;
     color: #050525;
+    white-space: pre-wrap;
+    word-break: break-all;
   }
 
   .tippy-content {
@@ -367,6 +369,8 @@ export default {
     font-weight: 500;
     color: #050525;
     margin-top: 8px;
+    white-space: pre-wrap;
+    word-break: break-all;
   }
 }
 
diff --git a/src/views/dashboard/screen/iso/MeetingInformationChart.vue b/src/views/dashboard/screen/iso/MeetingInformationChart.vue
index 3574e6b..9195b2c 100644
--- a/src/views/dashboard/screen/iso/MeetingInformationChart.vue
+++ b/src/views/dashboard/screen/iso/MeetingInformationChart.vue
@@ -230,12 +230,6 @@ export default {
       let tooltipTitle = this.getTooltipTitle()
       let option = {
         color: ['#069F99', '#97E3E0', '#18E0AB'],
-        legend: {
-          show: false
-        },
-        grid: {
-          top: '40px'
-        },
         tooltip: {
           formatter: params => {
             // 获取xAxis data中的数据
@@ -279,22 +273,19 @@ export default {
         series: [
           {
             name:'计划数量',
-            stack: 'total',
-            itemStyle:{
-              borderRadius:[0,0,0,0],
-            },
             data: yData[0]
           },
           {
             name:'实际数量',
-            stack: 'total',
+            barGap: '-100%',
             data: yData[1]
           },
           {
             name:'完成率',
             type: 'line',
             showSymbol: false,
-            symbol: 'path://M 30 10 A 20 20 0 1 0 30 50 A 20 20 0 1 0 30 10 Z M 30 15 A 15 15 0 1 1 30 45 A 15 15 0 1 1 30 15 Z',
+            symbol: 'emptyCircle',
+            // symbol: 'path://M 30 10 A 20 20 0 1 0 30 50 A 20 20 0 1 0 30 10 Z M 30 15 A 15 15 0 1 1 30 45 A 15 15 0 1 1 30 15 Z',
             areaStyle: {
               opacity: 0.8,
               color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
diff --git a/src/views/dashboard/screen/wp29/ExpertQuantityChart.vue b/src/views/dashboard/screen/wp29/ExpertQuantityChart.vue
index 01b9162..e3d6f0f 100644
--- a/src/views/dashboard/screen/wp29/ExpertQuantityChart.vue
+++ b/src/views/dashboard/screen/wp29/ExpertQuantityChart.vue
@@ -17,7 +17,7 @@
 
 <script>
 import { GetExpertQuantityData } from '@/screenApi/api'
-import { createBarChart } from "../util/BarOptions";
+import { createBarChart } from '../util/BarOptions'
 
 export default {
   name: 'ExpertQuantityChart',
@@ -67,13 +67,14 @@ export default {
               dataStr += `<div>
                 <div style="margin: 0 8px;">
                   <span style="display:inline-block;margin-right:5px;width:15px;height:10px;background-color:${color};border-radius: 3px"></span>
-                  <span style="color:#666">${item.name}</span>
+                  <span style="color:#666;white-space: pre-wrap;word-break: break-all">${item.name}</span>
                   <span style="color:#333;">${item.value}</span>
                 </div>
               </div>`
             })
             return dataStr
-          }
+          },
+          extraCssText:'max-width:400px;'
         },
         xAxis: {
           data: xAxisData
diff --git a/src/views/dashboard/screen/wp29/MeetingCalendar.vue b/src/views/dashboard/screen/wp29/MeetingCalendar.vue
index 73beb74..a68eb8f 100644
--- a/src/views/dashboard/screen/wp29/MeetingCalendar.vue
+++ b/src/views/dashboard/screen/wp29/MeetingCalendar.vue
@@ -366,6 +366,8 @@ export default {
     font-family: PingFang SC;
     font-weight: 800;
     color: @normal-color;
+    white-space: pre-wrap;
+    word-break: break-all;
   }
 
   .tippy-content {
@@ -374,6 +376,8 @@ export default {
     font-weight: 500;
     color: @normal-color;
     margin-top: 8px;
+    white-space: pre-wrap;
+    word-break: break-all;
   }
 }
 
diff --git a/src/views/dashboard/screen/wp29/MeetingInformationChart.vue b/src/views/dashboard/screen/wp29/MeetingInformationChart.vue
index db8ee2e..04cc3f4 100644
--- a/src/views/dashboard/screen/wp29/MeetingInformationChart.vue
+++ b/src/views/dashboard/screen/wp29/MeetingInformationChart.vue
@@ -254,12 +254,6 @@ export default {
       let tooltipTitle = this.getTooltipTitle()
       let option = {
         color: ['#069F99', '#97E3E0', '#18E0AB'],
-        legend: {
-          show: false
-        },
-        grid: {
-          top: '40px'
-        },
         tooltip: {
           formatter: params => {
             // 获取xAxis data中的数据
@@ -303,22 +297,19 @@ export default {
         series: [
           {
             name:'计划数量',
-            stack: 'total',
-            itemStyle:{
-              borderRadius:[0,0,0,0],
-            },
             data: yData[0]
           },
           {
             name:'实际数量',
-            stack: 'total',
+            barGap: '-100%',
             data: yData[1]
           },
           {
             name:'完成率',
             type: 'line',
             showSymbol: false,
-            symbol: 'path://M 30 10 A 20 20 0 1 0 30 50 A 20 20 0 1 0 30 10 Z M 30 15 A 15 15 0 1 1 30 45 A 15 15 0 1 1 30 15 Z',
+            symbol: 'emptyCircle',
+            // symbol: 'path://M 30 10 A 20 20 0 1 0 30 50 A 20 20 0 1 0 30 10 Z M 30 15 A 15 15 0 1 1 30 45 A 15 15 0 1 1 30 15 Z',
             areaStyle: {
               opacity: 0.8,
               color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
diff --git a/src/views/screen/iso/MeetingCalendar.vue b/src/views/screen/iso/MeetingCalendar.vue
index a95848a..3535969 100644
--- a/src/views/screen/iso/MeetingCalendar.vue
+++ b/src/views/screen/iso/MeetingCalendar.vue
@@ -356,6 +356,8 @@ div.calendar-box{
     font-family: PingFang SC;
     font-weight: 800;
     color: #fff;
+    white-space: pre-wrap;
+    word-break: break-all;
   }
 
   .tippy-content {
@@ -364,6 +366,8 @@ div.calendar-box{
     font-weight: 500;
     color: #fff;
     margin-top: 8px;
+    white-space: pre-wrap;
+    word-break: break-all;
   }
 }
 
diff --git a/src/views/screen/wp29/MeetingCalendar.vue b/src/views/screen/wp29/MeetingCalendar.vue
index e3db50c..a8f7ee9 100644
--- a/src/views/screen/wp29/MeetingCalendar.vue
+++ b/src/views/screen/wp29/MeetingCalendar.vue
@@ -365,6 +365,8 @@ div.calendar-box{
     font-family: PingFang SC;
     font-weight: 800;
     color: #fff;
+    white-space: pre-wrap;
+    word-break: break-all;
   }
 
   .tippy-content {
@@ -373,6 +375,8 @@ div.calendar-box{
     font-weight: 500;
     color: #fff;
     margin-top: 8px;
+    white-space: pre-wrap;
+    word-break: break-all;
   }
 }