解决部分

src/api/statisticalAnalysis/analysisTeachingActivities.js

@@ -219,9 +219,15 @@ export const getTeachingStats = (params = {}) => {
 export const documentJumpStatistic = (params = {}) => {
 	return request('teachingActivity/documentJumpStatistic', params, 'get')
 }
+export const getDiscussInteractionAnalyse = (params = {}) => {
+	return request('teachingActivity/discussInteractionAnalyse', params, 'get')
+}
 
 export const getWeeklyStats = (params = {}) => {
-	return request('teaching-analysis/weekly-stats', params, 'get')
+	return request('teachingActivity/stuWeeklyPostProgress', params, 'get')
+}
+export const getteachWeeklyStats = (params = {}) => {
+	return request('teachingActivity/teachWeeklyPostProgress', params, 'get')
 }
 // 开课每日访问人数统计
 export const getDailyVisits = (params = {}) => {
@@ -229,9 +235,12 @@ export const getDailyVisits = (params = {}) => {
 }
 
 export const getDiscussionData = (params = {}) => {
-	return request('teaching-analysis/discussions', params, 'get')
+	return request('teachingAnalysis/discussions', params, 'get')
 }
 
 export const getDocumentStats = (params = {}) => {
-	return request('teachingActivity/documentDetailStatistic', params, 'get')
+	return request('teachingActivity/courseDiscussDetail', params, 'get')
+}
+export const getDocumentDetailStatistic = (params = {}) => {
+	return request('/teachingActivity/documentDetailStatistic', params, 'get')
 }

src/components/UpLoadImg/index.vue

@@ -186,6 +186,7 @@ defineExpose({
 		margin-right: 24px;
 		border: 1px dashed #d9d9d9;
 		cursor: pointer;
+		overflow: hidden;
 
 		.cover-img {
 			width: 100%;

src/views/courseAdd/components/courseProduction/addClassHours.vue

@@ -147,6 +147,10 @@ const open = () => {
 	modeTag.value = 'add'
 	// reset()
 }
+const handleReset = () => {
+	// modeTag.value = 'add'
+	reset()
+}
 const reset = () => {
 	console.log("关掉吗")
 	formRef.value.resetFields();
@@ -162,6 +166,8 @@ const reset = () => {
 		fileNameRef.value.setData({id: "", name: ""})
 		upLoadDocRef.value.setData({id: "", name: ""})
 		UpLoadSrtRef.value.setData({id: "", name: ""})
+		emit('handlerEx', null)
+		emit('handlerExs', null)
 	})
 }
 
@@ -273,7 +279,7 @@ const edit = (item) => {
 
 }
 defineExpose({
-	getData, setFile, edit, open, reset
+	getData, setFile, edit, open, reset,handleReset
 })
 
 </script>

src/views/courseAdd/components/courseProduction/addDialog.vue

@@ -98,7 +98,7 @@ const open = () => {
 	activeKey.value = '1'
 	modeTag.value = 'add'
 	nextTick(() => {
-		// addClassHoursRef.value.handleReset()
+		addClassHoursRef.value.handleReset()
 		addClassHoursRef.value.open()
 		item1.value = item1.value+1
 

src/views/exm/exampaper/form.vue

@@ -237,6 +237,8 @@
 				currentTitleItem.value.questionItems.push(re)
 			})
 			questionPage.showDialog = false
+			questionPage.queryParam.id = ""
+			questionPage.queryParam.questionType =""
 		})
 	}
 	function levelChange() {

src/views/myResources/coverUpload/index.vue

@@ -24,7 +24,7 @@
 		</a-upload>
 		<div class="preview-area" v-if="previewImageUrl">
 			<a-image
-				:width="200"
+				:width="120"
 				:height="120"
 				:src="previewImageUrl"
 				:preview="{
@@ -172,8 +172,10 @@
 
 <style lang="less">
 .preview-area{
+	overflow: hidden;
+
 	.ant-image-img{
-		width: 200px;
+		width: 120px;
 		height: 120px;
 	}
 }

src/views/resourceDetails/components/VideoDetails.vue

@@ -9,75 +9,43 @@
 
 
 			<div style="display: flex; width: 100%">
-				<div class="video-info" style="width: 1206px; background: white">
+				<div class="video-info" style="width: 850px">
 					<div
-						v-if="videoFormat == 'jpg' || videoFormat == 'bmp' || videoFormat == 'png' || videoFormat == 'jpeg'"
+						v-if="['jpg', 'bmp', 'png', 'jpeg'].includes(videoFormat)"
 						style="width: 850px; height: 350px"
 					>
 						<!-- <img :src="imgs + itemData.coverImagePath" style="width: 100%; height: 100%" /> -->
 						<!-- <img :v-lazy="imagess" style="width: 100%; height: 100%" /> -->
-						<a-image width="1206px" height="600px" :src="resSrc" :preview="true" />
+						<a-image width="850px" height="350px" :src="resSrc" :preview="true" />
 						<!-- <image :src="resSrc" style="object-fit: cover" /> -->
 					</div>
 					<!-- "wmv","avi","flv","mpeg","mpg","rmvb","mov","mkv" -->
-
 					<div
-						v-if="
-						videoFormat == 'mkv' ||
-						videoFormat == 'mp4' ||
-						videoFormat == 'wmv' ||
-						videoFormat == 'avi' ||
-						videoFormat == 'flv' ||
-						videoFormat == 'mpeg' ||
-						videoFormat == 'mpg' ||
-						videoFormat == 'rmvb' ||
-						videoFormat == 'mov'
-					"
-						style="width: 100%; height: 600px"
+						v-else-if="['mkv', 'mp4', 'wmv', 'avi', 'flv', 'mpeg', 'mpg', 'rmvb', 'mov'].includes(videoFormat)"
+						style="width: 850px; height: 350px"
 					>
 						<video :src="resSrc" controls style="width: 100%; height: 100%" />
 					</div>
 					<!-- "doc","docx","ppt","pptx","xls","xlsx" -->
-<!--					'jpg','png','pdf','mp4','wmv','avi','flv','mpeg','mpg','rmvb','mov','mkv','docx','doc','xlsx','xls','pptx','ppt','txt','cad','zip','rar','dwg','dxf','dwt'-->
 					<div
-						v-if="
-						videoFormat == 'docx' ||
-						videoFormat == 'doc' ||
-						videoFormat == 'ppt' ||
-						videoFormat == 'pptx' ||
-						videoFormat == 'xls' ||
-						videoFormat == 'xlsx' ||
-						videoFormat == 'pdf'
-					"
-						style="width: 1206px; height: 600px"
+						v-else-if="['docx', 'doc', 'ppt', 'pptx', 'xls', 'xlsx', 'pdf'].includes(videoFormat)"
+						style="width: 850px; height: 350px"
 					>
 						<!-- <PDF :src="resSrc" :width="850" :height="350" /> -->
 						<FilePreviewer :fileUrl="resSrc" :fileName="resName" :fileType="fileType" />
 						<!-- <a-image width="200px" height="220px" :src="pdfRes" :preview="false" @click="handleDownload(resSrc)" /> -->
 						<!-- <a-button type="primary" @click="handleDownload(resSrc)">去预览</a-button> -->
 					</div>
-<!--					'jpg','png','pdf','mp4','docx','doc','xlsx','xls','pptx','ppt','txt','cad','zip','rar','dwg','dxf','dwt'-->
-<!--					'cad','zip','rar','dwg','dxf','dwt'-->
 					<div
-
-						v-if="
-						videoFormat == 'txt' ||
-						videoFormat == 'cad' ||
-						videoFormat == 'zip' ||
-						videoFormat == 'rar' ||
-						videoFormat == 'dwg' ||
-						videoFormat == 'dxf' ||
-						videoFormat == 'dwt'
-					"
-						style="width: 1206px; height: 600px; display: flex; justify-content: center; align-items: center;"
+						v-else
+						style="width: 850px; height: 350px;	border: 1px solid #dfe2e5; display: flex; justify-content: center; align-items: center"
 					>
-<!--						<span style="display: block; font-weight: bold">{{resName}}</span>-->
-						<a-image :src="coverImagePath" width="400px" height="400px" ></a-image>
+						<span style="display: block">本资源格式不可预览</span>
 						<!-- <PDF :src="resSrc" :width="850" :height="350" /> -->
-<!--						<FilePreviewer :fileUrl="resSrc" :fileName="resName" :fileType="fileType" />-->
 						<!-- <a-image width="200px" height="220px" :src="pdfRes" :preview="false" @click="handleDownload(resSrc)" /> -->
 						<!-- <a-button type="primary" @click="handleDownload(resSrc)">去预览</a-button> -->
 					</div>
+					<div style="height: 20px"></div>
 					<!-- 用户信息部分 -->
 					<div class="user-info" style="display: flex; flex-direction: column">
 						<div style="display: flex; align-items: center; justify-content: space-between; width: 100%">

src/views/statisticalAnalysis/analysisLearningBehaviors/index.vue

@@ -426,6 +426,12 @@
 				await initCollegeCharts()
 			})
 		}
