From ce7bdf6065e66474c01a45e2bb967ead46cab541 Mon Sep 17 00:00:00 2001
From: 周宾 <2802492122@qq.com>
Date: 星期一, 22 十二月 2025 17:42:46 +0800
Subject: [PATCH] 海川开心-本地推送通知公告标题
---
src/pages/inspectionUpload/index.vue | 728 ++++++++++++++++++++++++++-----------------------------
1 files changed, 350 insertions(+), 378 deletions(-)
diff --git a/src/pages/inspectionUpload/index.vue b/src/pages/inspectionUpload/index.vue
index 4320a6e..e18f93b 100644
--- a/src/pages/inspectionUpload/index.vue
+++ b/src/pages/inspectionUpload/index.vue
@@ -1,46 +1,32 @@
<template>
<view class="inspection-upload-page">
<!-- 椤甸潰澶撮儴 -->
- <PageHeader title="宸℃涓婁紶" @back="goBack"/>
-
+ <PageHeader title="宸℃涓婁紶" @back="goBack" />
+
<!-- 鏁版嵁鍒楄〃 -->
<view class="table-section">
<!-- 鐢熶骇宸℃鍒楄〃 -->
<view class="task-list">
- <view
- v-for="(item, index) in taskTableData"
- :key="index"
- class="task-item"
- >
+ <view v-for="(item, index) in taskTableData" :key="index" class="task-item">
<view class="task-header">
<view class="task-info">
<text class="task-name">{{ item.taskName }}</text>
<text class="task-location">{{ item.inspectionLocation }}</text>
</view>
<view class="task-actions">
- <u-button
- type="primary"
- size="small"
- @click.stop="startScanForTask(item)"
- :customStyle="{
- borderRadius: '15px',
- height: '30px',
- fontSize: '12px',
- marginRight: '8px'
- }"
- >
+ <u-button type="primary" 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 type="success" size="small" @click.stop="viewAttachments(item)" :customStyle="{
+ borderRadius: '15px',
+ height: '30px',
+ fontSize: '12px'
+ }">
鏌ョ湅闄勪欢
</u-button>
</view>
@@ -58,64 +44,56 @@
<text class="detail-label">鎵ц浜�</text>
<text class="detail-value">{{ item.inspector }}</text>
</view>
- <view class="detail-item">
- <text class="detail-label">浠诲姟涓嬪彂鏃ユ湡</text>
- <text class="detail-value">{{ item.dateStr }}</text>
- </view>
+ <view class="detail-item">
+ <text class="detail-label">浠诲姟涓嬪彂鏃ユ湡</text>
+ <text class="detail-value">{{ item.dateStr }}</text>
+ </view>
+ <view class="detail-item">
+ <text class="detail-label">宸℃鐘舵��</text>
+ <view class="detail-value">
+ <uni-tag v-if="item.fileStatus==2" text="宸插畬鎴�" size="small" type="success" inverted></uni-tag>
+ <uni-tag v-else-if="item.fileStatus==1" text="宸℃涓�" size="small" type="primary" inverted></uni-tag>
+ <uni-tag v-else="" text="鏈贰妫�" size="small" type="warning" inverted></uni-tag>
+ </view>
+ </view>
</view>
</view>
+ <uni-load-more :status="loadMoreStatus"></uni-load-more>
</view>
-
+
<!-- 绌虹姸鎬� -->
- <view v-if="taskTableData.length === 0" class="no-data">
+ <view v-if="taskTableData?.length === 0" class="no-data">
<text>鏆傛棤鏁版嵁</text>
</view>
-
+
</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 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>
+ <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="{
+ <u-alert v-if="cameraError" :title="cameraError" type="error" :showIcon="true" :closable="true"
+ @close="cameraError = ''" :customStyle="{
margin: '10px 0'
- }"
- ></u-alert>
+ }"></u-alert>
</view>
</view>
-
+
<!-- 鍥剧墖涓婁紶寮圭獥 - 鍘熺敓瀹炵幇 -->
<view v-if="showUploadDialog" class="custom-modal-overlay" @click="closeUploadDialog">
<view class="custom-modal-container" @click.stop>
@@ -123,145 +101,109 @@
<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 class="upload-popup-body">
+ <!-- 鍒嗙被鏍囩椤� -->
+ <view class="upload-tabs">
+ <view class="tab-item" :class="{ active: currentUploadType === 'before' }"
+ @click="switchUploadType('before')">
+ 鐢熶骇鍓�
</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 class="tab-item" :class="{ active: currentUploadType === 'after' }"
+ @click="switchUploadType('after')">
+ 鐢熶骇涓�
</view>
-
- <!-- 褰撳墠鍒嗙被鐨勪笂浼犲尯鍩� -->
- <view class="simple-upload-area">
- <view class="upload-buttons">
- <u-button
- type="primary"
- @click="chooseMedia('image')"
- :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="chooseMedia('video')"
- :loading="uploading"
- :disabled="getCurrentFiles().length >= uploadConfig.limit"
- :customStyle="{ flex: 1 }"
- >
- <uni-icons type="videocam" name="videocam" size="18" color="#fff" style="margin-right: 5px;"></uni-icons>
- {{ uploading ? '涓婁紶涓�...' : '鎷嶈棰�' }}
- </u-button>
+ <view class="tab-item" :class="{ active: currentUploadType === 'issue' }"
+ @click="switchUploadType('issue')">
+ 鐢熶骇鍚�
+ </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 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?.path?.fileType === 'image'"
- :src="file?.url || file?.tempFilePath?.tempFilePath || file?.path?.tempFilePath"
- class="file-preview"
- mode="aspectFill"
- />
- <view v-else class="video-preview">
- <uni-icons type="videocam" name="videocam" size="18" color="#fff" style="margin-right: 5px;"></uni-icons>
- <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 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">
+ <u-button type="primary" @click="chooseMedia('image')" :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="chooseMedia('video')" :loading="uploading"
+ :disabled="getCurrentFiles().length >= uploadConfig.limit" :customStyle="{ flex: 1 }">
+ <uni-icons type="videocam" name="videocam" size="18" color="#fff"
+ style="margin-right: 5px;"></uni-icons>
+ {{ 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?.path?.fileType === 'image'"
+ :src="file?.url || file?.tempFilePath?.tempFilePath || file?.path?.tempFilePath"
+ class="file-preview" mode="aspectFill" />
+ <view v-else class="video-preview">
+ <uni-icons type="videocam" name="videocam" size="18" color="#fff"
+ style="margin-right: 5px;"></uni-icons>
+ <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
- v-if="hasException === true"
- type="warning"
- @click="goToRepair"
- :customStyle="{ marginRight: '10px' }"
- >
+ <u-button v-if="hasException === true" type="warning" @click="goToRepair"
+ :customStyle="{ marginRight: '10px' }">
鏂板鎶ヤ慨
</u-button>
<u-button type="primary" @click="submitUpload">鎻愪氦</u-button>
@@ -269,7 +211,7 @@
</view>
</view>
</view>
-
+
<!-- 鏌ョ湅闄勪欢寮圭獥 -->
<view v-if="showAttachmentDialog" class="custom-modal-overlay" @click="closeAttachmentDialog">
<view class="custom-modal-container" @click.stop>
@@ -280,62 +222,44 @@
<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')"
- >
+ <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')"
- >
+ <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')"
- >
+ <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 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"
- />
+ <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-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>
@@ -344,7 +268,7 @@
</view>
</view>
</view>
-
+
<!-- 瑙嗛棰勮寮圭獥 -->
<view v-if="showVideoDialog" class="video-modal-overlay" @click="closeVideoPreview">
<view class="video-modal-container" @click.stop>
@@ -355,14 +279,8 @@
</view>
</view>
<view class="video-modal-body">
- <video
- v-if="currentVideoFile"
- :src="currentVideoFile.url || currentVideoFile.downloadUrl"
- class="video-player"
- controls
- autoplay
- @error="handleVideoError"
- ></video>
+ <video v-if="currentVideoFile" :src="currentVideoFile.url || currentVideoFile.downloadUrl"
+ class="video-player" controls autoplay @error="handleVideoError"></video>
</view>
</view>
</view>
@@ -370,11 +288,11 @@
</template>
<script setup>
-import { onMounted, onUnmounted, ref, nextTick, computed } from 'vue'
-import { onShow } from '@dcloudio/uni-app'
+import { onMounted, onUnmounted, ref, nextTick, computed, reactive } from 'vue'
+import { onShow, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'
import PageHeader from '@/components/PageHeader.vue'
import { getLedgerById } from '@/api/equipmentManagement/ledger.js'
-import {inspectionTaskList, uploadInspectionTask} from "@/api/inspectionManagement";
+import { inspectionTaskList, uploadInspectionTask } from "@/api/inspectionManagement";
import { getToken } from "@/utils/auth";
// 缁勪欢寮曠敤宸茬Щ闄�
@@ -439,7 +357,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') {
@@ -447,7 +365,7 @@
} else {
baseUrl = 'http://114.132.189.42:9068';
}
-
+
return baseUrl + uploadConfig.action;
})
@@ -464,29 +382,68 @@
const isScanning = ref(false)
const cameraError = ref('')
+const pagesPames = reactive({
+ size: 10,
+ current:1
+})
+
+const loadMoreStatus = computed(()=>{
+ if(loading.value){
+ return 'loading'
+ }
+ if(noMore.value){
+ return 'noMore'
+ }
+ return 'more'
+})
+const totalSize = ref(0)
+const noMore = computed(()=>{
+ return taskTableData.value.length>=totalSize.value
+})
+const loading = ref(false)
+
+const reloadPage = ()=>{
+ pagesPames.current = 1
+ taskTableData.value = []
+ getList()
+}
+const loadPage = ()=>{
+ if(noMore.value||loading.value)return;
+ pagesPames.current += 1
+ getList()
+}
+
// 鐢熷懡鍛ㄦ湡
onMounted(() => {
// 寤惰繜鍒濆鍖栵紝纭繚DOM宸叉覆鏌�
- nextTick(() => {
- getList()
- })
+ // nextTick(() => {
+ // getList()
+ // })
+})
+
+onReachBottom(() => {
+ loadPage()
+})
+onPullDownRefresh(() => {
+ reloadPage()
+ uni.stopPullDownRefresh()
})
onShow(() => {
// 椤甸潰鏄剧ず鏃跺埛鏂版暟鎹�
- getList()
+ reloadPage()
})
// 缁勪欢閿�姣佹椂鐨勬竻鐞�
onUnmounted(() => {
// 璁剧疆鍙栨秷鏍囧織锛岄樆姝㈠悗缁殑寮傛鎿嶄綔
isRequestCancelled = true
-
+
// 鍋滄鎵爜
if (isScanning.value) {
isScanning.value = false
}
-
+
// 鍏抽棴涓婁紶寮圭獥
if (showUploadDialog.value) {
showUploadDialog.value = false
@@ -498,26 +455,23 @@
uni.navigateBack()
}
-// 鏌ヨ鏁版嵁
-const handleQuery = () => {
- getList()
-}
// 鑾峰彇鍒楄〃鏁版嵁
const getList = () => {
// 鏄剧ず鍔犺浇鎻愮ず
- showLoadingToast('鍔犺浇涓�...')
-
+ // showLoadingToast('鍔犺浇涓�...')
+
// 璁剧疆鍙栨秷鏍囧織
isRequestCancelled = false
-
- inspectionTaskList({}).then(res => {
+ loading.value = true
+ inspectionTaskList({...pagesPames}).then(res => {
// 妫�鏌ョ粍浠舵槸鍚﹁繕瀛樺湪涓旇姹傛湭琚彇娑�
if (!isRequestCancelled) {
// 澶勭悊涓嶅悓鐨勬暟鎹粨鏋�
let records = [];
if (res && res.data) {
// 灏濊瘯澶氱鍙兘鐨勬暟鎹粨鏋�
+ totalSize.value = res.data.total
if (Array.isArray(res.data.records)) {
records = res.data.records;
} else if (Array.isArray(res.data.rows)) {
@@ -528,9 +482,12 @@
records = res.data.list;
}
}
-
+
if (records.length > 0) {
- taskTableData.value = records;
+ taskTableData.value = [...taskTableData.value,...records.map((record)=>{
+ record.fileStatus = getFileStatus(record)
+ return record
+ })];
} else {
taskTableData.value = [];
uni.showToast({
@@ -539,8 +496,9 @@
});
}
}
+ loading.value =false
// 鍏抽棴鍔犺浇鎻愮ず
- closeToast()
+ // closeToast()
}).catch(err => {
// 妫�鏌ョ粍浠舵槸鍚﹁繕瀛樺湪涓旇姹傛湭琚彇娑�
if (!isRequestCancelled) {
@@ -551,9 +509,23 @@
icon: 'error'
})
}
+ loading.value =false
// 鍏抽棴鍔犺浇鎻愮ず
- closeToast()
+ // closeToast()
})
+}
+
+const getFileStatus = (record)=>{
+ let _beforeProduction = record.beforeProduction&&record.beforeProduction.length
+ let _afterProduction = record.afterProduction&&record.afterProduction.length
+ let _productionIssues = record.productionIssues&&record.productionIssues.length
+ if(_beforeProduction&&_afterProduction&&_productionIssues){
+ return 2
+ }else if(_beforeProduction||_afterProduction||_productionIssues){
+ return 1
+ }else{
+ return 0
+ }
}
// 涓烘寚瀹氫换鍔″紑濮嬫壂鐮�
@@ -561,10 +533,10 @@
try {
// 璁板綍褰撳墠鎵弿鐨勪换鍔�
currentScanningTask.value = task
-
+
// 鏄剧ず鎵弿鐣岄潰
isScanning.value = true
-
+
// 浣跨敤uniapp鐨勬壂鐮丄PI
uni.scanCode({
success: (res) => {
@@ -599,7 +571,7 @@
try {
// 瑙ｆ瀽浜岀淮鐮佹暟鎹紝鎻愬彇deviceId
let deviceId = ''
-
+
// 妫�鏌ユ槸鍚︽槸URL鏍煎紡
if (result.result.includes('deviceId=')) {
// 浠嶶RL涓彁鍙杁eviceId
@@ -618,7 +590,7 @@
deviceId = result.result
}
}
-
+
if (!deviceId) {
uni.showToast({
title: '鏈瘑鍒埌璁惧ID',
@@ -627,20 +599,20 @@
isScanning.value = false
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)
@@ -650,11 +622,11 @@
title: '璇锋壂鎻忔纭殑璁惧',
icon: 'error'
})
-
+
// 鍏抽棴鎵弿鐣岄潰
isScanning.value = false
}
-
+
} catch (error) {
uni.showToast({
title: error.message || '鏁版嵁瑙ｆ瀽澶辫触',
@@ -675,13 +647,13 @@
storageBlobDTO: [] // 鍒濆鍖栨枃浠跺垪琛�
};
}
-
+
// 璁剧疆涓婁紶鐘舵�佺被鍨嬶紙鍙互鏍规嵁浠诲姟绫诲瀷璁剧疆涓嶅悓鐨勭姸鎬侊級
uploadStatusType.value = 0 // 榛樿鐘舵��
-
+
// 娓呯┖涔嬪墠鐨勬枃浠�
uploadFiles.value = []
-
+
// 鏄剧ず涓婁紶寮圭獥
showUploadDialog.value = true
}
@@ -708,11 +680,11 @@
const getCurrentFiles = () => {
switch (currentUploadType.value) {
case 'before':
- return beforeModelValue.value
+ return beforeModelValue.value||[]
case 'after':
- return afterModelValue.value
+ return afterModelValue.value||[]
case 'issue':
- return issueModelValue.value
+ return issueModelValue.value||[]
default:
return []
}
@@ -758,17 +730,17 @@
issue: issueModelValue.value
}
}
-
+
uni.setStorageSync('repairTaskInfo', JSON.stringify(taskInfo))
-
+
// 璺宠浆鍒版柊澧炴姤淇〉闈�
uni.navigateTo({
url: '/pages/equipmentManagement/repair/add'
})
-
+
// 鍏抽棴涓婁紶寮圭獥
closeUploadDialog()
-
+
} catch (error) {
console.error('璺宠浆鎶ヤ慨椤甸潰澶辫触:', error)
uni.showToast({
@@ -789,7 +761,7 @@
})
return
}
-
+
// 妫�鏌ユ槸鍚︽湁浠讳綍鏂囦欢涓婁紶
const totalFiles = beforeModelValue.value.length + afterModelValue.value.length + issueModelValue.value.length;
if (totalFiles === 0) {
@@ -814,31 +786,31 @@
if (issueModelValue.value.length > 0) {
arr.push(...issueModelValue.value);
}
-
+
// 鎻愪氦鏁版嵁
infoData.value.storageBlobDTO = arr;
// 娣诲姞寮傚父鐘舵�佷俊鎭�
infoData.value.hasException = hasException.value;
- const result = await uploadInspectionTask({...infoData.value});
-
+ const result = await uploadInspectionTask({ ...infoData.value });
+
// 妫�鏌ユ彁浜ょ粨鏋�
if (result && (result.code === 200 || result.success)) {
// 鎻愪氦鎴愬姛
closeToast(); // 鍏抽棴鍔犺浇鎻愮ず
-
+
uni.showToast({
title: '鎻愪氦鎴愬姛',
icon: 'success'
})
-
+
// 鍏抽棴寮圭獥
closeUploadDialog()
-
+
// 鍒锋柊鍒楄〃
setTimeout(() => {
- getList()
+ reloadPage()
}, 500)
-
+
} else {
// 鎻愪氦澶辫触
closeToast();
@@ -847,11 +819,11 @@
icon: 'error'
})
}
-
+
} catch (error) {
console.error('鎻愪氦涓婁紶澶辫触:', error)
closeToast(); // 鍏抽棴鍔犺浇鎻愮ず
-
+
let errorMessage = '鎻愪氦澶辫触';
if (error.message) {
errorMessage = error.message;
@@ -860,7 +832,7 @@
} else if (typeof error === 'string') {
errorMessage = error;
}
-
+
uni.showToast({
title: errorMessage,
icon: 'error'
@@ -883,10 +855,10 @@
try {
currentViewTask.value = task
currentViewType.value = 'before'
-
+
// 瑙ｆ瀽鏂扮殑鏁版嵁缁撴瀯
attachmentList.value = []
-
+
// 鐢熶骇鍓嶉檮浠� (type=0)
if (task.beforeProduction && Array.isArray(task.beforeProduction)) {
const beforeFiles = task.beforeProduction.map(file => ({
@@ -895,7 +867,7 @@
}))
attachmentList.value.push(...beforeFiles)
}
-
+
// 鐢熶骇涓檮浠� (type=1)
if (task.afterProduction && Array.isArray(task.afterProduction)) {
const afterFiles = task.afterProduction.map(file => ({
@@ -904,7 +876,7 @@
}))
attachmentList.value.push(...afterFiles)
}
-
+
// 鐢熶骇鍚庨檮浠� (type=2)
if (task.productionIssues && Array.isArray(task.productionIssues)) {
const issueFiles = task.productionIssues.map(file => ({
@@ -913,9 +885,9 @@
}))
attachmentList.value.push(...issueFiles)
}
-
+
showAttachmentDialog.value = true
-
+
} catch (error) {
uni.showToast({
title: '鑾峰彇闄勪欢澶辫触',
@@ -943,16 +915,16 @@
}
// 鑾峰彇type鍊�
const getTabType = () => {
- switch (currentUploadType.value) {
- case 'before':
- return 0
- case 'after':
- return 1
- case 'issue':
- return 2
- default:
- return 0
- }
+ switch (currentUploadType.value) {
+ case 'before':
+ return 0
+ case 'after':
+ return 1
+ case 'issue':
+ return 2
+ default:
+ return 0
+ }
}
// 鑾峰彇褰撳墠鏌ョ湅绫诲瀷鐨勯檮浠�
const getCurrentViewAttachments = () => {
@@ -974,10 +946,10 @@
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()
@@ -991,7 +963,7 @@
const imageUrls = getCurrentViewAttachments()
.filter(f => isImageFile(f))
.map(f => f.url || f.downloadUrl)
-
+
uni.previewImage({
urls: imageUrls,
current: file.url || file.downloadUrl
@@ -1024,50 +996,50 @@
// 浣跨敤鐩告満
const chooseMedia = (type) => {
- let mediaPamaes={
- count: 1,
- mediaType:[type||'image'],
- sizeType: ['compressed', 'original'],
- sourceType: ['camera'],
- }
- uni.chooseMedia({
- ...mediaPamaes,
- success: (res) => {
- try {
- if (!res.tempFiles || res.tempFiles.length === 0) {
- throw new Error('鏈幏鍙栧埌鍥剧墖鏂囦欢');
- }
-
- const tempFilePath = res.tempFiles[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'
- });
- }
- })
+ let mediaPamaes = {
+ count: 1,
+ mediaType: [type || 'image'],
+ sizeType: ['compressed', 'original'],
+ sourceType: ['camera'],
+ }
+ uni.chooseMedia({
+ ...mediaPamaes,
+ success: (res) => {
+ try {
+ if (!res.tempFiles || res.tempFiles.length === 0) {
+ throw new Error('鏈幏鍙栧埌鍥剧墖鏂囦欢');
+ }
+
+ const tempFilePath = res.tempFiles[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'
+ });
+ }
+ })
}
// 鎷嶇収
@@ -1079,10 +1051,10 @@
});
return;
}
-
+
uni.chooseMedia({
count: 1,
- mediaType:['image', 'video'],
+ mediaType: ['image', 'video'],
sizeType: ['compressed', 'original'],
sourceType: ['camera'],
success: (res) => {
@@ -1090,10 +1062,10 @@
if (!res.tempFiles || res.tempFiles.length === 0) {
throw new Error('鏈幏鍙栧埌鍥剧墖鏂囦欢');
}
-
+
const tempFilePath = res.tempFiles[0];
const tempFile = res.tempFiles && res.tempFiles[0] ? res.tempFiles[0] : {};
-
+
const file = {
tempFilePath: tempFilePath,
path: tempFilePath, // 淇濇寔鍏煎鎬�
@@ -1103,7 +1075,7 @@
createTime: new Date().getTime(),
uid: Date.now() + Math.random()
};
-
+
handleBeforeUpload(file);
} catch (error) {
console.error('澶勭悊鎷嶇収缁撴灉澶辫触:', error);
@@ -1132,7 +1104,7 @@
});
return;
}
-
+
uni.chooseVideo({
sourceType: ['camera'],
maxDuration: uploadConfig.maxVideoDuration,
@@ -1142,7 +1114,7 @@
if (!res.tempFilePath) {
throw new Error('鏈幏鍙栧埌瑙嗛鏂囦欢');
}
-
+
const file = {
tempFilePath: res.tempFilePath,
path: res.tempFilePath, // 淇濇寔鍏煎鎬�
@@ -1153,7 +1125,7 @@
createTime: new Date().getTime(),
uid: Date.now() + Math.random()
};
-
+
handleBeforeUpload(file);
} catch (error) {
console.error('澶勭悊鎷嶈棰戠粨鏋滃け璐�:', error);
@@ -1256,7 +1228,7 @@
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') {
@@ -1264,13 +1236,13 @@
} else if (file.type === 'video') {
expectedTypes = ['mp4', 'mov', 'avi', 'wmv'];
}
-
+
// 妫�鏌ユ枃浠舵墿灞曞悕鏄惁鍦ㄥ厑璁哥殑绫诲瀷涓�
if (fileExtension && expectedTypes.length > 0) {
- const isAllowed = expectedTypes.some(type =>
+ const isAllowed = expectedTypes.some(type =>
uploadConfig.fileType.includes(type) && type === fileExtension
);
-
+
if (!isAllowed) {
uni.showToast({
title: `鏂囦欢鏍煎紡涓嶆敮鎸侊紝璇锋媿鎽� ${expectedTypes.join('/')} 鏍煎紡鐨勬枃浠禶,
@@ -1291,21 +1263,21 @@
uploading.value = true;
uploadProgress.value = 0;
number.value++; // 澧炲姞涓婁紶璁℃暟
-
+
// 纭繚鏂囦欢璺緞姝ｇ‘
- const filePath = file.tempFilePath?.tempFilePath || file.path?.tempFilePath||'';
+ const filePath = file.tempFilePath?.tempFilePath || file.path?.tempFilePath || '';
if (!filePath) {
handleUploadError('鏂囦欢璺緞涓嶅瓨鍦�');
return;
}
-
+
// 纭繚token瀛樺湪
const token = getToken();
if (!token) {
handleUploadError('鐢ㄦ埛鏈櫥褰�');
return;
}
-
+
// 鍑嗗涓婁紶鍙傛暟
const uploadParams = {
url: uploadFileUrl.value,
@@ -1345,7 +1317,7 @@
fail: (err) => {
console.error('涓婁紶澶辫触:', err.errMsg || err);
number.value--; // 涓婁紶澶辫触鏃跺噺灏戣鏁�
-
+
let errorMessage = '涓婁紶澶辫触';
if (err.errMsg) {
if (err.errMsg.includes('statusCode: null')) {
@@ -1358,7 +1330,7 @@
errorMessage = err.errMsg;
}
}
-
+
handleUploadError(errorMessage);
},
complete: () => {
@@ -1366,7 +1338,7 @@
uploadProgress.value = 0;
}
});
-
+
// 鐩戝惉涓婁紶杩涘害
if (uploadTask && uploadTask.onProgressUpdate) {
uploadTask.onProgressUpdate((res) => {
@@ -1399,7 +1371,7 @@
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) {
@@ -1413,7 +1385,7 @@
typeValue = 2;
break;
}
-
+
// 纭繚涓婁紶鐨勬枃浠舵暟鎹畬鏁达紝鍖呭惈id鍜宼ype
const fileData = {
...file,
@@ -1425,7 +1397,7 @@
createTime: uploadedFile.createTime || new Date().getTime(),
type: typeValue // 娣诲姞绫诲瀷瀛楁锛�0=鐢熶骇鍓�, 1=鐢熶骇涓�, 2=鐢熶骇鍚�
};
-
+
uploadList.value.push(fileData);
uploadedSuccessfully();
} else {
@@ -1449,7 +1421,7 @@
issueModelValue.value = [...issueModelValue.value, ...uploadList.value];
break;
}
-
+
// 閲嶇疆鐘舵��
uploadList.value = [];
number.value = 0;
--
Gitblit v1.9.3