Merge branch 'need_pool394'

src/views/report/PreviewDetail.vue

@@ -46,9 +46,6 @@ async function getEtaConfig(){
     await configStore.getBaseConfigSetting()
 }
 getEtaConfig()
-const dynamicClassName = computed(() => {
-    return etaConfigInfo.value.IsOpenChartExpired==='true'?'select-text-disabled':'';
-})
 
 // 获取报告详情
 let reportInfo=ref(null)
@@ -88,11 +85,29 @@ async function getReportDetail(){
         getSystemInfoFun()
     }
 }
+
+const waterMarkStr=ref('')
+const getSystemInfoFun=()=>{
+    getSystemInfo().then(res=>{
+        if(res.Ret===200){
+          const systemUserInfo=res.Data
+          // 设置水印文案
+          let waterMarkString=''
+          if(systemUserInfo){
+            waterMarkString=`${systemUserInfo.RealName}${systemUserInfo.Mobile?systemUserInfo.Mobile:systemUserInfo.Email}`
+            waterMarkString=encodeURIComponent(waterMarkString)
+            waterMarkStr.value=Base64.encode(waterMarkString)
+          }
+        }
+    })
+}
+
 if(route.query.id==-1){
     //新增编辑报告时的预览
     const data=JSON.parse(sessionStorage.getItem('reportPreData'))
     reportInfo.value=data
     document.title=data.Title
+    getSystemInfoFun()
 }else{
     getReportDetail()
 }
@@ -148,26 +163,10 @@ const shareCodeUrls = computed(() => {
     let index = shareUrls.value.indexOf(' ');
     return shareUrls.value.substring(0,index)
 })
-
-const waterMarkStr=ref('')
-const getSystemInfoFun=()=>{
-    getSystemInfo().then(res=>{
-        if(res.Ret===200){
-          const systemUserInfo=res.Data
-          // 设置水印文案
-          let waterMarkString=''
-          if(systemUserInfo){
-            waterMarkString=`${systemUserInfo.RealName}${systemUserInfo.Mobile?systemUserInfo.Mobile:systemUserInfo.Email}`
-            waterMarkString=encodeURIComponent(waterMarkString)
-            waterMarkStr.value=Base64.encode(waterMarkString)
-          }
-        }
-    })
-}
 </script>
 
 <template>
-    <div class="report-detail-page" :class="dynamicClassName" v-if="reportInfo" :style="{backgroundColor:bgColor}">
+    <div class="report-detail-page" v-if="reportInfo" :style="{backgroundColor:bgColor}">
         <!-- <div class="top-stage-box" v-if="$route.query.id!=-1">
             <span class="stage">第{{reportInfo.Stage}}期 / {{reportInfo.Frequency}}</span>
         </div> -->

src/views/reportEn/Detail.vue

@@ -67,14 +67,11 @@ async function getEtaConfig(){
     await configStore.getBaseConfigSetting()
 }
 getEtaConfig()
-const dynamicClassName = computed(() => {
-    return etaConfigInfo.value.IsOpenChartExpired==='true'?'select-text-disabled':'';
-})
 
 </script>
 
 <template>
-    <div class="report-detail-page" :class="dynamicClassName" v-if="reportInfo">
+    <div class="report-detail-page" v-if="reportInfo">
         <div class="top-stage-box" v-if="route.query.id>0">
             <span class="stage">第{{reportInfo.Stage}}期 / {{reportInfo.Frequency}}</span>
             <img v-if="reportInfo.State==1&&checkAuthBtn(enReportManageBtn.enReport_reportEdit)" class="edit-icon" src="@/assets/imgs/report/icon_edit2.png" alt="" @click="goEdit">