Merge branch 'zcwy0417-out' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/learning-system-portal into zcwy0417-out

2025-12-09 02:46:44 +08:00 · 2024-05-31 14:29:23 +08:00
parent 5e335d1c0d 31399063e3
commit 44ebaa791c
12 changed files with 27 additions and 24 deletions
--- a/.env.development
+++ b/.env.development
@@ -16,22 +16,22 @@ VUE_APP_CESOURCE_BASE_API = '/socialApi'
 VUE_APP_STAT_BASE_API = '/statApi'

 # BOE系统网址
-VUE_APP_BOE_WEB_URL = 'https://pretest.zcwytd.com'
+VUE_APP_BOE_WEB_URL = 'https://u-pre.boe.com'

 # BOE 移动端url
 # VUE_APP_BOE_MOBILE_URL = 'http://127.0.0.1:8082/mobile'
-VUE_APP_BOE_MOBILE_URL = 'https://pretest.zcwytd.com'
+VUE_APP_BOE_MOBILE_URL = 'https://u-pre.boe.com'

 # File路径的基础url
 # VUE_APP_FILE_BASE_URL = 'http://127.0.0.1:9090/cdn/upload'
-VUE_APP_FILE_BASE_URL='https://pretest.zcwytd.com/upload'
+VUE_APP_FILE_BASE_URL='https://u-pre.boe.com/upload'

 # File路径的基础url的相对路径，加此项是为了不影响之前的路径配置
 VUE_APP_FILE_RELATIVE_PATH = '/upload'


 # 受众批量导入人员信息URL
-VUE_APP_AUDIENCE_IMPORT_URL = 'https://pretest.zcwytd.com/userbasic/audience/import'
+VUE_APP_AUDIENCE_IMPORT_URL = 'https://u-pre.boe.com/userbasic/audience/import'

 # 登录地址
 VUE_APP_LOGIN_URL='/pc/login'
@@ -47,7 +47,7 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true

 # scorm课件的播放url地址
 # VUE_APP_SCORM_URL = 'http://localhost:9083/scorm-player'
-VUE_APP_SCORM_URL = 'https://pretest.zcwytd.com/newscorm/scorm-player'
+VUE_APP_SCORM_URL = 'https://u-pre.boe.com/newscorm/scorm-player'

 #案例组织领域类型
 VUE_APP_CASE_TYPE = '90'
