diff --git a/.env.development b/.env.development
index 8904c30c..09c5c761 100644
--- a/.env.development
+++ b/.env.development
@@ -9,7 +9,7 @@ ENV = 'development'
VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
# app入口
-VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
+VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
#VITE_APP_BASE_API_Url = 'http://25.16.122.65:7001'
#VITE_APP_BASE_API_Url = 'http://25.16.122.91:9786'
#VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786'
diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue
index c694d2ad..30b25bc9 100644
--- a/src/pages/course/study.vue
+++ b/src/pages/course/study.vue
@@ -741,10 +741,14 @@ onShow(() => {
})
const watchFlag = ref(1)
onUnload(() => {
- changePlayItemId()
- teacherVoiceObj?.stop?.()
- teacherVoiceObj.src = ''
socketStore.closeSocket()
+ changePlayItemId('')
+ console.log(typeof teacherVoiceObj);
+ try{
+ teacherVoiceObj?.stop()
+ teacherVoiceObj.src = ''
+ // 0910杨航叫我这么改的
+ } catch {}
})
const testAnswer = computed(() => {
if (talkingList.value.length < 5) return true
diff --git a/src/pages/examination/index.vue b/src/pages/examination/index.vue
index c094d706..8bdba1fe 100644
--- a/src/pages/examination/index.vue
+++ b/src/pages/examination/index.vue
@@ -389,19 +389,11 @@
answerCacheList.value = common.getValue(examinationAnswerCacheKey);
if (typeof answerCacheList.value !== 'object') {
answerCacheList.value = {};
- paperData.isCacheExam = 'N'
+ paperData.isCacheExam = 'N';
}
-
+
topicList.push(
...examination.qnsInfoVos.map((res) => {
- // const es_status =
- // paperData.isCacheExam === 'N'
- // ? ''
- // : res.qnsId in answerCacheList.value
- // ? 'ossKey' in answerCacheList.value[res.qnsId]
- // ? '02'
- // : '01'
- // : '';
const es_status = (() => {
try {
// 基础数据校验
@@ -428,12 +420,6 @@
return ''; // 错误情况下的默认值,可根据业务调整
}
})();
- // const my_answer =
- // paperData.isCacheExam === 'N'
- // ? []
- // : res.qnsId in answerCacheList.value
- // ? answerCacheList.value[res.qnsId]
- // : [];
const my_answer = (() => {
try {
// 基础数据校验
@@ -552,12 +538,7 @@
b: res.my_answer,
c: !!res.my_answer
}));
-
const incompleteNumber = topicList.length - completeList.length;
- console.log('incompleteNumber', incompleteNumber);
- console.log('completeList', completeList);
- console.log('topicList', topicList);
-
if (incompleteNumber === 0) {
// 完成
dialogConfiguration.title = '确认现在交卷吗?';
diff --git a/src/pages/learningTasks/details.vue b/src/pages/learningTasks/details.vue
index 650de210..c23df0cd 100644
--- a/src/pages/learningTasks/details.vue
+++ b/src/pages/learningTasks/details.vue
@@ -44,7 +44,7 @@
{{ detailData.taskFinishSums ?? 0 }}/{{ detailData.taskSums ?? 0 }}
- 进度:
+ 我的进度:
{{ detailData.finishCrs ?? 0 }}/{{ detailData.sumCrs ?? 0 }}门课程
diff --git a/src/pages/testingHall/components/content.vue b/src/pages/testingHall/components/content.vue
index d4e8b711..9eb0435c 100644
--- a/src/pages/testingHall/components/content.vue
+++ b/src/pages/testingHall/components/content.vue
@@ -97,9 +97,18 @@
page.value = 1;
data_list.length = 0;
};
+ const updateData = (item) => {
+ // const index = data_list.findIndex((res) => res.taskId === item.taskId);
+
+ // console.log('updateData', index, item);
+ // if (index !== -1) {
+ // data_list[index] = item;
+ // }
+ };
defineExpose({
getData,
search,
+ updateData,
clear
});
diff --git a/src/pages/testingHall/details.vue b/src/pages/testingHall/details.vue
index 89409129..f4959bf2 100644
--- a/src/pages/testingHall/details.vue
+++ b/src/pages/testingHall/details.vue
@@ -117,7 +117,10 @@
diff --git a/src/pages/testingHall/index.vue b/src/pages/testingHall/index.vue
index 06fccb6d..d49403a1 100644
--- a/src/pages/testingHall/index.vue
+++ b/src/pages/testingHall/index.vue
@@ -44,7 +44,8 @@
onMounted
} from 'vue'
import {
- onLoad
+ onLoad,
+ onUnload
} from '@dcloudio/uni-app'
import {
setPageCache
@@ -92,6 +93,19 @@
immediate: true
}) // 这里的immediate会在onMounted之后执行
})
+
+
+ onLoad(() => {
+ uni.$on('refresh_testing_hall_data', (res) => {
+ // console.log('exam_completed');
+ // contentRefs.value[0]?.updateData(res);
+ // contentRefs.value[1]?.updateData(res);
+ // contentRefs.value[2]?.updateData(res);
+ });
+ });
+ onUnload(() => {
+ uni.$off('refresh_testing_hall_data');
+ });