From 6408617e6db0ab8568c60b628f978b9c87af5740 Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Fri, 18 Jul 2025 15:36:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=B1=E7=8A=B6=E5=9B=BE=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/DesignForm/tableButton.ts | 9 +++ src/api/chart/index.ts | 8 +++ src/components/DesignForm/app/index.vue | 45 +++++++++++- .../DesignForm/tableListPage/index.vue | 48 ++++++++++++- src/permission.ts | 2 +- .../appPage/appPageForm/dataBoard.vue | 3 +- .../appPageForm/echatesUnit/chart/bar.vue | 71 ++++++++++++------- .../appPage/appPageForm/echatesUnit/right.vue | 25 ++++++- .../appPage/appPageForm/openAppFormPage.vue | 36 ++++++++-- .../lowcodepage/runApp/runAppForm.vue | 23 +++++- 10 files changed, 231 insertions(+), 39 deletions(-) diff --git a/src/api/DesignForm/tableButton.ts b/src/api/DesignForm/tableButton.ts index ba813e3..c6dae84 100644 --- a/src/api/DesignForm/tableButton.ts +++ b/src/api/DesignForm/tableButton.ts @@ -346,6 +346,15 @@ export interface viewPageType { sortWord:string, sort:number } + }, + chart:{ + status:boolean, + isClick:boolean, + form:{ + mapWord:string, + sortWord:string, + sort:number + } } } diff --git a/src/api/chart/index.ts b/src/api/chart/index.ts index 0311f5f..d32ff26 100644 --- a/src/api/chart/index.ts +++ b/src/api/chart/index.ts @@ -23,3 +23,11 @@ export function getChartCont(data?: any) { data: data }); } +//根据条件解析图标结果 +export function analyzeChartData(data?: any) { + return request({ + url: "/systemapi/chart/analyzeChartData", + method: 'post', + data: data + }); +} diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue index 302f64a..d9f4639 100644 --- a/src/components/DesignForm/app/index.vue +++ b/src/components/DesignForm/app/index.vue @@ -53,6 +53,7 @@ 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"; const props = withDefaults( defineProps<{ @@ -80,6 +81,7 @@ const props = withDefaults( formBasicConfig?: any; fieldsDetailList?: any; orgAndManTree?: any; + echatsViews: echatsViews; }>(), { showPage: true, @@ -130,6 +132,12 @@ const props = withDefaults( }, } ); +const echatsViewsdf = computed({ + get() { + return props.echatsViews; + }, + set(newVal: any) {}, +}); const emits = defineEmits<{ (e: "selectionChange", row: any): void; (e: "btnClick", btn: any, row?: any): void; // 列表上面及表格列表里添加删除按钮事件 @@ -1422,6 +1430,7 @@ const tabsView = (val: any, types: number) => { props.viewPage.gantt.isClick = false; props.viewPage.map.isClick = false; props.viewPage.card.isClick = false; + props.viewPage.chart.isClick = false; break; case 3: props.viewPage.list.isClick = false; @@ -1429,6 +1438,7 @@ const tabsView = (val: any, types: number) => { props.viewPage.gantt.isClick = false; props.viewPage.map.isClick = false; props.viewPage.card.isClick = false; + props.viewPage.chart.isClick = false; getPageData(); break; case 4: @@ -1437,15 +1447,26 @@ const tabsView = (val: any, types: number) => { props.viewPage.time.isClick = false; props.viewPage.map.isClick = false; props.viewPage.card.isClick = false; + props.viewPage.chart.isClick = false; break; case 5: - props.viewPage.card.isClick = false; props.viewPage.list.isClick = false; props.viewPage.date.isClick = false; props.viewPage.time.isClick = false; props.viewPage.gantt.isClick = false; + props.viewPage.card.isClick = false; + props.viewPage.chart.isClick = false; break; case 6: + props.viewPage.list.isClick = false; + props.viewPage.date.isClick = false; + props.viewPage.time.isClick = false; + props.viewPage.gantt.isClick = false; + props.viewPage.map.isClick = false; + props.viewPage.chart.isClick = false; + break; + case 7: + props.viewPage.card.isClick = false; props.viewPage.list.isClick = false; props.viewPage.date.isClick = false; props.viewPage.time.isClick = false; @@ -1458,6 +1479,7 @@ const tabsView = (val: any, types: number) => { props.viewPage.time.isClick = false; props.viewPage.gantt.isClick = false; props.viewPage.map.isClick = false; + props.viewPage.chart.isClick = false; break; } }; @@ -1762,6 +1784,20 @@ const readerColumnSun = (column: any) => { @click="tabsView(props.viewPage.map, 5)" /> + + + @@ -2082,6 +2118,13 @@ const readerColumnSun = (column: any) => { :columns-filter="columnsFilter" /> + + + (), { showPage: true, @@ -118,6 +120,13 @@ const props = withDefaults( }, } ); + +const echatsViewsdf = computed({ + get() { + return props.echatsViews; + }, + set(newVal: any) {}, +}); const emits = defineEmits<{ (e: "selectionChange", row: any): void; (e: "btnClick", btn: any, row?: any): void; // 列表上面及表格列表里添加删除按钮事件 @@ -1361,6 +1370,7 @@ const tabsView = (val: any, types: number) => { props.viewPage.gantt.isClick = false; props.viewPage.map.isClick = false; props.viewPage.card.isClick = false; + props.viewPage.chart.isClick = false; break; case 3: props.viewPage.list.isClick = false; @@ -1368,6 +1378,7 @@ const tabsView = (val: any, types: number) => { props.viewPage.gantt.isClick = false; props.viewPage.map.isClick = false; props.viewPage.card.isClick = false; + props.viewPage.chart.isClick = false; getPageData(); break; case 4: @@ -1376,6 +1387,7 @@ const tabsView = (val: any, types: number) => { props.viewPage.time.isClick = false; props.viewPage.map.isClick = false; props.viewPage.card.isClick = false; + props.viewPage.chart.isClick = false; break; case 5: props.viewPage.list.isClick = false; @@ -1383,8 +1395,18 @@ const tabsView = (val: any, types: number) => { props.viewPage.time.isClick = false; props.viewPage.gantt.isClick = false; props.viewPage.card.isClick = false; + props.viewPage.chart.isClick = false; break; case 6: + props.viewPage.list.isClick = false; + props.viewPage.date.isClick = false; + props.viewPage.time.isClick = false; + props.viewPage.gantt.isClick = false; + props.viewPage.map.isClick = false; + props.viewPage.chart.isClick = false; + break; + case 7: + props.viewPage.card.isClick = false; props.viewPage.list.isClick = false; props.viewPage.date.isClick = false; props.viewPage.time.isClick = false; @@ -1397,6 +1419,7 @@ const tabsView = (val: any, types: number) => { props.viewPage.time.isClick = false; props.viewPage.gantt.isClick = false; props.viewPage.map.isClick = false; + props.viewPage.chart.isClick = false; break; } }; @@ -1768,6 +1791,20 @@ const readerColumnSun = (column: any) => { @click="tabsView(viewPage.map, 5)" /> + + + @@ -2118,9 +2155,14 @@ const readerColumnSun = (column: any) => { :columns-filter="columnsFilter" /> - - {{ tableDataList }} + + + { NProgress.start(); - + console.log("白名单路由----》"); const hasToken = localStorage.getItem(appTokenKey); // console.log("白名单路由----》",hasToken,"--->",to.path); if (hasToken) { diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/dataBoard.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/dataBoard.vue index 6986644..81bdf8b 100644 --- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/dataBoard.vue +++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/dataBoard.vue @@ -7,6 +7,7 @@ import { echatsViews } from "@/api/DesignForm/types"; import { dimMeaInfo } from "@/api/chart/index"; import { dimMeaFormTable, countChartValue, getChartCont } from "@/api/chart/index"; +import { useDesignEchartsStore } from "@/store/DesignForm/designForm"; //引入页面 import LeftPath from "@/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/left.vue"; @@ -47,7 +48,7 @@ const props = defineProps({ }, }, }); - +const store = useDesignEchartsStore() as any; //自定义表单存储器 const butLoading = ref(false); const echartsInfo = reactive({ uuid: "12332", 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 40856a4..39e4baf 100644 --- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/bar.vue +++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/bar.vue @@ -4,6 +4,7 @@ @ 备注: 柱状图 -->