From e9bc48963b157fac2fd8ac2b58b45f8664b02b4e Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Sun, 5 Jan 2025 20:53:39 +0800
Subject: [PATCH 01/21] edit

---
 src/renderer/src/api/mode/index.js            |  33 +++++-
 .../template-study/container/right.vue        |   3 +
 .../views/teachingDesign/container/center.vue |  83 +++++++++----
 .../teachingDesign/container/edit-dialog.vue  |  19 ++-
 .../views/teachingDesign/container/left2.vue  | 110 ++++++++++--------
 .../src/views/teachingDesign/index.vue        |  50 ++++----
 6 files changed, 198 insertions(+), 100 deletions(-)

diff --git a/src/renderer/src/api/mode/index.js b/src/renderer/src/api/mode/index.js
index add0402..26540bb 100644
--- a/src/renderer/src/api/mode/index.js
+++ b/src/renderer/src/api/mode/index.js
@@ -118,7 +118,6 @@ export function docList(params) {
   })
 }
 
-
 // 保存教学大纲
 export function addSyllabus(data) {
   return request({
@@ -128,3 +127,35 @@ export function addSyllabus(data) {
   })
 }
 
+// 获取保存的大纲列表
+export function syllabusList(params) {
+  return request({
+    url: '/education/generate/list',
+    method: 'get',
+    params
+  })
+}
+
+// 大纲详情
+export function syllabuss(id) {
+  return request({
+    url: '/education/generate/' + id,
+    method: 'get',
+  })
+}
+
+// 删除大纲
+export function removeSyllabus(id) {
+  return request({
+    url: '/education/generate/' + id,
+    method: 'delete',
+  })
+}
+
+export function editSyllabus(data) {
+  return request({
+    url: '/education/generate',
+    method: 'put',
+    data
+  })
+}
diff --git a/src/renderer/src/components/template-study/container/right.vue b/src/renderer/src/components/template-study/container/right.vue
index ea67d82..543c928 100644
--- a/src/renderer/src/components/template-study/container/right.vue
+++ b/src/renderer/src/components/template-study/container/right.vue
@@ -344,6 +344,8 @@ const againResult = async (index, item) => {
   }
 }
 
+
+const delay = (ms) => new Promise(resolve => setTimeout(resolve, ms));
 // 一键研读
 const getCompletion = async () => {
   isStarted.value = new Array(childTempList.length).fill(false)
@@ -372,6 +374,7 @@ const getCompletion = async () => {
           conversationId: conversation_id.value,
           stream: false
         })
+        await delay(1000); // 每个请求之间延迟 1 秒
         data = res.data
       }
       // 知识库模型
diff --git a/src/renderer/src/views/teachingDesign/container/center.vue b/src/renderer/src/views/teachingDesign/container/center.vue
index 2bb122c..ab35643 100644
--- a/src/renderer/src/views/teachingDesign/container/center.vue
+++ b/src/renderer/src/views/teachingDesign/container/center.vue
@@ -9,29 +9,41 @@
         <el-button type="primary" @click="createAi">
           <i class="iconfont icon-chuangzuo"></i>生成教学大纲
         </el-button>
+        <el-button type="danger" :disabled="Boolean(!answer)" @click="delAnswer">
+          <i class="iconfont icon-shanchu"></i>
+          删除大纲
+        </el-button>
+    
+        <el-button type="primary" @click="isEdit = true">
+          <i class="iconfont icon-bianji"></i>编辑大纲
+        </el-button>
       </div>
     </div>
     <div class="center-con" v-loading="loading">
-      <TypingEffect v-if="answer" :text="answer" :delay="10" aiShow/>
+      <TypingEffect v-if="answer" :text="answer" :delay="10" :aiShow="aiShow"/>
       <el-empty v-if="!answer" description="请选择符合您需要的教学模式，生成教学大纲" />
     </div>
   </div>
+  <EditDialog v-model="isEdit" :item="curItem" />
 </template>
 
 <script setup>
 import { ref, reactive, onMounted, onUnmounted } from 'vue'
-import { ElMessage } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { sessionStore } from '@/utils/store'
+import EditDialog from './edit-dialog.vue'
 import emitter from '@/utils/mitt'
 import * as commUtils from '@/utils/comm.js'
 import { createChart, sendChart } from '@/api/ai/index'
-import { completion, addSyllabus } from '@/api/mode/index.js'
+import { completion, addSyllabus, syllabuss, removeSyllabus } from '@/api/mode/index.js'
 import TypingEffect from '@/components/typing-effect/index.vue'
 import useUserStore from '@/store/modules/user'
 
 const curMode = ref(2)
+const isEdit = ref(false)
 
 const { user } = useUserStore()
