From 20b8822af3c15664b3eab20f964ce76773774737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=9A=E5=86=89?= <mail_b_r@163.com>
Date: Fri, 2 Dec 2022 13:57:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9Akano=E5=88=86=E6=9E=90=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=8E=BB=E6=8E=89x=E3=80=81y=E8=BD=B4=E7=82=B9?=
 =?UTF-8?q?=EF=BC=8Cpsm=E8=AE=BE=E8=AE=A1=E5=9B=BE=E7=89=87=E9=97=B4?=
 =?UTF-8?q?=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kndiagram/components/chartPage.vue            | 15 ++++++++-------
 .../planetDesign/Design/questions/psm/Psm.vue     |  1 +
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/views/DataAnalyse/kndiagram/components/chartPage.vue b/src/views/DataAnalyse/kndiagram/components/chartPage.vue
index 96e8d86b..d888b02a 100644
--- a/src/views/DataAnalyse/kndiagram/components/chartPage.vue
+++ b/src/views/DataAnalyse/kndiagram/components/chartPage.vue
@@ -60,7 +60,7 @@
     const xy = [{
       type: 'scatter',
       data: [[(worse.avg-0),0  ]],
-      itemStyle: {color: '#1C6FFF'},
+      itemStyle: {color: '#70b936', opacity: 0},
       markLine: {
         symbol:'none',
         silent:true,
@@ -76,7 +76,7 @@
     {
       type: 'scatter',
       data: [[0,(better.avg-0)]],
-      itemStyle: {color: '#1C6FFF'},
+      itemStyle: {color: '#70b936', opacity: 0},
       markLine: {
         symbol:'none',
         silent:true,
@@ -92,7 +92,7 @@
       const optionData = {
         max:el,
         type: 'scatter',
-        itemStyle: {},
+        itemStyle: {color: '#70b936'},
         data: [],
         label:{
           show:true,
@@ -104,10 +104,11 @@
       }
       newData.push(optionData)
     })
-    if(newData[0])newData[0].itemStyle ={color: '#33A6C7'}
-    if(newData[1])newData[1].itemStyle ={color: '#F59646'}
-    if(newData[2])newData[2].itemStyle ={color: '#397ADC'}
-    if(newData[3])newData[3].itemStyle ={color: '#E24D4D'}
+    console.log('newData========',newData);
+    // if(newData[0])newData[0].itemStyle ={color: '#33A6C7'}
+    // if(newData[1])newData[1].itemStyle ={color: '#F59646'}
+    // if(newData[2])newData[2].itemStyle ={color: '#397ADC'}
+    // if(newData[3])newData[3].itemStyle ={color: '#E24D4D'}
     newData.forEach(el=>{
       data.forEach(cel => {
         // if(cel.max===el.max){
diff --git a/src/views/planetDesign/Design/questions/psm/Psm.vue b/src/views/planetDesign/Design/questions/psm/Psm.vue
index 1edd7130..8107c2f9 100644
--- a/src/views/planetDesign/Design/questions/psm/Psm.vue
+++ b/src/views/planetDesign/Design/questions/psm/Psm.vue
@@ -14,6 +14,7 @@
               ></question-tinymce>
               <div class="psm-top-left-imgs">
                 <ImageCard
+                  style="margin-bottom: 5px;"
                   class="psm-top-left-imgs-card"
                   :type="1"
                   :uploadCount="16"

From 972b6cd466c4348f5dabbcdb1485bff47e4ac509 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=9A=E5=86=89?= <mail_b_r@163.com>
Date: Fri, 2 Dec 2022 16:30:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A=E6=95=B0=E6=8D=AE=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E8=A1=A8=E6=A0=BC=E5=A4=B4=E4=B8=8A=E4=BC=A0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E9=A2=98=E8=BF=87=E9=95=BFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/DataAnalyse/components/CustomTableHeaderCell.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/DataAnalyse/components/CustomTableHeaderCell.vue b/src/views/DataAnalyse/components/CustomTableHeaderCell.vue
index b43ee1da..924a2105 100644
--- a/src/views/DataAnalyse/components/CustomTableHeaderCell.vue
+++ b/src/views/DataAnalyse/components/CustomTableHeaderCell.vue
@@ -7,7 +7,7 @@
       </template>
       <div class="custom-head-main">
 <!--        下载题型-->
-        <div class="file-question" v-if="question_type === 18">
+        <div class="file-question" v-if="question_type === 18" :style="{width:data.width + 'px'}">
           <div class="label">{{ content }}</div>
           <a-button size="mini" @click="download">下载全部附件</a-button>
         </div>