Merge branch 'eta2.4.5' into debug

src/components/noAuth.vue

@@ -0,0 +1,37 @@
+
+<script setup lang="ts">
+import { ref } from 'vue'
+
+const props = defineProps({
+  text: {
+    type: String,
+    default: '暂无权限'
+  }
+})
+
+</script>
+<template>
+  <div class="no-auth-wapper">
+    <div>
+      <img
+        src="@/assets/img/no_auth.png"
+        alt=""
+      />
+      <span>{{text}}</span>
+    </div>
+  </div>
+</template>
+<style scoped lang="less">
+.no-auth-wapper {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  text-align: center;
+  color: #666;
+  img {
+    display: block;
+  }
+}
+</style>

src/request/api.ts

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

src/views/chartShow/index.vue

@@ -20,6 +20,7 @@
     </header>
     <template v-if="haveData">
       <div
+        v-if="haveAuth"
         class="chart-wrapper"
         id="chart-wrapper"
         v-loading="loading"
@@ -32,6 +33,8 @@
 
         <div class="mark"></div>
       </div>
+
+      <NoAuth v-else/>
     </template>
     <div class="chart-wrapper notfound" v-else>
       <i class="el-icon-warning"></i>哎吆，你的图飞了，赶快去找管理员救命吧~
@@ -40,7 +43,7 @@
     <!-- 图表来源说明 -->
     <div 
       class="chart-bottom-info bootom-source"
-      v-if="chartInfo.Instructions&&JSON.parse(chartInfo.Instructions).isShow
+      v-if="haveAuth&&chartInfo.Instructions&&JSON.parse(chartInfo.Instructions).isShow
     ">
 
       <!-- 图表说明 -->
@@ -54,7 +57,7 @@
       ></div>
     </div>
 
-    <div class="bootom-source">
+    <div class="bootom-source" v-if="haveAuth">
 
       <!-- 自定义来源 -->
       <div class="source-box">
@@ -93,13 +96,15 @@ import { ChartApi } from '@/request/api';
 import collectBtn from './components/collectBtn.vue'
 import collectBtnHT from './components/collectBtnHT.vue'
 import { useChartRender } from '@/hooks/chart/useChartRender';
