From c92894037064ef6064acd6c9519e872361d50f1c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 27 一月 2026 09:55:34 +0800
Subject: [PATCH] 进销存升级app： 1.巡检上传修改
---
src/pages/inspectionUpload/components/formDia.vue | 148 ++++++++---
src/pages/inspectionUpload/index.vue | 546 +++++++++++++++++++++-----------------------
2 files changed, 362 insertions(+), 332 deletions(-)
diff --git a/src/pages/inspectionUpload/components/formDia.vue b/src/pages/inspectionUpload/components/formDia.vue
index 41837cb..6b900cd 100644
--- a/src/pages/inspectionUpload/components/formDia.vue
+++ b/src/pages/inspectionUpload/components/formDia.vue
@@ -21,8 +21,8 @@
name="before"
multiple
:maxCount="10"
- :maxSize="1024 * 1024"
- accept="video/*"
+ :maxSize="5 * 1024 * 1024"
+ accept="image/*"
:previewFullImage="true"
></u-upload>
</view>
@@ -36,8 +36,8 @@
name="after"
multiple
:maxCount="10"
- :maxSize="1024 * 1024"
- accept="video/*"
+ :maxSize="5 * 1024 * 1024"
+ accept="image/*"
:previewFullImage="true"
></u-upload>
</view>
@@ -51,8 +51,8 @@
name="issue"
multiple
:maxCount="10"
- :maxSize="1024 * 1024"
- accept="video/*"
+ :maxSize="5 * 1024 * 1024"
+ accept="image/*"
:previewFullImage="true"
></u-upload>
</view>
@@ -67,8 +67,10 @@
</template>
<script setup>
-import { ref } from 'vue'
+import { ref, computed } from 'vue'
import { submitInspectionRecord } from '@/api/equipmentManagement/inspection.js'
+import { getToken } from '@/utils/auth'
+import config from '@/config'
const emit = defineEmits(['closeDia'])
@@ -78,50 +80,106 @@
const issueModelValue = ref([])
const infoData = ref(null)
+// 璁＄畻涓婁紶URL
+const uploadFileUrl = computed(() => {
+ let baseUrl = '';
+
+ if (process.env.VUE_APP_BASE_API) {
+ baseUrl = process.env.VUE_APP_BASE_API;
+ } else {
+ baseUrl = config.baseUrl;
+ }
+
+ return baseUrl + '/file/upload';
+})
+
+const uploadSingleFile = async (fileItem, typeValue) => {
+ const token = getToken()
+ if (!token) throw new Error('鐢ㄦ埛鏈櫥褰�')
+
+ // H5: u-upload 鍙兘缁欏師鐢� File锛坒ileItem.file锛�
+ const rawFile = fileItem?.file
+ if (rawFile) {
+ const formData = new FormData()
+ formData.append('file', rawFile, rawFile.name || 'image.jpg')
+ formData.append('type', String(typeValue))
+ const res = await fetch(uploadFileUrl.value, {
+ method: 'POST',
+ headers: { Authorization: 'Bearer ' + token },
+ body: formData
+ })
+ const data = await res.json()
+ if (data?.code !== 200) throw new Error(data?.msg || '涓婁紶澶辫触')
+ return {
+ url: data?.data?.url,
+ name: rawFile.name || 'image.jpg',
+ status: 'success'
+ }
+ }
+
+ // 闈� H5 / 鍏煎锛氳蛋 uni.uploadFile
+ return await new Promise((resolve, reject) => {
+ uni.uploadFile({
+ url: uploadFileUrl.value,
+ filePath: fileItem.url,
+ name: 'file',
+ header: {
+ 'Authorization': `Bearer ${token}`
+ },
+ formData: {
+ type: typeValue
+ },
+ success: (res) => {
+ try {
+ const data = JSON.parse(res.data)
+ if (data.code === 200) {
+ resolve({
+ url: data.data.url,
+ name: fileItem.name,
+ status: 'success'
+ })
+ } else {
+ reject(new Error(data.msg || '涓婁紶澶辫触'))
+ }
+ } catch (e) {
+ reject(e)
+ }
+ },
+ fail: (err) => reject(err)
+ })
+ })
+}
+
// 鏂囦欢涓婁紶澶勭悊
const afterRead = (event) => {
const { name, file } = event
- // 涓婁紶鏂囦欢鍒版湇鍔″櫒
- uni.uploadFile({
- url: '/api/upload', // 鏇挎崲涓哄疄闄呯殑涓婁紶鎺ュ彛
- filePath: file.url,
- name: 'file',
- success: (res) => {
- const data = JSON.parse(res.data)
- if (data.code === 200) {
- const fileItem = {
- url: data.data.url,
- name: file.name,
- status: 'success'
- }
-
- // 鏍规嵁name娣诲姞鍒板搴旂殑鏁扮粍
- if (name === 'before') {
- beforeModelValue.value.push(fileItem)
- } else if (name === 'after') {
- afterModelValue.value.push(fileItem)
- } else if (name === 'issue') {
- issueModelValue.value.push(fileItem)
- }
-
- uni.showToast({
- title: '涓婁紶鎴愬姛',
- icon: 'success'
- })
- } else {
- uni.showToast({
- title: '涓婁紶澶辫触',
- icon: 'error'
- })
+ // 鏍规嵁涓婁紶绫诲瀷璁剧疆涓嶅悓鐨則ype鍊�
+ let typeValue = 10 // 榛樿鍊�
+ if (name === 'before') {
+ typeValue = 10 // 鐢熶骇鍓�
+ } else if (name === 'after') {
+ typeValue = 11 // 鐢熶骇涓�
+ } else if (name === 'issue') {
+ typeValue = 12 // 鐢熶骇鍚�
+ }
+
+ const files = Array.isArray(file) ? file : [file]
+ Promise.resolve().then(async () => {
+ for (const f of files) {
+ const uploaded = await uploadSingleFile(f, typeValue)
+ if (name === 'before') {
+ beforeModelValue.value.push(uploaded)
+ } else if (name === 'after') {
+ afterModelValue.value.push(uploaded)
+ } else if (name === 'issue') {
+ issueModelValue.value.push(uploaded)
}
- },
- fail: () => {
- uni.showToast({
- title: '涓婁紶澶辫触',
- icon: 'error'
- })
}
+ uni.showToast({ title: '涓婁紶鎴愬姛', icon: 'success' })
+ }).catch((err) => {
+ console.error('涓婁紶澶辫触:', err)
+ uni.showToast({ title: '涓婁紶澶辫触', icon: 'error' })
})
}
diff --git a/src/pages/inspectionUpload/index.vue b/src/pages/inspectionUpload/index.vue
index e18f93b..94f4b29 100644
--- a/src/pages/inspectionUpload/index.vue
+++ b/src/pages/inspectionUpload/index.vue
@@ -68,32 +68,6 @@
</view>
- <!-- 鎵爜鍖哄煙 - 鍏ㄥ眬寮圭獥 -->
- <view v-if="isScanning" class="qr-scan-overlay">
- <view class="qr-scan-container">
- <view class="scan-header">
- <text class="scan-title">鎵弿浜岀淮鐮�</text>
- <u-button type="error" size="small" @click.stop="stopScan" :customStyle="{
- borderRadius: '15px',
- height: '30px',
- fontSize: '12px'
- }">
- 鍏抽棴
- </u-button>
- </view>
- <camera class="qr-camera" device-position="back" flash="off" @scancode="handleScanCode"
- @error="handleCameraError"></camera>
- <view class="scan-frame-wrapper">
- <view class="scan-frame"></view>
- <view class="scan-tip">璇峰皢浜岀淮鐮佹斁鍏ユ鍐�</view>
- </view>
- <u-alert v-if="cameraError" :title="cameraError" type="error" :showIcon="true" :closable="true"
- @close="cameraError = ''" :customStyle="{
- margin: '10px 0'
- }"></u-alert>
- </view>
- </view>
-
<!-- 鍥剧墖涓婁紶寮圭獥 - 鍘熺敓瀹炵幇 -->
<view v-if="showUploadDialog" class="custom-modal-overlay" @click="closeUploadDialog">
<view class="custom-modal-container" @click.stop>
@@ -162,10 +136,10 @@
<view v-if="getCurrentFiles().length > 0" class="file-list">
<view v-for="(file, index) in getCurrentFiles()" :key="index" class="file-item">
<view class="file-preview-container">
- <image v-if="file?.path?.fileType === 'image'"
- :src="file?.url || file?.tempFilePath?.tempFilePath || file?.path?.tempFilePath"
+ <image v-if="file.type === 'image' || (file.type !== 'video' && !file.type)"
+ :src="file.url || file.tempFilePath || file.path || file.downloadUrl"
class="file-preview" mode="aspectFill" />
- <view v-else class="video-preview">
+ <view v-else-if="file.type === 'video'" class="video-preview">
<uni-icons type="videocam" name="videocam" size="18" color="#fff"
style="margin-right: 5px;"></uni-icons>
<text class="video-text">瑙嗛</text>
@@ -294,6 +268,7 @@
import { getLedgerById } from '@/api/equipmentManagement/ledger.js'
import { inspectionTaskList, uploadInspectionTask } from "@/api/inspectionManagement";
import { getToken } from "@/utils/auth";
+import config from '@/config'
// 缁勪欢寮曠敤宸茬Щ闄�
@@ -347,7 +322,7 @@
// 涓婁紶閰嶇疆
const uploadConfig = {
- action: "/common/minioUploads",
+ action: "/file/upload",
limit: 10,
fileSize: 50, // MB
fileType: ['jpg', 'jpeg', 'png', 'mp4', 'mov'],
@@ -356,15 +331,7 @@
// 璁＄畻涓婁紶URL
const uploadFileUrl = computed(() => {
- let baseUrl = '';
-
- if (process.env.VUE_APP_BASE_API) {
- baseUrl = process.env.VUE_APP_BASE_API;
- } else if (process.env.NODE_ENV === 'development') {
- baseUrl = 'http://114.132.189.42:9068';
- } else {
- baseUrl = 'http://114.132.189.42:9068';
- }
+ const baseUrl = 'http://114.132.189.42:9030';
return baseUrl + uploadConfig.action;
})
@@ -377,10 +344,6 @@
// 璇锋眰鍙栨秷鏍囧織锛岀敤浜庡彇娑堟鍦ㄨ繘琛岀殑璇锋眰
let isRequestCancelled = false
-
-// 鎵爜鐩稿叧鐘舵��
-const isScanning = ref(false)
-const cameraError = ref('')
const pagesPames = reactive({
size: 10,
@@ -438,11 +401,6 @@
onUnmounted(() => {
// 璁剧疆鍙栨秷鏍囧織锛岄樆姝㈠悗缁殑寮傛鎿嶄綔
isRequestCancelled = true
-
- // 鍋滄鎵爜
- if (isScanning.value) {
- isScanning.value = false
- }
// 鍏抽棴涓婁紶寮圭獥
if (showUploadDialog.value) {
@@ -528,114 +486,77 @@
}
}
-// 涓烘寚瀹氫换鍔″紑濮嬫壂鐮�
+// 涓烘寚瀹氫换鍔″紑濮嬫壂鐮侊紙鐪熸満锛�
const startScanForTask = async (task) => {
try {
- // 璁板綍褰撳墠鎵弿鐨勪换鍔�
currentScanningTask.value = task
-
- // 鏄剧ず鎵弿鐣岄潰
- isScanning.value = true
-
- // 浣跨敤uniapp鐨勬壂鐮丄PI
uni.scanCode({
success: (res) => {
handleScanSuccess(res)
},
fail: (err) => {
+ console.error('鎵爜澶辫触:', err)
uni.showToast({
title: '鎵爜澶辫触',
icon: 'error'
})
- // 鍏抽棴鎵弿鐣岄潰
- isScanning.value = false
}
})
} catch (e) {
+ console.error('鍚姩鎵爜澶辫触:', e)
uni.showToast({
title: '鍚姩鎵爜澶辫触',
icon: 'error'
})
- isScanning.value = false
}
}
-// 鍋滄鎵爜
-const stopScan = () => {
- isScanning.value = false
- currentScanningTask.value = null
-}
-
-// 鎵爜鎴愬姛澶勭悊
-const handleScanSuccess = async (result) => {
+// 鎵爜鎴愬姛澶勭悊锛氭牎楠屽悗鎵撳紑涓婁紶寮圭獥
+const handleScanSuccess = (result) => {
try {
// 瑙ｆ瀽浜岀淮鐮佹暟鎹紝鎻愬彇deviceId
let deviceId = ''
- // 妫�鏌ユ槸鍚︽槸URL鏍煎紡
- if (result.result.includes('deviceId=')) {
- // 浠嶶RL涓彁鍙杁eviceId
- const url = result.result
- const match = url.match(/deviceId=(\d+)/)
- if (match && match[1]) {
- deviceId = match[1]
- }
- } else {
- // 灏濊瘯瑙ｆ瀽JSON鏍煎紡
- try {
- const qrData = JSON.parse(result.result)
- deviceId = qrData.deviceId || qrData.qrCodeId || ''
- } catch (e) {
- // 濡傛灉涓嶆槸JSON鏍煎紡锛岀洿鎺ヤ娇鐢ㄧ粨鏋�
- deviceId = result.result
+ if (result?.result && typeof result.result === 'string') {
+ if (result.result.includes('deviceId=')) {
+ const match = result.result.match(/deviceId=(\d+)/)
+ if (match && match[1]) deviceId = match[1]
+ } else {
+ try {
+ const qrData = JSON.parse(result.result)
+ deviceId = qrData.deviceId || qrData.qrCodeId || ''
+ } catch (e) {
+ deviceId = result.result
+ }
}
}
if (!deviceId) {
- uni.showToast({
- title: '鏈瘑鍒埌璁惧ID',
- icon: 'error'
- })
- isScanning.value = false
+ uni.showToast({ title: '鏈瘑鍒埌璁惧ID', icon: 'error' })
return
}
- // 鑾峰彇褰撳墠浠诲姟鐨則askId
const currentTaskId = currentScanningTask.value?.taskId || currentScanningTask.value?.id
-
- // 瀵规瘮deviceId鍜宼askId
- if (deviceId === currentTaskId.toString()) {
- uni.showToast({
- title: '璇嗗埆鎴愬姛',
- icon: 'success'
- })
-
- // 鍏堝叧闂壂鎻忕晫闈�
- isScanning.value = false
-
- // 寤惰繜鎵撳紑涓婁紶寮圭獥锛岀‘淇濇壂鎻忕晫闈㈠畬鍏ㄥ叧闂�
- setTimeout(() => {
- openUploadDialog(currentScanningTask.value)
- }, 300)
- } else {
- uni.showToast({
- title: '璇锋壂鎻忔纭殑璁惧',
- icon: 'error'
- })
-
- // 鍏抽棴鎵弿鐣岄潰
- isScanning.value = false
+ if (!currentTaskId) {
+ uni.showToast({ title: '浠诲姟淇℃伅缂哄け', icon: 'error' })
+ return
}
+ if (deviceId === currentTaskId.toString()) {
+ uni.showToast({ title: '璇嗗埆鎴愬姛', icon: 'success' })
+ openUploadDialog(currentScanningTask.value)
+ } else {
+ uni.showToast({ title: '璇锋壂鎻忔纭殑璁惧', icon: 'error' })
+ }
} catch (error) {
+ console.error('鎵爜缁撴灉澶勭悊澶辫触:', error)
uni.showToast({
- title: error.message || '鏁版嵁瑙ｆ瀽澶辫触',
+ title: error?.message || '鏁版嵁瑙ｆ瀽澶辫触',
icon: 'error'
})
- // 鍏抽棴鎵弿鐣岄潰
- isScanning.value = false
}
}
+
// 鎵撳紑涓婁紶寮圭獥
const openUploadDialog = (task) => {
@@ -787,10 +708,20 @@
arr.push(...issueModelValue.value);
}
+ // 浼犵粰鍚庣鐨勪复鏃舵枃浠禝D鍒楄〃锛坱empFileIds锛�
+ // 鍏煎锛氭湁浜涙帴鍙ｅ彲鑳借繑鍥� tempId / tempFileId / id
+ let tempFileIds = []
+ if (arr !== null && arr.length > 0) {
+ tempFileIds = arr
+ .map((item) => item?.tempId ?? item?.tempFileId ?? item?.id)
+ .filter((v) => v !== undefined && v !== null && v !== '')
+ }
+
// 鎻愪氦鏁版嵁
infoData.value.storageBlobDTO = arr;
// 娣诲姞寮傚父鐘舵�佷俊鎭�
infoData.value.hasException = hasException.value;
+ infoData.value.tempFileIds = tempFileIds;
const result = await uploadInspectionTask({ ...infoData.value });
// 妫�鏌ユ彁浜ょ粨鏋�
@@ -840,16 +771,6 @@
}
}
-// 鎽勫儚澶撮敊璇鐞�
-const handleCameraError = (error) => {
- cameraError.value = '鎽勫儚澶磋闂け璐ワ紝璇锋鏌ユ潈闄愯缃�'
-}
-
-// 鎵爜浜嬩欢澶勭悊
-const handleScanCode = (result) => {
- handleScanSuccess(result)
-}
-
// 鏌ョ湅闄勪欢
const viewAttachments = async (task) => {
try {
@@ -859,32 +780,40 @@
// 瑙ｆ瀽鏂扮殑鏁版嵁缁撴瀯
attachmentList.value = []
- // 鐢熶骇鍓嶉檮浠� (type=0)
- if (task.beforeProduction && Array.isArray(task.beforeProduction)) {
- const beforeFiles = task.beforeProduction.map(file => ({
+ // 鍚庣鍙嶆樉瀛楁锛堜綘鎻愪緵鐨勬暟鎹粨鏋勶級锛�
+ // - commonFileListBefore锛氱敓浜у墠锛堥�氬父 type=10锛�
+ // - commonFileListAfter锛氱敓浜т腑锛堥�氬父 type=11锛�
+ // - commonFileList锛氬彲鑳芥槸鍏ㄩ儴/鍏滃簳锛堣嫢鍖呭惈鐢熶骇鍚庯紝涓�鑸� type=12锛�
+ const allList = Array.isArray(task?.commonFileList) ? task.commonFileList : []
+ const beforeList = Array.isArray(task?.commonFileListBefore)
+ ? task.commonFileListBefore
+ : allList.filter(f => f?.type === 10)
+ const afterList = Array.isArray(task?.commonFileListAfter)
+ ? task.commonFileListAfter
+ : allList.filter(f => f?.type === 11)
+ // 濡傛灉鍚庣鍚庣画琛ヤ簡 commonFileListIssue锛屽垯浼樺厛鐢紱鍚﹀垯浠� commonFileList 閲屾寜 type=12 鍏滃簳
+ const issueList = Array.isArray(task?.commonFileListIssue)
+ ? task.commonFileListIssue
+ : allList.filter(f => f?.type === 12)
+
+ const mapToViewFile = (file, viewType) => {
+ const u = normalizeFileUrl(file?.url || file?.downloadUrl || '')
+ return {
...file,
- type: 0 // 纭繚type涓�0
- }))
- attachmentList.value.push(...beforeFiles)
+ // 鐢ㄤ簬涓夋爣绛鹃〉鍒嗙粍锛�0=鐢熶骇鍓� 1=鐢熶骇涓� 2=鐢熶骇鍚�
+ type: viewType,
+ name: file?.name || file?.originalFilename || file?.bucketFilename,
+ bucketFilename: file?.bucketFilename || file?.name,
+ originalFilename: file?.originalFilename || file?.name,
+ url: u,
+ downloadUrl: u,
+ size: file?.size || file?.byteSize,
+ }
}
- // 鐢熶骇涓檮浠� (type=1)
- if (task.afterProduction && Array.isArray(task.afterProduction)) {
- const afterFiles = task.afterProduction.map(file => ({
- ...file,
- type: 1 // 纭繚type涓�1
- }))
- attachmentList.value.push(...afterFiles)
- }
-
- // 鐢熶骇鍚庨檮浠� (type=2)
- if (task.productionIssues && Array.isArray(task.productionIssues)) {
- const issueFiles = task.productionIssues.map(file => ({
- ...file,
- type: 2 // 纭繚type涓�2
- }))
- attachmentList.value.push(...issueFiles)
- }
+ attachmentList.value.push(...beforeList.map(f => mapToViewFile(f, 0)))
+ attachmentList.value.push(...afterList.map(f => mapToViewFile(f, 1)))
+ attachmentList.value.push(...issueList.map(f => mapToViewFile(f, 2)))
showAttachmentDialog.value = true
@@ -917,13 +846,13 @@
const getTabType = () => {
switch (currentUploadType.value) {
case 'before':
- return 0
+ return 10
case 'after':
- return 1
+ return 11
case 'issue':
- return 2
+ return 12
default:
- return 0
+ return 10
}
}
// 鑾峰彇褰撳墠鏌ョ湅绫诲瀷鐨勯檮浠�
@@ -954,6 +883,41 @@
const name = file.bucketFilename || file.originalFilename || file.name || ''
const ext = name.split('.').pop()?.toLowerCase()
return ['jpg', 'jpeg', 'png', 'gif', 'webp'].includes(ext)
+}
+
+// 鏂囦欢璁块棶鍩虹鍩燂紙鍚庣瑕佹眰鍓嶇紑锛�
+const filePreviewBase = 'http://114.132.189.42:9098'
+
+// 灏嗗悗绔繑鍥炵殑鏂囦欢鍦板潃瑙勮寖鎴愬彲璁块棶URL
+// 鍏煎鍦烘櫙锛�
+// - 宸茬粡鏄� http/https锛氱洿鎺ヨ繑鍥�
+// - 浠� / 寮�澶达細鎷兼帴 filePreviewBase
+// - Windows 鏈湴璺緞锛堝 D:\ruoyi\prod\uploads...\xx.jpg锛夛細灏濊瘯鎴彇 prod 涔嬪悗鐨勭浉瀵硅矾寰勫苟鎷兼帴 filePreviewBase
+const normalizeFileUrl = (rawUrl) => {
+ try {
+ if (!rawUrl || typeof rawUrl !== 'string') return ''
+ const url = rawUrl.trim()
+ if (!url) return ''
+ if (/^https?:\/\//i.test(url)) return url
+ if (url.startsWith('/')) return `${filePreviewBase}${url}`
+
+ // Windows path -> web path
+ if (/^[a-zA-Z]:\\/.test(url)) {
+ const normalized = url.replace(/\\/g, '/')
+ const idx = normalized.indexOf('/prod/')
+ if (idx >= 0) {
+ const relative = normalized.slice(idx + '/prod/'.length)
+ return `${filePreviewBase}/${relative}`
+ }
+ // 鍏滃簳锛氭棤娉曟帹鏂槧灏勮鍒欐椂锛岃嚦灏戞妸鍙嶆枩鏉犲彉鎴愭鏂滄潬
+ return normalized
+ }
+
+ // 鍏朵粬鐩稿璺緞锛氱洿鎺ョ敤 baseUrl 鎷间竴涓�
+ return `${filePreviewBase}/${url.replace(/^\//, '')}`
+ } catch (e) {
+ return rawUrl || ''
+ }
}
// 棰勮闄勪欢
@@ -994,52 +958,80 @@
})
}
-// 浣跨敤鐩告満
+// 鎷嶇収/鎷嶈棰戯紙鐪熸満浼樺厛鐢� chooseMedia锛涗笉鏀寔鍒欓檷绾э級
const chooseMedia = (type) => {
- let mediaPamaes = {
- count: 1,
- mediaType: [type || 'image'],
- sizeType: ['compressed', 'original'],
- sourceType: ['camera'],
+ if (getCurrentFiles().length >= uploadConfig.limit) {
+ uni.showToast({ title: `鏈�澶氬彧鑳介�夋嫨${uploadConfig.limit}涓枃浠禶, icon: 'none' })
+ return
}
- uni.chooseMedia({
- ...mediaPamaes,
- success: (res) => {
- try {
- if (!res.tempFiles || res.tempFiles.length === 0) {
- throw new Error('鏈幏鍙栧埌鍥剧墖鏂囦欢');
+
+ const remaining = uploadConfig.limit - getCurrentFiles().length
+
+ // 浼樺厛锛歝hooseMedia锛堟敮鎸� image/video锛�
+ if (typeof uni.chooseMedia === 'function') {
+ uni.chooseMedia({
+ count: Math.min(remaining, 1),
+ mediaType: [type || 'image'],
+ sizeType: ['compressed', 'original'],
+ sourceType: ['camera'],
+ success: (res) => {
+ try {
+ const files = res?.tempFiles || []
+ if (!files.length) throw new Error('鏈幏鍙栧埌鏂囦欢')
+
+ files.forEach((tf, idx) => {
+ const filePath = tf.tempFilePath || tf.path || ''
+ const fileType = tf.fileType || type || 'image'
+ const ext = fileType === 'video' ? 'mp4' : 'jpg'
+ const file = {
+ tempFilePath: filePath,
+ path: filePath,
+ type: fileType,
+ name: `${fileType}_${Date.now()}_${idx}.${ext}`,
+ size: tf.size || 0,
+ duration: tf.duration || 0,
+ createTime: Date.now(),
+ uid: Date.now() + Math.random() + idx
+ }
+ handleBeforeUpload(file)
+ })
+ } catch (e) {
+ console.error('澶勭悊鎷嶆憚缁撴灉澶辫触:', e)
+ uni.showToast({ title: '澶勭悊鏂囦欢澶辫触', icon: 'error' })
}
+ },
+ fail: (err) => {
+ console.error('鎷嶆憚澶辫触:', err)
+ uni.showToast({ title: '鎷嶆憚澶辫触', icon: 'error' })
+ }
+ })
+ return
+ }
- const tempFilePath = res.tempFiles[0];
- const tempFile = res.tempFiles && res.tempFiles[0] ? res.tempFiles[0] : {};
-
- const file = {
- tempFilePath: tempFilePath,
- path: tempFilePath, // 淇濇寔鍏煎鎬�
+ // 闄嶇骇锛歝hooseImage / chooseVideo
+ if (type === 'video') {
+ chooseVideo()
+ } else {
+ uni.chooseImage({
+ count: 1,
+ sizeType: ['compressed', 'original'],
+ sourceType: ['camera'],
+ success: (res) => {
+ const tempFilePath = res?.tempFilePaths?.[0]
+ const tempFile = res?.tempFiles?.[0] || {}
+ if (!tempFilePath) return
+ handleBeforeUpload({
+ tempFilePath,
+ path: tempFilePath,
type: 'image',
name: `photo_${Date.now()}.jpg`,
size: tempFile.size || 0,
- createTime: new Date().getTime(),
+ createTime: Date.now(),
uid: Date.now() + Math.random()
- };
-
- handleBeforeUpload(file);
- } catch (error) {
- console.error('澶勭悊鎷嶇収缁撴灉澶辫触:', error);
- uni.showToast({
- title: '澶勭悊鍥剧墖澶辫触',
- icon: 'error'
- });
+ })
}
- },
- fail: (err) => {
- console.error('鎷嶇収澶辫触:', err);
- uni.showToast({
- title: '鎷嶇収澶辫触: ' + (err.errMsg || '鏈煡閿欒'),
- icon: 'error'
- });
- }
- })
+ })
+ }
}
// 鎷嶇収
@@ -1193,36 +1185,6 @@
// 涓婁紶鍓嶆牎楠�
const handleBeforeUpload = async (file) => {
- // 妫�鏌ョ綉缁滆繛鎺�
- const hasNetwork = await checkNetworkConnection();
- if (!hasNetwork) {
- uni.showToast({
- title: '缃戠粶杩炴帴涓嶅彲鐢紝璇锋鏌ョ綉缁滆缃�',
- icon: 'none'
- });
- return false;
- }
-
- // 鏍￠獙鏂囦欢澶у皬
- if (uploadConfig.fileSize && file.size) {
- const isLt = file.size / 1024 / 1024 < uploadConfig.fileSize;
- if (!isLt) {
- uni.showToast({
- title: `鏂囦欢澶у皬涓嶈兘瓒呰繃 ${uploadConfig.fileSize} MB!`,
- icon: 'none'
- });
- return false;
- }
- }
-
- // 鏍￠獙瑙嗛鏃堕暱
- if (file.type === 'video' && file.duration && file.duration > uploadConfig.maxVideoDuration) {
- uni.showToast({
- title: `瑙嗛鏃堕暱涓嶈兘瓒呰繃 ${uploadConfig.maxVideoDuration} 绉�!`,
- icon: 'none'
- });
- return false;
- }
// 鏍￠獙鏂囦欢绫诲瀷
if (uploadConfig.fileType && Array.isArray(uploadConfig.fileType) && uploadConfig.fileType.length > 0) {
@@ -1258,18 +1220,11 @@
return true;
}
-// 鏂囦欢涓婁紶澶勭悊
-const uploadFile = (file) => {
+// 鏂囦欢涓婁紶澶勭悊锛堢湡鏈鸿蛋 uni.uploadFile锛�
+const uploadFile = async (file) => {
uploading.value = true;
uploadProgress.value = 0;
number.value++; // 澧炲姞涓婁紶璁℃暟
-
- // 纭繚鏂囦欢璺緞姝ｇ‘
- const filePath = file.tempFilePath?.tempFilePath || file.path?.tempFilePath || '';
- if (!filePath) {
- handleUploadError('鏂囦欢璺緞涓嶅瓨鍦�');
- return;
- }
// 纭繚token瀛樺湪
const token = getToken();
@@ -1278,20 +1233,28 @@
return;
}
- // 鍑嗗涓婁紶鍙傛暟
- const uploadParams = {
+ const typeValue = getTabType(); // 鐢熶骇鍓�:10, 鐢熶骇涓�:11, 鐢熶骇鍚�:12
+
+ uploadWithUniUploadFile(file, file.tempFilePath || file.path || '', typeValue, token);
+}
+
+// 浣跨敤uni.uploadFile涓婁紶锛堥潪H5鐜鎴朒5鍥為��鏂规锛�
+const uploadWithUniUploadFile = (file, filePath, typeValue, token) => {
+ if (!filePath) {
+ handleUploadError('鏂囦欢璺緞涓嶅瓨鍦�');
+ return;
+ }
+
+ const uploadTask = uni.uploadFile({
url: uploadFileUrl.value,
filePath: filePath,
- name: 'files',
+ name: 'file',
formData: {
- type: getTabType() || 0
+ type: typeValue
},
header: {
'Authorization': `Bearer ${token}`
- }
- };
- const uploadTask = uni.uploadFile({
- ...uploadParams,
+ },
success: (res) => {
try {
if (res.statusCode === 200) {
@@ -1348,7 +1311,10 @@
}
// 涓婁紶澶辫触澶勭悊
-const handleUploadError = (message = '涓婁紶鏂囦欢澶辫触', showRetry = true) => {
+const handleUploadError = (message = '涓婁紶鏂囦欢澶辫触', showRetry = false) => {
+ uploading.value = false;
+ uploadProgress.value = 0;
+
if (showRetry) {
uni.showModal({
title: '涓婁紶澶辫触',
@@ -1369,63 +1335,69 @@
// 涓婁紶鎴愬姛鍥炶皟
const handleUploadSuccess = (res, file) => {
- if (res.code === 200 && res.data && Array.isArray(res.data) && res.data.length > 0) {
- const uploadedFile = res.data[0];
+ console.log('涓婁紶鎴愬姛鍝嶅簲:', res);
+
+ // 澶勭悊涓嶅悓鐨勬暟鎹粨鏋勶細鍙兘鏄暟缁勶紝涔熷彲鑳芥槸鍗曚釜瀵硅薄
+ let uploadedFile = null;
+ uploadedFile = res.data;
- // 鏍规嵁褰撳墠涓婁紶绫诲瀷璁剧疆type瀛楁
- let typeValue = 0; // 榛樿涓虹敓浜у墠
- switch (currentUploadType.value) {
- case 'before':
- typeValue = 0;
- break;
- case 'after':
- typeValue = 1;
- break;
- case 'issue':
- typeValue = 2;
- break;
- }
-
- // 纭繚涓婁紶鐨勬枃浠舵暟鎹畬鏁达紝鍖呭惈id鍜宼ype
- const fileData = {
- ...file,
- id: uploadedFile.id, // 娣诲姞鏈嶅姟鍣ㄨ繑鍥炵殑id
- url: uploadedFile.url || uploadedFile.downloadUrl,
- bucketFilename: uploadedFile.bucketFilename || file.name,
- downloadUrl: uploadedFile.downloadUrl || uploadedFile.url,
- size: uploadedFile.size || file.size,
- createTime: uploadedFile.createTime || new Date().getTime(),
- type: typeValue // 娣诲姞绫诲瀷瀛楁锛�0=鐢熶骇鍓�, 1=鐢熶骇涓�, 2=鐢熶骇鍚�
- };
-
- uploadList.value.push(fileData);
- uploadedSuccessfully();
- } else {
+ if (!uploadedFile) {
+ console.error('鏃犳硶瑙ｆ瀽涓婁紶鍝嶅簲鏁版嵁:', res);
number.value--; // 涓婁紶澶辫触鏃跺噺灏戣鏁�
- handleUploadError(res.msg || '涓婁紶澶辫触');
+ handleUploadError('涓婁紶鍝嶅簲鏁版嵁鏍煎紡閿欒', false);
+ return;
}
+
+ // 鏍规嵁褰撳墠涓婁紶绫诲瀷璁剧疆type瀛楁
+ let typeValue = 0; // 榛樿涓虹敓浜у墠
+ switch (currentUploadType.value) {
+ case 'before':
+ typeValue = 0;
+ break;
+ case 'after':
+ typeValue = 1;
+ break;
+ case 'issue':
+ typeValue = 2;
+ break;
+ }
+
+ // 纭繚涓婁紶鐨勬枃浠舵暟鎹畬鏁达紝鍖呭惈id鍜宼ype
+ const fileData = {
+ ...file,
+ id: uploadedFile.id, // 娣诲姞鏈嶅姟鍣ㄨ繑鍥炵殑id
+ tempId: uploadedFile.tempId ?? uploadedFile.tempFileId ?? uploadedFile.id,
+ url: uploadedFile.url || uploadedFile.downloadUrl || file.tempFilePath || file.path,
+ bucketFilename: uploadedFile.bucketFilename || uploadedFile.originalFilename || file.name,
+ downloadUrl: uploadedFile.downloadUrl || uploadedFile.url,
+ size: uploadedFile.size || uploadedFile.byteSize || file.size,
+ createTime: uploadedFile.createTime || new Date().getTime(),
+ type: typeValue // 娣诲姞绫诲瀷瀛楁锛�0=鐢熶骇鍓�, 1=鐢熶骇涓�, 2=鐢熶骇鍚�
+ };
+
+ uploadList.value.push(fileData);
+
+ // 绔嬪嵆娣诲姞鍒板搴旂殑鍒嗙被锛屼笉绛夊緟鎵�鏈夋枃浠朵笂浼犲畬鎴�
+ switch (currentUploadType.value) {
+ case 'before':
+ beforeModelValue.value.push(fileData);
+ break;
+ case 'after':
+ afterModelValue.value.push(fileData);
+ break;
+ case 'issue':
+ issueModelValue.value.push(fileData);
+ break;
+ }
+
+ // 閲嶇疆涓婁紶鍒楄〃锛堝洜涓哄凡缁忔坊鍔犲埌瀵瑰簲鍒嗙被浜嗭級
+ uploadList.value = [];
+ number.value = 0;
}
-// 涓婁紶缁撴潫澶勭悊
+// 涓婁紶缁撴潫澶勭悊锛堝凡搴熷純锛岀幇鍦ㄥ湪handleUploadSuccess涓洿鎺ュ鐞嗭級
const uploadedSuccessfully = () => {
- if (number.value > 0 && uploadList.value.length === number.value) {
- // 鏍规嵁褰撳墠涓婁紶绫诲瀷锛屽皢鏂囦欢娣诲姞鍒板搴旂殑鍒嗙被
- switch (currentUploadType.value) {
- case 'before':
- beforeModelValue.value = [...beforeModelValue.value, ...uploadList.value];
- break;
- case 'after':
- afterModelValue.value = [...afterModelValue.value, ...uploadList.value];
- break;
- case 'issue':
- issueModelValue.value = [...issueModelValue.value, ...uploadList.value];
- break;
- }
-
- // 閲嶇疆鐘舵��
- uploadList.value = [];
- number.value = 0;
- }
+ // 姝ゅ嚱鏁板凡涓嶅啀浣跨敤锛屾枃浠朵笂浼犳垚鍔熷悗绔嬪嵆娣诲姞鍒板搴斿垎绫�
}
// 鏍煎紡鍖栨枃浠跺ぇ灏�
--
Gitblit v1.9.3