+		if (tabName === 'student') {
+			nextTick(async () => {
+				await searchStudent()
+
+			})
+		}
 	}
 	const formatDateWithDays = (days = 0) => {
 		const date = new Date();

src/views/statisticalAnalysis/analysisTeachingActivities/index.vue

@@ -48,7 +48,7 @@
 				<div class="stat-label">总观看人数</div>
 				<div class="stat-number">{{ stats.alreadyUserCount }}</div>
 				<div class="stat-label">完成观看人数</div>
-				<div class="completion-rate">{{tool.formatValue(stats.finishRate) }}</div>
+				<div class="completion-rate">{{tool.formatValue(stats.docFinishRate) }}</div>
 				<div class="stat-label">完成率</div>
 			</div>
 
@@ -56,7 +56,7 @@
 				<h3>🚪 文档跳出分析</h3>
 				<div class="stat-number">{{ stats.allHourCount }}</div>
 				<div class="stat-label">总跳出次数</div>
-				<div class="stat-number">{{tool.formatValue(stats.allHourCount)  }}</div>
+				<div class="stat-number">{{tool.formatValue(stats.finishRate)  }}</div>
 				<div class="stat-label">跳出率</div>
 				<div class="stat-number">{{ stats.jumpAvgTime }}</div>
 				<div class="stat-label">平均跳出时间</div>
@@ -64,11 +64,11 @@
 
 			<div class="stat-card" v-if="forumType">
 				<h3>💬 讨论互动统计</h3>
-				<div class="stat-number">{{ stats.totalDiscussions }}</div>
+				<div class="stat-number">{{ stats.postCount }}</div>
 				<div class="stat-label">讨论总数</div>
-				<div class="stat-number">{{ stats.totalReplies }}</div>
+				<div class="stat-number">{{ stats.replyCount }}</div>
 				<div class="stat-label">回帖总数</div>
-				<div class="stat-number">{{ stats.avgRepliesPerDiscussion }}</div>
+				<div class="stat-number">{{ stats.avgReplyCount }}</div>
 				<div class="stat-label">平均回帖数</div>
 			</div>
 		</div>
@@ -83,21 +83,21 @@
 		<div class="weekly-stats" v-if="forumType">
 			<div class="weekly-card">
 				<h4>👨‍🎓 学员每周发帖统计</h4>
-				<div class="weekly-number">{{ weeklyStats.studentWeeklyPosts }}</div>
+				<div class="weekly-number">{{ weeklyStats.weekPostCount }}</div>
 				<div class="weekly-label">本周发帖数</div>
-				<div class="weekly-number">{{ weeklyStats.studentWeeklyReplies }}</div>
+				<div class="weekly-number">{{ weeklyStats.weekReplyCount }}</div>
 				<div class="weekly-label">本周回帖数</div>
-				<div class="weekly-number">{{ weeklyStats.studentAvgPostsPerDay }}</div>
+				<div class="weekly-number">{{ weeklyStats.weekAvgPostCount }}</div>
 				<div class="weekly-label">日均发帖数</div>
 			</div>
 
 			<div class="weekly-card">
 				<h4>👨‍🏫 教员每周发帖统计</h4>
-				<div class="weekly-number">{{ weeklyStats.teacherWeeklyPosts }}</div>
+				<div class="weekly-number">{{ teachweeklyStats.weekPostCount }}</div>
 				<div class="weekly-label">本周发帖数</div>
-				<div class="weekly-number">{{ weeklyStats.teacherWeeklyReplies }}</div>
+				<div class="weekly-number">{{ teachweeklyStats.weekReplyCount }}</div>
 				<div class="weekly-label">本周回帖数</div>
-				<div class="weekly-number">{{ weeklyStats.teacherAvgPostsPerDay }}</div>
+				<div class="weekly-number">{{ teachweeklyStats.weekAvgPostCount }}</div>
 				<div class="weekly-label">日均发帖数</div>
 			</div>
 		</div>
@@ -133,15 +133,17 @@
 <script setup>
 import {ref, reactive, onMounted, nextTick, h, computed} from 'vue'
 	import * as echarts from 'echarts'
-	import {
-		getCourseOptions,
-		getTeachingStats,
-		documentJumpStatistic,
-		getWeeklyStats,
-		getDailyVisits,
-		getDiscussionData,
-		getDocumentStats
-	} from '@/api/statisticalAnalysis/analysisTeachingActivities'
+import {
+	getCourseOptions,
+	getTeachingStats,
+	documentJumpStatistic,
+	getDiscussInteractionAnalyse,
+	getWeeklyStats,
+	getteachWeeklyStats,
+	getDailyVisits,
+	getDiscussionData,
+	getDocumentStats, getDocumentDetailStatistic
+} from '@/api/statisticalAnalysis/analysisTeachingActivities'
 	import tool from '@/utils/tool'
 import dayjs from "dayjs";
 // 课程选项
@@ -170,6 +172,15 @@ const times = ref([])
 		teacherAvgPostsPerDay: 0
 	})
 
