一些bug

.env.development245

@@ -0,0 +1,18 @@
+# 本地环境
+NODE_ENV = development
+
+# 标题
+VITE_TITLE = 飞行学院
+
+# 接口地址
+VITE_API_BASEURL = http://192.168.1.245:9003
+# VITE_API_BASEURL = http://192.168.31.81:19003
+VITE_FILEURL = http://192.168.1.245:10005/education/
+# VITE_API_BASEURL = http://192.168.31.14:9003
+# VITE_API_BASEURL = http://192.168.31.6:9003
+
+# 本地端口
+VITE_PORT = 9000
+
+# 开启设置抽屉
+VITE_SET_DRAWER = true

package.json

@@ -9,6 +9,7 @@
 	"scripts": {
 		"serve": "vite --host 0.0.0.0",
 		"dev": "vite --mode development --host 0.0.0.0",
+		"dev245": "vite --mode development245 --host 0.0.0.0",
 		"preview": "vite preview",
 		"build": "vite build --mode production",
 		"prod": "vite  --mode production"

src/views/exm/examinationManagement/form.vue

@@ -27,7 +27,7 @@
 						readonly
 						style="width: calc(100% - 100px)"
 					/>
-					<a-button type="primary" @click="addPaper" style="width: 100px">选择试卷</a-button>
+					<a-button type="primary" @click="addPaper" style="width: 100px"  :disabled="!form.examType">选择试卷</a-button>
 				</a-input-group>
 			</a-form-item>
 			<a-form-item v-if="form.gradesIdsList.length === 0" label="学期" name="semesterId" :rules="rules.semesterId">

src/views/exm/question/edit/single-choice.vue

@@ -75,7 +75,7 @@
 					<a-button danger size="small" class="question-item-remove" @click="questionItemRemove(index)">删除</a-button>
 				</div>
 			</a-form-item>
-			<a-form-item label="解析：" name="analyze" required>
+			<a-form-item label="解析：1" name="analyze" required>
 				<div
 					v-if="form.analyze"
 					class="rich-text-preview"

src/views/exm/question/index.vue

@@ -342,7 +342,7 @@
 		// })
 	}
 	const downloadTemplate = () => {
-		window.open(`${config.API_URL}/api/webapp/dev/file/download?id=1955542101022437377`)
+		window.open(`${config.FILE_URL}题目导入模版.xlsx`)
 	}
 </script>
 

src/views/exm/question/style/common.less

@@ -7,7 +7,7 @@
 	cursor: pointer;
 	transition: all 0.2s;
 	line-height: 1.5715;
-	display: flex;
+	//display: flex;
 	overflow: auto;
 
 	&:hover {

src/views/forum/index.vue

@@ -23,7 +23,7 @@
 				/>
 				<a-select
 					v-model:value="typeVal"
-					placeholder="所有分类"
+					placeholder="所有类型"
 					style="width: 110px"
 					:options="typeOptionsVal"
 					@change="handleChangeVal"
@@ -32,7 +32,7 @@
 				<a-select
 					v-if="typeVal == 0"
 					v-model:value="typeValue"
-					placeholder="所有分类"
+					placeholder="所有类型"
 					style="width: 100px"
 					:options="typeOptions"
 					@change="handleChange"
@@ -178,7 +178,7 @@
 			width: 120
 		}
 	]
