Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-26 beb95fb5fc166804056abafd70fc01ac27de7621

 applications/drone-command/src/views/basicManage/deviceStock/index.vue

@@ -6,10 +6,10 @@
         <DeviceChart3 />
      </div>

      <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-input"
               v-model="searchParams.deviceName"
               placeholder="请输入"
               clearable
@@ -19,8 +19,8 @@

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

         <el-form-item label="所属部门" prop="belongDept">
            <el-tree-select
               class="ztzf-data-cockpit-select"
               popper-class="ztzf-data-cockpit-tree-select-popper"
               class="command-select"
               popper-class="command-tree-select-popper"
               v-model="searchParams.belongDept"
               :data="deptTree"
               :props="treeProps"
@@ -54,14 +54,14 @@
         </el-form-item>
      </el-form>

      <div class="ztzf-table-toolbar">
      <div class="command-table-toolbar">
         <el-button :icon="Plus" color="#284FE3" type="primary" @click="handleAdd">设备建档</el-button>
         <!--         <el-button type="danger" :disabled="!selectedIds.length" @click="handleDelete()">删除</el-button>-->
      </div>

      <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">
      <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-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="deviceName" show-overflow-tooltip width="130" label="设备名称" />
@@ -99,9 +99,9 @@
            </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-select-popper"
               v-model:current-page="searchParams.current"
               v-model:page-size="searchParams.size"
               layout="total, prev, pager, next, sizes"
@@ -212,7 +212,12 @@
// 删除
async function handleDelete(row) {
   const tips = row ? '该条' : '选中的项'
   await ElMessageBox.confirm(`确认删除${tips}吗？`, '提示', { type: 'warning' })
   await ElMessageBox.confirm(`确认删除${tips}吗？`, '提示', { 
      type: 'warning',
      customClass: 'command-page-view-message-box',
      confirmButtonClass: 'command-message-box-confirm',
      cancelButtonClass: 'command-message-box-cancel',
   })
   const ids = row ? row.id : selectedIds.value.join(',')
   await fwDeviceRemoveApi({ ids })
   ElMessage.success('删除成功')