+	const teachweeklyStats = reactive({
+		studentWeeklyPosts: 0,
+		studentWeeklyReplies: 0,
+		studentAvgPostsPerDay: 0,
+		teacherWeeklyPosts: 0,
+		teacherWeeklyReplies: 0,
+		teacherAvgPostsPerDay: 0
+	})
+
 
 
 	// 图表引用
@@ -180,28 +191,23 @@ const times = ref([])
 	const discussionColumns = [
 		{
 			title: '讨论主题',
-			dataIndex: 'title',
-			key: 'title'
+			dataIndex: 'postTitle',
+			key: 'postTitle'
 		},
 		{
-			title: '发起人',
-			dataIndex: 'author',
-			key: 'author'
+			title: '回帖数',
+			dataIndex: 'postCount',
+			key: 'postCount'
 		},
 		{
 			title: '发起时间',
-			dataIndex: 'createTime',
-			key: 'createTime'
-		},
-		{
-			title: '回帖数',
-			dataIndex: 'replyCount',
-			key: 'replyCount'
+			dataIndex: 'postCreateTime',
+			key: 'postCreateTime'
 		},
 		{
 			title: '最后回复',
-			dataIndex: 'lastReplyTime',
-			key: 'lastReplyTime'
+			dataIndex: 'postLastReplyTime',
+			key: 'postLastReplyTime'
 		}
 	]
 
