智能柜api日志创建时间和设备详情日志时间线和货柜商品编辑图片显示

src/components/Upload/Images.vue

@@ -167,17 +167,39 @@ watch(
 			return
 		}
 
-		fileList.value = newValue
-			.split(",")
-			.map((item: string) => {
-				const url = item.startsWith("http") ? item : imageBaseUrl + item
-				return {
-					name: item.split("/").pop() || "",
-					url: url,
-					fileUrl: item,
-				}
-			})
-			.filter((item) => item.url)
+		if (!newValue.match(/x-oss-process/g)) {
+			fileList.value = newValue
+				.split(",")
+				.map((item: string) => {
+					const url = item.startsWith("http") ? item : imageBaseUrl + item
+					return {
+						name: item.split("/").pop() || "",
+						url: url,
+						fileUrl: item,
+					}
+				})
+				.filter((item) => item.url)
+
+			console.log("fileList.value", fileList.value)
+		} else {
+			fileList.value = newValue
+				.split("?")
+				.filter(
+					(item) =>
+						item.endsWith(".jpg") || item.endsWith(".png") || item.endsWith(".gif") || item.endsWith(".jpeg") || item.endsWith(".webp"),
+				)
+				.map((item: string) => {
+					const url = item.startsWith("http") ? item : imageBaseUrl + item
+					return {
+						name: item.split("/").pop() || "",
+						url: url,
+						fileUrl: item,
+					}
+				})
+				.filter((item) => item.url)
+
+			console.log("fileList.value", fileList.value)
+		}
 	},
 	{ immediate: true },
 )

src/views/hard/hard-door-manager/index.vue

@@ -177,6 +177,18 @@
 					</div>
 				</el-tab-pane>
 			</el-tabs>
+
+			<el-descriptions title="智能柜日志">
+				<el-descriptions-item labelClassName="no-colon">
+					<el-timeline>
+						<el-timeline-item v-for="v in new Array(2).fill({})" :key="v.id" timestamp="2025-1-1 222222" placement="top">
+							<div class="el-timeline-right-content">
+								<span>{{ "121121" }}</span>
+							</div>
+						</el-timeline-item>
+					</el-timeline>
+				</el-descriptions-item>
+			</el-descriptions>
 		</div>
 
 		<!-- 柜子设置 -->
@@ -436,4 +448,69 @@ const deleteGoods = async (v: any) => {
 		}
 	}
 }
+.el-timeline-right-content {
+	display: flex;
+	align-items: center;
+	min-height: 30px;
+	padding: 10px;
+	background-color: #409eff;
+
+	&::before {
+		position: absolute;
+		top: 10px;
+		left: 13px;
+		border-color: transparent #409eff transparent transparent;
+		border-style: solid;
+		border-width: 8px;
+		content: "";
+	}
+}
+// 时间线样式调整
+:deep(.el-timeline) {
+	margin: 10px 0 0 160px;
+
+	.el-timeline-item__wrapper {
+		position: relative;
+		top: -20px;
+
+		.el-timeline-item__timestamp {
+			position: absolute !important;
+			top: 10px;
+			left: -150px;
+		}
+	}
+
+	.el-timeline-right-content {
+		display: flex;
+		align-items: center;
+		min-height: 30px;
+		padding: 10px;
+		background-color: #409eff;
+
+		&::before {
+			position: absolute;
+			top: 10px;
+			left: 13px;
+			border-color: transparent #409eff transparent transparent;
+			border-style: solid;
+			border-width: 8px;
+			content: "";
+		}
+	}
+
+	.el-timeline-item__node {
+		position: absolute;
+		left: -5px;
+		top: -50%;
+		transform: translateY(100%);
+		display: flex;
+		width: 20px;
+		height: 20px;
+		font-size: 10px;
+		background: #409eff;
+		border-radius: 50%;
+		justify-content: center;
+		align-items: center;
+	}
+}
 </style>

src/views/hard/hard-spu/form.vue

@@ -173,7 +173,7 @@ const gethardSpuData = (id: string) => {
 	hardSpu
 		.getObj(id)
 		.then((res: any) => {
-			Object.assign(form, res.data, { price: displayPrice(res.data.price, "", 0) })
+			Object.assign(form, res.data, { price: Number(displayPrice(res.data.price, "", 0)) })
 		})
 		.finally(() => {
 			loading.value = false

src/views/hard/hard-spu/index.vue

@@ -94,11 +94,18 @@
 					</template>
 				</el-table-column>
 				<el-table-column label="操作" fixed="right" width="150">
-					<template #default="scope">
-						<el-button icon="edit-pen" text type="primary" v-auth="'hard_hardSpu_edit'" @click="formDialogRef.openDialog(scope.row.id)">
+					<template #default="{ row }">
+						<el-button icon="edit-pen" text type="primary" v-auth="'hard_hardSpu_edit'" @click="formDialogRef.openDialog(row.id)">
 							编辑
 						</el-button>
-						<el-button icon="delete" text type="primary" v-auth="'hard_hardSpu_del'" @click="handleDelete([scope.row.id])">
+						<el-button
+							v-if="row.skuType != '0'"
+							icon="delete"
+							text
+							type="primary"
+							v-auth="'hard_hardSpu_del'"
+							@click="handleDelete([row.id])"
+						>
 							删除
 						</el-button>
 					</template>

src/views/hard/third-door-log/index.vue

@@ -28,7 +28,7 @@
 				@sort-change="sortChangeHandle"
 			>
 				<el-table-column type="selection" width="40" align="center" />
-				<el-table-column type="index" label="#" width="40" />
+				<el-table-column type="index" label="#" width="50" />
 				<el-table-column prop="apiType" label="请求类型">
 					<template #default="{ row }">
 						<dict-tag :options="third_api_type" :value="row.apiType" />
@@ -68,6 +68,7 @@
 					</template>
 				</el-table-column>
 				<el-table-column prop="timeConsuming" label="耗时(毫秒)" show-overflow-tooltip />
+				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip />
 			</el-table>
 			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 		</div>