-- fix bug

This commit is contained in:
yuping
2023-03-03 17:27:42 +08:00
parent 43435b0b41
commit 78fd3a87b0
9 changed files with 42 additions and 44 deletions

View File

@@ -17,7 +17,7 @@
</div> </div>
<div> <div>
<div class="contentMain" style="padding:20px"> <div class="contentMain" style="padding:20px">
<CreateOnline ref="onlineRef"> <CreateOnline ref="onlineRef" :id="props.id" :type="props.infoType">
<a-button type="primary" style="border-radius: 4px">{{ <a-button type="primary" style="border-radius: 4px">{{
taskIndex === -1 ? '选择/新建课程' : '重新选择' taskIndex === -1 ? '选择/新建课程' : '重新选择'
}} }}
@@ -46,7 +46,9 @@ import {message} from "ant-design-vue";
import CreateOnline from "@/components/drawers/CreateOnline.vue"; import CreateOnline from "@/components/drawers/CreateOnline.vue";
const props = defineProps({ const props = defineProps({
type: Number, infoType: Number,
courseSyncFlag: Number,
id: Number,
taskList: [] taskList: []
}) })
const visible = ref(false) const visible = ref(false)
@@ -133,6 +135,10 @@ function confirm() {
function selectCourse(row) { function selectCourse(row) {
console.log(row) console.log(row)
if(!props.courseSyncFlag && !row.refId){
message.warning("请新建本项目在线课!");
return
}
rowSelectKeys.value = [row.id] rowSelectKeys.value = [row.id]
selectsData.value = [row] selectsData.value = [row]
onlineRef.value.closeModal() onlineRef.value.closeModal()

View File

@@ -14,7 +14,7 @@
<iframe <iframe
id="iframe" id="iframe"
style="width: 100%; height: 600px" style="width: 100%; height: 600px"
:src="iframeUrl + '/course/manages?f=choose'" :src="`${iframeUrl}/course/manages?f=choose?ref_id=${props.id}&ref_type=${props.type}`"
name="myframe" name="myframe"
security="restricted" security="restricted"
sandbox="allow-forms allow-scripts allow-same-origin allow-popups" sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
@@ -22,19 +22,25 @@
</a-modal> </a-modal>
</template> </template>
<script setup> <script setup>
import {ref} from "vue"; import {defineProps, ref} from "vue";
import {iframeUrl} from "@/api/method"; import {iframeUrl} from "@/api/method";
const visible = ref(false) const visible = ref(false);
const props = defineProps({
type: Number,
id: Number,
});
function openModal() { function openModal() {
visible.value = true visible.value = true;
} }
function closeModal() { function closeModal() {
visible.value = false visible.value = false;
} }
defineExpose({closeModal})
defineExpose({ closeModal });
</script> </script>
<style lang="scss"> <style lang="scss">

View File

@@ -140,7 +140,7 @@
</div> </div>
<div class="mid"> <div class="mid">
<div class="item" v-for="(value,key) in TASK_TYPE" :key="key"> <div class="item" v-for="(value,key) in TASK_TYPE" :key="key">
<component :is="value.component" :ref="el=>courseRef['el'+key]=el" :type="key" <component :is="value.component" :ref="el=>courseRef['el'+key]=el" :type="key" :infoType="2" :id="routerInfo.routerInfo?.id"
v-model:task-list="routerInfo.chapterList[activeIndex].draftTaskList"> v-model:task-list="routerInfo.chapterList[activeIndex].draftTaskList">
<div class="itcon"> <div class="itcon">
<div class="img"> <div class="img">

View File

@@ -552,7 +552,6 @@
<div class="setc_main"> <div class="setc_main">
<a-radio <a-radio
v-model:checked="projectInfo.courseSyncFlag" v-model:checked="projectInfo.courseSyncFlag"
:disabled="true"
><span style="color: #333333" ><span style="color: #333333"
>同步课程学习记录如学员在课程库中拥有课程的学习记录自动免修该课程</span >同步课程学习记录如学员在课程库中拥有课程的学习记录自动免修该课程</span
></a-radio ></a-radio

View File

@@ -150,21 +150,8 @@
<div class="namebox"> <div class="namebox">
<div class="inname">同步学习记录</div> <div class="inname">同步学习记录</div>
</div> </div>
<div class="in ggysxz" v-if="courseSyncFlag"> <div class="in ggysxz">
<!-- :disabled="viewDetail ? true : false" --> <a-checkbox v-model:checked="courseSyncFlag">
<a-checkbox v-model:checked="courseSyncFlag" disabled>
<span style="
width: 100%;
color: rgba(109, 117, 132, 1);
font-size: 14px;
">
同步课程学习记录如学员在课程库中拥有课程的学习记录自动免修该课程
</span>
</a-checkbox>
</div>
<div class="in" v-else>
<!-- :disabled="viewDetail ? true : false" -->
<a-checkbox v-model:checked="courseSyncFlag" disabled>
<span style=" <span style="
width: 100%; width: 100%;
color: rgba(109, 117, 132, 1); color: rgba(109, 117, 132, 1);

View File

@@ -100,7 +100,7 @@
<div class="mid"> <div class="mid">
<div class="item" v-for="(value,key) in TASK_TYPE" :key="key"> <div class="item" v-for="(value,key) in TASK_TYPE" :key="key">
<div v-if="key!=13"> <div v-if="key!=13">
<component :is="value.component" :ref="el=>courseRef['el'+key]=el" :type="key" <component :is="value.component" :ref="el=>courseRef['el'+key]=el" :type="key" :infoType="1" :id="projectInfo.projectInfo?.id"
v-model:task-list="projectInfo.stageList[activeIndex].taskDraftDtoList"> v-model:task-list="projectInfo.stageList[activeIndex].taskDraftDtoList">
<div class="itcon"> <div class="itcon">
<div class="img"> <div class="img">

View File

@@ -1247,7 +1247,7 @@
<div class="set_content"> <div class="set_content">
<div class="setc_name"><span>同步学习记录:</span></div> <div class="setc_name"><span>同步学习记录:</span></div>
<div class="setc_main"> <div class="setc_main">
<a-radio v-model:checked="checkedSty" :disabled="true" <a-radio v-model:checked="checkedSty"
><span style="color: #333333" ><span style="color: #333333"
>同步课程学习记录(如学员在课程库中拥有课程的学习记录,自动免修该课程)</span >同步课程学习记录(如学员在课程库中拥有课程的学习记录,自动免修该课程)</span
></a-radio ></a-radio

View File

@@ -98,7 +98,7 @@
<div class="mid"> <div class="mid">
<div class="item" v-for="(value, key) in TASK_TYPE" :key="key"> <div class="item" v-for="(value, key) in TASK_TYPE" :key="key">
<div v-if="key != 13"> <div v-if="key != 13">
<component :is="value.component" :ref="el => courseRef['el' + key] = el" :type="key" <component :is="value.component" :ref="el => courseRef['el' + key] = el" :type="key" :infoType="1" :id="projectInfo.projectTemplateInfo?.id"
v-model:task-list="projectInfo.stageList[activeIndex].taskTemplateList"> v-model:task-list="projectInfo.stageList[activeIndex].taskTemplateList">
<div class="itcon"> <div class="itcon">
<div class="img"> <div class="img">

View File

@@ -197,7 +197,7 @@
</div> </div>
<div class="in ggysxz" v-if="courseSyncFlag"> <div class="in ggysxz" v-if="courseSyncFlag">
<!-- :disabled="viewDetail ? true : false" --> <!-- :disabled="viewDetail ? true : false" -->
<a-checkbox disabled v-model:checked="courseSyncFlag" <a-checkbox v-model:checked="courseSyncFlag"
><span ><span
style=" style="
width: 100%; width: 100%;
@@ -210,7 +210,7 @@
</div> </div>
<div class="in" v-else> <div class="in" v-else>
<!-- :disabled="viewDetail ? true : false" --> <!-- :disabled="viewDetail ? true : false" -->
<a-checkbox disabled v-model:checked="courseSyncFlag" <a-checkbox v-model:checked="courseSyncFlag"
><span ><span
style=" style="
width: 100%; width: 100%;