Merge branch 'wang' into test

src/views/searchTerm/targetingSearchTerm/index.vue

@@ -180,7 +180,7 @@ async function fetchSearchTermData() {
               value-format="YYYY-MM-DD"/>
         </div>
       </div>
-      <el-button icon="search" plain type="primary" @click="fetchTableData">查询</el-button>
+      <el-button icon="search" plain type="primary" @click="fetchTableData">查 询</el-button>
     </el-card>
     <el-card body-style="padding-top: 10px" class="mt-3" shadow="hover" style="border: none">
       <div v-loading="TargetingLoading" class="w-full overflow-hidden" style="height: 950px">

src/views/searchTerm/topSearchTermRank/index.vue

@@ -47,10 +47,6 @@ onBeforeMount(() => {
   fetchTableData();
 });
 
-watch([ weekDate, monthDate ], () => {
-  fetchTableData();
-});
-
 async function refreshTable() {
   currentPage.value = 1;
   pageSize.value = 10;
@@ -75,13 +71,13 @@ async function fetchTableData(isQuery = false) {
     return;
   }
   // await fetchTableData();
-  
+
   tableLoading.value = true;
-  
+
   if (isQuery) {
     currentPage.value = 1;
   }
-  
+
   const query = {
     page: currentPage.value,
     limit: pageSize.value,
@@ -166,7 +162,7 @@ function handleJump() {
       <div class="flex gap-5 flex-wrap">
         <div>
           <span class="font-medium mr-0.5">市 场 </span>
-          <el-select v-model="marketplaceSelect" style="width: 90px" @change="fetchTableData">
+          <el-select v-model="marketplaceSelect" style="width: 90px">
             <el-option
                 v-for="item in marketplaceOptions"
                 :key="item.value"
@@ -177,7 +173,7 @@ function handleJump() {
         </div>
         <div>
           <span class="font-medium mr-0.5">报告类型 </span>
-          <el-select v-model="reportTypeSelect" style="width: 90px" @change="fetchTableData">
+          <el-select v-model="reportTypeSelect" style="width: 90px">
             <el-option label="周度" value="weekly"/>
             <el-option label="月度" value="monthly"/>
           </el-select>
@@ -210,7 +206,7 @@ function handleJump() {
         <el-button :icon="Search" type="primary" @click="fetchTableData(true)">查 询</el-button>
         <el-button :icon="Refresh" @click="refreshTable">刷 新</el-button>
       </div>
-      
+
     </div>
     <div class="mt-6">
       <el-button :icon="TopRight" plain type="primary" @click="handleJump">搜索词管理</el-button>

src/views/searchTerm/topSearchTermTable/index.vue

@@ -45,7 +45,7 @@ onBeforeMount(() => {
 watch(dateDimension, () => {
   calculateDate();
   // console.log('==Date==', date.value[0], date.value[1]);
-  fetchTableData();
+  // fetchTableData();
 });
 
 /**