Skip to content

P
pica.cloud.web-education-admin
提交 4c68c850 编写于 作者: hujun's avatar hujun
浏览文件
操作

Merge branch 'release' into 'master' 

Release



See merge request !58
上级 9372dd9e c130a5fb
显示空白字符变更
内嵌 并排
正在显示 包含 30 行增加 和 29 行删除
package-lock.json
浏览文件 @ 4c68c850
...@@ -2306,9 +2306,9 @@ ...@@ -2306,9 +2306,9 @@
"dev": true "dev": true
}, },
"element-ui": { "element-ui": {
"version": "2.9.1", "version": "2.6.1",
"resolved": "http://192.168.110.93:4873/element-ui/-/element-ui-2.9.1.tgz", "resolved": "http://192.168.110.93:4873/element-ui/-/element-ui-2.6.1.tgz",
"integrity": "sha1-oF8udgI9Upug36LQOuFuUTSyDE4=", "integrity": "sha1-htt5/13psbzDGHtls3crDFQHRxg=",
"requires": { "requires": {
"async-validator": "~1.8.1", "async-validator": "~1.8.1",
"babel-helper-vue-jsx-merge-props": "^2.0.0", "babel-helper-vue-jsx-merge-props": "^2.0.0",
...@@ -2777,8 +2777,7 @@ ...@@ -2777,8 +2777,7 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
...@@ -3180,8 +3179,7 @@ ...@@ -3180,8 +3179,7 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.1", "version": "5.1.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -3236,7 +3234,6 @@ ...@@ -3236,7 +3234,6 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -3280,14 +3277,12 @@ ...@@ -3280,14 +3277,12 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.0.2", "version": "3.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
} }
} }
}, },
......
src/utils/env-config.js
浏览文件 @ 4c68c850
...@@ -68,8 +68,8 @@ export const envConfig = { ...@@ -68,8 +68,8 @@ export const envConfig = {
baseUrl: 'https://uat-sc.yunqueyi.com/', baseUrl: 'https://uat-sc.yunqueyi.com/',
apiUrl: 'https://uat-api.yunqueyi.com/', apiUrl: 'https://uat-api.yunqueyi.com/',
qiniuFileUrl: "https://uat-sc.yunqueyi.com/contents/admin/qiniu/token1", qiniuFileUrl: "https://uat-sc.yunqueyi.com/contents/admin/qiniu/token1",
qiniuResourceUrl: "https://video.yunqueyi.com", // 视频 qiniuResourceUrl: "https://test1-videos.yunqueyi.com", // 视频
qiniuImgUrl: "https://files.yunqueyi.com", qiniuImgUrl: "https://test1-file.yunqueyi.com",
loginUrl: 'https://uat.yunqueyi.com/pica-login/work_station.html', loginUrl: 'https://uat.yunqueyi.com/pica-login/work_station.html',
innerLoginUrl: 'https://uat-sso.yunqueyi.com/PICA_SSO_FE/html/pica_index.html', innerLoginUrl: 'https://uat-sso.yunqueyi.com/PICA_SSO_FE/html/pica_index.html',
followUpSC: 'https://uat-sc.yunqueyi.com', followUpSC: 'https://uat-sc.yunqueyi.com',
......
src/utils/qiniu-util.js
浏览文件 @ 4c68c850
...@@ -427,8 +427,10 @@ export const doUpload = (self,file, filePath, previewId,progressId, fileType) => ...@@ -427,8 +427,10 @@ export const doUpload = (self,file, filePath, previewId,progressId, fileType) =>
result.path = '/' + res.key; result.path = '/' + res.key;
// result.fullPath = domain + '/' + res.key + '_' + new Date().getTime(); // result.fullPath = domain + '/' + res.key + '_' + new Date().getTime();
if(!fileType) { // 图片 文件 if(!fileType) { // 图片 文件
console.log('---domain-------',domain)
result.fullPath = domain + '/' + res.key; result.fullPath = domain + '/' + res.key;
}else{ // 视频 }else{ // 视频
console.log('----domain1------',domain1)
result.fullPath = domain1 + '/' + res.key; result.fullPath = domain1 + '/' + res.key;
} }
......
src/views/education/create-component.vue
浏览文件 @ 4c68c850
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
<el-col :span="10" class="item-icon"> <el-col :span="10" class="item-icon">
<span class="require">*</span> <span class="require">*</span>
<el-form-item label="关联考试"> <el-form-item label="关联考试">
<el-select v-model="item3.content2" @focus="examIDfocus(index,index1,index2,index3)" @change="changeExamID" :disabled="fieldDisabled(item)" size="small" placeholder="请选择考试ID" style="width:288px;"> <el-select v-model="item3.content2" filterable @focus="examIDfocus(index,index1,index2,index3)" @change="changeExamID" :disabled="fieldDisabled(item)" size="small" placeholder="请选择考试ID" style="width:288px;">
<el-option <el-option
v-for="(itemTest,indexTest) in testIdSelect" v-for="(itemTest,indexTest) in testIdSelect"
:key="indexTest" :key="indexTest"
...@@ -218,7 +218,7 @@ ...@@ -218,7 +218,7 @@
<el-col :span="10" class="item-icon"> <el-col :span="10" class="item-icon">
<span class="require">*</span> <span class="require">*</span>
<el-form-item label="关联课程"> <el-form-item label="关联课程">
<el-select v-model="item3.content2" @focus="courseIDfocus(index,index1,index2,index3)" @change="changeCourseID" :disabled="fieldDisabled(item)" size="small" placeholder="请选择课程ID" style="width:288px;"> <el-select v-model="item3.content2" filterable @focus="courseIDfocus(index,index1,index2,index3)" @change="changeCourseID" :disabled="fieldDisabled(item)" size="small" placeholder="请选择课程ID" style="width:288px;">
<el-option <el-option
v-for="(itemCourse,indexCourse) in courseIdSelect" v-for="(itemCourse,indexCourse) in courseIdSelect"
:key="indexCourse" :key="indexCourse"
...@@ -431,7 +431,7 @@ export default { ...@@ -431,7 +431,7 @@ export default {
], ],
"introduce": [ "introduce": [
{ required: true, message: '请输入组件简介', trigger: 'blur' }, { required: true, message: '请输入组件简介', trigger: 'blur' },
{ min: 1, max: 150, message: '超出可输入的最大长度', trigger: 'blur' } { min: 1, max: 151, message: '超出可输入的最大长度', trigger: 'blur' }
], ],
"certificateId": [ "certificateId": [
{ required: true, message: '请选择证书', trigger: 'blur' }, { required: true, message: '请选择证书', trigger: 'blur' },
...@@ -443,7 +443,7 @@ export default { ...@@ -443,7 +443,7 @@ export default {
moduleRules: { moduleRules: {
"name": [ "name": [
{ required: true, message: '请输入模块名称', trigger: 'blur' }, { required: true, message: '请输入模块名称', trigger: 'blur' },
{ min: 2, max: 20, message: '输入长度为2-20个字符', trigger: 'blur' }, { min: 2, max: 40, message: '输入长度为2-40个字符', trigger: 'blur' },
{ validator: function(rule, value, callback) { { validator: function(rule, value, callback) {
validateModuleName(rule, value, callback, '模块名称已存在，请修改名称后保存') validateModuleName(rule, value, callback, '模块名称已存在，请修改名称后保存')
}, },
...@@ -465,12 +465,16 @@ export default { ...@@ -465,12 +465,16 @@ export default {
]) ])
}, },
created() { created() {
console.log("#######==========#####")
vm = this vm = this
vm.componentId = vm.$route.query.id vm.componentId = vm.$route.query.id;
vm.componentStatus = vm.$route.query.status // 3 启用 4 禁用 vm.componentStatus = vm.$route.query.status; // 3 启用 4 禁用
vm.resultFlag = vm.$route.query.resultFlag // 判断可编辑范围是基础信息还是全部信息 1 为全部 2 为基础 vm.resultFlag = vm.$route.query.resultFlag; // 判断可编辑范围是基础信息还是全部信息 1 为全部 2 为基础
vm.getCertificateList() // 获取证书列表 vm.getCertificateList(); // 获取证书列表
vm.componentBasicInfo() // 根据ID查询组件基本信息 vm.componentBasicInfo(); // 根据ID查询组件基本信息
vm.getTestListData(); // 获取考试列表
vm.getCourseData(); // 获取课程列表
vm.getTemplateData(); // 获取模板信息
vm.conditionSelect = vm.resultFlag == 2 || vm.componentStatus == 3 || vm.componentStatus == 4 vm.conditionSelect = vm.resultFlag == 2 || vm.componentStatus == 3 || vm.componentStatus == 4
// vm.conditionSelect = vm.resultFlag == 2 || vm.componentStatus == 4 // vm.conditionSelect = vm.resultFlag == 2 || vm.componentStatus == 4
vm.newconditionSelect = vm.componentStatus == 4 vm.newconditionSelect = vm.componentStatus == 4
...@@ -600,10 +604,10 @@ export default { ...@@ -600,10 +604,10 @@ export default {
} }
if(flag == 2) { if(flag == 2) {
vm.stepNum = 2 vm.stepNum = 2
vm.getTemplateData() //vm.getTemplateData()
vm.getModuleData() vm.getModuleData()
vm.getTestListData() // vm.getTestListData()
vm.getCourseData() // vm.getCourseData()
} else { } else {
vm.$message.info("暂存成功！") vm.$message.info("暂存成功！")
} }
...@@ -624,10 +628,10 @@ export default { ...@@ -624,10 +628,10 @@ export default {
} }
if(flag == 2) { if(flag == 2) {
vm.stepNum = 2 vm.stepNum = 2
vm.getTemplateData() //vm.getTemplateData()
vm.getModuleData() vm.getModuleData()
vm.getTestListData() // vm.getTestListData()
vm.getCourseData() // vm.getCourseData()
} else { } else {
vm.$message.info("暂存成功！") vm.$message.info("暂存成功！")
} }
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或