Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web

shuishen

2026-01-17 86c2d61ba9d33f1886cfc904dcaf17f033e4c80a

 applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/index.vue

@@ -1,9 +1,9 @@
<template>
   <basic-container>
      <el-form ref="queryParamsRef" :model="searchParams" class="ztzf-page-history-search">
      <el-form ref="queryParamsRef" :model="searchParams" class="command-page-history-search">
         <el-form-item label="设备名称" prop="deviceName">
            <el-input
               class="ztzf-data-cockpit-search-input"
               class="command-data-cockpit-search-input"
               v-model="searchParams.deviceName"
               placeholder="请输入"
               clearable
@@ -13,8 +13,8 @@

         <el-form-item label="设备类型" prop="deviceType">
            <el-select
               class="ztzf-data-cockpit-select"
               popper-class="ztzf-data-cockpit-select-popper"
               class="command-data-cockpit-select"
               popper-class="command-data-cockpit-select-popper"
               v-model="searchParams.deviceType"
               placeholder="请选择"
               clearable
@@ -31,8 +31,8 @@

         <el-form-item label="设备状态" prop="deviceStatus">
            <el-select
               class="ztzf-data-cockpit-select"
               popper-class="ztzf-data-cockpit-select-popper"
               class="command-data-cockpit-select"
               popper-class="command-data-cockpit-select-popper"
               v-model="searchParams.deviceStatus"
               placeholder="请选择"
               clearable
@@ -53,9 +53,9 @@
         </el-form-item>
      </el-form>

      <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">
      <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-data-cockpit-table" :data="list">
               <el-table-column type="index" width="64" show-overflow-tooltip label="序号" />
               <el-table-column prop="deviceType" show-overflow-tooltip label="设备类型">
                  <template v-slot="{ row }">
@@ -78,23 +78,23 @@
               <el-table-column prop="manufacturer" show-overflow-tooltip label="厂商" />
               <el-table-column prop="contactPhone" show-overflow-tooltip label="联系方式" />
               <el-table-column prop="sceneName" show-overflow-tooltip label="所属场景" />
               <el-table-column label="设置配置" class-name="operation-btns">
               <el-table-column label="操作" class-name="operation-btns">
                  <template v-slot="{ row }">
                     <el-link @click="openForm('edit', row)" type="warning">配置接口</el-link>
                  </template>
               </el-table-column>
               <el-table-column label="操作" class-name="operation-btns">
               <!--               <el-table-column label="操作" class-name="operation-btns">
                  <template v-slot="{ row }">
                     <el-link @click="handleEdit(row)">编辑</el-link>
                     <el-link @click="handleDelete(row)" type="danger">删除</el-link>
                  </template>
               </el-table-column>
               </el-table-column>-->
            </el-table>
         </div>

         <div class="ztzf-table-pagination">
         <div class="command-table-pagination">
            <el-pagination
               popper-class="ztzf-data-cockpit-select-popper"
               popper-class="command-data-cockpit-select-popper"
               v-model:current-page="searchParams.current"
               v-model:page-size="searchParams.size"
               layout="total, prev, pager, next, sizes"
@@ -200,9 +200,9 @@
async function handleDelete(row) {
   await ElMessageBox.confirm('确认删除该设备吗？', '提示', {
      type: 'warning',
      customClass: 'ztzf-page-view-message-box',
      confirmButtonClass: 'ztzf-message-box-confirm',
      cancelButtonClass: 'ztzf-message-box-cancel',
      customClass: 'command-page-view-message-box',
      confirmButtonClass: 'command-message-box-confirm',
      cancelButtonClass: 'command-message-box-cancel',
   })
   await fwDeviceRemoveApi({ ids: row.id })
   ElMessage.success('删除成功')
@@ -210,11 +210,8 @@
}

function formatDeployLocation(row) {
   if (!row) return ''
   const longitude = row.deployLongitude ?? row.longitude
   const latitude = row.deployLatitude ?? row.latitude
   if (longitude == null || latitude == null) return ''
   return `${longitude}, ${latitude}`
   if (!row.longitude || !row.latitude) return ''
   return `${row.longitude}, ${row.latitude}`
}

onMounted(() => {