Merge branch 'qin_24'

src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/bar.vue

@@ -41,7 +41,7 @@ const drawPictures = () => {
     analyzeChartData({
       tableKey: props.tableKey,
       chartId: props.uuid,
-      setConfig: controlData.value,
+      setConfig: props.data,
     }).then((data) => {
       console.log("火1111111兔", data);
       if (data.code == 0 && data.data != null) {
@@ -132,7 +132,7 @@ watch(
   { deep: true }
 );
 watch(
-  () => controlData.value,
+  () => props.data,
   (val: any) => {
     console.log("画图完毕--改变-->", val);
     drawPictures();

src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/barRace.vue

@@ -7,7 +7,12 @@
 import { analyzeChartData } from "@/api/chart/index";
 import { echatsViews } from "@/api/DesignForm/types";
 import * as echarts from "echarts";
-
+import { useDesignEchartsStore } from "@/store/DesignForm/designForm";
+const store = useDesignEchartsStore() as any; //自定义表单存储器
+//获取当前激活的项目
+const controlData = computed(() => {
+  return store.controlAttr;
+});
 const props = withDefaults(
   defineProps<{
     uuid: string;
@@ -29,10 +34,14 @@ var myChart = ref<any>();
 @ 时间: 2025-06-26 11:34:21
 @ 功能: 画图
 */
-const drawPictures = () => {
+const drawBarracetures = () => {
   if (props.uuid && props.uuid != "") {
     myChart.value = echarts.init(document.getElementById(props.uuid) as HTMLDivElement);
-    analyzeChartData({ tableKey: props.tableKey, chartId: props.uuid }).then((data) => {
+    analyzeChartData({
+      tableKey: props.tableKey,
+      chartId: props.uuid,
+      setConfig: props.data,
+    }).then((data) => {
       console.log("画图排行榜---->1", data);
       if (data.code == 0 && data.data != null) {
         let radMap = data.data;
@@ -131,10 +140,17 @@ const searBut = (val: string) => {
   }
   return false;
 };
-
+watch(
+  () => props.data,
+  (val: any) => {
+    console.log("画图完毕--改变-->", val);
+    drawBarracetures();
+  },
+  { deep: true }
+);
 onMounted(() => {
   nextTick(() => {
-    drawPictures();
+    drawBarracetures();
   });
 });
 </script>

src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/line.vue

@@ -34,7 +34,7 @@ var myChartPie = ref<any>();
 @ 时间: 2025-06-26 11:34:21
 @ 功能: 画图
 */
-const drawPie = () => {
+const drawLine = () => {
   if (props.uuid && props.uuid != "") {
     myChartPie.value = echarts.init(
       document.getElementById(props.uuid) as HTMLDivElement
@@ -42,7 +42,7 @@ const drawPie = () => {
     analyzeChartData({
       tableKey: props.tableKey,
       chartId: props.uuid,
-      etConfig: controlData.value,
+      setConfig: props.data,
     }).then((data) => {
       console.log("火兔", data);
       if (data.code == 0 && data.data != null) {
@@ -114,13 +114,13 @@ watch(
   () => props.data,
   (val: any) => {
     console.log("画图完毕--改变-->", val);
-    drawPie();
+    drawLine();
   },
   { deep: true }
 );
 onMounted(() => {
   nextTick(() => {
-    drawPie();
+    drawLine();
   });
 });
 </script>
@@ -229,7 +229,7 @@ onMounted(() => {
 </template>
 <style lang="scss" scoped>
 .barBox {
-  height: 250px;
+  height: 350px;
   width: 100%;
 }
 .spaceBox {

src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/pie.vue

@@ -41,7 +41,7 @@ const drawPie = () => {
     analyzeChartData({
       tableKey: props.tableKey,
       chartId: props.uuid,
-      etConfig: controlData.value,
+      setConfig: props.data,
     }).then((data) => {
       console.log("火兔---->1", data);
       if (data.code == 0 && data.data != null) {

src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/radar.vue

@@ -41,7 +41,7 @@ const drawRadar = () => {
     analyzeChartData({
       tableKey: props.tableKey,
       chartId: props.uuid,
-      etConfig: controlData.value,
+      setConfig: props.data,
     }).then((data) => {
       console.log("画图雷达---->1", data);
       if (data.code == 0 && data.data != null) {

src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/target.vue

@@ -30,7 +30,7 @@ const getTargetData = () => {
     analyzeChartData({
       tableKey: props.tableKey,
       chartId: props.uuid,
-      etConfig: controlData.value,
+      setConfig: props.data,
     }).then((data) => {
       console.log("获取指标数据---->1", data);
       listAry.value = data.data;

src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/container.vue

@@ -126,6 +126,7 @@ const click = (action: string, index: number, item?: any) => {
     const newItem = jsonParseStringify(item);
     dataList.value.splice(index, 0, Object.assign(newItem, { uuid: key }));
   } else if (action === "del") {
+    console.log("要删除的对象------->", index);
     dataList.value.splice(index, 1);
     // 清空右侧栏信息
     store.setActiveKey("");
@@ -186,7 +187,7 @@ const getFormItemStyle = (ele: echatsViews) => {
     }"
     @add="draggableAdd"
   >
-    <template #item="{ element }">
+    <template #item="{ element, index }">
       <div
         class="group"
         :class="{