From 7d1848277e425c0eec54188bddea1203d5f6a31f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com> Date: Mon, 6 Jan 2025 16:18:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=A4=E6=96=AD=E9=A2=98=E7=AD=94?= =?UTF-8?q?=E6=A1=88=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/hooks/useProcessList.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/renderer/src/hooks/useProcessList.js b/src/renderer/src/hooks/useProcessList.js index c9f1e07..a3dcd8b 100644 --- a/src/renderer/src/hooks/useProcessList.js +++ b/src/renderer/src/hooks/useProcessList.js @@ -328,7 +328,7 @@ export const processList = (row, aloneOption=false) => { // 处理[答案显示] - 1-正常 0-错误 const answer = workAnswerArr .map((item) => { - return item === '1' ? '正确' : '错误' + return DICT_TRUE_OR_FALSE.TRUE.includes(item) ? '正确' : DICT_TRUE_OR_FALSE.FALSE.includes(item)?'错误':item; }) .join('、') row[i].workanswerFormat = answer @@ -341,3 +341,8 @@ export const processList = (row, aloneOption=false) => { } } } + +const DICT_TRUE_OR_FALSE = { + TRUE: ['正确', '对', '√', '1'], + FALSE: ['错误', '错', '×', '0'], +}; \ No newline at end of file From 7be60a3d72c6434fe255e18b45d6635b99b0ac70 Mon Sep 17 00:00:00 2001 From: lyc Date: Mon, 6 Jan 2025 17:24:56 +0800 Subject: [PATCH 2/4] edit --- src/renderer/src/utils/ppt-request.js | 8 +- .../views/teachingDesign/container/center.vue | 6 +- .../views/teachingDesign/container/left2.vue | 218 +++++++++--------- 3 files changed, 119 insertions(+), 113 deletions(-) diff --git a/src/renderer/src/utils/ppt-request.js b/src/renderer/src/utils/ppt-request.js index f080ece..642d9a9 100644 --- a/src/renderer/src/utils/ppt-request.js +++ b/src/renderer/src/utils/ppt-request.js @@ -107,9 +107,13 @@ const getBackGroundV2 = async () => { } }; -const createOutlineV2 = async (data) => { +const createOutlineV2 = async (params) => { try { - const response = await req("/api/aipptV2/createOutlineV2", "POST", data); + const response = await request({ + url:"/api/aipptV2/createOutlineV2", + method: "POST", + params + }); console.log("createOutline response:", response); return response.data; diff --git a/src/renderer/src/views/teachingDesign/container/center.vue b/src/renderer/src/views/teachingDesign/container/center.vue index ae9fa30..96515a1 100644 --- a/src/renderer/src/views/teachingDesign/container/center.vue +++ b/src/renderer/src/views/teachingDesign/container/center.vue @@ -36,6 +36,7 @@ import emitter from '@/utils/mitt' import * as commUtils from '@/utils/comm.js' import { createChart, sendChart } from '@/api/ai/index' import { completion, addSyllabus, syllabuss, removeSyllabus } from '@/api/mode/index.js' +import { createOutlineV2 } from '@/utils/ppt-request.js' import TypingEffect from '@/components/typing-effect/index.vue' import useUserStore from '@/store/modules/user' @@ -59,6 +60,7 @@ const modeOptions = ref([ // 选中的环节 const selectedData = ref([]) emitter.on('selected', (data)=>{ + console.log(data,3000) selectedData.value = data }) // 回显大纲 @@ -119,9 +121,11 @@ const createAi = async ()=>{ // 知识库模型 else { const res = await completion(params) + data = res.data } - console.log(data) + const res = await createOutlineV2({query: data.answer}) + console.log(res) emitter.emit('onResult', data.answer) answer.value = getResult(data.answer) diff --git a/src/renderer/src/views/teachingDesign/container/left2.vue b/src/renderer/src/views/teachingDesign/container/left2.vue index 3f4a612..def98d7 100644 --- a/src/renderer/src/views/teachingDesign/container/left2.vue +++ b/src/renderer/src/views/teachingDesign/container/left2.vue @@ -4,8 +4,11 @@ 教学模式
重置 - 新增 + 新增
@@ -13,33 +16,34 @@
- {{ item.name }} - -
- 添加 - 编辑 -
+ {{ item.name }} + +
+ 添加 + 编辑 +
- - + +
-
+
{{ child.name }} - - 编辑 + + 编辑
- - + +
+ style="border-radius: 10px; padding: 10px 15px"> - -
+ +
删除
@@ -64,7 +68,6 @@
- \ No newline at end of file + From fb428ba5cae411026d617b1325401674096452ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com> Date: Tue, 7 Jan 2025 10:52:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=8D=95=E5=85=83?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=BC=A0=E6=A0=87=E7=A7=BB=E5=85=A5=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=B8=8E=E8=B6=85=E9=95=BF=E2=80=A6=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/choose-textbook/index.vue | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue index 50526fb..811c1cc 100644 --- a/src/renderer/src/components/choose-textbook/index.vue +++ b/src/renderer/src/components/choose-textbook/index.vue @@ -11,15 +11,21 @@ :default-expanded-keys="defaultExpandedKeys" :current-node-key="curNode.data.id" highlight-current @node-click="handleNodeClick"> @@ -334,7 +340,7 @@ onMounted( async () => { } } -.tree-label { +.tree-label-wrap, .tree-label { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; From 586ce134f84f08933b03c947236de3cf2251f43c Mon Sep 17 00:00:00 2001 From: lyc Date: Tue, 7 Jan 2025 11:02:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?edit=20=E6=A1=86=E6=9E=B6=E8=AE=BE=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/teachingDesign/container/center.vue | 49 ++++++++++++------- .../views/teachingDesign/container/left2.vue | 4 +- 2 files changed, 34 insertions(+), 19 deletions(-) diff --git a/src/renderer/src/views/teachingDesign/container/center.vue b/src/renderer/src/views/teachingDesign/container/center.vue index 96515a1..0627f9f 100644 --- a/src/renderer/src/views/teachingDesign/container/center.vue +++ b/src/renderer/src/views/teachingDesign/container/center.vue @@ -20,8 +20,20 @@
- - + +
封面页
+
+
标题:{{ answer.title }}
+
副标题:{{answer.subTitle }}
+
+
目录页
+
+
{{index + 1}}:{{ item.chapterTitle }}
+
+

{{ index + 1 }} - {{ i + 1}} : {{ el.chapterTitle }}

+
+
+
@@ -37,7 +49,6 @@ import * as commUtils from '@/utils/comm.js' import { createChart, sendChart } from '@/api/ai/index' import { completion, addSyllabus, syllabuss, removeSyllabus } from '@/api/mode/index.js' import { createOutlineV2 } from '@/utils/ppt-request.js' -import TypingEffect from '@/components/typing-effect/index.vue' import useUserStore from '@/store/modules/user' const curMode = ref(2) @@ -60,14 +71,14 @@ const modeOptions = ref([ // 选中的环节 const selectedData = ref([]) emitter.on('selected', (data)=>{ - console.log(data,3000) selectedData.value = data }) // 回显大纲 const curItem = reactive({}) emitter.on('onShow', (data)=>{ + console.log(data) aiShow.value = false - answer.value = getResult(data.outline) + Object.assign(answer, JSON.parse(data.outline)) Object.assign(curItem, data) curItem.answer = curItem.outline getDetails(data.id) @@ -90,10 +101,9 @@ const params = reactive( // 研读 const loading = ref(false) -const answer = ref('') +const answer = reactive({}) const createAi = async ()=>{ - console.log(selectedData.value) if(selectedData.value.length == 0){ ElMessage.warning('请先选择教学环节后再生成教学大纲') return @@ -126,14 +136,12 @@ const createAi = async ()=>{ } const res = await createOutlineV2({query: data.answer}) console.log(res) - emitter.emit('onResult', data.answer) - answer.value = getResult(data.answer) - - onSaveTemp(data.answer) + emitter.emit('onResult', res) + Object.assign(answer, res.outline) + onSaveTemp(JSON.stringify(res.outline)) } finally { loading.value = false } - } @@ -174,11 +182,6 @@ const delAnswer = () =>{ } -// 去掉字符串中的 ### ** -let getResult = (str) => { - let newStr = str.replace(/#+|(\*\*)/g, ''); - return newStr -} // 千帆创建对话 const conversation_id = ref('') @@ -231,6 +234,18 @@ onMounted(() => { border-radius: 5px; text-align: left; overflow-y: auto; + padding: 15px; + .con-item{ + display: flex; + flex-direction: column; + margin-top: 15px; + .item-text{ + background: #F2F2F2; + padding: 15px; + border-radius: 5px; + margin-top: 10px; + } + } } } diff --git a/src/renderer/src/views/teachingDesign/container/left2.vue b/src/renderer/src/views/teachingDesign/container/left2.vue index def98d7..0ac347c 100644 --- a/src/renderer/src/views/teachingDesign/container/left2.vue +++ b/src/renderer/src/views/teachingDesign/container/left2.vue @@ -5,8 +5,8 @@
重置 新增