Merge remote-tracking branch 'origin/master'

张含笑

2026-01-14 46f71f1985eabbf84926d6416659370f1e8c8c3e

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

@@ -1,79 +1,75 @@
<template>
   <basic-container>
      <el-form ref="queryParamsRef" :model="searchParams">
         <el-row :gutter="16">
            <el-col :span="4">
               <el-form-item label="区域名称" prop="areaName">
                  <el-input v-model="searchParams.areaName" placeholder="请输入" clearable @clear="handleSearch" />
               </el-form-item>
            </el-col>
            <el-col :span="4">
               <el-form-item label="区域类型" prop="areaType">
                  <el-select v-model="searchParams.areaType" placeholder="请选择" clearable @change="handleSearch">
                     <el-option
                        v-for="item in dictObj.areaType"
                        :key="item.dictKey"
                        :label="item.dictValue"
                        :value="item.dictKey"
                     />
                  </el-select>
               </el-form-item>
            </el-col>
            <el-col :span="4">
               <el-form-item>
                  <el-button @click="resetForm">重置</el-button>
                  <el-button type="primary" @click="handleSearch">查询</el-button>
               </el-form-item>
            </el-col>
         </el-row>
      <el-form ref="queryParamsRef" :model="searchParams" class="ztzf-page-history-search">
         <el-form-item label="区域名称" prop="areaName">
            <el-input class="ztzf-data-cockpit-search-input" v-model="searchParams.areaName" placeholder="请输入"
               clearable @clear="handleSearch" />
         </el-form-item>

         <el-form-item label="区域类型" prop="areaType">
            <el-select class="ztzf-data-cockpit-select" popper-class="ztzf-data-cockpit-select-popper"
               v-model="searchParams.areaType" placeholder="请选择" clearable @change="handleSearch">
               <el-option v-for="item in dictObj.areaType" :key="item.dictKey" :label="item.dictValue"
                  :value="item.dictKey" />
            </el-select>
         </el-form-item>

         <el-form-item class="history-search-actions">
            <el-button :icon="RefreshRight" @click="resetForm"></el-button>
            <el-button class="search-btn" :icon="Search" @click="handleSearch"></el-button>
         </el-form-item>
      </el-form>
      <div>
         <el-button type="primary" @click="openForm('add')">新增</el-button>

      <div class="ztzf-table-toolbar">
         <el-button :icon="Plus" color="#284FE3" 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">
         <el-table-column type="selection" width="55" />
         <el-table-column type="index" width="60" label="序号" />
         <el-table-column prop="areaName" label="区域名称" />
         <el-table-column label="区域位置">
            <template v-slot="{ row }">
               {{ formatLocation(row) }}
            </template>
         </el-table-column>
         <el-table-column prop="areaSize" label="区域面积(k㎡)" />
         <el-table-column prop="areaType" label="区域类型">
            <template v-slot="{ row }">
               {{ getDictLabel(row.areaType, dictObj.areaType) }}
            </template>
         </el-table-column>
         <el-table-column prop="triggerCondition" label="触发条件" />
         <el-table-column prop="responseMechanism" label="响应机制" />
         <el-table-column prop="controlLevel" label="管控级别">
            <template v-slot="{ row }">
               {{ getDictLabel(row.controlLevel, dictObj.controlLevel) }}
            </template>
         </el-table-column>
         <el-table-column prop="policeStationName" label="关联派出所" />
         <el-table-column label="可飞行时间段">
            <template v-slot="{ row }">
               {{ formatFlyDate(row) }}
            </template>
         </el-table-column>
         <el-table-column label="操作">
            <template v-slot="{ row }">
               <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>
      </el-table>
      <div>
         <el-pagination
            v-model:current-page="searchParams.current"
            v-model:page-size="searchParams.size"
            :total="total"
            @change="getList"
         />

      <div class="ztzf-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
         <div class="ztzf-table-content ztzf-table-content-bg">
            <el-table class="ztzf-data-cockpit-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="areaName" show-overflow-tooltip width="150" label="区域名称" />
               <el-table-column show-overflow-tooltip width="160" label="区域位置">
                  <template v-slot="{ row }">
                     {{ formatLocation(row) }}
                  </template>
               </el-table-column>
               <el-table-column prop="areaSize" show-overflow-tooltip width="130" label="区域面积(k㎡)" />
               <el-table-column prop="areaType" show-overflow-tooltip width="120" label="区域类型">
                  <template v-slot="{ row }">
                     {{ getDictLabel(row.areaType, dictObj.areaType) }}
                  </template>
               </el-table-column>
               <el-table-column prop="triggerCondition" show-overflow-tooltip width="130" label="触发条件" />
               <el-table-column prop="responseMechanism" show-overflow-tooltip width="130" label="响应机制" />
               <el-table-column prop="controlLevel" show-overflow-tooltip width="120" label="管控级别">
                  <template v-slot="{ row }">
                     {{ getDictLabel(row.controlLevel, dictObj.controlLevel) }}
                  </template>
               </el-table-column>
               <el-table-column prop="policeStationName" show-overflow-tooltip width="140" label="关联派出所" />
               <el-table-column show-overflow-tooltip width="160" label="可飞行时间段">
                  <template v-slot="{ row }">
                     {{ formatFlyDate(row) }}
                  </template>
               </el-table-column>
               <el-table-column label="操作" class-name="operation-btns">
                  <template v-slot="{ row }">
                     <el-link @click="openForm('view', row)">查看</el-link>
                     <el-link @click="openForm('edit', row)">编辑</el-link>
                     <el-link @click="handleDelete(row)">删除</el-link>
                  </template>
               </el-table-column>
            </el-table>
         </div>

         <div class="ztzf-table-pagination">
            <el-pagination popper-class="ztzf-data-cockpit-select-popper"
               v-model:current-page="searchParams.current" v-model:page-size="searchParams.size"
               layout="total, prev, pager, next, sizes" :total="total" @change="getList" />
         </div>
      </div>

      <FormDiaLog v-if="dialogVisible" v-model="dialogVisible" ref="dialogRef" @success="getList" />