@@ -220,54 +226,59 @@ const times = ref([])
 			dataIndex: 'fileName',
 			key: 'fileName'
 		},
+		{
+			title: '所属课程',
+			dataIndex: 'courseHourName',
+			key: 'courseHourName'
+		},
 		{
 			title: '文档类型',
-			dataIndex: 'extendName',
-			key: 'extendName',
+			dataIndex: 'suffix',
+			key: 'suffix',
 			width: '100px'
 		},
 		{
 			title: '观看人数',
-			dataIndex: 'seeNum',
-			key: 'seeNum',
+			dataIndex: 'watchUserCount',
+			key: 'watchUserCount',
 			width: '100px'
 		},
 		{
 			title: '完成人数',
-			dataIndex: 'finishNum',
-			key: 'finishNum',
+			dataIndex: 'completeUserCount',
+			key: 'completeUserCount',
 			width: '100px'
 		},
 		{
 			title: '完成率',
-			dataIndex: 'finishRate',
-			key: 'finishRate',
+			dataIndex: 'completeRate',
+			key: 'completeRate',
 			customRender: ({ text }) => {
 				const rate = parseFloat(text)
 				const className = rate >= 70 ? 'completion-rate' : rate < 50 ? 'low-engagement' : ''
-				return h('span', { class: className }, `${text}%`)
+				return h('span', { class: className }, `${tool.formatValue(text)}`)
 			}
 		},
 		{
 			title: '平均阅读时长',
-			dataIndex: 'jumpAvgTime',
-			key: 'jumpAvgTime',
+			dataIndex: 'readAvgTime',
+			key: 'readAvgTime',
 			width: '130px'
 		},
 		{
 			title: '跳出率',
-			dataIndex: 'jumpRate',
-			key: 'jumpRate',
+			dataIndex: 'jumpOutRate',
+			key: 'jumpOutRate',
 			customRender: ({ text }) => {
 				const rate = parseFloat(text)
 				const className = rate > 30 ? 'low-engagement' : ''
-				return h('span', { class: className }, `${text}%`)
+				return h('span', { class: className }, `${tool.formatValue(text)}`)
 			}
 		},
 		{
 			title: '下载次数',
-			dataIndex: 'downNum',
-			key: 'downNum',
+			dataIndex: 'downloadCount',
+			key: 'downloadCount',
 			width: '100px'
 		}
 	]
