Compare commits

..

No commits in common. "1b7d340c5b3f207da550c3437ccb54cc6e67e48e" and "d38321ec69a55fadfbfb9af3e8e8b23376d4bbd0" have entirely different histories.

View File

@ -34,26 +34,22 @@
<!-- 设备基本信息区 --> <!-- 设备基本信息区 -->
<view class="equipment-info"> <view class="equipment-info">
<view class="info-card"> <view class="info-card">
<text class="device-id">{{ <text class="device-id">{{equipmentDetail.name || '未知设备'}}</text>
equipmentDetail.name || "未知设备" <text class="device-model">{{equipmentDetail.model || '未知型号'}}</text>
}}</text>
<text class="device-model">{{
equipmentDetail.model || "未知型号"
}}</text>
</view> </view>
</view> </view>
<!-- 维保记录区 --> <!-- 维保记录区 -->
<view class="maintenance-records"> <view class="maintenance-records">
<view class="section-title"> <view class="section-title">
<text style="z-index: 1">维保记录</text> <text style="z-index:1;">维保记录</text>
<view class="title-underline"></view> <view class="title-underline"></view>
</view> </view>
<view class="record-list"> <view class="record-list">
<view <view
class="record-item" class="record-item"
v-for="(record, index) in maintenanceRecords || []" v-for="(record, index) in maintenanceRecords"
:key="index" :key="index"
> >
<view class="record-image"> <view class="record-image">
@ -106,7 +102,7 @@
custom-style="font-size:32rpx;" custom-style="font-size:32rpx;"
placeholder="请选择维保类型" placeholder="请选择维保类型"
type="select" type="select"
v-model="recordForm.type" v-model="maintenanceType"
@click="handleClickType()" @click="handleClickType()"
:clearable="false" :clearable="false"
/> />
@ -186,8 +182,9 @@ export default {
showTypePicker: false, showTypePicker: false,
maintenanceType: "", maintenanceType: "",
maintenanceTypes: [ maintenanceTypes: [
{ label: "例行检查", value: 0 }, { label: "三方险", value: 1 },
{ label: "电池损坏", value: 1 }, { label: "设备险", value: 2 },
{ label: "运营险", value: 3 },
], ],
recordForm: { recordForm: {
type: "", type: "",
@ -208,14 +205,14 @@ export default {
async loadDeviceDetail() { async loadDeviceDetail() {
try { try {
const detail = await this.$api.getDevicesDetail(this.deviceId); const detail = await this.$api.getDevicesDetail(this.deviceId);
console.log("设备详情:", detail); console.log('设备详情:', detail);
if (detail) { if (detail) {
this.equipmentDetail = detail; this.equipmentDetail = detail;
// //
if (detail.deviceImages && detail.deviceImages.length > 0) { if (detail.deviceImages && detail.deviceImages.length > 0) {
this.equipmentImages = detail.deviceImages.map((img) => ({ this.equipmentImages = detail.deviceImages.map(img => ({
image: img.fileFullPath, image: img.fileFullPath,
title: img.sourceFileName, title: img.sourceFileName
})); }));
} else { } else {
this.equipmentImages = [{ this.equipmentImages = [{
@ -225,10 +222,10 @@ export default {
} }
} }
} catch (err) { } catch (err) {
console.error("获取设备详情失败:", err); console.error('获取设备详情失败:', err);
uni.showToast({ uni.showToast({
title: "获取设备详情失败", title: '获取设备详情失败',
icon: "none", icon: 'none'
}); });
} }
}, },
@ -237,23 +234,21 @@ export default {
async loadMaintenanceRecords() { async loadMaintenanceRecords() {
try { try {
const res = await this.$api.getMaintenanceRecords({ const res = await this.$api.getMaintenanceRecords({
aircraftId: this.deviceId, aircraftId: this.deviceId
}); });
if (res && res.records && res.records.length > 0) { if (res && res.records) {
this.maintenanceRecords = res.records.map((record) => ({ this.maintenanceRecords = res.records.map(record => ({
type: this.getMaintenanceTypeName(record.maintenanceType), type: this.getMaintenanceTypeName(record.maintenanceType),
operator: record.createBy || "未知", operator: record.createBy || '未知',
time: record.createTime || "未知时间", time: record.createTime || '未知时间',
description: record.remark || "无", description: record.remark || '无'
})); }));
} else {
this.maintenanceRecords = [];
} }
} catch (err) { } catch (err) {
console.error("获取维保记录失败:", err); console.error('获取维保记录失败:', err);
uni.showToast({ uni.showToast({
title: "获取维保记录失败", title: '获取维保记录失败',
icon: "none", icon: 'none'
}); });
} }
}, },
@ -261,10 +256,10 @@ export default {
// //
getMaintenanceTypeName(type) { getMaintenanceTypeName(type) {
const typeMap = { const typeMap = {
0: "例行检查", 0: '例行检查',
1: "电池损坏", 1: '电池损坏',
}; };
return typeMap[type] || "未知类型"; return typeMap[type] || '未知类型';
}, },
onPageScroll(e) { onPageScroll(e) {
@ -307,9 +302,7 @@ export default {
} }
// //
const selectedType = this.maintenanceTypes.find( const selectedType = this.maintenanceTypes.find(t => t.label === this.recordForm.type);
(t) => t.label === this.recordForm.type
);
if (!selectedType) { if (!selectedType) {
uni.showToast({ uni.showToast({
title: "请选择正确的维保类型", title: "请选择正确的维保类型",
@ -333,13 +326,12 @@ export default {
aircraftId: this.deviceId, aircraftId: this.deviceId,
employeesId: employeesId, employeesId: employeesId,
maintenanceType: selectedType.value, maintenanceType: selectedType.value,
remark: this.recordForm.description, remark: this.recordForm.description
createTime: new Date().toISOString(),
}); });
uni.showToast({ uni.showToast({
title: "添加成功", title: '添加成功',
icon: "success", icon: 'success'
}); });
// //
@ -353,23 +345,22 @@ export default {
}; };
this.maintenanceType = ""; this.maintenanceType = "";
} catch (err) { } catch (err) {
console.error("添加维保记录失败:", err); console.error('添加维保记录失败:', err);
uni.showToast({ uni.showToast({
title: "添加失败", title: '添加失败',
icon: "none", icon: 'none'
}); });
} }
}, },
// //
handleTypeSelect(e) { handleTypeSelect(e) {
if (e && typeof e[0] === "number") { if (e && e.indexs && e.indexs.length > 0) {
const selected = this.maintenanceTypes[e[0]]; const selected = this.maintenanceTypes[e.indexs[0]];
if (selected) { if (selected) {
this.recordForm.type = selected.label; this.recordForm.type = selected.label;
this.maintenanceType = selected.label; this.maintenanceType = selected.label;
} }
console.log("选中的维保类型:", this.recordForm.type);
} }
}, },
}, },
@ -381,7 +372,7 @@ export default {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
// min-height: 100vh; // min-height: 100vh;
background-color: #f5f5f5; background-color: #F5F5F5;
.detail-container { .detail-container {
flex: 1; flex: 1;
@ -498,8 +489,7 @@ export default {
gap: 26rpx; gap: 26rpx;
.record-item:first-child { .record-item:first-child {
box-shadow: 0rpx -6rpx 10rpx 0rpx rgba(226, 226, 226, 0.3), box-shadow: 0rpx -6rpx 10rpx 0rpx rgba(226,226,226,0.3), 0rpx 6rpx 8rpx 0rpx rgba(218,218,218,0.3);
0rpx 6rpx 8rpx 0rpx rgba(218, 218, 218, 0.3);
} }
.record-item { .record-item {
@ -512,7 +502,7 @@ export default {
width: 123rpx; width: 123rpx;
height: 123rpx; height: 123rpx;
border-radius: 12rpx; border-radius: 12rpx;
border: 3rpx solid #fee547; border: 3rpx solid #FEE547;
.thumbnail { .thumbnail {
width: 100%; width: 100%;
height: 100%; height: 100%;
@ -649,14 +639,6 @@ export default {
.textarea-container { .textarea-container {
position: relative; position: relative;
height: 420rpx; height: 420rpx;
.u-input {
height: 100%;
font-size: 32rpx;
color: #333333;
padding: 20rpx 30rpx;
border-radius: 12rpx;
background-color: #f5f5f5;
}
.word-count { .word-count {
position: absolute; position: absolute;
right: 20rpx; right: 20rpx;
@ -664,7 +646,7 @@ export default {
font-family: Arial; font-family: Arial;
font-weight: 400; font-weight: 400;
font-size: 32rpx; font-size: 32rpx;
color: #b3b3b3; color: #B3B3B3;
.word-count-max { .word-count-max {
color: #333333; color: #333333;