diff --git a/src/views/DataAnalyse/components/diagram/newSearch.vue b/src/views/DataAnalyse/components/diagram/newSearch.vue index e680bbb8..c0268f8c 100644 --- a/src/views/DataAnalyse/components/diagram/newSearch.vue +++ b/src/views/DataAnalyse/components/diagram/newSearch.vue @@ -858,7 +858,7 @@ const delGroup =index=>{ // 拼装answer const getAnswer = ()=>{ const newAnswerList = toRaw(answerList.value) - const newAnswerGroupListVal = JSON.parse(JSON.stringify(answerGroupList.value)) + const newAnswerGroupListVal = toRaw(answerGroupList.value) console.log('newAnswerList',newAnswerList); console.log('newAnswerGroupListVal',newAnswerGroupListVal); // 单项拼装 diff --git a/src/views/DataAnalyse/diagram/components/Layouts/Main.vue b/src/views/DataAnalyse/diagram/components/Layouts/Main.vue index 0258f62b..626dd9fd 100644 --- a/src/views/DataAnalyse/diagram/components/Layouts/Main.vue +++ b/src/views/DataAnalyse/diagram/components/Layouts/Main.vue @@ -99,7 +99,6 @@ const props = defineProps({ default: "", }, }); - const isValid = computed(() => props.data.count > 0); const questionIndex = computed(() => props.data.question_index); const chartTypeOptions = ref([]); diff --git a/src/views/DataAnalyse/diagram/components/SingleChart.vue b/src/views/DataAnalyse/diagram/components/SingleChart.vue index 0db36c97..46fe8b75 100644 --- a/src/views/DataAnalyse/diagram/components/SingleChart.vue +++ b/src/views/DataAnalyse/diagram/components/SingleChart.vue @@ -104,7 +104,7 @@ export default defineComponent({ if (empty_option) { data = clearData(data); } - const config = useChartOption(data, type, data_label, other); + const config = useChartOption(data, type, data_label, other, props.data.max); option.value = config; } diff --git a/src/views/DataAnalyse/diagram/components/questionTypes/quick/CascaderType.vue b/src/views/DataAnalyse/diagram/components/questionTypes/quick/CascaderType.vue index 8132dbe5..c7b63734 100644 --- a/src/views/DataAnalyse/diagram/components/questionTypes/quick/CascaderType.vue +++ b/src/views/DataAnalyse/diagram/components/questionTypes/quick/CascaderType.vue @@ -103,7 +103,7 @@ function renderChart(source) { data = clearData(source); } if (data.length === 0) return; - const config = useChartOption(data, type, data_label, other); + const config = useChartOption(data, type, data_label, other, props.data.max); option.value = config; } @@ -114,7 +114,7 @@ function handleUpdateAction(params) { if (empty_option) { data = clearData(data); } - const config = useChartOption(data, type, data_label, other); + const config = useChartOption(data, type, data_label, other, props.data.max); option.value = config; } diff --git a/src/views/DataAnalyse/diagram/components/questionTypes/quick/Institution.vue b/src/views/DataAnalyse/diagram/components/questionTypes/quick/Institution.vue index 543ca8bf..f302b325 100644 --- a/src/views/DataAnalyse/diagram/components/questionTypes/quick/Institution.vue +++ b/src/views/DataAnalyse/diagram/components/questionTypes/quick/Institution.vue @@ -105,7 +105,7 @@ function renderChart(source) { data = clearData(source); } if (data.length === 0) return; - const config = useChartOption(data, type, data_label, other); + const config = useChartOption(data, type, data_label, other, props.data.max); option.value = config; } @@ -116,7 +116,7 @@ function handleUpdateAction(params) { if (empty_option) { data = clearData(data); } - const config = useChartOption(data, type, data_label); + const config = useChartOption(data, type, data_label, null, props.data.max); option.value = config; } diff --git a/src/views/DataAnalyse/diagram/components/questionTypes/quick/Major.vue b/src/views/DataAnalyse/diagram/components/questionTypes/quick/Major.vue index 49eb0711..2b9882ba 100644 --- a/src/views/DataAnalyse/diagram/components/questionTypes/quick/Major.vue +++ b/src/views/DataAnalyse/diagram/components/questionTypes/quick/Major.vue @@ -97,7 +97,7 @@ function renderChart(source) { data = clearData(source); } if (data.length === 0) return; - const config = useChartOption(data, type, data_label); + const config = useChartOption(data, type, data_label, null, props.data.max); option.value = config; } @@ -108,7 +108,7 @@ function handleUpdateAction(params) { if (empty_option) { data = clearData(data); } - const config = useChartOption(data, type, data_label); + const config = useChartOption(data, type, data_label, null, props.data.max); option.value = config; } diff --git a/src/views/DataAnalyse/diagram/components/questionTypes/quick/ProvinceCityType.vue b/src/views/DataAnalyse/diagram/components/questionTypes/quick/ProvinceCityType.vue index c269bf65..e827755b 100644 --- a/src/views/DataAnalyse/diagram/components/questionTypes/quick/ProvinceCityType.vue +++ b/src/views/DataAnalyse/diagram/components/questionTypes/quick/ProvinceCityType.vue @@ -37,7 +37,7 @@