From f9500b9f24e0859f2be064efa74dc6559f897c72 Mon Sep 17 00:00:00 2001
From: herenshan112 <hreenshan112@163.com>
Date: Tue, 5 Aug 2025 14:31:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/public/expand/lowcodeImage.vue |   6 +-
 .../public/expand/uploadPageList.vue          | 162 ++++++++++--------
 .../DesignForm/public/form/formItem.vue       |  17 +-
 .../appPageForm/echatesUnit/chart/barRace.vue |   9 +-
 .../appPageForm/echatesUnit/chart/radar.vue   |  24 ++-
 5 files changed, 139 insertions(+), 79 deletions(-)

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) => {
 <style lang="scss" scoped>
 .upload-demo {
   img {
-    width: 100%;
+    min-width: 150px;
+    max-width: 300px;
   }
 }
+.avatar {
+  width: 150px;
+}
 </style>
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
 @ 备注: 解析上传文件问题
 -->
-<script lang='ts' setup>
-import { AnalysisCss,AnalysisInputCss } from '@/components/DesignForm/public/form/calculate/cssInfo'
+<script lang="ts" setup>
+import {
+  AnalysisCss,
+  AnalysisInputCss,
+} from "@/components/DesignForm/public/form/calculate/cssInfo";
 const props = defineProps({
-	imgList:{
-		type:String,
-		default:""
-	},
-	data:{
-		type:Object,
-		default(){
-			return {}
-		}
-	},
-	control:{
-		type:Object,
-		default(){
-			return {}
-		}
-	}
-})
-const imgStr = ref<String>(props.imgList)
+  imgList: {
+    type: String,
+    default: "",
+  },
+  data: {
+    type: Object,
+    default() {
+      return {};
+    },
+  },
+  control: {
+    type: Object,
+    default() {
+      return {};
+    },
+  },
+});
+const imgStr = ref<String>(props.imgList);
 //组件css部分
 
 /**
@@ -43,64 +46,79 @@ const imgStr = ref<String>(props.imgList)
 // 		return []
 // 	}
 // }
-const imgAry =computed({
-	get: () => {
-		if(props.imgList != "" && props.imgList != null && props.imgList != undefined && props.imgList != "undefined"){
-			// let zj = props.imgList
-			// let img = zj.Split(",");
-			let arr = props.imgList.match(/[^,]+/g);
-			console.log("文件列表",arr)
-			return arr
-		}else{
-			return []
-		}
-	}
-})
-
-
-
-
+const imgAry = computed({
+  get: () => {
+    if (
+      props.imgList != "" &&
+      props.imgList != null &&
+      props.imgList != undefined &&
+      props.imgList != "undefined"
+    ) {
+      // let zj = props.imgList
+      // let img = zj.Split(",");
+      let arr = props.imgList.match(/[^,]+/g);
+      console.log("文件列表", arr);
+      return arr;
+    } else {
+      return [];
+    }
+  },
+});
 
 const listType = () => {
-	if(props.control.listType){
-		return props.control.listType
-	}else{
-		return "text"
-	}
-}
+  if (props.control.listType) {
+    return props.control.listType;
+  } else {
+    return "text";
+  }
+};
 //解析指定样式
-const getFormItemInputStyle = (ele: any,sty:number) => {
-    if(ele?.inputStyle){
-      console.log("返回栅格宽度4",AnalysisInputCss(ele?.inputStyle,sty))
-      return AnalysisInputCss(ele?.inputStyle,sty)
-    }
-}
+const getFormItemInputStyle = (ele: any, sty: number) => {
+  if (ele?.inputStyle) {
+    console.log("返回栅格宽度4", AnalysisInputCss(ele?.inputStyle, sty));
+    return AnalysisInputCss(ele?.inputStyle, sty);
+  }
+};
 const configStyle = computed(() => {
-    return props.data.styles || {}
-})
+  return props.data.styles || {};
+});
 </script>
 <template>
-	<div>
-		<div v-if="props.control.listType=='picture-card'">
-			<div v-for="item in imgAry">
-				<el-image class="imgCss" :style="getFormItemInputStyle(configStyle,2)" :src="item" :fit="fit" :preview-src-list="imgAry" />
-			</div>
-		</div>
-		<div v-else-if="props.control.listType=='picture'">
-			<div v-for="item in imgAry">
-				<el-image class="imgCss" :style="getFormItemInputStyle(configStyle,2)" :src="item" :fit="fit" :preview-src-list="imgAry" />
-			</div>
-		</div>
-		<div v-else>
-			<div v-for="item in imgAry">
-				<el-link :underline="false" :href="item" target="_blank">{{ item }}</el-link><br>
-			</div>
-		</div>
-	</div>
+  <div>
+    {{ props.control.listType }}
+    <div v-if="props.control.listType == 'picture-card'">
+      <div v-for="item in imgAry">
+        <el-image
+          class="imgCss"
+          :style="getFormItemInputStyle(configStyle, 2)"
+          :src="item"
+          :fit="fit"
+          :preview-src-list="imgAry"
+        />
+      </div>
+    </div>
+    <div v-else-if="props.control.listType == 'picture'">
+      <div v-for="item in imgAry">
+        <el-image
+          class="imgCss"
+          :style="getFormItemInputStyle(configStyle, 2)"
+          :src="item"
+          :fit="fit"
+          :preview-src-list="imgAry"
+        />
+      </div>
+    </div>
+    <div v-else>
+      <div v-for="item in imgAry">
+        <el-link :underline="false" :href="item" target="_blank">{{ item }}</el-link
+        ><br />
+      </div>
+    </div>
+  </div>
 </template>
-<style  lang='scss' scoped>
-.imgCss{
-	width: 100px;
-	height: 100px;
+<style lang="scss" scoped>
+.imgCss {
+  width: 100px;
+  height: 100px;
 }
 </style>
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[]) => {
   />
 
   <LowcodeTransfer
-    v-else-if="judgeIsShow(data.name) && data.type === 'lowcodeTransfer' "
+    v-else-if="judgeIsShow(data.name) && data.type === 'lowcodeTransfer'"
     :data="data"
   />
 
@@ -1194,6 +1194,21 @@ const diGuiJilian = (val: any, options: any[]) => {
         :type="type"
         v-model="value"
       />
+      <component
+        v-else-if="['lowcodeImage'].includes(data.type)"
+        :is="currentComponent"
+        v-bind="control"
+        :disabled="judgeIsDisabled(data.name)"
+        :placeholder="
+          data.control.placeholder
+            ? data.control.placeholder
+            : '请选择' + getLabel(data.item)
+        "
+        :data="data"
+        :tablekey="props.tablekey"
+        :form-table-set-up="props.alldata"
+        v-model="value"
+      />
       <div class="form-value" v-else v-html="value"></div>
     </template>
     <template v-else>
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(() => {
         <el-date-picker
           v-else-if="item.type == 3 && item.timeType == 'year'"
           v-model="item.value"
-          type="yearrange"
+          type="yeayearrange"
           range-separator="To"
           start-placeholder="起始时间"
           end-placeholder="结束时间"
@@ -266,4 +267,25 @@ 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;
+}
 </style>