From 41c7df61e54da0526f51fdb60cb1406aa8ede342 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 26 九月 2025 14:48:21 +0800
Subject: [PATCH] 巡检上传报告异常功能
---
src/pages/inspectionUpload/index.vue | 203 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 137 insertions(+), 66 deletions(-)
diff --git a/src/pages/inspectionUpload/index.vue b/src/pages/inspectionUpload/index.vue
index b648e9c..a31902d 100644
--- a/src/pages/inspectionUpload/index.vue
+++ b/src/pages/inspectionUpload/index.vue
@@ -146,6 +146,29 @@
</view>
</view>
+ <!-- 寮傚父鐘舵�侀�夋嫨 -->
+ <view class="exception-section">
+ <text class="section-title">鏄惁瀛樺湪寮傚父锛�</text>
+ <view class="exception-options">
+ <view
+ class="exception-option"
+ :class="{ active: hasException === false }"
+ @click="setExceptionStatus(false)"
+ >
+ <u-icon name="checkmark-circle" size="20" color="#52c41a"></u-icon>
+ <text>姝ｅ父</text>
+ </view>
+ <view
+ class="exception-option"
+ :class="{ active: hasException === true }"
+ @click="setExceptionStatus(true)"
+ >
+ <u-icon name="close-circle" size="20" color="#ff4d4f"></u-icon>
+ <text>瀛樺湪寮傚父</text>
+ </view>
+ </view>
+ </view>
+
<!-- 褰撳墠鍒嗙被鐨勪笂浼犲尯鍩� -->
<view class="simple-upload-area">
<view class="upload-buttons">
@@ -229,6 +252,14 @@
<view class="upload-popup-footer">
<u-button @click="closeUploadDialog" :customStyle="{ marginRight: '10px' }">鍙栨秷</u-button>
+ <u-button
+ v-if="hasException === true"
+ type="warning"
+ @click="goToRepair"
+ :customStyle="{ marginRight: '10px' }"
+ >
+ 鏂板鎶ヤ慨
+ </u-button>
<u-button type="primary" @click="submitUpload">鎻愪氦</u-button>
</view>
</view>
@@ -389,6 +420,9 @@
const showVideoDialog = ref(false)
const currentVideoFile = ref(null)
+// 寮傚父鐘舵��
+const hasException = ref(null) // null: 鏈�夋嫨, true: 瀛樺湪寮傚父, false: 姝ｅ父
+
// 涓婁紶閰嶇疆
const uploadConfig = {
action: "/common/minioUploads",
@@ -476,8 +510,6 @@
inspectionTaskList({}).then(res => {
// 妫�鏌ョ粍浠舵槸鍚﹁繕瀛樺湪涓旇姹傛湭琚彇娑�
if (!isRequestCancelled) {
- console.log('鐢熶骇宸℃API杩斿洖鏁版嵁:', res);
-
// 澶勭悊涓嶅悓鐨勬暟鎹粨鏋�
let records = [];
if (res && res.data) {
@@ -495,9 +527,7 @@
if (records.length > 0) {
taskTableData.value = records;
- console.log('鐢熶骇宸℃鏁版嵁璁剧疆鎴愬姛锛岃褰曟暟:', records.length);
} else {
- console.warn('鐢熶骇宸℃鏁版嵁涓虹┖鎴栨牸寮忎笉姝ｇ‘:', res);
taskTableData.value = [];
uni.showToast({
title: '鏆傛棤宸℃浠诲姟鏁版嵁',
@@ -510,7 +540,6 @@
}).catch(err => {
// 妫�鏌ョ粍浠舵槸鍚﹁繕瀛樺湪涓旇姹傛湭琚彇娑�
if (!isRequestCancelled) {
- console.error('鑾峰彇鐢熶骇宸℃鏁版嵁澶辫触:', err);
taskTableData.value = [];
// 娣诲姞閿欒鎻愮ず
uni.showToast({
@@ -528,7 +557,6 @@
try {
// 璁板綍褰撳墠鎵弿鐨勪换鍔�
currentScanningTask.value = task
- console.log('涓轰换鍔″紑濮嬫壂鐮侊紝浠诲姟ID:', task.taskId || task.id, '浠诲姟鍚嶇О:', task.taskName)
// 鏄剧ず鎵弿鐣岄潰
isScanning.value = true
@@ -536,13 +564,9 @@
// 浣跨敤uniapp鐨勬壂鐮丄PI
uni.scanCode({
success: (res) => {
- console.log('=== 鎵爜API鎴愬姛鍥炶皟 ===')
- console.log('鎵爜缁撴灉:', res)
- console.log('褰撳墠鎵弿浠诲姟:', currentScanningTask.value)
handleScanSuccess(res)
},
fail: (err) => {
- console.error('鎵爜澶辫触:', err)
uni.showToast({
title: '鎵爜澶辫触',
icon: 'error'
@@ -550,10 +574,8 @@
// 鍏抽棴鎵弿鐣岄潰
isScanning.value = false
}
- // 绉婚櫎complete鍥炶皟锛岄伩鍏嶅共鎵板脊绐楁樉绀�
})
} catch (e) {
- console.error('鍚姩鎵爜澶辫触:', e)
uni.showToast({
title: '鍚姩鎵爜澶辫触',
icon: 'error'
@@ -571,9 +593,6 @@
// 鎵爜鎴愬姛澶勭悊
const handleScanSuccess = async (result) => {
try {
- console.log('澶勭悊鎵爜缁撴灉:', result)
- console.log('褰撳墠鍏宠仈浠诲姟:', currentScanningTask.value?.taskName)
-
// 瑙ｆ瀽浜岀淮鐮佹暟鎹紝鎻愬彇deviceId
let deviceId = ''
@@ -584,13 +603,11 @@
const match = url.match(/deviceId=(\d+)/)
if (match && match[1]) {
deviceId = match[1]
- console.log('浠嶶RL涓彁鍙栧埌deviceId:', deviceId)
}
} else {
// 灏濊瘯瑙ｆ瀽JSON鏍煎紡
try {
const qrData = JSON.parse(result.result)
- console.log('瑙ｆ瀽鐨勪簩缁寸爜鏁版嵁:', qrData)
deviceId = qrData.deviceId || qrData.qrCodeId || ''
} catch (e) {
// 濡傛灉涓嶆槸JSON鏍煎紡锛岀洿鎺ヤ娇鐢ㄧ粨鏋�
@@ -609,25 +626,19 @@
// 鑾峰彇褰撳墠浠诲姟鐨則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 {
@@ -635,14 +646,12 @@
title: '璇锋壂鎻忔纭殑璁惧',
icon: 'error'
})
- console.warn('璁惧ID涓嶅尮閰嶏紝鏈熸湜:', currentTaskId, '瀹為檯:', deviceId)
// 鍏抽棴鎵弿鐣岄潰
isScanning.value = false
}
} catch (error) {
- console.error('澶勭悊鎵爜缁撴灉澶辫触:', error)
uni.showToast({
title: error.message || '鏁版嵁瑙ｆ瀽澶辫触',
icon: 'error'
@@ -654,11 +663,6 @@
// 鎵撳紑涓婁紶寮圭獥
const openUploadDialog = (task) => {
- console.log('=== 寮�濮嬫墦寮�涓婁紶寮圭獥 ===')
- console.log('浼犲叆鐨勪换鍔�:', task)
- console.log('浠诲姟鍚嶇О:', task?.taskName || '鏈煡浠诲姟')
- console.log('褰撳墠showUploadDialog鐘舵��(璋冪敤鍓�):', showUploadDialog.value)
-
// 璁剧疆浠诲姟淇℃伅鍒癷nfoData
if (task) {
infoData.value = {
@@ -666,7 +670,6 @@
taskId: task.taskId || task.id,
storageBlobDTO: [] // 鍒濆鍖栨枃浠跺垪琛�
};
- console.log('璁剧疆infoData:', infoData.value);
}
// 璁剧疆涓婁紶鐘舵�佺被鍨嬶紙鍙互鏍规嵁浠诲姟绫诲瀷璁剧疆涓嶅悓鐨勭姸鎬侊級
@@ -677,14 +680,6 @@
// 鏄剧ず涓婁紶寮圭獥
showUploadDialog.value = true
-
- console.log('褰撳墠showUploadDialog鐘舵��(璁剧疆鍚�):', showUploadDialog.value)
- console.log('=== 涓婁紶寮圭獥璁剧疆瀹屾垚 ===')
-
- // 寤惰繜妫�鏌ョ姸鎬�
- setTimeout(() => {
- console.log('寤惰繜妫�鏌howUploadDialog鐘舵��:', showUploadDialog.value)
- }, 100)
}
// 鍏抽棴涓婁紶寮圭獥
@@ -696,14 +691,13 @@
afterModelValue.value = []
issueModelValue.value = []
currentUploadType.value = 'before'
+ hasException.value = null // 閲嶇疆寮傚父鐘舵��
infoData.value = null // 娓呯悊浠诲姟鏁版嵁
- console.log('涓婁紶寮圭獥宸插叧闂紝鏁版嵁宸叉竻鐞�')
}
// 鍒囨崲涓婁紶绫诲瀷
const switchUploadType = (type) => {
currentUploadType.value = type
- console.log('鍒囨崲鍒颁笂浼犵被鍨�:', type)
}
// 鑾峰彇褰撳墠鍒嗙被鐨勬枃浠跺垪琛�
@@ -737,12 +731,61 @@
// 澶勭悊涓婁紶鏂囦欢鏇存柊
const handleUploadUpdate = (files) => {
uploadFiles.value = files
- console.log('涓婁紶鏂囦欢鏇存柊:', files)
+}
+
+// 璁剧疆寮傚父鐘舵��
+const setExceptionStatus = (status) => {
+ hasException.value = status
+}
+
+// 璺宠浆鍒版柊澧炴姤淇〉闈�
+const goToRepair = () => {
+ try {
+ // 瀛樺偍褰撳墠浠诲姟淇℃伅鍒版湰鍦板瓨鍌紝渚涙姤淇〉闈娇鐢�
+ const taskInfo = {
+ taskId: infoData.value?.taskId || infoData.value?.id,
+ taskName: infoData.value?.taskName,
+ inspectionLocation: infoData.value?.inspectionLocation,
+ inspector: infoData.value?.inspector,
+ // 浼犻�掑綋鍓嶄笂浼犵殑鏂囦欢淇℃伅
+ uploadedFiles: {
+ before: beforeModelValue.value,
+ after: afterModelValue.value,
+ issue: issueModelValue.value
+ }
+ }
+
+ uni.setStorageSync('repairTaskInfo', JSON.stringify(taskInfo))
+
+ // 璺宠浆鍒版柊澧炴姤淇〉闈�
+ uni.navigateTo({
+ url: '/pages/equipmentManagement/repair/add'
+ })
+
+ // 鍏抽棴涓婁紶寮圭獥
+ closeUploadDialog()
+
+ } catch (error) {
+ console.error('璺宠浆鎶ヤ慨椤甸潰澶辫触:', error)
+ uni.showToast({
+ title: '璺宠浆澶辫触锛岃閲嶈瘯',
+ icon: 'error'
+ })
+ }
}
// 鎻愪氦涓婁紶
const submitUpload = async () => {
try {
+ // 妫�鏌ユ槸鍚﹂�夋嫨浜嗗紓甯哥姸鎬�
+ if (hasException.value === null) {
+ uni.showToast({
+ title: '璇烽�夋嫨鏄惁瀛樺湪寮傚父',
+ icon: 'none'
+ })
+ return
+ }
+
// 妫�鏌ユ槸鍚︽湁浠讳綍鏂囦欢涓婁紶
const totalFiles = beforeModelValue.value.length + afterModelValue.value.length + issueModelValue.value.length;
if (totalFiles === 0) {
@@ -770,16 +813,10 @@
// 鎻愪氦鏁版嵁
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);
+ // 娣诲姞寮傚父鐘舵�佷俊鎭�
+ infoData.value.hasException = hasException.value;
const result = await uploadInspectionTask({...infoData.value});
-
- console.log('宸℃浠诲姟鎻愪氦缁撴灉:', result);
// 妫�鏌ユ彁浜ょ粨鏋�
if (result && (result.code === 200 || result.success)) {
@@ -830,20 +867,17 @@
// 鎽勫儚澶撮敊璇鐞�
const handleCameraError = (error) => {
- console.error('鎽勫儚澶撮敊璇�:', error)
cameraError.value = '鎽勫儚澶磋闂け璐ワ紝璇锋鏌ユ潈闄愯缃�'
}
// 鎵爜浜嬩欢澶勭悊
const handleScanCode = (result) => {
- console.log('鎵爜缁撴灉:', result)
handleScanSuccess(result)
}
// 鏌ョ湅闄勪欢
const viewAttachments = async (task) => {
try {
- console.log('鏌ョ湅闄勪欢锛屼换鍔�:', task)
currentViewTask.value = task
currentViewType.value = 'before'
@@ -877,15 +911,9 @@
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'
@@ -904,7 +932,6 @@
// 鍒囨崲鏌ョ湅绫诲瀷
const switchViewType = (type) => {
currentViewType.value = type
- console.log('鍒囨崲鏌ョ湅绫诲瀷鍒�:', type)
}
// 鏍规嵁type鑾峰彇瀵瑰簲鍒嗙被鐨勯檮浠�
@@ -964,7 +991,6 @@
const showVideoPreview = (file) => {
currentVideoFile.value = file
showVideoDialog.value = true
- console.log('鎾斁瑙嗛:', file.url || file.downloadUrl)
}
// 鍏抽棴瑙嗛棰勮
@@ -975,7 +1001,6 @@
// 瑙嗛鎾斁閿欒澶勭悊
const handleVideoError = (error) => {
- console.error('瑙嗛鎾斁閿欒:', error)
uni.showToast({
title: '瑙嗛鎾斁澶辫触',
icon: 'error'
@@ -1338,8 +1363,6 @@
type: typeValue // 娣诲姞绫诲瀷瀛楁锛�0=鐢熶骇鍓�, 1=鐢熶骇涓�, 2=鐢熶骇鍚�
};
- console.log(`${getUploadTypeText()}鏂囦欢涓婁紶鎴愬姛锛岀被鍨嬪��:`, typeValue, '鏂囦欢鏁版嵁:', fileData);
-
uploadList.value.push(fileData);
uploadedSuccessfully();
} else {
@@ -1367,8 +1390,6 @@
// 閲嶇疆鐘舵��
uploadList.value = [];
number.value = 0;
-
- console.log(`${getUploadTypeText()}鏂囦欢涓婁紶瀹屾垚:`, getCurrentFiles());
}
}
@@ -1777,6 +1798,56 @@
color: #333;
}
+/* 寮傚父鐘舵�侀�夋嫨鏍峰紡 */
+.exception-section {
+ margin-bottom: 20px;
+ padding: 15px;
+ background: #f8f9fa;
+ border-radius: 8px;
+ border: 1px solid #e9ecef;
+}
+
+.section-title {
+ display: block;
+ font-size: 14px;
+ font-weight: 600;
+ color: #333;
+ margin-bottom: 12px;
+}
+
+.exception-options {
+ display: flex;
+ gap: 12px;
+}
+
+.exception-option {
+ flex: 1;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ gap: 8px;
+ padding: 12px 16px;
+ background: #fff;
+ border: 2px solid #e9ecef;
+ border-radius: 8px;
+ cursor: pointer;
+ transition: all 0.3s ease;
+ font-size: 14px;
+ color: #666;
+}
+
+.exception-option.active {
+ border-color: #409eff;
+ background: #f0f8ff;
+ color: #409eff;
+ font-weight: 500;
+}
+
+.exception-option:hover:not(.active) {
+ border-color: #d9d9d9;
+ background: #fafafa;
+}
+
/* 缁熻淇℃伅鏍峰紡 */
.upload-summary {
margin-top: 15px;
--
Gitblit v1.9.3