From 68297c618802650fce4bd200e4e384d91e3d8fa8 Mon Sep 17 00:00:00 2001
From: zhangrenyuan <18990852002@163.com>
Date: Tue, 5 Aug 2025 10:16:06 +0800
Subject: [PATCH] fix fuzzy query

---
 .env.development                        |  4 ++--
 src/views/consume/bean/articleVideo.vue | 14 ++++++------
 src/views/consume/bean/dieHardFan.vue   | 15 ++++++-------
 src/views/consume/bean/liveStream.vue   | 39 +++++++++++++++++++++++++--------
 4 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/.env.development b/.env.development
index 36d1127..3014602 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
-VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
+# VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
 # 测试环境
 #  VITE_API_BASE='http://18.143.76.3:10704/'
 #  VITE_API_BASE='http://192.168.9.52:10705/'
@@ -10,4 +10,4 @@ VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload
 # zhangyong
 #  VITE_API_BASE='http://192.168.3.83:8081/'
 # 李慧琳
-# VITE_API_BASE='http://localhost:8081/'
+    VITE_API_BASE='http://localhost:8081/'
diff --git a/src/views/consume/bean/articleVideo.vue b/src/views/consume/bean/articleVideo.vue
index 81e1433..86e325e 100644
--- a/src/views/consume/bean/articleVideo.vue
+++ b/src/views/consume/bean/articleVideo.vue
@@ -100,13 +100,13 @@ const getDept = async function () {
   }
 }
 
-// 频道模糊查询方法
-const filterChannel = (query) => {
-  if (query) {
-    return channels.value.filter(item => item.toLowerCase().includes(query.toLowerCase()));
-  }
-  return channels.value;
-};
+// // 频道模糊查询方法
+// const filterChannel = (query) => {
+//   if (query) {
+//     return channels.value.filter(item => item.toLowerCase().includes(query.toLowerCase()));
+//   }
+//   return channels.value;
+// };
 
 // 新增排序字段和排序方式
 const sortField = ref('')
diff --git a/src/views/consume/bean/dieHardFan.vue b/src/views/consume/bean/dieHardFan.vue
index a137349..b98237c 100644
--- a/src/views/consume/bean/dieHardFan.vue
+++ b/src/views/consume/bean/dieHardFan.vue
@@ -54,13 +54,13 @@ const getChannel = async function () {
     })
   }
 }
-// 频道模糊查询方法
-const filterChannel = (query) => {
-  if (query) {
-    return channels.value.filter(item => item.toLowerCase().includes(query.toLowerCase()));
-  }
-  return channels.value;
-};
+// // 频道模糊查询方法
+// const filterChannel = (query) => {
+//   if (query) {
+//     return channels.value.filter(item => item.toLowerCase().includes(query.toLowerCase()));
+//   }
+//   return channels.value;
+// };
 
 // 抽离类型选项到响应式数组
 const consumeTypes = ref([
@@ -480,7 +480,6 @@ const getTagText = (state) => {
                 filterable
                 allow-create
                 default-first-option
-                :filter-method="filterChannel"
               >
                 <el-option v-for="(item, index) in channels" :key="index" :label="item" :value="item" />
               </el-select>
diff --git a/src/views/consume/bean/liveStream.vue b/src/views/consume/bean/liveStream.vue
index c0cddbe..7d248b0 100644
--- a/src/views/consume/bean/liveStream.vue
+++ b/src/views/consume/bean/liveStream.vue
@@ -372,17 +372,38 @@ onMounted(async function () {
 
 
 const exportExcel = async function () {
+  console.log('1')
   const params = {
-  ...getObj.value,
-  "beanConsumeLive": {
-    ...beanConsumeLive.value,
-    sortField: sortField.value || 'consumeTime',
-    sortOrder: sortOrder.value || 'desc'
+    ...getObj.value,
+    "beanConsumeLive": {
+      ...beanConsumeLive.value,
+      jwcode: beanConsumeLive.value.jwcode ? String(beanConsumeLive.value.jwcode) : '',
+      dept: beanConsumeLive.value.dept || '',
+      type: beanConsumeLive.value.type || '',
+      gift: beanConsumeLive.value.gift || '',
+      liveChannel: beanConsumeLive.value.liveChannel || '',
+      liveName: beanConsumeLive.value.liveName || '',
+      startTime: beanConsumeLive.value.startTime || '',
+      endTime: beanConsumeLive.value.endTime || '',
+      sortField: sortField.value || 'consumeTime',
+      sortOrder: sortOrder.value || 'desc'
+    }
   }
-}
-  const res = await API({ url: '/export/exportLive', data: params })
-  if (res.code === 200) {
-    ElMessage.success('导出成功')
+  // 打印请求参数，方便调试
+  console.log('导出请求参数:', params);
+
+  try {
+    console.log('2')
+    const res = await API({ url: '/export/exportLive', data: params });
+    console.log('导出请求响应:', res);
+    if (res.code === 200) {
+      ElMessage.success('导出成功');
+    } else {
+      ElMessage.error(res.message || '导出失败，请稍后重试');
+    }
+  } catch (error) {
+    console.error('导出请求出错:', error);
+    ElMessage.error('导出失败，请稍后重试');
   }
 }
 const exportListVisible = ref(false)