--- a/src/security.js
+++ b/src/security.js
@@ -58,7 +58,7 @@ router.beforeEach((to, from, next) => {
                console.log(err);
                store.commit('app/SET_INITDATA',false);
                //如果初始化错误，就不再执行了，不然会一直循环下去
-                // next({ path: '/500' })
+                next({ path: '/500' })
                //NProgress.done();
            })
          } else {
--- a/src/views/lecturer/CoachingSuccess.vue
+++ b/src/views/lecturer/CoachingSuccess.vue
@@ -15,6 +15,7 @@ export default {
      },
      progressData: {},
      fileBaseUrl: process.env.VUE_APP_BOE_MOBILE_URL,
+      uploadUrl:process.env.VUE_APP_FILE_BASE_URL,
      disabled: false,
      statusInfo: '',
      teacherInfo:''
@@ -166,7 +167,8 @@ export default {
    <div class="progress" >
      <div v-for="(item,index) in progressData" :key="index" @click="toCaseData(item.courseId)">
        <div class="uc-course-img" style="width: 212px;height:119px">
-          <img style="width: 100%;" v-if="item.courseImage!=''" :src="item.courseImage">
+          <img style="width: 100%;" v-if="item.courseImage!=''&&item.courseImage.includes('https://')" :src="item.courseImage">
+          <img style="width: 100%;" v-else-if="item.courseImage!=''" :src="uploadUrl+item.courseImage">
          <img style="width: 100%;" v-else :src="fileBaseUrl+'/pc/images/bgimg/course.png'">
        </div>
        <div class="courseName" :title="item.courseName">{{ item.courseName }}</div>
--- a/src/views/lecturer/FinalDraft.vue
+++ b/src/views/lecturer/FinalDraft.vue
@@ -230,7 +230,7 @@ export default {
              multiple>
              <i class="el-icon-upload"></i>
              <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-              <div class="el-upload__tip" slot="tip">请上传解密后的文件，仅支持上传ppt，pptx，pdf格式文件</div>
+              <div class="el-upload__tip" slot="tip">请上传解密后的文件，仅支持上传ppt、pptx、pdf格式文件</div>
            </el-upload>
          </el-form-item>
          <el-form-item>
--- a/src/views/lecturer/FinalSuccess.vue
+++ b/src/views/lecturer/FinalSuccess.vue
@@ -21,6 +21,7 @@ export default {
      },
      progressData: {},
      fileBaseUrl: process.env.VUE_APP_BOE_MOBILE_URL,
+      uploadUrl:process.env.VUE_APP_FILE_BASE_URL,
      disabled: false,
      statusInfo: '',
      result: '',
@@ -207,7 +208,8 @@ export default {
    <div class="progress">
      <div v-for="(item,index) in progressData" :key="index" @click="toCaseData(item.courseId)">
        <div class="uc-course-img" style="width: 212px;height:119px">
-          <img style="width: 100%;" v-if="item.courseImage!=''" :src="item.courseImage">
+          <img style="width: 100%;" v-if="item.courseImage!=''&&item.courseImage.includes('https://')" :src="item.courseImage">
+          <img style="width: 100%;" v-else-if="item.courseImage!=''" :src="uploadUrl+item.courseImage">
          <img style="width: 100%;" v-else :src="fileBaseUrl+'/pc/images/bgimg/course.png'">
        </div>
        <div class="courseName" :title="item.courseName">{{ item.courseName }}</div>
--- a/src/views/lecturer/FirstDraft.vue
+++ b/src/views/lecturer/FirstDraft.vue
@@ -236,7 +236,7 @@ export default {
                multiple>
                <i class="el-icon-upload"></i>
                <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-                <div class="el-upload__tip" slot="tip">请上传解密后的文件，仅支持上传ppt，pptx，pdf格式文件</div>
+                <div class="el-upload__tip" slot="tip">请上传解密后的文件，仅支持上传ppt、pptx、pdf格式文件</div>
              </el-upload>
          </el-form-item>
          <el-form-item>
--- a/src/views/lecturer/OnlineLearning.vue
+++ b/src/views/lecturer/OnlineLearning.vue
@@ -16,6 +16,7 @@ export default {
      },
      progressData:{},
      fileBaseUrl:process.env.VUE_APP_BOE_MOBILE_URL,
+      uploadUrl:process.env.VUE_APP_FILE_BASE_URL,
      disabled:false,
      statusInfo:'',
      teacherInfo:'',
@@ -162,7 +163,8 @@ export default {
    <div class="progress" >
      <div v-for="(item,index) in progressData" :key="index" @click="toCaseData(item.courseId)">
        <div class="uc-course-img" style="width: 212px;height:119px">
-          <img style="width: 100%;" v-if="item.courseImage!=''" :src="item.courseImage">
+          <img style="width: 100%;" v-if="item.courseImage!=''&&item.courseImage.includes('https://')" :src="item.courseImage">
+          <img style="width: 100%;" v-else-if="item.courseImage!=''" :src="uploadUrl+item.courseImage">
          <img style="width: 100%;" v-else :src="fileBaseUrl+'/pc/images/bgimg/course.png'">
        </div>
        <div class="courseName" :title="item.courseName">{{ item.courseName }}</div>
--- a/src/views/lecturer/TwoAthentication.vue
+++ b/src/views/lecturer/TwoAthentication.vue
@@ -21,6 +21,7 @@ export default {
      },
      progressData:{},
      fileBaseUrl:process.env.VUE_APP_BOE_MOBILE_URL,
+      uploadUrl:process.env.VUE_APP_FILE_BASE_URL,
      disabled:false,
      statusInfo:'',
      result:'',
@@ -194,7 +195,8 @@ export default {
    <div class="progress">
      <div v-for="(item,index) in progressData" :key="index" @click="toCaseData(item.courseId)">
        <div class="uc-course-img" style="width: 212px;height:119px">
-          <img style="width: 100%;" v-if="item.courseImage!=''" :src="item.courseImage">
+          <img style="width: 100%;" v-if="item.courseImage!=''&&item.courseImage.includes('https://')" :src="item.courseImage">
+          <img style="width: 100%;" v-else-if="item.courseImage!=''" :src="uploadUrl+item.courseImage">
          <img style="width: 100%;" v-else :src="fileBaseUrl+'/pc/images/bgimg/course.png'">
        </div>
        <div class="courseName" :title="item.courseName">{{ item.courseName }}</div>
--- a/src/views/lecturer/TwoCos.vue
+++ b/src/views/lecturer/TwoCos.vue
@@ -21,6 +21,7 @@ export default {
      },
      progressData:{},
      fileBaseUrl:process.env.VUE_APP_BOE_MOBILE_URL,
+      uploadUrl:process.env.VUE_APP_FILE_BASE_URL,
      disabled:false,
      statusInfo:'',
      result:'',
@@ -197,7 +198,8 @@ export default {
    <div class="progress">
      <div v-for="(item,index) in progressData" :key="index" @click="toCaseData(item.courseId)">
        <div class="uc-course-img" style="width: 212px;height:119px">
-          <img style="width: 100%;" v-if="item.courseImage!=''" :src="item.courseImage">
+          <img style="width: 100%;" v-if="item.courseImage!=''&&item.courseImage.includes('https://')" :src="item.courseImage">
+          <img style="width: 100%;" v-else-if="item.courseImage!=''" :src="uploadUrl+item.courseImage">
          <img style="width: 100%;" v-else :src="fileBaseUrl+'/pc/images/bgimg/course.png'">
        </div>
        <div class="courseName" :title="item.courseName">{{ item.courseName }}</div>
--- a/src/views/lecturer/TwoFinal.vue
+++ b/src/views/lecturer/TwoFinal.vue
@@ -232,7 +232,7 @@ export default {
              multiple>
              <i class="el-icon-upload"></i>
              <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-              <div class="el-upload__tip" slot="tip">请上传解密后的文件，仅支持上传ppt，pptx，pdf格式文件</div>
+              <div class="el-upload__tip" slot="tip">请上传解密后的文件，仅支持上传ppt、pptx、pdf格式文件</div>
            </el-upload>
          </el-form-item>
          <el-form-item>
--- a/src/views/lecturer/TwoFinals.vue
+++ b/src/views/lecturer/TwoFinals.vue
@@ -21,6 +21,7 @@ export default {
      },
      progressData:{},
      fileBaseUrl:process.env.VUE_APP_BOE_MOBILE_URL,
+      uploadUrl:process.env.VUE_APP_FILE_BASE_URL,
      disabled:false,
      statusInfo:'',
      statusInfo1:'',
@@ -203,7 +204,8 @@ export default {
    <div class="progress">
      <div v-for="(item,index) in progressData" :key="index" @click="toCaseData(item.courseId)">
        <div class="uc-course-img" style="width: 212px;height:119px">
-          <img style="width: 100%;" v-if="item.courseImage!=''" :src="item.courseImage">
+          <img style="width: 100%;" v-if="item.courseImage!=''&&item.courseImage.includes('https://')" :src="item.courseImage">
+          <img style="width: 100%;" v-else-if="item.courseImage!=''" :src="uploadUrl+item.courseImage">
          <img style="width: 100%;" v-else :src="fileBaseUrl+'/pc/images/bgimg/course.png'">
        </div>
        <div class="courseName" :title="item.courseName ">{{ item.courseName }}</div>
--- a/vue.config.js
+++ b/vue.config.js
@@ -126,7 +126,6 @@ module.exports = {
    proxy: {
      '/manageApi': {
        // 目标代理服务器地址
-        // target: 'https://pretest.zcwytd.com',
        target: 'https://u-pre.boe.com',
        changeOrigin: true,
        secure: false,
@@ -137,7 +136,6 @@ module.exports = {
      '/systemapi': {
        // 目标代理服务器地址
        // target: 'http://127.0.0.1:9090',
-        // target: 'https://pretest.zcwytd.com',
        target: 'https://u-pre.boe.com',
        changeOrigin: true,
        logLevel: 'debug',
@@ -148,7 +146,6 @@ module.exports = {
      },
      '/uboeApi': {
        // 目标代理服务器地址
-        // target: 'https://pretest.zcwytd.com',
        target: 'https://u-pre.boe.com',
        changeOrigin: true,
        secure: false,
@@ -158,7 +155,6 @@ module.exports = {
      },
      '/userbasic': {
        // 目标代理服务器地址
-        // target: 'https://pretest.zcwytd.com',
        target: 'https://u-pre.boe.com',
        changeOrigin: true,
        secure: false,
@@ -169,7 +165,6 @@ module.exports = {
      '/statApi': {
        // 目标代理服务器地址
        // target: 'http://127.0.0.1:9080',
-        // target: 'https://pretest.zcwytd.com',
        target: 'https://u-pre.boe.com',
        changeOrigin: true,
        logLevel: 'debug',
@@ -181,7 +176,6 @@ module.exports = {
      '/socialApi': {
        // 目标代理服务器地址
        // target: 'http://127.0.0.1:9081',
-        // target: 'https://pretest.zcwytd.com',
        target: 'https://u-pre.boe.com',
        changeOrigin: true,
        logLevel: 'debug',
@@ -192,7 +186,6 @@ module.exports = {
      },
      '/report': {
        // 目标代理服务器地址
-        // target: 'https://pretest.zcwytd.com',
        target: 'https://u-pre.boe.com',
        changeOrigin: true,
        secure: false,
@@ -202,14 +195,12 @@ module.exports = {
      },
      '/infrasApi': {
        // 目标代理服务器地址
-        // target: 'https://pretest.zcwytd.com',
        target: 'https://u-pre.boe.com',
        changeOrigin: true,
        secure: false,
      },
      '/activityApi': {
        // 目标代理服务器地址
-        // target: 'https://pretest.zcwytd.com',
        target: 'https://u-pre.boe.com',
        changeOrigin: true,
        secure: false,