From 7c9496727436fc131a1cc64b8a3e43ea3e5a1606 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 3 Sep 2025 15:47:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/formControlPropertiNew.vue     | 29 ++++++++++++++--
 .../DesignForm/public/expand/lowcodeImage.vue | 33 ++++++++++++-------
 .../DesignForm/tableListPage/formPageCont.vue | 10 +++---
 3 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 9e1b0fc..0c7d4bf 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -833,14 +833,14 @@ const attrList = computed(() => {
         vIf: state.isSearch,
         vShow: ["lowcodeImage"],
       },
-      {
+      /* {
         label: "添加时间水印",
         value: config.lowcodeImage,
         path: "config.lowcodeImage",
         type: "lowcodeImage_watermark",
         vIf: state.isSearch,
         vShow: ["lowcodeImage"],
-      },
+      }, */
       {
         label: "显示级别",
         value: config.organization,
@@ -4111,7 +4111,7 @@ const aiAgentList = ref([
           <el-divider content-position="left">通用属性</el-divider>
 
           <template v-for="(item, index) in attrList" :key="index">
-            <template v-if="item.label == '添加时间水印'">
+            <!-- <template v-if="item.label == '添加时间水印'">
 
                   <el-form-item :label="item.label" v-if="controlData.control.onSiteShot=='1'" class="form_cont">
                         <el-radio-group v-model="controlData.control.watermark">
@@ -4119,6 +4119,29 @@ const aiAgentList = ref([
                           <el-radio value="">否</el-radio>
                         </el-radio-group>
                   </el-form-item>
+            </template> -->
+            <template v-if="item.label == '必须现场拍照'">
+
+                  <el-form-item :label="item.label" v-if="controlData.control.useDefaultImg==false" class="form_cont">
+                        <el-radio-group v-model="controlData.control.onSiteShot">
+                          <el-radio value="1">是</el-radio>
+                          <el-radio value="">否</el-radio>
+                        </el-radio-group>
+                        <div v-if="controlData.control.onSiteShot=='1'" style="width: 100%;border: 0px solid black; margin-top: 10px">
+                          <div style="position: relative; left: -84px">
+                          添加时间水印
+
+                            <el-radio-group v-model="controlData.control.watermark" style="position: relative; left: 8px">
+                              <el-radio value="1">是</el-radio>
+                              <el-radio value="">否</el-radio>
+                            </el-radio-group>
+                          </div>
+                          
+                        </div>
+                  </el-form-item>
+                  
+
+                  
             </template>
             
             <el-form-item v-else :label="item.label" class="form_cont">
diff --git a/src/components/DesignForm/public/expand/lowcodeImage.vue b/src/components/DesignForm/public/expand/lowcodeImage.vue
index 88ca50d..3c7328f 100644
--- a/src/components/DesignForm/public/expand/lowcodeImage.vue
+++ b/src/components/DesignForm/public/expand/lowcodeImage.vue
@@ -16,7 +16,7 @@ import { Plus } from '@element-plus/icons-vue'
 import type { UploadProps, UploadUserFile } from 'element-plus'
 
 
-const attrs = useAttrs()
+//const attrs = useAttrs()
 
 const props = withDefaults(
   defineProps<{
@@ -26,6 +26,7 @@ const props = withDefaults(
     data?: Object;
     formTableSetUp?: Object;
     imgUrl?: string;
+    type: string;
   }>(),
   {}
 );
@@ -192,12 +193,22 @@ function selectFile(){
 }
 </script>
 <template>
-  <img
-      v-if="props.data.control.useDefaultImg"
-      :src="value"
-      class="avatar"
-      :style="getFormItemInputStyle(configStyle, 2)"
-    />
+  <el-upload
+    v-bind="$props"
+    class="upload-demo"
+    :action="uploadUrl"
+    :show-file-list="false"
+    :on-success="handleAvatarSuccess"
+    :before-upload="beforeAvatarUpload"
+    v-loading="imgLoading"
+  >
+    <img
+        v-if="props.data.control.useDefaultImg"
+        :src="props.modelValue"
+        class="avatar"
+        :style="getFormItemInputStyle(configStyle, 2)"
+      />
+  </el-upload>
     <!-- <img referrerpolicy="no-referrer" :src="url" :style="styleObject" :fit="fit" :class="[boderAndShadowClassIsActive ? boderAndShadowClass : '', radiusClassIsActive ? radiusClass : '',mp, floatFlag ? floatStyle : '']"  /> -->
     <!-- <div></div> -->
 
@@ -231,13 +242,13 @@ function selectFile(){
   >
     <el-icon><Plus /></el-icon>
   </el-upload> -->
-  <div v-if="!props.data.control.useDefaultImg&&attrs.type!=4&&props.data.control.onSiteShot==''" style="width: 100%; ">
+  <div v-if="!props.data.control.useDefaultImg&&props.type!=4&&props.data.control.onSiteShot==''" style="width: 100%; ">
 
     <el-button  @click="selectFile" style="color:grey;font-weight: bolder;"><el-icon style="margin-right: 7px;font-weight: bolder;"><Plus /></el-icon>添加图片</el-button>
   </div>
-  <div v-if="!props.data.control.useDefaultImg&&attrs.type!=4&&props.data.control.onSiteShot&&props.data.control.onSiteShot=='1'" style="width: 100%; color:orangered">
+  <div v-if="!props.data.control.useDefaultImg&&props.type!=4&&props.data.control.onSiteShot&&props.data.control.onSiteShot=='1'" style="width: 100%; color:orangered">
     
-    <div v-if="attrs.type==5">仅允许现场手机拍照上传</div>
+    <div v-if="props.type!=5">仅允许现场手机拍照上传</div>
     <div v-else ><el-button  @click="selectFile" style="color:grey;font-weight: bolder;"><el-icon style="margin-right: 7px;font-weight: bolder;"><Plus /></el-icon>拍照上传</el-button></div>
   </div>
   
@@ -265,7 +276,7 @@ function selectFile(){
   </el-upload>
 
 <!-- 详情页略缩图列表 -->
-<div v-if ="!props.data.control.useDefaultImg&&attrs.type==4" v-for="url in valueArr"  class="demo-image__preview">
+<div v-if ="!props.data.control.useDefaultImg&&props.type==4" v-for="url in valueArr"  class="demo-image__preview">
     <el-image
       style="width: 100px; height: 100px;margin: 4px;border: #DCDFE6 1px solid; border-radius: 8px;"
       :src="url"
diff --git a/src/components/DesignForm/tableListPage/formPageCont.vue b/src/components/DesignForm/tableListPage/formPageCont.vue
index a80c35d..5cd41a3 100644
--- a/src/components/DesignForm/tableListPage/formPageCont.vue
+++ b/src/components/DesignForm/tableListPage/formPageCont.vue
@@ -572,11 +572,12 @@ function optionsValue3Get3(data: any, fieldName: any) {
                     </template>
 
                     <div v-if="mastItem.types == 'lowcodeImage'">
-                      <el-image
+                      {{ mastItem.value }}
+                      <!-- <el-image
                         style="width: 100px; height: 100px"
                         :src="mastItem.value"
                         fit="cover"
-                      />
+                      /> -->
                     </div>
                     <div v-if="mastItem.types == 'lowcodeCarsusel'">
                       <el-carousel :interval="5000" type="card" height="200px">
@@ -680,11 +681,12 @@ function optionsValue3Get3(data: any, fieldName: any) {
                     </template>
 
                     <div v-if="sonCentor.types == 'lowcodeImage'">
-                      <el-image
+                      {{ sonCentor.value }}
+                      <!-- <el-image
                         style="width: 100px; height: 100px"
                         :src="sonCentor.value"
                         fit="cover"
-                      />
+                      /> -->
                     </div>
                     <div v-if="sonCentor.types == 'lowcodeCarsusel'">
                       <el-carousel :interval="5000" type="card" height="200px">