From 3c314978e45dfe775b835a8dd7e1aad72dcdd190 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Tue, 18 Nov 2025 09:13:30 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v8.0/8.0.2' into feature/v8.0/8.0.3
---
src/views/dataCenter/components/searchData.vue | 4 ++--
src/views/dataCenter/dataCenter.vue | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/dataCenter/components/searchData.vue b/src/views/dataCenter/components/searchData.vue
index 1988466..8a4b29c 100644
--- a/src/views/dataCenter/components/searchData.vue
+++ b/src/views/dataCenter/components/searchData.vue
@@ -115,8 +115,8 @@
</el-form-item>
</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>
+ <el-button :disabled="viewDetailsDisabled" type="primary" icon="el-icon-search" @click="handleSearch">搜索</el-button>
+ <el-button :disabled="viewDetailsDisabled" icon="el-icon-refresh" @click="handleReset">清空</el-button>
</el-col>
</el-row>
<div class="search-first">
diff --git a/src/views/dataCenter/dataCenter.vue b/src/views/dataCenter/dataCenter.vue
index e9f9ec2..3f150a0 100644
--- a/src/views/dataCenter/dataCenter.vue
+++ b/src/views/dataCenter/dataCenter.vue
@@ -242,7 +242,7 @@
<div>
拍摄机巢：{{ dialogDetailList?.nestName ? dialogDetailList?.nestName : '--' }}
</div>
- <div v-if="dialogDetailList?.resultType != 4">
+ <div v-if="dialogDetailList?.resultType == 0">
照片位置：{{ _.round(dialogDetailList?.longitude, 3) }},{{
_.round(dialogDetailList?.latitude, 3)
}}
--
Gitblit v1.9.3