Browse Source

Merge branch 'ch/ht_3.1' into debug_ht

chenlei 3 months ago
parent
commit
b95370ae20
2 changed files with 6 additions and 4 deletions
  1. 2 2
      src/api/modules/report.js
  2. 4 2
      src/views/chart/Detail.vue

+ 2 - 2
src/api/modules/report.js

@@ -29,7 +29,7 @@ export default{
     return post('/myreport/pdf/collectCancel',params)
     return post('/myreport/pdf/collectCancel',params)
   },
   },
   // 获取收藏进入图表上一张下一张信息
   // 获取收藏进入图表上一张下一张信息
-  myChartLocate:()=>{
-    return get('/user/bookmark/chartList',{})
+  myChartLocate:params=>{
+    return get('/user/bookmark/chartList',params)
   }
   }
 }
 }

+ 4 - 2
src/views/chart/Detail.vue

@@ -63,9 +63,11 @@ const chartRenderUrl = computed(() => {
 let changeChartList=ref([])
 let changeChartList=ref([])
 async function getChangeChartList(){
 async function getChangeChartList(){
   // if(route.query.fromPage!=='myCollect') return
   // if(route.query.fromPage!=='myCollect') return
-  let res=await apiReport.myChartLocate()
+  let res=await apiReport.myChartLocate({
+    key: route.query.searchKey,
+  })
   if(res.Ret===200){
   if(res.Ret===200){
-    changeChartList.value=res.data.Data||[]
+    changeChartList.value=res.data||[]
   }
   }
 }
 }
 getChangeChartList()
 getChangeChartList()