Merge branch 'uat' of e.coding.yili.com:yldc/ylst/ylst-survey-web into uat

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>

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'}
+    console.log('newData========',newData);
-    if(newData[1])newData[1].itemStyle ={color: '#F59646'}
+    // if(newData[0])newData[0].itemStyle ={color: '#33A6C7'}
-    if(newData[2])newData[2].itemStyle ={color: '#397ADC'}
+    // if(newData[1])newData[1].itemStyle ={color: '#F59646'}
-    if(newData[3])newData[3].itemStyle ={color: '#E24D4D'}
+    // 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){

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"