@@ -81,6 +77,7 @@
</template>

<script setup>
import { Search, RefreshRight, Plus } from '@element-plus/icons-vue'
import { nextTick, onMounted, ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { fwAreaDividePageApi, fwAreaDivideRemoveApi } from './partitionApi'
@@ -105,7 +102,7 @@
const dialogVisible = ref(false)

// 获取列表
async function getList() {
async function getList () {
   loading.value = true
   try {
      const res = await fwAreaDividePageApi(searchParams.value)
@@ -117,20 +114,20 @@
}

// 查询
function handleSearch() {
function handleSearch () {
   searchParams.value.current = 1
   getList()
}

// 重置查询
function resetForm() {
function resetForm () {
   queryParamsRef.value?.resetFields()
   searchParams.value.current = 1
   getList()
}

// 删除
async function handleDelete(row) {
async function handleDelete (row) {
   const tips = row ? '该条' : '选中的项'
   await ElMessageBox.confirm(`确认删除${tips}吗？`, '提示', { type: 'warning' })
   const ids = row ? row.id : selectedIds.value.join(',')
@@ -141,16 +138,16 @@
}

// 勾选值设置
function handleSelectionChange(rows) {
function handleSelectionChange (rows) {
   selectedIds.value = rows.map(item => item.id)
}

function formatLocation(row) {
function formatLocation (row) {
   if (row?.longitude == null || row?.latitude == null) return ''
   return `${row.longitude}, ${row.latitude}`
}

function formatFlyDate(row) {
function formatFlyDate (row) {
   if (!row?.flyDateStart && !row?.flyDateEnd) return ''
   return `${row.flyDateStart || '-'} ~ ${row.flyDateEnd || '-'}`
}
@@ -170,7 +167,7 @@
}

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