From 31d0fc3caacc159faddf0c4f3bb4f84bf7a00c69 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 08 Jan 2026 16:53:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue | 87 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 76 insertions(+), 11 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue b/applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue
index 6a0aee0..b32d7ac 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue
@@ -4,12 +4,32 @@
<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 @change="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">
@@ -22,11 +42,17 @@
</el-form>
<div>
<el-button type="primary" @click="handleAdd">新增</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 +63,6 @@
</template>
</el-table-column>
</el-table>
-
<div>
<el-pagination
v-model:current-page="searchParams.current"
@@ -53,14 +78,17 @@
<script setup>
import { onMounted, ref } from 'vue'
-import { ElMessageBox } from 'element-plus'
-import { fwDeviceListApi, fwDeviceRemoveApi } from '@/views/basicManage/deviceStock/fwDevice'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { 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 { getDictLabel } from '@ztzf/utils'
const initSearchParams = () => ({
- // 查询参数默认值
deviceName: '', // 设备名称
deviceType: '', // 设备类型
+ belongDept: '', // 所属部门
current: 1, // 当前页
size: 10, // 每页大小
})
@@ -68,14 +96,26 @@
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: [], //设备属性
+})
+const deptTree = ref([])
+const treeProps = {
+ label: 'name',
+ children: 'children',
+}
+provide('dictObj', dictObj)
+provide('deptTree', deptTree)
// 获取列表
async function getList() {
loading.value = true
try {
- const res = await fwDeviceListApi(searchParams.value)
+ const res = await fwDevicePageApi(searchParams.value)
list.value = res?.data?.data?.records ?? []
total.value = res?.data?.data?.total ?? 0
} finally {
@@ -108,9 +148,32 @@
// 删除
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 getDictList() {
+ getDictionaryByCode('deviceType,deviceAtt').then(res => {
+ dictObj.value = res.data.data
+ })
+}
+
+// 获取部门树
+function getDeptTreeFun() {
+ getDeptTree().then(res => {
+ deptTree.value = res.data.data
+ })
}
// 新增
@@ -120,6 +183,8 @@
onMounted(() => {
getList()
+ getDictList()
+ getDeptTreeFun()
})
</script>
<style scoped lang="scss"></style>
--
Gitblit v1.9.3