From 2d10745e4832904e2ab39c413cf7670c6f9408b9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 26 九月 2025 13:06:25 +0800
Subject: [PATCH] 巡检上传
---
src/pages/index.vue | 82 +-
src/config.js | 4
src/pages/inspectionUpload/index.vue | 1863 +++++++++++++++++++++++++++++++++++++++++++++++++-------
src/static/images/banner/backview.png | 0
4 files changed, 1,674 insertions(+), 275 deletions(-)
diff --git a/src/config.js b/src/config.js
index b7c35cd..5349e2a 100644
--- a/src/config.js
+++ b/src/config.js
@@ -2,8 +2,8 @@
const config = {
// baseUrl: 'https://vue.ruoyi.vip/prod-api',
// baseUrl: 'http://localhost/prod-api',
- baseUrl: 'http://114.132.189.42:9036',
- // baseUrl: 'http://192.168.1.147:9036',
+ // baseUrl: 'http://114.132.189.42:9036',
+ baseUrl: 'http://192.168.1.147:9036',
//cloud鍚庡彴缃戝叧鍦板潃
// baseUrl: 'http://192.168.10.3:8080',
// 搴旂敤淇℃伅
diff --git a/src/pages/index.vue b/src/pages/index.vue
index 1749b98..f555632 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -271,26 +271,26 @@
icon: '/static/images/icon/xunjianshangchuan@2x.png',
label: '宸℃涓婁紶',
},
- {
- icon: '/static/images/icon/guzhangfenxi@2x.png',
- label: '鍒嗘瀽杩芥函',
- bgColor: '#ff9800'
- },
- {
- icon: '/static/images/icon/zhinengpaidan@2x.png',
- label: '鏅鸿兘娲惧崟',
- bgColor: '#ff6b35'
- },
- {
- icon: '/static/images/icon/zuoyezhidao@2x.png',
- label: '浣滀笟鎸囧',
- bgColor: '#4caf50'
- },
- {
- icon: '/static/images/icon/jieguoyanzheng@2x.png',
- label: '缁撴灉楠岃瘉',
- bgColor: '#9c27b0'
- }
+ // {
+ // icon: '/static/images/icon/guzhangfenxi@2x.png',
+ // label: '鍒嗘瀽杩芥函',
+ // bgColor: '#ff9800'
+ // },
+ // {
+ // icon: '/static/images/icon/zhinengpaidan@2x.png',
+ // label: '鏅鸿兘娲惧崟',
+ // bgColor: '#ff6b35'
+ // },
+ // {
+ // icon: '/static/images/icon/zuoyezhidao@2x.png',
+ // label: '浣滀笟鎸囧',
+ // bgColor: '#4caf50'
+ // },
+ // {
+ // icon: '/static/images/icon/jieguoyanzheng@2x.png',
+ // label: '缁撴灉楠岃瘉',
+ // bgColor: '#9c27b0'
+ // }
]);
// 澶勭悊甯哥敤鍔熻兘鐐瑰嚮
@@ -387,26 +387,26 @@
url: '/pages/inspectionUpload/index'
});
break;
- case '鍒嗘瀽杩芥函':
- uni.navigateTo({
- url: '/pages/equipmentManagement/faultAnalysis/index'
- });
- break;
- case '鏅鸿兘娲惧崟':
- uni.navigateTo({
- url: '/pages/equipmentManagement/smartDispatch/index'
- });
- break;
- case '浣滀笟鎸囧':
- uni.navigateTo({
- url: '/pages/equipmentManagement/sop/index'
- });
- break;
- case '缁撴灉楠岃瘉':
- uni.navigateTo({
- url: '/pages/equipmentManagement/verification/index'
- });
- break;
+ // case '鍒嗘瀽杩芥函':
+ // uni.navigateTo({
+ // url: '/pages/equipmentManagement/faultAnalysis/index'
+ // });
+ // break;
+ // case '鏅鸿兘娲惧崟':
+ // uni.navigateTo({
+ // url: '/pages/equipmentManagement/smartDispatch/index'
+ // });
+ // break;
+ // case '浣滀笟鎸囧':
+ // uni.navigateTo({
+ // url: '/pages/equipmentManagement/sop/index'
+ // });
+ // break;
+ // case '缁撴灉楠岃瘉':
+ // uni.navigateTo({
+ // url: '/pages/equipmentManagement/verification/index'
+ // });
+ // break;
default:
uni.showToast({
title: `鐐瑰嚮浜�${item.label}`,
@@ -557,7 +557,7 @@
.bg-img {
width: 100%;
height: 8.75rem;
- background-image: url("../static/images/banner/view-background.png");
+ background-image: url("../static/images/banner/backview.png");
background-size: cover;
border-radius: 0.75rem;
position: relative;
diff --git a/src/pages/inspectionUpload/index.vue b/src/pages/inspectionUpload/index.vue
index 3b9e0d7..b648e9c 100644
--- a/src/pages/inspectionUpload/index.vue
+++ b/src/pages/inspectionUpload/index.vue
@@ -11,7 +11,6 @@
v-for="(item, index) in taskTableData"
:key="index"
class="task-item"
- @click="handleAdd(item)"
>
<view class="task-header">
<view class="task-info">
@@ -22,30 +21,35 @@
<u-button
type="primary"
size="small"
- @click.stop="handleAdd(item)"
- :customStyle="{
- borderRadius: '15px',
- height: '30px',
- fontSize: '12px'
- }"
- >
- 涓婁紶
- </u-button>
- <u-button
- type="info"
- size="small"
@click.stop="startScanForTask(item)"
:customStyle="{
borderRadius: '15px',
height: '30px',
+ fontSize: '12px',
+ marginRight: '8px'
+ }"
+ >
+ 鎵爜涓婁紶
+ </u-button>
+ <u-button
+ type="success"
+ size="small"
+ @click.stop="viewAttachments(item)"
+ :customStyle="{
+ borderRadius: '15px',
+ height: '30px',
fontSize: '12px'
}"
>
- 鎵爜
+ 鏌ョ湅闄勪欢
</u-button>
</view>
</view>
<view class="task-details">
+ <view class="detail-item">
+ <text class="detail-label">浠诲姟ID</text>
+ <text class="detail-value">{{ item.taskId || item.id }}</text>
+ </view>
<view class="detail-item">
<text class="detail-label">澶囨敞</text>
<text class="detail-value">{{ item.remarks || '鏃�' }}</text>
@@ -62,6 +66,7 @@
<view v-if="taskTableData.length === 0" class="no-data">
<text>鏆傛棤鏁版嵁</text>
</view>
+
</view>
<!-- 鎵爜鍖哄煙 - 鍏ㄥ眬寮圭獥 -->
@@ -107,21 +112,237 @@
</view>
</view>
- <!-- 寮圭獥缁勪欢 -->
- <form-dia ref="formDia" @closeDia="handleQuery"></form-dia>
+ <!-- 鍥剧墖涓婁紶寮圭獥 - 鍘熺敓瀹炵幇 -->
+ <view v-if="showUploadDialog" class="custom-modal-overlay" @click="closeUploadDialog">
+ <view class="custom-modal-container" @click.stop>
+ <view class="upload-popup-content">
+ <view class="upload-popup-header">
+ <text class="upload-popup-title">涓婁紶宸℃璁板綍</text>
+ </view>
+
+ <view class="upload-popup-body">
+ <!-- 鍒嗙被鏍囩椤� -->
+ <view class="upload-tabs">
+ <view
+ class="tab-item"
+ :class="{ active: currentUploadType === 'before' }"
+ @click="switchUploadType('before')"
+ >
+ 鐢熶骇鍓�
+ </view>
+ <view
+ class="tab-item"
+ :class="{ active: currentUploadType === 'after' }"
+ @click="switchUploadType('after')"
+ >
+ 鐢熶骇涓�
+ </view>
+ <view
+ class="tab-item"
+ :class="{ active: currentUploadType === 'issue' }"
+ @click="switchUploadType('issue')"
+ >
+ 鐢熶骇鍚�
+ </view>
+ </view>
+
+ <!-- 褰撳墠鍒嗙被鐨勪笂浼犲尯鍩� -->
+ <view class="simple-upload-area">
+ <view class="upload-buttons">
+ <u-button
+ type="primary"
+ @click="chooseImage"
+ :loading="uploading"
+ :disabled="getCurrentFiles().length >= uploadConfig.limit"
+ :customStyle="{ marginRight: '10px', flex: 1 }"
+ >
+ <u-icon name="camera" size="18" color="#fff" style="margin-right: 5px;"></u-icon>
+ {{ uploading ? '涓婁紶涓�...' : '鎷嶇収' }}
+ </u-button>
+ <u-button
+ type="success"
+ @click="chooseVideo"
+ :loading="uploading"
+ :disabled="getCurrentFiles().length >= uploadConfig.limit"
+ :customStyle="{ flex: 1 }"
+ >
+ <u-icon name="video" size="18" color="#fff" style="margin-right: 5px;"></u-icon>
+ {{ uploading ? '涓婁紶涓�...' : '鎷嶈棰�' }}
+ </u-button>
+ </view>
+
+ <!-- 涓婁紶杩涘害 -->
+ <view v-if="uploading" class="upload-progress">
+ <u-line-progress
+ :percentage="uploadProgress"
+ :showText="true"
+ activeColor="#409eff"
+ ></u-line-progress>
+ </view>
+
+ <!-- 褰撳墠鍒嗙被鐨勬枃浠跺垪琛� -->
+ <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.type === 'image'"
+ :src="file.url || file.tempFilePath || file.path"
+ class="file-preview"
+ mode="aspectFill"
+ />
+ <view v-else class="video-preview">
+ <u-icon name="video" size="24" color="#409eff"></u-icon>
+ <text class="video-text">瑙嗛</text>
+ </view>
+
+ <!-- 鍒犻櫎鎸夐挳 -->
+ <view class="delete-btn" @click="removeFile(index)">
+ <u-icon name="close" size="12" color="#fff"></u-icon>
+ </view>
+ </view>
+
+ <view class="file-info">
+ <text class="file-name">{{ file.bucketFilename || file.name || (file.type === 'image' ? '鍥剧墖' : '瑙嗛') }}</text>
+ <text class="file-size">{{ formatFileSize(file.size) }}</text>
+ </view>
+ </view>
+ </view>
+
+ <view v-if="getCurrentFiles().length === 0" class="empty-state">
+ <text>璇烽�夋嫨瑕佷笂浼犵殑{{ getUploadTypeText() }}鍥剧墖鎴栬棰�</text>
+ </view>
+
+ <!-- 缁熻淇℃伅 -->
+ <view class="upload-summary">
+ <text class="summary-text">
+ 鐢熶骇鍓�: {{ beforeModelValue.length }}涓枃浠� |
+ 鐢熶骇涓�: {{ afterModelValue.length }}涓枃浠� |
+ 鐢熶骇鍚�: {{ issueModelValue.length }}涓枃浠�
+ </text>
+ </view>
+ </view>
+ </view>
+
+ <view class="upload-popup-footer">
+ <u-button @click="closeUploadDialog" :customStyle="{ marginRight: '10px' }">鍙栨秷</u-button>
+ <u-button type="primary" @click="submitUpload">鎻愪氦</u-button>
+ </view>
+ </view>
+ </view>
+ </view>
+
+ <!-- 鏌ョ湅闄勪欢寮圭獥 -->
+ <view v-if="showAttachmentDialog" class="custom-modal-overlay" @click="closeAttachmentDialog">
+ <view class="custom-modal-container" @click.stop>
+ <view class="attachment-popup-content">
+ <view class="attachment-popup-header">
+ <text class="attachment-popup-title">鏌ョ湅闄勪欢 - {{ currentViewTask?.taskName }}</text>
+ <view class="close-btn-attachment" @click="closeAttachmentDialog">
+ <u-icon name="close" size="16" color="#666"></u-icon>
+ </view>
+ </view>
+
+ <view class="attachment-popup-body">
+ <!-- 鍒嗙被鏍囩椤� -->
+ <view class="attachment-tabs">
+ <view
+ class="tab-item"
+ :class="{ active: currentViewType === 'before' }"
+ @click="switchViewType('before')"
+ >
+ 鐢熶骇鍓� ({{ getAttachmentsByType(0).length }})
+ </view>
+ <view
+ class="tab-item"
+ :class="{ active: currentViewType === 'after' }"
+ @click="switchViewType('after')"
+ >
+ 鐢熶骇涓� ({{ getAttachmentsByType(1).length }})
+ </view>
+ <view
+ class="tab-item"
+ :class="{ active: currentViewType === 'issue' }"
+ @click="switchViewType('issue')"
+ >
+ 鐢熶骇鍚� ({{ getAttachmentsByType(2).length }})
+ </view>
+ </view>
+
+ <!-- 褰撳墠鍒嗙被鐨勯檮浠跺垪琛� -->
+ <view class="attachment-content">
+ <view v-if="getCurrentViewAttachments().length > 0" class="attachment-list">
+ <view
+ v-for="(file, index) in getCurrentViewAttachments()"
+ :key="index"
+ class="attachment-item"
+ @click="previewAttachment(file)"
+ >
+ <view class="attachment-preview-container">
+ <image
+ v-if="file.type === 'image' || isImageFile(file)"
+ :src="file.url || file.downloadUrl"
+ class="attachment-preview"
+ mode="aspectFill"
+ />
+ <view v-else class="attachment-video-preview">
+ <u-icon name="video" size="24" color="#409eff"></u-icon>
+ <text class="video-text">瑙嗛</text>
+ </view>
+ </view>
+
+ <view class="attachment-info">
+ <text class="attachment-name">{{ file.originalFilename || file.bucketFilename || file.name || '闄勪欢' }}</text>
+ <text class="attachment-size">{{ formatFileSize(file.byteSize || file.size) }}</text>
+ </view>
+ </view>
+ </view>
+
+ <view v-else class="attachment-empty">
+ <text>璇ュ垎绫绘殏鏃犻檮浠�</text>
+ </view>
+ </view>
+ </view>
+ </view>
+ </view>
+ </view>
+
+ <!-- 瑙嗛棰勮寮圭獥 -->
+ <view v-if="showVideoDialog" class="video-modal-overlay" @click="closeVideoPreview">
+ <view class="video-modal-container" @click.stop>
+ <view class="video-modal-header">
+ <text class="video-modal-title">{{ currentVideoFile?.originalFilename || '瑙嗛棰勮' }}</text>
+ <view class="close-btn-video" @click="closeVideoPreview">
+ <u-icon name="close" size="16" color="#fff"></u-icon>
+ </view>
+ </view>
+ <view class="video-modal-body">
+ <video
+ v-if="currentVideoFile"
+ :src="currentVideoFile.url || currentVideoFile.downloadUrl"
+ class="video-player"
+ controls
+ autoplay
+ @error="handleVideoError"
+ ></video>
+ </view>
+ </view>
+ </view>
</view>
</template>
<script setup>
-import { onMounted, onUnmounted, ref, nextTick } from 'vue'
+import { onMounted, onUnmounted, ref, nextTick, computed } from 'vue'
import { onShow } from '@dcloudio/uni-app'
import PageHeader from '@/components/PageHeader.vue'
-import FormDia from './components/formDia.vue'
import { getLedgerById } from '@/api/equipmentManagement/ledger.js'
-import {inspectionTaskList} from "@/api/inspectionManagement";
+import {inspectionTaskList, uploadInspectionTask} from "@/api/inspectionManagement";
+import { getToken } from "@/utils/auth";
-// 缁勪欢寮曠敤
-const formDia = ref()
+// 缁勪欢寮曠敤宸茬Щ闄�
// 鍔犺浇鎻愮ず鏂规硶
const showLoadingToast = (message) => {
@@ -139,6 +360,64 @@
// 褰撳墠鎵弿鐨勪换鍔�
const currentScanningTask = ref(null)
+const infoData = ref(null);
+
+// 涓婁紶鐩稿叧鐘舵��
+const showUploadDialog = ref(false)
+const uploadFiles = ref([]) // 淇濈暀鐢ㄤ簬鍏煎鎬�
+const uploadStatusType = ref(0)
+const uploading = ref(false)
+const uploadProgress = ref(0)
+const number = ref(0)
+const uploadList = ref([])
+
+// 涓変釜鍒嗙被鐨勪笂浼犵姸鎬�
+const beforeModelValue = ref([]) // 鐢熶骇鍓�
+const afterModelValue = ref([]) // 鐢熶骇涓�
+const issueModelValue = ref([]) // 鐢熶骇鍚�
+
+// 褰撳墠婵�娲荤殑涓婁紶绫诲瀷
+const currentUploadType = ref('before') // 'before', 'after', 'issue'
+
+// 鏌ョ湅闄勪欢鐩稿叧鐘舵��
+const showAttachmentDialog = ref(false)
+const currentViewTask = ref(null)
+const currentViewType = ref('before') // 'before', 'after', 'issue'
+const attachmentList = ref([]) // 褰撳墠鏌ョ湅浠诲姟鐨勯檮浠跺垪琛�
+
+// 瑙嗛棰勮鐩稿叧鐘舵��
+const showVideoDialog = ref(false)
+const currentVideoFile = ref(null)
+
+// 涓婁紶閰嶇疆
+const uploadConfig = {
+ action: "/common/minioUploads",
+ limit: 10,
+ fileSize: 50, // MB
+ fileType: ['jpg', 'jpeg', 'png', 'mp4', 'mov'],
+ maxVideoDuration: 60 // 绉�
+}
+
+// 璁＄畻涓婁紶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://192.168.1.147:9036';
+ } else {
+ baseUrl = 'http://192.168.1.147:9036';
+ }
+
+ return baseUrl + uploadConfig.action;
+})
+
+// 璁＄畻璇锋眰澶�
+const headers = computed(() => {
+ const token = getToken();
+ return token ? { Authorization: "Bearer " + token } : {};
+})
// 璇锋眰鍙栨秷鏍囧織锛岀敤浜庡彇娑堟鍦ㄨ繘琛岀殑璇锋眰
let isRequestCancelled = false
@@ -168,6 +447,11 @@
// 鍋滄鎵爜
if (isScanning.value) {
isScanning.value = false
+ }
+
+ // 鍏抽棴涓婁紶寮圭獥
+ if (showUploadDialog.value) {
+ showUploadDialog.value = false
}
})
@@ -239,29 +523,12 @@
})
}
-
-// 涓婁紶
-const handleAdd = (row) => {
- nextTick(() => {
- // 妫�鏌ョ粍浠舵槸鍚﹁繕瀛樺湪
- if (formDia.value && formDia.value.openDialog) {
- formDia.value.openDialog(row)
- } else {
- console.error('涓婁紶缁勪欢寮曠敤涓嶅瓨鍦�')
- uni.showToast({
- title: '缁勪欢鏈噯澶囧ソ',
- icon: 'error'
- })
- }
- })
-}
-
// 涓烘寚瀹氫换鍔″紑濮嬫壂鐮�
const startScanForTask = async (task) => {
try {
// 璁板綍褰撳墠鎵弿鐨勪换鍔�
currentScanningTask.value = task
- console.log('涓轰换鍔″紑濮嬫壂鐮�:', task.taskName)
+ console.log('涓轰换鍔″紑濮嬫壂鐮侊紝浠诲姟ID:', task.taskId || task.id, '浠诲姟鍚嶇О:', task.taskName)
// 鏄剧ず鎵弿鐣岄潰
isScanning.value = true
@@ -269,7 +536,9 @@
// 浣跨敤uniapp鐨勬壂鐮丄PI
uni.scanCode({
success: (res) => {
- console.log('鎵爜鎴愬姛:', res)
+ console.log('=== 鎵爜API鎴愬姛鍥炶皟 ===')
+ console.log('鎵爜缁撴灉:', res)
+ console.log('褰撳墠鎵弿浠诲姟:', currentScanningTask.value)
handleScanSuccess(res)
},
fail: (err) => {
@@ -280,13 +549,8 @@
})
// 鍏抽棴鎵弿鐣岄潰
isScanning.value = false
- },
- complete: () => {
- // 鎵爜瀹屾垚鍚庡叧闂壂鎻忕晫闈�
- setTimeout(() => {
- isScanning.value = false
- }, 1000)
}
+ // 绉婚櫎complete鍥炶皟锛岄伩鍏嶅共鎵板脊绐楁樉绀�
})
} catch (e) {
console.error('鍚姩鎵爜澶辫触:', e)
@@ -310,98 +574,257 @@
console.log('澶勭悊鎵爜缁撴灉:', result)
console.log('褰撳墠鍏宠仈浠诲姟:', currentScanningTask.value?.taskName)
- uni.showToast({
- title: '璇嗗埆鎴愬姛',
- icon: 'success'
- })
-
- // 瑙ｆ瀽浜岀淮鐮佹暟鎹�
- let qrData
+ // 瑙ｆ瀽浜岀淮鐮佹暟鎹紝鎻愬彇deviceId
let deviceId = ''
- try {
- qrData = JSON.parse(result.result)
- console.log('瑙ｆ瀽鐨勪簩缁寸爜鏁版嵁:', qrData)
- deviceId = qrData.deviceId || qrData.qrCodeId
- } catch (e) {
- // 濡傛灉涓嶆槸JSON鏍煎紡锛屽皾璇曚粠URL涓彁鍙杁eviceId
+ // 妫�鏌ユ槸鍚︽槸URL鏍煎紡
+ if (result.result.includes('deviceId=')) {
+ // 浠嶶RL涓彁鍙杁eviceId
const url = result.result
-
- if (url.includes('deviceId=')) {
- // 浠嶶RL涓彁鍙杁eviceId
- const match = url.match(/deviceId=(\d+)/)
- if (match && match[1]) {
- deviceId = match[1]
- }
+ const match = url.match(/deviceId=(\d+)/)
+ if (match && match[1]) {
+ deviceId = match[1]
+ console.log('浠嶶RL涓彁鍙栧埌deviceId:', deviceId)
}
-
- qrData = {
- deviceName: deviceId ? `璁惧${deviceId}` : result.result,
- location: '',
- qrCodeId: deviceId // 浣跨敤鎻愬彇鐨刣eviceId鎴栧師濮嬬粨鏋�
- }
- }
-
- // 濡傛灉鏈夎澶嘔D锛屽皾璇曚粠API鑾峰彇鐪熷疄鐨勮澶囧悕绉�
- if (deviceId) {
+ } else {
+ // 灏濊瘯瑙ｆ瀽JSON鏍煎紡
try {
- console.log('姝ｅ湪鏌ヨ璁惧淇℃伅锛岃澶嘔D:', deviceId)
- const response = await getLedgerById(deviceId)
- console.log('璁惧淇℃伅鏌ヨ缁撴灉:', response)
-
- if (response.code === 200 && response.data) {
- qrData.deviceName = response.data.deviceName || `璁惧${deviceId}`
- qrData.location = response.data.storageLocation || ''
- console.log('鑾峰彇鍒拌澶囧悕绉�:', qrData.deviceName)
- } else {
- console.warn('璁惧淇℃伅鏌ヨ澶辫触锛屼娇鐢ㄩ粯璁ゅ悕绉�')
- qrData.deviceName = qrData.deviceName || `璁惧${deviceId}`
- }
- } catch (apiError) {
- console.error('鏌ヨ璁惧淇℃伅澶辫触:', apiError)
- // API璋冪敤澶辫触鏃朵娇鐢ㄩ粯璁ゅ悕绉�
- qrData.deviceName = qrData.deviceName || `璁惧${deviceId}`
+ const qrData = JSON.parse(result.result)
+ console.log('瑙ｆ瀽鐨勪簩缁寸爜鏁版嵁:', qrData)
+ deviceId = qrData.deviceId || qrData.qrCodeId || ''
+ } catch (e) {
+ // 濡傛灉涓嶆槸JSON鏍煎紡锛岀洿鎺ヤ娇鐢ㄧ粨鏋�
+ deviceId = result.result
}
}
- // 纭繚鏁版嵁瀹屾暣鎬�
- if (!qrData.deviceName) {
- qrData.deviceName = result.result
- }
- if (!qrData.qrCodeId) {
- qrData.qrCodeId = deviceId || result.result
- }
-
- // 灏嗘壂鐮佹暟鎹笌浠诲姟鍏宠仈
- if (currentScanningTask.value) {
- // 鍏宠仈浠诲姟淇℃伅
- const taskData = {
- ...currentScanningTask.value,
- qrCodeData: qrData
- }
-
- // 鎵撳紑涓婁紶寮圭獥锛屼紶閫掑叧鑱斿悗鐨勪换鍔℃暟鎹�
- nextTick(() => {
- if (formDia.value && formDia.value.openDialog) {
- formDia.value.openDialog(taskData)
- } else {
- console.error('涓婁紶缁勪欢寮曠敤涓嶅瓨鍦�')
- uni.showToast({
- title: '缁勪欢鏈噯澶囧ソ',
- icon: 'error'
- })
- }
+ if (!deviceId) {
+ uni.showToast({
+ title: '鏈瘑鍒埌璁惧ID',
+ icon: 'error'
})
+ isScanning.value = false
+ return
}
+
+ // 鑾峰彇褰撳墠浠诲姟鐨則askId
+ const currentTaskId = currentScanningTask.value?.taskId || currentScanningTask.value?.id
+ console.log('褰撳墠浠诲姟ID:', currentTaskId, '鎵爜璁惧ID:', deviceId)
+
+ // 瀵规瘮deviceId鍜宼askId
+ if (deviceId === currentTaskId.toString()) {
+ console.log('=== 璁惧ID鍖归厤鎴愬姛 ===')
+ uni.showToast({
+ title: '璇嗗埆鎴愬姛',
+ icon: 'success'
+ })
+
+ console.log('鍑嗗鎵撳紑涓婁紶寮圭獥锛屽綋鍓嶄换鍔�:', currentScanningTask.value)
+
+ // 鍏堝叧闂壂鎻忕晫闈�
+ isScanning.value = false
+ console.log('鎵弿鐣岄潰宸插叧闂�')
+
+ // 寤惰繜鎵撳紑涓婁紶寮圭獥锛岀‘淇濇壂鎻忕晫闈㈠畬鍏ㄥ叧闂�
+ setTimeout(() => {
+ console.log('寤惰繜鎵撳紑涓婁紶寮圭獥')
+ openUploadDialog(currentScanningTask.value)
+ }, 300)
+ } else {
+ uni.showToast({
+ title: '璇锋壂鎻忔纭殑璁惧',
+ icon: 'error'
+ })
+ console.warn('璁惧ID涓嶅尮閰嶏紝鏈熸湜:', currentTaskId, '瀹為檯:', deviceId)
+
+ // 鍏抽棴鎵弿鐣岄潰
+ isScanning.value = false
+ }
+
} catch (error) {
console.error('澶勭悊鎵爜缁撴灉澶辫触:', error)
uni.showToast({
title: error.message || '鏁版嵁瑙ｆ瀽澶辫触',
icon: 'error'
})
- } finally {
// 鍏抽棴鎵弿鐣岄潰
isScanning.value = false
+ }
+}
+
+// 鎵撳紑涓婁紶寮圭獥
+const openUploadDialog = (task) => {
+ console.log('=== 寮�濮嬫墦寮�涓婁紶寮圭獥 ===')
+ console.log('浼犲叆鐨勪换鍔�:', task)
+ console.log('浠诲姟鍚嶇О:', task?.taskName || '鏈煡浠诲姟')
+ console.log('褰撳墠showUploadDialog鐘舵��(璋冪敤鍓�):', showUploadDialog.value)
+
+ // 璁剧疆浠诲姟淇℃伅鍒癷nfoData
+ if (task) {
+ infoData.value = {
+ ...task,
+ taskId: task.taskId || task.id,
+ storageBlobDTO: [] // 鍒濆鍖栨枃浠跺垪琛�
+ };
+ console.log('璁剧疆infoData:', infoData.value);
+ }
+
+ // 璁剧疆涓婁紶鐘舵�佺被鍨嬶紙鍙互鏍规嵁浠诲姟绫诲瀷璁剧疆涓嶅悓鐨勭姸鎬侊級
+ uploadStatusType.value = 0 // 榛樿鐘舵��
+
+ // 娓呯┖涔嬪墠鐨勬枃浠�
+ uploadFiles.value = []
+
+ // 鏄剧ず涓婁紶寮圭獥
+ showUploadDialog.value = true
+
+ console.log('褰撳墠showUploadDialog鐘舵��(璁剧疆鍚�):', showUploadDialog.value)
+ console.log('=== 涓婁紶寮圭獥璁剧疆瀹屾垚 ===')
+
+ // 寤惰繜妫�鏌ョ姸鎬�
+ setTimeout(() => {
+ console.log('寤惰繜妫�鏌howUploadDialog鐘舵��:', showUploadDialog.value)
+ }, 100)
+}
+
+// 鍏抽棴涓婁紶寮圭獥
+const closeUploadDialog = () => {
+ showUploadDialog.value = false
+ uploadFiles.value = []
+ // 娓呯悊涓変釜鍒嗙被鐨勬暟鎹�
+ beforeModelValue.value = []
+ afterModelValue.value = []
+ issueModelValue.value = []
+ currentUploadType.value = 'before'
+ infoData.value = null // 娓呯悊浠诲姟鏁版嵁
+ console.log('涓婁紶寮圭獥宸插叧闂紝鏁版嵁宸叉竻鐞�')
+}
+
+// 鍒囨崲涓婁紶绫诲瀷
+const switchUploadType = (type) => {
+ currentUploadType.value = type
+ console.log('鍒囨崲鍒颁笂浼犵被鍨�:', type)
+}
+
+// 鑾峰彇褰撳墠鍒嗙被鐨勬枃浠跺垪琛�
+const getCurrentFiles = () => {
+ switch (currentUploadType.value) {
+ case 'before':
+ return beforeModelValue.value
+ case 'after':
+ return afterModelValue.value
+ case 'issue':
+ return issueModelValue.value
+ default:
+ return []
+ }
+}
+
+// 鑾峰彇涓婁紶绫诲瀷鏂囨湰
+const getUploadTypeText = () => {
+ switch (currentUploadType.value) {
+ case 'before':
+ return '鐢熶骇鍓�'
+ case 'after':
+ return '鐢熶骇涓�'
+ case 'issue':
+ return '鐢熶骇鍚�'
+ default:
+ return ''
+ }
+}
+
+// 澶勭悊涓婁紶鏂囦欢鏇存柊
+const handleUploadUpdate = (files) => {
+ uploadFiles.value = files
+ console.log('涓婁紶鏂囦欢鏇存柊:', files)
+}
+
+// 鎻愪氦涓婁紶
+const submitUpload = async () => {
+ try {
+ // 妫�鏌ユ槸鍚︽湁浠讳綍鏂囦欢涓婁紶
+ const totalFiles = beforeModelValue.value.length + afterModelValue.value.length + issueModelValue.value.length;
+ if (totalFiles === 0) {
+ uni.showToast({
+ title: '璇峰厛涓婁紶鏂囦欢',
+ icon: 'none'
+ })
+ return
+ }
+
+ // 鏄剧ず鎻愪氦涓殑鍔犺浇鎻愮ず
+ showLoadingToast('鎻愪氦涓�...')
+
+ // 鎸夌収鎮ㄧ殑閫昏緫鍚堝苟鎵�鏈夊垎绫荤殑鏂囦欢
+ let arr = [];
+ if (beforeModelValue.value.length > 0) {
+ arr.push(...beforeModelValue.value);
+ }
+ if (afterModelValue.value.length > 0) {
+ arr.push(...afterModelValue.value);
+ }
+ if (issueModelValue.value.length > 0) {
+ arr.push(...issueModelValue.value);
+ }
+
+ // 鎻愪氦鏁版嵁
+ infoData.value.storageBlobDTO = arr;
+
+ console.log('鍑嗗鎻愪氦宸℃浠诲姟鏁版嵁:', infoData.value);
+ console.log('鍚堝苟鐨勬枃浠跺垪琛�:', arr);
+ console.log('鐢熶骇鍓嶆枃浠�(type=0):', beforeModelValue.value.length, beforeModelValue.value);
+ console.log('鐢熶骇涓枃浠�(type=1):', afterModelValue.value.length, afterModelValue.value);
+ console.log('鐢熶骇鍚庢枃浠�(type=2):', issueModelValue.value.length, issueModelValue.value);
+
+ const result = await uploadInspectionTask({...infoData.value});
+
+ console.log('宸℃浠诲姟鎻愪氦缁撴灉:', result);
+
+ // 妫�鏌ユ彁浜ょ粨鏋�
+ if (result && (result.code === 200 || result.success)) {
+ // 鎻愪氦鎴愬姛
+ closeToast(); // 鍏抽棴鍔犺浇鎻愮ず
+
+ uni.showToast({
+ title: '鎻愪氦鎴愬姛',
+ icon: 'success'
+ })
+
+ // 鍏抽棴寮圭獥
+ closeUploadDialog()
+
+ // 鍒锋柊鍒楄〃
+ setTimeout(() => {
+ getList()
+ }, 500)
+
+ } else {
+ // 鎻愪氦澶辫触
+ closeToast();
+ uni.showToast({
+ title: result?.msg || result?.message || '鎻愪氦澶辫触',
+ icon: 'error'
+ })
+ }
+
+ } catch (error) {
+ console.error('鎻愪氦涓婁紶澶辫触:', error)
+ closeToast(); // 鍏抽棴鍔犺浇鎻愮ず
+
+ let errorMessage = '鎻愪氦澶辫触';
+ if (error.message) {
+ errorMessage = error.message;
+ } else if (error.msg) {
+ errorMessage = error.msg;
+ } else if (typeof error === 'string') {
+ errorMessage = error;
+ }
+
+ uni.showToast({
+ title: errorMessage,
+ icon: 'error'
+ })
}
}
@@ -410,120 +833,636 @@
console.error('鎽勫儚澶撮敊璇�:', error)
cameraError.value = '鎽勫儚澶磋闂け璐ワ紝璇锋鏌ユ潈闄愯缃�'
}
-</script>
-<style scoped lang="scss">
-// 瀵煎叆閿�鍞ā鍧楀叕鍏辨牱寮�
-@import '@/styles/sales-common.scss';
-
-// 椤甸潰瀹瑰櫒鏍峰紡
-.inspection-upload-page {
- min-height: 100vh;
- background: #f8f9fa;
- position: relative;
+// 鎵爜浜嬩欢澶勭悊
+const handleScanCode = (result) => {
+ console.log('鎵爜缁撴灉:', result)
+ handleScanSuccess(result)
}
-// 鍒楄〃瀹瑰櫒鏍峰紡
-.table-section {
- padding: 20px;
-}
-
-// 浠诲姟鍒楄〃鏍峰紡 - 浣跨敤閿�鍞彴璐︾殑鏍峰紡瑙勮寖
-.task-list {
- .task-item {
- background: #ffffff;
- border-radius: 12px;
- margin-bottom: 16px;
- overflow: hidden;
- box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
- padding: 0 16px;
+// 鏌ョ湅闄勪欢
+const viewAttachments = async (task) => {
+ try {
+ console.log('鏌ョ湅闄勪欢锛屼换鍔�:', task)
+ currentViewTask.value = task
+ currentViewType.value = 'before'
- &:active {
- transform: scale(0.98);
- box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
+ // 瑙ｆ瀽鏂扮殑鏁版嵁缁撴瀯
+ attachmentList.value = []
+
+ // 鐢熶骇鍓嶉檮浠� (type=0)
+ if (task.beforeProduction && Array.isArray(task.beforeProduction)) {
+ const beforeFiles = task.beforeProduction.map(file => ({
+ ...file,
+ type: 0 // 纭繚type涓�0
+ }))
+ attachmentList.value.push(...beforeFiles)
}
+
+ // 鐢熶骇涓檮浠� (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)
+ }
+
+ console.log('瑙ｆ瀽鍚庣殑闄勪欢鍒楄〃:', attachmentList.value)
+ console.log('鐢熶骇鍓嶉檮浠�:', task.beforeProduction?.length || 0)
+ console.log('鐢熶骇涓檮浠�:', task.afterProduction?.length || 0)
+ console.log('鐢熶骇鍚庨檮浠�:', task.productionIssues?.length || 0)
+
+ showAttachmentDialog.value = true
+
+ } catch (error) {
+ console.error('鑾峰彇闄勪欢鍒楄〃澶辫触:', error)
+ uni.showToast({
+ title: '鑾峰彇闄勪欢澶辫触',
+ icon: 'error'
+ })
}
}
-// 椤圭洰澶撮儴鏍峰紡
-.task-header {
- padding: 16px 0;
+// 鍏抽棴闄勪欢鏌ョ湅寮圭獥
+const closeAttachmentDialog = () => {
+ showAttachmentDialog.value = false
+ currentViewTask.value = null
+ attachmentList.value = []
+ currentViewType.value = 'before'
+}
+
+// 鍒囨崲鏌ョ湅绫诲瀷
+const switchViewType = (type) => {
+ currentViewType.value = type
+ console.log('鍒囨崲鏌ョ湅绫诲瀷鍒�:', type)
+}
+
+// 鏍规嵁type鑾峰彇瀵瑰簲鍒嗙被鐨勯檮浠�
+const getAttachmentsByType = (typeValue) => {
+ return attachmentList.value.filter(file => file.type === typeValue) || []
+}
+
+// 鑾峰彇褰撳墠鏌ョ湅绫诲瀷鐨勯檮浠�
+const getCurrentViewAttachments = () => {
+ switch (currentViewType.value) {
+ case 'before':
+ return getAttachmentsByType(0)
+ case 'after':
+ return getAttachmentsByType(1)
+ case 'issue':
+ return getAttachmentsByType(2)
+ default:
+ return []
+ }
+}
+
+// 鍒ゆ柇鏄惁涓哄浘鐗囨枃浠�
+const isImageFile = (file) => {
+ // 妫�鏌ontentType瀛楁
+ if (file.contentType && file.contentType.startsWith('image/')) {
+ return true
+ }
+
+ // 妫�鏌ュ師鏈夌殑type瀛楁
+ if (file.type === 'image') return true
+
+ // 妫�鏌ユ枃浠舵墿灞曞悕
+ const name = file.bucketFilename || file.originalFilename || file.name || ''
+ const ext = name.split('.').pop()?.toLowerCase()
+ return ['jpg', 'jpeg', 'png', 'gif', 'webp'].includes(ext)
+}
+
+// 棰勮闄勪欢
+const previewAttachment = (file) => {
+ if (isImageFile(file)) {
+ // 棰勮鍥剧墖
+ const imageUrls = getCurrentViewAttachments()
+ .filter(f => isImageFile(f))
+ .map(f => f.url || f.downloadUrl)
+
+ uni.previewImage({
+ urls: imageUrls,
+ current: file.url || file.downloadUrl
+ })
+ } else {
+ // 棰勮瑙嗛 - 鏄剧ず瑙嗛鎾斁寮圭獥
+ showVideoPreview(file)
+ }
+}
+
+// 鏄剧ず瑙嗛棰勮
+const showVideoPreview = (file) => {
+ currentVideoFile.value = file
+ showVideoDialog.value = true
+ console.log('鎾斁瑙嗛:', file.url || file.downloadUrl)
+}
+
+// 鍏抽棴瑙嗛棰勮
+const closeVideoPreview = () => {
+ showVideoDialog.value = false
+ currentVideoFile.value = null
+}
+
+// 瑙嗛鎾斁閿欒澶勭悊
+const handleVideoError = (error) => {
+ console.error('瑙嗛鎾斁閿欒:', error)
+ uni.showToast({
+ title: '瑙嗛鎾斁澶辫触',
+ icon: 'error'
+ })
+}
+
+// 鎷嶇収
+const chooseImage = () => {
+ if (uploadFiles.value.length >= uploadConfig.limit) {
+ uni.showToast({
+ title: `鏈�澶氬彧鑳芥媿鎽�${uploadConfig.limit}涓枃浠禶,
+ icon: 'none'
+ });
+ return;
+ }
+
+ uni.chooseImage({
+ count: 1,
+ sizeType: ['compressed', 'original'],
+ sourceType: ['camera'],
+ success: (res) => {
+ try {
+ if (!res.tempFilePaths || res.tempFilePaths.length === 0) {
+ throw new Error('鏈幏鍙栧埌鍥剧墖鏂囦欢');
+ }
+
+ const tempFilePath = res.tempFilePaths[0];
+ const tempFile = res.tempFiles && res.tempFiles[0] ? res.tempFiles[0] : {};
+
+ const file = {
+ tempFilePath: tempFilePath,
+ path: tempFilePath, // 淇濇寔鍏煎鎬�
+ type: 'image',
+ name: `photo_${Date.now()}.jpg`,
+ size: tempFile.size || 0,
+ createTime: new Date().getTime(),
+ 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'
+ });
+ }
+ });
+}
+
+// 鎷嶈棰�
+const chooseVideo = () => {
+ if (uploadFiles.value.length >= uploadConfig.limit) {
+ uni.showToast({
+ title: `鏈�澶氬彧鑳芥媿鎽�${uploadConfig.limit}涓枃浠禶,
+ icon: 'none'
+ });
+ return;
+ }
+
+ uni.chooseVideo({
+ sourceType: ['camera'],
+ maxDuration: uploadConfig.maxVideoDuration,
+ camera: 'back',
+ success: (res) => {
+ try {
+ if (!res.tempFilePath) {
+ throw new Error('鏈幏鍙栧埌瑙嗛鏂囦欢');
+ }
+
+ const file = {
+ tempFilePath: res.tempFilePath,
+ path: res.tempFilePath, // 淇濇寔鍏煎鎬�
+ type: 'video',
+ name: `video_${Date.now()}.mp4`,
+ size: res.size || 0,
+ duration: res.duration || 0,
+ createTime: new Date().getTime(),
+ 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'
+ });
+ }
+ });
+}
+
+// 鍒犻櫎鏂囦欢
+const removeFile = (index) => {
+ uni.showModal({
+ title: '纭鍒犻櫎',
+ content: '纭畾瑕佸垹闄よ繖涓枃浠跺悧锛�',
+ success: (res) => {
+ if (res.confirm) {
+ // 鏍规嵁褰撳墠涓婁紶绫诲瀷鍒犻櫎瀵瑰簲鍒嗙被鐨勬枃浠�
+ switch (currentUploadType.value) {
+ case 'before':
+ beforeModelValue.value.splice(index, 1);
+ break;
+ case 'after':
+ afterModelValue.value.splice(index, 1);
+ break;
+ case 'issue':
+ issueModelValue.value.splice(index, 1);
+ break;
+ }
+ uni.showToast({
+ title: '鍒犻櫎鎴愬姛',
+ icon: 'success'
+ });
+ }
+ }
+ });
+}
+
+// 妫�鏌ョ綉缁滆繛鎺�
+const checkNetworkConnection = () => {
+ return new Promise((resolve) => {
+ uni.getNetworkType({
+ success: (res) => {
+ if (res.networkType === 'none') {
+ resolve(false);
+ } else {
+ resolve(true);
+ }
+ },
+ fail: () => {
+ resolve(false);
+ }
+ });
+ });
+}
+
+// 涓婁紶鍓嶆牎楠�
+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) {
+ const fileName = file.name || '';
+ const fileExtension = fileName ? fileName.split('.').pop().toLowerCase() : '';
+
+ // 鏍规嵁鏂囦欢绫诲瀷纭畾鏈熸湜鐨勬墿灞曞悕
+ let expectedTypes = [];
+ if (file.type === 'image') {
+ expectedTypes = ['jpg', 'jpeg', 'png', 'gif', 'webp'];
+ } else if (file.type === 'video') {
+ expectedTypes = ['mp4', 'mov', 'avi', 'wmv'];
+ }
+
+ // 妫�鏌ユ枃浠舵墿灞曞悕鏄惁鍦ㄥ厑璁哥殑绫诲瀷涓�
+ if (fileExtension && expectedTypes.length > 0) {
+ const isAllowed = expectedTypes.some(type =>
+ uploadConfig.fileType.includes(type) && type === fileExtension
+ );
+
+ if (!isAllowed) {
+ uni.showToast({
+ title: `鏂囦欢鏍煎紡涓嶆敮鎸侊紝璇锋媿鎽� ${expectedTypes.join('/')} 鏍煎紡鐨勬枃浠禶,
+ icon: 'none'
+ });
+ return false;
+ }
+ }
+ }
+
+ // 鏍￠獙閫氳繃锛屽紑濮嬩笂浼�
+ uploadFile(file);
+ return true;
+}
+
+// 鏂囦欢涓婁紶澶勭悊
+const uploadFile = (file) => {
+ uploading.value = true;
+ uploadProgress.value = 0;
+ number.value++; // 澧炲姞涓婁紶璁℃暟
+
+ // 纭繚鏂囦欢璺緞姝ｇ‘
+ const filePath = file.tempFilePath || file.path;
+ if (!filePath) {
+ handleUploadError('鏂囦欢璺緞涓嶅瓨鍦�');
+ return;
+ }
+
+ // 纭繚token瀛樺湪
+ const token = getToken();
+ if (!token) {
+ handleUploadError('鐢ㄦ埛鏈櫥褰�');
+ return;
+ }
+
+ // 鍑嗗涓婁紶鍙傛暟
+ const uploadParams = {
+ url: uploadFileUrl.value,
+ filePath: filePath,
+ name: 'files',
+ formData: {
+ type: uploadStatusType.value || 0
+ },
+ header: {
+ 'Authorization': `Bearer ${token}`
+ }
+ };
+
+ const uploadTask = uni.uploadFile({
+ ...uploadParams,
+ success: (res) => {
+ try {
+ if (res.statusCode === 200) {
+ const response = JSON.parse(res.data);
+ if (response.code === 200) {
+ handleUploadSuccess(response, file);
+ uni.showToast({
+ title: '涓婁紶鎴愬姛',
+ icon: 'success'
+ });
+ } else {
+ handleUploadError(response.msg || '鏈嶅姟鍣ㄨ繑鍥為敊璇�');
+ }
+ } else {
+ handleUploadError(`鏈嶅姟鍣ㄩ敊璇紝鐘舵�佺爜: ${res.statusCode}`);
+ }
+ } catch (e) {
+ console.error('瑙ｆ瀽鍝嶅簲澶辫触:', e);
+ console.error('鍘熷鍝嶅簲鏁版嵁:', res.data);
+ handleUploadError('鍝嶅簲鏁版嵁瑙ｆ瀽澶辫触: ' + e.message);
+ }
+ },
+ fail: (err) => {
+ console.error('涓婁紶澶辫触:', err.errMsg || err);
+ number.value--; // 涓婁紶澶辫触鏃跺噺灏戣鏁�
+
+ let errorMessage = '涓婁紶澶辫触';
+ if (err.errMsg) {
+ if (err.errMsg.includes('statusCode: null')) {
+ errorMessage = '缃戠粶杩炴帴澶辫触锛岃妫�鏌ョ綉缁滆缃�';
+ } else if (err.errMsg.includes('timeout')) {
+ errorMessage = '涓婁紶瓒呮椂锛岃閲嶈瘯';
+ } else if (err.errMsg.includes('fail')) {
+ errorMessage = '涓婁紶澶辫触锛岃妫�鏌ョ綉缁滆繛鎺�';
+ } else {
+ errorMessage = err.errMsg;
+ }
+ }
+
+ handleUploadError(errorMessage);
+ },
+ complete: () => {
+ uploading.value = false;
+ uploadProgress.value = 0;
+ }
+ });
+
+ // 鐩戝惉涓婁紶杩涘害
+ if (uploadTask && uploadTask.onProgressUpdate) {
+ uploadTask.onProgressUpdate((res) => {
+ uploadProgress.value = res.progress;
+ });
+ }
+}
+
+// 涓婁紶澶辫触澶勭悊
+const handleUploadError = (message = '涓婁紶鏂囦欢澶辫触', showRetry = true) => {
+ if (showRetry) {
+ uni.showModal({
+ title: '涓婁紶澶辫触',
+ content: message + '锛屾槸鍚﹂噸璇曪紵',
+ success: (res) => {
+ if (res.confirm) {
+ // 鐢ㄦ埛閫夋嫨閲嶈瘯锛岃繖閲屽彲浠ラ噸鏂拌Е鍙戜笂浼�
+ }
+ }
+ });
+ } else {
+ uni.showToast({
+ title: message,
+ icon: 'error'
+ });
+ }
+}
+
+// 涓婁紶鎴愬姛鍥炶皟
+const handleUploadSuccess = (res, file) => {
+ if (res.code === 200 && res.data && Array.isArray(res.data) && res.data.length > 0) {
+ const uploadedFile = res.data[0];
+
+ // 鏍规嵁褰撳墠涓婁紶绫诲瀷璁剧疆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=鐢熶骇鍚�
+ };
+
+ console.log(`${getUploadTypeText()}鏂囦欢涓婁紶鎴愬姛锛岀被鍨嬪��:`, typeValue, '鏂囦欢鏁版嵁:', fileData);
+
+ uploadList.value.push(fileData);
+ uploadedSuccessfully();
+ } else {
+ number.value--; // 涓婁紶澶辫触鏃跺噺灏戣鏁�
+ handleUploadError(res.msg || '涓婁紶澶辫触');
+ }
+}
+
+// 涓婁紶缁撴潫澶勭悊
+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;
+
+ console.log(`${getUploadTypeText()}鏂囦欢涓婁紶瀹屾垚:`, getCurrentFiles());
+ }
+}
+
+// 鏍煎紡鍖栨枃浠跺ぇ灏�
+const formatFileSize = (size) => {
+ if (!size) return '';
+ if (size < 1024) return size + 'B';
+ if (size < 1024 * 1024) return (size / 1024).toFixed(1) + 'KB';
+ return (size / (1024 * 1024)).toFixed(1) + 'MB';
+}
+</script>
+
+<style scoped>
+.inspection-upload-page {
+ min-height: 100vh;
+ background-color: #f5f5f5;
+}
+
+.table-section {
+ padding: 15px;
+}
+
+.task-list {
display: flex;
- align-items: center;
+ flex-direction: column;
+ gap: 12px;
+}
+
+.task-item {
+ background: #fff;
+ border-radius: 12px;
+ padding: 15px;
+ box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+ transition: all 0.3s ease;
+}
+
+.task-header {
+ display: flex;
justify-content: space-between;
- margin-bottom: 0;
+ align-items: flex-start;
+ margin-bottom: 12px;
}
.task-info {
flex: 1;
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
}
.task-name {
- font-size: 14px;
+ font-size: 16px;
+ font-weight: 600;
color: #333;
- font-weight: 500;
- margin-bottom: 0;
- line-height: 1.4;
}
.task-location {
- font-size: 12px;
+ font-size: 14px;
color: #666;
- margin-top: 4px;
}
-// 浠诲姟鎿嶄綔鎸夐挳鏍峰紡
.task-actions {
display: flex;
- align-items: center;
gap: 8px;
- margin-left: 0;
}
-// 浠诲姟璇︽儏鏍峰紡 - 浣跨敤閿�鍞彴璐︾殑璇︽儏琛屾牱寮�
.task-details {
- padding: 16px 0;
-
- .detail-item {
- display: flex;
- align-items: flex-end;
- justify-content: space-between;
- margin-bottom: 8px;
-
- &:last-child {
- margin-bottom: 0;
- }
-
- .detail-label {
- font-size: 12px;
- color: #777777;
- min-width: 60px;
- flex-shrink: 0;
- }
-
- .detail-value {
- font-size: 12px;
- color: #000000;
- text-align: right;
- flex: 1;
- margin-left: 16px;
- line-height: 1.4;
- }
- }
+ display: flex;
+ flex-direction: column;
+ gap: 6px;
}
-// 鏃犳暟鎹彁绀烘牱寮� - 浣跨敤閿�鍞彴璐︾殑鏍峰紡
+.detail-item {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+
+.detail-label {
+ font-size: 12px;
+ color: #999;
+}
+
+.detail-value {
+ font-size: 12px;
+ color: #666;
+ font-weight: 500;
+}
+
.no-data {
- padding: 40px 0;
text-align: center;
+ padding: 40px 20px;
color: #999;
- background: none;
- margin: 0;
-}
-
-.no-data text {
font-size: 14px;
- color: #999;
}
/* 鎵爜寮圭獥鏍峰紡 */
@@ -533,78 +1472,538 @@
left: 0;
right: 0;
bottom: 0;
- background-color: rgba(0, 0, 0, 0.8);
+ background: rgba(0, 0, 0, 0.8);
z-index: 9999;
display: flex;
- flex-direction: column;
- justify-content: center;
align-items: center;
- padding: 20px;
+ justify-content: center;
}
.qr-scan-container {
- width: 100%;
+ width: 90vw;
max-width: 400px;
- background-color: #000;
+ background: #fff;
border-radius: 12px;
- overflow: hidden;
+ padding: 20px;
+ position: relative;
}
.scan-header {
display: flex;
justify-content: space-between;
align-items: center;
- padding: 15px;
- background-color: rgba(0, 0, 0, 0.7);
+ margin-bottom: 15px;
}
.scan-title {
font-size: 18px;
font-weight: 600;
- color: #fff;
+ color: #333;
}
.qr-camera {
width: 100%;
- height: 400px;
+ height: 300px;
+ border-radius: 8px;
+ overflow: hidden;
+ margin-bottom: 15px;
}
.scan-frame-wrapper {
position: relative;
- width: 100%;
- height: 300px;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
}
.scan-frame {
- position: absolute;
- top: 50%;
- left: 50%;
- transform: translate(-50%, -50%);
- width: 80%;
- height: 80%;
- border: 3px solid #1890ff;
+ width: 200px;
+ height: 200px;
+ border: 2px solid #409eff;
border-radius: 8px;
- box-shadow: 0 0 20px rgba(24, 144, 255, 0.3);
- animation: pulse 2s infinite;
+ position: relative;
+}
+
+.scan-frame::before,
+.scan-frame::after {
+ content: '';
+ position: absolute;
+ width: 20px;
+ height: 20px;
+ border: 2px solid #409eff;
+}
+
+.scan-frame::before {
+ top: -2px;
+ left: -2px;
+ border-right: none;
+ border-bottom: none;
+}
+
+.scan-frame::after {
+ bottom: -2px;
+ right: -2px;
+ border-left: none;
+ border-top: none;
}
.scan-tip {
- position: absolute;
- bottom: 10px;
- left: 50%;
- transform: translateX(-50%);
- color: #fff;
+ margin-top: 10px;
font-size: 14px;
+ color: #666;
text-align: center;
- background-color: rgba(0, 0, 0, 0.6);
- padding: 5px 15px;
- border-radius: 20px;
}
-@keyframes pulse {
- 0% { opacity: 0.8; }
- 50% { opacity: 0.4; }
- 100% { opacity: 0.8; }
+/* 鑷畾涔夋ā鎬佹鏍峰紡 */
+.custom-modal-overlay {
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ background: rgba(0, 0, 0, 0.5);
+ z-index: 10000;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ padding: 20px;
}
+.custom-modal-container {
+ width: 100%;
+ max-width: 500px;
+ max-height: 80vh;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+/* 涓婁紶寮圭獥鏍峰紡 */
+.upload-popup-content {
+ background: #fff;
+ border-radius: 12px;
+ width: 100%;
+ min-height: 300px;
+ max-height: 70vh;
+ overflow: hidden;
+ display: flex;
+ flex-direction: column;
+ box-shadow: 0 4px 20px rgba(0, 0, 0, 0.3);
+}
+
+.upload-popup-header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 15px 20px;
+ border-bottom: 1px solid #eee;
+}
+
+.upload-popup-title {
+ font-size: 16px;
+ font-weight: 600;
+ color: #333;
+}
+
+.upload-popup-body {
+ flex: 1;
+ padding: 20px;
+ overflow-y: auto;
+}
+
+.upload-popup-footer {
+ display: flex;
+ justify-content: flex-end;
+ padding: 15px 20px;
+ border-top: 1px solid #eee;
+ gap: 10px;
+}
+
+/* 绠�鍖栦笂浼犵粍浠舵牱寮� */
+.simple-upload-area {
+ padding: 15px;
+}
+
+.upload-buttons {
+ display: flex;
+ gap: 10px;
+ margin-bottom: 15px;
+}
+
+.file-list {
+ margin-top: 15px;
+ display: flex;
+ flex-wrap: wrap;
+ gap: 12px;
+}
+
+.file-item {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ background: #fff;
+ border-radius: 12px;
+ padding: 8px;
+ border: 1px solid #e9ecef;
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+ transition: all 0.3s ease;
+ width: calc(50% - 6px);
+ min-width: 120px;
+}
+
+.file-item:hover {
+ box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+ transform: translateY(-2px);
+}
+
+.file-preview-container {
+ position: relative;
+ margin-bottom: 8px;
+}
+
+.file-preview {
+ width: 80px;
+ height: 80px;
+ border-radius: 8px;
+ object-fit: cover;
+ border: 2px solid #f0f0f0;
+}
+
+.video-preview {
+ width: 80px;
+ height: 80px;
+ background: linear-gradient(135deg, #f8f9fa 0%, #e9ecef 100%);
+ border-radius: 8px;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ border: 2px solid #f0f0f0;
+}
+
+.video-text {
+ font-size: 12px;
+ color: #666;
+ margin-top: 4px;
+}
+
+.delete-btn {
+ position: absolute;
+ top: -6px;
+ right: -6px;
+ width: 20px;
+ height: 20px;
+ background: #ff4757;
+ border-radius: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ cursor: pointer;
+ box-shadow: 0 2px 4px rgba(255, 71, 87, 0.3);
+ transition: all 0.3s ease;
+}
+
+.delete-btn:hover {
+ background: #ff3742;
+ transform: scale(1.1);
+}
+
+.file-info {
+ text-align: center;
+ width: 100%;
+}
+
+.file-name {
+ font-size: 12px;
+ color: #333;
+ font-weight: 500;
+ display: block;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ max-width: 100px;
+}
+
+.file-size {
+ font-size: 10px;
+ color: #999;
+ margin-top: 2px;
+ display: block;
+}
+
+.empty-state {
+ text-align: center;
+ padding: 40px 20px;
+ color: #999;
+ font-size: 14px;
+ background: #f8f9fa;
+ border-radius: 8px;
+ border: 2px dashed #ddd;
+}
+
+.upload-progress {
+ margin: 15px 0;
+ padding: 0 10px;
+}
+
+/* 涓婁紶鏍囩椤垫牱寮� */
+.upload-tabs {
+ display: flex;
+ background: #f8f9fa;
+ border-radius: 8px;
+ margin-bottom: 15px;
+ padding: 4px;
+}
+
+.tab-item {
+ flex: 1;
+ text-align: center;
+ padding: 8px 12px;
+ font-size: 14px;
+ color: #666;
+ border-radius: 6px;
+ transition: all 0.3s ease;
+ cursor: pointer;
+}
+
+.tab-item.active {
+ background: #409eff;
+ color: #fff;
+ font-weight: 500;
+}
+
+.tab-item:hover:not(.active) {
+ background: #e9ecef;
+ color: #333;
+}
+
+/* 缁熻淇℃伅鏍峰紡 */
+.upload-summary {
+ margin-top: 15px;
+ padding: 10px;
+ background: #f8f9fa;
+ border-radius: 6px;
+ border-left: 3px solid #409eff;
+}
+
+.summary-text {
+ font-size: 12px;
+ color: #666;
+ line-height: 1.4;
+}
+
+/* 鏌ョ湅闄勪欢寮圭獥鏍峰紡 */
+.attachment-popup-content {
+ background: #fff;
+ border-radius: 12px;
+ width: 100%;
+ min-height: 400px;
+ max-height: 70vh;
+ overflow: hidden;
+ display: flex;
+ flex-direction: column;
+ box-shadow: 0 4px 20px rgba(0, 0, 0, 0.3);
+}
+
+.attachment-popup-header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 15px 20px;
+ border-bottom: 1px solid #eee;
+ background: #f8f9fa;
+}
+
+.attachment-popup-title {
+ font-size: 16px;
+ font-weight: 600;
+ color: #333;
+}
+
+.close-btn-attachment {
+ width: 28px;
+ height: 28px;
+ border-radius: 50%;
+ background: #f5f5f5;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ cursor: pointer;
+ transition: all 0.3s ease;
+}
+
+.close-btn-attachment:hover {
+ background: #e9ecef;
+ transform: scale(1.1);
+}
+
+.attachment-popup-body {
+ flex: 1;
+ padding: 15px 20px;
+ overflow-y: auto;
+}
+
+.attachment-tabs {
+ display: flex;
+ background: #f8f9fa;
+ border-radius: 8px;
+ margin-bottom: 15px;
+ padding: 4px;
+}
+
+.attachment-content {
+ min-height: 200px;
+}
+
+.attachment-list {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 12px;
+}
+
+.attachment-item {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ background: #fff;
+ border-radius: 12px;
+ padding: 8px;
+ border: 1px solid #e9ecef;
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+ transition: all 0.3s ease;
+ width: calc(33.33% - 8px);
+ min-width: 100px;
+ cursor: pointer;
+}
+
+.attachment-item:hover {
+ box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+ transform: translateY(-2px);
+}
+
+.attachment-preview-container {
+ margin-bottom: 8px;
+}
+
+.attachment-preview {
+ width: 80px;
+ height: 80px;
+ border-radius: 8px;
+ object-fit: cover;
+ border: 2px solid #f0f0f0;
+}
+
+.attachment-video-preview {
+ width: 80px;
+ height: 80px;
+ background: linear-gradient(135deg, #f8f9fa 0%, #e9ecef 100%);
+ border-radius: 8px;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ border: 2px solid #f0f0f0;
+}
+
+.attachment-info {
+ text-align: center;
+ width: 100%;
+}
+
+.attachment-name {
+ font-size: 12px;
+ color: #333;
+ font-weight: 500;
+ display: block;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ max-width: 80px;
+}
+
+.attachment-size {
+ font-size: 10px;
+ color: #999;
+ margin-top: 2px;
+ display: block;
+}
+
+.attachment-empty {
+ text-align: center;
+ padding: 60px 20px;
+ color: #999;
+ font-size: 14px;
+ background: #f8f9fa;
+ border-radius: 8px;
+ border: 2px dashed #ddd;
+}
+
+/* 瑙嗛棰勮寮圭獥鏍峰紡 */
+.video-modal-overlay {
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ background: rgba(0, 0, 0, 0.8);
+ z-index: 10001;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ padding: 20px;
+}
+
+.video-modal-container {
+ width: 90%;
+ max-width: 800px;
+ max-height: 80vh;
+ background: #000;
+ border-radius: 12px;
+ overflow: hidden;
+ box-shadow: 0 4px 20px rgba(0, 0, 0, 0.5);
+}
+
+.video-modal-header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 15px 20px;
+ background: rgba(0, 0, 0, 0.7);
+ color: #fff;
+}
+
+.video-modal-title {
+ font-size: 16px;
+ font-weight: 500;
+ color: #fff;
+}
+
+.close-btn-video {
+ width: 28px;
+ height: 28px;
+ border-radius: 50%;
+ background: rgba(255, 255, 255, 0.2);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ cursor: pointer;
+ transition: all 0.3s ease;
+}
+
+.close-btn-video:hover {
+ background: rgba(255, 255, 255, 0.3);
+ transform: scale(1.1);
+}
+
+.video-modal-body {
+ position: relative;
+ background: #000;
+}
+
+.video-player {
+ width: 100%;
+ height: auto;
+ max-height: 60vh;
+ display: block;
+}
</style>
\ No newline at end of file
diff --git a/src/static/images/banner/backview.png b/src/static/images/banner/backview.png
new file mode 100644
index 0000000..c244c47
--- /dev/null
+++ b/src/static/images/banner/backview.png
Binary files differ
--
Gitblit v1.9.3