Merge remote-tracking branch 'origin/develop'

This commit is contained in:
yuping
2023-01-19 02:08:17 +08:00
2 changed files with 24 additions and 8 deletions

View File

@@ -335,6 +335,7 @@
v-model:addtestVisible="addtestvisible" v-model:addtestVisible="addtestvisible"
v-model:EditTestId="EditTestId" v-model:EditTestId="EditTestId"
v-model:testName="testName" v-model:testName="testName"
v-model:offCourseId="offCourseId"
:faceLevel="true" :faceLevel="true"
/> />
</div> </div>
@@ -498,6 +499,7 @@ export default {
assessmentName: null, assessmentName: null,
isClick: false, isClick: false,
attach:"", attach:"",
offCourseId:props.EditFaceId,
}); });
const clear = () => { const clear = () => {
@@ -586,6 +588,7 @@ export default {
const queryFaceTeach = () => { const queryFaceTeach = () => {
queryFaceDetailById(props.EditFaceId).then((res) => { queryFaceDetailById(props.EditFaceId).then((res) => {
console.log("获取到了面授课开课详情", res.data.data); console.log("获取到了面授课开课详情", res.data.data);
state.offCourseId = props.EditFaceId;
let result = res.data.data; let result = res.data.data;
state.courseName = result.name; state.courseName = result.name;
state.description = result.description; state.description = result.description;

View File

@@ -379,6 +379,10 @@ export default {
type: String, type: String,
default: null, default: null,
}, },
offCourseId: {
type: Number,
default: null,
},
}, },
setup(props, ctx) { setup(props, ctx) {
const state = reactive({ const state = reactive({
@@ -541,16 +545,25 @@ export default {
state.test.targetId = 0; state.test.targetId = 0;
state.test.type = 0; state.test.type = 0;
state.test.chapterId=0; state.test.chapterId=0;
if(props.isLevel == 1){ console.log("props.offCourseId",props.offCourseId);
state.test.targetId = props.routerId; if (props.faceLevel && props.offCourseId > 0) {
state.test.chapterId = props.isactive; state.test.targetId = props.offCourseId;
state.test.type = 2; state.test.type = 3;
}else{
if(props.isLevel == 1){
state.test.targetId = props.routerId;
state.test.chapterId = props.isactive;
state.test.type = 2;
} else if (props.isLevel == 2) { } else if (props.isLevel == 2) {
state.test.targetId = props.projectId; state.test.targetId = props.projectId;
state.test.type = 1; state.test.type = 1;
} }
}
// if (props.EditTestId > 0) { // if (props.EditTestId > 0) {