diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts index 05235e3..3e3ccb0 100644 --- a/src/api/measure/file.ts +++ b/src/api/measure/file.ts @@ -43,14 +43,21 @@ }) } // 文件上传 -export function UploadFile(fileobj: any) { - const param = new FormData() - param.append('file', fileobj.file) +// export function UploadFile(fileobj: any) { +// const param = new FormData() +// param.append('file', fileobj.file) +// return request({ +// url: 'file/uploadFile', +// method: 'post', +// headers: { 'Content-Type': 'multipart/form-data' }, +// data: param, +// }) +// } +export function UploadFile(data: FormData) { return request({ - url: 'file/uploadFile', + url: 'minio/file/upload', method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param, + data, }) } // 导出 diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts index 05235e3..3e3ccb0 100644 --- a/src/api/measure/file.ts +++ b/src/api/measure/file.ts @@ -43,14 +43,21 @@ }) } // 文件上传 -export function UploadFile(fileobj: any) { - const param = new FormData() - param.append('file', fileobj.file) +// export function UploadFile(fileobj: any) { +// const param = new FormData() +// param.append('file', fileobj.file) +// return request({ +// url: 'file/uploadFile', +// method: 'post', +// headers: { 'Content-Type': 'multipart/form-data' }, +// data: param, +// }) +// } +export function UploadFile(data: FormData) { return request({ - url: 'file/uploadFile', + url: 'minio/file/upload', method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param, + data, }) } // 导出 diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue index 2b67e84..a1464aa 100644 --- a/src/views/measure/file/components/addDialog.vue +++ b/src/views/measure/file/components/addDialog.vue @@ -175,32 +175,30 @@ emits('resetData') } -const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => { - ElMessage.warning('只能上传一个文件') +const fileRef = ref() // 文件上传input +const onFileChange = (event: any) => { + // 原生上传 + // console.log(event.target.files) + if (event.target.files?.length !== 0) { + // 创建formdata对象 + const fd = new FormData() + fd.append('multipartFile', event.target.files[0]) + UploadFile(fd).then((res) => { + if (res.code === 200) { + console.log(res.data[0]) + ruleForm.minioFileName = res.data[0] + // 重置当前验证 + ruleFormRef.value?.clearValidate('minioFileName') + ElMessage.success('文件上传成功') + } + else { + ElMessage.error(res.message) + } + }) + } } -// 移除时触发 -const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => { - return ElMessageBox.confirm( - `确认移除${uploadFile.name}文件吗 ?`, - ).then( - () => true, - () => false, - ) -} -// 上传请求 -const uploadQuarterlyEvaluateFile: any = (file: File) => { - UploadFile(file).then((res) => { - if (res.code === 200) { - ruleForm.minioFileName = res.data.fileName - // fileList.value.push({ - // name: ruleForm.minioFileName, - // url: '', - // }) - // 重置当前验证 - ruleFormRef.value?.clearValidate('minioFileName') - ElMessage.success('文件上传成功') - } - }) +const upload = () => { + fileRef.value.click() } // 实施状态判断 // const statusList = ref([ @@ -322,8 +320,12 @@ - - + + + {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }} + + diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts index 05235e3..3e3ccb0 100644 --- a/src/api/measure/file.ts +++ b/src/api/measure/file.ts @@ -43,14 +43,21 @@ }) } // 文件上传 -export function UploadFile(fileobj: any) { - const param = new FormData() - param.append('file', fileobj.file) +// export function UploadFile(fileobj: any) { +// const param = new FormData() +// param.append('file', fileobj.file) +// return request({ +// url: 'file/uploadFile', +// method: 'post', +// headers: { 'Content-Type': 'multipart/form-data' }, +// data: param, +// }) +// } +export function UploadFile(data: FormData) { return request({ - url: 'file/uploadFile', + url: 'minio/file/upload', method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param, + data, }) } // 导出 diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue index 2b67e84..a1464aa 100644 --- a/src/views/measure/file/components/addDialog.vue +++ b/src/views/measure/file/components/addDialog.vue @@ -175,32 +175,30 @@ emits('resetData') } -const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => { - ElMessage.warning('只能上传一个文件') +const fileRef = ref() // 文件上传input +const onFileChange = (event: any) => { + // 原生上传 + // console.log(event.target.files) + if (event.target.files?.length !== 0) { + // 创建formdata对象 + const fd = new FormData() + fd.append('multipartFile', event.target.files[0]) + UploadFile(fd).then((res) => { + if (res.code === 200) { + console.log(res.data[0]) + ruleForm.minioFileName = res.data[0] + // 重置当前验证 + ruleFormRef.value?.clearValidate('minioFileName') + ElMessage.success('文件上传成功') + } + else { + ElMessage.error(res.message) + } + }) + } } -// 移除时触发 -const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => { - return ElMessageBox.confirm( - `确认移除${uploadFile.name}文件吗 ?`, - ).then( - () => true, - () => false, - ) -} -// 上传请求 -const uploadQuarterlyEvaluateFile: any = (file: File) => { - UploadFile(file).then((res) => { - if (res.code === 200) { - ruleForm.minioFileName = res.data.fileName - // fileList.value.push({ - // name: ruleForm.minioFileName, - // url: '', - // }) - // 重置当前验证 - ruleFormRef.value?.clearValidate('minioFileName') - ElMessage.success('文件上传成功') - } - }) +const upload = () => { + fileRef.value.click() } // 实施状态判断 // const statusList = ref([ @@ -322,8 +320,12 @@ - - + + + {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }} + + diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue index 51b0dcd..9ad87af 100644 --- a/src/views/measure/measureDept/components/templatePage.vue +++ b/src/views/measure/measureDept/components/templatePage.vue @@ -67,7 +67,7 @@ { text: '计量专业', value: 'meterMajor', align: 'center' }, { text: '负责人', value: 'director', align: 'center' }, { text: '联系方式', value: 'phone', align: 'center' }, - { text: '所属科室', value: 'deptId', align: 'center' }, + { text: '所属科室', value: 'pDeptName', align: 'center' }, { text: '科室负责人', value: '', align: 'center' }, { text: '创建日期', value: 'createTime', align: 'center' }, ], diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts index 05235e3..3e3ccb0 100644 --- a/src/api/measure/file.ts +++ b/src/api/measure/file.ts @@ -43,14 +43,21 @@ }) } // 文件上传 -export function UploadFile(fileobj: any) { - const param = new FormData() - param.append('file', fileobj.file) +// export function UploadFile(fileobj: any) { +// const param = new FormData() +// param.append('file', fileobj.file) +// return request({ +// url: 'file/uploadFile', +// method: 'post', +// headers: { 'Content-Type': 'multipart/form-data' }, +// data: param, +// }) +// } +export function UploadFile(data: FormData) { return request({ - url: 'file/uploadFile', + url: 'minio/file/upload', method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param, + data, }) } // 导出 diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue index 2b67e84..a1464aa 100644 --- a/src/views/measure/file/components/addDialog.vue +++ b/src/views/measure/file/components/addDialog.vue @@ -175,32 +175,30 @@ emits('resetData') } -const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => { - ElMessage.warning('只能上传一个文件') +const fileRef = ref() // 文件上传input +const onFileChange = (event: any) => { + // 原生上传 + // console.log(event.target.files) + if (event.target.files?.length !== 0) { + // 创建formdata对象 + const fd = new FormData() + fd.append('multipartFile', event.target.files[0]) + UploadFile(fd).then((res) => { + if (res.code === 200) { + console.log(res.data[0]) + ruleForm.minioFileName = res.data[0] + // 重置当前验证 + ruleFormRef.value?.clearValidate('minioFileName') + ElMessage.success('文件上传成功') + } + else { + ElMessage.error(res.message) + } + }) + } } -// 移除时触发 -const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => { - return ElMessageBox.confirm( - `确认移除${uploadFile.name}文件吗 ?`, - ).then( - () => true, - () => false, - ) -} -// 上传请求 -const uploadQuarterlyEvaluateFile: any = (file: File) => { - UploadFile(file).then((res) => { - if (res.code === 200) { - ruleForm.minioFileName = res.data.fileName - // fileList.value.push({ - // name: ruleForm.minioFileName, - // url: '', - // }) - // 重置当前验证 - ruleFormRef.value?.clearValidate('minioFileName') - ElMessage.success('文件上传成功') - } - }) +const upload = () => { + fileRef.value.click() } // 实施状态判断 // const statusList = ref([ @@ -322,8 +320,12 @@ - - + + + {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }} + + diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue index 51b0dcd..9ad87af 100644 --- a/src/views/measure/measureDept/components/templatePage.vue +++ b/src/views/measure/measureDept/components/templatePage.vue @@ -67,7 +67,7 @@ { text: '计量专业', value: 'meterMajor', align: 'center' }, { text: '负责人', value: 'director', align: 'center' }, { text: '联系方式', value: 'phone', align: 'center' }, - { text: '所属科室', value: 'deptId', align: 'center' }, + { text: '所属科室', value: 'pDeptName', align: 'center' }, { text: '科室负责人', value: '', align: 'center' }, { text: '创建日期', value: 'createTime', align: 'center' }, ], diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue index d8d1ff0..16a899c 100644 --- a/src/views/measure/person/components/addPerson.vue +++ b/src/views/measure/person/components/addPerson.vue @@ -157,11 +157,13 @@ ruleFormRef.value?.clearValidate('name') } // 上传请求 -const uploadQuarterlyEvaluateFile: any = (file: File) => { - UploadFile(file).then((res) => { +const uploadQuarterlyEvaluateFile: any = (file: any) => { + const fd = new FormData() + fd.append('multipartFile', file.file) + UploadFile(fd).then((res) => { if (res.code === 200) { ruleFormRef.value?.clearValidate('minioFileName') - ruleForm.value.minioFileName = res.data.fileName + ruleForm.value.minioFileName = res.data[0] } }) } diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts index 05235e3..3e3ccb0 100644 --- a/src/api/measure/file.ts +++ b/src/api/measure/file.ts @@ -43,14 +43,21 @@ }) } // 文件上传 -export function UploadFile(fileobj: any) { - const param = new FormData() - param.append('file', fileobj.file) +// export function UploadFile(fileobj: any) { +// const param = new FormData() +// param.append('file', fileobj.file) +// return request({ +// url: 'file/uploadFile', +// method: 'post', +// headers: { 'Content-Type': 'multipart/form-data' }, +// data: param, +// }) +// } +export function UploadFile(data: FormData) { return request({ - url: 'file/uploadFile', + url: 'minio/file/upload', method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param, + data, }) } // 导出 diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue index 2b67e84..a1464aa 100644 --- a/src/views/measure/file/components/addDialog.vue +++ b/src/views/measure/file/components/addDialog.vue @@ -175,32 +175,30 @@ emits('resetData') } -const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => { - ElMessage.warning('只能上传一个文件') +const fileRef = ref() // 文件上传input +const onFileChange = (event: any) => { + // 原生上传 + // console.log(event.target.files) + if (event.target.files?.length !== 0) { + // 创建formdata对象 + const fd = new FormData() + fd.append('multipartFile', event.target.files[0]) + UploadFile(fd).then((res) => { + if (res.code === 200) { + console.log(res.data[0]) + ruleForm.minioFileName = res.data[0] + // 重置当前验证 + ruleFormRef.value?.clearValidate('minioFileName') + ElMessage.success('文件上传成功') + } + else { + ElMessage.error(res.message) + } + }) + } } -// 移除时触发 -const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => { - return ElMessageBox.confirm( - `确认移除${uploadFile.name}文件吗 ?`, - ).then( - () => true, - () => false, - ) -} -// 上传请求 -const uploadQuarterlyEvaluateFile: any = (file: File) => { - UploadFile(file).then((res) => { - if (res.code === 200) { - ruleForm.minioFileName = res.data.fileName - // fileList.value.push({ - // name: ruleForm.minioFileName, - // url: '', - // }) - // 重置当前验证 - ruleFormRef.value?.clearValidate('minioFileName') - ElMessage.success('文件上传成功') - } - }) +const upload = () => { + fileRef.value.click() } // 实施状态判断 // const statusList = ref([ @@ -322,8 +320,12 @@ - - + + + {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }} + + diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue index 51b0dcd..9ad87af 100644 --- a/src/views/measure/measureDept/components/templatePage.vue +++ b/src/views/measure/measureDept/components/templatePage.vue @@ -67,7 +67,7 @@ { text: '计量专业', value: 'meterMajor', align: 'center' }, { text: '负责人', value: 'director', align: 'center' }, { text: '联系方式', value: 'phone', align: 'center' }, - { text: '所属科室', value: 'deptId', align: 'center' }, + { text: '所属科室', value: 'pDeptName', align: 'center' }, { text: '科室负责人', value: '', align: 'center' }, { text: '创建日期', value: 'createTime', align: 'center' }, ], diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue index d8d1ff0..16a899c 100644 --- a/src/views/measure/person/components/addPerson.vue +++ b/src/views/measure/person/components/addPerson.vue @@ -157,11 +157,13 @@ ruleFormRef.value?.clearValidate('name') } // 上传请求 -const uploadQuarterlyEvaluateFile: any = (file: File) => { - UploadFile(file).then((res) => { +const uploadQuarterlyEvaluateFile: any = (file: any) => { + const fd = new FormData() + fd.append('multipartFile', file.file) + UploadFile(fd).then((res) => { if (res.code === 200) { ruleFormRef.value?.clearValidate('minioFileName') - ruleForm.value.minioFileName = res.data.fileName + ruleForm.value.minioFileName = res.data[0] } }) } diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue index d26e734..17b92d3 100644 --- a/src/views/system/notice/noteAdd.vue +++ b/src/views/system/notice/noteAdd.vue @@ -70,25 +70,25 @@ const onFileChange = (event: any) => { // 原生上传图片 // console.log(event.target.files) - if (event.target.files[0].type === 'application/pdf') { - if (event.target.files?.length !== 0) { - // 创建formdata对象 - const fd = new FormData() - fd.append('multipartFile', event.target.files[0]) - uploadApi(fd).then((res) => { - if (res.code === 200) { - ruleForm.minioFileName = res.data[0] - ElMessage.success('上传成功') - } - else { - ElMessage.error(res.message) - } - }) - } + // if (event.target.files[0].type === 'application/pdf') { + if (event.target.files?.length !== 0) { + // 创建formdata对象 + const fd = new FormData() + fd.append('multipartFile', event.target.files[0]) + uploadApi(fd).then((res) => { + if (res.code === 200) { + ruleForm.minioFileName = res.data[0] + ElMessage.success('上传成功') + } + else { + ElMessage.error(res.message) + } + }) } - else { - ElMessage.error('请上传pdf格式') - } + // } + // else { + // ElMessage.error('请上传pdf格式') + // } } const upload = () => { fileRef.value.click() @@ -225,6 +225,14 @@ const look = () => { console.log(ruleForm.noticeContent) } +const minioFileUrl = ref('') +watch(() => ruleForm.minioFileName, (newVal) => { + if (newVal) { + getPhotoUrl(newVal).then((res) => { + minioFileUrl.value = res.data + }) + } +})