From 132c2a94c4b3d402c7f64c298612cbc70ef4911d Mon Sep 17 00:00:00 2001
From: wangxy <xinyao.wang@le-it.com.cn>
Date: Tue, 27 Apr 2021 11:19:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=9B=E6=80=9D=E7=BB=B4=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=EF=BC=8C=E7=AD=94=E9=A2=98?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=A1=E9=AA=8C=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/questionnaire/question.vue                 |  2 +-
 .../questionnaire/satis/components/BarChart.vue      | 12 ++++++++++--
 .../questionnaire/satis/components/PieChart.vue      |  2 +-
 .../questionnaire/satis/components/ThreeBarChart.vue | 10 +++++++++-
 .../questionnaire/satis/components/TwoBarChart.vue   | 10 +++++++++-
 5 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/views/questionnaire/question.vue b/src/views/questionnaire/question.vue
index 2cababa..a9f808b 100644
--- a/src/views/questionnaire/question.vue
+++ b/src/views/questionnaire/question.vue
@@ -425,7 +425,7 @@ export default {
         !this.submitParams.buildingid ||
         // !this.submitParams.unit ||
         // !this.submitParams.room ||
-				!this.submitParams.personname ||
+				// !this.submitParams.personname ||
 				!this.submitParams.sex ||
 				!this.submitParams.persontype ||
 				!this.submitParams.age ||
diff --git a/src/views/questionnaire/satis/components/BarChart.vue b/src/views/questionnaire/satis/components/BarChart.vue
index 1033283..dde622e 100644
--- a/src/views/questionnaire/satis/components/BarChart.vue
+++ b/src/views/questionnaire/satis/components/BarChart.vue
@@ -87,7 +87,15 @@ export default {
           trigger: 'axis',
           axisPointer: { // 坐标轴指示器，坐标轴触发有效
             type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
-          }
+          },
+					formatter: function(datas) {
+						var res = datas[0].name + '<br/>', val;
+						for(var i = 0, length = datas.length; i < length; i++) {
+								val = (datas[i].value*100).toFixed(1) + '%';
+								res += datas[i].seriesName + '：' + val + '<br/>';
+						}
+						return res;
+					}
         },
         grid: {
           top: 30,
@@ -110,7 +118,7 @@ export default {
           }
         }],
         series: [{
-          name: '值',
+          name: '满意度',
           type: 'bar',
           // stack: 'vistors',
           barWidth: 30,
diff --git a/src/views/questionnaire/satis/components/PieChart.vue b/src/views/questionnaire/satis/components/PieChart.vue
index 8a8d021..92a3762 100644
--- a/src/views/questionnaire/satis/components/PieChart.vue
+++ b/src/views/questionnaire/satis/components/PieChart.vue
@@ -91,7 +91,7 @@ export default {
 				},
         tooltip: {
           trigger: 'item',
-          formatter: '{a} <br/>{b} : {c} ({d}%)'
+          formatter: '{a} <br/>{b} : ({d}%)',
         },
         legend: {
           left: 'center',
diff --git a/src/views/questionnaire/satis/components/ThreeBarChart.vue b/src/views/questionnaire/satis/components/ThreeBarChart.vue
index 13b3fad..eff0c90 100644
--- a/src/views/questionnaire/satis/components/ThreeBarChart.vue
+++ b/src/views/questionnaire/satis/components/ThreeBarChart.vue
@@ -96,7 +96,15 @@ export default {
           trigger: 'axis',
           axisPointer: { // 坐标轴指示器，坐标轴触发有效
             type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
-          }
+          },
+					formatter: function(datas) {
+						var res = datas[0].name + '<br/>', val;
+						for(var i = 0, length = datas.length; i < length; i++) {
+								val = (datas[i].value*100).toFixed(1) + '%';
+								res += datas[i].seriesName + '：' + val + '<br/>';
+						}
+						return res;
+					}
         },
         grid: {
           top: 10,
diff --git a/src/views/questionnaire/satis/components/TwoBarChart.vue b/src/views/questionnaire/satis/components/TwoBarChart.vue
index 208b16f..491834b 100644
--- a/src/views/questionnaire/satis/components/TwoBarChart.vue
+++ b/src/views/questionnaire/satis/components/TwoBarChart.vue
@@ -93,7 +93,15 @@ export default {
           trigger: 'axis',
           axisPointer: { // 坐标轴指示器，坐标轴触发有效
             type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
-          }
+          },
+					formatter: function(datas) {
+						var res = datas[0].name + '<br/>', val;
+						for(var i = 0, length = datas.length; i < length; i++) {
+								val = (datas[i].value*100).toFixed(1) + '%';
+								res += datas[i].seriesName + '：' + val + '<br/>';
+						}
+						return res;
+					}
         },
         grid: {
           top: 10,