From 6a1a7eb218b09a59cca440c1eca0a01b96ce0e59 Mon Sep 17 00:00:00 2001
From: guanj <guan0550>
Date: Wed, 12 Nov 2025 14:35:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=B2=E5=8F=91=E7=9F=AD?=
 =?UTF-8?q?=E4=BF=A1=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/datePicker/index.vue           |  8 +++-
 .../VoltageSag_BJ/components/smsQueries.vue   | 37 +++++++++++++++----
 src/views/VoltageSag_BJ/index.vue             | 15 +++++---
 3 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/src/components/datePicker/index.vue b/src/components/datePicker/index.vue
index 454da2c..0289f28 100644
--- a/src/components/datePicker/index.vue
+++ b/src/components/datePicker/index.vue
@@ -58,11 +58,13 @@ const emit = defineEmits(["timeChangeInfo"]);
 interface Props {
   nextFlag?: boolean;
   theCurrentTime?: boolean;
+  setWatch?: boolean;
 }
 
 const props = withDefaults(defineProps<Props>(), {
   nextFlag: false,
   theCurrentTime: true,
+  setWatch: true,
 });
 
 const interval = ref(3);
@@ -573,8 +575,10 @@ function formatDate(date: Date): string {
 }
 
 watch(timeValue, async (newVal) => {
-  await store.dispatch("setTimeType", { type: interval, value: newVal });
-  await emit("timeChangeInfo");
+  if (props.setWatch) {
+    await store.dispatch("setTimeType", { type: interval, value: newVal });
+    await emit("timeChangeInfo");
+  }
 });
 
 defineExpose({
diff --git a/src/views/VoltageSag_BJ/components/smsQueries.vue b/src/views/VoltageSag_BJ/components/smsQueries.vue
index 00aa8ed..ae7fd90 100644
--- a/src/views/VoltageSag_BJ/components/smsQueries.vue
+++ b/src/views/VoltageSag_BJ/components/smsQueries.vue
@@ -1,10 +1,30 @@
 <template>
   <!--短信查询-->
-  <el-dialog    :close-on-click-modal="false" draggable v-model="machineVisible" :title="title" width="1200px"  :before-close="handleClose">
+  <el-dialog
+    :close-on-click-modal="false"
+    draggable
+    v-model="machineVisible"
+    :title="title"
+    width="1200px"
+    :before-close="handleClose"
+  >
     <div class="formBox">
       <div class="formLeft">
-        <datePicker ref="datePickerRef" />
-        <span>发送结果： </span>
+        <datePicker
+          :setWatch="false"
+          ref="datePickerRef"
+          style="width: 470px"
+        />
+        <span>关键字搜索： </span>
+        <el-input
+          size="small"
+          v-model="searchValue"
+          placeholder="请输入关键字"
+          clearable
+          style="width: 130px"
+        ></el-input>
+
+        <span class="ml20">发送结果： </span>
         <el-select
           size="small"
           v-model="state"
@@ -32,7 +52,8 @@
     </div>
     <div class="tableBox">
       <el-table
-      :scrollbar-always-on="true"   :data="tableData"
+        :scrollbar-always-on="true"
+        :data="tableData"
         height="500px"
         size="small"
         stripe
@@ -104,7 +125,7 @@ import { ElMessage } from "element-plus";
 import datePicker from "@/components/datePicker/index.vue";
 import { Search, Download } from "@element-plus/icons-vue";
 import table2excel from "js-table2excel";
-const emit= defineEmits(["close"]);
+const emit = defineEmits(["close"]);
 const machineVisible = ref(false);
 const title = ref("已发送短信查询");
 const datePickerRef = ref();
@@ -124,14 +145,15 @@ const inquire = () => {
     searchBeginTime: datePickerRef.value.timeValue[0],
     searchEndTime: datePickerRef.value.timeValue[1],
     sendResult: state.value,
+    searchValue: searchValue.value,
   }).then((res) => {
     total.value = res.data.total;
     tableData.value = res.data.records;
     loading.value = false;
   });
 };
+const searchValue = ref("");
 const open = (text: string, data?: any) => {
-  
   machineVisible.value = true;
   nextTick(() => {
     inquire();
@@ -183,6 +205,7 @@ const exportTable = () => {
     searchBeginTime: datePickerRef.value.timeValue[0],
     searchEndTime: datePickerRef.value.timeValue[1],
     sendResult: state.value,
+    searchValue: searchValue.value,
   }).then((res) => {
     setTimeout(() => {
       table2excel(
@@ -197,7 +220,7 @@ const exportTable = () => {
 };
 const handleClose = () => {
   emit("close", false);
-}
+};
 
 defineExpose({ open });
 </script>
diff --git a/src/views/VoltageSag_BJ/index.vue b/src/views/VoltageSag_BJ/index.vue
index 3e472eb..dec4a30 100644
--- a/src/views/VoltageSag_BJ/index.vue
+++ b/src/views/VoltageSag_BJ/index.vue
@@ -54,11 +54,8 @@
             </el-icon>
             <template #dropdown>
               <el-dropdown-menu>
-                <!-- <el-dropdown-item @click="handleClick('1')"
-                  >已发送短信查询</el-dropdown-item
-                >
-
-                <el-dropdown-item @click="handleClick('2')"
+             
+                <!--   <el-dropdown-item @click="handleClick('2')"
                   >模拟短信发送</el-dropdown-item
                 > -->
                 <el-dropdown-item @click="handleClick('3')"
@@ -70,6 +67,10 @@
                 <el-dropdown-item @click="handleClick('5')"
                   >台账导出</el-dropdown-item
                 >
+                   <el-dropdown-item @click="handleClick('1')"
+                  >已发送短信查询</el-dropdown-item
+                >
+
               </el-dropdown-menu>
             </template>
           </el-dropdown>
@@ -292,6 +293,10 @@ const handleClick = (type: string) => {
   smsQueriesFlag.value = true;
 
   setTimeout(() => {
+    if (type === "1") {
+      smsQueriesRef.value.open("已发送短信查询");
+    }
+
     if (type === "3") {
       ConfigRef.value.open("系统配置");
     }