@@ -444,8 +455,14 @@ const times = ref([])
 				startTime: filters.startTime,
 				endTime: filters.endTime,
 			})
+			const analyse = await getDiscussInteractionAnalyse({
+				courseId: filters.courseId,
+				startTime: filters.startTime,
+				endTime: filters.endTime,
+			})
 
-			Object.assign(stats, response, statistic)
+			Object.assign(stats, response, statistic,analyse)
+			console.log('上面呢',stats)
 		} catch (error) {
 			console.error('获取统计数据失败:', error)
 		}
@@ -458,6 +475,11 @@ const times = ref([])
 				courseId: filters.courseId
 			})
 			Object.assign(weeklyStats, response)
+
+			const responseteach = await getteachWeeklyStats({
+				courseId: filters.courseId
+			})
+			Object.assign(teachweeklyStats, responseteach)
 		} catch (error) {
 			console.error('获取每周统计数据失败:', error)
 		}
@@ -480,14 +502,14 @@ const times = ref([])
 	// 获取讨论数据
 	const loadDiscussionData = async () => {
 		try {
-			const response = await getDiscussionData({
+			const response = await getDocumentStats({
 				courseId: filters.courseId,
 				startTime: filters.startTime,
 				endTime: filters.endTime,
 				page: discussionPagination.current,
 				pageSize: discussionPagination.pageSize
 			})
-			discussionData.value = response.list
+			discussionData.value = response.records
 			discussionPagination.total = response.total
 		} catch (error) {
 			console.error('获取讨论数据失败:', error)
@@ -497,15 +519,17 @@ const times = ref([])
 	// 获取文档数据
 	const loadDocumentData = async () => {
 		try {
-			const response = await getDocumentStats({
+			const response = await getDocumentDetailStatistic({
 				courseId: filters.courseId,
-				page: documentPagination.current,
-				pageSize: documentPagination.pageSize,
+				current: documentPagination.current,
+				size: documentPagination.pageSize,
 				startTime: filters.startTime,
 				endTime: filters.endTime,
 			})
-			documentData.value = response
+			documentData.value = response.records
 			documentPagination.total = response.total
+			documentPagination.pageSize = response.size
+			documentPagination.current = response.current
 		} catch (error) {
 			console.error('获取文档数据失败:', error)
 		}

src/views/statisticalAnalysis/overviewLearningProgress/index.vue

@@ -83,7 +83,7 @@
 				<a-table
 					:columns="tableColumns"
 					:data-source="tableData"
-					:pagination="false"
+					:pagination="pagination"
 					:loading="loading"
 					size="small"
 				></a-table>
@@ -120,9 +120,23 @@
 	const filters = reactive({
 		courseId: '',
 		startTime: undefined,
-		endTime: undefined
-	})
+		endTime: undefined,
 
+	})
+	// 分页配置
+	const pagination = reactive({
+		current: 1,
+		size: 10,
+		total: 0,
+		showSizeChanger: true,
+		showQuickJumper: true,
+		showTotal: (total, range) => `显示 ${range[0]}-${range[1]} 条，共 ${total} 条`,
+		onChange: (page, pageSize) => {
+			pagination.current = page
+			pagination.size = pageSize
+			fetchStudyDetail()
+		}
+	})
 	// 统计卡片数据
 	const statsCards = reactive([
 		{
@@ -340,10 +354,16 @@
 		try {
 			const params = {
 				courseId: filters.courseId,
+				current : pagination.current,
+				size : pagination.size,
 				startTime: startDate.value ? startDate.value.format('YYYY-MM-DD') : filters.startTime,
 				endTime: endDate.value ? endDate.value.format('YYYY-MM-DD') : filters.endTime
 			}
 			const data = await overviewLearningProgressApi.getStudyDetail(params)
+
+			pagination.current = data.current
+			pagination.total = data.total
+
 			// 更新表格数据
 			tableData.value = (data.records || []).map((item, index) => ({
 				...item,

src/views/statisticalAnalysis/platformStatusOverview/index.vue

@@ -154,7 +154,7 @@
 			align: 'center',
 			customRender: ({ record }) => {
 				console.log("分析呢",record)
-				return h('button', { class: 'btn-view', onClick: () => showVisitModal(record.id) }, '查看')
+				return h('button', { class: 'btn-view', onClick: () => showVisitModal(record.id,record.name) }, '查看')
 			}
 		}
 	]
@@ -215,8 +215,8 @@
 	}
 
 	// 显示访问统计弹窗
-	const showVisitModal = async (courseId) => {
-		modalTitle.value = `${courseId} - 近7天访问统计`
+	const showVisitModal = async (courseId,name) => {
+		modalTitle.value = `${name} - 近7天访问统计`
 		visitModalVisible.value = true
 
 		try {

src/views/statisticalAnalysis/videoAnalysis/index.vue

@@ -50,7 +50,6 @@
 			</div>
 
 			<div class="stat-card" v-if="stats.downData">
-
 				<h3>📥 讲义下载统计</h3>
 				<div class="stat-number">{{ stats.downData.allDownloadCount }}</div>
 				<div class="stat-label">总下载次数</div>
@@ -121,7 +120,7 @@
 					<template v-if="column.key === 'finishRate'">
 						<div class="progress-container">
 							<a-progress :percent="record.finishRate * 100" size="small" />
-							<span :class="{ 'low-engagement': record.finishRate * 100 < 50 }"> {{ record.finishRate * 100 }}% </span>
+<!--							<span :class="{ 'low-engagement': record.finishRate * 100 < 50 }"> {{ record.finishRate * 100 }}% </span>-->
 						</div>
 					</template>
 					<template v-else-if="column.key === 'jumpTimeContact'">
@@ -145,16 +144,13 @@
 				<template #bodyCell="{ column, record }">
 					<template v-if="column.key === 'completeRate'">
 						<span
-							:class="{
-								'completion-rate': record.completeRate * 100 >= 70,
-								'low-engagement': record.completeRate * 100 < 70
-							}"
+							class="low-engagement"
 						>
 							{{ record.completeRate * 100 }}%
 						</span>
 					</template>
 					<template v-else-if="column.key === 'jumpOutRate'">
-						<span :class="{ 'low-engagement': record.jumpOutRate * 100 > 25 }"> {{ record.jumpOutRate * 100 }}% </span>
+						<span class="low-engagement"> {{ record.jumpOutRate * 100 }}% </span>
 					</template>
 				</template>
 			</a-table>
@@ -239,7 +235,7 @@
 		showTotal: (total, range) => `显示 ${range[0]}-${range[1]} 条，共 ${total} 条`,
 		onChange: (page, pageSize) => {
 			pagination.current = page
-			pagination.pageSize = pageSize
+			pagination.size = pageSize
 			fetchStudentData()
 		}
 	})
@@ -536,7 +532,6 @@
 				jumpData,
 				interdata
 			})
-			console.log('新的参数呢',stats)
 		} catch (error) {
 			console.error('获取统计数据失败:', error)
 			message.error('获取统计数据失败')
@@ -549,7 +544,7 @@
 			const response = await videoAnalysisApi.studyBehaviorDetailData({
 				...filters,
 				current: pagination.current,
-				pageSize: pagination.pageSize
+				size: pagination.pageSize
 			})
 			const data = response.records || []
 			studentData.value = data.map((r) => {
@@ -571,7 +566,7 @@
 			const response = await videoAnalysisApi.videoDetailDataAnalysis({
 				...filters,
 				current: chapterPagination.current,
-				pageSize: chapterPagination.pageSize
+				size: chapterPagination.pageSize
 			})
 			chapterData.value = response.records || []
 			chapterPagination.total = response.total || 0