-	const typeVal = ref('所有分类')
+	const typeVal = ref('所有类型')
 	const typeOptionsVal = ref([
 		{
 			label: '普通帖子',

src/views/forum/reportForm.vue

@@ -120,8 +120,9 @@
 	const visibleOptions = tool.dictList('MENU_VISIBLE')
 	// 验证并提交数据
 	const onSubmit = () => {
-		submitLoading.value = true
+
 		formRef.value.validate().then(() => {
+			submitLoading.value = true
 			forumApi
 				.reportinfoAdd({
 					...formData.value,

src/views/portal/components/Header.vue

@@ -6,7 +6,7 @@
 		<div style="display: flex; width: 100%; justify-content: center; align-items: center; position: relative; background: white ">
 			<div style="display: flex;width: 1624px ;justify-content: space-between; ">
 				<div style="display: flex; padding-left: 0%; ">
-					<a-menu v-model:selectedKeys="current"  mode="horizontal" theme="light"  >
+					<a-menu v-model:selectedKeys="current"  mode="horizontal" theme="light" @click="onClick" >
 							<a-menu-item style="margin-left: 1px; margin-right: 1px" key="">资源中心</a-menu-item>
 						<a-sub-menu  key="course">
 							<template #title>
@@ -102,7 +102,7 @@
 		(newVal, oldVal) => {
 			if (newVal != oldVal) {
 				// emit('onChangeCurrent', newVal)
-				onChangeCurrent(newVal)
+				// onChangeCurrent(newVal)
 			}
 		}
 	)
@@ -110,7 +110,12 @@
 	const list = ref([
 	]);
 
-
+	const onClick = (e) => {
+		console.log('Header.vue: onClick. e:', e);
+		onChangeCurrent(e.key)
+		// current.value = [e.key]
+		// router.push(e.key)
+	}
 
 // 	<a-menu-item style="margin-left: 1px; margin-right: 1px" key="">资源中心</a-menu-item>
 // 	<a-menu-item style="margin-left: 1px; margin-right: 1px" key="portal/personalResources">个人资源</a-menu-item>

src/views/portal/components/UserHeader.vue

@@ -1,22 +1,24 @@
 <template>
 	<div>
-
-		<a-badge :count="allCount" :offset=[x,y]>
 		<a-dropdown >
+
+
 			<div style="display: flex;  justify-content: center;  align-items: center">
-				<div v-if="userInfo && userInfo.avatar" class="account-center-avatarHolder" style="margin-top: 0px; ">
-					<div class="avatar">
-						<a-spin size="small" :spinning="false">
-							<img :src="userInfo.avatar" />
-						</a-spin>
-						<!--						<a @click="uploadLogo">-->
-						<!--							<div :class="userInfo.avatar ? 'mask' : 'mask-notImg'"><upload-outlined /></div>-->
-						<!--						</a>-->
+				<a-badge :count="allCount" :offset=[x,y]>
+					<div v-if="userInfo && userInfo.avatar" class="account-center-avatarHolder" style="margin-top: 0px; ">
+						<div class="avatar">
+							<a-spin size="small" :spinning="false">
+								<img :src="userInfo.avatar" />
+							</a-spin>
+							<!--						<a @click="uploadLogo">-->
+							<!--							<div :class="userInfo.avatar ? 'mask' : 'mask-notImg'"><upload-outlined /></div>-->
+							<!--						</a>-->
+						</div>
 					</div>
-
+				</a-badge>
+				<div style="display: inline ">
+					<span style="cursor: pointer;  margin-left: 10px">{{userInfo.name}}</span>
 				</div>
-
-
 			</div>
 
 			<template #overlay>
@@ -55,10 +57,8 @@
 			</template>
 
 		</a-dropdown>
-		</a-badge>
-		<div style="display: inline ">
-			<span style="cursor: pointer;  margin-left: 10px">{{userInfo.name}}</span>
-		</div>
+
+
 	</div>
 </template>
 
@@ -88,6 +88,7 @@
 
 
 	const userInfo = computed(() => {
+		console.log('用户信息',global_store.userInfo)
 		return global_store.userInfo
 	})
 

src/views/resourceCenter/components/ComplexChoices.vue

@@ -77,7 +77,7 @@
 		<!-- 课程类型和课件格式（联动单选） -->
 		<div class="filter-group">
 			<span class="filter-group-title">资源类型:</span>
-			<!-- <a-radio-group v-model:value="selectedType" @change="handleTypeChange">
+			<!-- <a-radio-group v-model:value="selectedType" @change="handleTypeChange">/
 				<a-radio-button v-for="dept in selectedTypes" :key="dept" :value="dept">{{ dept }}</a-radio-button>
 			</a-radio-group> -->
 			<a-spin :spinning="spinningSelectedTypesBig" tip="">
@@ -250,6 +250,7 @@
 
 	const selectedTypesBigList = ref([])
 	const selectedTypesList = ref([])
+	const selectedTypesLists = ref([])
 	const handleSelectedDept = (e) => {
 		if (e == 0) {
 			selectedDeptBigs.value = []
@@ -310,13 +311,15 @@
 		updateSelectedTags()
 	}
 	const handleTypeChange = (e) => {
-		console.log('handleTypeChange', ' e ', e, selectedTypes.value)
+
+		let item  = selectedTypes.value[e]
+		console.log('handleTypeChange', ' e ', e, ' selectedTypes ',selectedTypes.value,selectedTypesLists.value,' item ',item , ' selectedTypesLists.value[item.id] ',selectedTypesLists.value[item.parentId])
 		if (e == 0) {
 			selectedTypesSmail.value = []
 		} else {
-			selectedTypesSmail.value = selectedTypesList.value[e - 1]
+			selectedTypesSmail.value = selectedTypesLists.value[item.parentId] ?selectedTypesLists.value[item.parentId] : []
 		}
-
+		console.log('handleTypeChange 应该显示',selectedTypesSmail.value)
 		// selectedFormat.value = undefined // 选择课程类型时，重置课件格式
 		// updateSelectedTags()
 		updateSelectedTags()
@@ -519,6 +522,11 @@
 			Type.value.setClean(-1)
 			selectedType.value = -1
 		}
+		if (tag.key == 'resourceThreeType') {
+
+			TypeSmail.value.setClean(-1)
+			selectedTypeSmail.value = -1
+		}
 		if (tag.key == 'resourceType') {
 			Type.value.setClean(-1)
 			selectedType.value = -1
@@ -574,7 +582,8 @@
 		selectedType.value = -1
 		TypeBig.value.setClean(-1)
 		selectedTypeBig.value = -1
-
+		TypeSmail.value.setClean(-1)
+		selectedTypeSmail.value = -1
 		Smail.value.setClean(-1)
 		selectedDeptSmail.value = -1
 		Smail.value.setClean(-1)
@@ -626,19 +635,22 @@
 		spinningSelectedTypesBig.value = true
 		getQueryTreeAll().then((data) => {
 			selectedTypesBig.value = data.data
-			selectedTypesBig.value.forEach((item) => {
+			selectedTypesBig.value.forEach((item,index) => {
 				selectedTypesBigList.value.push(item.children)
 				if (item.children) {
-					item.children.forEach((item) => {
-						if (item.children) {
-							selectedTypesList.value.push(item.children)
+					item.children.forEach((iitem,iindex) => {
+
+						if (iitem.children) {
+							selectedTypesList.value = iitem.children
+
+							selectedTypesLists.value[iitem.parentId] = selectedTypesList.value
 						}
 					})
 				}
 			})
 			spinningSelectedTypesBig.value = false
 		})
-		console.log('有数据吗',selectedTypesList.value)
+		console.log('有数据吗',selectedTypesLists.value)
 		spinningSelectedFormats.value = true
 		getAllListFileFormat().then((data) => {
 			selectedFormats.value = data.data

src/views/resourceDetails/components/VideoDetails.vue

@@ -395,6 +395,7 @@
 	)
 	onMounted(() => {
 		fetchData()
+		// EventBus.emit('onSetHeader','66')
 	})
 
 	const upDataDetailsNum = () => {

src/views/statisticalAnalysis/analysisTeachingActivities/index.vue

@@ -731,6 +731,7 @@
 	:deep(.completion-rate) {
 		color: #27ae60;
 		font-weight: bold;
+		font-size: 2.5em;
 	}
 
 	:deep(.low-engagement) {