From 18fe56e777c241166bd23060529760080d257f33 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期三, 14 八月 2024 08:45:59 +0800
Subject: [PATCH] 上传资源修改配置

---
 .env.development                                                              |    2 +-
 src/views/homePage.vue                                                        |    2 +-
 src/views/onlineEducation/courseManage/courseResource/componets/viewVideo.vue |    2 +-
 .env.production                                                               |    2 +-
 src/views/components/upload.vue                                               |    9 ++++++---
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.env.development b/.env.development
index 1da346e..aca6703 100644
--- a/.env.development
+++ b/.env.development
@@ -13,4 +13,4 @@
 VITE_APP_RESOURCE_API = 'http://192.168.2.16:9000/trainexam/'
 
 #线上
-#VITE_APP_BASE_API = 'http://106.15.95.149:8088/api'
+#VITE_APP_BASE_API = 'http://117.190.40.54:6622/edu/api'
diff --git a/.env.production b/.env.production
index caac7c0..76b966c 100644
--- a/.env.production
+++ b/.env.production
@@ -5,7 +5,7 @@
 VITE_APP_ENV = 'production'
 
 # 在线教育/生产环境
-VITE_APP_BASE_API = '/api'
+VITE_APP_BASE_API = 'http://117.190.40.54:6622/edu/api'
 VITE_APP_RESOURCE_API = 'http://47.108.222.15:9000/trainexam/'
 
 # 是否在打包时开启压缩,支持 gzip 和 brotli
diff --git a/src/views/components/upload.vue b/src/views/components/upload.vue
index 036dc1a..481cda0 100644
--- a/src/views/components/upload.vue
+++ b/src/views/components/upload.vue
@@ -83,7 +83,7 @@
         autoplay:true,//自动播放
         sources: [
           {
-            src: resourcePath.value ? import.meta.env.VITE_APP_RESOURCE_API + resourcePath.value : '',
+            src: resourcePath.value ? resourcePath.value : '',
             // src:'',
             type: 'application/x-mpegURL',
           }
@@ -153,7 +153,7 @@
 const view = (file) => {
   console.log('vlco',file)
   // console.log("点击文件=>", file);
-  const url = import.meta.env.VITE_APP_RESOURCE_API + file.path;
+  const url = file.path;
   const link = document.createElement("a");
   link.href = url;
   link.download = file.name;
@@ -435,6 +435,8 @@
         uploadedCount.value=uploadedCount.value+1
         fileChunkList.value[data.get('index')].percentage=100 //手动更新进度
         console.log(uploadedCount.value,'result--------------')
+      }else {
+        loading.value = false
       }
       resolve('done')
     })
@@ -457,7 +459,7 @@
         console.log("myPlayer.value",myPlayer.value)
         myPlayer.value.src(
             {
-              src: import.meta.env.VITE_APP_RESOURCE_API +data.data.path,
+              src: data.data.url,
               type: 'application/x-mpegURL',
             })
         //   myPlayer.value.load()
@@ -483,6 +485,7 @@
     loading.value = false
     ElMessage.success("上传成功")
   }else{
+    loading.value = false
     ElMessage.success("合并数据失败")
   }
 }
diff --git a/src/views/homePage.vue b/src/views/homePage.vue
index 7d944ef..4c1b77f 100644
--- a/src/views/homePage.vue
+++ b/src/views/homePage.vue
@@ -3,7 +3,7 @@
     <div class="title">
       <div class="logo">
         <img class="pics2" :src="logoPng">
-        <span style="font-size: 40px;color: black">沙湾市安全培训</span>
+        <span style="font-size: 40px;color: black">国泰新华</span>
         <div style="width: 2px;height: 40px;background-color: #1C68A7;margin-top: 5px;margin-left: 15px;margin-right: 15px"></div>
         <span style="font-size: 28px;color: white">在线教育平台</span>
       </div>
diff --git a/src/views/onlineEducation/courseManage/courseResource/componets/viewVideo.vue b/src/views/onlineEducation/courseManage/courseResource/componets/viewVideo.vue
index e527d51..9bf03d4 100644
--- a/src/views/onlineEducation/courseManage/courseResource/componets/viewVideo.vue
+++ b/src/views/onlineEducation/courseManage/courseResource/componets/viewVideo.vue
@@ -42,7 +42,7 @@
         autoplay:true,//自动播放
         sources: [
           {
-            src: resourcePath.value ? import.meta.env.VITE_APP_RESOURCE_API + resourcePath.value : '',
+            src: resourcePath.value ? resourcePath.value : '',
             // src:'',
             type: 'application/x-mpegURL',
           }

--
Gitblit v1.9.2