${char}.${workDescArr[j]}
`;
}
else {
if(j%2 == 0){
tmp += ``;
}
- tmp += `
';
}
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
index 234693f..27be20e 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
@@ -488,6 +488,10 @@ watch(() => props.bookobj.levelSecondId, (newVal, oldVal) => {
width: 100%;
height: calc(100% - 100px);
}
+
+ :deep(.format-work-desc > :is(div):first-child){
+ display: inline-block;
+ }
// :deep(.el-dialog .question-dialog){
// height: 80vh !important;
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue
index 52d87fc..88147d1 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue
@@ -405,9 +405,10 @@
+
+
+
\ No newline at end of file
From 34e74c5ec6260f70aa22e19350452db1d4e45709 Mon Sep 17 00:00:00 2001
From: lyc ${char}.${workDescArr[j]}
`;
+ tmp += `${char}.${workDescArr[j]}
`;
if(j%2 == 1){
tmp += '
-
+
{{ curNode.edustage}}{{ curNode.edusubject }}{{ type == 1 ? '课标研读': '教材分析'}}
@@ -20,12 +20,14 @@
+
添加提示词
+
一键研读
@@ -53,9 +55,7 @@ const props = defineProps({
default: 1
}
})
-watch(() => props.type, (newValue) => {
- console.log(newValue, 'newValue2');
-}, { immediate: true });
+
const emit = defineEmits(['changeTemp', 'onRead'])
@@ -104,6 +104,11 @@ const onAdd = () => {
wordDialog.value = true
}
+const onClick = () =>{
+ if(props.type == 1) return
+ showDialog.value = true
+}
+
onUnmounted(() => {
emitter.off('onGetMain')
})
diff --git a/src/renderer/src/components/template-study/container/pdf.vue b/src/renderer/src/components/template-study/container/pdf.vue
index c83dfd0..dad00fb 100644
--- a/src/renderer/src/components/template-study/container/pdf.vue
+++ b/src/renderer/src/components/template-study/container/pdf.vue
@@ -15,6 +15,8 @@ const pdfUrl = ref('')
onMounted(async () =>{
await nextTick()
const { fileurl } = sessionStore.get('subject.curBook')
+ console.log(fileurl,'fileurl');
+
pdfUrl.value = import.meta.env.VITE_APP_RES_FILE_PATH + fileurl.replace('.txt','.pdf')
})
diff --git a/src/renderer/src/views/examination-analysis/container/adjust-dialog.vue b/src/renderer/src/views/examination-analysis/container/adjust-dialog.vue
index 3b23962..7f98bc1 100644
--- a/src/renderer/src/views/examination-analysis/container/adjust-dialog.vue
+++ b/src/renderer/src/views/examination-analysis/container/adjust-dialog.vue
@@ -60,6 +60,7 @@ import { sessionStore } from '@/utils/store'
import { ElMessage } from 'element-plus'
import { dataSetJson } from '@/utils/comm.js'
import useUserStore from '@/store/modules/user'
+import emitter from '@/utils/mitt';
const userInfo = useUserStore().user
const textarea = ref('')
@@ -132,6 +133,8 @@ const saveAdjust = (item) =>{
}
+
+
const curFile = reactive({})
const dataset_id = ref('')
const fileList = ref([])
@@ -144,7 +147,9 @@ const getList = () =>{
Object.assign(curFile, fileList.value[0])
})
}
-
+emitter.on('curFile', (item) =>{
+ changeFile(item)
+})
const changeFile = (val) =>{
Object.assign(curFile, val);
diff --git a/src/renderer/src/views/examination-analysis/container/dialog.vue b/src/renderer/src/views/examination-analysis/container/dialog.vue
index 5e81e27..8a01069 100644
--- a/src/renderer/src/views/examination-analysis/container/dialog.vue
+++ b/src/renderer/src/views/examination-analysis/container/dialog.vue
@@ -8,16 +8,16 @@
-
+
-
-
-
-
- {{ item.name }} + -
+
+ {{ item.fileName }}
-
+
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue
index 952a816..c095ac5 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue
@@ -990,16 +990,26 @@ const updateForm= async(item, submitIndex=0, submitType=1) =>{
lessionid.value = props.bookobj.levelSecondId? props.bookobj.levelSecondId : props.bookobj.levelFirstId;
console.log('lessionid', lessionid.value);
+
// 拿到当前章节下得所有知识点
- const res = await getBindlist({ eid: lessionid.value })
- if (!res.data || res.data.length < 1) {
- ElMessage.warning('当前章节下未绑定知识点，暂不更新该试题知识点！');
- curKnowledgePointList.value = [];
+ if( props.bookobj.node.edustage == '高中' && (props.bookobj.node.edusubject == '语文' || props.bookobj.node.edusubject == '英语') ){
+ const res = await listEvaluation({ edusubject: props.bookobj.node.edusubject, edustage: props.bookobj.node.edustage, itemkey: "subject", pageSize: 10 });
+ const id = res.rows[0]?.id;
+ if (id) {
+ const res = await listKnowlegepointFormat({evalId: id, pageNum: 1, pageSize: 5000,});
+ curKnowledgePointList.value = updateKnowledgePoint(res.rows);
+ //console.log('updateKnowledgePoint->', res.rows);
+ }
+ } else {
+ const res = await getBindlist({ eid: lessionid.value })
+ if (!res.data || res.data.length < 1) {
+ ElMessage.warning('当前章节下未绑定知识点，暂不更新该试题知识点！');
+ curKnowledgePointList.value = [];
+ }
+ else {
+ curKnowledgePointList.value = res.data;
+ }
}
- else {
- curKnowledgePointList.value = res.data;
- }
-
}
//item.evalnodeid = '3772b,374112,374233';
From 09e6bec69f93f75d776de01a0b942f2cedd78d3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com>
Date: Mon, 25 Nov 2024 17:23:31 +0800
Subject: [PATCH 10/26] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8F=81=E4=BC=98?=
=?UTF-8?q?=E7=BD=91api=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/api/education/entpCourseWork.js | 17 +++++++++++++++
src/renderer/src/utils/examQuestion/jyeoo.js | 21 +++++++++++--------
.../container/newTask/taskTypeView.vue | 4 ++--
src/renderer/src/views/examReport/index.vue | 2 +-
4 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/src/renderer/src/api/education/entpCourseWork.js b/src/renderer/src/api/education/entpCourseWork.js
index 0ba694c..04582ba 100644
--- a/src/renderer/src/api/education/entpCourseWork.js
+++ b/src/renderer/src/api/education/entpCourseWork.js
@@ -108,4 +108,21 @@ export function pyOCRAPI(path) {
imageBas64: path,
}
})
+}
+
+
+/**
+ * @desc: 菁优网转发
+ * @return: {*}
+ * @param {*} url
+ * @param {*} config
+ */
+export function getJYPath(url,config) {
+ config.params = config.params?config.params:{}
+ config.params["getjypath"] = url;
+ return request({
+ url: "/jy/proxy",
+ method: config.method||"get",
+ params: config.params
+ })
}
\ No newline at end of file
diff --git a/src/renderer/src/utils/examQuestion/jyeoo.js b/src/renderer/src/utils/examQuestion/jyeoo.js
index 8fb0a67..d04c34d 100644
--- a/src/renderer/src/utils/examQuestion/jyeoo.js
+++ b/src/renderer/src/utils/examQuestion/jyeoo.js
@@ -1,3 +1,5 @@
+import { getJYPath } from "@/api/education/entpcoursework";
+
const JY_TOKEN = 'CA82641DA86072DEFD39E287335E035FDA6AEEC0549B58F54F4408734C8683FFAF0585CFA3B25091E588A03A65C66A80F5FF613F539D600954007A35DFFBFDC3C7BB982771C5E13F0918642CFD7596CE3718F06E5579238D92EC809AC6F4C82A9FE4B0E232A67DD3594D4DAC1C219CCBC4A7A093344446107EB11DC317526D0594249DEBBD82B740C794CF5A7065E1982B7779AF16AD25D7';
const JY_SUBJECT = [
{id: 10, subject: 'math3', name: '小学数学'},
@@ -27,7 +29,7 @@ const JY_SUBJECT = [
];
-export const JYApiListCT = async (_this, name = '高中历史') => {
+export const JYApiListCT = async (name = '高中历史') => {
if (name === '初中政治') {
name = '初中道德与法治';
}
@@ -35,7 +37,8 @@ export const JYApiListCT = async (_this, name = '高中历史') => {
if(obj.length < 1) {
return [];
}
- const res = await _this.$requestGetJYW(`/${obj[0].subject}/common`, {
+ getJYPath
+ const res = await getJYPath(`/${obj[0].subject}/common`, {
headers: {
authorization: `Token ${JY_TOKEN}`
},
@@ -63,7 +66,7 @@ export const JYApiListCT = async (_this, name = '高中历史') => {
return arrCT;
}
-export const JYApiListOriginYear = () => {
+export const JYApiListOriginYear = async () => {
const arrYear = [{label: '不限', value: '-1'}];
let i = 0;
for( ; i < 10; i++) {
@@ -78,7 +81,7 @@ export const JYApiListOriginYear = () => {
return arrYear;
}
-export const JYApiListSO = async (_this, name = '高中历史') => {
+export const JYApiListSO = async (name = '高中历史') => {
if (name === '初中政治') {
name = '初中道德与法治';
}
@@ -87,7 +90,7 @@ export const JYApiListSO = async (_this, name = '高中历史') => {
if(obj.length < 1) {
return [];
}
- const res = await _this.$requestGetJYW(`/${obj[0].subject}/common`, {
+ const res = await getJYPath(`/${obj[0].subject}/common`, {
headers: {
authorization: `Token ${JY_TOKEN}`
},
@@ -104,7 +107,7 @@ export const JYApiListSO = async (_this, name = '高中历史') => {
-export const JYApiListPoint = async (_this, name = '高中历史') => {
+export const JYApiListPoint = async (name = '高中历史') => {
if (name === '初中政治') {
name = '初中道德与法治';
}
@@ -113,7 +116,7 @@ export const JYApiListPoint = async (_this, name = '高中历史') => {
if(obj.length < 1) {
return [];
}
- const res = await _this.$requestGetJYW(`/${obj[0].subject}/point`, {
+ const res = await getJYPath(`/${obj[0].subject}/point`, {
headers: {
authorization: `Token ${JY_TOKEN}`
},
@@ -129,7 +132,7 @@ export const JYApiListPoint = async (_this, name = '高中历史') => {
* @desc: 获取菁优网的版本内容
* @return: {*}
*/
-export const JYApiListVersion = async (_this, query, hasPoints=true) => {
+export const JYApiListVersion = async (query, hasPoints=true) => {
const listVersion = {
status: 0,
msg: '',
@@ -148,7 +151,7 @@ export const JYApiListVersion = async (_this, query, hasPoints=true) => {
listVersion.msg = `[${name}]未找到对应菁优网教材版本, 请检查学段或学科是否匹配!`;
return listVersion;
}
- const JYBook = await _this.$requestGetJYW(`/${result[0].subject}/book2`, {
+ const JYBook = await getJYPath(`/${result[0].subject}/book2`, {
headers: {
// JYToken仅占位, 实际后续已未使用该token
authorization: `Token ${JY_TOKEN}`
diff --git a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
index 50378b1..94263d1 100644
--- a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
+++ b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
@@ -1008,7 +1008,7 @@ const initPageParams = () => {
onMounted(async() => {
// 获取当前学科下的试题题型
const name = userStore.edustage + userStore.edusubject;
- const jyCT = await JYApiListCT(proxy, name);
+ const jyCT = await JYApiListCT(name);
if (jyCT.length == 0) {
ElMessage.error('获取题型失败!');
return;
@@ -1016,7 +1016,7 @@ onMounted(async() => {
entpCourseWorkTypeList.value = jyCT;
// 获取当前学科下的试题年份
entpCourseWorkYearList.value = JYApiListOriginYear();
- entpCourseWorkGroupList.value = await JYApiListSO(proxy, name);
+ entpCourseWorkGroupList.value = await JYApiListSO(name);
})
diff --git a/src/renderer/src/views/examReport/index.vue b/src/renderer/src/views/examReport/index.vue
index e0e4d5d..e42669c 100644
--- a/src/renderer/src/views/examReport/index.vue
+++ b/src/renderer/src/views/examReport/index.vue
@@ -187,7 +187,7 @@ const getWorkType = async (data) => {
if (selName === curName) {
return;
}
- const jyCT = await JYApiListCT(proxy, selName);
+ const jyCT = await JYApiListCT(selName);
if (jyCT.length == 0) {
ElMessage.error('获取题型失败!');
return;
From e1caa441cb9eaa3b7b818b1c997410366c1f1751 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E6=9D=A8?= <666>
Date: Tue, 26 Nov 2024 09:35:25 +0800
Subject: [PATCH 11/26] =?UTF-8?q?add=EF=BC=9A=E6=96=B0=E5=A2=9E=E7=AC=AC?=
=?UTF-8?q?=E4=B8=89=E6=96=B9=E8=B5=84=E6=BA=90=E7=AD=9B=E9=80=89=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/renderer/src/utils/resourceDict.js | 4 ++++
.../src/views/resource/container/resoure-search.vue | 11 +++++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/renderer/src/utils/resourceDict.js b/src/renderer/src/utils/resourceDict.js
index c86aaf8..07d1d44 100644
--- a/src/renderer/src/utils/resourceDict.js
+++ b/src/renderer/src/utils/resourceDict.js
@@ -117,4 +117,8 @@ export const coursewareTypeList = [
label:'素材',
value:6
},
+ {
+ label:'视频',
+ value:12
+ },
]
diff --git a/src/renderer/src/views/resource/container/resoure-search.vue b/src/renderer/src/views/resource/container/resoure-search.vue
index 9d3344e..97c3bf2 100644
--- a/src/renderer/src/views/resource/container/resoure-search.vue
+++ b/src/renderer/src/views/resource/container/resoure-search.vue
@@ -32,7 +32,15 @@
-->
-
+
+
+
+
+
-
From 1882fd0daec9ba08f9b152aa75e7555bd5c73c6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E6=9D=A8?= <666>
Date: Tue, 26 Nov 2024 10:36:41 +0800
Subject: [PATCH 12/26] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E4=B8=AA?=
=?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83=E4=BF=AE=E6=94=B9=E5=AD=A6=E7=A7=91?=
=?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/renderer/src/views/profile/components/selectClass.vue | 3 +++
src/renderer/src/views/profile/userInfo.vue | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/renderer/src/views/profile/components/selectClass.vue b/src/renderer/src/views/profile/components/selectClass.vue
index 24e3d48..ada1d13 100644
--- a/src/renderer/src/views/profile/components/selectClass.vue
+++ b/src/renderer/src/views/profile/components/selectClass.vue
@@ -42,6 +42,7 @@ import useUserStore from '@/store/modules/user'
import {ArrowDown} from '@element-plus/icons-vue'
import { onMounted,ref } from 'vue';
import { listEvaluation } from '@/api/subject/index'
+import {sessionStore} from '@/utils/store'
const userStore = useUserStore().user
const subjectList = ref([])
// 获取基础的学科
@@ -58,6 +59,7 @@ const getSubject = () => {
// 选择学段
const handleUserEduStage = (item) => {
userStore.edustage = item
+ sessionStore.set('edustage',item)
if(item === '幼儿园'){
// 默认语文
userStore.edusubject = '语文'
@@ -74,6 +76,7 @@ const handleUserEduStage = (item) => {
// 选择学科
const handleUserEduSubject = (item) => {
userStore.edusubject = item;
+ sessionStore.set('edusubject',item)
}
onMounted(() => {
getSubject()
diff --git a/src/renderer/src/views/profile/userInfo.vue b/src/renderer/src/views/profile/userInfo.vue
index 6216179..b927274 100644
--- a/src/renderer/src/views/profile/userInfo.vue
+++ b/src/renderer/src/views/profile/userInfo.vue
@@ -162,7 +162,8 @@ setTimeout(() => {
function submit() {
proxy.$refs.userRef.validate((valid) => {
if (valid) {
- userStore.user.avatar = userStore.user.avatar
+ userStore.user.edusubject = sessionStore.get('edusubject')
+ userStore.user.edustage = sessionStore.get('edustage')
updateUserInfo(userStore.user).then((response) => {
if(response.code == 200){
userStore.login({username:userStore.user.userName,password:userStore.user.plainpwd}).then(() => {
From 393587848f5d15d5c0736550b9dd480f078526e4 Mon Sep 17 00:00:00 2001
From: lyc
Date: Tue, 26 Nov 2024 14:52:52 +0800
Subject: [PATCH 13/26] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../container/adjust-dialog.vue | 6 +-
.../template-study/container/edit-dialog.vue | 5 +-
.../template-study/container/header.vue | 149 ------
.../container/keyword-dialog.vue | 17 +-
.../container/{dialog.vue => left-dialog.vue} | 0
.../template-study/container/left.vue | 60 +++
.../template-study/container/pdf.vue | 28 -
.../template-study/container/result.vue | 505 ------------------
.../template-study/container/right.vue | 451 ++++++++++++++++
.../src/components/template-study/index.vue | 39 +-
10 files changed, 542 insertions(+), 718 deletions(-)
delete mode 100644 src/renderer/src/components/template-study/container/header.vue
rename src/renderer/src/components/template-study/container/{dialog.vue => left-dialog.vue} (100%)
create mode 100644 src/renderer/src/components/template-study/container/left.vue
delete mode 100644 src/renderer/src/components/template-study/container/pdf.vue
delete mode 100644 src/renderer/src/components/template-study/container/result.vue
create mode 100644 src/renderer/src/components/template-study/container/right.vue
diff --git a/src/renderer/src/components/template-study/container/adjust-dialog.vue b/src/renderer/src/components/template-study/container/adjust-dialog.vue
index 0258471..3ac07da 100644
--- a/src/renderer/src/components/template-study/container/adjust-dialog.vue
+++ b/src/renderer/src/components/template-study/container/adjust-dialog.vue
@@ -45,6 +45,7 @@ import { conversation, completion } from '@/api/mode/index'
import { sessionStore } from '@/utils/store'
import { ElMessage } from 'element-plus'
import { dataSetJson } from '@/utils/comm.js'
+import emitter from '@/utils/mitt';
const textarea = ref('')
@@ -109,13 +110,16 @@ const getCompletion = async (val) => {
}
const saveAdjust = (item) =>{
- emit('saveAdjust', item.msg)
+
isDialog.value = false
ElMessage.success('操作成功')
+ emitter.on('saveAdjust', item.msg)
+
}
onMounted(() => {
let data = sessionStore.get('subject.curNode')
+
Object.assign(curNode, data);
let text = props.modeType == 1 ? '课标': props.modeType == 2 ? '教材' : '考试'
diff --git a/src/renderer/src/components/template-study/container/edit-dialog.vue b/src/renderer/src/components/template-study/container/edit-dialog.vue
index fa7ff5d..97dda43 100644
--- a/src/renderer/src/components/template-study/container/edit-dialog.vue
+++ b/src/renderer/src/components/template-study/container/edit-dialog.vue
@@ -29,6 +29,7 @@
import { ref, watch} from 'vue'
import { ElMessage } from 'element-plus'
import { editTempResult } from '@/api/mode/index.js'
+import emitter from '@/utils/mitt';
const textarea = ref('')
@@ -49,12 +50,12 @@ watch(() => props.item.answer, (newVal) => {
}
},{ deep: true })
-const emit = defineEmits(['saveEdit'])
+
const onSave = () =>{
editTempResult({id: props.item.reultId, content: textarea.value}).then( res =>{
isDialog.value = false
ElMessage.success('操作成功')
- emit('saveEdit', textarea.value)
+ emitter.emit('onGetChild', textarea.value)
})
}
diff --git a/src/renderer/src/components/template-study/container/header.vue b/src/renderer/src/components/template-study/container/header.vue
deleted file mode 100644
index b6b368b..0000000
--- a/src/renderer/src/components/template-study/container/header.vue
+++ /dev/null
@@ -1,149 +0,0 @@
-
-
+
-
-
-
-
- {{ curNode.edustage}}{{ curNode.edusubject }}{{ type == 1 ? '课标研读': '教材分析'}}
-
-
-
-
-
-
- {{ curTemplate.name }}
-
-
-
-
- {{ item.name
- }}
-
-
-
-
-
-
-
-
-
- 添加提示词
-
-
-
- 一键研读
-
-
{{ item.ex3 == '1' ? '请输入新的模板名称' : isAdd ? '添加提示词' : '编辑提示词' }}
@@ -12,12 +12,10 @@
-
-
@@ -52,14 +50,9 @@ const props = defineProps({
return { ex3: '' }
}
},
- tempId: {
- type: [String, Number],
- default: ''
- },
+
})
-
-
const form = reactive({
name: '',
prompt: '',
@@ -73,16 +66,17 @@ watch(() => props.isAdd, (newVal) => {
}, { immediate: false })
+
const loading = ref(false)
const saveAdd = async () => {
-
loading.value = true
if (props.item.ex3 == '1') {
+
if (props.isAdd) {
try {
// 系统预设模板 copy一份
const { msg } = await addKeyWords({ name: form.name, id: props.item.id })
- emitter.emit('onGetChild')
+ emitter.emit('onGetMain')
ElMessage.success(msg)
mode.value = false
} finally {
@@ -138,7 +132,6 @@ const onAddChildTemp = async (parentId) => {
}
}
-
\ No newline at end of file
diff --git a/src/renderer/src/components/template-study/container/pdf.vue b/src/renderer/src/components/template-study/container/pdf.vue
deleted file mode 100644
index dad00fb..0000000
--- a/src/renderer/src/components/template-study/container/pdf.vue
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
Date: Wed, 27 Nov 2024 11:21:18 +0800
Subject: [PATCH 25/26] edit
---
.../template-study/container/left.vue | 5 ++-
.../template-study/container/right.vue | 41 +++++++++++--------
2 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/src/renderer/src/components/template-study/container/left.vue b/src/renderer/src/components/template-study/container/left.vue
index 4fbd9d7..f924206 100644
--- a/src/renderer/src/components/template-study/container/left.vue
+++ b/src/renderer/src/components/template-study/container/left.vue
@@ -16,6 +16,7 @@
diff --git a/src/renderer/src/components/template-study/container/right.vue b/src/renderer/src/components/template-study/container/right.vue
index 21931db..2fb7ada 100644
--- a/src/renderer/src/components/template-study/container/right.vue
+++ b/src/renderer/src/components/template-study/container/right.vue
@@ -82,9 +82,10 @@
diff --git a/src/renderer/src/components/template-study/container/right.vue b/src/renderer/src/components/template-study/container/right.vue
index 2fb7ada..68d9acd 100644
--- a/src/renderer/src/components/template-study/container/right.vue
+++ b/src/renderer/src/components/template-study/container/right.vue
@@ -76,7 +76,7 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/renderer/src/components/template-study/container/result.vue b/src/renderer/src/components/template-study/container/result.vue
deleted file mode 100644
index bead413..0000000
--- a/src/renderer/src/components/template-study/container/result.vue
+++ /dev/null
@@ -1,505 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/renderer/src/components/template-study/container/right.vue b/src/renderer/src/components/template-study/container/right.vue
new file mode 100644
index 0000000..21931db
--- /dev/null
+++ b/src/renderer/src/components/template-study/container/right.vue
@@ -0,0 +1,451 @@
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 编辑
- 移除
-
-
-
-
- #{{ item.name }}
-
-
- {{ item.prompt }}
-
-
-
-
-
-
-
-
- 重新研读
-
-
-
- AI对话调整
-
-
-
- 手动编辑结果
-
-
-
+
+
+
+
+
+
+ {{ curTemplate.name }}
+
+
+
+
+ {{ item.name
+ }}
+
+
+
+
+
+
+
+ 删除
+
+
+
+ 添加提示词
+
+ 一键研读
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+ 移除
+
+
+
+
+ #{{ item.name }}
+
+
+ {{ item.prompt }}
+
+
+
+
+
+
+
+
+ 重新研读
+
+
+
+ AI对话调整
+
+
+
+ 手动编辑结果
+
+
+
-
-
+
-
-
-
-
-
\ No newline at end of file
diff --git a/src/renderer/src/views/teachingDesign/container/right.vue b/src/renderer/src/views/teachingDesign/container/right.vue
index 48c1ce3..f973469 100644
--- a/src/renderer/src/views/teachingDesign/container/right.vue
+++ b/src/renderer/src/views/teachingDesign/container/right.vue
@@ -52,26 +52,55 @@
+
+
diff --git a/src/renderer/src/views/prepare/container/ai-pptistV2.vue b/src/renderer/src/views/prepare/container/ai-pptistV2.vue
new file mode 100644
index 0000000..0a1f50e
--- /dev/null
+++ b/src/renderer/src/views/prepare/container/ai-pptistV2.vue
@@ -0,0 +1,391 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/renderer/src/views/prepare/container/pptist-dialog.vue b/src/renderer/src/views/prepare/container/pptist-dialog.vue
new file mode 100644
index 0000000..84bf25f
--- /dev/null
+++ b/src/renderer/src/views/prepare/container/pptist-dialog.vue
@@ -0,0 +1,43 @@
+
+
+
+ 从新生成
+ 下一步
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ outputText }}
+
+ ppt模板选择
+
+
+
+ {{ item.name }}
+ ![]()
+
+
+
+ 自动配图
+
+
+ PPT作者名：
+
+ 上一步
+ 生成PPT
+
+
+
+
+
+
+
+
+
+
+
From 2c6ccd893bff1e9c6141f51b948711c47aa12fb9 Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Wed, 27 Nov 2024 11:03:35 +0800
Subject: [PATCH 24/26] =?UTF-8?q?s=E7=94=9F=E6=88=90PPT?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/renderer/src/views/teachingDesign/container/right.vue | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/renderer/src/views/teachingDesign/container/right.vue b/src/renderer/src/views/teachingDesign/container/right.vue
index d360122..2be6c0d 100644
--- a/src/renderer/src/views/teachingDesign/container/right.vue
+++ b/src/renderer/src/views/teachingDesign/container/right.vue
@@ -98,8 +98,9 @@ const params = reactive(
}
)
-const addAiPPT = () => {
-
+const addAiPPT = (res) => {
+ //TODO res中有PPT地址
+ console.log(res)
}
const conversation = async () => {
for (let item of resultList.value) {
From a68fb21203d819ac3ffcc11b93f4e1df85959e79 Mon Sep 17 00:00:00 2001
From: lyc
+
+
+