Accept Merge Request #18610: (uat -> master)

Merge Request: bug

Created By: @郝震-深圳维码
Accepted By: @郝震-深圳维码
URL: https://yldc.coding.yili.com/p/ylst/d/ylst-survey-web/git/merge/18610

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/chartOption.js

@@ -56,7 +56,12 @@ const option = {
     formatter: (params) => {
       // console.log(params);
       if (params.value.length > 1) {
-        return `${params.name}:<br/>Worse${params.value[0]}Better${params.value[1]}`;
+        const list = option?.series?.[0]?.data?.filter(
+          (i) => i.value?.[0] === params.value[0] && i.value?.[1] === params.value[1]
+        );
+        const name = list.map((i) => i.name || '').join(', ') || params.name || '';
+        return `${name}:<br/>Worse${params.value[0]}Better${params.value[1]}`;
+        // return `${params.name}:<br/>Worse${params.value[0]}Better${params.value[1]}`;
       }
       return false;
     },

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,20 +104,21 @@
       }
       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){
+        // if(cel.max===el.max){
           let dataInfo = {
             name: cel.title,
             value: [cel.Worse,cel.Better]
           }
           el.data.push(dataInfo)
           dataArr.push(dataInfo)
-        }
+        // }
       })
     })
     option.series= [...newData,...xy]

src/views/TempMarket/components/CreateSurveyProduct.vue

@@ -136,7 +136,7 @@
                 :key="index"
               >
                 <div class="create-survey-attr-right-item-input">
-                  <label class="create-survey-attr-label">产品名称{{item.status}}</label>
+                  <label class="create-survey-attr-label">产品名称</label>
                   <a-input
                     v-model:value="item.productName"
                     class="create-custom-input"
@@ -544,16 +544,16 @@ export default defineComponent({
                 product_title: item.packName,
                 taste_title: item.packType,
               }));
-            params.shelves_cover_picture = packingData.value.stackImgs.urls;
-            params.package_shelves_test_list = packingData.value.stack
+            params.shelves_cover_picture = packingData.value.shelvesImgs.urls;
+            params.package_shelves_test_list = packingData.value.shelves
               .filter((item) => !item.status)
               .map((item) => ({
                 product_picture: item.packImg,
                 product_title: item.packName,
                 taste_title: item.packType,
               }));
-            params.package_cover_picture = packingData.value.shelvesImgs.urls;
-            params.package_pile_test_list = packingData.value.shelves
+            params.package_cover_picture = packingData.value.stackImgs.urls;
+            params.package_pile_test_list = packingData.value.stack
               .filter((item) => !item.status)
               .map((item) => ({
                 product_picture: item.packImg,

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"