mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git
synced 2025-12-10 11:26:43 +08:00
Merge branch 'zcwy0417-out' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/learning-system-portal into zcwy0417-out
This commit is contained in:
@@ -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 {
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user