diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue index 60c45d7..a15ae6d 100644 --- a/src/components/DesignForm/app/index.vue +++ b/src/components/DesignForm/app/index.vue @@ -1768,7 +1768,7 @@ const transformOption = (val: string | number, type?: string) => { }; const readerColumnSun = (column: any) => { - console.log("表头label长度-11->", column); + // console.log("表头label长度-11->", column); let labelLong = 0; // 表头label长度 if (column.children) { labelLong = column.children.length; @@ -1782,7 +1782,7 @@ const readerColumnSun = (column: any) => { countLenght = countLenght + item.label.length * 15; } }); - console.log("表头label长度-->", countLenght); + // console.log("表头label长度-->", countLenght); return countLenght; } else { return 100; diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue index 2930c6f..0df0289 100644 --- a/src/components/DesignForm/tableListPage/index.vue +++ b/src/components/DesignForm/tableListPage/index.vue @@ -1644,7 +1644,7 @@ const readerColumnSun = (column: any) => { countLenght = countLenght + item.label.length * 15; } }); - console.log("表头label长度-->", countLenght); + // console.log("表头label长度-->", countLenght); return countLenght; } else { return 100; @@ -2047,8 +2047,7 @@ const readerColumnSun = (column: any) => { :label="item.label" :width="readerColumnSun(item)" > - {{ data.tableProps }} + { {{ scope.row[scope.column.property] }} + + {{ scope.row[scope.column.property] }} + diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/bar.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/bar.vue index 727ab61..34b0ce6 100644 --- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/bar.vue +++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/bar.vue @@ -30,6 +30,17 @@ const props = withDefaults( } ); var myChart = ref(); +const seriesAnlay = (listVal: any[]) => { + if (listVal && Array.isArray(listVal)) { + listVal.forEach((item: any) => { + item.label = { + show: true, + position: "top", + }; + }); + } + return listVal; +}; /** @ 作者: 秦东 @ 时间: 2025-06-26 11:34:21 @@ -45,16 +56,44 @@ const drawPictures = () => { }).then((data) => { console.log("火1111111兔", data); if (data.code == 0 && data.data != null) { - let optVal = data.data; - // optVal.grid = { - // left: "2%", - // right: "2%", - // bottom: "15%", - // top: "15%", - // containLabel: true, + // let optVal = data.data; + // let optVal = { + // tooltip: { + // trigger: "axis", + // axisPointer: { + // type: "shadow", + // }, + // }, + // grid: { + // left: "2%", + // right: "2%", + // bottom: "15%", + // top: "15%", + // containLabel: true, + // }, + // ...data.data, // }; - myChart.value.setOption(optVal); - myChart.value.resize(); + let optChart = { + grid: { + left: "2%", + right: "2%", + bottom: "15%", + top: "15%", + containLabel: true, + }, + tooltip: { + trigger: "axis", + axisPointer: { + type: "shadow", + }, + }, + legend: data.data.legend, + yAxis: data.data.yAxis, + xAxis: data.data.xAxis, + series: seriesAnlay(data.data.series), + }; + myChart.value.setOption(optChart); + // myChart.value.resize(); } else { myChart.value.setOption({ grid: { diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/barRace.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/barRace.vue index 0c5f3ea..bd58334 100644 --- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/barRace.vue +++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/barRace.vue @@ -87,7 +87,7 @@ const drawBarracetures = () => { series: seriesList, }; myChart.value.setOption(optionData); - myChart.value.resize(); + // myChart.value.resize(); } else { myChart.value.setOption({ grid: { @@ -120,7 +120,7 @@ const drawBarracetures = () => { }, ], }); - myChart.value.resize(); + // myChart.value.resize(); } }); diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/line.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/line.vue index 6b57cd7..786dca3 100644 --- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/line.vue +++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/line.vue @@ -28,7 +28,31 @@ const props = withDefaults( } ); var myChartPie = ref(); +const pinhuaOrzejiao = ref(false); +/** +@ 作者: 秦东 +@ 时间: 2025-08-04 14:31:20 +@ 功能: 解析数据结果 +*/ +const seriesAnlay = (listVal: any[]) => { + if (listVal && Array.isArray(listVal)) { + listVal.forEach((item: any) => { + item.smooth = pinhuaOrzejiao.value; + item.label = { + show: true, + position: "top", + }; + }); + } + return listVal; +}; +watch( + () => pinhuaOrzejiao.value, + () => { + drawLine(); + } +); /** @ 作者: 秦东 @ 时间: 2025-06-26 11:34:21 @@ -46,18 +70,50 @@ const drawLine = () => { }).then((data) => { console.log("火兔", data); if (data.code == 0 && data.data != null) { - let optVal = data.data; - optVal.grid = { - left: "2%", - right: "2%", - bottom: "15%", - top: "15%", - containLabel: true, + let optChart = { + grid: { + left: "2%", + right: "2%", + bottom: "15%", + top: "15%", + containLabel: true, + }, + tooltip: { + trigger: "axis", + axisPointer: { + type: "shadow", + }, + }, + legend: data.data.legend, + yAxis: data.data.yAxis, + xAxis: data.data.xAxis, + series: seriesAnlay(data.data.series), }; - myChartPie.value.setOption(optVal); - myChartPie.value.resize(); + + // let optVal = data.data; + // optVal.grid = { + // left: "2%", + // right: "2%", + // bottom: "15%", + // top: "15%", + // containLabel: true, + // }; + // (optVal.tooltip = { + // trigger: "axis", + // axisPointer: { + // type: "shadow", + // }, + // }), + myChartPie.value.setOption(optChart); + // myChartPie.value.resize(); } else { myChartPie.value.setOption({ + tooltip: { + trigger: "axis", + axisPointer: { + type: "shadow", + }, + }, grid: { left: "2%", right: "2%", @@ -80,17 +136,17 @@ const drawLine = () => { name: "销量", data: [820, 932, 901, 934, 1290, 1330, 1320], type: "line", - smooth: true, + smooth: pinhuaOrzejiao.value, }, { name: "销量科技", data: [822, 942, 951, 4, 1290, 1330, 1320], type: "line", - smooth: true, + smooth: pinhuaOrzejiao.value, }, ], }); - myChartPie.value.resize(); + // myChartPie.value.resize(); } }); @@ -126,9 +182,12 @@ onMounted(() => { - - - {{ props.data.title }} + + + + {{ props.data.title }} + + { .demo-form-inline .el-select { --el-select-width: 200px; } +.leftOrRight { + display: flex; + justify-content: space-between; + align-items: center; +} diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/pie.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/pie.vue index 0ef11f2..5e210b1 100644 --- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/pie.vue +++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/pie.vue @@ -145,6 +145,7 @@ const searBut = (val: string) => { } return false; }; + watch( () => props.data, (val: any) => { diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/radar.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/radar.vue index 8a73f1f..170dddc 100644 --- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/radar.vue +++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/radar.vue @@ -66,7 +66,7 @@ const drawRadar = () => { ], }; myChartPie.value.setOption(optionData); - myChartPie.value.resize(); + // myChartPie.value.resize(); } else { myChartPie.value.setOption({ grid: { diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/container.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/container.vue index f3525c6..054fdc2 100644 --- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/container.vue +++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/container.vue @@ -106,6 +106,7 @@ const getGroupName = (item: any) => { } }; const groupClick = (item: any, ele?: string) => { + // if (props.types == 5) { store.setActiveKey(getGroupName(item)); store.setControlAttr(item); // grid时显示添加列按钮 @@ -113,7 +114,9 @@ const groupClick = (item: any, ele?: string) => { // state.clone = !notNested(item.type) // state.clone = !notNestedTableFlex(item.type); pickEcharts.value = item; - console.log("点击激活当前--->", item, ele); + // } + + console.log("点击激活当前--->", props.types, item, ele); }; // 删除或复制 const click = (action: string, index: number, item?: any) => {