diff --git a/src/views/datascreen/index.vue b/src/views/datascreen/index.vue
index 5d2e479..0df389a 100644
--- a/src/views/datascreen/index.vue
+++ b/src/views/datascreen/index.vue
@@ -134,28 +134,28 @@
                 <h2 class="bulebg">{{ consoleMap.completed }}</h2><span>办结总数</span>
               </li>
               <li>
-                <el-popover placement="right-start" title="办结率计算方式" :width="200" trigger="hover" show-after="500"
+                <el-popover placement="right-start" title="办结率计算方式" :width="200" trigger="hover" show-after="700"
                   :content="completedrateContent" popper-class="custom-popover-style">
                   <template #reference>
-                    <h2 class="yellowbg">{{ consoleMap.completedrate }}</h2>
+                    <h2 class="yellowbg" v-show="consoleMap.completedrate">{{ consoleMap.completedrate }}</h2>
                   </template>
                 </el-popover>
                 <span>办结率</span>
               </li>
               <li>
-                <el-popover placement="right-start" title="满意率计算方式" :width="200" trigger="hover" show-after="500"
+                <el-popover placement="right-start" title="满意率计算方式" :width="200" trigger="hover" show-after="700"
                   :content="satisfiedrateContent" popper-class="custom-popover-style">
                   <template #reference>
-                    <h2 class="bulebg">{{ consoleMap.satisfiedrate }}</h2>
+                    <h2 class="bulebg" v-show="consoleMap.satisfiedrate">{{ consoleMap.satisfiedrate }}</h2>
                   </template>
                 </el-popover>
                 <span>满意率</span>
               </li>
               <li>
-                <el-popover placement="right-start" title="解决率计算方式" :width="200" trigger="hover" show-after="500"
+                <el-popover placement="right-start" title="解决率计算方式" :width="200" trigger="hover" show-after="700"
                   :content="resolvedrateContent" popper-class="custom-popover-style">
                   <template #reference>
-                    <h2 class="bulebg">{{ consoleMap.resolvedrate }}</h2>
+                    <h2 class="yellowbg" v-show="consoleMap.resolvedrate">{{ consoleMap.resolvedrate }}</h2>
                   </template>
                 </el-popover>
                 <span>解决率</span>
@@ -276,14 +276,12 @@ body {
 
 
 <script lang="ts" setup>
-import { ref, onMounted, watch, onBeforeUpdate, onBeforeMount, onUnmounted } from 'vue'
+import { ref, onMounted, onUnmounted } from 'vue'
 import type { TabsPaneContext } from 'element-plus'
 import * as echarts from 'echarts';
 import chinaJSON from "./changsha.json";
-import yuhuaJSON from "@/static/430111.json";
 import { peopleMail, dutyDay, threeRate, consoleData, mailTypeRank, mailTrend, mapCountyData } from '@/api/datascreen'
 import { useRouter } from "vue-router";
-import { menuLists } from "~/api/perms/menu.ts";
 import DetailsPopup from './details.vue'
 const detailsRef = shallowRef<InstanceType<typeof DetailsPopup>>()
 const showDetails = ref(false)
diff --git a/src/views/work/Query.vue b/src/views/work/Query.vue
index 088158c..350d850 100644
--- a/src/views/work/Query.vue
+++ b/src/views/work/Query.vue
@@ -5,7 +5,7 @@
                 <el-row>
                     <el-col :span="6">
                         <el-form-item label="来信时间">
-                            <el-date-picker v-model="query.mailTime" value-format="YYYY-MM-DD" type="daterange"
+                            <el-date-picker v-model="query.mailTime" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
                                 range-separator="~" start-placeholder="开始日期" end-placeholder="结束日期"
                                 @change="handleMailTimeQuery" />
                         </el-form-item>
@@ -95,10 +95,21 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="内容查询">
+                                <el-input v-model="query.queryByContent" placeholder="请输入相关信件内容" clearable />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="编号查询">
+                                <el-input v-model="query.queryById" placeholder="请输入相关信件编号" clearable />
+                        </el-form-item>
+                    </el-col>
                 </el-row>
                 <div style="display: flex; justify-content: space-between; margin-bottom: 20px;">
                     <div>
                         <el-button type="primary" @click="checkMail">信件核对</el-button>
+                        <el-button type="primary" @click="outputSelectedMail" class="ml-4">信件导出</el-button>
                     </div>
                     <div>
                         <el-button type="primary" @click="getList">查询</el-button>
@@ -178,7 +189,6 @@
                     <el-checkbox v-model="checkAll" label="全选" style="margin-left: 15px;" :indeterminate="isCheckAll"
                         @click="handleCheckAll">全选</el-checkbox>
                     <span class="ml-4">({{ selectedCount }})条</span>
-                    <el-button type="primary" link @click="outputSelectedMail" class="ml-4">信件导出</el-button>
                 </div>
                 <div>
                     <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"