Merge branch 'pre-dev' into 'develop'

Pre dev

See merge request !57
This commit is contained in:
huangshengfa
2023-03-05 17:00:40 +08:00
4 changed files with 8 additions and 8 deletions

View File

@@ -16,8 +16,8 @@ VUE_APP_COURSE_STUDY=//u.boe.com/pc-release/course/studyindex?id=
VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx
# 外部考试导入成绩模板
VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE=外部考试学员成绩导入模板-1676551319283.xlsx
VUE_APP_ONLINE_CLASS_URL=//u.boe.com/mobile/pages/study/courseStudy?id=
VUE_APP_ONLINE_CLASS_URL=//u.boe.com/mobile-release/pages/study/courseStudy?id=
VITE_BOE_CASS_DETAIL_URL=//u.boe.com/pc-release/case/detail?id=
VUE_APP_EXAM_DETAIL_URL=//u.boe.com/mobile/pages/exam/exam?id=
VUE_APP_EXAM_DETAIL_URL=//u.boe.com/mobile-release/pages/exam/exam?id=
#h5的基本url
VUE_APP_H5=//u.boe.com/student-h5-release

View File

@@ -14,7 +14,7 @@
<iframe
id="iframe"
style="width: 100%; height: 600px"
:src="`${iframeUrl}/course/manages?f=choose&ref_id=${props.id}&ref_type=${props.type}`"
:src="`${iframeUrl}/course/manages?f=choose&refId=${props.id}&refType=${props.type}`"
name="myframe"
security="restricted"
sandbox="allow-forms allow-scripts allow-same-origin allow-popups"

View File

@@ -3971,7 +3971,7 @@ export default defineComponent({
};
const handelGuan = (itm) => {
console.log("开课信息", itm);
state.offcourseId = itm.id;
state.offcourseId = itm.offcourseId;
state.offcoursePlanId = itm.id;
state.studentId = itm.studentId;
state.studentItem = itm;

View File

@@ -332,7 +332,7 @@
<NameInput
placeholder="请输入路径名称"
v-model:value="pathName"
v-model:validate="validate"
v-model:validated="validated"
:maxlength="20"
show-count
:type="3"
@@ -414,7 +414,7 @@
<a-button
class="samtn btn2"
@click="editLearnPath"
:loading="confirmLoading"
:loading="confirmLoading || validated === 1"
>确定</a-button
>
</div>
@@ -1234,7 +1234,7 @@ export default {
state.confirmLoading = false;
return message.warning("未配置H5背景图请联系管理员");
}
if (!state.validate) {
if (state.validated !== 2) {
message.destroy();
state.confirmLoading = false;
message.warning("路径图名称重复");
@@ -1347,7 +1347,7 @@ export default {
state.confirmLoading = false;
return message.warning("未配置H5背景图请联系管理员");
}
if (!state.validate) {
if (state.validated !== 2) {
message.destroy();
state.confirmLoading = false;
return message.warning("路径图名称重复");