Merge branch 'xinyan' into test

src/views/googleTrends/components/createKeyword.vue

@@ -9,6 +9,7 @@ import { ref } from 'vue';
 import { VxeGridInstance } from 'vxe-table';
 
 const emit = defineEmits([ 'updateKeyword' ]);
+const refreshView = inject('refreshView');
 
 const keywordInput = ref('');
 const btnLoading = ref(false);
@@ -117,7 +118,11 @@ async function handleAdd() {
     if (resp.code === 2000) {
       ElMessage.success('关键词添加成功');
       keywordInput.value = ''; // 清空输入框
-      await getList();
+      // await getList();
+      // 创建成功后调用刷新父组件的方法
+      if (refreshView) {
+        refreshView();
+      }
     }
   } catch (error) {
     ElMessage.error('添加关键词失败，请重试！'); // 提示失败消息
@@ -160,7 +165,11 @@ async function handleDelete(row) {
     const resp = await deleteKeyword({ keyword: row.keyword });
     if (resp.code === 2000) {
       ElMessage.success('关键词删除成功');
-      await getList();
+      // await getList();
+      // 删除成功后调用刷新父组件的方法
+      if (refreshView) {
+        refreshView();
+      }
     }
   } catch (error) {
     ElMessage.error('删除关键词失败，请重试！'); // 提示失败消息

src/views/googleTrends/components/keywordTrendsChart.vue

@@ -116,15 +116,6 @@ async function initLine() {
   await loadData();
   chartObj = echarts.init(chartRef.value);
   option.dataset.source = dataSet.value;
-  // option.series = defaultKeywords.value.map((keyword, index) => ({
-  //   id: index,
-  //   name: keyword,
-  //   type: 'line',
-  //   stack: 'Total',
-  //   itemStyle: {
-  //     color: colors[index]
-  //   }
-  // }));
   chartObj.setOption(option, true);
 }
 
@@ -150,9 +141,7 @@ async function loadData() {
         color: colors[index]
       }
     }));
-    console.log("=>(keywordTrendsChart.vue:150) option.series", option.series);
   }catch (e) {
-    console.log("=>(keywordTrendsChart.vue:153) e", e);
     ElMessage.error('加载数据失败，请稍后再试');
   }
   finally {

src/views/googleTrends/index.vue

@@ -23,9 +23,7 @@ function updateKeywordList(newKeywords) {
   <el-card class="mt-5 mx-2" v-loading="loading" style="height: 600px;">
     <KeywordTrendsChart v-if="keywordList.length > 0" :keywordList="keywordList"></KeywordTrendsChart>
   </el-card>
-  <!--<el-card class="mt-5 mx-2">-->
-    <CreateKeyword @updateKeyword="updateKeywordList"></CreateKeyword>
-  <!--</el-card>-->
+  <CreateKeyword @updateKeyword="updateKeywordList"></CreateKeyword>
 </template>
 
 <style scoped>