From 86c2d61ba9d33f1886cfc904dcaf17f033e4c80a Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 17 Jan 2026 13:52:53 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/drone-command/src/views/basicManage/deviceStock/index.vue | 43 ++++++++++++++-----------------------------
1 files changed, 14 insertions(+), 29 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/deviceStock/index.vue b/applications/drone-command/src/views/basicManage/deviceStock/index.vue
index 8874ad0..4c00e14 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/index.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/index.vue
@@ -6,10 +6,10 @@
<DeviceChart3 />
</div>
- <el-form ref="queryParamsRef" :model="searchParams" class="ztzf-page-history-search">
+ <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-data-cockpit-search-input"
v-model="searchParams.deviceName"
placeholder="请输入"
clearable
@@ -19,8 +19,8 @@
<el-form-item label="设备类型" prop="deviceType">
<el-select
- class="ztzf-data-cockpit-select"
- popper-class="ztzf-data-cockpit-select-popper"
+ class="command-data-cockpit-select"
+ popper-class="command-data-cockpit-select-popper"
v-model="searchParams.deviceType"
placeholder="请选择"
clearable
@@ -37,8 +37,8 @@
<el-form-item label="所属部门" prop="belongDept">
<el-tree-select
- class="ztzf-data-cockpit-select"
- popper-class="ztzf-data-cockpit-tree-select-popper"
+ class="command-data-cockpit-select"
+ popper-class="command-data-cockpit-tree-select-popper"
v-model="searchParams.belongDept"
:data="deptTree"
:props="treeProps"
@@ -48,36 +48,20 @@
@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">
+ <div class="command-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>
<!-- <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-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="设备名称" />
@@ -91,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="来源" />
@@ -115,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-data-cockpit-select-popper"
v-model:current-page="searchParams.current"
v-model:page-size="searchParams.size"
layout="total, prev, pager, next, sizes"
@@ -147,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: '', // 设备名称
--
Gitblit v1.9.3