登陆问题处理

src/router/index.js

@@ -67,7 +67,7 @@ router.beforeEach(async (to, from, next) => {
 	}
 
 	const token = tool.data.get('TOKEN')
-	if (to.path === '/login') {
+	if (to.path === '/slogin') {
 		// 当用户输入了login路由，将其跳转首页即可
 		if (token) {
 			next({

src/router/whiteList.js

@@ -45,10 +45,6 @@ const constRouters = [
 	{
 		path: '/slogin',
 		component: () => import('@/views/slogin/login.vue')
-	},
-	{
-		path: '/tlogin',
-		component: () => import('@/views/tlogin/login.vue')
 	}
 ]
 /**

src/views/slogin/login.vue

@@ -88,8 +88,8 @@
 				captchaOpen: config.SYS_BASE_CONFIG.SNOWY_SYS_DEFAULT_CAPTCHA_OPEN,
 				validCodeBase64: '',
 				ruleForm: {
-					account: 'superAdmin',
-					password: '123456',
+					account: '',
+					password: '',
 					validCode: '',
 					validCodeReqNo: '',
 					autologin: false

src/views/student/In-site-message/index.vue

@@ -4,7 +4,7 @@
 			<a-list :data-source="messageList" size="small" :loading="miniMessageLoading">
 				<template #renderItem="{ item }">
 					<a-list-item>
-						<a-list-item-meta :description="item.createTime">
+						<a-list-item-meta :description="formatDateTime(item.createTime)">
 							<template #title>
 								<a @click="messageDetail(item)">{{ item.subject }}</a>
 							</template>
@@ -19,7 +19,7 @@
 					<span>{{ formData.subject }}</span>
 				</a-form-item>
 				<a-form-item label="发送时间：" name="createTime">
-					<span>{{ formData.createTime }}</span>
+					<span>{{ formatDateTime(formData.createTime)}}</span>
 				</a-form-item>
 				<a-form-item label="内容：" name="content">
 					<span>{{ formData.content }}</span>
@@ -33,6 +33,7 @@
 						:showPagination="false"
 						bordered
 						:row-key="(record) => record.id"
+						:scroll="{x:'auto'}"
 					>
 						<template #bodyCell="{ column, record }">
 							<template v-if="column.dataIndex === 'read'">
@@ -51,6 +52,11 @@
 	import indexApi from '@/api/sys/indexApi'
 	import { onMounted } from 'vue'
 	import router from '@/router'
+	import { parseTime } from '@/utils/exam'
+	const formatDateTime = (val) => {
+		if (!val) return ''
+		return parseTime(val, '{y}-{m}-{d} {h}:{i}:{s}')
+	}
 	const miniMessageLoading = ref(false)
 	const messageList = ref([])
 	const miniMessageBodyStyle = ref({

src/views/student/exam/paper/do.vue

@@ -68,7 +68,7 @@
 				</a-form>
 			</a-layout-content>
 		</a-layout>
-		<forumBtn :forumData="forumData" :resourceType="resourceType"></forumBtn>
+		<forumBtn :forumData="forumData" :resourceType="resourceType" :isShow="[1,2,3]"></forumBtn>
 	</div>
 </template>
 
@@ -160,9 +160,9 @@
 				Modal.success({
 					title: '考试结果',
 					content: `试卷得分：${re}分`,
-					okText: '返回考试记录',
+					okText: '返回',
 					onOk: () => {
-						router.push('/student/record/')
+						router.back()
 					}
 				})
 				formLoading.value = false
@@ -178,7 +178,6 @@
 			formLoading.value = true
 			examPaperApi.select(id).then((re) => {
 				Object.assign(form, re)
-				console.log('🚀 ~ form:', form)
 				remainTime.value = re.suggestTime * 60
 				initAnswer()
 				timeReduce()

src/views/student/exam/paper/edit.vue

@@ -68,6 +68,7 @@
 				</a-spin>
 			</a-layout-content>
 		</a-layout>
+		<forumBtn :forumData="forumData" :resourceType="resourceType" :isShow="[1,2,3]"></forumBtn>
 	</div>
 </template>
 
@@ -146,7 +147,20 @@
 				formLoading.value = false
 			})
 	}
-
+	const resourceType = computed(() => {
+		//考试
+		if (form.examType == 1 || form.paperType == 6) {
+			return 2
+		}
+		//调查问卷
+		if (form.examType == 3 || form.paperType == 5) {
+			return 2
+		}
+		//作业
+		if (form.paperType == 2) {
+			return 1
+		}
+	})
 	onMounted(() => {
 		const id = route.query.id
 		if (id && parseInt(id) !== 0) {

src/views/student/exam/paper/read.vue

@@ -56,7 +56,7 @@
 				</a-spin>
 			</a-layout-content>
 		</a-layout>
-		<forumBtn :forumData="forumData"></forumBtn>
+		<forumBtn :forumData="forumData" :resourceType="resourceType" :isShow="[1,2,3]"></forumBtn>
 	</div>
 </template>
 
@@ -96,7 +96,20 @@
 			}
 		})
 	}
-
+	const resourceType = computed(() => {
+		//考试
+		if (form.examType == 1 || form.paperType == 6) {
+			return 2
+		}
+		//调查问卷
+		if (form.examType == 3 || form.paperType == 5) {
+			return 2
+		}
+		//作业
+		if (form.paperType == 2) {
+			return 1
+		}
+	})
 	onMounted(() => {
 		const id = route.query.id
 		if (id && parseInt(id) !== 0) {