From 633568cff8a45c9f92aec1ec5edb5a09a3b0d8a4 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期六, 14 三月 2026 13:26:38 +0800
Subject: [PATCH] fix: 隐患地点需要拍照而不是文字描述，需要可预览。
---
src/pages/equipmentManagement/repair/add.vue | 460 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 359 insertions(+), 101 deletions(-)
diff --git a/src/pages/equipmentManagement/repair/add.vue b/src/pages/equipmentManagement/repair/add.vue
index 71de940..171b89e 100644
--- a/src/pages/equipmentManagement/repair/add.vue
+++ b/src/pages/equipmentManagement/repair/add.vue
@@ -14,17 +14,22 @@
<u-form-item label="璁惧鍚嶇О"
prop="deviceLedgerId"
required
- border-bottom>
- <u-input v-model="deviceNameText"
- placeholder="璇烽�夋嫨璁惧鍚嶇О"
- @click="showDevicePicker"
- clearable
- readonly="" />
- <template #right>
- <u-icon name="scan"
- @click="startScan"
- class="scan-icon" />
- </template>
+ border-bottom
+ class="device-name-form-item">
+ <view class="device-picker-wrap">
+ <picker mode="selector"
+ class="device-picker-full"
+ :range="deviceOptions"
+ range-key="deviceName"
+ :value="deviceIndex"
+ @change="onDevicePickerChange">
+ <view class="picker-input-row">
+ <text class="picker-input-text"
+ :class="{ placeholder: !deviceNameText }">{{ deviceNameText || "璇烽�夋嫨璁惧鍚嶇О" }}</text>
+ <view class="picker-input-arrow"><u-icon name="arrow-right" /></view>
+ </view>
+ </picker>
+ </view>
</u-form-item>
<u-form-item label="瑙勬牸鍨嬪彿"
prop="deviceModel"
@@ -48,7 +53,7 @@
</template>
</u-form-item>
<u-form-item label="鎶ヤ慨鐘舵��"
- prop="repairTime"
+ prop="status"
required
border-bottom>
<u-input v-model="repairStatusText"
@@ -80,6 +85,53 @@
count
maxlength="200" />
</u-form-item>
+ <view class="simple-upload-area">
+ <view class="upload-buttons">
+ <u-button type="primary"
+ @click="chooseRepairMedia"
+ :loading="uploading"
+ :disabled="repairFileList.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>
+ </view>
+ <view v-if="uploading"
+ class="upload-progress">
+ <u-line-progress :percentage="uploadProgress"
+ :showText="true"
+ activeColor="#409eff"></u-line-progress>
+ </view>
+ <view v-if="repairFileList.length > 0"
+ class="file-list">
+ <view v-for="(file, index) in repairFileList"
+ :key="index"
+ class="file-item">
+ <view class="file-preview-container">
+ <view class="delete-btn"
+ @click="removeRepairFile(index)">
+ <u-icon name="close"
+ size="12"
+ color="#fff"></u-icon>
+ </view>
+ <image :src="file.url || file.tempFilePath || file.path || file.downloadUrl"
+ class="file-preview"
+ mode="aspectFill" />
+ </view>
+ <view class="file-info">
+ <text class="file-name">{{ file.bucketFilename || file.name || "鍥剧墖" }}</text>
+ <text class="file-size">{{ formatFileSize(file.size) }}</text>
+ </view>
+ </view>
+ </view>
+ <view v-if="repairFileList.length === 0"
+ class="empty-state">
+ <text>璇烽�夋嫨瑕佷笂浼犵殑鐜板満鐓х墖</text>
+ </view>
+ </view>
</u-cell-group>
<!-- 鎻愪氦鎸夐挳 -->
<view class="footer-btns">
@@ -91,12 +143,6 @@
:loading="loading">淇濆瓨</u-button>
</view>
</u-form>
- <!-- 璁惧閫夋嫨鍣� -->
- <up-action-sheet :show="showDevice"
- :actions="deviceActionList"
- title="閫夋嫨璁惧鍚嶇О"
- @select="onDeviceSelect"
- @close="showDevice = false" />
<!-- 鏃ユ湡閫夋嫨鍣� -->
<up-datetime-picker :show="showDate"
v-model="pickerDateValue"
@@ -107,7 +153,7 @@
</template>
<script setup>
- import { ref, computed, onMounted, onUnmounted } from "vue";
+ import { ref, computed, onMounted } from "vue";
import { onShow } from "@dcloudio/uni-app";
import PageHeader from "@/components/PageHeader.vue";
import { getDeviceLedger } from "@/api/equipmentManagement/ledger";
@@ -116,6 +162,8 @@
editRepair,
getRepairById,
} from "@/api/equipmentManagement/repair";
+ import config from "@/config";
+ import { getToken } from "@/utils/auth";
import dayjs from "dayjs";
import { formatDateToYMD } from "@/utils/ruoyi";
const showToast = message => {
@@ -133,23 +181,28 @@
const formRef = ref(null);
const operationType = ref("add");
const loading = ref(false);
- const showDevice = ref(false);
const showDate = ref(false);
const pickerDateValue = ref(Date.now());
+
+ // 涓婁紶閰嶇疆锛堜笌宸℃涓�鑷达級
+ const uploadConfig = {
+ action: "/file/upload",
+ limit: 10,
+ };
+ const uploadFileUrl = computed(() => config.baseUrl + uploadConfig.action);
+ const repairFileList = ref([]);
+ const uploading = ref(false);
+ const uploadProgress = ref(0);
// 璁惧閫夐」
const deviceOptions = ref([]);
const deviceNameText = ref("");
- const deviceActionList = computed(() => {
- return deviceOptions.value.map(item => ({
- name: item.deviceName,
- value: item.id,
- }));
+ const deviceIndex = computed(() => {
+ const id = form.value.deviceLedgerId;
+ if (id == null || !deviceOptions.value.length) return 0;
+ const idx = deviceOptions.value.findIndex(item => item.id === id || item.id == id);
+ return idx >= 0 ? idx : 0;
});
-
- // 鎵爜鐩稿叧鐘舵��
- const isScanning = ref(false);
- const scanTimer = ref(null);
// 琛ㄥ崟楠岃瘉瑙勫垯
const formRules = {
@@ -158,6 +211,9 @@
],
repairTime: [
{ required: true, trigger: "change", message: "璇烽�夋嫨鎶ヤ慨鏃ユ湡" },
+ ],
+ status: [
+ { required: true, trigger: "change", message: "璇烽�夋嫨鎶ヤ慨鐘舵��" },
],
repairName: [{ required: true, trigger: "blur", message: "璇疯緭鍏ユ姤淇汉" }],
remark: [{ required: true, trigger: "blur", message: "璇疯緭鍏ユ晠闅滅幇璞�" }],
@@ -168,6 +224,7 @@
deviceLedgerId: undefined, // 璁惧ID
deviceModel: undefined, // 瑙勬牸鍨嬪彿
repairTime: dayjs().format("YYYY-MM-DD"), // 鎶ヤ慨鏃ユ湡
+ status: undefined, // 鎶ヤ慨鐘舵��
repairName: undefined, // 鎶ヤ慨浜�
remark: undefined, // 鏁呴殰鐜拌薄
});
@@ -220,6 +277,7 @@
form.value.deviceLedgerId = data.deviceLedgerId;
form.value.deviceModel = data.deviceModel;
form.value.repairTime = dayjs(data.repairTime).format("YYYY-MM-DD");
+ form.value.status = data.status;
form.value.repairName = data.repairName;
form.value.remark = data.remark;
repairStatusText.value =
@@ -232,6 +290,15 @@
if (device) {
deviceNameText.value = device.deviceName;
}
+ // 鍥炴樉闄勪欢鍒楄〃锛堝悗绔繑鍥� fileList 鏃讹級
+ const list = data.fileList || data.commonFileList || [];
+ repairFileList.value = (Array.isArray(list) ? list : []).map(f => ({
+ url: f.url || f.downloadUrl,
+ name: f.bucketFilename || f.originalFilename || f.name,
+ bucketFilename: f.bucketFilename || f.originalFilename || f.name,
+ size: f.size || f.byteSize,
+ uploadResponse: f,
+ }));
}
} catch (e) {
showToast("鑾峰彇璇︽儏澶辫触");
@@ -242,77 +309,136 @@
}
};
- // 鎵弿浜岀淮鐮佸姛鑳�
- const startScan = () => {
- if (isScanning.value) {
- showToast("姝ｅ湪鎵弿涓紝璇风◢鍊�...");
+ // 涓嬫媺妗嗛�夋嫨璁惧
+ const onDevicePickerChange = e => {
+ const index = Number(e.detail?.value ?? 0);
+ const item = deviceOptions.value[index];
+ if (item) {
+ form.value.deviceLedgerId = item.id;
+ setDeviceModel(item.id);
+ }
+ };
+
+ // 鏍煎紡鍖栨枃浠跺ぇ灏�
+ 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";
+ };
+
+ // 鎷嶇収閫夋嫨锛堜笌宸℃涓�鑷达級
+ const chooseRepairMedia = () => {
+ if (repairFileList.value.length >= uploadConfig.limit) {
+ showToast(`鏈�澶氬彧鑳介�夋嫨${uploadConfig.limit}涓枃浠禶);
return;
}
+ const remaining = uploadConfig.limit - repairFileList.value.length;
+ if (typeof uni.chooseMedia === "function") {
+ uni.chooseMedia({
+ count: Math.min(remaining, 9),
+ mediaType: ["image"],
+ sizeType: ["compressed", "original"],
+ sourceType: ["camera", "album"],
+ success: res => {
+ const files = res?.tempFiles || [];
+ files.forEach((tf, idx) => {
+ const filePath = tf.tempFilePath || tf.path || "";
+ const file = {
+ tempFilePath: filePath,
+ path: filePath,
+ type: "image",
+ name: `repair_${Date.now()}_${idx}.jpg`,
+ size: tf.size || 0,
+ uid: Date.now() + Math.random() + idx,
+ };
+ uploadRepairFile(file);
+ });
+ },
+ fail: () => showToast("閫夋嫨鍥剧墖澶辫触"),
+ });
+ } else {
+ uni.chooseImage({
+ count: remaining,
+ sizeType: ["compressed", "original"],
+ sourceType: ["camera", "album"],
+ success: res => {
+ (res.tempFilePaths || []).forEach((path, idx) => {
+ uploadRepairFile({
+ tempFilePath: path,
+ path: path,
+ type: "image",
+ name: `repair_${Date.now()}_${idx}.jpg`,
+ size: 0,
+ uid: Date.now() + Math.random(),
+ });
+ });
+ },
+ fail: () => showToast("閫夋嫨鍥剧墖澶辫触"),
+ });
+ }
+ };
- // 璋冪敤uni-app鐨勬壂鐮丄PI
- uni.scanCode({
- scanType: ["qrCode", "barCode"],
+ const uploadRepairFile = file => {
+ const filePath = file.tempFilePath || file.path;
+ if (!filePath) return;
+ uploading.value = true;
+ uploadProgress.value = 0;
+ const token = getToken();
+ if (!token) {
+ showToast("璇峰厛鐧诲綍");
+ uploading.value = false;
+ return;
+ }
+ const uploadTask = uni.uploadFile({
+ url: uploadFileUrl.value,
+ filePath,
+ name: "file",
+ header: { Authorization: "Bearer " + token },
success: res => {
- handleScanResult(res.result);
+ try {
+ if (res.statusCode === 200) {
+ const response = typeof res.data === "string" ? JSON.parse(res.data) : res.data;
+ const d = response?.data !== undefined ? response.data : response;
+ if (response && (response.code === 200 || response.code === 0) && d) {
+ const fileData = {
+ ...file,
+ id: d.id,
+ tempId: d.tempId ?? d.tempFileId ?? d.id,
+ url: d.url || d.downloadUrl || filePath,
+ bucketFilename: d.bucketFilename || d.originalFilename || file.name,
+ downloadUrl: d.downloadUrl || d.url,
+ size: d.size ?? d.byteSize ?? file.size,
+ uploadResponse: response,
+ };
+ repairFileList.value.push(fileData);
+ } else {
+ showToast(response?.msg || "涓婁紶澶辫触");
+ }
+ } else {
+ showToast("涓婁紶澶辫触");
+ }
+ } catch (e) {
+ showToast("涓婁紶澶辫触");
+ }
+ uploading.value = false;
+ uploadProgress.value = 0;
},
- fail: err => {
- console.error("鎵爜澶辫触:", err);
- showToast("鎵爜澶辫触锛岃閲嶈瘯");
+ fail: () => {
+ showToast("涓婁紶澶辫触");
+ uploading.value = false;
+ uploadProgress.value = 0;
},
});
- };
-
- // 澶勭悊鎵爜缁撴灉
- const handleScanResult = scanResult => {
- if (!scanResult) {
- showToast("鎵爜缁撴灉涓虹┖");
- return;
- }
-
- isScanning.value = true;
- showToast("鎵爜鎴愬姛");
-
- // 3绉掑悗澶勭悊鎵爜缁撴灉
- scanTimer.value = setTimeout(() => {
- processScanResult(scanResult);
- isScanning.value = false;
- }, 100);
- };
- function getDeviceIdByRegExp(url) {
- // 鍖归厤deviceId=鍚庨潰鐨勬暟瀛�
- const reg = /deviceId=(\d+)/;
- const match = url.match(reg);
- // 濡傛灉鍖归厤鍒扮粨鏋滐紝杩斿洖鏁板瓧绫诲瀷锛屽惁鍒欒繑鍥瀗ull
- return match ? Number(match[1]) : null;
- }
-
- // 澶勭悊鎵爜缁撴灉骞跺尮閰嶈澶�
- const processScanResult = scanResult => {
- const deviceId = getDeviceIdByRegExp(scanResult);
- const matchedDevice = deviceOptions.value.find(item => item.id == deviceId);
-
- if (matchedDevice) {
- // 鎵惧埌鍖归厤鐨勮澶囷紝鑷姩濉厖
- form.value.deviceLedgerId = matchedDevice.id;
- deviceNameText.value = matchedDevice.deviceName;
- form.value.deviceModel = matchedDevice.deviceModel;
- showToast("璁惧淇℃伅宸茶嚜鍔ㄥ～鍏�");
- } else {
- // 鏈壘鍒板尮閰嶇殑璁惧
- showToast("鏈壘鍒板尮閰嶇殑璁惧锛岃鎵嬪姩閫夋嫨");
+ if (uploadTask && uploadTask.onProgressUpdate) {
+ uploadTask.onProgressUpdate(e => {
+ uploadProgress.value = e.progress;
+ });
}
};
- // 鏄剧ず璁惧閫夋嫨鍣�
- const showDevicePicker = () => {
- showDevice.value = true;
- };
-
- // 纭璁惧閫夋嫨
- const onDeviceSelect = e => {
- form.value.deviceLedgerId = e.value;
- setDeviceModel(e.value);
- showDevice.value = false;
+ const removeRepairFile = index => {
+ repairFileList.value.splice(index, 1);
};
// 鏄剧ず鏃ユ湡閫夋嫨鍣�
@@ -339,11 +465,6 @@
});
// 缁勪欢鍗歌浇鏃舵竻鐞嗗畾鏃跺櫒
- onUnmounted(() => {
- if (scanTimer.value) {
- clearTimeout(scanTimer.value);
- }
- });
// 鎻愪氦琛ㄥ崟
const sendForm = async () => {
@@ -357,6 +478,9 @@
} else if (!form.value.repairTime || form.value.repairTime.trim() === "") {
isValid = false;
errorMessage = "璇烽�夋嫨鎶ヤ慨鏃ユ湡";
+ } else if (form.value.status === undefined || form.value.status === null || form.value.status === "") {
+ isValid = false;
+ errorMessage = "璇烽�夋嫨鎶ヤ慨鐘舵��";
} else if (!form.value.repairName || form.value.repairName.trim() === "") {
isValid = false;
errorMessage = "璇疯緭鍏ユ姤淇汉";
@@ -373,8 +497,13 @@
loading.value = true;
const id = getPageId();
- // 鍑嗗鎻愪氦鏁版嵁
+ // 闄勪欢鏁扮粍锛氫笂浼犳帴鍙ｈ繑鍥炵殑闄勪欢淇℃伅锛堜笌宸℃涓�鑷翠紶 fileList锛�
+ const fileList = repairFileList.value.map(f => {
+ const d = f.uploadResponse?.data !== undefined ? f.uploadResponse.data : f.uploadResponse;
+ return d ? { ...d } : null;
+ }).filter(Boolean);
const submitData = { ...form.value };
+ if (fileList.length) submitData.fileList = fileList;
const { code } = id
? await editRepair({ id: id, ...submitData })
@@ -480,10 +609,139 @@
color: #888;
}
- .scan-icon {
- color: #1989fa;
- font-size: 18px;
- margin-left: 8px;
- cursor: pointer;
+ :deep(.device-name-form-item .u-form-item__content) {
+ justify-content: flex-start !important;
+ }
+
+ .device-picker-wrap {
+ width: 100%;
+ flex: 1;
+ min-width: 0;
+ }
+
+ .device-picker-full {
+ display: block;
+ width: 100%;
+ }
+
+ .picker-input-row {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ width: 100%;
+ min-height: 36px;
+ padding: 0;
+ }
+
+ .picker-input-text {
+ flex: 1;
+ min-width: 0;
+ font-size: 15px;
+ color: #333;
+ line-height: 36px;
+ margin-right: 8px;
+ }
+
+ .picker-input-arrow {
+ flex-shrink: 0;
+ display: flex;
+ align-items: center;
+ }
+
+ .picker-input-text.placeholder {
+ color: #c0c4cc;
+ }
+
+ .simple-upload-area {
+ padding: 15px 20px;
+ }
+
+ .upload-buttons {
+ display: flex;
+ gap: 10px;
+ margin-bottom: 10px;
+ }
+
+ .upload-progress {
+ margin: 15px 0;
+ padding: 0 10px;
+ }
+
+ .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;
+ width: calc(50% - 6px);
+ min-width: 120px;
+ }
+
+ .file-preview-container {
+ position: relative;
+ margin-bottom: 8px;
+ }
+
+ .file-preview {
+ width: 80px;
+ height: 80px;
+ border-radius: 8px;
+ object-fit: cover;
+ border: 2px solid #f0f0f0;
+ }
+
+ .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;
+ z-index: 1;
+ }
+
+ .file-info {
+ text-align: center;
+ width: 100%;
+ }
+
+ .file-name {
+ font-size: 12px;
+ color: #333;
+ 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: 24px 16px;
+ color: #999;
+ font-size: 14px;
+ background: #f8f9fa;
+ border-radius: 8px;
+ border: 2px dashed #ddd;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3