+const aiShow = ref(false)
 
 const modeOptions = ref([
   {
@@ -49,7 +61,21 @@ const selectedData = ref([])
 emitter.on('selected', (data)=>{
   selectedData.value = data
 })
+// 回显大纲
+const curItem = reactive({})
+emitter.on('onShow', (data)=>{
+  aiShow.value = false
+  answer.value = getResult(data.outline)
+  Object.assign(curItem, data)
+  curItem.answer = curItem.outline
+  getDetails(data.id)
+})
 
+const getDetails = (id) =>{
+  syllabuss(id).then( res =>{
+    console.log(res)
+  })
+}
 
 const params = reactive(
   {
@@ -62,17 +88,18 @@ const params = reactive(
 // 研读
 const loading = ref(false)
 const answer = ref('')
+
 const createAi = async ()=>{
   console.log(selectedData.value)
   if(selectedData.value.length == 0){
     ElMessage.warning('请先选择教学环节后再生成教学大纲')
     return
   }
-  onSaveTemp()
-  return
+  
   let str = selectedData.value.map( item => item.name).join('、')
   let bookV = curNode.roottitle.split('-')[1] + '版'
   loading.value = true
+  aiShow.value = true
   try {
 
     params.prompt = `针对${curNode.edustage}${curNode.edusubject}${bookV}${curNode.itemtitle}这一课，根据以下教学环节：${str}，进行课件教学PPT内容设计`
@@ -94,10 +121,10 @@ const createAi = async ()=>{
       data = res.data
     }
     console.log(data)
-    emitter('onResult', data.answer)
+    emitter.emit('onResult', data.answer)
     answer.value = getResult(data.answer)
 
-    // onSaveTemp(item)
+    onSaveTemp(data.answer)
   } finally {
     loading.value = false
   }
@@ -106,27 +133,41 @@ const createAi = async ()=>{
 
 
 // 保存模板
-const onSaveTemp = async (data) => {
-  if (data == '') return
-  console.log(selectedData)
+const onSaveTemp = async (answer) => {
+  if (answer == '') return
   let modelIds = selectedData.value.map( item => item.id).join(',')
-  console.log(modelIds)
-  console.log(user)
-  const data1 = {
+  const data = {
     eduId: curNode.id,
-    outline: data,
+    outline: answer,
     outlineType: curMode.value == 1  ? 0 : 1,
     modelIds,
     sourceType: 1,
-    createUserId: 1
-  }
-  // const res = await addSyllabus(data)
-
-  if(!item.resultId){
-    item.resultId = res.data
+    createUserId: user.userId,
+    createUserName: user.nickName
   }
+  await addSyllabus(data)
 }
 
+// 删除大纲
+const delAnswer = () =>{
+  ElMessageBox.confirm(
+    '确定要删除大纲吗?',
+    '温馨提示',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }
+  )
+    .then(async () => {
+      await removeSyllabus(curItem.id)
+      ElMessage.success('操作成功')
+      answer.value = ''
+      emitter.emit('resetSelect')
+    })
+    .catch(() => {})
+  
+}
 
 // 去掉字符串中的 ### **
 let getResult = (str) => {
@@ -145,6 +186,8 @@ const getChartId = () => {
 
 onUnmounted(()=>{
   emitter.off('selected')
+  emitter.off('onShow')
+  
 })
 
 const curNode = reactive({})
diff --git a/src/renderer/src/views/teachingDesign/container/edit-dialog.vue b/src/renderer/src/views/teachingDesign/container/edit-dialog.vue
index de61247..49cc5a4 100644
--- a/src/renderer/src/views/teachingDesign/container/edit-dialog.vue
+++ b/src/renderer/src/views/teachingDesign/container/edit-dialog.vue
@@ -6,7 +6,7 @@
         <i class="iconfont icon-guanbi" @click="isDialog = false"></i>
       </div>
     </template>
-    <div class="dialog-content">
+    <div class="dialog-content" v-loading="loading">
       <el-row>
         <el-col :span="24">
           <el-input v-model="textarea" :autosize="{ minRows: 5, maxRows: 15 }" type="textarea" />
@@ -28,11 +28,14 @@
 <script setup>
 import { ref, watch} from 'vue'
 import { ElMessage } from 'element-plus'
+import { editSyllabus } from '@/api/mode/index.js'
+import { cloneDeep } from 'lodash';
 import emitter from '@/utils/mitt';
 
 const textarea = ref('')
 
 const isDialog = defineModel()
+const loading = ref(false)
 
 const props = defineProps({
   item: {
@@ -51,9 +54,17 @@ watch(() => props.item.answer, (newVal) => {
 
 const emit = defineEmits(['saveEdit'])
 const onSave = () =>{
-  emitter.emit('changeResult', textarea.value)
-  isDialog.value = false
-  ElMessage.success('操作成功')
+  loading.value = true
+  let data = cloneDeep(props.item)
+  data.outline = textarea.value
+
+  editSyllabus(data).then( res =>{
+    isDialog.value = false
+    ElMessage.success('操作成功')
+    emitter.emit('onShow', data)
+  }).finally( ()=>{
+    loading.value = false
+  })
   
 }
 
diff --git a/src/renderer/src/views/teachingDesign/container/left2.vue b/src/renderer/src/views/teachingDesign/container/left2.vue
index 17668a0..3f4a612 100644
--- a/src/renderer/src/views/teachingDesign/container/left2.vue
+++ b/src/renderer/src/views/teachingDesign/container/left2.vue
@@ -11,7 +11,7 @@
     <div class="left-list">
       <div class="item" v-for="item in templateList" :key="item.id">
         <div class="item-name flex" @mouseenter="item.isAdd = true" @mouseleave="item.isAdd = false"
-          @click="handleItem(item)">
+          @click="toggleParent(item)">
           <div class="flex">
               <span>{{ item.name }}</span>
               <!--个人教学模式才会有添加、编辑-->
@@ -21,19 +21,19 @@
               </div>
           </div>
           <!--加号 数鼠标悬浮 显示-->
-          <i v-show="item.isAdd && !item.isSelect" class="iconfont icon-jiahao"></i> 
+          <i v-show="item.isAdd && !item.selected" class="iconfont icon-jiahao"></i> 
           <!--减号 选中之后显示-->     
-          <i v-show="item.isSelect" class="iconfont icon-zuixiaohua"></i>
+          <i v-show="item.selected" class="iconfont icon-zuixiaohua"></i>
         </div>
-        <div class="item-child flex" :class="el.isSelect ? 'act-child' : ''" v-for="el in item.child" :key="el.id"
-          @mouseenter="el.isAdd = true" @mouseleave="el.isAdd = false" @click="handleItemChild(el)">
+        <div class="item-child flex" :class="child.selected ? 'act-child' : ''" v-for="child in item.children" :key="child.id"
+          @mouseenter="child.isAdd = true" @mouseleave="child.isAdd = false" @click="toggleChild(item,child)">
           <div>
-            <span>{{ el.name }}</span>
+            <span>{{ child.name }}</span>
              <!--个人教学模式才会有编辑-->
-             <el-button v-if="!el.ex3" class="ml-3" type="primary" link @click.stop="editMode(el)">编辑</el-button>
+             <el-button v-if="!child.ex3" class="ml-3" type="primary" link @click.stop="editMode(child)">编辑</el-button>
           </div>
-            <i v-show="el.isAdd && !el.isSelect"  class="iconfont icon-jiahao"></i>
-            <i v-show="el.isSelect" class="iconfont icon-zuixiaohua "></i>
+            <i v-show="child.isAdd && !child.selected"  class="iconfont icon-jiahao"></i>
+            <i v-show="child.selected" class="iconfont icon-zuixiaohua "></i>
         </div>
       </div>
     </div>
@@ -68,13 +68,13 @@
 </template>
 
 <script setup>
-import { ref, reactive, onMounted } from 'vue'
+import { ref, reactive, onMounted, onUnmounted } from 'vue'
 import { modelList } from '@/api/mode/index'
 import useUserStore from '@/store/modules/user'
 import { sessionStore } from '@/utils/store'
 import emitter from '@/utils/mitt'
 import { ElMessage, ElMessageBox  } from 'element-plus'
-import { addChildTemp, editChildTemp, removeChildTemp } from '@/api/mode'
+import { addChildTemp, editChildTemp, removeChildTemp, syllabusList } from '@/api/mode'
 import { cloneDeep } from 'lodash'
 
 
@@ -104,67 +104,73 @@ const getChildTemp = async () => {
       let { rows } = await modelList({ model: 4, type: 2, parentId: item.id })
       templateList.value.push({
         ...item,
-        child: rows
+        children: rows
       })
     } finally {
       loading.value = false
     }
   }
+  getSyllabus()
 }
 
+// 查询生成大纲记录
+const getSyllabus = async () =>{
+  const { rows } = await syllabusList()
+  if(rows && rows.length){
+    const idsAry = rows.at(-1).modelIds.split(',').map(item => Number(item));
+    // 设置选中
+    templateList.value.forEach((parent) => {
+      parent.children.forEach((child) => {
+        child.selected = idsAry.includes(child.id);
+      });
+      // 更新父项的 selected 状态
+      parent.selected = parent.children.every((child) => child.selected);
+    });
+    // 回显大纲数据
+    emitter.emit('onShow', rows.at(-1))
+  }
+} 
+
 // 重置选中
 const resetSelect = () =>{
   templateList.value.forEach(item =>{
-    item.isSelect = false
-    item.child.forEach( el=>{
-      el.isSelect = false
+    item.selected = false
+    item.children.forEach( el=>{
+      el.selected = false
     })
   })
+  emitter.emit('selected', [])
 }
 
-const handleItem = (item) => {
-  if(item.newMode) return
-  item.isSelect = !item.isSelect
-  item.child.forEach(el => {
-    el.isSelect = !el.isSelect
-  })
+emitter.on('resetSelect', () =>{
+  resetSelect()
+})
 
-  let data = collectSelectedItems(templateList.value)
-  emitter.emit('selected', data)
+// 点击教学模式
+const toggleParent = (parent) => {
+  parent.selected = !parent.selected;
+  parent.children.forEach(child => {
+    child.selected = parent.selected;
+  });
+  const selectedData = templateList.value.map((item) => item.children.filter((child) => child.selected)).flat() 
+   // .flat()将二维数组扁平化为一维数组
+  emitter.emit('selected', selectedData)
 }
 
-const handleItemChild = (el) =>{
-  el.isSelect = !el.isSelect
-
-  let data = collectSelectedItems(templateList.value)
-  emitter.emit('selected', data)
+// 点击教学环节
+const toggleChild = (parent,child) =>{
+  child.selected = !child.selected;
+  updateParentSelection(parent)
+  const selectedData = templateList.value.map((item) => item.children.filter((child) => child.selected)).flat() 
+  emitter.emit('selected', selectedData)
 } 
 
-
-
- // 定义一个函数来过滤 children 中 isSelect 为 true 的对象
-const collectSelectedItems = (data) => {
-  let result = [];
-
-  // 遍历每个父节点
-  data.forEach(parent => {
-    if (Array.isArray(parent.child)) {
-      // 使用 filter 方法筛选出 children 中 isSelect 为 true 的对象
-      const selectedChildren = parent.child.filter(child => child.isSelect === true);
-      
-      // 将筛选后的子节点添加到结果数组中
-      result = result.concat(selectedChildren.map(child => ({
-        ...child
-      })));
-    }
-  });
-
-  return result;
+// 检查父项(教学模式)的所有子项(教学环节)是否都被选中，如果是，则设置父项为选中状态，否则取消选中
+const updateParentSelection = (parent) => {
+  parent.selected = parent.children.every((child) => child.selected);
 }
 
 
-
-
 // 弹窗
 const addVisible = ref(false)
 
@@ -286,6 +292,10 @@ onMounted(() => {
 })
 
 
+onUnmounted(()=>{
+  emitter.off('resetSelect')
+})
+
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/renderer/src/views/teachingDesign/index.vue b/src/renderer/src/views/teachingDesign/index.vue
index d356986..773aebf 100644
--- a/src/renderer/src/views/teachingDesign/index.vue
+++ b/src/renderer/src/views/teachingDesign/index.vue
@@ -1,14 +1,14 @@
 <template>
-  <div class="page-design flex">
-    <div class="page-left">
+  <div class="page-design">
+    <!-- <div class="page-left">
     
       <left />
     </div>
     <div class="page-right">
      
       <right />
-    </div>
-  <!-- <el-row :gutter="20">
+    </div> -->
+  <el-row :gutter="20">
     <el-col :span="5">
       <Left/>
     </el-col>
@@ -18,37 +18,37 @@
     <el-col :span="6">
       <Right/>
     </el-col>
-  </el-row> -->
+  </el-row>
     
   </div>
 </template>
 
 <script setup>
-import left from './container/left.vue';
-import right from './container/right.vue';
-// import Left from './container/left2.vue'
-// import Center from './container/center.vue'
-// import Right from './container/right2.vue'
+// import left from './container/left.vue';
+// import right from './container/right.vue';
+import Left from './container/left2.vue'
+import Center from './container/center.vue'
+import Right from './container/right2.vue'
 </script>
 
 <style lang="scss" scoped>
-// .page-design {
-//   height: 100%;
-//   .el-row{
-//     height: 100%;
-//     .el-col{
-//       height: 100%;
-//     }
-//   }
-// }
-
 .page-design {
   height: 100%;
-  .page-left{
-    width: 50%;
-  }
-  .page-right{
-    width: 50%;
+  .el-row{
+    height: 100%;
+    .el-col{
+      height: 100%;
+    }
   }
 }
+
+// .page-design {
+//   height: 100%;
+//   .page-left{
+//     width: 50%;
+//   }
+//   .page-right{
+//     width: 50%;
+//   }
+// }
 </style>
\ No newline at end of file

From 9f42f93cb99659a081f34aab71001bac07db57e1 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: Mon, 6 Jan 2025 09:48:11 +0800
Subject: [PATCH 02/21] =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/layout/components/Aside.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/renderer/src/layout/components/Aside.vue b/src/renderer/src/layout/components/Aside.vue
index 005d8fb..bde5ccd 100644
--- a/src/renderer/src/layout/components/Aside.vue
+++ b/src/renderer/src/layout/components/Aside.vue
@@ -345,6 +345,7 @@ onMounted(() => {
   color: #fff;
   font-size: 12px;
   margin-top: 5px;
+  text-align: center;
 }
 .pointer-events{
   pointer-events: none;

From 86ae0fa0cdd0362f4c8373fb818a92ac6b14565b 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: Mon, 6 Jan 2025 09:54:21 +0800
Subject: [PATCH 03/21] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=89=B9=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=9B=A0=E6=A1=86=E6=9E=B6?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E4=BF=AE=E6=94=B9=E8=80=8C=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/views/classTask/teachClassTask.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/renderer/src/views/classTask/teachClassTask.vue b/src/renderer/src/views/classTask/teachClassTask.vue
index 0d1afe6..0617952 100644
--- a/src/renderer/src/views/classTask/teachClassTask.vue
+++ b/src/renderer/src/views/classTask/teachClassTask.vue
@@ -821,6 +821,7 @@ onUnmounted(() => {
 
 <style scoped lang="scss">
 .teachClassTask{
+  padding: 10px;
   height: 100%;
   display: flex;
   flex-direction: column;

From 6579ee1c2dcbcdb540a0fa10741bd4f68633fcbe Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Mon, 6 Jan 2025 09:55:28 +0800
Subject: [PATCH 04/21] =?UTF-8?q?=E6=95=99=E5=AD=A6=E6=A1=86=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/views/teachingDesign/container/center.vue    | 4 ++--
 .../src/views/teachingDesign/container/edit-dialog.vue        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/renderer/src/views/teachingDesign/container/center.vue b/src/renderer/src/views/teachingDesign/container/center.vue
index ab35643..cfc8d45 100644
--- a/src/renderer/src/views/teachingDesign/container/center.vue
+++ b/src/renderer/src/views/teachingDesign/container/center.vue
@@ -9,7 +9,7 @@
         <el-button type="primary" @click="createAi">
           <i class="iconfont icon-chuangzuo"></i>生成教学大纲
         </el-button>
-        <el-button type="danger" :disabled="Boolean(!answer)" @click="delAnswer">
+        <el-button type="danger" :disabled="curItem.parentId" @click="delAnswer">
           <i class="iconfont icon-shanchu"></i>
           删除大纲
         </el-button>
@@ -73,7 +73,7 @@ emitter.on('onShow', (data)=>{
 
 const getDetails = (id) =>{
   syllabuss(id).then( res =>{
-    console.log(res)
+    Object.assign(curItem, res.data)
   })
 }
 
diff --git a/src/renderer/src/views/teachingDesign/container/edit-dialog.vue b/src/renderer/src/views/teachingDesign/container/edit-dialog.vue
index 49cc5a4..49c7601 100644
--- a/src/renderer/src/views/teachingDesign/container/edit-dialog.vue
+++ b/src/renderer/src/views/teachingDesign/container/edit-dialog.vue
@@ -2,7 +2,7 @@
   <el-dialog v-model="isDialog" :show-close="false" width="900" destroy-on-close>
     <template #header>
       <div class="custom-header flex">
-        <span>{{ item.name }}</span>
+        <span>编辑大纲</span>
         <i class="iconfont icon-guanbi" @click="isDialog = false"></i>
       </div>
     </template>

From 8119c6c835f63d48c38936b210477d66e29658e5 Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Mon, 6 Jan 2025 10:50:45 +0800
Subject: [PATCH 05/21] =?UTF-8?q?=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

---
 src/renderer/src/components/whiteboard/whiteboard.vue      | 3 ++-
 src/renderer/src/views/teachingDesign/container/center.vue | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/renderer/src/components/whiteboard/whiteboard.vue b/src/renderer/src/components/whiteboard/whiteboard.vue
index be3e274..563b114 100644
--- a/src/renderer/src/components/whiteboard/whiteboard.vue
+++ b/src/renderer/src/components/whiteboard/whiteboard.vue
@@ -123,7 +123,7 @@
           <!-- 边框样式 -->
           <div class="blockBox">
             <el-dropdown @command="updateStyle('lineDash', $event)" placement="top">
-              <el-button><el-image src="../../../src/assets/images/borderstyle.png"
+              <el-button><el-image :src="borderStyleImg"
                   style="width: 14px; height: 14px"></el-image></el-button>
               <template #dropdown>
                 <el-dropdown-menu>
@@ -303,6 +303,7 @@ import {
 import Contextmenu from './components/Contextmenu.vue'
 import { fontFamilyList, fontSizeList } from './constants'
 
+const borderStyleImg = new URL('../../../src/assets/images/borderstyle.png', import.meta.url).href
 const borderImg = new URL('../../../src/assets/images/borderwidth.png', import.meta.url).href
 const pointerImg = new URL('../../../src/assets/images/mouse-pointer.png', import.meta.url).href
 const { proxy } = getCurrentInstance()
diff --git a/src/renderer/src/views/teachingDesign/container/center.vue b/src/renderer/src/views/teachingDesign/container/center.vue
index cfc8d45..ae9fa30 100644
--- a/src/renderer/src/views/teachingDesign/container/center.vue
+++ b/src/renderer/src/views/teachingDesign/container/center.vue
@@ -74,6 +74,7 @@ emitter.on('onShow', (data)=>{
 const getDetails = (id) =>{
   syllabuss(id).then( res =>{
     Object.assign(curItem, res.data)
+    emitter.emit('onResult', res.data)
   })
 }
 

From b13eb1163318652fb1ac4f7113187cfeb7a51d02 Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Mon, 6 Jan 2025 14:51:20 +0800
Subject: [PATCH 06/21] =?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

---
 electron-builder-yc.yml               |  4 ++--
 package.json                          |  2 +-
 src/renderer/src/utils/ppt-request.js | 14 +++++++++++++-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/electron-builder-yc.yml b/electron-builder-yc.yml
index 385b578..fd34471 100644
--- a/electron-builder-yc.yml
+++ b/electron-builder-yc.yml
@@ -1,10 +1,10 @@
 appId: com.electron.app.yc
-productName: 文枢课堂
+productName: 永川中小学AI教学系统
 directories:
   output: dist
   buildResources: build
 win:
-  executableName: 文枢课堂
+  executableName: 永川中小学AI教学系统
   icon: resources/yc-logo.png
 files:
   - '!**/.vscode/*'
diff --git a/package.json b/package.json
index f3599c1..7fb23eb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aix-win-ws",
-  "version": "2.5.11",
+  "version": "2.5.14",
   "description": "",
   "main": "./out/main/index.js",
   "author": "上海交大重庆人工智能研究院",
diff --git a/src/renderer/src/utils/ppt-request.js b/src/renderer/src/utils/ppt-request.js
index 7d49a50..f080ece 100644
--- a/src/renderer/src/utils/ppt-request.js
+++ b/src/renderer/src/utils/ppt-request.js
@@ -106,6 +106,18 @@ const getBackGroundV2 = async () => {
     throw error;
   }
 };
+
+const createOutlineV2 = async (data) => {
+  try {
+    const response = await req("/api/aipptV2/createOutlineV2", "POST", data);
+    console.log("createOutline response:", response);
+
+    return response.data;
+  } catch (error) {
+    console.error("请求失败:", error);
+    throw error;
+  }
+};
 const createPPTV2 = async (data) => {
   try {
     const response = await req("/api/aipptV2/createV2", "POST", data);
@@ -127,4 +139,4 @@ const getProgressV2 = async (id) => {
   }
 };
 
-export { createOutline, getBackGround, createPPT, getProgress, getBackGroundV2, createPPTV2, getProgressV2, createByOutline };
+export { createOutline, getBackGround, createPPT, getProgress, getBackGroundV2, createOutlineV2, createPPTV2, getProgressV2, createByOutline };

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 07/21] =?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 <ly_cheng2023@163.com>
Date: Mon, 6 Jan 2025 17:24:56 +0800
Subject: [PATCH 08/21] 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 @@
       <span>教学模式</span>
       <div>
         <el-button type="primary" link @click="resetSelect">重置</el-button>
-        <el-button type="primary" link @click="addVisible = true; addChild = false; isEdit = false"><i class="iconfont icon-jiahao"
-          ></i>新增</el-button>
+        <el-button type="primary" link @click="
+          addVisible = true
+        addChild = false
+        isEdit = false
+          "><i class="iconfont icon-jiahao"></i>新增</el-button>
       </div>
     </div>
     <div class="left-list">
@@ -13,33 +16,34 @@
         <div class="item-name flex" @mouseenter="item.isAdd = true" @mouseleave="item.isAdd = false"
           @click="toggleParent(item)">
           <div class="flex">
-              <span>{{ item.name }}</span>
-              <!--个人教学模式才会有添加、编辑-->
-              <div v-if="!item.ex3" class="ml-3">
-                <el-button type="primary" link @click.stop="addModeChild(item)">添加</el-button>
-                <el-button type="primary" link @click.stop="editMode(item)">编辑</el-button>
-              </div>
+            <span>{{ item.name }}</span>
+            <!--个人教学模式才会有添加、编辑-->
+            <div v-if="!item.ex3" class="ml-3">
+              <el-button type="primary" link @click.stop="addModeChild(item)">添加</el-button>
+              <el-button type="primary" link @click.stop="editMode(item)">编辑</el-button>
+            </div>
           </div>
           <!--加号 数鼠标悬浮 显示-->
-          <i v-show="item.isAdd && !item.selected" class="iconfont icon-jiahao"></i> 
-          <!--减号 选中之后显示-->     
+          <i v-show="item.isAdd && !item.selected" class="iconfont icon-jiahao"></i>
+          <!--减号 选中之后显示-->
           <i v-show="item.selected" class="iconfont icon-zuixiaohua"></i>
         </div>
-        <div class="item-child flex" :class="child.selected ? 'act-child' : ''" v-for="child in item.children" :key="child.id"
-          @mouseenter="child.isAdd = true" @mouseleave="child.isAdd = false" @click="toggleChild(item,child)">
+        <div class="item-child flex" :class="child.selected ? 'act-child' : ''" v-for="child in item.children"
+          :key="child.id" @mouseenter="child.isAdd = true" @mouseleave="child.isAdd = false"
+          @click="toggleChild(item, child)">
           <div>
             <span>{{ child.name }}</span>
-             <!--个人教学模式才会有编辑-->
-             <el-button v-if="!child.ex3" class="ml-3" type="primary" link @click.stop="editMode(child)">编辑</el-button>
+            <!--个人教学模式才会有编辑-->
+            <el-button v-if="!child.ex3" class="ml-3" type="primary" link @click.stop="editMode(child)">编辑</el-button>
           </div>
-            <i v-show="child.isAdd && !child.selected"  class="iconfont icon-jiahao"></i>
-            <i v-show="child.selected" class="iconfont icon-zuixiaohua "></i>
+          <i v-show="child.isAdd && !child.selected" class="iconfont icon-jiahao"></i>
+          <i v-show="child.selected" class="iconfont icon-zuixiaohua"></i>
         </div>
       </div>
     </div>
     <!--弹窗-->
     <el-dialog v-model="addVisible" append-to-body :show-close="false" width="550" :before-close="handleBeforeClose"
-      style="border-radius: 10px; padding: 10px 15px;">
+      style="border-radius: 10px; padding: 10px 15px">
       <template #header>
         <div class="mode-dialog-header flex">
           <span>{{ addChild ? '教学环节' : '教学模式' }}</span>
@@ -48,8 +52,8 @@
       </template>
       <el-form ref="ruleFormRef" style="max-width: 600px" :model="ruleForm" :rules="rules" label-width="auto"
         class="demo-ruleForm">
-        <el-form-item :label="`教学${ addChild ? '环节' : '模式'}名称`" prop="name">
-          <div class="flex" style="width: 100%;">
+        <el-form-item :label="`教学${addChild ? '环节' : '模式'}名称`" prop="name">
+          <div class="flex" style="width: 100%">
             <el-input v-model="ruleForm.name" />
             <el-button v-if="isEdit" link type="danger" class="ml-5 mr-3" @click="onDel">删除</el-button>
           </div>
@@ -64,7 +68,6 @@
       </div>
     </el-dialog>
   </div>
-
 </template>
 
 <script setup>
@@ -73,131 +76,134 @@ import { modelList } from '@/api/mode/index'
 import useUserStore from '@/store/modules/user'
 import { sessionStore } from '@/utils/store'
 import emitter from '@/utils/mitt'
-import { ElMessage, ElMessageBox  } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { addChildTemp, editChildTemp, removeChildTemp, syllabusList } from '@/api/mode'
 import { cloneDeep } from 'lodash'
 
-
 const { user } = useUserStore()
 
-// 获取主模板
+// 获取模板
 const loading = ref(false)
-let list = ref([])
-const getTemplate = async (id) => {
-  loading.value = true
-  const { rows } = await modelList({ createUser: user.userId, model: 4, type: 1, pageNum: 1, pageSize: 10000 })
-  loading.value = false
-  list.value = rows
-  if (list.value.length) {
-    getChildTemp(id)
-  }
-}
-
-// 获取子模板
 const templateList = ref([])
-const getChildTemp = async () => {
-  templateList.value = []
+const getTemplate = async () => {
   loading.value = true
+  const { rows } = await modelList({
+    createUser: user.userId,
+    model: 4,
+    pageNum: 1,
+    pageSize: 10000
+  })
+  loading.value = false
 
-  for (let item of list.value) {
-    try {
-      let { rows } = await modelList({ model: 4, type: 2, parentId: item.id })
-      templateList.value.push({
-        ...item,
-        children: rows
-      })
-    } finally {
-      loading.value = false
-    }
-  }
+  // 过滤出 type 为 1 的项
+  let ary1 = rows.filter((item) => item.type === 1)
+  templateList.value = ary1.map((parent) => {
+    parent.children = rows.filter((child) => child.type === 2 && child.parentId === parent.id)
+    return parent
+  })
   getSyllabus()
 }
 
 // 查询生成大纲记录
-const getSyllabus = async () =>{
-  const { rows } = await syllabusList()
-  if(rows && rows.length){
-    const idsAry = rows.at(-1).modelIds.split(',').map(item => Number(item));
+const getSyllabus = async () => {
+  const { rows } = await syllabusList({
+    createUserId: user.userId,
+    eduId: curNode.id,
+    sourceType: 1,
+    pageSize: 1,
+    orderByColumn: 'createTime',
+    isAsc: 'desc'
+  })
+  if (rows && rows.length) {
+    const idsAry = rows
+      .at(-1)
+      .modelIds.split(',')
+      .map((item) => Number(item))
     // 设置选中
+    let ary = []
     templateList.value.forEach((parent) => {
       parent.children.forEach((child) => {
-        child.selected = idsAry.includes(child.id);
-      });
+        child.selected = idsAry.includes(child.id)
+        if (child.selected) {
+          ary.push(child)
+        }
+      })
       // 更新父项的 selected 状态
-      parent.selected = parent.children.every((child) => child.selected);
-    });
+      parent.selected = parent.children.every((child) => child.selected)
+    })
     // 回显大纲数据
     emitter.emit('onShow', rows.at(-1))
+    emitter.emit('selected', ary)
   }
-} 
+}
 
 // 重置选中
-const resetSelect = () =>{
-  templateList.value.forEach(item =>{
+const resetSelect = () => {
+  templateList.value.forEach((item) => {
     item.selected = false
-    item.children.forEach( el=>{
+    item.children.forEach((el) => {
       el.selected = false
     })
   })
   emitter.emit('selected', [])
 }
 
-emitter.on('resetSelect', () =>{
+emitter.on('resetSelect', () => {
   resetSelect()
 })
 
 // 点击教学模式
 const toggleParent = (parent) => {
-  parent.selected = !parent.selected;
-  parent.children.forEach(child => {
-    child.selected = parent.selected;
-  });
-  const selectedData = templateList.value.map((item) => item.children.filter((child) => child.selected)).flat() 
-   // .flat()将二维数组扁平化为一维数组
+  parent.selected = !parent.selected
+  parent.children.forEach((child) => {
+    child.selected = parent.selected
+  })
+  const selectedData = templateList.value
+    .map((item) => item.children.filter((child) => child.selected))
+    .flat()
+  // .flat()将二维数组扁平化为一维数组
   emitter.emit('selected', selectedData)
 }
 
 // 点击教学环节
-const toggleChild = (parent,child) =>{
-  child.selected = !child.selected;
+const toggleChild = (parent, child) => {
+  child.selected = !child.selected
   updateParentSelection(parent)
-  const selectedData = templateList.value.map((item) => item.children.filter((child) => child.selected)).flat() 
+  const selectedData = templateList.value
+    .map((item) => item.children.filter((child) => child.selected))
+    .flat()
   emitter.emit('selected', selectedData)
-} 
+}
 
 // 检查父项(教学模式)的所有子项(教学环节)是否都被选中，如果是，则设置父项为选中状态，否则取消选中
 const updateParentSelection = (parent) => {
-  parent.selected = parent.children.every((child) => child.selected);
+  parent.selected = parent.children.every((child) => child.selected)
 }
 
-
 // 弹窗
 const addVisible = ref(false)
 
 const ruleFormRef = ref()
 const rules = reactive({
-  name: [
-  { required: true, message: '不能为空', trigger: 'blur' },
-  ]
+  name: [{ required: true, message: '不能为空', trigger: 'blur' }]
 })
 const ruleForm = reactive({
   name: '',
   prompt: ''
 })
 // 提交
-const onSubmit = async (formEl) =>{
+const onSubmit = async (formEl) => {
   if (!formEl) return
   await formEl.validate(async (valid, fields) => {
     if (valid) {
-
       // 修改
-      if(isEdit.value){
+      if (isEdit.value) {
         let data = cloneDeep(curEditItem)
         data.name = ruleForm.name
         await editChildTemp(data)
       }
       // 新增
-      else{
+      else {
         let obj = {
           ex1: curNode.edustage,
           ex2: curNode.edusubject,
@@ -207,13 +213,12 @@ const onSubmit = async (formEl) =>{
           type: 1
         }
         // 新增教学环节
-        if(addChild.value){
+        if (addChild.value) {
           obj.parentId = curEditItem.id
           obj.prompt = ruleForm.prompt
           obj.type = 2
         }
         await addChildTemp(obj)
-        
       }
       ElMessage.success('操作成功')
       resetForm()
@@ -231,16 +236,16 @@ const isEdit = ref(false)
 const addChild = ref(false)
 
 const curEditItem = reactive({})
-const addModeChild = (item) =>{
+const addModeChild = (item) => {
   isEdit.value = false
   Object.assign(curEditItem, item)
   addChild.value = true
   addVisible.value = true
 }
 
-// 
+//
 
-const editMode = (item)=>{
+const editMode = (item) => {
   isEdit.value = true
   addChild.value = false
   Object.assign(curEditItem, item)
@@ -249,16 +254,12 @@ const editMode = (item)=>{
 }
 
 // 删除 教学模式 教学环节
-const onDel = () =>{
-  ElMessageBox.confirm(
-    '确定要删除模板吗?',
-    '温馨提示',
-    {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }
-  )
+const onDel = () => {
+  ElMessageBox.confirm('确定要删除模板吗?', '温馨提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  })
     .then(async () => {
       await removeChildTemp(curEditItem.id)
       ElMessage.success('操作成功')
@@ -266,36 +267,33 @@ const onDel = () =>{
       addVisible.value = false
       getTemplate()
     })
-    .catch(() => {})
+    .catch(() => { })
 }
 
-
-const closeDialog = () =>{
-  handleBeforeClose(() => addVisible.value = false);
+const closeDialog = () => {
+  handleBeforeClose(() => (addVisible.value = false))
 }
 
-const handleBeforeClose = (done) =>{
+const handleBeforeClose = (done) => {
   resetForm()
   done()
 }
 const resetForm = () => {
   if (ruleFormRef.value) {
-    ruleFormRef.value.resetFields();
+    ruleFormRef.value.resetFields()
   }
-};
+}
 
 const curNode = reactive({})
 onMounted(() => {
   let data = sessionStore.get('subject.curNode')
-  Object.assign(curNode, data);
+  Object.assign(curNode, data)
   getTemplate()
 })
 
-
-onUnmounted(()=>{
+onUnmounted(() => {
   emitter.off('resetSelect')
 })
-
 </script>
 
 <style lang="scss" scoped>
@@ -342,7 +340,7 @@ onUnmounted(()=>{
       position: relative;
 
       &::after {
-        content: "";
+        content: '';
         width: 5px;
         height: 5px;
         border-radius: 50%;
@@ -352,7 +350,6 @@ onUnmounted(()=>{
         top: 50%;
         transform: translate(0, -50%);
       }
-
     }
 
     .iconfont {
@@ -389,8 +386,9 @@ onUnmounted(()=>{
     cursor: pointer;
   }
 }
-.form-btn{
+
+.form-btn {
   text-align: right;
   margin-bottom: 10px;
 }
-</style>
\ No newline at end of file
+</style>

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 09/21] =?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">
           <template #default="{ node, data }">
-            <div v-if="props.isClassTask && (data.bookId == '' || data.bookId == '0')">
-              <el-tooltip effect="light" placement="right" content="该单元章节无自主试题">
-                <span class="tree-label" style="color: #A5B3CA">
+            <div v-if="props.isClassTask && (data.bookId == '' || data.bookId == '0')" class="tree-label-wrap">
+              <el-tooltip effect="light" placement="right" >
+                <template #content> {{ node.label }}<br /><span style="color: red;">-该单元章节无自主试题-</span> </template>
+                <span class="tree-label" style="color: #A5B3CA" >
                   {{ node.label }}
                 </span>
               </el-tooltip>
             </div>
-            <div v-else>
-              <span class="tree-label">{{ node.label }}</span>
+            <div v-else class="tree-label-wrap">
+              <el-tooltip effect="light" placement="right" >
+                <template #content> {{ node.label }}</template>
+                <span class="tree-label">
+                  {{ node.label }}
+                </span>
+              </el-tooltip>
             </div>
           </template>
         </el-tree>
@@ -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 <ly_cheng2023@163.com>
Date: Tue, 7 Jan 2025 11:02:11 +0800
Subject: [PATCH 10/21] =?UTF-8?q?edit=20=E6=A1=86=E6=9E=B6=E8=AE=BE?=
 =?UTF-8?q?=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 @@
       </div>
     </div>
     <div class="center-con" v-loading="loading">
-      <TypingEffect v-if="answer" :text="answer" :delay="10" :aiShow="aiShow"/>
-      <el-empty v-if="!answer" description="请选择符合您需要的教学模式，生成教学大纲" />
+      <!-- <TypingEffect v-if="answer" :text="answer" :delay="10" :aiShow="aiShow"/> -->
+      <div style="font-size: 18px;color: #409eff;">封面页</div>
+      <div class="con-item mb-5">
+        <div class="item-name">标题：{{ answer.title }}</div>
+        <div class="item-name">副标题：{{answer.subTitle }}</div>
+      </div>
+      <div style="font-size: 18px;color: #409eff;">目录页</div>
+      <div class="con-item" v-for="(item,index) in answer.chapters">
+        <div class="item-name">{{index + 1}}：{{ item.chapterTitle }}</div>
+        <div class="item-text">
+          <p v-for="(el,i) in item.chapterContents">{{ index + 1 }} - {{ i + 1}} : {{ el.chapterTitle }}</p>
+        </div>
+      </div>
+      <el-empty v-if="!answer.title" description="请选择符合您需要的教学模式，生成教学大纲" />
     </div>
   </div>
   <EditDialog v-model="isEdit" :item="curItem" />
@@ -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 @@
       <div>
         <el-button type="primary" link @click="resetSelect">重置</el-button>
         <el-button type="primary" link @click="
-          addVisible = true
-        addChild = false
+          addVisible = true,
+        addChild = false,
         isEdit = false
           "><i class="iconfont icon-jiahao"></i>新增</el-button>
       </div>

From 57caed47dd33721931fd76a40549696f6dc1442a Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Tue, 7 Jan 2025 11:03:05 +0800
Subject: [PATCH 11/21] =?UTF-8?q?=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/model/index.vue        |   1 +
 .../views/prepare/container/pptist-dialog.vue | 156 +++++++++-
 .../views/teachingDesign/container/center.vue |  12 +-
 .../container/progress-dialog.vue             |  11 +-
 .../views/teachingDesign/container/right2.vue | 293 +++++++++++++++++-
 .../src/views/teachingDesign/index.vue        |  12 +-
 6 files changed, 455 insertions(+), 30 deletions(-)

diff --git a/src/renderer/src/views/model/index.vue b/src/renderer/src/views/model/index.vue
index f869bee..8e2049a 100644
--- a/src/renderer/src/views/model/index.vue
+++ b/src/renderer/src/views/model/index.vue
@@ -680,6 +680,7 @@ onMounted(async () => {
           display: flex;
           flex-wrap: wrap;
           gap: 15px;
+          padding: 10px;
           .content-body-right-item{
             &:hover{
               cursor: pointer;
diff --git a/src/renderer/src/views/prepare/container/pptist-dialog.vue b/src/renderer/src/views/prepare/container/pptist-dialog.vue
index 22b2155..0d907b4 100644
--- a/src/renderer/src/views/prepare/container/pptist-dialog.vue
+++ b/src/renderer/src/views/prepare/container/pptist-dialog.vue
@@ -1,30 +1,120 @@
 <template>
   <div>
-    <el-dialog class="ppt-dialog" v-model="model" :show-close="false" width="800"  destroy-on-close :top="'3vh'">
-      <template #header="{ close, titleId, titleClass }">
-        <div class="dialog-header">
-          <h4 :id="titleId" :class="titleClass">生成PPT(试验版)</h4>
-          <i class="iconfont icon-guanbi" @click="close"></i>
+    <el-dialog class="ppt-dialog" v-model="model" title="生成PPT(试验版)"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :show-close="false" width="1000"  destroy-on-close >
+<!--      <AiPptist @add-success="addAiPPT" :dataList="dataList"/>-->
+      <div class="ppt-dialog-content">
+        <div v-if="activeStep === 1" class="ppt-dialog-cover-wrap">
+          <div v-for="(item,index) in backGroundList"
+               :key="item.templateIndexId"
+               @click="outlineData.templateId = item.templateIndexId"
+               :class="outlineData.templateId === item.templateIndexId?'active-mode':''"
+               class="ppt-dialog-cover-item">
+            <div class="icon-select">
+              <Select />
+            </div>
+            <img :src="getBackGroundImg(item.detailImage)">
+          </div>
         </div>
-      </template>
-      <AiPptist @add-success="addAiPPT" :dataList="dataList"/>
+        <div class="ppt-dialog-prog-wrap" v-if="activeStep === 2">
+          <el-progress :percentage="percentage" type="circle"></el-progress>
+        </div>
+      </div>
+      <div class="ppt-dialog-footer" v-if="activeStep === 1">
+        <el-button @click="closeDialog">关闭</el-button>
+        <el-button type="primary" :loading="createPPTLoading" @click="createPPT">生成课件</el-button>
+      </div>
     </el-dialog>
   </div>
 </template>
 
 <script setup>
   import AiPptist from './ai-pptistV2.vue';
+  import {Select} from "@element-plus/icons-vue";
+  import {ref, defineEmits, onMounted} from "vue";
+  import {createPPTV2, getBackGroundV2, getProgressV2} from "@/utils/ppt-request";
+  import {ElMessage} from "element-plus";
   const model = defineModel()
-  const emit = defineEmits(['addSuccess'])
+  const emit = defineEmits(['addSuccess', 'close-dialogs'])
+  const backGroundList = ref([]);
+  const activeStep = ref(1);
   const props = defineProps({
     dataList: {
-      type: Array,
-      default: () => []
+      type: Object,
+      default: () => {}
     }
   })
+  const closeDialog = () => {
+    emit('close-dialogs')
+  }
   const addAiPPT = (data) => {
     emit('addSuccess', data)
   }
+  const getBackGroundImg = (imgUrlStr) => {
+    return JSON.parse(imgUrlStr).titleCoverImage
+  };
+
+  const createPPTLoading = ref(false);
+  const outlineData = ref({
+      query: '',  // 用户要求（最多8000字）
+      templateId: '',  // ppt生成主题
+      author: 'AIX平台',
+      isFigure: false,   // 是否自动配图
+      search: true,
+      language: "cn"
+  })
+  const percentage = ref(0);
+  const outlineCreatePPT = () => {
+    const newOutlineData = { ...outlineData.value, };
+    newOutlineData.query = props.dataList.outline;
+    createPPTLoading.value = true;
+    createPPTV2(newOutlineData).then((res) => {
+      console.log(res, "正在生成中");
+      createPPTLoading.value = false;
+      activeStep.value = 2
+
+      const checkProgress = () => {
+        getProgressV2(res.sid).then(response => {
+          percentage.value = Math.round(response?.donePages*100/response?.totalPages);
+          if (response.pptStatus === "done") {
+            emit('addSuccess',{...res,url:response.pptUrl})
+            ElMessage.success("生成成功");
+          } else {
+            const sleepTime = 2000;
+            let remainingTime = sleepTime;
+            const intervalId = setInterval(() => {
+              remainingTime -= 100;
+              if (remainingTime <= 0) {
+                clearInterval(intervalId);
+                checkProgress();
+              }
+            }, 100);
+          }
+        });
+      };
+
+      checkProgress();
+    }).finally(()=>{
+      createPPTLoading.value = false
+    })
+  };
+
+  const createPPT = () => {
+    if (outlineData.value.templateId) {
+      outlineCreatePPT()
+    }else {
+      ElMessage.warning("请选择模板");
+    }
+  }
+
+  onMounted(() => {
+    // emit('addSuccess',{url:'https://bjcdn.openstorage.cn/xinghuo-privatedata/%2Ftmp/apiTempFileba724e0344f74e1480535eedf3ebec661601807661085006275/%E9%87%91%E9%A9%AC%E5%A5%96%E5%B0%B4%E5%B0%AC%E4%BA%8B%E4%BB%B6%E5%88%86%E6%9E%90%E4%B8%8E%E5%BA%94%E5%AF%B9%E7%AD%96%E7%95%A5.pptx'})
+    getBackGroundV2().then((res) => {
+      backGroundList.value = res.records;
+    });
+  })
 </script>
 
 <style lang="scss" scoped>
@@ -40,4 +130,50 @@
     cursor: pointer;
   }
 }
+.ppt-dialog-footer{
+  padding-top: 20px;
+  text-align: right;
+}
+.ppt-dialog-content{
+  height: 500px;
+  overflow: auto;
+  .ppt-dialog-prog-wrap{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 100%;
+  }
+  .ppt-dialog-cover-wrap{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+    .ppt-dialog-cover-item{
+      margin-bottom: 10px;
+      border: 10px solid #ccc;
+      border-radius: 10px;
+      cursor: pointer;
+      img{
+        width: 200px;
+      }
+      .icon-select{
+        display: none;
+      }
+    }
+    .active-mode{
+      border: 10px solid #5e24d0;
+      position: relative;
+      .icon-select{
+        position: absolute;
+        bottom: 10px;
+        right: 10px;
+        height: 20px;
+        width: 20px;
+        color: #fff;
+        background: #5e24d0;
+        border-radius: 5px;
+        display: block!important;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/renderer/src/views/teachingDesign/container/center.vue b/src/renderer/src/views/teachingDesign/container/center.vue
index ae9fa30..ed59b32 100644
--- a/src/renderer/src/views/teachingDesign/container/center.vue
+++ b/src/renderer/src/views/teachingDesign/container/center.vue
@@ -9,11 +9,11 @@
         <el-button type="primary" @click="createAi">
           <i class="iconfont icon-chuangzuo"></i>生成教学大纲
         </el-button>
-        <el-button type="danger" :disabled="curItem.parentId" @click="delAnswer">
+        <el-button type="danger" :disabled="!!curItem.parentId" @click="delAnswer">
           <i class="iconfont icon-shanchu"></i>
           删除大纲
         </el-button>
-    
+
         <el-button type="primary" @click="isEdit = true">
           <i class="iconfont icon-bianji"></i>编辑大纲
         </el-button>
@@ -96,7 +96,7 @@ const createAi = async ()=>{
     ElMessage.warning('请先选择教学环节后再生成教学大纲')
     return
   }
-  
+
   let str = selectedData.value.map( item => item.name).join('、')
   let bookV = curNode.roottitle.split('-')[1] + '版'
   loading.value = true
@@ -167,7 +167,7 @@ const delAnswer = () =>{
       emitter.emit('resetSelect')
     })
     .catch(() => {})
-  
+
 }
 
 // 去掉字符串中的 ### **
@@ -188,7 +188,7 @@ const getChartId = () => {
 onUnmounted(()=>{
   emitter.off('selected')
   emitter.off('onShow')
-  
+
 })
 
 const curNode = reactive({})
@@ -230,4 +230,4 @@ onMounted(() => {
   }
 }
 
-</style>
\ No newline at end of file
+</style>
diff --git a/src/renderer/src/views/teachingDesign/container/progress-dialog.vue b/src/renderer/src/views/teachingDesign/container/progress-dialog.vue
index 5bfe036..7f01c73 100644
--- a/src/renderer/src/views/teachingDesign/container/progress-dialog.vue
+++ b/src/renderer/src/views/teachingDesign/container/progress-dialog.vue
@@ -1,6 +1,6 @@
 
 <template>
-  <el-dialog v-model="open" v-bind="dAttrs">
+  <el-dialog class="aix-progress-dialog" v-model="open" v-bind="dAttrs">
     <el-progress type="dashboard" v-bind="$attrs.pg" />
   </el-dialog>
 </template>
@@ -29,5 +29,10 @@ const dAttrs = computed(() => {
 })
 </script>
 <style lang="scss" scoped>
-
-</style>
\ No newline at end of file
+</style>
+<style>
+.aix-progress-dialog .el-dialog__body{
+  display: flex;
+  justify-content: center;
+}
+</style>
diff --git a/src/renderer/src/views/teachingDesign/container/right2.vue b/src/renderer/src/views/teachingDesign/container/right2.vue
index 03ce212..e3e5d72 100644
--- a/src/renderer/src/views/teachingDesign/container/right2.vue
+++ b/src/renderer/src/views/teachingDesign/container/right2.vue
@@ -4,22 +4,73 @@
       <span>课件预览</span>
       <div>
         <el-button type="danger" @click="onCreate">一键生成</el-button>
-        <el-button>编辑课件</el-button>
+        <el-button :disabled="!result?.parentId" @click="openAiPPT">编辑课件</el-button>
       </div>
     </div>
     <div class="right-con">
-      <el-empty v-if="!result" description="请先生成教学大纲，再生成教学课件" />
+      <el-empty v-if="!result?.parentId" description="请先生成教学大纲，再生成教学课件" />
+      <div v-for="(item,index) in pptSlides" class="right-con-item">
+        <div>{{index+1}}</div><img :src="item.fileurl">
+      </div>
     </div>
   </div>
+  <PptDialog @close-dialogs="pptDialog = false" @add-success="addAiPPT" :dataList="result" v-model="pptDialog" />
+  <progress-dialog v-model:visible="pgDialog.visible" v-bind="pgDialog" />
 </template>
 <script setup>
-import { ref, onUnmounted } from 'vue'
+import {ref, onUnmounted, onMounted, reactive} from 'vue'
 import { ElMessage } from 'element-plus'
 import emitter from '@/utils/mitt'
+import progressDialog from './progress-dialog.vue'
+import PptDialog from "@/views/prepare/container/pptist-dialog.vue";
+import msgUtils from "@/plugins/modal";
+import {PPTXFileToJson} from "@/AixPPTist/src/hooks/useImport";
+import {slidesToImg} from "@/utils/ppt";
+import {getEntpcoursefile, listEntpcoursefileNew} from "@/api/education/entpcoursefile";
+import {sessionStore} from "@/utils/store";
+import * as API_smarttalk from "@/api/file";
+import * as API_entpcourse from "@/api/education/entpcourse";
+import * as API_entpcoursefile from "@/api/education/entpcoursefile";
+import * as commUtils from '@/utils/comm.js'
+import * as Api_server from '@/api/apiService' // 相关api
+import useUserStore from '@/store/modules/user'
+import {createWindow} from "@/utils/tool";
+import {editSyllabus} from "@/api/mode";
+import { getSmarttalkPage } from "@/api/file"
+const userStore = useUserStore()
+
+const pptDialog = ref(false)
+const result = ref(null)
+const courseObj = reactive({
+  node: null, // 选择的课程节点
+})
+const curNode = reactive({})
+const pgDialog = reactive({ // 弹窗-进度条
+  visible: false,
+  title: 'PPT解析中...',
+  width: 300,
+  showClose: false,
+  draggable: true,
+  beforeClose: done => { }, // 阻止-弹窗事件
+  pg: { // 进度条-参数
+    percentage: 0, // 百分比
+    color: [
+      { color: '#1989fa', percentage: 50 }, // 蓝色
+      { color: '#e6a23c', percentage: 80 }, // 橙色
+      { color: '#5cb87a', percentage: 100 }, // 绿色
+    ]
+  }
+})
+
+const pptSlides = ref([])
 
-const result = ref('')
 emitter.on('onResult', (data)=>{
   result.value = data
+  if (!!result.value.parentId) {
+    listEntpcoursefileNew({parentid: result.value.parentId}).then(res=>{
+      pptSlides.value = res.rows
+    })
+  }
 })
 
 const onCreate = () =>{
@@ -27,8 +78,232 @@ const onCreate = () =>{
     ElMessage.warning('请先进行研读')
     return
   }
+  pptDialog.value = true
 }
 
+const addAiPPT = async (res) => {
+  // res = { url: 'https://bjcdn.openstorage.cn/xinghuo-privatedata/%2Ftmp/apiTempFileba724e0344f74e1480535eedf3ebec661601807661085006275/%E9%87%91%E9%A9%AC%E5%A5%96%E5%B0%B4%E5%B0%AC%E4%BA%8B%E4%BB%B6%E5%88%86%E6%9E%90%E4%B8%8E%E5%BA%94%E5%AF%B9%E7%AD%96%E7%95%A5.pptx' }
+  let node = courseObj.node
+  pptDialog.value = false;
+  if (!node) return msgUtils.msgWarning('请选择章节?')
+  pgDialog.visible = true
+  pgDialog.pg.percentage = 0
+  //TODO res中有PPT地址
+  const params = { evalid: node.id, edituserid: userStore.id, pageSize: 1 }
+  const resEnpt = await HTTP_SERVER_API('getCourseList', params)
+  if (!(resEnpt?.rows?.[0] || null)) { // 创建
+    const resid = await HTTP_SERVER_API('addEntpcourse')
+    courseObj.entp.id = resid
+  } else courseObj.entp = resEnpt?.rows?.[0] || null
+  // 下载PPT 并解析json转换到我们自己数据库
+  fetch(res.url)
+    .then(res => res.arrayBuffer())
+    .then(async buffer => {
+      const resPptJson = await PPTXFileToJson(buffer)
+      const { def, slides, ...content } = resPptJson
+      // 生成缩略图
+      const thumbnails = await slidesToImg(slides, content.width)
+      // 转换图片|音频|视频 为线上地址
+      let completed = 0
+      const total = slides.length
+      for (let o of slides) {
+        completed++
+        await toRousrceUrl(o)
+        // 设置进度条
+        pgDialog.pg.percentage = Math.floor(completed / total * 100)
+      }
+      pgDialog.pg.percentage = 0
+      pgDialog.visible = false
+      // 生成ppt课件-父级
+      const p_params = { parentContent: JSON.stringify(content) }
+      const parentid = await HTTP_SERVER_API('addEntpcoursefile', p_params)
+      if (!!parentid ?? null) { // 生成内容幻灯片
+        // 生成备课资源-Smarttalk
+        const smarttalk = await HTTP_SERVER_API('addSmarttalk', { fileId: parentid })
+        if (slides.length > 0) {
+          const resSlides = slides.map(({ id, ...slide }) => JSON.stringify(slide))
+          const params = { parentid, filetype: 'slide', title: '', thumbnails, slides: resSlides }
+          const res_3 = await HTTP_SERVER_API('batchAddNew', params)
+          if (res_3 && res_3.code == 200) {
+            msgUtils.msgSuccess('生成PPT课件成功')
+            //TODO 打开生成的课件
+            updateGen(parentid)
+            listEntpcoursefileNew({parentid: parentid}).then(res=>{
+              pptSlides.value = res.rows
+            })
+            const res = await getEntpcoursefile(parentid)
+            if (res && res.code === 200) {
+              openPublicScreen('edit', res.data, smarttalk.resData) // 打开公屏-窗口
+            } else {
+              ElMessage.warning(res.msg||'文件获取异常！')
+            }
+          } else {
+            msgUtils.msgWarning('生成PPT课件失败')
+          }
+        }
+      }
+    }).finally(()=>{
+      pgDialog.visible = false
+  })
+}
+
+const openAiPPT = async () =>{
+  let parentid = result.value.parentId
+  const res = await getEntpcoursefile(parentid)
+  if (res && res.code === 200) {
+    const smarttalk = getSmarttalkPage({fileId: parentid})
+    openPublicScreen('edit', res.data, smarttalk.resData) // 打开公屏-窗口
+  } else {
+    ElMessage.warning(res.msg||'文件获取异常！')
+  }
+}
+
+const updateGen = (parentid)=>{
+  result.value.parentId = parentid
+  editSyllabus(result.value)
+}
+
+const openPublicScreen = (type, resource, currData)=> {
+  sessionStore.set('curr.resource', resource) // 缓存当前资源信息
+  if (type=='edit') sessionStore.set('curr.smarttalk', currData) // 缓存当前文件smarttalk
+  else sessionStore.set('curr.classcourse', currData) // 缓存当前当前上课
+  createWindow('open-win', {
+    url: '/pptist', // 窗口关闭时，清除缓存
+    close: () => {
+      sessionStore.set('curr.resource', null) // 清除缓存
+      if (type=='edit') {
+        sessionStore.set('curr.smarttalk', null) // 清除缓存
+      } else sessionStore.set('curr.classcourse', null) // 清除缓存
+    }
+  })
+}
+
+// 图片|音频|视频 转换为在线地址
+const toRousrceUrl = async (o) => {
+  if (!!o.src) { // 如果有src就转换
+    const isBase64 = /^data:image\/(\w+);base64,/.test(o.src)
+    const isBlobUrl = /^blob:/.test(o.src)
+    console.log('isBase64', o, isBase64)
+    if (isBase64) {
+      const bolb = commUtils.base64ToBlob(o.src)
+      const fileName = Date.now() + '.png'
+      const file = commUtils.blobToFile(bolb, fileName)
+      // o.src = fileName
+      // console.log('file', file)
+      const formData = new FormData()
+      formData.append('file', file)
+      const res = await Api_server.Other.uploadFile(formData)
+      if (res && res.code == 200) {
+        const url = res?.url
+        url && (o.src = url)
+      }
+    } else if (isBlobUrl) { // 视频和音频
+      const res = await fetch(o.src)
+      const blob = await res.blob()
+      const fileName = o.type == 'video' ? Date.now() + '.mp4' : Date.now() + '.mp3'
+      const file = commUtils.blobToFile(blob, fileName)
+      // o.src = fileName
+      // console.log('file', file)
+      const formData = new FormData()
+      formData.append('file', file)
+      const ress = await Api_server.Other.uploadFile(formData)
+      if (ress && ress.code == 200) {
+        const url = ress?.url
+        url && (o.src = url)
+      }
+    }
+  }
+  if (o?.background?.image) await toRousrceUrl(o.background.image)
+  if (o?.elements) {
+    for (let element of o.elements) {
+      await toRousrceUrl(element);
+    }
+  }
+}
+
+const HTTP_SERVER_API = (type, params = {}) => {
+  switch (type) {
+    case 'addSmarttalk': { // 获取课程
+      const node = courseObj.node || {}
+      const def = {
+        fileId: '', // 文件id - Entpcoursefile 对应id
+        fileFlag: 'aippt',
+        fileShowName: node.itemtitle + '.aippt',
+        textbookId: node.rootid,
+        levelFirstId: node.parentid || node.id,
+        levelSecondId: node.parentid && node.id,
+        fileSource: '个人',
+        fileRoot: '备课'
+      }
+      return API_smarttalk.creatAPT({ ...def, ...params })
+    }
+    case 'addEntpcourse': { // 添加课程
+      const node = courseObj.node || {}
+      if (!node) return msgUtils.msgWarning('请选择章节?')
+      const def = { // 默认参数
+        entpid: userStore.user.deptId, // 部门id
+        level: 1, // 层级
+        parentid: 0, // 父级id
+        dictid: 0, // 字典id
+        evalid: node.id, // 章节id
+        evalparentid: node.parentid, // 单元id(父级id)
+        edusubject: node.edusubject, // 学科
+        edudegree: node.edudegree, // 年级
+        edustage: node.edustage, // 阶段
+        coursetype: '课标学科', // 课程类型
+        coursetitle: node.itemtitle, // 课程名称
+        coursedesc: '', // 课程描述
+        status: '', // 状态
+        dflag: 0, // 状态
+        edituserid: userStore.id, // 编辑人id
+        createblankfile: 'no', // 创建空白文件
+      }
+      courseObj.entp = def
+      return API_entpcourse.addEntpcourse(def)
+    }
+    case 'addEntpcoursefile': { // 添加课程文件
+      params = getDefParams(params)
+      return API_entpcoursefile.addEntpcoursefileReturnId(params)
+    }
+    case 'batchAddNew': { // 批量添加课程文件
+      params = getDefParams(params)
+      return API_entpcoursefile.batchAddNew(params)
+    }
+    case 'getCourseList': { // 获取课程列表
+      return API_entpcourse.listEntpcourse(params)
+    }
+    case 'getCourseFileList': { // 获取课程文件列表
+      return API_entpcoursefile.listEntpcoursefileNew(params)
+    }
+  }
+}
+// 获取默认参数
+const getDefParams = (params) => {
+  const enpt = courseObj.entp
+  const def = {
+    parentid: 0,
+    entpid: userStore.user.deptId,
+    entpcourseid: enpt.id,
+    ppttype: 'file',
+    title: enpt.coursetitle,
+    fileurl: '',
+    filetype: 'aippt',
+    datacontent: '',
+    filekey: '',
+    filetag: '',
+    fileidx: 0,
+    dflag: 0,
+    status: '',
+    edituserid: userStore.id
+  }
+  return Object.assign(def, params)
+}
+onMounted(()=>{
+  let data = sessionStore.get('subject.curNode')
+  Object.assign(curNode, data);
+  courseObj.node = data
+})
+
 onUnmounted(()=>{
   emitter.off('onResult')
 })
@@ -51,7 +326,15 @@ onUnmounted(()=>{
     background-color: #fff;
     border-radius: 5px;
     overflow-y: auto;
+    .right-con-item{
+      display: flex;
+      margin: 10px 0;
+      justify-content: space-around;
+      img{
+        width: 150px;
+      }
+    }
   }
 }
 
-</style>
\ No newline at end of file
+</style>
diff --git a/src/renderer/src/views/teachingDesign/index.vue b/src/renderer/src/views/teachingDesign/index.vue
index 773aebf..5928fdb 100644
--- a/src/renderer/src/views/teachingDesign/index.vue
+++ b/src/renderer/src/views/teachingDesign/index.vue
@@ -1,25 +1,25 @@
 <template>
   <div class="page-design">
     <!-- <div class="page-left">
-    
+
       <left />
     </div>
     <div class="page-right">
-     
+
       <right />
     </div> -->
   <el-row :gutter="20">
     <el-col :span="5">
       <Left/>
     </el-col>
-    <el-col :span="13">
+    <el-col :span="15">
       <Center/>
     </el-col>
-    <el-col :span="6">
+    <el-col :span="4">
       <Right/>
     </el-col>
   </el-row>
-    
+
   </div>
 </template>
 
@@ -51,4 +51,4 @@ import Right from './container/right2.vue'
 //     width: 50%;
 //   }
 // }
-</style>
\ No newline at end of file
+</style>

From 1132dc2c0d4c5ec9fa772d20993f7f5007cf9c03 Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Tue, 7 Jan 2025 15:24:26 +0800
Subject: [PATCH 12/21] =?UTF-8?q?=E7=94=9F=E6=88=90ppt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/utils/ppt-request.js         | 20 +++++++++++++++----
 .../views/prepare/container/pptist-dialog.vue | 11 ++++++----
 .../views/teachingDesign/container/right2.vue |  5 +++--
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/renderer/src/utils/ppt-request.js b/src/renderer/src/utils/ppt-request.js
index 642d9a9..2918d0c 100644
--- a/src/renderer/src/utils/ppt-request.js
+++ b/src/renderer/src/utils/ppt-request.js
@@ -107,12 +107,12 @@ const getBackGroundV2 = async () => {
   }
 };
 
-const createOutlineV2 = async (params) => {
+const createOutlineV2 = async (data) => {
   try {
     const response = await request({
       url:"/api/aipptV2/createOutlineV2",
-      method: "POST", 
-      params
+      method: "POST",
+      data
     });
     console.log("createOutline response:", response);
 
@@ -133,6 +133,18 @@ const createPPTV2 = async (data) => {
     throw error;
   }
 };
+
+const createPptByOutline = async (data) => {
+  try {
+    const response = await req("/api/aipptV2/createPptByOutline", "POST", data);
+    console.log("createOutline response:", response);
+
+    return response.data;
+  } catch (error) {
+    console.error("请求失败:", error);
+    throw error;
+  }
+};
 const getProgressV2 = async (id) => {
   try {
     const response = await req(`/api/aipptV2/progressV2?sid=${id}`, "GET");
@@ -143,4 +155,4 @@ const getProgressV2 = async (id) => {
   }
 };
 
-export { createOutline, getBackGround, createPPT, getProgress, getBackGroundV2, createOutlineV2, createPPTV2, getProgressV2, createByOutline };
+export { createOutline, getBackGround, createPPT, getProgress, getBackGroundV2, createOutlineV2, createPPTV2, getProgressV2, createByOutline, createPptByOutline };
diff --git a/src/renderer/src/views/prepare/container/pptist-dialog.vue b/src/renderer/src/views/prepare/container/pptist-dialog.vue
index 0d907b4..0bad55b 100644
--- a/src/renderer/src/views/prepare/container/pptist-dialog.vue
+++ b/src/renderer/src/views/prepare/container/pptist-dialog.vue
@@ -34,8 +34,10 @@
   import AiPptist from './ai-pptistV2.vue';
   import {Select} from "@element-plus/icons-vue";
   import {ref, defineEmits, onMounted} from "vue";
-  import {createPPTV2, getBackGroundV2, getProgressV2} from "@/utils/ppt-request";
+  import {createPPTV2, getBackGroundV2, getProgressV2, createPptByOutline} from "@/utils/ppt-request";
   import {ElMessage} from "element-plus";
+  import useUserStore from '@/store/modules/user'
+  const userStore = useUserStore()
   const model = defineModel()
   const emit = defineEmits(['addSuccess', 'close-dialogs'])
   const backGroundList = ref([]);
@@ -60,7 +62,7 @@
   const outlineData = ref({
       query: '',  // 用户要求（最多8000字）
       templateId: '',  // ppt生成主题
-      author: 'AIX平台',
+      author: userStore.user.nickName,
       isFigure: false,   // 是否自动配图
       search: true,
       language: "cn"
@@ -68,9 +70,10 @@
   const percentage = ref(0);
   const outlineCreatePPT = () => {
     const newOutlineData = { ...outlineData.value, };
-    newOutlineData.query = props.dataList.outline;
+    newOutlineData.outline = props.dataList.outline;
+    newOutlineData.query = "通过传入大纲帮我生成相应的PPT课件"
     createPPTLoading.value = true;
-    createPPTV2(newOutlineData).then((res) => {
+    createPptByOutline(newOutlineData).then((res) => {
       console.log(res, "正在生成中");
       createPPTLoading.value = false;
       activeStep.value = 2
diff --git a/src/renderer/src/views/teachingDesign/container/right2.vue b/src/renderer/src/views/teachingDesign/container/right2.vue
index e3e5d72..300399f 100644
--- a/src/renderer/src/views/teachingDesign/container/right2.vue
+++ b/src/renderer/src/views/teachingDesign/container/right2.vue
@@ -33,12 +33,11 @@ import * as API_entpcourse from "@/api/education/entpcourse";
 import * as API_entpcoursefile from "@/api/education/entpcoursefile";
 import * as commUtils from '@/utils/comm.js'
 import * as Api_server from '@/api/apiService' // 相关api
-import useUserStore from '@/store/modules/user'
 import {createWindow} from "@/utils/tool";
 import {editSyllabus} from "@/api/mode";
 import { getSmarttalkPage } from "@/api/file"
+import useUserStore from '@/store/modules/user'
 const userStore = useUserStore()
-
 const pptDialog = ref(false)
 const result = ref(null)
 const courseObj = reactive({
@@ -70,6 +69,8 @@ emitter.on('onResult', (data)=>{
     listEntpcoursefileNew({parentid: result.value.parentId}).then(res=>{
       pptSlides.value = res.rows
     })
+  }else {
+    pptSlides.value = []
   }
 })
 

From 7c1d669a569a34625ef5612f1d7d2800e4647356 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 16:06:40 +0800
Subject: [PATCH 13/21] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=B6=85=E9=95=BF?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/choose-textbook/index.vue       | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue
index 811c1cc..0ed1188 100644
--- a/src/renderer/src/components/choose-textbook/index.vue
+++ b/src/renderer/src/components/choose-textbook/index.vue
@@ -14,17 +14,17 @@
             <div v-if="props.isClassTask && (data.bookId == '' || data.bookId == '0')" class="tree-label-wrap">
               <el-tooltip effect="light" placement="right" >
                 <template #content> {{ node.label }}<br /><span style="color: red;">-该单元章节无自主试题-</span> </template>
-                <span class="tree-label" style="color: #A5B3CA" >
+                <div class="tree-label" style="color: #A5B3CA" >
                   {{ node.label }}
-                </span>
+                </div>
               </el-tooltip>
             </div>
             <div v-else class="tree-label-wrap">
               <el-tooltip effect="light" placement="right" >
                 <template #content> {{ node.label }}</template>
-                <span class="tree-label">
+                <div class="tree-label">
                   {{ node.label }}
-                </span>
+                </div>
               </el-tooltip>
             </div>
           </template>
@@ -44,8 +44,9 @@
 
     <div class="textbook-container">
       <el-scrollbar height="450px">
-        <div class="textbook-item flex" v-for="item in subjectList" :class="curBook.data.id == item.id ? 'active-item' : ''"
-          :key="item.id" @click="changeBook(item)">
+        <div
+          v-for="item in subjectList" :key="item.id" class="textbook-item flex"
+          :class="curBook.data.id == item.id ? 'active-item' : ''" @click="changeBook(item)">
           <img v-if="item.avartar" :src="item.avartar.indexOf('http') === 0 ? item.avartar : BaseUrl + item.avartar" class="textbook-img" alt="">
           <div v-else class="textbook-img">
             <i class="iconfont icon-jiaocaixuanze" style="font-size: 40px;"></i>
@@ -341,6 +342,7 @@ onMounted( async () => {
 }
 
 .tree-label-wrap, .tree-label {
+  max-width: 100%;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;

From 49facdffa9233a8d36af6dc3ed3b3af74360199d Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Tue, 7 Jan 2025 16:25:07 +0800
Subject: [PATCH 14/21] =?UTF-8?q?edit=20=E6=A1=86=E6=9E=B6=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/teachingDesign/container/center.vue | 142 ++++++++++++------
 .../teachingDesign/container/edit-dialog.vue  |  59 ++++++--
 2 files changed, 142 insertions(+), 59 deletions(-)

diff --git a/src/renderer/src/views/teachingDesign/container/center.vue b/src/renderer/src/views/teachingDesign/container/center.vue
index 0627f9f..4c01048 100644
--- a/src/renderer/src/views/teachingDesign/container/center.vue
+++ b/src/renderer/src/views/teachingDesign/container/center.vue
@@ -13,30 +13,38 @@
           <i class="iconfont icon-shanchu"></i>
           删除大纲
         </el-button>
-    
+
         <el-button type="primary" @click="isEdit = true">
           <i class="iconfont icon-bianji"></i>编辑大纲
         </el-button>
       </div>
     </div>
     <div class="center-con" v-loading="loading">
-      <!-- <TypingEffect v-if="answer" :text="answer" :delay="10" :aiShow="aiShow"/> -->
-      <div style="font-size: 18px;color: #409eff;">封面页</div>
-      <div class="con-item mb-5">
-        <div class="item-name">标题：{{ answer.title }}</div>
-        <div class="item-name">副标题：{{answer.subTitle }}</div>
-      </div>
-      <div style="font-size: 18px;color: #409eff;">目录页</div>
-      <div class="con-item" v-for="(item,index) in answer.chapters">
-        <div class="item-name">{{index + 1}}：{{ item.chapterTitle }}</div>
-        <div class="item-text">
-          <p v-for="(el,i) in item.chapterContents">{{ index + 1 }} - {{ i + 1}} : {{ el.chapterTitle }}</p>
+      <template v-if="answer.title">
+        <div class="flex justify-between">
+          <span style="font-size: 18px;color: #409eff;">封面页</span>
+          <el-button type="primary" link @click="onEdit(item, -1)">编辑</el-button>
         </div>
-      </div>
-      <el-empty v-if="!answer.title" description="请选择符合您需要的教学模式，生成教学大纲" />
+        <div class="con-item mb-5">
+          <div class="item-name">标题：{{ answer.title }}</div>
+          <div class="item-name">副标题：{{ answer.subTitle }}</div>
+        </div>
+        <div style="font-size: 18px;color: #409eff;">目录页</div>
+        <div class="con-item" v-for="(item, index) in answer.chapters">
+          <div class="item-name">
+            <span>{{ index + 1 }}：{{ item.chapterTitle }}</span>
+            <el-button type="primary" link @click="onEdit(item, index)">编辑</el-button>
+          </div>
+          <div class="item-text">
+            <p v-for="(el, i) in item.chapterContents">{{ index + 1 }} - {{ i + 1 }} : {{ el.chapterTitle }}</p>
+          </div>
+          
+        </div>
+      </template>
+      <el-empty v-else description="请选择符合您需要的教学模式，生成教学大纲" />
     </div>
   </div>
-  <EditDialog v-model="isEdit" :item="curItem" />
+  <EditDialog v-model="isEdit" :item="editItem" :index="editIndex" />
 </template>
 
 <script setup>
@@ -47,9 +55,10 @@ import EditDialog from './edit-dialog.vue'
 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 { completion, addSyllabus, syllabuss, removeSyllabus, editSyllabus } from '@/api/mode/index.js'
 import { createOutlineV2 } from '@/utils/ppt-request.js'
 import useUserStore from '@/store/modules/user'
+import { cloneDeep } from 'lodash'
 
 const curMode = ref(2)
 const isEdit = ref(false)
@@ -70,26 +79,22 @@ const modeOptions = ref([
 
 // 选中的环节
 const selectedData = ref([])
-emitter.on('selected', (data)=>{
+emitter.on('selected', (data) => {
   selectedData.value = data
 })
 // 回显大纲
 const curItem = reactive({})
-emitter.on('onShow', (data)=>{
+emitter.on('onShow', (data) => {
   console.log(data)
   aiShow.value = false
   Object.assign(answer, JSON.parse(data.outline))
+ 
+
   Object.assign(curItem, data)
-  curItem.answer = curItem.outline
-  getDetails(data.id)
+  emitter.emit('onResult',data)
 })
 
-const getDetails = (id) =>{
-  syllabuss(id).then( res =>{
-    Object.assign(curItem, res.data)
-    emitter.emit('onResult', res.data)
-  })
-}
+
 
 const params = reactive(
   {
@@ -103,13 +108,13 @@ const params = reactive(
 const loading = ref(false)
 const answer = reactive({})
 
-const createAi = async ()=>{
-  if(selectedData.value.length == 0){
+const createAi = async () => {
+  if (selectedData.value.length == 0) {
     ElMessage.warning('请先选择教学环节后再生成教学大纲')
     return
   }
-  
-  let str = selectedData.value.map( item => item.name).join('、')
+
+  let str = selectedData.value.map(item => item.name).join('、')
   let bookV = curNode.roottitle.split('-')[1] + '版'
   loading.value = true
   aiShow.value = true
@@ -131,10 +136,10 @@ const createAi = async ()=>{
     // 知识库模型
     else {
       const res = await completion(params)
-    
+
       data = res.data
     }
-    const res = await createOutlineV2({query: data.answer})
+    const res = await createOutlineV2({ query: data.answer })
     console.log(res)
     emitter.emit('onResult', res)
     Object.assign(answer, res.outline)
@@ -144,15 +149,53 @@ const createAi = async ()=>{
   }
 }
 
+// 编辑大纲
+const editItem = reactive({})
+const editIndex = ref(0)
+const onEdit = (item, index)=>{
+
+  let obj = null
+  if(index == -1){
+    obj = {
+      title: answer.title,
+      subTitle: answer.subTitle
+    }
+  }
+  else{
+    obj = cloneDeep(item)
+  }
+  editIndex.value = index
+  isEdit.value = true
+  Object.assign(editItem, obj)
+}
+
+emitter.on('editItem', (item) =>{
+  if(editIndex.value == -1){
+    answer.title = item.title
+    answer.subTitle = item.subTitle
+  }else{
+    answer.chapters[editIndex.value] = item
+  }
+  let data = cloneDeep(curItem)
+ 
+  data.outline = JSON.stringify(cloneDeep(answer))
+  loading.value = true
+
+  editSyllabus(data).then( res =>{
+    ElMessage.success('操作成功')
+  }).finally( ()=>{
+    loading.value = false
+  })
+})
 
 // 保存模板
 const onSaveTemp = async (answer) => {
   if (answer == '') return
-  let modelIds = selectedData.value.map( item => item.id).join(',')
+  let modelIds = selectedData.value.map(item => item.id).join(',')
   const data = {
     eduId: curNode.id,
     outline: answer,
-    outlineType: curMode.value == 1  ? 0 : 1,
+    outlineType: curMode.value == 1 ? 0 : 1,
     modelIds,
     sourceType: 1,
     createUserId: user.userId,
@@ -162,7 +205,7 @@ const onSaveTemp = async (answer) => {
 }
 
 // 删除大纲
-const delAnswer = () =>{
+const delAnswer = () => {
   ElMessageBox.confirm(
     '确定要删除大纲吗?',
     '温馨提示',
@@ -178,8 +221,8 @@ const delAnswer = () =>{
       answer.value = ''
       emitter.emit('resetSelect')
     })
-    .catch(() => {})
-  
+    .catch(() => { })
+
 }
 
 
@@ -192,10 +235,12 @@ const getChartId = () => {
   })
 }
 
-onUnmounted(()=>{
+onUnmounted(() => {
   emitter.off('selected')
   emitter.off('onShow')
+  emitter.off('editItem')
   
+
 })
 
 const curNode = reactive({})
@@ -216,18 +261,21 @@ onMounted(() => {
 </script>
 
 <style lang="scss" scoped>
-.container-center{
+.container-center {
   height: 100%;
   font-size: 15px;
   flex-direction: column;
-  .center-header{
+
+  .center-header {
     justify-content: space-between;
     align-items: center;
-    .icon-jiahao{
+
+    .icon-jiahao {
       font-size: 12px;
     }
   }
-  .center-con{
+
+  .center-con {
     flex: 1;
     margin-top: 5px;
     background-color: #fff;
@@ -235,11 +283,16 @@ onMounted(() => {
     text-align: left;
     overflow-y: auto;
     padding: 15px;
-    .con-item{
+
+    .con-item {
       display: flex;
       flex-direction: column;
       margin-top: 15px;
-      .item-text{
+      .item-name{
+        display: flex;
+        justify-content: space-between;
+      }
+      .item-text {
         background: #F2F2F2;
         padding: 15px;
         border-radius: 5px;
@@ -248,5 +301,4 @@ onMounted(() => {
     }
   }
 }
-
 </style>
\ No newline at end of file
diff --git a/src/renderer/src/views/teachingDesign/container/edit-dialog.vue b/src/renderer/src/views/teachingDesign/container/edit-dialog.vue
index 49c7601..24c8528 100644
--- a/src/renderer/src/views/teachingDesign/container/edit-dialog.vue
+++ b/src/renderer/src/views/teachingDesign/container/edit-dialog.vue
@@ -7,11 +7,28 @@
       </div>
     </template>
     <div class="dialog-content" v-loading="loading">
-      <el-row>
-        <el-col :span="24">
-          <el-input v-model="textarea" :autosize="{ minRows: 5, maxRows: 15 }" type="textarea" />
-        </el-col>
-      </el-row>
+      <template v-if="props.index == -1">
+        <div class="flex mb-5">
+          <span class="name">标题：</span>
+          <el-input v-model="editItem.title" />
+        </div>
+        <div class="flex mb-5">
+          <span class="name">副标题</span>
+          <el-input v-model="editItem.subTitle" />
+        </div>
+      </template>
+      <template v-else>
+        <div class="flex mb-5">
+          <span class="name">标题：</span>
+          <el-input v-model="editItem.chapterTitle" />
+        </div>
+        <div class="flex">
+          <span class="name">内容：</span>
+          <div class="flex edit-con">
+            <el-input class="mb-3" v-model="item.chapterTitle" v-for="item in editItem.chapterContents" />
+          </div>
+        </div>
+      </template>
 
     </div>
     <template #footer>
@@ -26,13 +43,13 @@
 </template>
 
 <script setup>
-import { ref, watch} from 'vue'
+import { reactive, ref, watch} from 'vue'
 import { ElMessage } from 'element-plus'
 import { editSyllabus } from '@/api/mode/index.js'
 import { cloneDeep } from 'lodash';
 import emitter from '@/utils/mitt';
 
-const textarea = ref('')
+
 
 const isDialog = defineModel()
 const loading = ref(false)
@@ -40,20 +57,28 @@ const loading = ref(false)
 const props = defineProps({
   item: {
     type: Object,
-    default: () => {
-      return { name: '11' }
-    }
+ 
+  },
+  index: {
+    type: [Number, String]
   }
 })
 
-watch(() => props.item.answer, (newVal) => {
-  if (newVal) {
-    textarea.value = newVal
+const editItem = reactive({})
+
+watch(() => isDialog.value, (newVal) => {
+  if(newVal){
+    let data = cloneDeep(props.item)
+    Object.assign(editItem, data)
   }
+
 },{ deep: true })
 
 const emit = defineEmits(['saveEdit'])
 const onSave = () =>{
+  emitter.emit('editItem', editItem)
+  isDialog.value = false
+  return
   loading.value = true
   let data = cloneDeep(props.item)
   data.outline = textarea.value
@@ -83,6 +108,12 @@ const onSave = () =>{
 
 .dialog-content {
   padding-top: 10px;
-
+  .name{
+    flex-shrink: 0;
+  }
+  .edit-con{
+    width: 100%;
+    flex-direction: column;
+  }
 }
 </style>
\ No newline at end of file

From 8106fb0c41cb6879222c5d2338f1a7a17a32099d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E6=9D=A8?= <666>
Date: Tue, 7 Jan 2025 17:19:41 +0800
Subject: [PATCH 15/21] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=AD=A6=E7=A7=91=E6=96=B9=E5=BC=8F;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/profile/components/selectClass.vue  | 138 +++++++++++-------
 src/renderer/src/views/profile/index.vue      |   4 +-
 2 files changed, 91 insertions(+), 51 deletions(-)

diff --git a/src/renderer/src/views/profile/components/selectClass.vue b/src/renderer/src/views/profile/components/selectClass.vue
index 2dcc47e..7110967 100644
--- a/src/renderer/src/views/profile/components/selectClass.vue
+++ b/src/renderer/src/views/profile/components/selectClass.vue
@@ -1,50 +1,59 @@
 <template>
-    <div style="display: flex;">
-        <div style="margin-left: 15px">
-            <el-dropdown @command="handleUserEduStage">
-            <span class="el-dropdown-link">
-                <el-button class="custom-button" type="default" round >{{ userStore.edustage }}
-                    <el-icon><ArrowDown /></el-icon>
-                </el-button>
-            </span>
-            <template #dropdown>
-                <el-dropdown-menu>
-                <el-dropdown-item command="幼儿园">幼儿园</el-dropdown-item>
-                <el-dropdown-item command="小学">小学</el-dropdown-item>
-                <el-dropdown-item command="初中">初中</el-dropdown-item>
-                <el-dropdown-item command="高中">高中</el-dropdown-item>
-                </el-dropdown-menu>
-            </template>
-            </el-dropdown>
+    <div>
+        <div style="display: flex;align-items: center;" v-if="!showSelect">
+            <div style="margin-left: 15px">
+                <span class="el-dropdown-link">
+                    <el-button class="custom-button" type="default" round>{{ userStore.edustage }}
+                    </el-button>
+                </span>
+            </div>
+            <div style="margin-left: 15px">
+                <span class="el-dropdown-link">
+                    <el-button class="custom-button" type="default" round>{{ userStore.edusubject }}
+                    </el-button>
+                </span>
+            </div>
+            <el-text type="primary" style="margin-left: 10px;cursor:pointer" @click="handleUserEduSubject()">修改</el-text>
         </div>
-        <div style="margin-left: 15px">
-            <el-dropdown @command="handleUserEduSubject">
-            <span class="el-dropdown-link">
-                <el-button class="custom-button" type="default" round>{{ userStore.edusubject }}
-                    <el-icon><ArrowDown /></el-icon>
-                </el-button>
-            </span>
-            <template #dropdown>
-                <el-dropdown-menu>
-                <template v-for="(item, index) in subjectList">
-                    <el-dropdown-item v-if="item.edustage == userStore.edustage" :command="item.itemtitle">{{
-                    item.itemtitle }}</el-dropdown-item>
-                </template>
-                </el-dropdown-menu>
-            </template>
-            </el-dropdown>
+        <div class="m-4" v-else>
+            <el-cascader v-model="cascaderValue" :options="options" @change="handleChange" />
         </div>
     </div>
 </template>
   
 <script setup>
 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([])
+// 点击选择时级联框出现
+const showSelect = ref(false)
+const cascaderValue = ref([])
+// 学段固定
+const options = ref([
+  {
+    value: '幼儿园',
+    label: '幼儿园',
+    children: [],
+  },
+  {
+    value: '小学',
+    label: '小学',
+    children: [],
+  },
+  {
+    value: '初中',
+    label: '初中',
+    children: [],
+  },
+  {
+    value: '高中',
+    label: '高中',
+    children: [],
+  },
+])
 // 获取基础的学科
 const getSubject = () => {
   //没有学科则不进行下面的步骤
@@ -53,33 +62,64 @@ const getSubject = () => {
     const arr = userStore.subject.split(',')
     subjectList.value = res.rows.filter(item => arr.includes(String(item.id))).map(items => items)
     console.log(subjectList,'subjectList');
+    if(subjectList.value.length === 0) return
+    // 判断options里面的label是否和subjectList里面的edustage是否一致，如果一直添加到chilren里面去
+    options.value.forEach(item => {
+        subjectList.value.forEach(items => {
+            if(item.label === items.edustage){
+                item.children.push({
+                    value: items.id,
+                    label: items.edusubject
+                })
+            }
+        })
+    })
     
   })
 }
 // 选择学段
-const handleUserEduStage = (item) => {
-    userStore.edustage = item
-    sessionStore.set('edustageSelf',item)
-    if(item === '幼儿园'){
-        // 默认语文
-        userStore.edusubject = '语文'
-        sessionStore.set('edusubjectSelf','语文')
-    }
-    else if(item === '高中' && userStore.edusubject === "道德与法治"){
+const handleUserEduStage = () => {
+    // userStore.edustage = item
+    // sessionStore.set('edustageSelf',item)
+    // if(item === '幼儿园'){
+    //     // 默认语文
+    //     userStore.edusubject = '语文'
+    //     sessionStore.set('edusubjectSelf','语文')
+    // }
+    // else if(item === '高中' && userStore.edusubject === "道德与法治"){
+    //     // 默认语文
+    //     userStore.edusubject = '政治'
+    //     sessionStore.set('edusubjectSelf','政治')
+    // }
+    // else if(item != '高中' && userStore.edusubject === "政治"){
+    //     // 默认语文
+    //     userStore.edusubject = '道德与法治'
+    //     sessionStore.set('edusubjectSelf','道德与法治')
+    // }
+}
+// 选择学科
+const handleUserEduSubject = () => {
+    showSelect.value = true
+    cascaderValue.value = []
+}
+const handleChange = (value) => {
+    const id = value[1];
+    userStore.edusubject = subjectList.value.find(item => item.id === id).edusubject
+    userStore.edustage = value[0]
+    sessionStore.set('edustageSelf',userStore.edustage)
+    if(userStore.edustage === '高中' && userStore.edusubject === "道德与法治"){
         // 默认语文
         userStore.edusubject = '政治'
         sessionStore.set('edusubjectSelf','政治')
     }
-    else if(item != '高中' && userStore.edusubject === "政治"){
+    else if(userStore.edustage != '高中' && userStore.edusubject === "政治"){
         // 默认语文
         userStore.edusubject = '道德与法治'
         sessionStore.set('edusubjectSelf','道德与法治')
+    }else{
+        sessionStore.set('edusubjectSelf',userStore.edusubject)
     }
-}
-// 选择学科
-const handleUserEduSubject = (item) => {
-    userStore.edusubject = item;
-    sessionStore.set('edusubjectSelf',item)
+    showSelect.value = false
 }
 onMounted(() => {
     getSubject()
diff --git a/src/renderer/src/views/profile/index.vue b/src/renderer/src/views/profile/index.vue
index 9b7fff4..07a731f 100644
--- a/src/renderer/src/views/profile/index.vue
+++ b/src/renderer/src/views/profile/index.vue
@@ -5,7 +5,7 @@
       <div class="info">
         <div class="info-name">{{ state.user.nickName }}</div>
         <div class="infomation" v-if="isStadium() !== true" >
-          <selectClass v-if="!isSubject"/>
+          <SelectClass v-if="!isSubject"/>
         </div>
       </div>
     </div>
@@ -34,7 +34,7 @@ import resetPwd from './resetPwd.vue'
 import { getUserProfile } from '@/api/system/user'
 import pkc from "../../../../../package.json"
 //选择学校和班级
-import selectClass from './components/selectClass.vue'
+import SelectClass from './components/selectClass.vue'
 import useUserStore from '@/store/modules/user'
 
 const version = ref(pkc.version)

From 510f02a5302ae52cdbc21311e0c4b4a2fcbcbb28 Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Wed, 8 Jan 2025 13:45:40 +0800
Subject: [PATCH 16/21] =?UTF-8?q?=E6=89=93=E5=8C=85=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                |  2 ++
 .env.yc                        |  4 +++-
 .env.yc2                       |  2 ++
 electron-builder-yc.yml        |  2 +-
 electron-builder-yc2.yml       |  2 +-
 package.json                   |  9 ++++----
 src/renderer/src/utils/comm.js | 41 ++++++++++++++++++++++++++++++++++
 updatePackageJsonName.js       | 14 ++++++++++++
 8 files changed, 68 insertions(+), 8 deletions(-)
 create mode 100644 updatePackageJsonName.js

diff --git a/.env.production b/.env.production
index c3b1489..b6dfa01 100644
--- a/.env.production
+++ b/.env.production
@@ -1,6 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 文枢课堂
 
+VITE_APP_ID = 'aix-win-ws'
+
 # 生产环境配置
 VITE_APP_ENV = 'production'
 
diff --git a/.env.yc b/.env.yc
index c3b1489..d60ed5c 100644
--- a/.env.yc
+++ b/.env.yc
@@ -1,5 +1,7 @@
 # 页面标题
-VITE_APP_TITLE = 文枢课堂
+VITE_APP_TITLE = 永川中小学AI教学系统
+
+VITE_APP_ID = 'aix-win-ws-yc'
 
 # 生产环境配置
 VITE_APP_ENV = 'production'
diff --git a/.env.yc2 b/.env.yc2
index c4a88ef..1f76587 100644
--- a/.env.yc2
+++ b/.env.yc2
@@ -1,6 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 实训教学
 
+VITE_APP_ID = 'aix-win-ws-yc2'
+
 # 生产环境配置
 VITE_APP_ENV = 'production'
 
diff --git a/electron-builder-yc.yml b/electron-builder-yc.yml
index fd34471..89158a2 100644
--- a/electron-builder-yc.yml
+++ b/electron-builder-yc.yml
@@ -17,7 +17,7 @@ asarUnpack:
 nsis:
   oneClick: false
   allowToChangeInstallationDirectory: true
-  artifactName: ${name}-yc-${version}-setup.${ext}
+  artifactName: ${name}-${version}-setup.${ext}
   shortcutName: ${productName}
   uninstallDisplayName: ${productName}
   createDesktopShortcut: always
diff --git a/electron-builder-yc2.yml b/electron-builder-yc2.yml
index a7bfd2f..3f9322a 100644
--- a/electron-builder-yc2.yml
+++ b/electron-builder-yc2.yml
@@ -17,7 +17,7 @@ asarUnpack:
 nsis:
   oneClick: false
   allowToChangeInstallationDirectory: true
-  artifactName: ${name}-ycsx-${version}-setup.${ext}
+  artifactName: ${name}-${version}-setup.${ext}
   shortcutName: ${productName}
   uninstallDisplayName: ${productName}
   createDesktopShortcut: always
diff --git a/package.json b/package.json
index 7fb23eb..4fba2cd 100644
--- a/package.json
+++ b/package.json
@@ -10,14 +10,13 @@
     "lint": "eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix",
     "start": "electron-vite preview",
     "dev": "electron-vite dev",
-    "build": "electron-vite build",
     "postinstall": "electron-builder install-app-deps",
     "build:unpack": "npm run build && electron-builder --dir",
     "build:dev": "npm run build && electron-builder --win --config ./electron-builder-test.yml",
-    "build:test": "electron-vite build --mode test && electron-builder --win --config ./electron-builder.yml",
-    "build:prod": "electron-vite build --mode production && electron-builder --win --config ./electron-builder-prod.yml",
-    "build:yc": "electron-vite build --mode yc && electron-builder --win --config ./electron-builder-yc.yml",
-    "build:yc2": "electron-vite build --mode yc2 && electron-builder --win --config ./electron-builder-yc2.yml",
+    "build:test": "node updatePackageJsonName.js && electron-vite build --mode test && electron-builder --win --config ./electron-builder.yml",
+    "build": "node updatePackageJsonName.js && electron-vite build --mode production && electron-builder --win --config ./electron-builder-prod.yml",
+    "build:yc": "node updatePackageJsonName.js && electron-vite build --mode yc && electron-builder --win --config ./electron-builder-yc.yml",
+    "build:yc2": "node updatePackageJsonName.js && electron-vite build --mode yc2 && electron-builder --win --config ./electron-builder-yc2.yml",
     "build:lt": "electron-vite build --mode lt && electron-builder --win --config ./electron-builder-lt.yml",
     "build:mac": "electron-vite build --mode production && electron-builder --mac --config ./electron-builder-prod.yml",
     "build:linux": "npm run build && electron-builder --linux"
diff --git a/src/renderer/src/utils/comm.js b/src/renderer/src/utils/comm.js
index 3f21fb1..4c78313 100644
--- a/src/renderer/src/utils/comm.js
+++ b/src/renderer/src/utils/comm.js
@@ -407,11 +407,52 @@ export const dataSetJson = {
   "教材-高中-数学": "e03aa4fe9fd011ef91270242ac140006",
   "教材-高中-地理": "270516829fd111efb13c0242ac140006",
   "教材-高中-政治": "a2f0b247b85d11ef84290242ac140005",
+
+  "考试-小学-语文": "570f7ed2cc9d11ef9e070242ac140002",
+  "考试-小学-数学": "983270b8cc9d11efbbd80242ac140002",
+  "考试-小学-英语": "d5f80e4ccc9d11ef96fa0242ac140002",
   "课标-小学-科学": "935cfec8bf6a11ef98950242ac140006",
   "课标-小学-数学": "3c4e298fbf7911ef8e8b0242ac140002",
   "课标-小学-语文": "f76f1aa5bf7111ef90c80242ac140002",
+  "课标-小学-道德": "8da87869cbd711ef92280242ac140002",
+  "课标-小学-英语": "dc963316cbd811ef8d820242ac140002",
+  "课标-小学-劳动": "fc047d81cbdc11efa1740242ac140002",
   "教材-小学-科学": "935cfec8bf6a11ef98950242ac140006",
   "教材-小学-数学": "3c4e298fbf7911ef8e8b0242ac140002",
   "教材-小学-语文": "f76f1aa5bf7111ef90c80242ac140002",
+  "教材-小学-道德": "8da87869cbd711ef92280242ac140002",
+  "教材-小学-英语": "dc963316cbd811ef8d820242ac140002",
+  "教材-小学-劳动": "fc047d81cbdc11efa1740242ac140002",
+
+  "教材-初中-道德与法治": "df9f3ccccbdd11ef9e550242ac140002",
+  "教材-初中-语文": "3770ad18cbde11efadaa0242ac140002",
+  "教材-初中-数学": "8cc0a799cbde11ef8b440242ac140002",
+  "教材-初中-英语": "07b58ca2cbdf11efaa180242ac140002",
+  "教材-初中-物理": "86f2c018cbf211ef9d6a0242ac140002",
+  "教材-初中-化学": "c7b34790cbf211ef92350242ac140002",
+  "教材-初中-生物": "083ac3edcbf311efaad30242ac140002",
+  "教材-初中-地理": "7ee584e1cbf311efbd270242ac140002",
+  "教材-初中-历史": "8ae07971cbf411ef81e70242ac140002",
+  "教材-初中-信息技术": "ca476233cbf411efa9860242ac140002",
+  "课标-初中-道德与法治": "df9f3ccccbdd11ef9e550242ac140002",
+  "课标-初中-语文": "3770ad18cbde11efadaa0242ac140002",
+  "课标-初中-数学": "8cc0a799cbde11ef8b440242ac140002",
+  "课标-初中-英语": "07b58ca2cbdf11efaa180242ac140002",
+  "课标-初中-物理": "86f2c018cbf211ef9d6a0242ac140002",
+  "课标-初中-化学": "c7b34790cbf211ef92350242ac140002",
+  "课标-初中-生物": "083ac3edcbf311efaad30242ac140002",
+  "课标-初中-地理": "7ee584e1cbf311efbd270242ac140002",
+  "课标-初中-历史": "8ae07971cbf411ef81e70242ac140002",
+  "课标-初中-信息技术": "ca476233cbf411efa9860242ac140002",
+
+  "考试-初中-语文": "6be6d201cc0111ef89100242ac140002",
+  "考试-初中-数学": "d764b539cc0111ef8f1b0242ac140002",
+  "考试-初中-英语": "3477cff7cc9911efbfa50242ac140002",
+  "考试-初中-政治": "7ac981d8cc9a11efa5dc0242ac140002",
+  "考试-初中-历史": "c058a33acc9a11efb7f00242ac140002",
+  "考试-初中-地理": "5548224ecc9b11efa76d0242ac140002",
+  "考试-初中-生物": "206c5fd3cc9c11ef990f0242ac140002",
+  "考试-初中-物理": "93039442cc9c11ef89b10242ac140002",
+  "考试-初中-化学": "f8d78002cc9c11efbbf60242ac140002",
   "鉴权": "ragflow-IwMDI1MGU2YTU3NjExZWZiNWEzMDI0Mm"
 }
diff --git a/updatePackageJsonName.js b/updatePackageJsonName.js
new file mode 100644
index 0000000..de5811c
--- /dev/null
+++ b/updatePackageJsonName.js
@@ -0,0 +1,14 @@
+const fs = require('fs');
+const path = require('path');
+const { env } = require('process');
+
+// 读取当前的package.json文件
+const packageJsonPath = path.join(__dirname, 'package.json');
+const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+console.log(env)
+let res = env.npm_lifecycle_event.replace("build", "").replace(":", "");
+res = res?"-" + res:"";
+packageJson.name = "aix-win-ws" + res
+
+// 将修改后的内容写回package.json文件
+fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));

From 01e7dfbc2b8b6c5ed9883653049c615110765905 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E6=9D=A8?= <666>
Date: Wed, 8 Jan 2025 14:02:23 +0800
Subject: [PATCH 17/21] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=AD=A6?=
 =?UTF-8?q?=E7=A7=91=E5=AD=A6=E6=AE=B5=E7=9A=84=E6=96=B9=E5=BC=8F=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/profile/components/selectClass.vue  | 221 ++++++++++++------
 1 file changed, 147 insertions(+), 74 deletions(-)

diff --git a/src/renderer/src/views/profile/components/selectClass.vue b/src/renderer/src/views/profile/components/selectClass.vue
index 7110967..963025f 100644
--- a/src/renderer/src/views/profile/components/selectClass.vue
+++ b/src/renderer/src/views/profile/components/selectClass.vue
@@ -1,36 +1,74 @@
 <template>
     <div>
-        <div style="display: flex;align-items: center;" v-if="!showSelect">
+        <div style="display: flex; align-items: center;">
             <div style="margin-left: 15px">
                 <span class="el-dropdown-link">
-                    <el-button class="custom-button" type="default" round>{{ userStore.edustage }}
-                    </el-button>
+                    <el-button class="custom-button" type="default" round>{{ eduStage || userStore.edustage }}</el-button>
                 </span>
             </div>
             <div style="margin-left: 15px">
                 <span class="el-dropdown-link">
-                    <el-button class="custom-button" type="default" round>{{ userStore.edusubject }}
-                    </el-button>
+                    <el-button class="custom-button" type="default" round>{{ eduSubject || userStore.edusubject }}</el-button>
                 </span>
             </div>
-            <el-text type="primary" style="margin-left: 10px;cursor:pointer" @click="handleUserEduSubject()">修改</el-text>
+            <el-text
+                type="primary"
+                style="margin-left: 10px; cursor: pointer;"
+                @click="handleUserEduSubject"
+                v-popover="popoverRef"
+                ref="buttonRef"
+            >修改</el-text>
         </div>
-        <div class="m-4" v-else>
-            <el-cascader v-model="cascaderValue" :options="options" @change="handleChange" />
+        <!-- 级联选择框 -->
+        <el-popover
+            ref="popoverRef"
+            :virtual-ref="buttonRef"
+            trigger="click"
+            title="修改学科学段"
+            virtual-triggering
+            placement="right"
+            width="300px"
+        >
+        <div class="sidebar">
+            <div class="nav-level-one">
+                <template v-for="(item,index) in options" :key="index">
+                    <div :class="[currentIndex===index?'active':'','nav-item']" @click="handleUserEduStage(item.label,index)">
+                        <span class="nav-text">{{ item.label }}</span>
+                        <el-icon class="icon"><ArrowRight /></el-icon>
+                    </div>
+                </template>
+            </div>
+            <div class="nav-level-two">
+                <el-scrollbar height="180">
+                    <template v-for="(item,index) in cascadeOptions" :key="index">
+                        <div class="nav-item" @click="handleChange(item)">
+                            <span class="nav-text">{{ item.label }}</span>
+                        </div>
+                    </template>
+                </el-scrollbar>
+            </div>
         </div>
+        </el-popover>
     </div>
 </template>
-  
+
 <script setup>
 import useUserStore from '@/store/modules/user'
-import { onMounted,ref } from 'vue';
+import { onMounted, ref, unref } from 'vue';
 import { listEvaluation } from '@/api/subject/index'
-import {sessionStore} from '@/utils/store'
+import { sessionStore } from '@/utils/store'
+import { ArrowRight } from '@element-plus/icons-vue'
+
 const userStore = useUserStore().user
 const subjectList = ref([])
-// 点击选择时级联框出现
-const showSelect = ref(false)
-const cascaderValue = ref([])
+const buttonRef = ref()
+const popoverRef = ref()
+// 获取当前选择的学段
+const currentIndex = ref(0)
+// 当前的学科和学段
+const eduStage = ref('')
+const eduSubject = ref('')
+
 // 学段固定
 const options = ref([
   {
@@ -54,77 +92,64 @@ const options = ref([
     children: [],
   },
 ])
+// 选择学段时后筛选学科
+const cascadeOptions = ref([]);
 // 获取基础的学科
 const getSubject = () => {
-  //没有学科则不进行下面的步骤
-  if(!userStore.subject) return
+  if (!userStore.subject) return;
   listEvaluation({ itemkey: 'subject', pageSize: 500 }).then((res) => {
-    const arr = userStore.subject.split(',')
-    subjectList.value = res.rows.filter(item => arr.includes(String(item.id))).map(items => items)
-    console.log(subjectList,'subjectList');
-    if(subjectList.value.length === 0) return
-    // 判断options里面的label是否和subjectList里面的edustage是否一致，如果一直添加到chilren里面去
-    options.value.forEach(item => {
-        subjectList.value.forEach(items => {
-            if(item.label === items.edustage){
-                item.children.push({
-                    value: items.id,
-                    label: items.edusubject
-                })
-            }
-        })
-    })
-    
-  })
+    const arr = userStore.subject.split(',');
+    subjectList.value = res.rows.filter(item => arr.includes(String(item.id)));
+    if (subjectList.value.length === 0) return;
+    options.value.forEach(option => {
+      option.children = subjectList.value
+        .filter(items => items.edustage === option.label)
+        .map(item => ({ value: item.id, label: item.edusubject }));
+    });
+    // 首次获取学段和学科列表
+    const cIndex = options.value.findIndex(item => item.label === userStore.edustage);
+    cascadeOptions.value = [...options.value[cIndex].children]
+    currentIndex.value = cIndex
+  });
 }
+
 // 选择学段
-const handleUserEduStage = () => {
-    // userStore.edustage = item
-    // sessionStore.set('edustageSelf',item)
-    // if(item === '幼儿园'){
-    //     // 默认语文
-    //     userStore.edusubject = '语文'
-    //     sessionStore.set('edusubjectSelf','语文')
-    // }
-    // else if(item === '高中' && userStore.edusubject === "道德与法治"){
-    //     // 默认语文
-    //     userStore.edusubject = '政治'
-    //     sessionStore.set('edusubjectSelf','政治')
-    // }
-    // else if(item != '高中' && userStore.edusubject === "政治"){
-    //     // 默认语文
-    //     userStore.edusubject = '道德与法治'
-    //     sessionStore.set('edusubjectSelf','道德与法治')
-    // }
+const handleUserEduStage = (stage,index) => {
+    const currentData = options.value.find(item => item.label === stage);
+    cascadeOptions.value = [...currentData.children]
+    currentIndex.value = index
 }
+
 // 选择学科
 const handleUserEduSubject = () => {
-    showSelect.value = true
-    cascaderValue.value = []
+  unref(popoverRef).popperRef?.delayHide?.();
 }
-const handleChange = (value) => {
-    const id = value[1];
-    userStore.edusubject = subjectList.value.find(item => item.id === id).edusubject
-    userStore.edustage = value[0]
-    sessionStore.set('edustageSelf',userStore.edustage)
-    if(userStore.edustage === '高中' && userStore.edusubject === "道德与法治"){
-        // 默认语文
-        userStore.edusubject = '政治'
-        sessionStore.set('edusubjectSelf','政治')
+
+const handleChange = (item) => {
+  const id = item.value
+  const current = subjectList.value.find(item => item.id === id);
+  if (current) {
+    eduSubject.value = item.label;
+    eduStage.value = current.edustage;
+    sessionStore.set('edustageSelf', eduStage.value);
+
+    if (eduStage.value === '高中' && eduSubject.value === "道德与法治") {
+        eduSubject.value = '政治';
+      sessionStore.set('edusubjectSelf', '政治');
+    } else if (eduStage.value !== '高中' && eduSubject.value === "政治") {
+        eduSubject.value = '道德与法治';
+      sessionStore.set('edusubjectSelf', '道德与法治');
+    } else {
+      sessionStore.set('edusubjectSelf', eduSubject.value);
     }
-    else if(userStore.edustage != '高中' && userStore.edusubject === "政治"){
-        // 默认语文
-        userStore.edusubject = '道德与法治'
-        sessionStore.set('edusubjectSelf','道德与法治')
-    }else{
-        sessionStore.set('edusubjectSelf',userStore.edusubject)
-    }
-    showSelect.value = false
+  }
 }
+
 onMounted(() => {
-    getSubject()
+  getSubject();
 })
 </script>
+
 <style scoped>
 .custom-button {
   width: auto;
@@ -133,10 +158,58 @@ onMounted(() => {
   outline-offset: none;
   padding: 0 24px;
 }
-
 .custom-button i {
   margin-left: 8px; /* 调整图标与文字之间的间距 */
 }
-</style>
+.sidebar {
+    width: 100%;
+    padding: 5px;
+    display: flex;
+    justify-content: space-between;
+}
 
-  
\ No newline at end of file
+.nav-level-one,.nav-level-two {
+    margin-bottom: 20px;
+    width: 120px;
+}
+.nav-level-two .nav-item{
+    text-align: center;
+}
+
+.nav-item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+    padding: 8px 10px;
+    border-radius: 5px;
+    cursor: pointer;
+    transition: background-color 0.3s ease;
+}
+
+.nav-item:hover {
+    background-color: rgb(245, 247, 250);
+}
+
+.nav-text {
+    flex: 1;
+    font-size: 14px;
+    color: #333;
+}
+
+.nav-arrow {
+    font-size: 12px;
+    margin-left: auto;
+}
+
+.nav-level-one.nav-item:first-child.nav-text {
+    color: blue;
+}
+.active .nav-text{
+    font-weight: bold;
+    color:rgb(64, 158, 255)
+}
+.active .icon{
+    font-weight: bold;
+    color:rgb(64, 158, 255)
+}
+</style>
\ No newline at end of file

From dbaf861bef10c10e256e20e785c22e4b75865570 Mon Sep 17 00:00:00 2001
From: zdg <zdg@163.com>
Date: Wed, 8 Jan 2025 16:48:31 +0800
Subject: [PATCH 18/21] =?UTF-8?q?=E8=AF=BE=E5=A0=82=E7=82=B9=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/public/icon/avatar.svg           |  3 +
 .../AixPPTist/src/views/Screen/BaseView.vue   |  7 +-
 .../src/views/Screen/PresenterView.vue        |  9 ++-
 .../src/AixPPTist/src/views/Screen/index.vue  |  5 +-
 src/renderer/src/api/teaching/classcourse.js  | 12 +++
 src/renderer/src/utils/ppt/index.js           | 81 ++++++++++++++++++-
 6 files changed, 107 insertions(+), 10 deletions(-)
 create mode 100644 src/renderer/public/icon/avatar.svg

diff --git a/src/renderer/public/icon/avatar.svg b/src/renderer/public/icon/avatar.svg
new file mode 100644
index 0000000..386fffa
--- /dev/null
+++ b/src/renderer/public/icon/avatar.svg
@@ -0,0 +1,3 @@
+<svg style="width: 1em;height: 1em;vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6511">
+<path d="M512 34.133333c263.466667 0 477.866667 214.4 477.866667 477.866667S775.466667 989.866667 512 989.866667 34.133333 775.466667 34.133333 512 248.533333 34.133333 512 34.133333M512 0C229.333333 0 0 229.333333 0 512s229.333333 512 512 512 512-229.333333 512-512S794.666667 0 512 0z" fill="#87C1FF" p-id="6512"></path><path d="M505.173333 611.62666667c100.053333 0 181.333333-80.64 181.333334-180.053333 0-99.2-81.28-180.053333-181.333334-180.053334-100.053333 0-181.333333 80.64-181.333333 180.053334s81.28 180.053333 181.333333 180.053333zM579.84 661.54666667h-135.893333c-126.293333 0-229.12 102.4-229.12 228.053333v13.44c0 65.706667 101.12 65.706667 229.12 65.706667h135.893333c122.88 0 229.12 0 229.12-65.706667v-13.44c0-125.653333-102.826667-228.053333-229.12-228.053333z" fill="#87C1FF" p-id="6513"></path>
+</svg>
\ No newline at end of file
diff --git a/src/renderer/src/AixPPTist/src/views/Screen/BaseView.vue b/src/renderer/src/AixPPTist/src/views/Screen/BaseView.vue
index 4b747bd..e2dba4a 100644
--- a/src/renderer/src/AixPPTist/src/views/Screen/BaseView.vue
+++ b/src/renderer/src/AixPPTist/src/views/Screen/BaseView.vue
@@ -47,9 +47,10 @@
         <IconListView class="tool-btn" v-tooltip="'演讲者视图'" @click="changeViewMode('presenter')" />
         <IconOffScreenOne class="tool-btn" v-tooltip="'退出全屏'" v-if="fullscreenState" @click="manualExitFullscreen()" />
         <IconFullScreenOne class="tool-btn" v-tooltip="'进入全屏'" v-else @click="enterFullscreen()" />
+        <Hands class="tool-btn" v-if="classcourse" v-tooltip="'课堂点名'" @click="ToolHandle('named')" />
+        <Share class="tool-btn" v-if="classcourse" v-tooltip="'分享'" @click="ShareCode()" />
         <IconPower class="tool-btn" v-if="!classcourse" v-tooltip="'结束放映'" @click="exitScreening()" />
         <IconPower class="tool-btn" v-else v-tooltip="'结束课堂'" @click="exitCourse()" size="30" fill="#d0021b" strokeLinecap="butt" />
-        <Share class="tool-btn" v-if="classcourse" v-tooltip="'分享'" @click="ShareCode()" />
       </div>
       <div :class="['tools-icon',{opacity:iconHide}]" @click.stop="toolTrigger('icon')">
         <circle-double-down v-if="rightToolsVisible" theme="outline" size="30" fill="#409EFF"/>
@@ -76,8 +77,8 @@ import WritingBoardTool from './WritingBoardTool.vue'
 import CountdownTimer from './CountdownTimer.vue'
 import emitter from '@/utils/mitt';
 import Chat from '../../api/chat' // 聊天
-import { CircleDoubleDown, CircleDoubleUp, Share } from '@icon-park/vue-next' // icon-park 图标库
-import { ShareCode } from '@/utils/ppt' // ppt相关
+import { CircleDoubleDown, CircleDoubleUp, Share, Hands } from '@icon-park/vue-next' // icon-park 图标库
+import { ShareCode, ToolHandle } from '@/utils/ppt' // ppt相关
 
 const props = defineProps<{
   changeViewMode: (mode: 'base' | 'presenter') => void
diff --git a/src/renderer/src/AixPPTist/src/views/Screen/PresenterView.vue b/src/renderer/src/AixPPTist/src/views/Screen/PresenterView.vue
index 5ece2f4..56e930b 100644
--- a/src/renderer/src/AixPPTist/src/views/Screen/PresenterView.vue
+++ b/src/renderer/src/AixPPTist/src/views/Screen/PresenterView.vue
@@ -10,7 +10,10 @@
         <IconOffScreenOne class="tool-icon" v-else />
         <span>{{ fullscreenState ? '退出全屏' : '全屏' }}</span>
       </div>
-      <div class="tool-btn" @click="ShareCode()"><Share class="tool-icon" /><span>分享</span></div>
+      <template v-if="classcourse">
+        <div class="tool-btn" @click="ToolHandle('named')"><Hands class="tool-icon" /><span>课堂点名</span></div>
+        <div class="tool-btn" @click="ShareCode()"><Share class="tool-icon" /><span>分享</span></div>
+      </template>
       <Divider class="divider" />
       <div class="tool-btn" v-if="!classcourse" @click="exitScreening()"><IconPower class="tool-icon" /><span>结束放映</span></div>
       <div class="tool-btn" v-else @click="exitCourse()" size="30" fill="#d0021b" strokeLinecap="butt"><IconPower class="tool-icon" /><span>结束课堂</span></div>
@@ -79,7 +82,7 @@
 </template>
 
 <script lang="ts" setup>
-import { Share } from '@icon-park/vue-next' // icon-park 图标库
+import { Share, Hands } from '@icon-park/vue-next' // icon-park 图标库
 import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
 import { storeToRefs } from 'pinia'
 import { useSlidesStore, useClasscourseStore } from '../../store'
@@ -99,7 +102,7 @@ import CountdownTimer from './CountdownTimer.vue'
 import Divider from '../../components/Divider.vue'
 import emitter from '@/utils/mitt';
 import Chat from '../../api/chat' // 聊天
-import { ShareCode } from '@/utils/ppt' // ppt相关
+import { ShareCode, ToolHandle } from '@/utils/ppt' // ppt相关
 
 const props = defineProps<{
   changeViewMode: (mode: 'base' | 'presenter') => void
diff --git a/src/renderer/src/AixPPTist/src/views/Screen/index.vue b/src/renderer/src/AixPPTist/src/views/Screen/index.vue
index b030a5b..3e10bd0 100644
--- a/src/renderer/src/AixPPTist/src/views/Screen/index.vue
+++ b/src/renderer/src/AixPPTist/src/views/Screen/index.vue
@@ -4,8 +4,7 @@
     <PresenterView  :changeViewMode="changeViewMode" v-else-if="viewMode === 'presenter'" />
     <!-- 点赞组件 -->
     <upvote-vue ref="upvoteRef"  type="2"></upvote-vue>
-    <!-- <div style="z-index: 999;position: absolute;top:10px">
-    </div> -->
+
     <!-- 推图上屏弹窗 -->
     <el-dialog
       v-model="dialogVisible"
@@ -15,7 +14,7 @@
       :show-close="false"
     >
       <grid-pic ref="gridPicRef" style="height:100%;"  @clear="clearchidrenPic"></grid-pic>
-  </el-dialog>
+    </el-dialog>
   </div>
 </template>
 
diff --git a/src/renderer/src/api/teaching/classcourse.js b/src/renderer/src/api/teaching/classcourse.js
index b3b6952..6d31d49 100644
--- a/src/renderer/src/api/teaching/classcourse.js
+++ b/src/renderer/src/api/teaching/classcourse.js
@@ -114,4 +114,16 @@ export function getShareCode(id) {
     data: { id }
   })
 }
+/**
+ * 课堂点名
+ * @param {*} timgroupid 群id
+ * @returns 
+ */
+export function rollCall(timgroupid) {
+  return request({
+    url: '/education/classcourse/roll/call',
+    method: 'post',
+    data: { timgroupid }
+  })
+}
 
diff --git a/src/renderer/src/utils/ppt/index.js b/src/renderer/src/utils/ppt/index.js
index f556f1f..faca4cc 100644
--- a/src/renderer/src/utils/ppt/index.js
+++ b/src/renderer/src/utils/ppt/index.js
@@ -1,5 +1,5 @@
 /**
- * ppt 转换为图片
+ * ppt 相关方法
  */
 import { h, render, getCurrentInstance } from 'vue'
 import { toPng, toJpeg } from 'html-to-image' // 引入html-to-image库
@@ -8,6 +8,7 @@ import ThumbnailSlide from '@/AixPPTist/src/views/components/ThumbnailSlide/inde
 import { useSlidesStore } from '@/AixPPTist/src/store'
 import * as ElementPlus from 'element-plus'
 import { sessionStore } from '@/utils/store' // electron-store 状态管理
+import { getStaticUrl } from '@/utils/tool' // 工具类
 import * as Http_Classcourse from '@/api/teaching/classcourse' // api接口
 
 // 延时
@@ -128,4 +129,82 @@ export const ShareCode = async(code, cb) => {
       } else done()
     }
   }).catch(() => {})
+}
+
+/**
+ * 提示框
+ * @param {*} msg 内容
+ * @param {*} title 标题
+ * @param {*} option 配置
+ * @param {*} cb  关闭前回调 ({ h, instance, action, done }, done)
+ * @returns 
+ */
+export const Alert = async (msg, title, option, cb) => {
+  try {
+    if (typeof msg == 'function') msg = await msg(h)
+    return await ElementPlus.ElMessageBox.alert(msg, title, {
+      confirmButtonText: '确认',
+      cancelButtonText: '关闭',
+      showCancelButton: true,
+      beforeClose: (action, instance, done) => {
+        if (action == 'confirm') { // 确认
+          if (!!cb) { // 回调
+            cb({ h, instance, action, done }, done) && done()
+          } else { // 默认确认
+            done()
+          }
+        } else done()
+      },
+      ...option,
+    })
+  } catch { }
+}
+/**
+ * 课堂工具栏-钩子
+ */
+export const ToolType = {
+  /** 分享码 */
+  SHARE_CODE: 'shareCode',
+  /** 课堂点名 */
+  NAMED: 'named',
+}
+export const ToolHandle = async(type, data, cb) => {
+  const classcourse = sessionStore.get('curr.classcourse') // 课堂信息
+  switch (type) {
+    case ToolType.SHARE_CODE:
+      return ShareCode(data, cb)
+    case ToolType.NAMED: {
+      if (!classcourse) return ElementPlus.ElMessage.warning('没有课堂信息！')
+      const avatar = getStaticUrl('/icon/avatar.svg')
+      const timgroupid = classcourse.timgroupid
+      if (!timgroupid) return ElementPlus.ElMessage.warning('没有课堂群信息！')
+      // 课堂点名
+      const res = await Http_Classcourse.rollCall(timgroupid)
+      if (!(res && res.code == 200 && res.data)) return ElementPlus.ElMessage.warning('点名失败！')
+      const userList = res?.data || []
+      const refresh = () => { ToolHandle(ToolType.NAMED); return true }
+      Alert(h => {
+        const attr_0 = {style:{display:'flex',gap:'10px', cursor:'pointer'}}
+        const attr_1 = { style:{display:'inline-flex',alignItems:'center',gap:'10px',padding:'5px 10px'}}
+        const attr_2 = { src: avatar, style: { width: '50px', height: '50px' }}
+        const attr_3 = { style: { fontSize: '20px', fontWeight: 'bold', color: '#409EFF' }}
+        const attr_4 = { style: { fontSize: '12px' }}
+        const userList_H = userList.map(o => {
+          attr_1.title = o.name
+          attr_4.style.color = o.online ? '#67C23A' : '#F56C6C'
+          return h('div', attr_1, [
+            h('img', attr_2),
+            h('div', [
+              h('p', attr_3, o.name),
+              h('span', attr_4, o.online?'在线':'离线')
+            ])
+          ])
+        })
+        return h('div', attr_0, userList_H)
+      }, '课堂点名', { confirmButtonText: '刷新' }, refresh)
+      break;
+    }
+    default:
+      break
+  }
 }
\ No newline at end of file

From 0c3b017a280e96a7931ca806f62b72b882827efc Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Thu, 9 Jan 2025 15:14:58 +0800
Subject: [PATCH 19/21] =?UTF-8?q?=E6=89=93=E5=8C=85=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/views/teachingDesign/container/right.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/renderer/src/views/teachingDesign/container/right.vue b/src/renderer/src/views/teachingDesign/container/right.vue
index 300399f..0a00bbb 100644
--- a/src/renderer/src/views/teachingDesign/container/right.vue
+++ b/src/renderer/src/views/teachingDesign/container/right.vue
@@ -3,7 +3,7 @@
     <div class="right-header flex">
       <span>课件预览</span>
       <div>
-        <el-button type="danger" @click="onCreate">一键生成</el-button>
+        <el-button :disabled="!result?.outline" type="danger" @click="onCreate">一键生成</el-button>
         <el-button :disabled="!result?.parentId" @click="openAiPPT">编辑课件</el-button>
       </div>
     </div>
@@ -64,6 +64,7 @@ const pgDialog = reactive({ // 弹窗-进度条
 const pptSlides = ref([])
 
 emitter.on('onResult', (data)=>{
+  console.log(data)
   result.value = data
   if (!!result.value.parentId) {
     listEntpcoursefileNew({parentid: result.value.parentId}).then(res=>{

From 5179e6407d99072f571bc1d0c159854e39d97160 Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Thu, 9 Jan 2025 15:16:34 +0800
Subject: [PATCH 20/21] =?UTF-8?q?edit=20=E6=A1=86=E6=9E=B6=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   1 +
 src/renderer/src/main.js                      |  14 +++
 .../views/teachingDesign/container/center.vue | 116 ++++++++++--------
 .../src/views/teachingDesign/index.vue        |   4 +-
 4 files changed, 79 insertions(+), 56 deletions(-)

diff --git a/package.json b/package.json
index 7fb23eb..ea23159 100644
--- a/package.json
+++ b/package.json
@@ -36,6 +36,7 @@
     "@electron/remote": "^2.1.2",
     "@element-plus/icons-vue": "^2.3.1",
     "@icon-park/vue-next": "^1.4.2",
+    "@kangc/v-md-editor": "^2.3.18",
     "@tinymce/tinymce-vue": "5.1.1",
     "@vitejs/plugin-vue-jsx": "^4.0.0",
     "@vue-office/docx": "^1.6.2",
diff --git a/src/renderer/src/main.js b/src/renderer/src/main.js
index a723b75..76763e7 100644
--- a/src/renderer/src/main.js
+++ b/src/renderer/src/main.js
@@ -10,6 +10,15 @@ import './assets/iconfont/iconfont'
 import 'virtual:windi.css'
 import request from "@/utils/request";
 
+//v-md-editor
+import VMdPreview from '@kangc/v-md-editor/lib/preview';
+import '@kangc/v-md-editor/lib/style/preview.css';
+// 引入你所使用的主题 此处以 github 主题为例
+import githubTheme from '@kangc/v-md-editor/lib/theme/github';
+import '@kangc/v-md-editor/lib/theme/style/github.css';
+// highlightjs
+import hljs from 'highlight.js';
+
 import { store } from '@/store'
 import App from './App.vue'
 import router from './router'
@@ -39,6 +48,10 @@ app.config.globalProperties.$requestGetJYW = (url,config)=>{
 import Icon from '@/AixPPTist/src/plugins/icon'
 import Directive from '@/AixPPTist/src/plugins/directive'
 
+VMdPreview.use(githubTheme, {
+  Hljs: hljs,
+});
+
 app.use(router)
     .use(store)
     .use(ElementPlus, { locale: zhLocale })
@@ -46,6 +59,7 @@ app.use(router)
     .use(plugins)
     .use(Icon)
     .use(Directive)
+    .use(VMdPreview)
     .mount('#app')
 
 const isStadium = (user) => {
diff --git a/src/renderer/src/views/teachingDesign/container/center.vue b/src/renderer/src/views/teachingDesign/container/center.vue
index 30f78d6..f76370e 100644
--- a/src/renderer/src/views/teachingDesign/container/center.vue
+++ b/src/renderer/src/views/teachingDesign/container/center.vue
@@ -16,7 +16,10 @@
       </div>
     </div>
     <div class="center-con" v-loading="loading">
-      <template v-if="answer.title">
+      <!-- <v-md-editor v-if="markeDownAnswer" :model-value="markeDownAnswer" mode="preview"></v-md-editor> -->
+      <v-md-preview v-if="markeDownAnswer" :text="markeDownAnswer"></v-md-preview>
+      
+      <!-- <template v-if="answer.title">
         <div class="flex justify-between">
           <span style="font-size: 18px;color: #409eff;">封面页</span>
           <el-button type="primary" link @click="onEdit(item, -1)">编辑</el-button>
@@ -36,11 +39,11 @@
           </div>
           
         </div>
-      </template>
+      </template> -->
       <el-empty v-else description="请选择符合您需要的教学模式，生成教学大纲" />
     </div>
   </div>
-  <EditDialog v-model="isEdit" :item="editItem" :index="editIndex" />
+  <!-- <EditDialog v-model="isEdit" :item="editItem" :index="editIndex" /> -->
 </template>
 
 <script setup>
@@ -60,7 +63,6 @@ const curMode = ref(2)
 const isEdit = ref(false)
 
 const { user } = useUserStore()
-const aiShow = ref(false)
 
 const modeOptions = ref([
   {
@@ -81,12 +83,11 @@ emitter.on('selected', (data) => {
 // 回显大纲
 const curItem = reactive({})
 emitter.on('onShow', (data) => {
-  aiShow.value = false
-  Object.assign(answer, JSON.parse(data.outline))
- 
+
+  let outline = JSON.parse(data.outline)
+  markeDownAnswer.value = outline.markdown
+  emitter.emit('onResult',outline.json)
   Object.assign(curItem, data)
-  curItem.outline = JSON.parse(curItem.outline)
-  emitter.emit('onResult',curItem)
 })
 
 
@@ -100,7 +101,8 @@ const params = reactive(
 
 // 研读
 const loading = ref(false)
-const answer = reactive({})
+// const answer = reactive({})
+const markeDownAnswer = ref('')
 
 const createAi = async () => {
   if (selectedData.value.length == 0) {
@@ -111,10 +113,10 @@ const createAi = async () => {
   let str = selectedData.value.map( item => item.name).join('、')
   let bookV = curNode.roottitle.split('-')[1] + '版'
   loading.value = true
-  aiShow.value = true
+
   try {
 
-    params.prompt = `针对${curNode.edustage}${curNode.edusubject}${bookV}${curNode.itemtitle}这一课，根据以下教学环节：${str}，进行课件教学PPT内容设计`
+    params.prompt = `针对${curNode.edustage}${curNode.edusubject}${bookV}${curNode.itemtitle}这一课，根据以下教学环节：${str}，进行课件教学PPT内容设计，按照幻灯片1、幻灯片2、...的格式`
     // params.template = item.prompt
 
     // 教学大模型
@@ -133,65 +135,72 @@ const createAi = async () => {
 
       data = res.data
     }
+    markeDownAnswer.value = data.answer
     const res = await createOutlineV2({ query: data.answer })
 
-    Object.assign(answer, res.outline)
-    curItem.outline = res.outline
+
+    curItem.outline = JSON.stringify({
+      json: res.outline,
+      markdown: data.answer
+    })
     emitter.emit('onResult', curItem)
-    onSaveTemp(JSON.stringify(res.outline))
+    onSaveTemp()
   } finally {
     loading.value = false
   }
 }
 
 // 编辑大纲
-const editItem = reactive({})
-const editIndex = ref(0)
-const onEdit = (item, index)=>{
+// const editItem = reactive({})
+// const editIndex = ref(0)
+// const onEdit = (item, index)=>{
 
-  let obj = null
-  if(index == -1){
-    obj = {
-      title: answer.title,
-      subTitle: answer.subTitle
-    }
-  }
-  else{
-    obj = cloneDeep(item)
-  }
-  editIndex.value = index
-  isEdit.value = true
-  Object.assign(editItem, obj)
-}
+//   let obj = null
+//   if(index == -1){
+//     obj = {
+//       title: answer.title,
+//       subTitle: answer.subTitle
+//     }
+//   }
+//   else{
+//     obj = cloneDeep(item)
+//   }
+//   editIndex.value = index
+//   isEdit.value = true
+//   Object.assign(editItem, obj)
+// }
 
-emitter.on('editItem', (item) =>{
-  if(editIndex.value == -1){
-    answer.title = item.title
-    answer.subTitle = item.subTitle
-  }else{
-    answer.chapters[editIndex.value] = item
-  }
-  let data = cloneDeep(curItem)
+// emitter.on('editItem', (item) =>{
+//   if(editIndex.value == -1){
+//     answer.title = item.title
+//     answer.subTitle = item.subTitle
+//   }else{
+//     answer.chapters[editIndex.value] = item
+//   }
+//   let data = cloneDeep(curItem)
  
-  data.outline = JSON.stringify(cloneDeep(answer))
-  loading.value = true
+//   data.outline = JSON.stringify(cloneDeep(answer))
+//   loading.value = true
 
-  editSyllabus(data).then( res =>{
-    curItem.outline = answer
-    emitter.emit('onResult', curItem)
-    ElMessage.success('操作成功')
-  }).finally( ()=>{
-    loading.value = false
-  })
-})
+//   editSyllabus(data).then( res =>{
+//     curItem.outline = answer
+//     emitter.emit('onResult', curItem)
+//     ElMessage.success('操作成功')
+//   }).finally( ()=>{
+//     loading.value = false
+//   })
+// })
 
 // 保存模板
-const onSaveTemp = async (answer) => {
-  if (answer == '') return
+const onSaveTemp = async () => {
   let modelIds = selectedData.value.map(item => item.id).join(',')
+  let outline = JSON.stringify({
+    markdown: markeDownAnswer.value, 
+    json:curItem.outline
+  })
   const data = {
     eduId: curNode.id,
-    outline: answer,
+    outline,
     outlineType: curMode.value == 1 ? 0 : 1,
     modelIds,
     sourceType: 1,
@@ -237,7 +246,6 @@ onUnmounted(() => {
   emitter.off('onShow')
   emitter.off('editItem')
   
-
 })
 
 const curNode = reactive({})
diff --git a/src/renderer/src/views/teachingDesign/index.vue b/src/renderer/src/views/teachingDesign/index.vue
index 1ffaf52..eb9de23 100644
--- a/src/renderer/src/views/teachingDesign/index.vue
+++ b/src/renderer/src/views/teachingDesign/index.vue
@@ -4,10 +4,10 @@
       <el-col :span="5">
         <Left />
       </el-col>
-      <el-col :span="14">
+      <el-col :span="15">
         <Center />
       </el-col>
-      <el-col :span="5">
+      <el-col :span="4">
         <Right />
       </el-col>
     </el-row>

From 3e8f8529fad3fde4bba0a4eea71a1ef60a8621f7 Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Thu, 9 Jan 2025 15:26:54 +0800
Subject: [PATCH 21/21] =?UTF-8?q?edit=20=E6=A1=86=E6=9E=B6=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/views/teachingDesign/container/center.vue | 3 +--
 src/renderer/src/views/teachingDesign/container/right.vue  | 5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/renderer/src/views/teachingDesign/container/center.vue b/src/renderer/src/views/teachingDesign/container/center.vue
index f76370e..f27faea 100644
--- a/src/renderer/src/views/teachingDesign/container/center.vue
+++ b/src/renderer/src/views/teachingDesign/container/center.vue
@@ -86,7 +86,7 @@ emitter.on('onShow', (data) => {
 
   let outline = JSON.parse(data.outline)
   markeDownAnswer.value = outline.markdown
-  emitter.emit('onResult',outline.json)
+  emitter.emit('onResult',data)
   Object.assign(curItem, data)
 })
 
@@ -138,7 +138,6 @@ const createAi = async () => {
     markeDownAnswer.value = data.answer
     const res = await createOutlineV2({ query: data.answer })
 
-
     curItem.outline = JSON.stringify({
       json: res.outline,
       markdown: data.answer
diff --git a/src/renderer/src/views/teachingDesign/container/right.vue b/src/renderer/src/views/teachingDesign/container/right.vue
index 0a00bbb..93b41fd 100644
--- a/src/renderer/src/views/teachingDesign/container/right.vue
+++ b/src/renderer/src/views/teachingDesign/container/right.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="container-right flex">
     <div class="right-header flex">
-      <span>课件预览</span>
+      <span>预览</span>
       <div>
         <el-button :disabled="!result?.outline" type="danger" @click="onCreate">一键生成</el-button>
-        <el-button :disabled="!result?.parentId" @click="openAiPPT">编辑课件</el-button>
+        <el-button :disabled="!result?.parentId" @click="openAiPPT">编辑</el-button>
       </div>
     </div>
     <div class="right-con">
@@ -66,6 +66,7 @@ const pptSlides = ref([])
 emitter.on('onResult', (data)=>{
   console.log(data)
   result.value = data
+  result.value.outline = JSON.parse(data.outline).json
   if (!!result.value.parentId) {
     listEntpcoursefileNew({parentid: result.value.parentId}).then(res=>{
       pptSlides.value = res.rows