From 0ef47a49fa6dce546be2d0f23b4949734e6a0cf9 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 29 Jan 2026 18:31:55 +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 | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/deviceStock/index.vue b/applications/drone-command/src/views/basicManage/deviceStock/index.vue
index b87baa7..561ce69 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/index.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/index.vue
@@ -1,9 +1,9 @@
<template>
<basic-container>
<div class="chart">
- <DeviceChart1 />
- <DeviceChart2 />
- <DeviceChart3 />
+ <DeviceChart1 :key="updateKey"/>
+ <DeviceChart2 :key="updateKey"/>
+ <DeviceChart3 :key="updateKey"/>
</div>
<el-form ref="queryParamsRef" :model="searchParams" class="command-page-history-search">
@@ -77,9 +77,9 @@
{{ dayjs(row.createTime).format('YYYY-MM-DD') }}
</template>
</el-table-column>
- <el-table-column prop="source" show-overflow-tooltip width="112" label="来源" />
- <el-table-column prop="purpose" show-overflow-tooltip width="206" label="用途" />
- <el-table-column prop="belongDeptName" show-overflow-tooltip label="所属部门" />
+ <el-table-column prop="source" show-overflow-tooltip width="120" label="来源" />
+ <el-table-column prop="purpose" show-overflow-tooltip width="130" label="用途" />
+ <el-table-column prop="belongDeptName" show-overflow-tooltip width="160" label="所属部门" />
<el-table-column prop="charger" show-overflow-tooltip width="100" label="负责人" />
<el-table-column prop="yxzt" show-overflow-tooltip width="116" label="运行状态">
<template v-slot="{ row }">
@@ -91,7 +91,7 @@
{{ getDictLabel(row.trackStatus, trackStatusOptions) }}
</template>
</el-table-column>
- <el-table-column label="操作" class-name="operation-btns">
+ <el-table-column label="操作" class-name="operation-btns" width="140">
<template v-slot="{ row }">
<el-link @click="handleView(row)">查看</el-link>
<el-link @click="handleEdit(row)">编辑</el-link>
@@ -116,9 +116,9 @@
</div>
</div>
- <FormDiaLog ref="dialogRef" @success="getList" />
- <DeviceTrackDiaLog ref="outboundDialogRef" @success="getList" />
- <DeviceScrapDiaLog ref="scrapDialogRef" @success="getList" />
+ <FormDiaLog ref="dialogRef" @success="successFun" />
+ <DeviceTrackDiaLog ref="outboundDialogRef" @success="successFun" />
+ <DeviceScrapDiaLog ref="scrapDialogRef" @success="successFun" />
</basic-container>
</template>
@@ -175,6 +175,12 @@
{ dictKey: 1, dictValue: '已出库' }
])
+const updateKey = ref(0)
+function successFun() {
+ updateKey.value = updateKey.value + 1
+ getList()
+}
+
// 获取列表
async function getList() {
const range = dateRangeFormat(dateRange.value)
@@ -219,7 +225,7 @@
// 归还
async function returnDevice(row) {
- await ElMessageBox.confirm(`确认归还吗？`, '提示', {
+ await ElMessageBox.confirm(`确认归还吗？`, '提示', {
type: 'warning',
customClass: 'command-page-view-message-box',
confirmButtonClass: 'command-message-box-confirm',
@@ -240,7 +246,7 @@
// 删除
async function handleDelete(row) {
const tips = row ? '该条' : '选中的项'
- await ElMessageBox.confirm(`确认删除${tips}吗？`, '提示', {
+ await ElMessageBox.confirm(`确认删除${tips}吗？`, '提示', {
type: 'warning',
customClass: 'command-page-view-message-box',
confirmButtonClass: 'command-message-box-confirm',
--
Gitblit v1.9.3