From 46f71f1985eabbf84926d6416659370f1e8c8c3e Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 14 Jan 2026 11:39:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/basicManage/deviceScrap/index.vue | 154 ++++++++++++++++++++++++---------------------------
1 files changed, 72 insertions(+), 82 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/deviceScrap/index.vue b/applications/drone-command/src/views/basicManage/deviceScrap/index.vue
index a3642a8..0032104 100644
--- a/applications/drone-command/src/views/basicManage/deviceScrap/index.vue
+++ b/applications/drone-command/src/views/basicManage/deviceScrap/index.vue
@@ -1,82 +1,72 @@
<template>
<basic-container>
- <el-form ref="queryParamsRef" :model="searchParams">
- <el-row :gutter="16">
- <el-col :span="4">
- <el-form-item label="设备名称" prop="deviceName">
- <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-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>
- <el-button @click="resetForm">重置</el-button>
- <el-button type="primary" @click="handleSearch">查询</el-button>
- </el-form-item>
- </el-col>
- </el-row>
+ <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-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>
+ </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-form-item>
+
+ <el-form-item class="history-search-actions">
+ <el-button :icon="RefreshRight" @click="resetForm"></el-button>
+ <el-button class="search-btn" :icon="Search" @click="handleSearch"></el-button>
+ </el-form-item>
</el-form>
- <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="设备类型">
- <template v-slot="{ row }">
- {{ getDictLabel(row.deviceType, dictObj.deviceType) }}
- </template>
- </el-table-column>
- <el-table-column prop="deviceModel" label="型号" />
- <el-table-column prop="manufacturer" label="生产厂商" />
- <el-table-column prop="createTime" label="入库时间" />
- <el-table-column prop="source" label="来源" />
- <el-table-column prop="charger" label="负责人" />
- <el-table-column prop="scrapTime" label="报废时间" />
- <el-table-column prop="scrapReason" label="报废原因" />
- <el-table-column prop="disposeWay" label="处置方式" />
- <el-table-column prop="maintainReminder" label="维护提醒" />
- <el-table-column label="操作">
- <template v-slot="{ row }">
- <el-link @click="handleView(row)" type="primary">查看</el-link>
- </template>
- </el-table-column>
- </el-table>
- <div>
- <el-pagination
- v-model:current-page="searchParams.current"
- v-model:page-size="searchParams.size"
- :total="total"
- @change="getList"
- />
+
+ <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-column type="index" show-overflow-tooltip width="64" label="序号" />
+ <el-table-column prop="deviceName" show-overflow-tooltip width="130" label="设备名称" />
+ <el-table-column prop="deviceType" show-overflow-tooltip width="130" label="设备类型">
+ <template v-slot="{ row }">
+ {{ getDictLabel(row.deviceType, dictObj.deviceType) }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="deviceModel" show-overflow-tooltip width="98" label="型号" />
+ <el-table-column prop="manufacturer" show-overflow-tooltip width="130" label="生产厂商" />
+ <el-table-column prop="createTime" show-overflow-tooltip width="96" label="入库时间" />
+ <el-table-column prop="source" show-overflow-tooltip width="112" label="来源" />
+ <el-table-column prop="charger" show-overflow-tooltip width="100" label="负责人" />
+ <el-table-column prop="scrapTime" show-overflow-tooltip width="96" label="报废时间" />
+ <el-table-column prop="scrapReason" show-overflow-tooltip width="136" label="报废原因" />
+ <el-table-column prop="disposeWay" show-overflow-tooltip width="116" label="处置方式" />
+ <el-table-column prop="maintainReminder" show-overflow-tooltip width="116" label="维护提醒" />
+ <el-table-column label="操作" class-name="operation-btns">
+ <template v-slot="{ row }">
+ <el-link @click="handleView(row)">查看</el-link>
+ </template>
+ </el-table-column>
+ </el-table>
+ </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" />
+ </div>
</div>
+
<FormDiaLog ref="dialogRef" @success="getList" />
<MaintenanceDiaLog ref="maintenanceDialogRef" @success="getList" />
</basic-container>
</template>
<script setup>
+import { Search, RefreshRight } from '@element-plus/icons-vue'
import { onMounted, ref } from 'vue'
import { getDictionaryByCode } from '@/api/system/dictbiz'
import { getDeptTree } from '@/api/system/dept'
@@ -101,11 +91,11 @@
const dialogRef = ref(null) // 弹框实例
const maintenanceDialogRef = ref(null) // 弹框实例
const dictObj = ref({
- deviceType: [], //设备类型
- deviceAtt: [], //设备属性
+ deviceType: [], // 设备类型
+ deviceAtt: [], // 设备属性
})
provide('dictObj', dictObj)
-const deptTree = ref([]) //部门树
+const deptTree = ref([]) // 部门树
const treeProps = {
label: 'name',
children: 'children',
@@ -118,7 +108,7 @@
provide('planCycleOptions', planCycleOptions)
// 获取列表
-async function getList() {
+async function getList () {
loading.value = true
try {
const res = await fwDeviceScrapPageApi(searchParams.value)
@@ -130,48 +120,48 @@
}
// 查询
-function handleSearch() {
+function handleSearch () {
searchParams.value.current = 1
getList()
}
// 重置查询
-function resetForm() {
+function resetForm () {
queryParamsRef.value?.resetFields()
searchParams.value.current = 1
getList()
}
// 查看
-function handleView(row) {
+function handleView (row) {
dialogRef.value?.open({ mode: 'view', row: { ...row } })
}
// 勾选值设置
-function handleSelectionChange(rows) {
+function handleSelectionChange (rows) {
selectedIds.value = rows.map(item => item.id)
}
// 获取字典
-function getDictList() {
+function getDictList () {
getDictionaryByCode('deviceType,deviceAtt').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' })
}
-function getPlanCycleLabel(row) {
+function getPlanCycleLabel (row) {
const item = planCycleOptions.find(option => option.value === row.planCycleType)
return item?.label + '-' + row.planCycleValue.join(',')
}
--
Gitblit v1.9.3