Merge branch 'master' into debug

src/hooks/chart/useChartRender.ts

@@ -104,7 +104,7 @@ export const useChartRender = (Data,lang='zh',) => {
   let chartOptions:any;
 
   //eta图
-  if ([1,11].includes(Data.ChartInfo.Source)) {
+  if ([1,11,14,15].includes(Data.ChartInfo.Source)) {
     setLimitData(state.dataList,Data)
     const typeMap = {
       1: setDefaultLineOptions,

src/request/api.ts

@@ -96,7 +96,7 @@ interface IExcelParams {
 	FromScene: number;
 	ReferencedId:number;
 	Uuid: string;
-	AuthToken: string;
+	AuthToken: string
 }
 interface IFreshParams {
 	UniqueCode: string | any

src/views/chartShow/index.vue

@@ -40,48 +40,49 @@
       <i class="el-icon-warning"></i>哎吆，你的图飞了，赶快去找管理员救命吧~
     </div>
 
-    <!-- 图表来源说明 -->
-    <div 
-      class="chart-bottom-info bootom-source"
-      v-if="haveAuth&&chartInfo.Instructions&&JSON.parse(chartInfo.Instructions).isShow
-    ">
-
-      <!-- 图表说明 -->
+    <template v-if="haveAuth">
+      <!-- 图表来源说明 -->
       <div 
-        class="chart-instruction text_oneLine" 
-        v-text="JSON.parse(chartInfo.Instructions).text"
-        :style="`
-          color: ${JSON.parse(chartInfo.Instructions).color};
-          font-size: ${ JSON.parse(chartInfo.Instructions).fontSize }px
-        `"
-      ></div>
-    </div>
-
-    <div class="bootom-source" v-if="haveAuth">
-
-      <!-- 自定义来源 -->
-      <div class="source-box">
-        <div class="chart-source text_oneLine" 
-          v-if="chartInfo.SourcesFrom&&JSON.parse(chartInfo.SourcesFrom).isShow"
+        class="chart-bottom-info bootom-source"
+        v-if="chartInfo.Instructions&&JSON.parse(chartInfo.Instructions).isShow
+      ">
+        <!-- 图表说明 -->
+        <div 
+          class="chart-instruction text_oneLine" 
+          v-text="JSON.parse(chartInfo.Instructions).text"
           :style="`
               color: ${ JSON.parse(chartInfo.SourcesFrom).color };
               font-size: ${ JSON.parse(chartInfo.SourcesFrom).fontSize }px;
           `"
-        >
-            source：<em>{{ JSON.parse(chartInfo.SourcesFrom).text}}</em>
-        </div>
+        ></div>
       </div>
+      
 
+      <div class="bootom-source">
+        <!-- 自定义来源 -->
+        <div class="source-box">
+          <div class="chart-source text_oneLine" 
+            v-if="chartInfo.SourcesFrom&&JSON.parse(chartInfo.SourcesFrom).isShow"
+            :style="`
+                color: ${ JSON.parse(chartInfo.SourcesFrom).color };
+                font-size: ${ JSON.parse(chartInfo.SourcesFrom).fontSize }px;
+            `"
+          >
+              source：<em>{{ JSON.parse(chartInfo.SourcesFrom).text}}</em>
+          </div>
+        </div>
 
-      <ul class="right-action" @click.stop>
-        <li v-if="$route.query.source==='ybxcx'&&$route.query.isETAForumChart!='true'"><collectBtn/></li>
-        <!-- eta小程序报告详情中的有收藏 -->
-        <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'&&$route.query.isETAForumChart!='true'"><i class="el-icon-refresh"/>刷新</li>
-      </ul>
-    </div>
+
+        <ul class="right-action" @click.stop>
+          <li v-if="$route.query.source==='ybxcx'&&$route.query.isETAForumChart!='true'"><collectBtn/></li>
+          <!-- eta小程序报告详情中的有收藏 -->
+          <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'&&$route.query.isETAForumChart!='true'"><i class="el-icon-refresh"/>刷新</li>
+        </ul>
+      </div>
+    </template>
   </div>
 </template>
 
@@ -162,9 +163,7 @@ export default defineComponent({
         haveData.value = true;
         haveAuth.value = Data.IsAuth;
 
-        //处理英文研报英文设置不全就展示中文
-        // setLangFromEnReport();
-        document.title = language.value==='zh'?Data.ChartInfo.ChartName:Data.ChartInfo.ChartNameEn||Data.ChartInfo.ChartName;
+        document.title = language.value==='zh'?Data.ChartInfo.ChartName:(Data.ChartInfo.ChartNameEn||Data.ChartInfo.ChartName);
 
         if(!Data.IsAuth) return
 

src/views/sheetShow/index.vue

@@ -5,11 +5,11 @@ import { SheetApi } from '@/request/api';
 import sheet from '@/components/sheet.vue'
 import { isMobile } from '@/utils/utils';
 import { IUnknowObject } from '@/types';
-import { ElMessage } from 'element-plus';
-import NoAuth from '@/components/noAuth.vue';
 import { useResizeTable } from '@/hooks/sheet/useResizeTable';
 
 const { postSheetHeightMsg } = useResizeTable();
+import { ElMessage, valueEquals } from 'element-plus';
+import NoAuth from '@/components/noAuth.vue';
 
 const route = useRoute();
 const code = ref(route.query.code || '')
@@ -87,7 +87,7 @@ const refreshSheet = async()=>{
     <template v-if="haveAuth">
       <sheet 
         :data="info.TableInfo.TableDataList" 
-        :config="info.Config"
+        :config="info.Config" 
         :sceneConfig="info.ReferencedExcelConfig"
       />
       <div class="tool sheet-bottom">