@@ -276,6 +276,7 @@ import { onMounted, ref, nextTick, watch, reactive, getCurrentInstance, computed
import { ElMessage } from 'element-plus'
import { cloneDeep } from 'lodash'
import { useRouter } from 'vue-router'
+import { Search } from '@element-plus/icons-vue'
import {listEntpcoursework, listEntpcourseworkNew, getEntpcoursework} from '@/api/education/entpCourseWork'
import { addClassworkReturnId } from '@/api/teaching/classwork'
@@ -284,6 +285,7 @@ import { listEvaluation } from '@/api/subject'
import { listEntpcoursefile } from '@/api/education/entpcoursefile'
import { listKnowledgePoint } from "@/api/knowledge/knowledgePoint";
+
import { useGetHomework } from '@/hooks/useGetHomework'
import { processList } from '@/hooks/useProcessList'
import { getCurrentTime } from '@/utils/date'
@@ -409,15 +411,15 @@ const fileLoading = ref(false); // 常规作业loading
// 下拉滚动参数
-const BASE_LIMIT_COUT = 50; // 总加载额外试题数
-const pageNoMore = computed( () => {
- if (pageParams.value.total < 1) {
- return false;
- }
- let count = BASE_LIMIT_COUT >= pageParams.value.total ? pageParams.value.total : pageParams.value.originCount+BASE_LIMIT_COUT;
- return workResource.entpCourseWorkList.length >= count;
-});
-const pageDisabled = computed(() => pageParams.value.loading || pageNoMore.value);
+// const BASE_LIMIT_COUT = 50; // 总加载额外试题数
+// const pageNoMore = computed( () => {
+// if (pageParams.value.total < 1) {
+// return false;
+// }
+// let count = BASE_LIMIT_COUT >= pageParams.value.total ? pageParams.value.total : pageParams.value.originCount+BASE_LIMIT_COUT;
+// return workResource.entpCourseWorkList.length >= count;
+// });
+// const pageDisabled = computed(() => pageParams.value.loading || pageNoMore.value);
const pageParams = ref({
loading: false, // 是否正在加载中
originCount: 0, // 初始条目数量
@@ -497,7 +499,7 @@ function Apis(key) {
// 年份
yearStr: entpCourseWorkQueryParams.yearStr !== '-1' ? entpCourseWorkQueryParams.yearStr:'',
// 知识点
- thirdId: entpCourseWorkQueryParams.point.length > 0 ? entpCourseWorkQueryParams.point[0]:'',
+ thirdId: entpCourseWorkQueryParams.point&&entpCourseWorkQueryParams.point.length > 0 ? entpCourseWorkQueryParams.point[0]:'',
// 关键字
keyword: entpCourseWorkQueryParams.keyWord && entpCourseWorkQueryParams.keyWord !== '' ? entpCourseWorkQueryParams.keyWord:'',
@@ -519,16 +521,16 @@ const handleQueryFromEntpCourseWork= async (queryType) => {
// }
client(t('任务1', 1500)).then(res => {
- console.log("请求返回",res);
- if(paginationParams.pageNum == 1){
- workResource.entpCourseWorkList = [];
- workResource.entpCourseWorkTotal = 0;
+ //console.log("请求返回",res);
+ // if(paginationParams.pageNum == 1){
+ // workResource.entpCourseWorkList = [];
+ // workResource.entpCourseWorkTotal = 0;
- // 初始化下拉滚动条参数
- // pageParams.value.loading = false;
- // pageParams.value.isFirst = true;
- // pageParams.value.originCount = 0;
- }
+ // // 初始化下拉滚动条参数
+ // // pageParams.value.loading = false;
+ // // pageParams.value.isFirst = true;
+ // // pageParams.value.originCount = 0;
+ // }
const data = res.data || [];
if(data && data.length>0){
// workResource.entpCourseWorkList = entpcourseworkres.data;
@@ -542,17 +544,20 @@ const handleQueryFromEntpCourseWork= async (queryType) => {
// 格式化试题信息
processList(data);
- workResource.entpCourseWorkList.push(...data);
+ //workResource.entpCourseWorkList.push(...data);
+ workResource.entpCourseWorkList = data;
// 初次加载时更新当前试题数量
if (pageParams.value.isFirst) {
pageParams.value.isFirst = false;
pageParams.value.originCount = workResource.entpCourseWorkList.length;
pageParams.value.total = parseInt(res.msg);
+ paginationParams.pageNum = Math.ceil(parseInt(res.msg)/paginationParams.pageSize);
+ console.log('first->', pageParams.value, paginationParams);
}
}
pageParams.value.loading = false;
- });
+});
//const entpcourseworkres = await listEntpcourseworkNew(queryForm);
@@ -977,6 +982,12 @@ const showExamAnalyseDrawer = (row) => {
})
}
+const getPaginationList = ( page, limit ) => {
+ paginationParams.pageNum = page;
+ paginationParams.pageSize = limit;
+ console.log(page, limit)
+ handleQueryFromEntpCourseWork(0);
+}
const pageLoad = async() => {
console.log("加载中...")
From 34fec10fc106e6ae1e1ea99343fe00e927063c99 Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Tue, 12 Nov 2024 15:51:22 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=B8=89=E6=96=B9=E8=B5=84=E6=BA=90?=
=?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=A4=87=E8=AF=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 4 +-
src/renderer/src/api/file/index.js | 11 +
.../prepare/components/chooseTextbook.vue | 308 ++++++++++++++++++
.../src/views/prepare/components/treeLog.vue | 64 ++++
.../views/resource/container/third-list.vue | 37 ++-
5 files changed, 421 insertions(+), 3 deletions(-)
create mode 100644 src/renderer/src/views/prepare/components/chooseTextbook.vue
create mode 100644 src/renderer/src/views/prepare/components/treeLog.vue
diff --git a/package.json b/package.json
index 1c822d7..b44e9f9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
- "name": "aix-win",
- "version": "2.5.1",
+ "name": "aix-win-ws",
+ "version": "2.5.3",
"description": "",
"main": "./out/main/index.js",
"author": "上海交大重庆人工智能研究院",
diff --git a/src/renderer/src/api/file/index.js b/src/renderer/src/api/file/index.js
index e655614..64cfdfb 100644
--- a/src/renderer/src/api/file/index.js
+++ b/src/renderer/src/api/file/index.js
@@ -53,3 +53,14 @@ export const moveSmarttalk = (params) => {
params
})
}
+
+export const addFileToPrepareThird = (data) => {
+ return request({
+ url: '/smarttalk/file/addFileToPrepareThird',
+ method: 'post',
+ headers: {
+ 'Content-Type': 'multipart/form-data'
+ },
+ data
+ })
+}
diff --git a/src/renderer/src/views/prepare/components/chooseTextbook.vue b/src/renderer/src/views/prepare/components/chooseTextbook.vue
new file mode 100644
index 0000000..144720f
--- /dev/null
+++ b/src/renderer/src/views/prepare/components/chooseTextbook.vue
@@ -0,0 +1,308 @@
+
+
+
+
+ {{ curBook.data.itemtitle }}
+
+
+
+
+
+ {{ node.label }}
+
+
+
+
+
+
+
+
![]()
+
+
+
+
{{ item.itemtitle }}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/renderer/src/views/prepare/components/treeLog.vue b/src/renderer/src/views/prepare/components/treeLog.vue
new file mode 100644
index 0000000..90b2fa7
--- /dev/null
+++ b/src/renderer/src/views/prepare/components/treeLog.vue
@@ -0,0 +1,64 @@
+
+
+
+
+
diff --git a/src/renderer/src/views/resource/container/third-list.vue b/src/renderer/src/views/resource/container/third-list.vue
index 0039e24..204dc12 100644
--- a/src/renderer/src/views/resource/container/third-list.vue
+++ b/src/renderer/src/views/resource/container/third-list.vue
@@ -50,6 +50,10 @@