Merge branch 'master' of http://8.136.199.33:3000/eta_front/eta_chart_front

src/request/api.ts

@@ -66,7 +66,14 @@ export const ChartApi = {
 	chartCollect:params=>{
 		return post('/chart/dw/collect',params)
 	},
-
+	/**
+	 * 获取社区图表详情
+	 * @param params UniqueCode 
+	 * @returns 
+	 */
+	getForumChart: (params:IChartParams) => {
+		return get('/eta_forum/chart/common/detail',params);
+	},
 	
 	// 海通
 	/**

src/views/chartShow/index.vue

@@ -71,12 +71,12 @@
 
 
       <ul class="right-action" @click.stop>
-        <li v-if="$route.query.source==='ybxcx'"><collectBtn/></li>
+        <li v-if="$route.query.source==='ybxcx'&&$route.query.isETAForumChart!='true'"><collectBtn/></li>
         <!-- eta小程序报告详情中的有收藏 -->
-        <li v-if="$route.query.source==='etamini'" @click="handleChangeChartCollect">{{IsCollect?'取消收藏':'收藏'}}</li>
-        <li v-if="$route.query.source==='ht_chart'"><collectBtnHT/></li>
+        <li v-if="$route.query.source==='etamini'&&$route.query.isETAForumChart!='true'" @click="handleChangeChartCollect">{{IsCollect?'取消收藏':'收藏'}}</li>
+        <li v-if="$route.query.source==='ht_chart'&&$route.query.isETAForumChart!='true'"><collectBtnHT/></li>
         <li @click="copyUrl" class="copy" v-if="isShare"><i class="el-icon-share"/>分享</li>
-        <li @click="refreshChart" v-if="chartInfo.UniqueCode&&$route.query.source!=='smartReportGetImg'"><i class="el-icon-refresh"/>刷新</li>
+        <li @click="refreshChart" v-if="chartInfo.UniqueCode&&$route.query.source!=='smartReportGetImg'&&$route.query.isETAForumChart!='true'"><i class="el-icon-refresh"/>刷新</li>
       </ul>
     </div>
   </div>
@@ -147,7 +147,8 @@ export default defineComponent({
         if(route.query.source==='ht_chart'){
           params.MiniSource='ht'
         }
-        const { Data } = await ChartApi.getChart(params);
+        // 如果是社区图表
+        const { Data } =route.query.isETAForumChart=='true'?await ChartApi.getForumChart(params) : await ChartApi.getChart(params);
         loading.value = false;
         state.chartInfo = Data.ChartInfo;
         IsCollect.value=Data.IsCollect
@@ -163,7 +164,10 @@ export default defineComponent({
         type === 'refresh' && ElMessage.success('刷新成功');
 
         //水印配置
+
         nextTick(()=>{
+          // 社区图表不加水印
+          if(route.query.isETAForumChart=='true') return
           const markDom = document.querySelector('.mark')
           Data.WaterMark&&(markDom.style.backgroundImage = `url(${Data.WaterMark})`)
         })