dedsudiyu %!s(int64=2) %!d(string=hai) anos
pai
achega
77c9822f4a

+ 4 - 0
src/utils/ruoyi.js

@@ -309,6 +309,9 @@ export function spaceJudgmentHTML(rule, value, callback) {
  * 预览地址判断
  */
 export function urlJudge(url) {
+  let src = window.location.href.split('://')[0]+'://' + judgmentNetworkReturnAddress()+'/statics'+ url.split('statics')[1]
+  return localStorage.getItem('filePreviewUrl')+'/onlinePreview?url='+encodeURIComponent(btoa(unescape(encodeURIComponent(src))));
+  /*
   // let src = '';
   // url = '/admin/statics'+url.split('statics')[1]
   url = '/statics'+url.split('statics')[1]
@@ -332,6 +335,7 @@ export function urlJudge(url) {
   console.log('location',location);
   console.log('url',url);
   return location + url
+  */
 }
 
 /**

+ 1 - 1
src/views/safetyEducationExam/safeLearning/safeLearning/learning.vue

@@ -237,7 +237,7 @@
           this.learningData.secondOne = secondOne;
           this.learningData.secondTwo = 0;
           if(this.learningData.postfix == "mp4"){
-            this.learningData.chapterData = window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + this.learningData.chapterData
+            this.learningData.chapterData = window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() +'/statics'+ this.learningData.chapterData.split('statics')[1];
             // this.getVideo();
             // this.getVideoTwo();
           }else if(this.learningData.postfix == "pdf" || this.learningData.postfix == "doc" || this.learningData.postfix == "docx"||this.learningData.postfix == "ppt" || this.learningData.postfix == "pptx"){