diff --git a/src/components/DesignForm/public/expand/lowcodeImage.vue b/src/components/DesignForm/public/expand/lowcodeImage.vue
index 0b3a8dd..f82d4c8 100644
--- a/src/components/DesignForm/public/expand/lowcodeImage.vue
+++ b/src/components/DesignForm/public/expand/lowcodeImage.vue
@@ -120,7 +120,11 @@ const getFormItemInputStyle = (ele: any, sty: number) => {
diff --git a/src/components/DesignForm/public/expand/uploadPageList.vue b/src/components/DesignForm/public/expand/uploadPageList.vue
index f8cb337..340b2c2 100644
--- a/src/components/DesignForm/public/expand/uploadPageList.vue
+++ b/src/components/DesignForm/public/expand/uploadPageList.vue
@@ -3,27 +3,30 @@
@ 时间: 2024-09-17 14:57:49
@ 备注: 解析上传文件问题
-->
-
-
+
+ {{ props.control.listType }}
+
+
+
+
-
diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue
index 1ea16ef..1436830 100644
--- a/src/components/DesignForm/public/form/formItem.vue
+++ b/src/components/DesignForm/public/form/formItem.vue
@@ -1066,7 +1066,7 @@ const diGuiJilian = (val: any, options: any[]) => {
/>
@@ -1194,6 +1194,21 @@ const diGuiJilian = (val: any, options: any[]) => {
:type="type"
v-model="value"
/>
+
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/barRace.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/barRace.vue
index bd58334..cc38a4b 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/barRace.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/barRace.vue
@@ -46,13 +46,13 @@ const drawBarracetures = () => {
if (data.code == 0 && data.data != null) {
let radMap = data.data;
let seriesList = new Array();
- if (radMap.seriesData && Array.isArray(radMap.seriesData)) {
- radMap.seriesData.forEach((item: any) => {
+ if (radMap.series && Array.isArray(radMap.series)) {
+ radMap.series.forEach((item: any) => {
seriesList.push({
realtimeSort: true,
name: item.name,
type: "bar",
- data: item.value,
+ data: item.data,
label: {
show: true,
position: "right",
@@ -61,6 +61,7 @@ const drawBarracetures = () => {
});
});
}
+ console.log("排行榜--->", seriesList);
let optionData = {
grid: {
left: "2%",
@@ -80,7 +81,7 @@ const drawBarracetures = () => {
},
yAxis: {
type: "category",
- data: radMap.yAxisData,
+ data: radMap.xAxis.data,
inverse: true,
max: radMap.max, // only the largest 3 bars will be displayed
},
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/radar.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/radar.vue
index 170dddc..a790c10 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/radar.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/chart/radar.vue
@@ -65,6 +65,7 @@ const drawRadar = () => {
},
],
};
+ console.log("雷达数据结构---》", optionData);
myChartPie.value.setOption(optionData);
// myChartPie.value.resize();
} else {
@@ -167,7 +168,7 @@ onMounted(() => {
{
.demo-form-inline .el-select {
--el-select-width: 200px;
}
+.demo-date-picker {
+ display: flex;
+ width: 100%;
+ padding: 0;
+ flex-wrap: wrap;
+}
+.demo-date-picker .block {
+ padding: 30px 0;
+ text-align: center;
+ border-right: solid 1px var(--el-border-color);
+ flex: 1;
+}
+.demo-date-picker .block:last-child {
+ border-right: none;
+}
+.demo-date-picker .demonstration {
+ display: block;
+ color: var(--el-text-color-secondary);
+ font-size: 14px;
+ margin-bottom: 20px;
+}