Merge branch 'debug' of http://8.136.199.33:3000/eta_front/eta_chart_front into debug

src/hooks/chart/useChartRender.ts

@@ -890,7 +890,7 @@ const setStackOrCombinChart = () => {
     const lineIndex = chartTheme ? index%chartTheme.lineOptionList.length : index
     let obj = {
       data: [] as any[],
-      type: chartStyle || item.ChartStyle,
+      type: chartInfo.ChartType!==3?(chartStyle || item.ChartStyle):ExtraConfig?.IsHeap==1?'area':((chartTheme && chartTheme.lineOptionList[lineIndex].lineType) || item.ChartStyle),
       yAxis: serie_yIndex,
       name,
       color: item.ChartColor,

src/views/chartShow/index.vue

@@ -172,7 +172,10 @@ export default defineComponent({
         type === 'refresh' && ElMessage.success('刷新成功');
 
         //水印配置
+
         nextTick(()=>{
+          // 社区图表不加水印
+          if(route.query.isETAForumChart=='true') return
           const markDom = document.querySelector('.mark') as HTMLElement
           Data.WaterMark&&(markDom.style.backgroundImage = `url(${Data.WaterMark})`)
         })