Merge remote-tracking branch 'origin/master'

张含笑

2026-01-12 4d575230604985f9fec9ebf0d1c4d467d7b8f639

Merge remote-tracking branch 'origin/master'

 applications/drone-command/src/views/aICrudTemplate/index.vue

@@ -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>
@@ -159,18 +159,6 @@
    getList()
}

// 查看
function handleView(row) {
    dialogVisible.value = true
    dialogRef.value?.open({ mode: 'view', row: { ...row } })
}

// 编辑
function handleEdit(row) {
    dialogVisible.value = true
    dialogRef.value?.open({ mode: 'edit', row: { ...row } })
}

// 删除
async function handleDelete(row) {
    const tips = row ? '该条' : '选中的项'
@@ -213,10 +201,12 @@
    })
}

// 新增
function handleAdd() {
// 新增/编辑/查看 弹框
function openForm(mode, row) {
    dialogVisible.value = true
    dialogRef.value?.open({ mode: 'add' })
    nextTick(() => {
        dialogRef.value?.open({ mode, row })
    })
}

onMounted(() => {

 applications/drone-command/src/views/areaManage/precinctInfo/index.vue

@@ -16,7 +16,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="danger" :disabled="!selectedIds.length" @click="handleDelete()">删除</el-button>
        </div>
        <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
@@ -30,7 +30,7 @@
            <el-table-column prop="contactPhone" label="联系方式" />
            <el-table-column label="操作">
                <template v-slot="{ row }">
                    <el-link @click="handleEdit(row)" type="warning">编辑</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>
@@ -93,18 +93,6 @@
    getList()
}

// 查看
function handleView(row) {
    dialogVisible.value = true
    dialogRef.value?.open({ mode: 'view', row: { ...row } })
}

// 编辑
function handleEdit(row) {
    dialogVisible.value = true
    dialogRef.value?.open({ mode: 'edit', row: { ...row } })
}

// 删除
async function handleDelete(row) {
    const tips = row ? '该条' : '选中的项'
@@ -122,9 +110,11 @@
}

// 新增
function handleAdd() {
function openForm(mode, row) {
    dialogVisible.value = true
    dialogRef.value?.open({ mode: 'add' })
    nextTick(() => {
        dialogRef.value?.open({ mode, row })
    })
}

onMounted(() => {