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 @@ @ 备注: 柱状图 --> @@ -198,7 +216,7 @@ const setSearch = (val: searchInfo) => { 未设置维度字段 - {{ item.title }} + {{ item.oldTitle }} { 未设置度量字段 - {{ item.title }} + {{ item.title }}({{ shuxingmh(item.method) }}) { 未设置过滤器 - {{ item.lable }} + {{ item }} + {{ item.oldTitle }} (""); const appInitData = ref(""); //app表单 const stateForm = reactive({ @@ -159,6 +160,14 @@ const stateList = reactive({ ranks: 3, }, }, + chart: { + status: false, + isClick: false, + form: { + sortWord: "", + sortClass: 1, + }, + }, }, }); @@ -196,7 +205,7 @@ const activePage = ref(0); //默认选择的页面 /** @ 作者: 秦东 @ 时间: 2024-05-18 10:13:15 -@ 功能: +@ 功能: */ const handleAppPageClick = () => {}; @@ -208,8 +217,9 @@ const handleAppPageClick = () => {}; const gainAppFormPageInit = () => { if (props.menusInfo.id) { gainAppPageInfo({ id: props.menusInfo.id }).then((data) => { - console.log("获取初始化表单数据", data); + console.log("获取初始化表单数据----->", data); appInitData.value = data.data; + echatsViews.value = data.data.chartList; if (data.data.page && data.data.pageList && data.data.appFlow) { activePage.value = 1; } else if (data.data.page && !data.data.pageList && data.data.appFlow) { @@ -356,8 +366,16 @@ const gainAppFormPageInit = () => { stateList.dict = stateData.dict; stateList.refreshTable = stateData.refreshTable; if (stateData.view) { - stateList.view = stateData.view; + // stateList.view = stateData.view; + stateList.view.card = stateData.view.card; + stateList.view.list = stateData.view.list; + stateList.view.date = stateData.view.date; + stateList.view.time = stateData.view.time; + stateList.view.gantt = stateData.view.gantt; + stateList.view.map = stateData.view.map; } + stateList.view.chart.status = data.data.chart; + // console.log("开发---->", stateList.view); } if (data.data.page) { // console.log("data.data.mastesform", data.data) @@ -484,7 +502,7 @@ defineExpose({ } } - + } */ @@ -501,6 +519,7 @@ defineExpose({ + @@ -519,6 +538,7 @@ defineExpose({ :form-basic-config="stateForm.formData.form" :fields-detail-list="stateForm.formData.list" :org-and-man-tree="orgAndManTree" + :echats-views="echatsViews" @optionsValue5Get5="optionsValue5Get5" /> + diff --git a/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue b/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue index 010ccab..5def235 100644 --- a/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue +++ b/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue @@ -157,8 +157,17 @@ const stateList = reactive({ title: [], }, }, + chart: { + status: false, + isClick: false, + form: { + sortWord: "", + sortClass: 1, + }, + }, }, }); +const echatsViews = ref(""); const appFormTitle = ref(""); const versionTitle = ref(""); //表单名称 const versionId = ref(""); //表单版本号 @@ -185,6 +194,7 @@ const initLoadData = () => { gainAppPageInfo({ id: props.pickAppMenu.id }).then((data) => { // console.log("获取初始化表单数据bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb", data); appInitData.value = data.data; + echatsViews.value = data.data.chartList; // console.log("获取初始化表单数据---!",appInitData.value) mastesformjson.value = data.data.appForm.mastesformjson; isFlow.value = data.data.appForm.flowIsOpen; @@ -280,9 +290,19 @@ const initLoadData = () => { stateList.formApi = stateData.formApi; stateList.dict = stateData.dict; stateList.refreshTable = stateData.refreshTable; + // if (stateData.view) { + // stateList.view = stateData.view; + // } if (stateData.view) { - stateList.view = stateData.view; + // stateList.view = stateData.view; + stateList.view.card = stateData.view.card; + stateList.view.list = stateData.view.list; + stateList.view.date = stateData.view.date; + stateList.view.time = stateData.view.time; + stateList.view.gantt = stateData.view.gantt; + stateList.view.map = stateData.view.map; } + stateList.view.chart.status = data.data.chart; } if (data.data.page) { // console.log("data.data.mastesform", data.data) @@ -389,6 +409,7 @@ function optionsValue3Get3(data: any, fieldName: string) { :form-basic-config="stateForm.formData.form" :fields-detail-list="stateForm.formData.list" :org-and-man-tree="orgAndManTree" + :echats-views="echatsViews" />