于添 il y a 5 mois
Parent
commit
0be9fe1130

+ 18 - 0
.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 = 9002
+
+# 开启设置抽屉
+VITE_SET_DRAWER = true

+ 1 - 0
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"

+ 5 - 5
src/layout/index.vue

@@ -59,11 +59,11 @@
 						</keep-alive>
 					</router-view>
 					<iframe-view />
-					<div class="main-bottom-wrapper">
-						<a style="color: #a0a0a0" :href="sysBaseConfig.SNOWY_SYS_COPYRIGHT_URL" target="_blank">{{
-							sysBaseConfig.SNOWY_SYS_COPYRIGHT
-						}}</a>
-					</div>
+<!--					<div class="main-bottom-wrapper">-->
+<!--						<a style="color: #a0a0a0" :href="sysBaseConfig.SNOWY_SYS_COPYRIGHT_URL" target="_blank">{{-->
+<!--							sysBaseConfig.SNOWY_SYS_COPYRIGHT-->
+<!--						}}</a>-->
+<!--					</div>-->
 				</div>
 			</a-layout-content>
 		</a-layout>

+ 2 - 1
src/views/exm/examinationManagement/form.vue

@@ -9,7 +9,7 @@
 			:loading="formLoading"
 			layout="horizontal"
 		>
-			<a-form-item label="任务类型:">
+			<a-form-item label="任务类型:" name="examType" :rules="rules.examType">
 				<a-select v-model:value="form.examType" placeholder="请选择任务类型" @change="examTypeChange" allow-clear>
 					<a-select-option v-for="item in examTypeEnum" :key="item.value" :value="item.value">
 						{{ item.label }}
@@ -187,6 +187,7 @@
 	})
 
 	const rules = {
+		examType: [{ required: true, message: '请选择任务类型', trigger: 'blur' }],
 		examName: [{ required: true, message: '请输入考试标题', trigger: 'blur' }],
 		paperId: [{ required: true, message: '请选择试卷', trigger: 'change' }],
 		startTime: [{ required: true, message: '请选择开始时间', trigger: 'change' }],

+ 1 - 0
src/views/statisticalAnalysis/analysisTeachingActivities/index.vue

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

+ 23 - 8
src/views/statisticalAnalysis/videoAnalysis/index.vue

@@ -21,14 +21,15 @@
 				</div>
 				<!-- 日期范围选择 -->
 				<div class="flex-1 mr-4">
-					<label class="block text-sm font-medium text-gray-700 mb-1">开始时间</label>
-					<a-date-picker v-model:value="startTime" class="w-full" placeholder="开始时间" />
+					<label class="block text-sm font-medium text-gray-700 mb-1">时间</label>
+<!--					<a-date-picker v-model:value="startTime" class="w-full" placeholder="开始时间" />-->
+					<a-range-picker class="w-full" v-model:value="times" />
 				</div>
 
-				<div class="flex-1 mr-4">
-					<label class="block text-sm font-medium text-gray-700 mb-1">结束时间</label>
-					<a-date-picker v-model:value="endTime" class="w-full" placeholder="结束时间" />
-				</div>
+<!--				<div class="flex-1 mr-4">-->
+<!--					<label class="block text-sm font-medium text-gray-700 mb-1">结束时间</label>-->
+<!--					<a-date-picker v-model:value="endTime" class="w-full" placeholder="结束时间" />-->
+<!--				</div>-->
 
 				<div class="filter-group">
 					<a-button type="primary" @click="updateStats">查询</a-button>
@@ -169,14 +170,17 @@
 	import dayjs from 'dayjs'
 
 	// 筛选条件
+	const times = ref([])
 	const startTime = ref('')
 	const endTime = ref('')
 	const filters = reactive({
 		courseId: '',
-		startTime: computed(() => (startTime.value ? dayjs(startTime.value).format('YYYY-MM-DD') : '')),
-		endTime: computed(() => (endTime.value ? dayjs(endTime.value).format('YYYY-MM-DD') : ''))
+		startTime: computed(() => (  times.value && times.value[0] ? dayjs(times.value[0]).format('YYYY-MM-DD') :  undefined)),
+		endTime: computed(() => (times.value && times.value[1] ? dayjs(times.value[1]).format('YYYY-MM-DD') :  undefined))
 	})
 
+
+
 	// 课程选项
 	const courseOptions = ref([])
 
@@ -595,6 +599,15 @@
 
 	// 更新统计数据
 	const updateStats = async () => {
+		// console.log('时间问题',' startTime.value ',startTime.value,' endTime.value ',endTime.value)
+		// if((startTime.value != '' || startTime.value != null)  && (endTime.value != '' || endTime.value != null)){
+		// 	if(dayjs(endTime.value).valueOf() - dayjs(startTime.value).valueOf() > 0){
+		//
+		// 	}else{
+		// 		message.error('结束时间比开始时间小')
+		// 		return
+		// 	}
+		// }
 		loading.value = true
 		chapterLoading.value = true
 		try {
@@ -606,6 +619,7 @@
 			loading.value = false
 			chapterLoading.value = false
 		}
+
 	}
 
 	// 初始化所有数据
@@ -813,6 +827,7 @@
 	.completion-rate {
 		color: #27ae60;
 		font-weight: bold;
+		font-size: 2.5em;
 	}
 
 	.low-engagement {