From 94119cd2eed9a4ae33a599595bc6c9bf9d67c0aa Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Wed, 14 Jan 2026 14:41:29 +0800
Subject: [PATCH] feat: 一些调整
---
applications/drone-command/src/views/basicManage/deviceStock/index.vue | 98 +++++++++++++++++++++++++++++++++----------------
1 files changed, 66 insertions(+), 32 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/deviceStock/index.vue b/applications/drone-command/src/views/basicManage/deviceStock/index.vue
index b504d5c..0138975 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/index.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/index.vue
@@ -2,29 +2,59 @@
<basic-container>
<el-form ref="queryParamsRef" :model="searchParams" class="ztzf-page-history-search">
<el-form-item label="名称" prop="deviceName">
- <el-input class="ztzf-data-cockpit-search-input" v-model="searchParams.deviceName" placeholder="请输入"
- clearable @clear="handleSearch" />
+ <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-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"
- :value="item.dictKey" />
+ <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"
+ :value="item.dictKey"
+ />
</el-select>
</el-form-item>
<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" />
+ <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"
+ />
</el-form-item>
<el-form-item label="时间">
- <el-date-picker popper-class="ztzf-data-cockpit-date-picker-popper"
- class="ztzf-data-cockpit-date-picker" v-model="dateRange" type="daterange" range-separator="至"
- start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD HH:mm:ss"
- @change="handleSearch" />
+ <el-date-picker
+ popper-class="ztzf-data-cockpit-date-picker-popper"
+ class="ztzf-data-cockpit-date-picker"
+ v-model="dateRange"
+ type="daterange"
+ range-separator="至"
+ start-placeholder="开始日期"
+ end-placeholder="结束日期"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ @change="handleSearch"
+ />
</el-form-item>
<el-form-item class="history-search-actions">
@@ -64,7 +94,7 @@
<el-table-column prop="charger" show-overflow-tooltip width="100" label="负责人" />
<el-table-column prop="yxzt" show-overflow-tooltip width="116" label="运行状态">
<template v-slot="{ row }">
- {{ DEVICE_STATUS[row.status] || '-' }}
+ {{ getDictLabel(row.status, dictObj.deviceStatus) }}
</template>
</el-table-column>
<el-table-column label="操作" class-name="operation-btns">
@@ -80,9 +110,14 @@
</div>
<div class="ztzf-table-pagination">
- <el-pagination popper-class="ztzf-data-cockpit-select-popper"
- v-model:current-page="searchParams.current" v-model:page-size="searchParams.size"
- layout="total, prev, pager, next, sizes" :total="total" @change="getList" />
+ <el-pagination
+ popper-class="ztzf-data-cockpit-select-popper"
+ v-model:current-page="searchParams.current"
+ v-model:page-size="searchParams.size"
+ layout="total, prev, pager, next, sizes"
+ :total="total"
+ @change="getList"
+ />
</div>
</div>
@@ -101,7 +136,6 @@
import { getDictionaryByCode } from '@/api/system/dictbiz'
import { getDeptTree } from '@/api/system/dept'
import { blobDownload, dateRangeFormat, getDictLabel, formatDateToSlash } from '@ztzf/utils'
-import { DEVICE_STATUS } from '@ztzf/constants'
import DeviceTrackDiaLog from '@/views/basicManage/deviceStock/DeviceTrackDiaLog.vue'
import DeviceScrapDiaLog from '@/views/basicManage/deviceStock/DeviceScrapDiaLog.vue'
@@ -136,7 +170,7 @@
provide('deptTree', deptTree)
// 获取列表
-async function getList () {
+async function getList() {
const range = dateRangeFormat(dateRange.value)
loading.value = true
try {
@@ -150,13 +184,13 @@
}
// 查询
-function handleSearch () {
+function handleSearch() {
searchParams.value.current = 1
getList()
}
// 重置查询
-function resetForm () {
+function resetForm() {
dateRange.value = []
queryParamsRef.value?.resetFields()
searchParams.value.current = 1
@@ -164,25 +198,25 @@
}
// 查看
-function handleView (row) {
+function handleView(row) {
dialogRef.value?.open({ mode: 'view', row: { ...row } })
}
// 编辑
-function handleEdit (row) {
+function handleEdit(row) {
dialogRef.value?.open({ mode: 'edit', row: { ...row } })
}
-function outbound (row) {
+function outbound(row) {
outboundDialogRef.value?.open({ mode: 'edit', row: { ...row } })
}
-function scrap (row) {
+function scrap(row) {
scrapDialogRef.value?.open({ mode: 'edit', row: { ...row } })
}
// 删除
-async function handleDelete (row) {
+async function handleDelete(row) {
const tips = row ? '该条' : '选中的项'
await ElMessageBox.confirm(`确认删除${tips}吗？`, '提示', { type: 'warning' })
const ids = row ? row.id : selectedIds.value.join(',')
@@ -193,11 +227,11 @@
}
// 勾选值设置
-function handleSelectionChange (rows) {
+function handleSelectionChange(rows) {
selectedIds.value = rows.map(item => item.id)
}
-function exportFile () {
+function exportFile() {
exportLoading.value = true
exportFwDeviceApi()
.then(res => {
@@ -209,21 +243,21 @@
}
// 获取字典
-function getDictList () {
- getDictionaryByCode('deviceType,deviceAtt').then(res => {
+function getDictList() {
+ getDictionaryByCode('deviceType,deviceAtt,deviceStatus').then(res => {
dictObj.value = res.data.data
})
}
// 获取部门树
-function getDeptTreeFun () {
+function getDeptTreeFun() {
getDeptTree().then(res => {
deptTree.value = res.data.data
})
}
// 新增
-function handleAdd () {
+function handleAdd() {
dialogRef.value?.open({ mode: 'add' })
}
--
Gitblit v1.9.3