From 87a6d28214429a90ac6920ad0bf4302aa5935f64 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 29 Feb 2024 09:34:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue    |  2 ++
 .../Detail/src/DetailDeviceLedger.vue         |  1 +
 src/components/UploadFile/src/UploadFile.vue  | 20 +++++++++++++++++--
 src/views/eam/device/problemSolving/index.vue |  7 +++++++
 .../problemSolving/problemSolving.data.ts     |  3 +--
 5 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 8cc85c7..831eb70 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -380,8 +380,10 @@ const open = async (type: string, row?: any, masterParmas?: any) => {
     formLoading.value = true
     try {
       nextTick(() => {
+      console.log('row11',row)
         formRef.value.setValues(row)
       })
+    
     } finally {
       formLoading.value = false
     }
diff --git a/src/components/Detail/src/DetailDeviceLedger.vue b/src/components/Detail/src/DetailDeviceLedger.vue
index 0d352d6..cf0a09a 100644
--- a/src/components/Detail/src/DetailDeviceLedger.vue
+++ b/src/components/Detail/src/DetailDeviceLedger.vue
@@ -594,6 +594,7 @@ const getImage = () => {
         if (imageParmas.value.funcCode == 'device_mould_picture') {
           imageFormData.value.filePathList = res
         } else {
+          console.log(444,res)
           fileFormData.value.filePathList = res
           formKey.value += 1
         }
diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue
index 464a54a..2047ff7 100644
--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -6,7 +6,7 @@
       name="file"
       v-model="valueRef"
       v-model:file-list="fileList"
-      :show-file-list="true"
+      :show-file-list="isShowFileList"
       :auto-upload="autoUpload"
       :action="updateUrl"
       :headers="uploadHeaders"
@@ -28,6 +28,7 @@
         <div style="font-size: 8px;line-height: initial;">
           格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b> 的文件
         </div>
+        <Preview1 :fileList="fileList" v-if="!isShowFile"/>
       </template>
       <template  v-if="!isShowFile" #file >
           <div>
@@ -42,6 +43,7 @@ import { PropType } from 'vue'
 import { propTypes } from '@/utils/propTypes'
 import { getAccessToken, getTenantId } from '@/utils/auth'
 import type { UploadInstance, UploadUserFile, UploadProps, UploadRawFile } from 'element-plus'
+import  Preview1  from '@/components/UploadFile/src/Preview.vue'
 
 defineOptions({ name: 'UploadFile' })
 
@@ -63,19 +65,25 @@ const props = defineProps({
   drag: propTypes.bool.def(false), // 拖拽上传
   isShowTip: propTypes.bool.def(true), // 是否显示提示
   isShowFile: propTypes.bool.def(true), // 是否显示上传的文件
+  // isShowFileList: propTypes.bool.def(true), // 是否显示自己上传的文件
   
 })
 // ========== 上传相关 ==========
+// setTimeout(()=>{
+
+// console.log('props.modelValue',props.modelValue)
+// },2000)
 const valueRef = ref(props.modelValue)
 const uploadRef = ref<UploadInstance>()
 const uploadList = ref<UploadUserFile[]>([])
-console.log('88',props.modelValue)
+
 const fileList = props.modelValue && props.modelValue.length > 0 ? ref<UploadUserFile[]>(props.modelValue) : ref<UploadUserFile[]>([])
 const uploadNumber = ref<number>(0)
 const uploadHeaders = ref({
   Authorization: 'Bearer ' + getAccessToken(),
   'tenant-id': getTenantId()
 })
+
 // 文件上传之前判断
 const beforeUpload: UploadProps['beforeUpload'] = (file: UploadRawFile) => {
   if (fileList.value.length >= props.limit) {
@@ -149,6 +157,14 @@ const listToString = (list: UploadUserFile[], separator?: string) => {
   }
   return strs != '' ? strs.substr(0, strs.length - 1) : ''
 }
+watch(
+  () => props.modelValue,
+  (val) => {
+    // if (val === unref(colorVal)) return
+    valueRef.value = val
+    fileList.value = val && val.length > 0 ?val:[]
+  }
+)
 </script>
 <style scoped lang="scss">
 .upload-file-uploader {
diff --git a/src/views/eam/device/problemSolving/index.vue b/src/views/eam/device/problemSolving/index.vue
index b603df2..66303da 100644
--- a/src/views/eam/device/problemSolving/index.vue
+++ b/src/views/eam/device/problemSolving/index.vue
@@ -126,6 +126,13 @@
   /** 添加/修改操作 */
   const basicFormRef = ref()
   const openForm = (type : string, row ?: any) => {
+    // console.log(99,row)
+    row.filePathListView = row.filePathList.map(item=>{
+      return {
+        name:item,
+        url:item
+      }
+    })
     basicFormRef.value.open(type, row)
   }
 
diff --git a/src/views/eam/device/problemSolving/problemSolving.data.ts b/src/views/eam/device/problemSolving/problemSolving.data.ts
index 1302a63..9fb6e8a 100644
--- a/src/views/eam/device/problemSolving/problemSolving.data.ts
+++ b/src/views/eam/device/problemSolving/problemSolving.data.ts
@@ -45,7 +45,6 @@ export const ProblemSolving = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'UploadFile',
       componentProps: {
-
       }
     }
   },
@@ -60,7 +59,7 @@ export const ProblemSolving = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'UploadFile',
       componentProps: {
-  
+        
       }
     }
   },