diff --git a/src/api/DesignForm/types.ts b/src/api/DesignForm/types.ts index 95669c7..282ec46 100644 --- a/src/api/DesignForm/types.ts +++ b/src/api/DesignForm/types.ts @@ -229,6 +229,8 @@ export interface echatsViews { title:string; y:string[]; x:string[]; + ysun?: string[]; + xsun?: string[]; filter:string[]; timelength:number; search:searchInfo; diff --git a/src/components/DesignForm/public/expand/userDialog.vue b/src/components/DesignForm/public/expand/userDialog.vue index 2f3d289..30fc785 100644 --- a/src/components/DesignForm/public/expand/userDialog.vue +++ b/src/components/DesignForm/public/expand/userDialog.vue @@ -205,12 +205,13 @@ const defaultProps = { @node-click="handleNodeClick" :props="defaultProps" highlight-current + clearable /> diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/dataBoard.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/dataBoard.vue index fa8bc5d..e34c47a 100644 --- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/dataBoard.vue +++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/dataBoard.vue @@ -58,6 +58,8 @@ const echartsInfo = reactive({ widthBox: 0, y: [], x: [], + ysun: [], + xsun: [], filter: [], timelength: 1, search: { @@ -82,8 +84,8 @@ const dimMeaList = () => { console.log("获取维度义量化字段", data); dimAry.value = data.data.dimList; meaAry.value = data.data.meaList; - sunDimAry.value = data.data.sunDimList; - sunMeaAry.value = data.data.sunMeaList; + sunDimAry.value = data.data.SunDimListAry; + sunMeaAry.value = data.data.SunMeaListAry; }); /*获取视图数据*/ getChartCont({ id: props.state.formData.form.name }).then((data) => { diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/winBox/dimMea.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/winBox/dimMea.vue index cd40d26..4ec12f6 100644 --- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/winBox/dimMea.vue +++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/winBox/dimMea.vue @@ -508,6 +508,11 @@ const pickDimMeaSet = () => { "确定选择----------checkListsunduLiang-------------->", checkListsunduLiang.value ); + console.log( + "确定选择----------checkListsund-------------->", + checkListsund.value + ); + switch (props.dimMeaType) { case 2: drawTitle.value = "添加度量"; @@ -529,6 +534,17 @@ const pickDimMeaSet = () => { handleClose(); }; +/** +@ 作者: 秦东 +@ 时间: 2025-08-27 10:20:38 +@ 功能: 组装子表数据结构 +*/ +const makeSunTableStruct = () => { + +} + + + /** @ 作者: 秦东 @ 时间: 2025-06-30 14:28:37 @@ -702,16 +718,17 @@ const checkListsunduLiang = ref([]); + 子表 - + -
- +
+
@@ -765,15 +782,15 @@ const checkListsunduLiang = ref([]);
子表 - - + + -
- +
+
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue index b9eb42b..40e22d5 100644 --- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue +++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue @@ -1617,7 +1617,7 @@ const delAllPick = () => {
- {{ state.view }} + {
- {{ state.view }} +