From 052d0e8bd9c1d8e0d243a166bedf761fc5a7a891 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 14 Jan 2026 16:38:00 +0800
Subject: [PATCH] feat:通用弹窗样式调整
---
applications/drone-command/src/views/detectionCountermeasure/taskSchedule/index.vue | 32 ++++++++++++++------------------
1 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/applications/drone-command/src/views/detectionCountermeasure/taskSchedule/index.vue b/applications/drone-command/src/views/detectionCountermeasure/taskSchedule/index.vue
index ec979d4..5cc07be 100644
--- a/applications/drone-command/src/views/detectionCountermeasure/taskSchedule/index.vue
+++ b/applications/drone-command/src/views/detectionCountermeasure/taskSchedule/index.vue
@@ -30,10 +30,10 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="设备编号" prop="deviceCode">
+ <el-form-item label="设备编号" prop="deviceSn">
<el-input
class="ztzf-data-cockpit-search-input"
- v-model="searchParams.deviceCode"
+ v-model="searchParams.deviceSn"
placeholder="请输入"
clearable
@clear="handleSearch"
@@ -57,14 +57,14 @@
<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="140" label="设备名称" />
- <el-table-column prop="deviceCode" show-overflow-tooltip width="140" label="设备编码" />
- <el-table-column prop="deviceStatus" show-overflow-tooltip width="100" label="设备状态">
+ <el-table-column prop="deviceSn" show-overflow-tooltip width="140" label="设备编码" />
+ <!-- <el-table-column prop="deviceStatus" show-overflow-tooltip width="100" label="设备状态">
<template v-slot="{ row }">
- {{ getDeviceStatusLabel(row.deviceStatus) }}
+ {{ getDictLabel(row.deviceStatus, dictObj.deviceStatus) }}
</template>
- </el-table-column>
- <el-table-column prop="areaDivideName" show-overflow-tooltip width="120" label="区域" />
- <el-table-column prop="defenseSceneName" show-overflow-tooltip width="120" label="场景" />
+ </el-table-column>-->
+ <el-table-column prop="areaName" show-overflow-tooltip width="120" label="区域" />
+ <el-table-column prop="defenseZoneName" show-overflow-tooltip width="120" label="场景" />
<el-table-column show-overflow-tooltip width="200" label="调度位置">
<template v-slot="{ row }">{{ row.longitude }}, {{ row.latitude }}</template>
</el-table-column>
@@ -77,12 +77,12 @@
<el-table-column prop="dispatchContent" show-overflow-tooltip width="160" label="调度内容" />
<el-table-column prop="dispatchResult" show-overflow-tooltip width="160" label="调度结果" />
<el-table-column prop="disposeMeasure" show-overflow-tooltip width="160" label="处理措施" />
- <el-table-column label="操作" class-name="operation-btns" fixed="right" width="120">
+ <!-- <el-table-column label="操作" class-name="operation-btns" fixed="right" width="120">
<template v-slot="{ row }">
<el-link @click="openForm('edit', row)">编辑</el-link>
<el-link @click="handleDelete(row)">删除</el-link>
</template>
- </el-table-column>
+ </el-table-column>-->
</el-table>
</div>
@@ -118,12 +118,13 @@
import { fwDeviceListApi } from '@/views/basicManage/deviceStock/fwDevice'
import { getDictionaryByCode } from '@/api/system/dictbiz'
import FormDiaLog from './FormDiaLog.vue'
+import { getDictLabel } from '@ztzf/utils'
// 初始化查询参数
const initSearchParams = () => ({
deviceId: '', // 设备名称
deviceType: '', // 设备类型
- deviceCode: '', // 设备编号
+ deviceSn: '', // 设备编号
current: 1, // 当前页
size: 10, // 每页大小
})
@@ -137,18 +138,13 @@
const dialogVisible = ref(false)
const dictObj = ref({
deviceType: [], // 设备类型
+ deviceStatus: [], // 设备状态
})
const sceneList = ref([]) // 场景列表
const deviceList = ref([]) // 设备列表
// 注入字典到子组件
provide('dictObj', dictObj)
-
-// 获取设备状态标签
-function getDeviceStatusLabel(status) {
- const statusMap = { 0: '离线', 1: '在线' }
- return statusMap[status] || status
-}
// 格式化调度日期
function formatDispatchDate(row) {
@@ -209,7 +205,7 @@
// 加载字典数据
function getDictList() {
- getDictionaryByCode('deviceType').then(res => {
+ getDictionaryByCode('deviceType,deviceStatus').then(res => {
dictObj.value = res.data.data
})
}
--
Gitblit v1.9.3