+import NoAuth from '@/components/noAuth.vue';
 
 
 export default defineComponent({
   components: {
     chart,
     collectBtn,
-    collectBtnHT
+    collectBtnHT,
+    NoAuth
   },
   setup() {
     const route = useRoute();
@@ -127,6 +132,7 @@ export default defineComponent({
     // 语言 中英文 ch en  默认中文
     const language = ref(route.query.fromPage || route.query.lang || 'zh');
     const IsCollect=ref(false)//图表是否收藏
+    const haveAuth = ref(true)
     const getChartInfo = async (type='') => {
       localStorage.setItem('token', `Bearer ${route.query.token}`)
       if(!code.value) {
@@ -138,6 +144,7 @@ export default defineComponent({
       try {
         let params={
           UniqueCode: code.value || '',
+          AuthToken: route.query?.authToken || ''
         }
         // 如果是来自etamini 也就是eta小程序的报告详情
         if(route.query.source==='etamini'){
@@ -151,26 +158,27 @@ export default defineComponent({
         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
+        IsCollect.value=Data.IsCollect;
         state.dataList = Data.ChartInfo.Source === 1 ? Data.EdbInfoList : [Data.EdbInfoList[0]];
+        haveData.value = true;
+        haveAuth.value = Data.IsAuth;
 
-        //处理英文研报英文设置不全就展示中文
-        // setLangFromEnReport();
         document.title = language.value==='zh'?Data.ChartInfo.ChartName:Data.ChartInfo.ChartNameEn;
 
+        if(!Data.IsAuth) return
+
         state.options = useChartRender(Data,language.value as string)
         
-        haveData.value = true;
         type === 'refresh' && ElMessage.success('刷新成功');
 
         //水印配置
         nextTick(()=>{
-          const markDom = document.querySelector('.mark')
+          const markDom = document.querySelector('.mark') as HTMLElement
           Data.WaterMark&&(markDom.style.backgroundImage = `url(${Data.WaterMark})`)
         })
       }catch (e) {
         loading.value = false;
-        haveData.value = false; 
+        haveData.value = false;
       }
 
     };
@@ -240,7 +248,8 @@ export default defineComponent({
       refreshChart,
       copyText,
       handleChangeChartCollect,
-      IsCollect
+      IsCollect,
+      haveAuth
     };
   },
 });

src/views/sheetShow/index.vue

@@ -5,7 +5,8 @@ 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 { ElMessage, valueEquals } from 'element-plus';
+import NoAuth from '@/components/noAuth.vue';
 
 const route = useRoute();
 const code = ref(route.query.code || '')
@@ -33,23 +34,28 @@ const setDefaultSource=(sourceText:string)=>{
   })
 }
 
+const haveAuth = ref(true)
 const getInfo = async(type='') => {
   loading.value = true;
   const { Data,Ret } = await SheetApi.getInfo({  
     UniqueCode: code.value,
     FromScene: Number(route.query.fromScene||''),
     ReferencedId: Number(route.query.sourceId||''),
-    Uuid: (route.query.uid as string)||""
+    Uuid: (route.query.uid as string)||"",
+    AuthToken: route.query?.authToken as string || ''
   });
   
   loading.value = false;
   if(Ret !== 200) return
 
   info.value = Data;
+  haveAuth.value = Data.IsAuth;
+  showData.value = true; 
+
+  if(!Data.IsAuth) return
   if(!info.value.SourcesFrom){
     info.value.SourcesFrom = Data.ExcelSource?setDefaultSource(Data.ExcelSource):''
   }
-  showData.value = true; 
   type==='refresh'&&ElMessage.success('刷新成功')
   type!=='refresh'&&nextTick(() => {
     updateToHeight()
@@ -90,29 +96,31 @@ const refreshSheet = async()=>{
     element-loading-text="加载中..."
   >
     <!-- <h3 class="title">{{info.ExcelName}}</h3> -->
-    
-    <sheet 
-      :data="info.TableInfo.TableDataList" 
-      :config="info.Config"
-      :sceneConfig="info.ReferencedExcelConfig"
-    />
-    <div class="tool sheet-bottom">
-      <div class="sheet-source" 
-        v-if="info.SourcesFrom&&JSON.parse(info.SourcesFrom).isShow"
-        :style="`
-            color: ${ JSON.parse(info.SourcesFrom).color };
-            font-size: ${ JSON.parse(info.SourcesFrom).fontSize }px;
-        `"
-      >
-          source：<em>{{ JSON.parse(info.SourcesFrom).text}}</em>
-      </div>
-      <!-- 占位 -->
-      <div v-else></div>
-      <div class="right-btns">
-        <span @click="updateToHeight('update')" v-if="route.query.sourceId&&!isMobile()">更新样式</span>
-        <span @click="refreshSheet">刷新</span>
+    <template v-if="haveAuth">
+      <sheet 
+        :data="info.TableInfo.TableDataList" 
+        :config="info.Config"
+        :sceneConfig="info.ReferencedExcelConfig"
+      />
+      <div class="tool sheet-bottom">
+        <div class="sheet-source" 
+          v-if="info.SourcesFrom&&JSON.parse(info.SourcesFrom).isShow"
+          :style="`
+              color: ${ JSON.parse(info.SourcesFrom).color };
+              font-size: ${ JSON.parse(info.SourcesFrom).fontSize }px;
+          `"
+        >
+            source：<em>{{ JSON.parse(info.SourcesFrom).text}}</em>
+        </div>
+        <!-- 占位 -->
+        <div v-else></div>
+        <div class="right-btns">
+          <span @click="updateToHeight('update')" v-if="route.query.sourceId&&!isMobile()">更新样式</span>
+          <span @click="refreshSheet">刷新</span>
+        </div>
       </div>
-    </div>
+    </template>
+    <NoAuth v-else/>
   </div>
 </template>