From c48eafe8411adad734b57b424f5440284dbc85e3 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Nov 2025 16:15:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
src/views/dataCenter/components/searchData.vue | 51 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 35 insertions(+), 16 deletions(-)
diff --git a/src/views/dataCenter/components/searchData.vue b/src/views/dataCenter/components/searchData.vue
index 1445f58..1988466 100644
--- a/src/views/dataCenter/components/searchData.vue
+++ b/src/views/dataCenter/components/searchData.vue
@@ -1,9 +1,10 @@
<template>
<div class="search-box-test">
<el-form :model="searchForm" inline>
- <div class="search-first">
+ <el-row :gutter="24">
+ <el-col :span="4">
<el-form-item label="行政区划:" >
- <el-tree-select
+ <el-tree-select
:disabled="viewDetailsDisabled"
popper-class="custom-tree-select"
v-model="searchForm.areaCode"
@@ -15,6 +16,8 @@
@node-click="handleNodeClick"
/>
</el-form-item>
+ </el-col>
+ <el-col :span="4">
<el-form-item label="所属机巢:">
<el-select
:disabled="viewDetailsDisabled"
@@ -32,10 +35,14 @@
/>
</el-select>
</el-form-item>
+ </el-col>
+ <el-col :span="4">
<el-form-item label="任务名称:">
<el-input :disabled="viewDetailsDisabled" v-model="searchForm.jobName" placeholder="请输入" clearable />
</el-form-item>
- <el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="选择日期:">
<el-date-picker
:disabled="viewDetailsDisabled"
popper-class="custom-date-picker"
@@ -60,6 +67,8 @@
}"
/>
</el-form-item>
+ </el-col>
+ <el-col :span="4">
<el-form-item label="文件格式:">
<el-select
:disabled="foldersDisabled || viewDetailsDisabled"
@@ -78,9 +87,11 @@
/>
</el-select>
</el-form-item>
+ </el-col>
+ <el-col :span="4">
<el-form-item label="文件类别:">
<el-select
-
+
:disabled="disabled || foldersDisabled || viewDetailsDisabled"
:teleported="false"
v-model="searchForm.photoType"
@@ -97,16 +108,17 @@
/>
</el-select>
</el-form-item>
- </div>
- <div class="search-first">
+ </el-col>
+ <el-col :span="4">
<el-form-item label="文件名称:">
<el-input :disabled="foldersDisabled || viewDetailsDisabled" v-model="searchForm.name" placeholder="请输入" clearable />
</el-form-item>
- <div class="search-btn">
+ </el-col>
+ <el-col :span="4">
<el-button type="primary" icon="el-icon-search" @click="handleSearch">搜索</el-button>
<el-button icon="el-icon-refresh" @click="handleReset">清空</el-button>
- </div>
- </div>
+ </el-col>
+ </el-row>
<div class="search-first">
<div class="search-btn">
<!-- <el-button type="primary" icon="el-icon-download" @click="allDownloadFun"-->
@@ -283,7 +295,7 @@
machineData.value = '';
const droneList = await getDeviceRegion({ areaCode: data.id });
machineData.value = droneList?.data?.data;
-
+
// 默认选中值
if (signDevice_sn.value) {
searchForm.deviceSn = signDevice_sn.value;
@@ -292,7 +304,7 @@
deptData.value = [];
getDeptsByAreaCode();
handleSearch();
-
+
};
// 所属部门信息
const getDeptsByAreaCode = () => {
@@ -347,21 +359,23 @@
function cancelDownload() {
cancelDownloadApi({ type:'htsjzx' }).then(res =>{
ElMessage.success('取消成功')
+ }).catch(e =>{
+ EventBus.emit('useGlobalWS-messageHandler', {biz_code: 'DOWNLOAD_PROGRESS',data:{status: 'CANCELLED',type:'htsjzx'}})
})
}
// 切换文件夹
const handleswitchFolders =()=>{
- emit('handleswitchFolders');
+ emit('handleswitchFolders');
}
// 返回按钮
const handleBack = ()=>{
- emit('handleBack');
+ emit('handleBack');
}
onMounted(() => {
requestDockInfo();
getDownloadStatusApi({type: 'htsjzx'}).then(res =>{
if (!['CANCELLED','COMPLETED'].includes(res.data.data?.status || 'COMPLETED')){
- EventBus.emit('useDownloadWs-messageHandler',res.data.data)
+ EventBus.emit('useGlobalWS-messageHandler',res.data.data)
}
})
});
@@ -467,12 +481,17 @@
}
.el-form-item {
- margin-bottom: 0;
- width: 233px;
+ //margin-bottom: 0;
+ width: 100%;
.el-form-item__label {
color: #363636;
line-height: 32px;
+ width: 80px;
+ }
+ .el-form-item__content {
+ display: flex;
+ flex: 1;
}
}
}
--
Gitblit v1.9.3