diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue index f37b799..c3326bb 100644 --- a/src/components/DesignForm/app/index.vue +++ b/src/components/DesignForm/app/index.vue @@ -54,7 +54,10 @@ import MapPage from "@/components/DesignForm/app/mapPage.vue"; import CalendarPage from "@/components/DesignForm/app/calendar/calendar1/calendarPage.vue"; import SearchSelect from "@/components/DesignForm/app/calendar/selectSearch.vue"; import AKSelect from "@/components/DesignForm/public/form/select.vue"; + import ContainerPath from "@/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/container.vue"; +import SeeContChart from "@/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/seeContChart.vue"; + import exportPanel from "../exportPanel.vue"; import importPanel from "../importPanel.vue"; import { EpPropMergeType } from "element-plus/es/utils"; @@ -2394,7 +2397,9 @@ const isObject = (obj) => { /> -
- + + +
+ + {{ props.data.title }} +
+
+ + + + + + +
+
-
+
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 9d26a79..80cd18a 100644 --- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/line.vue +++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/line.vue @@ -28,6 +28,7 @@ const props = withDefaults( }, } ); +const chartLoading = ref(false) const myChartPie = ref(); const lineChar = ref(null) const pinhuaOrzejiao = ref(false); @@ -72,6 +73,7 @@ watch( @ 功能: 画图 */ const drawLine = () => { + chartLoading.value = true if (props.uuid && props.uuid != "") { myChartPie.value.resize( { @@ -124,6 +126,7 @@ const drawLine = () => { // }), myChartPie.value.setOption(optChart); // myChartPie.value.resize(); + chartLoading.value = false; } else { myChartPie.value.setOption({ tooltip: { @@ -165,10 +168,52 @@ const drawLine = () => { ], }); // myChartPie.value.resize(); + chartLoading.value = false; } }); // console.log("画图完毕---->", props); + }else{ + myChartPie.value.setOption({ + tooltip: { + trigger: "axis", + axisPointer: { + type: "shadow", + }, + }, + grid: { + left: "2%", + right: "2%", + bottom: "5%", + top: "15%", + containLabel: true, + }, + xAxis: { + type: "category", + data: ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"], + }, + legend: { + data: ["销量", "销量科技"], + }, + yAxis: { + type: "value", + }, + series: [ + { + name: "销量", + data: [820, 932, 901, 934, 1290, 1330, 1320], + type: "line", + smooth: pinhuaOrzejiao.value, + }, + { + name: "销量科技", + data: [822, 942, 951, 4, 1290, 1330, 1320], + type: "line", + smooth: pinhuaOrzejiao.value, + }, + ], + }); + chartLoading.value = false; } }; /** @@ -347,7 +392,7 @@ const pickLine = () =>{ > -
+