+
diff --git a/src/views/DataAnalyse/kndiagram/components/chartOption.js b/src/views/DataAnalyse/kndiagram/components/chartOption.js
index 5ce3ae58..5bfd4f28 100644
--- a/src/views/DataAnalyse/kndiagram/components/chartOption.js
+++ b/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}:
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}:
Worse${params.value[0]}Better${params.value[1]}`;
+ // return `${params.name}:
Worse${params.value[0]}Better${params.value[1]}`;
}
return false;
},
diff --git a/src/views/DataAnalyse/kndiagram/components/chartPage.vue b/src/views/DataAnalyse/kndiagram/components/chartPage.vue
index 27a3b150..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,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]
diff --git a/src/views/TempMarket/components/CreateSurveyProduct.vue b/src/views/TempMarket/components/CreateSurveyProduct.vue
index fa122e8b..34f8c599 100644
--- a/src/views/TempMarket/components/CreateSurveyProduct.vue
+++ b/src/views/TempMarket/components/CreateSurveyProduct.vue
@@ -136,7 +136,7 @@
:key="index"
>