浏览代码

课程问答/伦塔踩

canghailong 6 月之前
父节点
当前提交
418c1b2efd

+ 0 - 3
src/components/Comment/index.vue

@@ -28,9 +28,6 @@
 							<dislike-outlined @click="postnotlike(item, 1)" />
 						</template>
 					</a-tooltip>
-					<span style="padding-left: 3px; cursor: auto">
-						{{ item.likeCount }}
-					</span>
 				</span>
 				<a-tooltip title="编辑" v-if="item.isSelf == 1">
 					<EditOutlined @click="replyFormRef.onOpen(item, props.params.targetId, item.replyId, true)" />

+ 1 - 4
src/views/forum/detail.vue

@@ -28,7 +28,7 @@
 						<template #title>
 							<span>返回</span>
 						</template>
-						<a-button @click="goToHome">
+						<a-button @click="goToHome" type="primary">
 							<rollback-outlined />
 						</a-button>
 					</a-tooltip>
@@ -57,9 +57,6 @@
 								<dislike-outlined @click="postnotlike(detailObj, 1)" />
 							</template>
 						</a-tooltip>
-						<span style="padding-left: 3px">
-							{{ detailObj.likeCount }}
-						</span>
 					</div>
 					<div
 						v-if="detailObj.isSelf == 1"

+ 27 - 27
src/views/student/classCentre/ask.vue

@@ -2,9 +2,9 @@
 	<a-form ref="formRefAdd" :model="formDataAdd" :rules="formRules" layout="vertical">
 		<a-row :gutter="16">
 			<a-col :span="24">
-				<a-form-item name="askType" label="请选择类型">
+				<a-form-item name="infoType" label="请选择类型">
 					<a-select
-						v-model:value="formDataAdd.askType"
+						v-model:value="formDataAdd.infoType"
 						placeholder="请选择类型"
 						style="width: 100%"
 						:options="typeOptions"
@@ -46,22 +46,25 @@
 							</template>
 						</a-list-item-meta>
 						<div v-html="item.info"></div>
-						<div class="frc mt-2" v-if="item.userId == userInfo.id">
-							<div @click="editNote(item)">
-								<a-tooltip title="编辑" :getPopupContainer="(trigger) => trigger.parentElement">
-									<edit-outlined />
-								</a-tooltip>
-							</div>
-							<div class="ml-2 mr-4" @click="delNote(item)">
-								<a-tooltip title="删除" :getPopupContainer="(trigger) => trigger.parentElement">
-									<delete-outlined />
-								</a-tooltip>
+						<div class="fcbc mt-2" v-if="item.userId == userInfo.id">
+							<div>{{ infoTypeName(item.infoType) }}</div>
+							<div class="flc">
+								<div @click="editNote(item)">
+									<a-tooltip title="编辑" :getPopupContainer="(trigger) => trigger.parentElement">
+										<edit-outlined />
+									</a-tooltip>
+								</div>
+								<div class="ml-2 mr-4" @click="delNote(item)">
+									<a-tooltip title="删除" :getPopupContainer="(trigger) => trigger.parentElement">
+										<delete-outlined />
+									</a-tooltip>
+								</div>
+								<!-- <div class="ml-2" @click="giveFun(item)">
+									<a-tooltip title="点赞" :getPopupContainer="(trigger) => trigger.parentElement">
+										<like-outlined :style="{ color: item.isLike == 1 ? '#fa6c8d' : '' }" />
+									</a-tooltip>
+								</div> -->
 							</div>
-							<!-- <div class="ml-2" @click="giveFun(item)">
-								<a-tooltip title="点赞" :getPopupContainer="(trigger) => trigger.parentElement">
-									<like-outlined :style="{ color: item.isLike == 1 ? '#fa6c8d' : '' }" />
-								</a-tooltip>
-							</div> -->
 						</div>
 						<div
 							v-for="(item, idx) in item.recordChildList"
@@ -87,9 +90,9 @@
 			<a-row :gutter="16">
 				<a-col :span="24">
 					<a-col :span="24">
-						<a-form-item name="askType" label="请选择类型">
+						<a-form-item name="infoType" label="请选择类型">
 							<a-select
-								v-model:value="formDataAdd.askType"
+								v-model:value="formData.infoType"
 								placeholder="请选择类型"
 								style="width: 100%"
 								:options="typeOptions"
@@ -98,7 +101,7 @@
 						</a-form-item>
 					</a-col>
 					<a-form-item name="info" label="问题">
-						<xn-editor v-model="formDataAdd.info" placeholder="请输入问题" :height="400"></xn-editor>
+						<xn-editor v-model="formData.info" placeholder="请输入问题" :height="400"></xn-editor>
 					</a-form-item>
 				</a-col>
 			</a-row>
@@ -117,7 +120,7 @@
 	import XnEditor from '@/components/Editor/index.vue'
 	const userInfo = tool.data.get('USER_INFO')
 	const typeOptions = tool.dictList('CLASS_DETAIL_ASK')
-
+	const infoTypeName = computed(() => (e) => typeOptions.find((r) => r.value == e).label)
 	// 表单数据,也就是默认给一些数据
 	const visible = ref(false)
 	const formData = ref({})
@@ -128,7 +131,7 @@
 	// 默认要校验的
 	const formRules = {
 		info: [required('请输入问题')],
-		askType: [required('请选择类型')]
+		infoType: [required('请选择类型')]
 	}
 	const props = defineProps({
 		idsObj: {
@@ -193,10 +196,7 @@
 	}
 
 	const editNote = (e) => {
-		formData.value.id = e.id
-		formData.value.hourId = e.hourId
-		formData.value.info = e.info
-		itemNote.value.noteId = e.id
+		formData.value = e
 		visible.value = true
 	}
 	const delNote = (e) => {
@@ -204,7 +204,7 @@
 			title: '确定要删除笔记',
 			icon: createVNode(ExclamationCircleOutlined),
 			onOk() {
-				classCentre.askDel([{ noteId: e.noteId }]).then((data) => {
+				classCentre.askDel([{ id: e.id }]).then((data) => {
 					getList()
 				})
 			},

+ 2 - 4
src/views/student/classCentre/note.vue

@@ -57,7 +57,7 @@
 			<a-row :gutter="16">
 				<a-col :span="24">
 					<a-form-item name="noteContent" label="问题">
-						<xn-editor v-model="formDataAdd.noteContent" placeholder="请输入笔记" :height="400"></xn-editor>
+						<xn-editor v-model="formData.noteContent" placeholder="请输入笔记" :height="400"></xn-editor>
 					</a-form-item>
 				</a-col>
 			</a-row>
@@ -145,9 +145,7 @@
 			})
 	}
 	const editNote = (e) => {
-		formData.value.noteId = e.noteId
-		formData.value.noteContent = e.noteContent
-		itemNote.value.noteId = e.noteId
+		formData.value = e
 		visible.value = true
 	}
 	const delNote = (e) => {