From 71beb96fd30a2d29ca98223e785fb541ba1082d3 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 16 Jan 2026 10:48:42 +0800
Subject: [PATCH] feat:列表显示调整等
---
packages/utils/date/index.js | 12 +++++++++++-
applications/drone-command/src/views/basicManage/deviceScrap/index.vue | 17 +++++------------
applications/drone-command/src/views/recordManage/alarmRecords/index.vue | 2 +-
applications/drone-command/src/views/recordManage/historyTracks/TrajectoryDiaLog.vue | 2 +-
applications/drone-command/src/views/recordManage/historyTracks/index.vue | 2 +-
5 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/deviceScrap/index.vue b/applications/drone-command/src/views/basicManage/deviceScrap/index.vue
index 481235a..d843ada 100644
--- a/applications/drone-command/src/views/basicManage/deviceScrap/index.vue
+++ b/applications/drone-command/src/views/basicManage/deviceScrap/index.vue
@@ -1,12 +1,12 @@
<template>
<basic-container>
<el-form ref="queryParamsRef" :model="searchParams" class="ztzf-page-history-search">
- <el-form-item label="名称" prop="deviceName">
+ <el-form-item label="设备名称" prop="deviceName">
<el-input class="ztzf-data-cockpit-search-input" v-model="searchParams.deviceName" placeholder="请输入"
clearable @clear="handleSearch" />
</el-form-item>
- <el-form-item label="类型" prop="deviceType">
+ <el-form-item label="设备类型" prop="deviceType">
<el-select class="ztzf-data-cockpit-select" popper-class="ztzf-data-cockpit-select-popper"
v-model="searchParams.deviceType" placeholder="请选择" clearable @change="handleSearch">
<el-option v-for="item in dictObj.deviceType" :key="item.dictKey" :label="item.dictValue"
@@ -14,7 +14,7 @@
</el-select>
</el-form-item>
- <el-form-item label="部门" prop="belongDept">
+ <el-form-item label="所属部门" prop="belongDept">
<el-tree-select class="ztzf-data-cockpit-select" popper-class="ztzf-data-cockpit-tree-select-popper"
v-model="searchParams.belongDept" :data="deptTree" :props="treeProps" node-key="id" check-strictly
clearable @change="handleSearch" />
@@ -28,8 +28,7 @@
<div class="ztzf-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
<div class="ztzf-table-content ztzf-table-content-bg">
- <el-table class="ztzf-data-cockpit-table" :data="list" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="46" />
+ <el-table class="ztzf-data-cockpit-table" :data="list">
<el-table-column type="index" show-overflow-tooltip width="64" label="序号" />
<el-table-column prop="deviceName" show-overflow-tooltip label="设备名称" />
<el-table-column prop="deviceType" show-overflow-tooltip label="设备类型">
@@ -41,11 +40,11 @@
<el-table-column prop="manufacturer" show-overflow-tooltip label="生产厂商" />
<el-table-column prop="createTime" show-overflow-tooltip label="入库时间" />
<el-table-column prop="source" show-overflow-tooltip label="来源" />
+ <el-table-column prop="belongDeptName" show-overflow-tooltip label="所属部门" />
<el-table-column prop="charger" show-overflow-tooltip label="负责人" />
<el-table-column prop="scrapTime" show-overflow-tooltip label="报废时间" />
<el-table-column prop="scrapReason" show-overflow-tooltip label="报废原因" />
<el-table-column prop="disposeWay" show-overflow-tooltip label="处置方式" />
- <el-table-column prop="maintainReminder" show-overflow-tooltip label="维护提醒" />
<el-table-column label="操作" class-name="operation-btns">
<template v-slot="{ row }">
<el-link @click="handleView(row)">查看</el-link>
@@ -86,7 +85,6 @@
const total = ref(0) // 总条数
const loading = ref(true) // 列表加载中
const list = ref([]) // 列表数据
-const selectedIds = ref([]) // 勾选的ID列表
const queryParamsRef = ref(null) // 查询表单实例
const dialogRef = ref(null) // 弹框实例
const maintenanceDialogRef = ref(null) // 弹框实例
@@ -135,11 +133,6 @@
// 查看
function handleView (row) {
dialogRef.value?.open({ mode: 'view', row: { ...row } })
-}
-
-// 勾选值设置
-function handleSelectionChange (rows) {
- selectedIds.value = rows.map(item => item.id)
}
// 获取字典
diff --git a/applications/drone-command/src/views/recordManage/alarmRecords/index.vue b/applications/drone-command/src/views/recordManage/alarmRecords/index.vue
index 5939a81..316f1f5 100644
--- a/applications/drone-command/src/views/recordManage/alarmRecords/index.vue
+++ b/applications/drone-command/src/views/recordManage/alarmRecords/index.vue
@@ -36,7 +36,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="时间">
+ <el-form-item label="告警时间">
<el-date-picker
popper-class="ztzf-data-cockpit-date-picker-popper"
class="ztzf-data-cockpit-date-picker"
diff --git a/applications/drone-command/src/views/recordManage/historyTracks/TrajectoryDiaLog.vue b/applications/drone-command/src/views/recordManage/historyTracks/TrajectoryDiaLog.vue
index cc0bd5c..8fb9ea7 100644
--- a/applications/drone-command/src/views/recordManage/historyTracks/TrajectoryDiaLog.vue
+++ b/applications/drone-command/src/views/recordManage/historyTracks/TrajectoryDiaLog.vue
@@ -15,7 +15,7 @@
<div class="val">{{ formData.droneName }}</div>
</el-col>
<el-col :span="24">
- <div class="label">序列号</div>
+ <div class="label">无人机序列号</div>
<div class="val">{{ formData.serialNo }}</div>
</el-col>
<el-col :span="24">
diff --git a/applications/drone-command/src/views/recordManage/historyTracks/index.vue b/applications/drone-command/src/views/recordManage/historyTracks/index.vue
index ae58333..4a9af4b 100644
--- a/applications/drone-command/src/views/recordManage/historyTracks/index.vue
+++ b/applications/drone-command/src/views/recordManage/historyTracks/index.vue
@@ -47,7 +47,7 @@
<el-table class="ztzf-data-cockpit-table" :data="list">
<el-table-column type="index" show-overflow-tooltip width="64" label="序号" />
<el-table-column prop="droneName" show-overflow-tooltip width="140" label="无人机名称" />
- <el-table-column prop="serialNo" show-overflow-tooltip label="序列号" />
+ <el-table-column prop="serialNo" show-overflow-tooltip label="无人机序列号" />
<el-table-column prop="alarmTime" show-overflow-tooltip label="告警时间" />
<el-table-column prop="areaName" show-overflow-tooltip label="区域" />
<el-table-column prop="triggerType" show-overflow-tooltip label="触发原因" />
diff --git a/packages/utils/date/index.js b/packages/utils/date/index.js
index e99f662..a2ab4b2 100644
--- a/packages/utils/date/index.js
+++ b/packages/utils/date/index.js
@@ -1,3 +1,13 @@
+/*
+ * @Author : yuan
+ * @Date : 2026-01-06 09:47:33
+ * @LastEditors : yuan
+ * @LastEditTime : 2026-01-16 10:48:25
+ * @FilePath : \packages\utils\date\index.js
+ * @Description :
+ * Copyright 2026 OBKoro1, All Rights Reserved.
+ * 2026-01-06 09:47:33
+ */
import dayjs from 'dayjs'
// 格式化日期开始00:00:00 结束 23:59:59
@@ -11,7 +21,7 @@
if (!dateStr) return '-'
// 兼容 'YYYY-MM-DD HH:mm:ss'
- const date = new Date(dateStr.replace(/-/g, '/'))
+ const date = new Date(dateStr.replace(/-/g, '-'))
if (isNaN(date.getTime())) return '-'
const y = date.getFullYear()
--
Gitblit v1.9.3