From 89380e6260a75d1d3b94de687ebcc2f50d50659d Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 03 Feb 2026 15:44:33 +0800
Subject: [PATCH] feat:环境变量配置调整
---
applications/drone-command/src/views/basicManage/deviceStock/index.vue | 65 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 13 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/deviceStock/index.vue b/applications/drone-command/src/views/basicManage/deviceStock/index.vue
index 186fb45..38cb3d6 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">
@@ -62,7 +62,6 @@
<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="设备类型">
@@ -78,20 +77,26 @@
{{ 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 width="124" 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="运行状态">
+ <el-table-column prop="yxzt" show-overflow-tooltip width="96" label="运行状态">
<template v-slot="{ row }">
{{ getDictLabel(row.status, dictObj.deviceStatus) }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="yxzt" show-overflow-tooltip width="96" label="出库状态">
+ <template v-slot="{ row }">
+ {{ getDictLabel(row.trackStatus, trackStatusOptions) }}
</template>
</el-table-column>
<el-table-column label="操作" class-name="operation-btns">
<template v-slot="{ row }">
<el-link @click="handleView(row)">查看</el-link>
<el-link @click="handleEdit(row)">编辑</el-link>
- <el-link @click="outbound(row)">出库</el-link>
+ <el-link v-if="row.trackStatus === 0" @click="outbound(row)">出库</el-link>
+ <el-link v-else @click="returnDevice(row)">归还</el-link>
<el-link @click="scrap(row)" v-if="row.status !== 3">报废</el-link>
<!-- <el-link @click="handleDelete(row)" type="danger">删除</el-link>-->
</template>
@@ -111,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>
@@ -122,6 +127,7 @@
import { onMounted, ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { exportFwDeviceApi, fwDevicePageApi, fwDeviceRemoveApi } from '@/views/basicManage/deviceStock/fwDevice'
+import { fwDeviceUpdateTrackStatusApi } from '@/views/basicManage/deviceStock/fwDeviceTrackApi'
import FormDiaLog from './FormDiaLog.vue'
import { getDictionaryByCode } from '@/api/system/dictbiz'
import { getDeptTree } from '@/api/system/dept'
@@ -162,6 +168,18 @@
const exportLoading = ref(false)
provide('dictObj', dictObj)
provide('deptTree', deptTree)
+
+// 出库状态
+const trackStatusOptions = ref([
+ { dictKey: 0, dictValue: '未出库' },
+ { dictKey: 1, dictValue: '已出库' }
+])
+
+const updateKey = ref(0)
+function successFun() {
+ updateKey.value = updateKey.value + 1
+ getList()
+}
// 获取列表
async function getList() {
@@ -205,6 +223,22 @@
outboundDialogRef.value?.open({ mode: 'edit', row: { ...row } })
}
+// 归还
+async function returnDevice(row) {
+ await ElMessageBox.confirm(`确认归还吗？`, '提示', {
+ type: 'warning',
+ customClass: 'command-page-view-message-box',
+ confirmButtonClass: 'command-message-box-confirm',
+ cancelButtonClass: 'command-message-box-cancel',
+ })
+ const payload = {
+ deviceId: row.id
+ }
+ await fwDeviceUpdateTrackStatusApi(payload)
+ ElMessage.success('归还成功')
+ getList()
+}
+
function scrap(row) {
scrapDialogRef.value?.open({ mode: 'edit', row: { ...row } })
}
@@ -212,7 +246,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('删除成功')
--
Gitblit v1.9.3