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

.gitignore

@@ -17,4 +17,4 @@
 
 /static/dll.vendor.js
 /.idea
-#/static/base_config.js
+/static/base_config.js

src/api/http.js

@@ -51,13 +51,13 @@ function checkStatus(response) {
     } else if (res.Ret == 403) {
       bus.$message.error(res.Msg);
     } else if (res.Ret === 408) {
+      localStorage.setItem("auth", "")
       bus
         .$alert(res.Msg, "提示", {
           showClose: false,
         })
         .then(() => {
           window.location.href = window.location.origin + '/login';
-
         });
     }
     return res;

src/utils/TimeOnPage.js

@@ -1,13 +1,12 @@
 //计算账号累计活跃时长
 import global from '@/config/setting';
 import {timeOnPage} from '@/api/api.js';
+
 //活跃时间间隔 (s)
 const TimeInterval = 60*10
 //页面停留时间 (s)
 let stayTime = 0
 
-
-
 let timer = null
 
 //打开计时器
@@ -38,7 +37,7 @@ export const endCalc = (type,intervalT)=>{
   //console.log('关闭计时器')
   clearInterval(timer)
   const IsActive = sessionStorage.getItem('IsActive')
-  if(Number(IsActive)){
+  if(Number(IsActive) && localStorage.getItem('auth')){
      sendTOPInfo(type,intervalT)
   }
   stayTime = 0

src/views/ppt_manage/newVersion/components/catalog/pptContent.vue

@@ -144,7 +144,8 @@ export default {
         await this.initPageElements(this.pageList[i],'show')
       } 
       this.isLoadBack = true
-      this.loadArr.push({name:'back'})
+      if(this.pptBackImage.length)
+        this.loadArr.push({name:'back'})
 
       //获取已加载图表的信息
       let chartInfoMap = {}

src/views/ppt_manage/newVersion/components/catalog/pptContentEn.vue

@@ -140,7 +140,8 @@ export default {
         await this.initPageElements(this.pageList[i],'show')
       }
       this.isLoadBack = true
-      this.loadArr.push({name:'back'})
+      if(this.pptBackImage.length)
+        this.loadArr.push({name:'back'})
       //获取已加载图表的信息
       let chartInfoMap = {}
       for(let i=1;i<this.loadArr.length-1;i++){
@@ -236,6 +237,7 @@ export default {
     },
     //计算title的字节数
     getStrCount(title){
+        if(!title) return
         return countStrSize(title)
     }
   },

src/views/ppt_manage/newVersion/pptEditor.vue

@@ -1227,6 +1227,7 @@ export default {
   },
   updated(){
     $('.ppt-item').css('height',$('.ppt-item').width()*0.7);
+    $('.ppt-item').css('background-image',`url(${this.pptBgImage})`);
     window.onresize = ()=>{
       $('.ppt-item').css('height',$('.ppt-item').width()*0.7);
     }

src/views/ppt_manage/newVersion/pptEnEditor.vue

@@ -1202,6 +1202,7 @@ export default {
   },
   updated(){
     $('.ppt-item').css('height',$('.ppt-item').width()*0.7);
+    $('.ppt-item').css('background-image',`url(${this.pptBgImage})`);
     window.onresize = ()=>{
       $('.ppt-item').css('height',$('.ppt-item').width()*0.7);
     }

static/base_config.js

@@ -1 +0,0 @@
-window.key = '6WpHp4vSvLVQK8SLioNZ7WMq'