From 5667f2b4fc7555ba678d5aef13b096cd38da64db Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 12 Jan 2026 15:45:34 +0800
Subject: [PATCH] feat:数据驾驶舱相关处理

---
 applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue |   32 ++++++++++++++++++++++++++------
 1 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue b/applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue
index a0645d3..65853cc 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue
@@ -4,7 +4,7 @@
 			<el-row :gutter="16">
 				<el-col :span="4">
 					<el-form-item label="名称" prop="deviceName">
-						<el-input v-model="searchParams.deviceName" placeholder="请输入" clearable @change="handleSearch" />
+						<el-input v-model="searchParams.deviceName" placeholder="请输入" clearable @clear="handleSearch" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="4">
@@ -33,7 +33,7 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="4">
-					<el-form-item label="时间" >
+					<el-form-item label="时间">
 						<el-date-picker
 							popper-class="ztzf-date-picker-popper"
 							class="ztzf-date-picker"
@@ -63,18 +63,30 @@
 		<el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" />
 			<el-table-column type="index" width="60" label="序号" />
-			<el-table-column prop="deviceName" label="名称" />
+			<el-table-column prop="deviceName" label="设备名称" />
 			<el-table-column prop="deviceType" label="类型">
 				<template v-slot="{ row }">
 					{{ getDictLabel(row.deviceType, dictObj.deviceType) }}
 				</template>
 			</el-table-column>
-			<el-table-column prop="deviceModel" label="设备型号" />
+			<el-table-column prop="deviceModel" label="型号" />
 			<el-table-column prop="deviceSpecification" label="规格" />
+			<el-table-column prop="manufacturer" label="生产厂商" />
+			<el-table-column prop="createTime" label="入库时间" />
+			<el-table-column prop="source" label="来源" />
+			<el-table-column prop="purpose" label="用途" />
+			<el-table-column prop="belongDeptName" label="所属部门" />
+			<el-table-column prop="charger" label="负责人" />
+			<el-table-column prop="yxzt" label="运行状态">
+				<template v-slot="{ row }">
+					{{ DEVICE_STATUS[row.status] || '-' }}
+				</template>
+			</el-table-column>
 			<el-table-column label="操作">
 				<template v-slot="{ row }">
 					<el-link @click="handleView(row)" type="primary">查看</el-link>
 					<el-link @click="handleEdit(row)" type="warning">编辑</el-link>
+					<el-link @click="outbound(row)" type="warning">出库</el-link>
 					<el-link @click="handleDelete(row)" type="danger">删除</el-link>
 				</template>
 			</el-table-column>
@@ -89,6 +101,7 @@
 		</div>
 
 		<FormDiaLog ref="dialogRef" @success="getList" />
+		<DeviceTrackDiaLog ref="outboundDialogRef" @success="getList" />
 	</basic-container>
 </template>
 
@@ -100,6 +113,8 @@
 import { getDictionaryByCode } from '@/api/system/dictbiz'
 import { getDeptTree } from '@/api/system/dept'
 import { blobDownload, dateRangeFormat, getDictLabel } from '@ztzf/utils'
+import { DEVICE_STATUS } from '@ztzf/constants'
+import DeviceTrackDiaLog from '@/views/basicManage/deviceStock/DeviceTrackDiaLog.vue'
 
 const initSearchParams = () => ({
 	deviceName: '', // 设备名称
@@ -109,12 +124,13 @@
 	size: 10, // 每页大小
 })
 const searchParams = ref(initSearchParams()) // 查询参数
-const total = ref(0) // 总条数
 const loading = ref(false) // 列表加载中
 const list = ref([]) // 列表数据
+const total = ref(0) // 总数
 const selectedIds = ref([]) // 勾选的设备ID列表
 const queryParamsRef = ref(null) // 查询表单实例
 const dialogRef = ref(null) // 弹框实例
+const outboundDialogRef = ref(null) // 弹框实例
 const dictObj = ref({
 	deviceType: [], //设备类型
 	deviceAtt: [], //设备属性
@@ -134,7 +150,7 @@
 	const range = dateRangeFormat(dateRange.value)
 	loading.value = true
 	try {
-		const params = { ...searchParams.value, start_time: range[0], end_time: range[1] }
+		const params = { ...searchParams.value, startTime: range[0], endTime: range[1] }
 		const res = await fwDevicePageApi(params)
 		list.value = res?.data?.data?.records ?? []
 		total.value = res?.data?.data?.total ?? 0
@@ -167,6 +183,10 @@
 	dialogRef.value?.open({ mode: 'edit', row: { ...row } })
 }
 
+function outbound(row) {
+	outboundDialogRef.value?.open({ mode: 'add', row: { ...row } })
+}
+
 // 删除
 async function handleDelete(row) {
 	const tips = row ? '该条' : '选中的项'

--
Gitblit v1.9.3