From beb95fb5fc166804056abafd70fc01ac27de7621 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 26 Jan 2026 09:11:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/basicManage/deviceStock/index.vue | 68 ++++++++++++++++------------------
1 files changed, 32 insertions(+), 36 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/deviceStock/index.vue b/applications/drone-command/src/views/basicManage/deviceStock/index.vue
index b2fdf81..4933b82 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/index.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/index.vue
@@ -5,10 +5,11 @@
<DeviceChart2 />
<DeviceChart3 />
</div>
- <el-form ref="queryParamsRef" :model="searchParams" class="ztzf-page-history-search">
- <el-form-item label="名称" prop="deviceName">
+
+ <el-form ref="queryParamsRef" :model="searchParams" class="command-page-history-search">
+ <el-form-item label="设备名称" prop="deviceName">
<el-input
- class="ztzf-data-cockpit-search-input"
+ class="command-input"
v-model="searchParams.deviceName"
placeholder="请输入"
clearable
@@ -16,10 +17,10 @@
/>
</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"
+ class="command-select"
+ popper-class="command-select-popper"
v-model="searchParams.deviceType"
placeholder="请选择"
clearable
@@ -34,10 +35,10 @@
</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"
+ class="command-select"
+ popper-class="command-tree-select-popper"
v-model="searchParams.belongDept"
:data="deptTree"
:props="treeProps"
@@ -47,40 +48,24 @@
@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-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>
- <div class="ztzf-table-toolbar">
- <el-button :icon="Plus" color="#284FE3" type="primary" @click="handleAdd">新增</el-button>
- <el-button :icon="Download" color="#1A2652" type="primary" @click="exportFile" :loading="exportLoading">导出</el-button>
+ <div class="command-table-toolbar">
+ <el-button :icon="Plus" color="#284FE3" type="primary" @click="handleAdd">设备建档</el-button>
<!-- <el-button type="danger" :disabled="!selectedIds.length" @click="handleDelete()">删除</el-button>-->
</div>
- <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">
+ <div class="command-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
+ <div class="command-table-content command-table-content-bg">
+ <el-table class="command-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="类型">
+ <el-table-column prop="deviceType" show-overflow-tooltip width="130" label="设备类型">
<template v-slot="{ row }">
{{ getDictLabel(row.deviceType, dictObj.deviceType) }}
</template>
@@ -90,7 +75,7 @@
<el-table-column prop="manufacturer" show-overflow-tooltip width="130" label="生产厂商" />
<el-table-column prop="createTime" show-overflow-tooltip width="96" label="入库时间">
<template v-slot="{ row }">
- {{ formatDateToSlash(row.createTime) }}
+ {{ dayjs(row.createTime).format('YYYY-MM-DD') }}
</template>
</el-table-column>
<el-table-column prop="source" show-overflow-tooltip width="112" label="来源" />
@@ -114,9 +99,9 @@
</el-table>
</div>
- <div class="ztzf-table-pagination">
+ <div class="command-table-pagination">
<el-pagination
- popper-class="ztzf-data-cockpit-select-popper"
+ popper-class="command-select-popper"
v-model:current-page="searchParams.current"
v-model:page-size="searchParams.size"
layout="total, prev, pager, next, sizes"
@@ -146,6 +131,7 @@
import DeviceChart1 from '@/views/basicManage/deviceStock/DeviceChart1.vue'
import DeviceChart2 from '@/views/basicManage/deviceStock/DeviceChart2.vue'
import DeviceChart3 from '@/views/basicManage/deviceStock/DeviceChart3.vue'
+import dayjs from 'dayjs'
const initSearchParams = () => ({
deviceName: '', // 设备名称
@@ -226,7 +212,12 @@
// 删除
async function handleDelete(row) {
const tips = row ? '该条' : '选中的项'
- await ElMessageBox.confirm(`确认删除${tips}吗？`, '提示', { type: 'warning' })
+ await ElMessageBox.confirm(`确认删除${tips}吗？`, '提示', {
+ type: 'warning',
+ customClass: 'command-page-view-message-box',
+ confirmButtonClass: 'command-message-box-confirm',
+ cancelButtonClass: 'command-message-box-cancel',
+ })
const ids = row ? row.id : selectedIds.value.join(',')
await fwDeviceRemoveApi({ ids })
ElMessage.success('删除成功')
@@ -277,6 +268,7 @@
</script>
<style scoped lang="scss">
.chart {
+ margin-bottom: 30px;
width: 100%;
height: 234px;
display: flex;
@@ -285,7 +277,7 @@
box-sizing: border-box;
}
.deviceChart {
-
+ margin-left: 20px;
height: 100%;
background: rgba(26, 26, 42, 0.3);
border-radius: 10px 10px 10px 10px;
@@ -296,6 +288,10 @@
align-items: center;
padding: 10px;
+ &:first-child {
+ margin-left: 0;
+ }
+
.titleBg {
font-weight: 400;
font-size: 18px;
--
Gitblit v1.9.3