canghailong vor 6 Monaten
Ursprung
Commit
19d936c671
2 geänderte Dateien mit 45 neuen und 40 gelöschten Zeilen
  1. 3 12
      src/views/student/classCentre/form.vue
  2. 42 28
      src/views/student/classCentre/rightMenu.vue

+ 3 - 12
src/views/student/classCentre/form.vue

@@ -10,11 +10,11 @@
 		<div v-if="itemObj.key == 2" style="height: 100%">
 			<handouts :itemObj="itemObj" :hourId="idsObj.hourId"></handouts>
 		</div>
-		<note v-if="itemObj.type == 2" :idsObj="idsObj" ref="noteRef" @videoSpeed="videoSpeed" @videoStopTime="videoStopTime"></note>
+		<note v-if="itemObj.key == 6" :idsObj="idsObj" ref="noteRef" @videoSpeed="videoSpeed" @videoStopTime="videoStopTime"></note>
 		<div v-if="itemObj.key == 3" style="height: 100%">
 			<subtitleBox :url="itemObj.url" @videoSpeed="videoSpeed"></subtitleBox>
 		</div>
-		<askDiv v-if="itemObj.type == 4" :idsObj="idsObj" ref="noteRef" @videoSpeed="videoSpeed" @videoStopTime="videoStopTime"></askDiv>
+		<askDiv v-if="itemObj.key == 7" :idsObj="idsObj" ref="noteRef" @videoSpeed="videoSpeed" @videoStopTime="videoStopTime"></askDiv>
 	</xn-form-container>
 </template>
 
@@ -45,17 +45,8 @@
 	const visible = ref(false)
 	const emit = defineEmits({ videoSpeed: null ,videoStopTime:null})
 	// 打开抽屉
-	const onOpen = (edit) => {
+	const onOpen = () => {
 		visible.value = true
-		if (edit) {
-			if (itemObj.value.type == 2) {
-				formData.value.noteId = edit.noteId
-				formData.value.noteContent = edit.noteContent
-			} else {
-				formData.value.info = edit.info
-				formData.value.id = edit.id
-			}
-		}
 	}
 	// 关闭抽屉
 	const onClose = () => {

+ 42 - 28
src/views/student/classCentre/rightMenu.vue

@@ -8,7 +8,13 @@
 				<div class="fcc">{{ item.title }}</div>
 			</a-menu-item>
 		</a-menu>
-		<rightContent ref="formRef" :idsObj="props.idsObj" :rightItem="rightItem" @videoSpeed="videoSpeed" @videoStopTime="videoStopTime"></rightContent>
+		<rightContent
+			ref="formRef"
+			:idsObj="props.idsObj"
+			:rightItem="rightItem"
+			@videoSpeed="videoSpeed"
+			@videoStopTime="videoStopTime"
+		></rightContent>
 	</div>
 </template>
 
@@ -19,7 +25,7 @@
 	import { message } from 'ant-design-vue'
 	const route = useRoute()
 	const router = useRouter()
-	const emit = defineEmits({ videoSpeed: null,videoStopTime:null })
+	const emit = defineEmits({ videoSpeed: null, videoStopTime: null })
 	const props = defineProps({
 		dataList: {
 			type: [Array, Object],
@@ -67,7 +73,7 @@
 			title: '作业',
 			key: '4',
 			icon: SnippetsOutlined,
-			type: 3,
+			type: 2,
 			routerUrl: '/student/do',
 			routerSrc: '/student/read'
 		},
@@ -75,7 +81,7 @@
 			title: '测验',
 			key: '5',
 			icon: CopyOutlined,
-			type: 3,
+			type: 2,
 			routerUrl: '/student/do',
 			routerSrc: '/student/read'
 		},
@@ -83,13 +89,13 @@
 			title: '笔记',
 			key: '6',
 			icon: ReadOutlined,
-			type: 2
+			type: 1
 		},
 		{
 			title: '问答',
 			key: '7',
 			icon: QuestionCircleOutlined,
-			type: 4
+			type: 1
 		},
 		{
 			title: '考试',
@@ -103,32 +109,40 @@
 			title: '网页',
 			key: '9',
 			icon: IeOutlined,
-			type: 3,
-			routerUrl: 'https://www.baidu.com/',
+			type: 4,
+			routerUrl: 'https://www.baidu.com/'
 		}
 	])
-	const selectBtn = (event, edit) => {
-		if (event.type == 3) {
-			if(event.key == '9'){
-				window.open(event.routerUrl)
-			}
-			if (event.relateId) {
-				if (event.key == '4' || event.key == '5') {
-					window.open(`${event.status == 1 ? `${event.routerSrc}?id=${event.answerId}` : `${event.routerUrl}?id=${event.relateId}`}`, '_blank')
+	const selectBtn = (event) => {
+		switch (event.type) {
+			case 1:
+				rightItem.value = event
+				formRef.value.onOpen()
+				break
+			case 2:
+				if (event.relateId) {
+					window.open(
+						`${
+							event.status == 1 ? `${event.routerSrc}?id=${event.answerId}` : `${event.routerUrl}?id=${event.relateId}`
+						}`,
+						'_blank'
+					)
 				} else {
-					router.push({
-						path: event.routerUrl,
-						query: {
-							id: event.relateId
-						}
-					})
+					message.error(`没有${event.key == 5 ? '测试' : '作业'}`)
 				}
-			} else {
-				message.error(`没有${event.key == 5 ? '测试' : '作业'}`)
-			}
-		} else {
-			rightItem.value = event
-			formRef.value.onOpen(edit ? edit : '')
+
+				break
+			case 3:
+				router.push({
+					path: event.routerUrl,
+					query: {
+						id: event.relateId
+					}
+				})
+				break
+			case 4:
+				window.open(event.routerUrl)
+				break
 		}
 	}
 	const listBtn = computed(() => {