Merge remote-tracking branch 'yx/250605-added-yzt' into test20250220

This commit is contained in:
joshen
2025-06-05 18:22:15 +08:00

View File

@@ -87,7 +87,7 @@
title="学员完成项目漏斗" title="学员完成项目漏斗"
:bordered="false" :bordered="false"
> >
<div ref="funnelChart" style="width: 100%; height: 300px;"></div> <div ref="funnelChart" style="width: 100%; height: 300px;">111</div>
</a-card> </a-card>
<!-- 完成比例柱状图 --> <!-- 完成比例柱状图 -->
@@ -309,18 +309,18 @@
onChange: onSelectChange, onChange: onSelectChange,
}" }"
> >
<!-- <template v-slot:header>--> <template v-slot:header>
<!-- <draggable--> <draggable
<!-- v-model="columns"--> v-model="columns"
<!-- item-key="key"--> item-key="key"
<!-- :list="columns"--> :list="columns"
<!-- :group="{ name: 'columns', pull: 'clone', put: false }"--> :group="{ name: 'columns', pull: 'clone', put: false }"
<!-- >--> >
<!-- <template #item="{ element }">--> <template #item="{ element }">
<!-- <a-table-column :title="element.title" :dataIndex="element.dataIndex" :key="element.key"></a-table-column>--> <a-table-column :title="element.title" :dataIndex="element.dataIndex" :key="element.key"></a-table-column>
<!-- </template>--> </template>
<!-- </draggable>--> </draggable>
<!-- </template>--> </template>
</a-table> </a-table>
@@ -358,6 +358,7 @@ import {useStore} from "vuex";
import PostSelectNew from "@/components/growthpath/PostSelect.vue"; import PostSelectNew from "@/components/growthpath/PostSelect.vue";
import OfficeSelect from "@/components/growthpath/OfficeSelect.vue"; import OfficeSelect from "@/components/growthpath/OfficeSelect.vue";
import draggable from 'vuedraggable'; import draggable from 'vuedraggable';
// import {log} from "echarts/types/src/util/log";
export default { export default {
@@ -380,6 +381,8 @@ export default {
let myPieChart = null; let myPieChart = null;
onMounted(() => { onMounted(() => {
console.log(88888888888)
console.log(funnelChart.value)
// 初始化漏斗图 // 初始化漏斗图
myFunnelChart = echarts.init(funnelChart.value); myFunnelChart = echarts.init(funnelChart.value);
const funnelOption = { const funnelOption = {
@@ -593,9 +596,9 @@ export default {
// 窗口大小变化时重新调整图表大小 // 窗口大小变化时重新调整图表大小
window.addEventListener('resize', () => { window.addEventListener('resize', () => {
myFunnelChart?.resize();
myChart?.resize(); myChart?.resize();
myPieChart?.resize(); myPieChart?.resize();
myFunnelChart?.resize();
}); });
}); });
@@ -676,15 +679,19 @@ export default {
} }
function afterApiPage(res) { function afterApiPage(res) {
console.log(res)
if (res && res.data) { if (res && res.data) {
let resData = res.data; let resData = res.data;
if (resData.code == 200) { if (res.code == 200) {
let list = resData.data?.records?.map((item) => { let list = res.data?.records?.map((item) => {
return { return {
key: item.id, key: item.id,
...item, ...item,
}; };
}); });
alert("列表出现")
console.log("list出现")
console.log(list)
tableData.value = list; tableData.value = list;
state.tableDataTotal = resData.data?.total; state.tableDataTotal = resData.data?.total;
} else { } else {
@@ -2315,7 +2322,10 @@ export default {
handleResizeColumn, handleResizeColumn,
onDragEnd, onDragEnd,
sysTypeOptions, sysTypeOptions,
handleTableChange handleTableChange,
funnelChart,
chart,
pieChart
}; };
}, },
}; };