From 0beae0b035dcc76a0dc32604b88f30f03ef0a1ae Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Thu, 13 Feb 2025 14:25:18 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E6=89=93=E5=AD=97=E6=9C=BA=E6=95=88?=
=?UTF-8?q?=E7=8E=87=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../template-study/container/right.vue | 19 +++++++++++++++----
.../src/components/typing-effect/index.vue | 19 ++++++++++++++++---
2 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/src/renderer/src/components/template-study/container/right.vue b/src/renderer/src/components/template-study/container/right.vue
index e2cba23..a0efe23 100644
--- a/src/renderer/src/components/template-study/container/right.vue
+++ b/src/renderer/src/components/template-study/container/right.vue
@@ -23,7 +23,7 @@
- 添加提示词
+ {{curTemplate.ex3 === '1' ? '复制并创建个人模板' : '添加提示词'}}
一键研读
@@ -120,6 +120,10 @@ const modeOptions = ref([
label: '知识库模型',
value: 2,
disabled: false
+ },
+ {
+ label: 'deepseek模型',
+ value: 3
}
])
@@ -134,7 +138,7 @@ const modeOptions = ref([
const isWordDialog = ref(false)
const editItem = reactive({})
const onAdd = () => {
-
+ console.log(curTemplate)
Object.assign(editItem, curTemplate)
editItem.isAdd = true
isWordDialog.value = true
@@ -333,6 +337,9 @@ const againResult = async (index, item) => {
})
data = res.data
} else {
+ if (curMode.value == 3) {
+ params.llm = 'deepseek-r1:8b'
+ }
// 知识库模型
const res = await completion(params)
data = res.data
@@ -381,6 +388,9 @@ const getCompletion = async () => {
}
// 知识库模型
else {
+ if (curMode.value == 3) {
+ params.llm = 'deepseek-r1:8b'
+ }
const res = await completion(params)
data = res.data
}
@@ -439,6 +449,7 @@ const onSaveTemp = async (item) => {
// 去掉字符串中的 ### **
let getResult = (str) => {
let newStr = str.replace(/#+|(\*\*)/g, '');
+ newStr = newStr.replace(/[\s\S]*?<\/think>/g, '');
return newStr
}
@@ -485,8 +496,8 @@ onMounted(() => {
getTemplateList()
let jsonKey = `${modeType.value}-${data.edustage}-${data.edusubject}`
-
-
+
+
params.dataset_id = dataSetJson[jsonKey]
if(!params.dataset_id){
curMode.value = 1
diff --git a/src/renderer/src/components/typing-effect/index.vue b/src/renderer/src/components/typing-effect/index.vue
index 2438ce0..d707a45 100644
--- a/src/renderer/src/components/typing-effect/index.vue
+++ b/src/renderer/src/components/typing-effect/index.vue
@@ -40,9 +40,22 @@ const type = async () => {
displayedText.value = props.text
return
}
+ //限制多久内打印完ms
+ let allLength = props.text.length
+ let allTime = 3000
+ let addIndex = allLength/(allTime/props.delay);
+ //一次添加5个字符
+ for (let i = 0; i < addIndex; i++) {
+ if (index.value <= allLength) {
+ displayedText.value += props.text.charAt(index.value);
+ index.value++;
+ } else {
+ break;
+ }
+ }
if (index.value <= props.text.length) {
- displayedText.value += props.text.charAt(index.value);
- index.value++;
+ // displayedText.value += props.text.charAt(index.value);
+ // index.value++;
setTimeout(() => {
type();
emit('updateScroll', typingEffectRef.value.clientHeight); // 每次添加新字符后滚动到底部
@@ -74,4 +87,4 @@ watch([() => props.text, () => props.delay], resetAndType);
:deep(.el-textarea__inner:hover){
box-shadow: none;
}
-
\ No newline at end of file
+
From cbb3971c9b6bd4f5e5bb32458604f93e70d637aa Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Mon, 17 Feb 2025 09:37:10 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index 7d5b681..d95a19e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "aix-win-ws",
- "version": "2.5.17",
+ "version": "2.5.18",
"description": "",
"main": "./out/main/index.js",
"author": "上海交大重庆人工智能研究院",
@@ -141,4 +141,4 @@
"vue-tsc": "^1.8.25",
"windicss": "^3.5.6"
}
-}
+}
\ No newline at end of file
From f033155cc18cc6b3844ce965febd5bfdda9cbbe9 Mon Sep 17 00:00:00 2001
From: zhangxuelin <959231531@qq.com>
Date: Tue, 18 Feb 2025 17:04:01 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9F=B3=E9=A2=91?=
=?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/AixPPTist/src/views/Editor/CanvasTool/MediaInput.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MediaInput.vue b/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MediaInput.vue
index c08635b..e28307d 100644
--- a/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MediaInput.vue
+++ b/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MediaInput.vue
@@ -94,7 +94,7 @@ const insertImageElementaudio = (files: FileList) => {
const imageFile = files[0]
if (!imageFile) return
PPTApi.toRousrceUrl(imageFile).then(data=>{
- videoSrc.value=data
+ audioSrc.value=data
insertAudio()
})
From b5f43f1a37a2aff505f1d01529ff3a2a771bc043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com>
Date: Wed, 19 Feb 2025 10:27:04 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=97=A0=E8=87=AA?=
=?UTF-8?q?=E4=B8=BB=E8=AF=95=E9=A2=98=E7=9A=84=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/renderer/src/components/choose-textbook/index.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue
index 0ed1188..4318e13 100644
--- a/src/renderer/src/components/choose-textbook/index.vue
+++ b/src/renderer/src/components/choose-textbook/index.vue
@@ -13,7 +13,8 @@
- {{ node.label }}
-该单元章节无自主试题-
+
+ {{ node.label }}
{{ node.label }}
From a5579d409110f20cdaf609f9335364a1a080f0dd Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Wed, 19 Feb 2025 10:35:11 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 6 +-
.../src/components/FileUpload/Eos.vue | 75 +----------------
.../src/views/mindMap/mindMapAITools.vue | 84 +++++++++++++------
3 files changed, 63 insertions(+), 102 deletions(-)
diff --git a/package.json b/package.json
index d95a19e..d677d13 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "aix-win-ws",
- "version": "2.5.18",
+ "version": "2.5.19",
"description": "",
"main": "./out/main/index.js",
"author": "上海交大重庆人工智能研究院",
@@ -44,7 +44,7 @@
"@vue-office/excel": "^1.7.11",
"@vue-office/pdf": "^2.0.2",
"@vueuse/core": "^10.11.0",
- "aix-plugins-aitools": "^1.1.10",
+ "aix-plugins-aitools": "^1.1.24",
"animate.css": "^4.1.1",
"circular-json": "^0.5.9",
"clipboard": "^2.0.11",
@@ -141,4 +141,4 @@
"vue-tsc": "^1.8.25",
"windicss": "^3.5.6"
}
-}
\ No newline at end of file
+}
diff --git a/src/renderer/src/components/FileUpload/Eos.vue b/src/renderer/src/components/FileUpload/Eos.vue
index 43d1211..f901fee 100644
--- a/src/renderer/src/components/FileUpload/Eos.vue
+++ b/src/renderer/src/components/FileUpload/Eos.vue
@@ -1,78 +1,11 @@
-
-
+
+ 上传
From fd43dde73350cfb4681f31f43359d7ac21536a73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E6=9D=A8?= <666>
Date: Wed, 19 Feb 2025 16:25:22 +0800
Subject: [PATCH 06/10] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9rootid?=
=?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/renderer/src/components/choose-textbook/index.vue | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue
index 0ed1188..d238032 100644
--- a/src/renderer/src/components/choose-textbook/index.vue
+++ b/src/renderer/src/components/choose-textbook/index.vue
@@ -195,6 +195,12 @@ const handleNodeClick = (data) => {
},
node: nodeData
}
+ /**
+ *
+ * 章节数据里面的rootid 为bookId
+ * 因为部分数据源的rootid 有问题 这里需要重复赋值一下
+ */
+ node.rootid = curBook.data.id
// 本地存储:electron-store
let defaultExpandedKeys = parentNode ? [parentNode.id] : [nodeData.id]
sessionStore.set('subject.defaultExpandedKeys', defaultExpandedKeys)
From 055746144d76667e33bceca50a191e2eb17cbd12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E6=9D=A8?= <666>
Date: Wed, 19 Feb 2025 16:27:25 +0800
Subject: [PATCH 07/10] =?UTF-8?q?fix=EF=BC=9A=E7=A9=BA=E6=A0=BC=E9=97=AE?=
=?UTF-8?q?=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/renderer/src/components/choose-textbook/index.vue | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue
index d238032..b04cd73 100644
--- a/src/renderer/src/components/choose-textbook/index.vue
+++ b/src/renderer/src/components/choose-textbook/index.vue
@@ -196,11 +196,11 @@ const handleNodeClick = (data) => {
node: nodeData
}
/**
- *
- * 章节数据里面的rootid 为bookId
- * 因为部分数据源的rootid 有问题 这里需要重复赋值一下
- */
- node.rootid = curBook.data.id
+ *
+ * 章节数据里面的rootid 为bookId
+ * 因为部分数据源的rootid 有问题 这里需要重复赋值一下
+ */
+ node.rootid = curBook.data.id
// 本地存储:electron-store
let defaultExpandedKeys = parentNode ? [parentNode.id] : [nodeData.id]
sessionStore.set('subject.defaultExpandedKeys', defaultExpandedKeys)
From f238e37fdd3ae8bd1bda2057548805dcd6a8de04 Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Wed, 19 Feb 2025 16:59:16 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/renderer/src/components/choose-textbook/index.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue
index 7eef102..2c616f8 100644
--- a/src/renderer/src/components/choose-textbook/index.vue
+++ b/src/renderer/src/components/choose-textbook/index.vue
@@ -197,11 +197,11 @@ const handleNodeClick = (data) => {
node: nodeData
}
/**
- *
+ *
* 章节数据里面的rootid 为bookId
* 因为部分数据源的rootid 有问题 这里需要重复赋值一下
*/
- node.rootid = curBook.data.id
+ curData.node.rootid = curBook.data.id
// 本地存储:electron-store
let defaultExpandedKeys = parentNode ? [parentNode.id] : [nodeData.id]
sessionStore.set('subject.defaultExpandedKeys', defaultExpandedKeys)
From 95d2059b9b9738a98569f7b3c82f4112529bc192 Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Wed, 19 Feb 2025 16:59:34 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index d677d13..ec95b28 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "aix-win-ws",
- "version": "2.5.19",
+ "version": "2.5.20",
"description": "",
"main": "./out/main/index.js",
"author": "上海交大重庆人工智能研究院",
From 7c377e0eaa495d84cb549727317890d2cbe0b98f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E6=9D=A8?= <666>
Date: Fri, 21 Feb 2025 16:00:30 +0800
Subject: [PATCH 10/10] =?UTF-8?q?fix=EF=BC=9A=E4=BD=9C=E4=B8=9A=E7=AE=A1?=
=?UTF-8?q?=E7=90=86=E5=88=86=E5=80=BC=E9=97=AE=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../container/classOverview/distribution/stuList.vue | 4 +++-
src/renderer/src/views/classTask/teachClassTask.vue | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/renderer/src/views/classTask/container/classOverview/distribution/stuList.vue b/src/renderer/src/views/classTask/container/classOverview/distribution/stuList.vue
index 9f73ac9..b594e1c 100644
--- a/src/renderer/src/views/classTask/container/classOverview/distribution/stuList.vue
+++ b/src/renderer/src/views/classTask/container/classOverview/distribution/stuList.vue
@@ -4,7 +4,7 @@
- {{ stuItem.studentname }}:{{ stuItem.getScore }}分
+ {{ stuItem.studentname }}:{{ stuItem.point }}分
@@ -93,6 +93,8 @@ watch(() => useOverview.tableList, () => {
}else{
hasStudents.value = useOverview.tableList.filter(item => useOverview.allData[0].hasAnswers.includes(item.studentid)).map(item => item);
}
+ console.log(hasStudents.value,'hasStudents.value');
+
showStudents(0)
},{deep: true})
diff --git a/src/renderer/src/views/classTask/teachClassTask.vue b/src/renderer/src/views/classTask/teachClassTask.vue
index 0617952..fd9e855 100644
--- a/src/renderer/src/views/classTask/teachClassTask.vue
+++ b/src/renderer/src/views/classTask/teachClassTask.vue
@@ -376,12 +376,12 @@ const getClassWorkStudentList = (rowId) => {
}
}
}
- const allScore = evalarray.reduce((acc, cur) => acc + cur.score, 0)
+ const allScore = evalarray.reduce((acc, cur) => acc + cur.teacherRating, 0)
//console.log(evalarray, 'evalarray------------------------------------')
if (feedcount > 0) {
// 多个题目的总得分率: 正确题数/（题目数*100）
response.rows[i].scoingRate = ((score / allScore) * 100).toFixed(0) + '%'
- response.rows[i].getScore = score
+ response.rows[i].getScore = allScore
} else {
response.rows[i].scoingRate = '0%'
response.rows[i].getScore = 0