From edaf70cb7f0c4e7c997ddab584b3b05798d58528 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Fri, 09 Jan 2026 08:50:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue | 96 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 84 insertions(+), 12 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue b/applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue
index 8f2d7cc..5b16c2f 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue
@@ -4,12 +4,47 @@
<el-row :gutter="16">
<el-col :span="4">
<el-form-item label="名称" prop="deviceName">
- <el-input v-model="searchParams.deviceName" placeholder="请输入" clearable @clear="getList" />
+ <el-input v-model="searchParams.deviceName" placeholder="请输入" clearable @clear="handleSearch" />
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="类型" prop="deviceType">
- <el-input v-model="searchParams.deviceType" placeholder="请输入" clearable @clear="getList" />
+ <el-select 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-col>
+ <el-col :span="4">
+ <el-form-item label="部门" prop="belongDept">
+ <el-tree-select
+ v-model="searchParams.belongDept"
+ :data="deptTree"
+ :props="treeProps"
+ node-key="id"
+ check-strictly
+ clearable
+ @change="handleSearch"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-form-item label="时间">
+ <el-date-picker
+ popper-class="ztzf-date-picker-popper"
+ class="ztzf-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-col>
<el-col :span="4">
@@ -22,11 +57,18 @@
</el-form>
<div>
<el-button type="primary" @click="handleAdd">新增</el-button>
+ <el-button type="primary" @click="exportFile" :loading="exportLoading">导出</el-button>
+ <el-button type="danger" :disabled="!selectedIds.length" @click="handleDelete()">删除</el-button>
</div>
- <el-table v-loading="loading" :data="list">
+ <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="deviceType" 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="deviceSpecification" label="规格" />
<el-table-column label="操作">
@@ -37,7 +79,6 @@
</template>
</el-table-column>
</el-table>
-
<div>
<el-pagination
v-model:current-page="searchParams.current"
@@ -54,14 +95,16 @@
<script setup>
import { onMounted, ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
-import { fwDevicePageApi, fwDeviceRemoveApi } from '@/views/basicManage/deviceStock/fwDevice'
+import { exportFwDeviceApi, fwDevicePageApi, fwDeviceRemoveApi } from '@/views/basicManage/deviceStock/fwDevice'
import FormDiaLog from './FormDiaLog.vue'
import { getDictionaryByCode } from '@/api/system/dictbiz'
import { getDeptTree } from '@/api/system/dept'
+import { blobDownload, dateRangeFormat, getDictLabel } from '@ztzf/utils'
const initSearchParams = () => ({
deviceName: '', // 设备名称
deviceType: '', // 设备类型
+ belongDept: '', // 所属部门
current: 1, // 当前页
size: 10, // 每页大小
})
@@ -69,21 +112,30 @@
const total = ref(0) // 总条数
const loading = ref(false) // 列表加载中
const list = ref([]) // 列表数据
+const selectedIds = ref([]) // 勾选的设备ID列表
const queryParamsRef = ref(null) // 查询表单实例
const dialogRef = ref(null) // 弹框实例
const dictObj = ref({
- deviceType: [],
- deviceAtt: [],
+ deviceType: [], //设备类型
+ deviceAtt: [], //设备属性
})
+const dateRange = ref([])
const deptTree = ref([])
-
+const treeProps = {
+ label: 'name',
+ children: 'children',
+}
+const exportLoading = ref(false)
provide('dictObj', dictObj)
provide('deptTree', deptTree)
+
// 获取列表
async function getList() {
+ const range = dateRangeFormat(dateRange.value)
loading.value = true
try {
- const res = await fwDevicePageApi(searchParams.value)
+ 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
} finally {
@@ -99,6 +151,7 @@
// 重置查询
function resetForm() {
+ dateRange.value = []
queryParamsRef.value?.resetFields()
searchParams.value.current = 1
getList()
@@ -116,12 +169,31 @@
// 删除
async function handleDelete(row) {
- await ElMessageBox.confirm('确认删除该设备吗？', '提示', { type: 'warning' })
- await fwDeviceRemoveApi({ ids: row.id })
+ const tips = row ? '该条' : '选中的项'
+ await ElMessageBox.confirm(`确认删除${tips}吗？`, '提示', { type: 'warning' })
+ const ids = row ? row.id : selectedIds.value.join(',')
+ await fwDeviceRemoveApi({ ids })
ElMessage.success('删除成功')
+ selectedIds.value = []
getList()
}
+// 勾选值设置
+function handleSelectionChange(rows) {
+ selectedIds.value = rows.map(item => item.id)
+}
+
+function exportFile() {
+ exportLoading.value = true
+ exportFwDeviceApi()
+ .then(res => {
+ blobDownload(res)
+ })
+ .finally(() => {
+ exportLoading.value = false
+ })
+}
+
// 获取字典
function getDictList() {
getDictionaryByCode('deviceType,deviceAtt').then(res => {
--
Gitblit v1.9.3