From 37e448c37ddf9e4ef5bb4b9dbb4ed6c3e9bd0024 Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Tue, 25 Jul 2023 16:11:17 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91-wp29=20=E5=92=8Ciso=20?=
 =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E4=BF=A1=E6=81=AF=E7=BB=9F=E8=AE=A1=20?=
 =?UTF-8?q?=E7=99=BE=E5=88=86=E6=AF=94=E7=BA=B5=E8=BD=B4=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E6=98=AF0-100=EF=BC=9B=E4=BF=AE=E6=94=B9=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E4=B8=93=E5=AE=B6=E7=BB=9F=E8=AE=A1=E7=9A=84=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/iso/MeetingInformationChart.vue    | 36 ++++++++++++++++++
 .../screen/wp29/ExpertQuantityChart.vue       |  6 +--
 .../screen/wp29/MeetingInformationChart.vue   | 38 +++++++++++++++++++
 3 files changed, 77 insertions(+), 3 deletions(-)

diff --git a/src/views/dashboard/screen/iso/MeetingInformationChart.vue b/src/views/dashboard/screen/iso/MeetingInformationChart.vue
index 25e55d7..d412e3f 100644
--- a/src/views/dashboard/screen/iso/MeetingInformationChart.vue
+++ b/src/views/dashboard/screen/iso/MeetingInformationChart.vue
@@ -274,6 +274,42 @@ export default {
         xAxis: {
           data: xData
         },
+        yAxis: [
+          {
+            axisLine: {
+              show: true,
+              lineStyle: {
+                color: '#F2F2F2'
+              }
+            },
+            axisLabel: {
+              show: true,
+              color: '#8E8E95'
+            },
+            splitLine: {
+              lineStyle: {
+                color: '#F2F2F2',
+                type: 'solid'
+              }
+            },
+            type: 'value',
+            nameTextStyle: {
+              color: '#20203D'
+            }
+          },
+          {
+            type: 'value',
+            min: 0,
+            max: 100,
+            axisLabel: {
+              show: false,
+              formatter: '{value} %',
+            },
+            splitLine: {
+              show: false
+            }
+          }
+        ],
         series: [
           {
             name:'计划数量',
diff --git a/src/views/dashboard/screen/wp29/ExpertQuantityChart.vue b/src/views/dashboard/screen/wp29/ExpertQuantityChart.vue
index 8a44337..5ce1b8f 100644
--- a/src/views/dashboard/screen/wp29/ExpertQuantityChart.vue
+++ b/src/views/dashboard/screen/wp29/ExpertQuantityChart.vue
@@ -32,9 +32,9 @@ export default {
         if(res.success) {
           let result = res.result || { }
           // TODO  客户要求先写死
-          result.count = [14, 20, 15, 11, 10, 12]
-          result.departName = ['GRBP', 'GRVA', 'GRSP', 'GRSG', 'GRE', 'GRPE']
-          result.departNameCn = ['噪声与轮胎工作组', '自动驾驶与网联车辆工作组', '被动安全工作组', '一般安全工作组', '灯光与光信号工作组', '污染与能源工作组']
+          result.count = [ 20, 14, 15, 11, 10, 12]
+          result.departName = ['GRVA', 'GRBP', 'GRSP', 'GRSG', 'GRE', 'GRPE']
+          result.departNameCn = ['自动驾驶与网联车辆工作组', '噪声与轮胎工作组', '被动安全工作组', '一般安全工作组', '灯光与光信号工作组', '污染与能源工作组']
           result.total = result.count.reduce((pre, val) => pre = pre + val)
           this.totalAll = result.total
           this.$nextTick(() => {
diff --git a/src/views/dashboard/screen/wp29/MeetingInformationChart.vue b/src/views/dashboard/screen/wp29/MeetingInformationChart.vue
index cb02dc3..dc02a3a 100644
--- a/src/views/dashboard/screen/wp29/MeetingInformationChart.vue
+++ b/src/views/dashboard/screen/wp29/MeetingInformationChart.vue
@@ -335,6 +335,42 @@ export default {
           },
           data: xData
         },
+        yAxis: [
+          {
+            axisLine: {
+              show: true,
+              lineStyle: {
+                color: '#F2F2F2'
+              }
+            },
+            axisLabel: {
+              show: true,
+              color: '#8E8E95'
+            },
+            splitLine: {
+              lineStyle: {
+                color: '#F2F2F2',
+                type: 'solid'
+              }
+            },
+            type: 'value',
+            nameTextStyle: {
+              color: '#20203D'
+            }
+          },
+          {
+            type: 'value',
+            min: 0,
+            max: 100,
+            axisLabel: {
+              show: false,
+              formatter: '{value} %',
+            },
+            splitLine: {
+              show: false
+            }
+          }
+        ],
         series: [
           {
             name:'计划数量',
@@ -350,6 +386,8 @@ export default {
             type: 'line',
             showSymbol: false,
             symbol: 'emptyCircle',
+            min: 0,
+            max: 100,
             // 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,