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/aICrudTemplate/index.vue | 34 ++++++++++++++--------------------
1 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/applications/drone-command/src/views/aICrudTemplate/index.vue b/applications/drone-command/src/views/aICrudTemplate/index.vue
index 81e0842..4c02b4d 100644
--- a/applications/drone-command/src/views/aICrudTemplate/index.vue
+++ b/applications/drone-command/src/views/aICrudTemplate/index.vue
@@ -35,8 +35,8 @@
<el-col :span="4">
<el-form-item label="时间">
<el-date-picker
- popper-class="ztzf-date-picker-popper"
- class="ztzf-date-picker"
+ popper-class="command-date-picker-popper"
+ class="command-date-picker"
v-model="dateRange"
type="daterange"
range-separator="至"
@@ -56,7 +56,7 @@
</el-row>
</el-form>
<div>
- <el-button type="primary" @click="handleAdd">新增</el-button>
+ <el-button type="primary" @click="openForm('add')">新增</el-button>
<el-button type="primary" @click="exportFile" :loading="exportLoading">导出</el-button>
<el-button type="danger" :disabled="!selectedIds.length" @click="handleDelete()">删除</el-button>
</div>
@@ -73,8 +73,8 @@
<el-table-column prop="deviceSpecification" label="规格" />
<el-table-column label="操作">
<template v-slot="{ row }">
- <el-link @click="handleView(row)" type="primary">查看</el-link>
- <el-link @click="handleEdit(row)" type="warning">编辑</el-link>
+ <el-link @click="openForm('view', row)" type="primary">查看</el-link>
+ <el-link @click="openForm('edit', row)" type="warning">编辑</el-link>
<el-link @click="handleDelete(row)" type="danger">删除</el-link>
</template>
</el-table-column>
@@ -88,7 +88,7 @@
/>
</div>
- <FormDiaLog ref="dialogRef" @success="getList" />
+ <FormDiaLog v-if="dialogVisible" v-model="dialogVisible" ref="dialogRef" @success="getList" />
</basic-container>
</template>
@@ -110,11 +110,12 @@
})
const searchParams = ref(initSearchParams()) // 查询参数
const total = ref(0) // 总条数
-const loading = ref(false) // 列表加载中
+const loading = ref(true) // 列表加载中
const list = ref([]) // 列表数据
const selectedIds = ref([]) // 勾选的设备ID列表
const queryParamsRef = ref(null) // 查询表单实例
const dialogRef = ref(null) // 弹框实例
+const dialogVisible = ref(null) // 弹框实例
const dictObj = ref({
deviceType: [], //设备类型
deviceAtt: [], //设备属性
@@ -156,16 +157,6 @@
queryParamsRef.value?.resetFields()
searchParams.value.current = 1
getList()
-}
-
-// 查看
-function handleView(row) {
- dialogRef.value?.open({ mode: 'view', row: { ...row } })
-}
-
-// 编辑
-function handleEdit(row) {
- dialogRef.value?.open({ mode: 'edit', row: { ...row } })
}
// 删除
@@ -210,9 +201,12 @@
})
}
-// 新增
-function handleAdd() {
- dialogRef.value?.open({ mode: 'add' })
+// 新增/编辑/查看 弹框
+function openForm(mode, row) {
+ dialogVisible.value = true
+ nextTick(() => {
+ dialogRef.value?.open({ mode, row })
+ })
}
onMounted(() => {
--
Gitblit v1.9.3