From 0d9844060912192819486a499ad987d216e33b6e Mon Sep 17 00:00:00 2001
From: 康鲁杰 <60095866+KangLujie@users.noreply.github.com>
Date: 星期四, 29 五月 2025 16:40:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 easegen-front/src/views/digitalcourse/digitalhumans/LookDigitalHumansForm.vue |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/easegen-front/src/views/digitalcourse/digitalhumans/LookDigitalHumansForm.vue b/easegen-front/src/views/digitalcourse/digitalhumans/LookDigitalHumansForm.vue
index 8064faf..0baeae1 100644
--- a/easegen-front/src/views/digitalcourse/digitalhumans/LookDigitalHumansForm.vue
+++ b/easegen-front/src/views/digitalcourse/digitalhumans/LookDigitalHumansForm.vue
@@ -43,7 +43,7 @@
           <UploadImg v-if="formData" v-model="formData.fixPictureUrl" />
           <UploadImg v-else v-model="formData.pictureUrl" />
         </el-form-item>
-  
+
         <!-- <el-form-item v-if="formData.useModel == 2" :label="t('digitalhumans.video')" prop="videoUrl"> -->
         <el-form-item v-if="false" :label="t('digitalhumans.video')" prop="videoUrl">
           <!-- 鍘熸湰鑷甫鐨勮棰戜笂浼� -->
@@ -85,8 +85,9 @@
         </el-form-item>
       </el-form>
       <template #footer>
-        <el-button @click="submitForm" type="primary" :disabled="formLoading" :loading="isUploading" >{{t('common.ok')}}</el-button>
-        <el-button @click="dialogVisible = false">{{t('common.cancel')}}</el-button>
+        <el-button @click="submitForm" type="primary" :disabled="formLoading" :loading="isUploading" v-if="formType=='updata'">{{t('common.ok')}}</el-button>
+        <el-button @click="dialogVisible = false" v-if="formType=='updata'">{{t('common.cancel')}}</el-button>
+        <el-button @click="dialogVisible = false" v-if="formType=='detail'">鍏抽棴</el-button>
       </template>
     </Dialog>
   </template>
@@ -100,10 +101,10 @@
   import { useUpload } from '@/components/UploadFile/src/useUpload'
   import { el } from 'element-plus/es/locale';
   import { any } from 'vue-types';
-  
+
   const { t } = useI18n() // 鍥介檯鍖�
   const message = useMessage() // 娑堟伅寮圭獥
-  
+
   const { uploadUrl, httpRequest } = useUpload() //涓婁紶鏂规硶
   const dialogVisible = ref(false) // 寮圭獥鐨勬槸鍚﹀睍绀�
   const dialogTitle = ref('') // 寮圭獥鐨勬爣棰�
@@ -128,10 +129,10 @@
     status: undefined,
     isTransparent: undefined,
   })
-  
+
   // 褰撳墠鏄惁姝ｅ湪涓婁紶瑙嗛
   const isUploading = ref(false)
-  
+
   const videoProperty = {
     videoUrl: '',
     posterUrl: '',
@@ -143,7 +144,7 @@
       height: 300
     }
   } as DiyComponent<VideoPlayerProperty>
-  
+
   watch(()=> formData.value.videoUrl,(newVal,oldValue)=>{
     if (newVal && newVal.length > 0){
       videoProperty.videoUrl = formData.value.fixVideoUrl || newVal
@@ -164,12 +165,12 @@
     videoUrl: [{ required: true, message: '瑙嗛涓嶈兘涓虹┖', trigger: 'blur' }]
   })
   const formRef = ref() // 琛ㄥ崟 Ref
-  
+
   const StartCes = () => {
     console.log( " ----- 寮�濮� ----- " )
     isUploading.value = true
   }
-  
+
   const End = (res)=>{
     const FileObject = {
       file:res
@@ -180,9 +181,9 @@
     } ).finally( res => {
       isUploading.value = false
     } )
-  
+
   }
-  
+
   /** 鎵撳紑寮圭獥 */
   const open = async (type: string, id?: number) => {
     dialogVisible.value = true
@@ -202,7 +203,7 @@
     }
   }
   defineExpose({ open }) // 鎻愪緵 open 鏂规硶锛岀敤浜庢墦寮�寮圭獥
-  
+
   /** 鎻愪氦琛ㄥ崟 */
   const emit = defineEmits(['success']) // 瀹氫箟 success 浜嬩欢锛岀敤浜庢搷浣滄垚鍔熷悗鐨勫洖璋�
   const submitForm = async () => {
@@ -226,7 +227,7 @@
       formLoading.value = false
     }
   }
-  
+
   /** 閲嶇疆琛ㄥ崟 */
   const resetForm = () => {
     formData.value = {
@@ -254,9 +255,9 @@
       formData.value.videoUrl = response.data;
     }
   };
-  
+
   // 淇敼榛樿鐨勬暟瀛椾汉瑙嗛妯″紡涓鸿棰�
-  
+
   const InitHumMODEL = ()=>{
     let ModelList = getIntDictOptions( DICT_TYPE.USE_MODEL )
     for (let index = 0; index < ModelList.length; index++) {
@@ -266,6 +267,5 @@
       }
     }
   }
-  
+
   </script>
-  
\ No newline at end of file

--
Gitblit v1.9.3