diff --git a/src/renderer/src/AixPPTist/src/api/chat.ts b/src/renderer/src/AixPPTist/src/api/chat.ts
new file mode 100644
index 0000000..6cf016e
--- /dev/null
+++ b/src/renderer/src/AixPPTist/src/api/chat.ts
@@ -0,0 +1,24 @@
+/**
+ * 统一处理消息 发送 避免找不到
+ */
+
+import ChatWs from '@/plugins/socket' // 聊天socket
+import { sessionStore } from '@/utils/store' // electron-store 状态管理
+import * as API_classcourse from '@/api/teaching/classcourse' // 后端api
+
+export default () => {
+  const classcourse = sessionStore.get('curr.classcourse') // 课堂信息
+  const timgroupid = classcourse?.timgroupid // 群组id
+  if (!ChatWs.ws) ChatWs.init()
+  // 下课消息
+  const exitCourse = async() => {
+    if(!timgroupid) throw new Error('未获取到群组ID')
+    await API_classcourse.updateClasscourse({ id: classcourse.id, status: 'closed' })
+    return ChatWs.closedCourse(timgroupid)
+  }
+  return {
+    exitCourse,
+    classcourse,
+    groupid: timgroupid,
+  }
+}
\ No newline at end of file
diff --git a/src/renderer/src/AixPPTist/src/api/classcourse.ts b/src/renderer/src/AixPPTist/src/api/classcourse.ts
index e513f3c..21e7296 100644
--- a/src/renderer/src/AixPPTist/src/api/classcourse.ts
+++ b/src/renderer/src/AixPPTist/src/api/classcourse.ts
@@ -7,13 +7,13 @@ import { sessionStore } from '@/utils/store' // electron-store 状态管理
 import * as useStore from '../store' // pptist-状态管理
 import ChatWs from '@/plugins/socket' // 聊天socket
 import msgUtils from '@/plugins/modal' // 消息工具
-import useExecPlay from '../views/Screen/hooks/useExecPlay' // 播放控制
+import emitter from '@/utils/mitt' //mitt 事件总线
+import { nextTick } from 'vue'
 
 const slidesStore = useStore.useSlidesStore() // 幻灯片-状态管理
 const screenStore = useStore.useScreenStore() // 全屏-状态管理
 const classcourseStore = useStore.useClasscourseStore() // 课堂信息-状态管理
 const classcourse = sessionStore.get('curr.classcourse') // 课堂信息
-const execPlay = useExecPlay() // 播放控制
 
 export class Classcourse {
   msgObj:ElMessageBox = null // 提示消息对象
@@ -23,10 +23,12 @@ export class Classcourse {
   constructor() {
     this.load()
   }
+  // 延时
+  sleep = ms => new Promise(resolve => setTimeout(resolve, ms))
   /**
    * @description 加载
    */
-  load() {
+  async load() {
     console.log('classcourse-load', classcourse)
     // 打开全屏
     const isCourse = !!classcourse
@@ -39,15 +41,12 @@ export class Classcourse {
       this.classcourse = classcourse // 课堂信息
       this.id = classcourse.id // 课堂id
       // 如果课堂信息有paging，则更新当前页码
-      const isPaging = !!classcourse.paging
-      if (isPaging) slidesStore.updateSlideIndex(classcourse.paging)
-        // 如果课堂信息有paging，则更新动画播放状态
-      const isAnim = !!classcourse.cartoonTimes
-      if (isAnim) { // 动画播放
-        for (let i = 0; i <= classcourse.cartoonTimes; i++) {
-          execPlay.runAnimation(true) // 异步执行动画
-        }
-      }
+      const { paging, cartoonTimes } = classcourse
+      const isPaging = !!paging || paging === 0
+      // 如果课堂信息有paging，则更新动画播放状态
+      const isAnim = !!cartoonTimes || cartoonTimes === 0
+      if (isPaging) slidesStore.updateSlideIndex(paging)
+      if (isAnim) slidesStore.updateAnimationIndex(cartoonTimes+1)
       // 课堂信息-状态管理
       classcourseStore.setClasscourse(classcourse)
       // 待上课提示
diff --git a/src/renderer/src/AixPPTist/src/api/index.ts b/src/renderer/src/AixPPTist/src/api/index.ts
index 685c367..203ba3e 100644
--- a/src/renderer/src/AixPPTist/src/api/index.ts
+++ b/src/renderer/src/AixPPTist/src/api/index.ts
@@ -258,6 +258,7 @@ export class PPTApi {
 }
 
 export class Homework{
+  static win: null  // 作业弹窗
   // 作业弹窗
   static async showHomework(id: any) {
     let result = await getClassWorkList(id)
@@ -265,7 +266,14 @@ export class Homework{
       localStorage.setItem('teachClassWorkItem', JSON.stringify(result[0]));
       toolStore.isTaskWin=true; // 设置打开批改窗口
     //   emit('closeActive')
-      createWindow('open-taskwin',{url:'/teachClassTask'}); 
+    // 重复打开，先关闭弹窗
+    // if (this.win) this.win?.close?.()
+    this.win = await createWindow('open-taskwin',{url:'/teachClassTask'})
+     return this.win;
+  }
+  static closeHomework() {
+    if (this.win) this.win?.close?.()
+    this.win = null
   }
 }
 export default PPTApi
\ No newline at end of file
diff --git a/src/renderer/src/AixPPTist/src/api/upvote.ts b/src/renderer/src/AixPPTist/src/api/upvote.ts
new file mode 100644
index 0000000..4e84407
--- /dev/null
+++ b/src/renderer/src/AixPPTist/src/api/upvote.ts
@@ -0,0 +1,33 @@
+/**
+ * 点赞组件-相关
+ */
+export default class Upvote {
+  instance: any = null // 自身实例
+  upvoteRef: any = null // 点赞组件
+  constructor(elRef?: any) {
+    if(!!elRef) this.upvoteRef = elRef // 点赞组件
+    if (!Upvote.Instance) {
+      Upvote.Instance = this
+    }
+    return Upvote.Instance
+  }
+
+  // 初始化
+  init(elRef) {
+    if(!!elRef) this.upvoteRef = elRef // 点赞组件
+    return this
+  }
+  // 打开点赞或者疑问 1点赞 2疑问
+  trigger(type) {
+    this.upvoteRef?.value?.trigger?.(type)
+    return this
+  }
+  // 静态方法-初始化
+  static init(elRef) {
+    return new Upvote(elRef)
+  }
+  // 静态方法-打开点赞或者疑问 1点赞 2疑问
+  static trigger(type) {
+    return new Upvote().trigger(type)
+  }
+}
\ No newline at end of file
diff --git a/src/renderer/src/AixPPTist/src/api/watcher.ts b/src/renderer/src/AixPPTist/src/api/watcher.ts
index 236c0e8..220ed53 100644
--- a/src/renderer/src/AixPPTist/src/api/watcher.ts
+++ b/src/renderer/src/AixPPTist/src/api/watcher.ts
@@ -11,8 +11,9 @@ import ChatWs from '@/plugins/socket' // 聊天socket
 import Classcourse from './classcourse' // 课程相关
 import msgUtils from '@/plugins/modal' // 消息工具
 import { Homework } from './index' // api-作业相关
-import emitter from '@/utils/mitt' //mitt 事件总线
+// import emitter from '@/utils/mitt' //mitt 事件总线
 import useExecPlay from '../views/Screen/hooks/useExecPlay' // 播放控制
+import hooksUpvote from './upvote' // 点赞-工具
 
 /**
  * @description 监听器
@@ -22,7 +23,7 @@ export default () => {
   const classcourseStore = store.useClasscourseStore() // 课堂信息-状态管理
   const resource = sessionStore.get('curr.resource') // apt 资源
   const smarttalk = sessionStore.get('curr.smarttalk') // 备课资源
-  const execPlay = useExecPlay() // 播放控制
+  const { execNext, turnPrevSlide } = useExecPlay()
   // 监听幻灯片内容变化
   watch(() => slidesStore.slides, (newVal, oldVal) => {
     PPTApi.updateSlides(newVal, oldVal) // 更新幻灯片内容
@@ -36,7 +37,8 @@ export default () => {
   
   // 监听幻灯片下标变化
   watch(() => slidesStore.slideIndex, (newVal, oldVal) => {
-    PPTApi.updateWorkList()
+    if (!!Classcourse.id) return // 上课状态，不更新右侧作业列表
+    PPTApi.updateWorkList() // 更新作业列表
   })
   // 监听幻灯片下画布尺寸比例变化
   watch(() => slidesStore.viewportRatio, (newVal, oldVal) => {
@@ -97,8 +99,8 @@ export default () => {
         case MsgEnum.HEADS.MSG_slideFlapping: // 幻灯片翻页
           const slideIndex = content?.current || 0
           const type = content?.animation
-          if (type === 'Nextsteps') emitter.emit('useExecPlay', 'execNext') // 下一步
-          else if (type === 'Previoustep') emitter.emit('useExecPlay', 'turnPrevSlide') // 上一步清空-动画
+          if (type === 'Nextsteps') execNext(true) // 下一步-异步动画
+          else if (type === 'Previoustep') turnPrevSlide() // 上一步清空-动画
           else slidesStore.updateSlideIndex(slideIndex) // 更新幻灯片下标
           break
         case MsgEnum.HEADS.MSG_homework: // 作业|活动-布置
@@ -109,10 +111,10 @@ export default () => {
           close()
           break
         case MsgEnum.HEADS.MSG_dz: // 点赞
-          emitter.emit('upvoteTrigger', 1)
+          hooksUpvote.trigger(1)
           break
         case MsgEnum.HEADS.MSG_yh: // 疑惑
-          emitter.emit('upvoteTrigger', 2)
+          hooksUpvote.trigger(2)
           break
         case MsgEnum.HEADS.MSG_0010: // 备用
           break
diff --git a/src/renderer/src/AixPPTist/src/store/classcourse.ts b/src/renderer/src/AixPPTist/src/store/classcourse.ts
index bd77fbd..5d83314 100644
--- a/src/renderer/src/AixPPTist/src/store/classcourse.ts
+++ b/src/renderer/src/AixPPTist/src/store/classcourse.ts
@@ -3,16 +3,21 @@ import type { Classcourse } from '../api/types'
 
 export interface ClasscourseState {
   classcourse: Classcourse | any, // 课堂信息
+  isEmit: boolean, // 是否加载监听事件(动画播放)
 }
 
 export const useClasscourseStore = defineStore('classcourse', {
   state: (): ClasscourseState => ({
     classcourse: null, // 课堂信息
+    isEmit: false, // 是否加载监听事件(动画播放)
   }),
 
   actions: {
     setClasscourse(classcourse: Classcourse) {
       this.classcourse = classcourse
     },
+    setIsEmit(isEmit: boolean) {
+      this.isEmit = isEmit
+    },
   },
 })
\ No newline at end of file
diff --git a/src/renderer/src/AixPPTist/src/store/slides.ts b/src/renderer/src/AixPPTist/src/store/slides.ts
index d7a3bae..f3a23fa 100644
--- a/src/renderer/src/AixPPTist/src/store/slides.ts
+++ b/src/renderer/src/AixPPTist/src/store/slides.ts
@@ -33,7 +33,8 @@ export interface SlidesState {
   slides: Slide[]
   slideIndex: number
   viewportSize: number
-  viewportRatio: number
+  viewportRatio: number,
+  animationIndex: number, // 不是从0开始
   workList:Object[],
   workItem:Object[],
 }
@@ -46,6 +47,7 @@ export const useSlidesStore = defineStore('slides', {
     slideIndex: 0, // 当前页面索引
     viewportSize: 1000, // 可视区域宽度基数
     viewportRatio: 0.5625, // 可视区域比例，默认16:9
+    animationIndex: 0, // 不是从0开始
     workList:[],// 活动的列表
     workItem:[],// 获取到的所有pptlist
   }),
@@ -206,6 +208,9 @@ export const useSlidesStore = defineStore('slides', {
     updateSlideIndex(index: number) {
       this.slideIndex = index
     },
+    updateAnimationIndex(index: number) {
+      this.animationIndex = index
+    },
   
     addElement(element: PPTElement | PPTElement[]) {
       const elements = Array.isArray(element) ? element : [element]
diff --git a/src/renderer/src/AixPPTist/src/views/Screen/BaseView.vue b/src/renderer/src/AixPPTist/src/views/Screen/BaseView.vue
index ae2add1..8e7acf0 100644
--- a/src/renderer/src/AixPPTist/src/views/Screen/BaseView.vue
+++ b/src/renderer/src/AixPPTist/src/views/Screen/BaseView.vue
@@ -30,14 +30,10 @@
       @close="timerlVisible = false" 
     />
 
-    <div class="tools-left">
+    <div class="tools-left" v-if="!classcourse">
       <IconLeftTwo class="tool-btn" theme="two-tone" :fill="['#111', '#fff']" @click="execPrev()" />
       <IconRightTwo class="tool-btn" theme="two-tone" :fill="['#111', '#fff']" @click="execNext()" />
     </div>
-    <!-- 点赞组件 -->
-    <div style="z-index: 999;position: absolute;top:10px">
-      <upvote-vue ref="upvoteRef"  type="2"></upvote-vue>
-    </div>
     <div 
       class="tools-right" :class="{ 'visible': rightToolsVisible }" 
       @mouseleave="rightToolsVisible = false"
@@ -52,15 +48,16 @@
         <IconOffScreenOne class="tool-btn" v-tooltip="'退出全屏'" v-if="fullscreenState" @click="manualExitFullscreen()" />
         <IconFullScreenOne class="tool-btn" v-tooltip="'进入全屏'" v-else @click="enterFullscreen()" />
         <IconPower class="tool-btn" v-tooltip="'结束放映'" @click="exitScreening()" />
+        <IconPower class="tool-btn close" v-if="chat.groupid" v-tooltip="'结束课堂'" @click="exitCourse()" />
       </div>
     </div>
   </div>
 </template>
 
 <script lang="ts" setup>
-import { ref , watchEffect} from 'vue'
+import { ref , watchEffect, onMounted, onUnmounted} from 'vue'
 import { storeToRefs } from 'pinia'
-import { useSlidesStore ,useScreenStore} from '../../store'
+import { useSlidesStore ,useScreenStore, useClasscourseStore} from '../../store'
 import type { ContextmenuItem } from '../../components/Contextmenu/types'
 import { enterFullscreen } from '../../utils/fullscreen'
 import useScreening from '../../hooks/useScreening'
@@ -72,14 +69,15 @@ import ScreenSlideList from './ScreenSlideList.vue'
 import SlideThumbnails from './SlideThumbnails.vue'
 import WritingBoardTool from './WritingBoardTool.vue'
 import CountdownTimer from './CountdownTimer.vue'
-import upvoteVue from '@/views/tool/components/upvote.vue' // 点赞-子组件
 import emitter from '@/utils/mitt';
+import Chat from '../../api/chat' // 聊天
 
 const props = defineProps<{
   changeViewMode: (mode: 'base' | 'presenter') => void
 }>()
 
 const { slides, slideIndex } = storeToRefs(useSlidesStore())
+const { classcourse, isEmit } = storeToRefs(useClasscourseStore()) // 课堂信息
 
 const {
   autoPlayTimer,
@@ -103,13 +101,13 @@ const {
 const { slideWidth, slideHeight } = useSlideSize()
 const { exitScreening } = useScreening()
 const { fullscreenState, manualExitFullscreen } = useFullscreen()
+const chat:any = Chat() // 聊天室
 
 const rightToolsVisible = ref(false)
 const writingBoardToolVisible = ref(false)
 const timerlVisible = ref(false)
 const slideThumbnailModelVisible = ref(false)
 const laserPen = ref(false)
-const upvoteRef = ref(null)
 const screenStore =useScreenStore()
 const contextmenus = (): ContextmenuItem[] => {
   return [
@@ -192,42 +190,13 @@ const contextmenus = (): ContextmenuItem[] => {
     },
   ]
 }
-// 打开点赞或者疑问 1点赞 2疑问
-emitter.on('upvoteTrigger', (type) => {
-  upvoteRef.value?.trigger(type)
-});
-// zdg: 使用方法才生效
-const execPlay = {
-  autoPlayTimer,
-  autoPlay,
-  closeAutoPlay,
-  autoPlayInterval,
-  setAutoPlayInterval,
-  loopPlay,
-  setLoopPlay,
-  mousewheelListener,
-  touchStartListener,
-  touchEndListener,
-  turnPrevSlide,
-  turnNextSlide,
-  turnSlideToIndex,
-  turnSlideToId,
-  execPrev,
-  execNext,
-  animationIndex,
-}
-emitter.on('useExecPlay', (data: string|any) => {
-  if (!data) throw new Error('参数错误')
-  if (typeof data === 'string') { // 字符串
-    if (execPlay[data]) execPlay[data]()
-    else throw new Error('方法不存在')
-  } else { // 对象
-    const { method, ...params } = data || {}
-    if (execPlay[method]) execPlay[method](...params)
-    else throw new Error('方法不存在')
-  }
-})
 
+// 下课
+const exitCourse = async () => {
+  // console.log('下课', chat)
+  await chat.exitCourse() // 下课消息
+  exitScreening() // 结束放映
+}
 
 </script>
 
@@ -309,6 +278,9 @@ emitter.on('useExecPlay', (data: string|any) => {
     & + .tool-btn {
       margin-left: 15px;
     }
+    &.close{
+      color: #d14424;
+    }
   }
   .page-number {
     font-size: 13px;
diff --git a/src/renderer/src/AixPPTist/src/views/Screen/PresenterView.vue b/src/renderer/src/AixPPTist/src/views/Screen/PresenterView.vue
index 4d2076d..a747a9c 100644
--- a/src/renderer/src/AixPPTist/src/views/Screen/PresenterView.vue
+++ b/src/renderer/src/AixPPTist/src/views/Screen/PresenterView.vue
@@ -12,6 +12,7 @@
       </div>
       <Divider class="divider" />
       <div class="tool-btn" @click="exitScreening()"><IconPower class="tool-icon" /><span>结束放映</span></div>
+      <div class="tool-btn close" @click="exitCourse()" v-if="chat.groupid"><IconPower class="tool-icon" /><span>结束课堂</span></div>
     </div>
 
     <div class="content">
@@ -55,7 +56,7 @@
           :class="{ 'active': index === slideIndex }"
           v-for="(slide, index) in slides" 
           :key="slide.id"
-          @click="turnSlideToIndex(index)"
+          @click="turnSlideTo(index, $event)"
         >
           <ThumbnailSlide :slide="slide" :size="120 / viewportRatio" :visible="index < slidesLoadLimit" />
         </div>
@@ -77,9 +78,9 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, nextTick, ref, watch } from 'vue'
+import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
 import { storeToRefs } from 'pinia'
-import { useSlidesStore } from '../../store'
+import { useSlidesStore, useClasscourseStore } from '../../store'
 import type { ContextmenuItem } from '../../components/Contextmenu/types'
 import { enterFullscreen } from '../../utils/fullscreen'
 import { parseText2Paragraphs } from '../../utils/textParser'
@@ -94,12 +95,15 @@ import ScreenSlideList from './ScreenSlideList.vue'
 import WritingBoardTool from './WritingBoardTool.vue'
 import CountdownTimer from './CountdownTimer.vue'
 import Divider from '../../components/Divider.vue'
+import emitter from '@/utils/mitt';
+import Chat from '../../api/chat' // 聊天
 
 const props = defineProps<{
   changeViewMode: (mode: 'base' | 'presenter') => void
 }>()
 
 const { slides, slideIndex, viewportRatio, currentSlide } = storeToRefs(useSlidesStore())
+const { classcourse, isEmit } = storeToRefs(useClasscourseStore()) // 课堂信息
 
 const slideListWrapRef = ref<HTMLElement>()
 const thumbnailsRef = ref<HTMLElement>()
@@ -117,17 +121,31 @@ const {
   turnSlideToId,
   animationIndex,
 } = useExecPlay()
-
 const { slideWidth, slideHeight } = useSlideSize(slideListWrapRef)
 const { exitScreening } = useScreening()
 const { slidesLoadLimit } = useLoadSlides()
 const { fullscreenState, manualExitFullscreen } = useFullscreen()
+const chat:any = Chat() // 聊天室
 
 const remarkFontSize = ref(16)
 const currentSlideRemark = computed(() => {
   return parseText2Paragraphs(currentSlide.value.remark || '无备注')
 })
 
+// 切换到指定的幻灯片
+const turnSlideTo = (index: number, e: PointerEvent) => {
+  // 课堂信息存在时，不允许翻页
+  console.log('课堂信息', classcourse, index)
+  if (!!classcourse.value) return
+  turnSlideToIndex(index)
+}
+// 下课
+const exitCourse = async () => {
+  // console.log('下课', chat)
+  await chat.exitCourse() // 下课消息
+  exitScreening() // 结束放映
+}
+
 const handleMousewheelThumbnails = (e: WheelEvent) => {
   if (!thumbnailsRef.value) return
   thumbnailsRef.value.scrollBy(e.deltaY, 0)
@@ -192,6 +210,7 @@ const contextmenus = (): ContextmenuItem[] => {
     },
   ]
 }
+
 </script>
 
 <style lang="scss" scoped>
@@ -208,7 +227,7 @@ const contextmenus = (): ContextmenuItem[] => {
   background-color: #fff;
   border-right: solid 1px #eee;
   font-size: 12px;
-  margin: 20px 0;
+  padding: 20px 0;
 
   .tool-btn {
     display: flex;
@@ -224,6 +243,9 @@ const contextmenus = (): ContextmenuItem[] => {
     &:hover, &.active {
       color: $themeColor;
     }
+    &.close{
+      color: #d14424;
+    }
   }
 
   .divider {
diff --git a/src/renderer/src/AixPPTist/src/views/Screen/hooks/useExecPlay.ts b/src/renderer/src/AixPPTist/src/views/Screen/hooks/useExecPlay.ts
index 4b0016c..860e37a 100644
--- a/src/renderer/src/AixPPTist/src/views/Screen/hooks/useExecPlay.ts
+++ b/src/renderer/src/AixPPTist/src/views/Screen/hooks/useExecPlay.ts
@@ -1,17 +1,19 @@
 import { onMounted, onUnmounted, ref } from 'vue'
 import { throttle } from 'lodash'
 import { storeToRefs } from 'pinia'
-import { useSlidesStore } from '../../../store'
+import { useSlidesStore, useClasscourseStore } from '../../../store'
 import { KEYS } from '../../../configs/hotkey'
 import { ANIMATION_CLASS_PREFIX } from '../../../configs/animation'
 import message from '../../../utils/message'
+import emitter from '@/utils/mitt';
 
 export default () => {
   const slidesStore = useSlidesStore()
-  const { slides, slideIndex, formatedAnimations } = storeToRefs(slidesStore)
+  const classcourseStore = useClasscourseStore() // 课堂信息-状态管理
+  const { slides, slideIndex, formatedAnimations, animationIndex } = storeToRefs(slidesStore)
 
   // 当前页的元素动画执行到的位置
-  const animationIndex = ref(0)
+  // const animationIndex = ref(0)
 
   // 动画执行状态
   const inAnimation = ref(false)
@@ -121,9 +123,9 @@ export default () => {
   // 遇到元素动画时，优先执行动画播放，无动画则执行翻页
   // 向上播放遇到动画时，仅撤销到动画执行前的状态，不需要反向播放动画
   // 撤回到上一页时，若该页从未播放过（意味着不存在动画状态），需要将动画索引置为最小值（初始状态），否则置为最大值（最终状态）
-  const execPrev = () => {
+  const execPrev = (isAsync: boolean) => {
     if (formatedAnimations.value.length && animationIndex.value > 0) {
-      revokeAnimation()
+      revokeAnimation(isAsync)
     }
     else if (slideIndex.value > 0) {
       slidesStore.updateSlideIndex(slideIndex.value - 1)
@@ -139,9 +141,10 @@ export default () => {
     }
     inAnimation.value = false
   }
-  const execNext = () => {
+  const execNext = (isAsync: boolean) => {
+    console.log('execNext', isAsync)
     if (formatedAnimations.value.length && animationIndex.value < formatedAnimations.value.length) {
-      runAnimation()
+      runAnimation(isAsync)
     }
     else if (slideIndex.value < slides.value.length - 1) {
       slidesStore.updateSlideIndex(slideIndex.value + 1)
@@ -173,7 +176,13 @@ export default () => {
   }
 
   // 鼠标滚动翻页
-  const mousewheelListener = throttle(function(e: WheelEvent) {
+  const mousewheelListener = (e: WheelEvent) => {
+    // console.log('mousewheel', e)
+    // 课堂信息存在时，不允许翻页
+    if (!!classcourseStore.classcourse) e.preventDefault()
+    mousewheelListenerThrottle(e)
+  }
+  const mousewheelListenerThrottle = throttle(function(e: WheelEvent) {
     if (e.deltaY < 0) turning(e, 'prev')
     else if (e.deltaY > 0) turning(e, 'next')
   }, 500, { leading: true, trailing: false })
@@ -203,6 +212,8 @@ export default () => {
   // 向上翻页/向下翻页
   const turning = (e, type) => {
     e.preventDefault() // 阻止默认事件
+    // 课堂信息存在时，不允许翻页
+    if (!!classcourseStore.classcourse) return
     if (type === 'prev') execPrev()
     else if (type === 'next') execNext()
   }
@@ -220,8 +231,8 @@ export default () => {
     ) turning(e, 'next')
   }
 
-  onMounted(() => document.addEventListener('keydown', keydownListener))
-  onUnmounted(() => document.removeEventListener('keydown', keydownListener))
+  onMounted(() => {document.addEventListener('keydown', keydownListener)})
+  onUnmounted(() => {document.removeEventListener('keydown', keydownListener)})
 
   // 切换到上一张/上一张幻灯片（无视元素的入场动画）
   const turnPrevSlide = () => {
diff --git a/src/renderer/src/AixPPTist/src/views/Screen/index.vue b/src/renderer/src/AixPPTist/src/views/Screen/index.vue
index 2f929c8..d5aa87f 100644
--- a/src/renderer/src/AixPPTist/src/views/Screen/index.vue
+++ b/src/renderer/src/AixPPTist/src/views/Screen/index.vue
@@ -2,6 +2,10 @@
   <div class="pptist-screen">
     <BaseView :changeViewMode="changeViewMode" v-if="viewMode === 'base'" />
     <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> -->
   </div>
 </template>
 
@@ -9,9 +13,11 @@
 import { onMounted, onUnmounted, ref } from 'vue'
 import { KEYS } from '../../configs/hotkey'
 import useScreening from '../../hooks/useScreening'
+import hooksUpvote from '../../api/upvote' // 点赞-工具
 
 import BaseView from './BaseView.vue'
 import PresenterView from './PresenterView.vue'
+import upvoteVue from '@/views/tool/components/upvote.vue' // 点赞-子组件
 
 const viewMode = ref<'base' | 'presenter'>('base')
 
@@ -20,6 +26,8 @@ const changeViewMode = (mode: 'base' | 'presenter') => {
 }
 
 const { exitScreening } = useScreening()
+const upvoteRef = ref(null)
+hooksUpvote.init(upvoteRef) // 初始化点赞
 
 // 快捷键退出放映
 const keydownListener = (e: KeyboardEvent) => {
diff --git a/src/renderer/src/api/ai/index.js b/src/renderer/src/api/ai/index.js
index ef5cfd6..5e491d3 100644
--- a/src/renderer/src/api/ai/index.js
+++ b/src/renderer/src/api/ai/index.js
@@ -10,11 +10,10 @@ export const createChart = ({ headers, data }) => {
   })
 }
 // 大模型对话
-export const sendChart = ({ headers, data }) => {
+export const sendChart = (data) => {
   return request({
     url: '/qf/sendTalk',
     method: 'post',
-    headers,
     data,
   })
 }
\ No newline at end of file
diff --git a/src/renderer/src/components/template-study/container/adjust-dialog.vue b/src/renderer/src/components/template-study/container/adjust-dialog.vue
index 65316c3..000f8e2 100644
--- a/src/renderer/src/components/template-study/container/adjust-dialog.vue
+++ b/src/renderer/src/components/template-study/container/adjust-dialog.vue
@@ -30,7 +30,7 @@
         </div>
       </el-scrollbar>
       <div class="file-list">
-        <el-dropdown @command="changeFile">
+        <el-dropdown @command="changeFile" v-if="type == 3">
         <span class="el-dropdown-link">
           {{ curFile.fileName }}
           <i class="iconfont icon-xiangxia"></i>
@@ -54,11 +54,12 @@
 </template>
 
 <script setup>
-import { ref, reactive, onMounted, onUnmounted, watch } from 'vue'
+import { ref, reactive, onMounted, onUnmounted } from 'vue'
 import { completion, docList } from '@/api/mode/index'
 import { sessionStore } from '@/utils/store'
 import { dataSetJson } from '@/utils/comm.js'
 import useUserStore from '@/store/modules/user'
+import { sendChart } from '@/api/ai/index'
 import emitter from '@/utils/mitt';
 
 const userInfo = useUserStore().user
@@ -71,12 +72,20 @@ const props = defineProps({
   item: {
     type: Object,
     default: () => {
-      return { name: '11' }
+      return { name: '' }
     }
   },
   type: {
     type: Number,
     default: 1
+  },
+  curMode:{
+    type: Number,
+    default: 1
+  },
+  conversation_id: {
+    type: [Number, String],
+    default: ''
   }
 })
 
@@ -100,7 +109,8 @@ const curNode = reactive({})
 const params = reactive(
   {
     prompt: '',
-    dataset_id: ''
+    dataset_id: '',
+    template: ''
   }
 )
 
@@ -108,7 +118,24 @@ const params = reactive(
 const getCompletion = async (val) => {
   try {
     params.prompt = `按照${val}的要求，针对${curNode.edustage}${curNode.edusubject}${modeType.value} 对${curNode.itemtitle}进行教学分析`
-    const { data } = await completion(params)
+    params.template = props.item.prompt
+
+    let data = null;
+    // 教学大模型
+    if(props.curMode == 1){
+      const res = await sendChart({
+        content: params.prompt,
+        conversationId: props.conversation_id,
+        stream: false
+      })
+      data = res.data
+    }
+    else{
+      // 知识库模型
+      const res = await completion(params)
+      data = res.data
+    }
+
     let answer = data.answer
     msgList.value.push({
       type: 'robot',
@@ -125,19 +152,6 @@ const saveAdjust = (item) =>{
   emitter.emit('onSaveAdjust', item.msg)
 }
 
-const modeType = ref('课标')
-watch(() => props.type, (newVal) => {
-  if (newVal == 1){
-    modeType.value = '课标'
-  }
-  if (newVal == 2){
-    modeType.value = '教材'
-  }
-  if (newVal == 2){
-    modeType.value = '考试'
-  }
-
-}, { immediate: false })
 
 const curFile = reactive({})
 const dataset_id = ref('')
@@ -160,11 +174,12 @@ const changeFile = (val) =>{
   params.document_ids = val.docId
 }
 
-
+const modeType = ref('')
 onMounted(() => {
   let data = sessionStore.get('subject.curNode')
-
   Object.assign(curNode, data);
+
+  modeType.value = props.type == 1 ? '课标' : props.type == 2 ? '教材' : '考试'
   let jsonKey = `${modeType.value}-${data.edustage}-${data.edusubject}`
   params.dataset_id = dataSetJson[jsonKey]
   if(props.type == 3){
diff --git a/src/renderer/src/components/template-study/container/right.vue b/src/renderer/src/components/template-study/container/right.vue
index b2fd574..2f4b93c 100644
--- a/src/renderer/src/components/template-study/container/right.vue
+++ b/src/renderer/src/components/template-study/container/right.vue
@@ -14,7 +14,10 @@
           </el-dropdown-menu>
         </template>
       </el-dropdown>
-      <div>
+      <div class="flex">
+        <el-select v-model="curMode" placeholder="Select" class="mr-4 w-30">
+          <el-option v-for="item in modeOptions" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
         <el-button type="danger" link :disabled="!(templateList.length)" @click="removeItem(curTemplate, false)">
           删除
         </el-button>
@@ -52,7 +55,8 @@
               <i class="iconfont icon-ai"></i>
             </div>
             <div class="item-answer">
-              <TypingEffect v-if="isStarted[index]" :text="item.answer" :delay="10" :aiShow="item.aiShow" @complete="handleCompleteText($event,index)" @updateScroll="scrollToBottom($event,index)" />
+              <TypingEffect v-if="isStarted[index]" :text="item.answer" :delay="10" :aiShow="item.aiShow"
+                @complete="handleCompleteText($event, index)" @updateScroll="scrollToBottom($event, index)" />
             </div>
           </div>
           <div class="ai-btn" v-if="item.answer">
@@ -77,7 +81,7 @@
   <!--编辑结果-->
   <EditDialog v-model="isEdit" :item="editItem" />
   <!--AI 对话调整-->
-  <AdjustDialog v-model="isAdjust" :type="type" :item="editItem" />
+  <AdjustDialog v-model="isAdjust" :type="type" :item="editItem" :curMode="curMode" :conversation_id="conversation_id"/>
   <!--添加、编辑提示词-->
   <keywordDialog v-model="isWordDialog" :item="editItem" />
 </template>
@@ -86,6 +90,7 @@
 import { ref, reactive, onMounted, onUnmounted, nextTick } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { tempSave, completion, modelList, removeChildTemp, tempResult, editTempResult } from '@/api/mode/index'
+import { createChart, sendChart } from '@/api/ai/index'
 import { sessionStore } from '@/utils/store'
 import keywordDialog from './keyword-dialog.vue';
 import AdjustDialog from './adjust-dialog.vue'
@@ -94,10 +99,23 @@ import TypingEffect from '@/components/typing-effect/index.vue'
 import useUserStore from '@/store/modules/user'
 import emitter from '@/utils/mitt';
 import { dataSetJson } from '@/utils/comm.js'
+import { cloneDeep } from 'lodash'
 
 const props = defineProps(['type'])
 const { user } = useUserStore()
 
+const curMode = ref(1)
+const modeOptions = ref([
+  {
+    label: '教学大模型',
+    value: 1
+  },
+  {
+    label: '知识库模型',
+    value: 2
+  }
+])
+
 /*****************提示词相关****************/
 
 /**
@@ -122,7 +140,7 @@ const editKeyWord = (item, val) => {
   Object.assign(editItem, item)
   editItem.isAdd = val
   isWordDialog.value = true
- 
+
 }
 
 /*******************模板相关**********************/
@@ -139,9 +157,9 @@ const curTemplate = reactive({ name: '', id: '' })
 const templateList = ref([])
 const childTempList = ref([])
 const getTemplateList = () => {
-  modelList({ createUser: user.userId, model: props.type, type: 1, pageNum: 1, pageSize: 10000, ex1: curNode.edustage, ex2: curNode.edusubject  }).then(res => {
+  modelList({ createUser: user.userId, model: props.type, type: 1, pageNum: 1, pageSize: 10000, ex1: curNode.edustage, ex2: curNode.edusubject }).then(res => {
     templateList.value = res.rows
-    if(res.rows.length > 0){
+    if (res.rows.length > 0) {
       Object.assign(curTemplate, res.rows[0]);
       getChildTemplate()
     }
@@ -151,7 +169,7 @@ const getChildTemplate = () => {
   tempLoading.value = true
   modelList({ model: props.type, type: 2, parentId: curTemplate.id, ex1: curNode.edustage, ex2: curNode.edusubject }).then(res => {
     childTempList.value = res.rows
-    if(childTempList.value.length){
+    if (childTempList.value.length) {
       childTempList.value.forEach(item => item.answer = '')
     }
     getTempResult()
@@ -173,28 +191,28 @@ const getTempResult = () => {
         }
       })
     })
-    if(rows.length > 0){
+    if (rows.length > 0) {
       isStarted.value = new Array(rows.length).fill(true)
     }
 
   })
 }
 
-const scrollToBottom = (height,index) =>{
+const scrollToBottom = (height, index) => {
 
   if (listRef.value) {
-    let sum = 0 
+    let sum = 0
     let listDom = listRef.value.children
-    
-    if(index == 0){
+
+    if (index == 0) {
       // 220 去掉头部 
-      let screenHeight  = window.innerHeight - 220
-      if(height > screenHeight){
+      let screenHeight = window.innerHeight - 220
+      if (height > screenHeight) {
         listRef.value.scrollTop = (height - screenHeight + 50)
       }
     }
-    else{
-      for(let i = 0; i < index; i++){
+    else {
+      for (let i = 0; i < index; i++) {
         sum += listDom[i].clientHeight
       }
       listRef.value.scrollTop = sum + height
@@ -252,7 +270,6 @@ const removeItem = async (item, isChild) => {
   }
 }
 
-
 // Ai对话调整
 const curIndex = ref(-1)
 const isAdjust = ref(false)
@@ -277,6 +294,7 @@ const params = reactive(
     dataset_id: ''
   }
 )
+const prompt = ref('')
 
 // 重新研读
 const isAgain = ref(false)
@@ -285,10 +303,10 @@ const againResult = async (index, item) => {
   isStarted.value[index] = false
   childTempList.value[index].answer = ''
 
-  if(index == 0){
+  if (index == 0) {
     listRef.value.scrollTop = 0
-   
-  }else{
+
+  } else {
     scrollToBottom(50, index)
   }
 
@@ -296,8 +314,28 @@ const againResult = async (index, item) => {
     await nextTick()
     childTempList.value[index].loading = true
     item.aiShow = true
-    params.prompt = `按照${item.prompt}的要求，针对${curNode.edustage}${curNode.edusubject}${modeType.value} 对${curNode.itemtitle}进行教学分析`
-    const { data } = await completion(params)
+
+    let str = cloneDeep(prompt.value)
+    str = str.replace('{模板标题}',item.name)
+    str = str.replace('{模板内容}',item.prompt)
+    params.prompt = str
+    params.template = item.prompt
+    
+    let data = null;
+    // 教学大模型
+    if (curMode.value == 1) {
+      const res = await sendChart({
+        content: params.prompt,
+        conversationId: conversation_id.value,
+        stream: false
+      })
+      data = res.data
+    } else {
+      // 知识库模型
+      const res = await completion(params)
+      data = res.data
+    }
+
     childTempList.value[index].answer = getResult(data.answer);
     isStarted.value[index] = true
 
@@ -305,13 +343,14 @@ const againResult = async (index, item) => {
     childTempList.value[index].loading = false
   }
 }
+
 // 一键研读
 const getCompletion = async () => {
   isStarted.value = new Array(childTempList.length).fill(false)
   isStarted.value[0] = true
 
-  childTempList.value.forEach(item =>{
-    if(item.answer){
+  childTempList.value.forEach(item => {
+    if (item.answer) {
       item.answer = ''
     }
   })
@@ -320,8 +359,27 @@ const getCompletion = async () => {
     try {
       item.loading = true
       item.aiShow = true
-      params.prompt = `按照${item.prompt}的要求，针对${curNode.edustage}${curNode.edusubject}${modeType.value} 对${curNode.itemtitle}进行教学分析`
-      const { data } = await completion(params)
+      let str = cloneDeep(prompt.value)
+      str = str.replace('{模板标题}',item.name)
+      str = str.replace('{模板内容}',item.prompt)
+      params.prompt = str
+      params.template = item.prompt
+      // 教学大模型
+      let data = null
+      if (curMode.value == 1) {
+        const res = await sendChart({
+          content: params.prompt,
+          conversationId: conversation_id.value,
+          stream: false
+        })
+        data = res.data
+      }
+      // 知识库模型
+      else {
+        const res = await completion(params)
+        data = res.data
+      }
+
       item.answer = getResult(data.answer)
       onSaveTemp(item)
     } finally {
@@ -330,14 +388,14 @@ const getCompletion = async () => {
   }
 }
 
-const handleCompleteText = async (answer, index) =>{
+const handleCompleteText = async (answer, index) => {
   if (index < childTempList.value.length - 1) {
     isStarted.value[index + 1] = true; // 开始显示下一个文本
   }
-  if(isAgain.value){
-    try{
+  if (isAgain.value) {
+    try {
       await editTempResult({ id: childTempList.value[index].resultId, content: answer })
-    }finally{
+    } finally {
       isAgain.value = false
     }
   }
@@ -386,6 +444,30 @@ emitter.on('onGetMain', () => {
 })
 
 
+// 创建对话
+const conversation_id = ref('')
+const getChartId = () => {
+  createChart({ app_id: '712ff0df-ed6b-470f-bf87-8cfbaf757be5' }).then(res => {
+    localStorage.setItem("conversation_id", res.data.conversation_id);
+    conversation_id.value = res.data.conversation_id;
+  })
+}
+
+// 查询prompt 替换
+const getPrompt = async () => {
+  const { rows } = await modelList({ model: 5 })
+  let str = rows.find(item => item.name.indexOf(modeType.value) != -1).prompt
+  str = str.replace('{学段}', curNode.edustage)
+  str = str.replace('{学科}', curNode.edusubject)
+  let bookV = curNode.roottitle.split('-')[1] + '版本'
+  str = str.replace('{教材版本}', bookV)
+  str = str.replace('{课程名称}', `《${curNode.itemtitle}》`)
+  if(modeType.value == '课标'){
+    str = str.replace('{课标名称}', `${curNode.edustage}${curNode.edusubject}课标`)
+  }
+  prompt.value = str
+}
+
 const curNode = reactive({})
 const modeType = ref('')
 onMounted(() => {
@@ -396,6 +478,15 @@ onMounted(() => {
   getTemplateList()
   let jsonKey = `${modeType.value}-${data.edustage}-${data.edusubject}`
   params.dataset_id = dataSetJson[jsonKey]
+  // 获取百度千帆会话ID
+  conversation_id.value = localStorage.getItem('conversation_id')
+  if (!conversation_id.value) {
+    getChartId();
+  }
+
+  // 获取prompt
+  getPrompt()
+
 })
 
 // 解绑
diff --git a/src/renderer/src/components/whiteboard/whiteboard.vue b/src/renderer/src/components/whiteboard/whiteboard.vue
index 88c9860..c6eb9a2 100644
--- a/src/renderer/src/components/whiteboard/whiteboard.vue
+++ b/src/renderer/src/components/whiteboard/whiteboard.vue
@@ -15,7 +15,7 @@
           </el-tooltip>
         </div>
         <div class="blockBox">
-          <el-button @click="currentType = 'selection'"><el-image src="../../../src/assets/images/mouse-pointer.png"
+          <el-button @click="currentType = 'selection'"><el-image :src="pointerImg"
               style="width: 14px; height: 14px; color: silver" /></el-button>
         </div>
         <template v-if="type == 'design'">
@@ -145,7 +145,7 @@
           <!-- 边框粗细 -->
           <div class="blockBox">
             <el-dropdown @command="updateStyle('lineWidth', $event)" placement="top">
-              <el-button><el-image src="../../../src/assets/images/borderwidth.png"
+              <el-button><el-image :src="borderImg"
                   style="width: 14px; height: 14px"></el-image></el-button>
               <template #dropdown>
                 <el-dropdown-menu>
@@ -303,6 +303,9 @@ import {
 import Contextmenu from './components/Contextmenu.vue'
 import { fontFamilyList, fontSizeList } from './constants'
 
+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 props = defineProps({
   modelValue: {
     type: Boolean,
diff --git a/src/renderer/src/plugins/socket/index.js b/src/renderer/src/plugins/socket/index.js
index 5e9870f..5d9cd6c 100644
--- a/src/renderer/src/plugins/socket/index.js
+++ b/src/renderer/src/plugins/socket/index.js
@@ -167,9 +167,6 @@ export class ChatWs {
     return new Promise((resolve, reject) => {
       this.sendMsg('closed', '下课', null, 'group', id)
       resolve()
-      // setTimeout(() => {
-      //   this.close() // 关闭链接
-      // }, 1000);
     })
   }
   // 延时 ms 毫秒
diff --git a/src/renderer/src/router/index.js b/src/renderer/src/router/index.js
index 8f982da..d8fdb1d 100644
--- a/src/renderer/src/router/index.js
+++ b/src/renderer/src/router/index.js
@@ -88,7 +88,7 @@ export const constantRoutes = [
         path: 'questionUpload',
         component: () => import('@/views/classTask/newClassTaskAssign/questionUpload/index.vue'),
         name: 'questionUpload',
-        meta: { title: '习题上传' }
+        meta: { title: '习题上传', showBread: true  }
       },
       {
         path: 'aiKolors',
diff --git a/src/renderer/src/store/modules/classTask.js b/src/renderer/src/store/modules/classTask.js
index c5f8b31..05a9491 100644
--- a/src/renderer/src/store/modules/classTask.js
+++ b/src/renderer/src/store/modules/classTask.js
@@ -5,6 +5,7 @@ import { JYApiListCT, JYApiListOriginYear, JYApiListSO} from "@/utils/examQuesti
 
 const useClassTaskStore = defineStore('classTask',{
   state: () => ({
+    isOpenQuestUploadView: false, // 是否打开习题上传的页面
     classListIds: [],
     entpCourseWorkTypeList: [
       {value: 0, label: "不限"},
diff --git a/src/renderer/src/utils/tool.js b/src/renderer/src/utils/tool.js
index c30db4e..1dbc2be 100644
--- a/src/renderer/src/utils/tool.js
+++ b/src/renderer/src/utils/tool.js
@@ -225,7 +225,7 @@ export const createWindow = async (type, data) => {
         .filter(k => typeof data[k] === 'function')
         .forEach(k => events[k] = data[k])
       eventHandles(type, win, events) // 事件监听处理
-      break
+      return win
     }
     default:
       break
diff --git a/src/renderer/src/views/classManage/reserv-item-apt.vue b/src/renderer/src/views/classManage/reserv-item-apt.vue
index 67fb1ec..320509b 100644
--- a/src/renderer/src/views/classManage/reserv-item-apt.vue
+++ b/src/renderer/src/views/classManage/reserv-item-apt.vue
@@ -23,7 +23,8 @@
     </div>
     <div class="class-reserv-item-tool" style="width: 50px;">
 <!--      <el-button v-if="item.status!='open'" size="small" type="danger" @click="deleteReserv">删除</el-button>-->
-      <el-tag>APT</el-tag>
+      <!-- <el-tag>APT</el-tag> -->
+      <el-tag>AIPPT</el-tag>
     </div>
     <div style="min-width: 150px;"><span> 浏览：25955 点赞：26605</span></div>
   </div>
@@ -85,6 +86,7 @@ const chatSend = () => {
 <style scoped lang="scss">
 .class-reserv-item {
   display: flex;
+  align-items: center;
   background-color: white;
   border-radius: 10px;
   padding: 5px;
@@ -110,7 +112,7 @@ const chatSend = () => {
     }
   }
   .class-reserv-item-tool {
-    margin-left: 15px;
+    margin: 0 7px;
     display: flex;
     align-items: center;
   }
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
index e8e9f7d..cf07db2 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
@@ -149,10 +149,14 @@ import { useGetHomework } from '@/hooks/useGetHomework'
 import { sessionStore } from '@/utils/store'
 import { useRouter, useRoute } from 'vue-router'
 import useUserStore from '@/store/modules/user'
+import useClassTaskStore from '@/store/modules/classTask'
+
 const userStore = useUserStore().user
 const route = useRoute();
 const router = useRouter()
 const { proxy } = getCurrentInstance()
+const useClassTaskStores = useClassTaskStore();
+
 const props = defineProps({
   currentCourse: Object,
 })
@@ -189,6 +193,7 @@ const boardLoading = ref(false);
 const fileLoading = ref(false); // 常规作业loading
 
 onMounted(() => {
+  console.log("----onMounted-------")
   currentRow.value = {id:0};
   if(propsQueryCourseObj){
     if(JSON.parse(propsQueryCourseObj)){
@@ -216,7 +221,28 @@ onMounted(() => {
     }
   }
   initHomeWork();
+  isInToMyQuestion(); // 如果是上传习题后返回的，跳转到个人题库
 })
+// 是否进入个人题库
+const isInToMyQuestion = () => {
+  console.log('isOpenQuestUploadView',useClassTaskStores.isOpenQuestUploadView);
+  if(useClassTaskStores.isOpenQuestUploadView){
+    useClassTaskStores.isOpenQuestUploadView = false;
+
+    currentRow.value = {id:1}; // 作业设计
+    activeAptTab.value = "个人题库";
+    //提交内容清空 重置
+    classWorkForm.id = 0;
+    classWorkForm.uniquekey = ""; // 作业唯一标识 作业名称
+    classWorkForm.worktype = "习题训练"; //作业类型
+    classWorkForm.title = ""; // 作业说明
+    classWorkForm.quizlist = [];  // 作业习题列表内容
+    classWorkForm.chooseWorkLists = [];  // 作业框架梳理list
+    classWorkForm.fileHomeworkList = [];  // 常规作业文件列表
+    classWorkForm.whiteboardObj = "";  // 作业资源 - 课堂展示 白板
+    classWorkForm.question = "";  // 作业资源 - 课堂展示 输入的问题
+  }
+}
 watch(() => props.currentCourse, (newVal, oldVal) => {
   if(newVal){
       courseObj.textbookId = newVal.textbookId  // 版本
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/index.vue
index 46b94b8..d2a40b2 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/index.vue
@@ -74,7 +74,7 @@
 <script setup>
 import "vue-cropper/dist/index.css";
 import { VueCropper } from "vue-cropper";
-import { onMounted, ref,watch, reactive, getCurrentInstance,nextTick } from 'vue'
+import { onMounted, ref,watch, reactive, getCurrentInstance,nextTick, onUnmounted } from 'vue'
 import { ElMessage } from 'element-plus'
 import { cloneDeep } from 'lodash'
 
@@ -88,6 +88,8 @@ import { useRouter, useRoute } from 'vue-router'
 
 import { ocrImg2ExamByManualUpl, ocrImg2ItemByManualUpl } from "@/views/classTask/newClassTaskAssign/questionUpload/ocrImg2ExamQues";
 import QuesItem from "@/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue";
+import useClassTaskStore from '@/store/modules/classTask'
+
 
 // const Remote = require('@electron/remote')
 // const fs = require('fs');
@@ -96,7 +98,9 @@ import useUserStore from '@/store/modules/user'
 const userStore = useUserStore().user
 const route = useRoute();
 const router = useRouter()
-const { proxy } = getCurrentInstance()
+const { proxy } = getCurrentInstance();
+const useClassTaskStores = useClassTaskStore();  
+
 const props = defineProps({
 })
 
@@ -151,6 +155,7 @@ const cropOption =  reactive({
 
 
 onMounted(() => {
+  useClassTaskStores.isOpenQuestUploadView = true; // 打开过习题上传界面
   console.log('propsQueryCourseObj', JSON.parse(propsQueryCourseObj));
   if(propsQueryCourseObj&&JSON.parse(propsQueryCourseObj)){
     courseObj.textbookId = JSON.parse(propsQueryCourseObj).bookObj  // 版本
@@ -161,7 +166,13 @@ onMounted(() => {
   }
   initHomeWork();
 })
-
+onUnmounted(()=>{
+  // 延迟1s 关闭习题上传界面，作业管理界面需要根据 isOpenQuestUploadView 来进行判断
+  setTimeout(()=>{
+    useClassTaskStores.isOpenQuestUploadView = false; // 关闭习题上传界面
+    console.log('onUnmounted 习题上传');
+  }, 1000)
+})
 
 /**
  * 获取 entpcourseid 获取作业列表
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/ocrImg2ExamQues.js b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/ocrImg2ExamQues.js
index 5e72245..b3a8c7a 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/ocrImg2ExamQues.js
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/ocrImg2ExamQues.js
@@ -1,6 +1,7 @@
 import { ElMessageBox, ElMessage } from "element-plus";
 import qs from "qs";
 import axios from 'axios'
+import request from '@/utils/request'
 import { pyOCRAPI } from "@/api/education/entpcoursework";
 
 
@@ -9,13 +10,20 @@ const baidubceConfig = {
   // Header
   'Content-Type': "application/x-www-form-urlencoded",
   // 格式
-  'Accept' : 'application/json',
+  'Accept': 'application/json',
   // id(临时测试)
   'client_id': "U0DrGBE6X92IXgV6cJMNON8F",
   // 密钥(临时测试)
   'client_secret': 'oWb0M0YWMmZPMQIhIUkJX99ddr7h61qf',
 };
 
+export function getOcrContent(data) {
+  return request({
+    url: '/ocr/exam',
+    method: 'post',
+    data: data
+  })
+}
 
 
 /**
@@ -34,8 +42,8 @@ export const ocrImg2ItemByManualUpl = async (isLocalTest = false, imgBase64 = ''
   let regex = null;
   // 识别内容拼接
   let ocrTxt = ''
-  
-  if(isLocalTest) {
+
+  if (isLocalTest) {
     // 临时本地测试（json格式跟百度ocr一致）
     const response = await fetch('/cropImgTest/single.json');
     const resOcr = await response.json();
@@ -59,7 +67,7 @@ export const ocrImg2ItemByManualUpl = async (isLocalTest = false, imgBase64 = ''
   }
   else {
     const tmp = await ocrImg2Json(imgBase64);
-    if(!tmp?.data) {
+    if (!tmp?.data) {
       return examItem;
     }
     ocrJson = tmp.data.results;
@@ -69,12 +77,12 @@ export const ocrImg2ItemByManualUpl = async (isLocalTest = false, imgBase64 = ''
     });
   }
 
-  if(ocrJson == '') {
+  if (ocrJson == '') {
     ElMessage.error('[人工录入-单项]识别的图片为空, 识别失败, 请检查重试!');
     return examItem;
   }
 
-  if(ocrTxt == '') {
+  if (ocrTxt == '') {
     ElMessage.error('[人工录入-单项]识别内容拼接失败, 请检查重试!');
     return examItem;
   }
@@ -87,7 +95,7 @@ export const ocrImg2ItemByManualUpl = async (isLocalTest = false, imgBase64 = ''
     ocrTxt = ocrTxt.replace(regex, '').replace(/<br \/>/g, '');
     examItem = ocrTxt;
   }
-  else if (curItem === 'workdesc') {      
+  else if (curItem === 'workdesc') {
     // 该类型下无需[判断题]和[主观题]处理   
     if (examType.includes('复合题')) {
       // 因[题目+选项]分离正则匹配需要, 故需开头手动拼一个<br />
@@ -96,13 +104,13 @@ export const ocrImg2ItemByManualUpl = async (isLocalTest = false, imgBase64 = ''
         worktype: '单选题',
         params: [],
       }
-      mutiParams.arrWorkDesc.forEach( item => {
+      mutiParams.arrWorkDesc.forEach(item => {
         const obj = {
           title: item.title,
           workanswer: '',
           checkAnswer: [],
           type: item.type,
-          options: item.options.map(element => {return {text: element.replace(/<br \/>/g, '')}}),
+          options: item.options.map(element => { return { text: element.replace(/<br \/>/g, '') } }),
         }
         examItem.params.push(obj);
       });
@@ -114,7 +122,7 @@ export const ocrImg2ItemByManualUpl = async (isLocalTest = false, imgBase64 = ''
       // 先判断是否存在选项标识, 且存在2个及以上(A.---1.---(1)---（1）)
       regex = /\s*[A-H][.．。]/g;
       const matches = ocrTxt.match(regex);
-      if (matches==null || matches.length < 2){
+      if (matches == null || matches.length < 2) {
         ElMessage.error('[人工录入-单项]识别[选项]失败, 请检查重试!');
         return examItem;
       }
@@ -138,7 +146,7 @@ export const ocrImg2ItemByManualUpl = async (isLocalTest = false, imgBase64 = ''
       examItem.push(obj);
       return examItem;
     }
-    
+
   }
   else if (curItem === 'workanswer') {
     // 该类型下只做[主观题]和[复合题]的处理
@@ -163,8 +171,8 @@ export const ocrImg2ExamByManualUpl = async (isLocalTest = false, imgBase64 = ''
   let ocrJson = '';
   // 识别内容拼接
   let ocrTxt = '';
-  
-  if(isLocalTest) {
+
+  if (isLocalTest) {
     // 临时本地测试（json格式跟百度ocr一致）
     const response = await fetch('/cropImgTest/single.json');
     const resOcr = await response.json();
@@ -173,7 +181,7 @@ export const ocrImg2ExamByManualUpl = async (isLocalTest = false, imgBase64 = ''
     ocrJson.forEach(ele => {
       ocrTxt += `${ele.words.word}<br />`;
     });
-    
+
     //-------------------------------------------------------------- 
     // 备用ocr识别服务 （python的一个识别服务）
     // const response = await ocrImgPyJson(imgBase64);
@@ -186,7 +194,7 @@ export const ocrImg2ExamByManualUpl = async (isLocalTest = false, imgBase64 = ''
     // });
   } else {
     const tmp = await ocrImg2Json(imgBase64);
-    if(!tmp?.data) {
+    if (!tmp?.data) {
       return examQues;
     }
     ocrJson = tmp.data.results;
@@ -195,20 +203,20 @@ export const ocrImg2ExamByManualUpl = async (isLocalTest = false, imgBase64 = ''
     });
   }
 
-  if(ocrJson == '') {
+  if (ocrJson == '') {
     ElMessage.error('[人工录入-整题]图片识别内容为空, 识别失败, 请重试!');
     return examQues;
   }
-  
 
-  if(ocrTxt == '') {
+
+  if (ocrTxt == '') {
     ElMessage.error('[人工录入-整题]识别内容拼接失败, 请重试!');
     return examQues;
   }
 
   // 识别内容转为试题结构
   examQues = assembleExam(ocrTxt);
-  if(examQues.err != '') {
+  if (examQues.err != '') {
     ElMessage.error(`[人工录入-整题]${examQues.err}, 请重试!`);
     examQues = {};
   }
@@ -226,30 +234,36 @@ const ocrImg2Json = async (urlBase64) => {
     ElMessage.error("未检测到截图图片, 请截取图片后再识别");
     return null;
   }
-  const resToken = await bdyAPI_getToken();
-  if (resToken.status !== 200) {
-    ElMessage.error("百度智能云用户标识有误");
-    return null;
-  }
-
-  const token = resToken.data?.access_token;
   let base64Code = urlBase64.split(",")[1];
-  const query = {
-    image: base64Code,                                      //图片地址(base64)
-    line_probability: false,                            //是否返回每行识别结果的置信度。默认为false
-    disp_line_poly: false,                              //是否返回每行的四角点坐标。默认为false
-    words_type: 'handprint_mix',                        //文字类型。 默认：印刷文字识别 = handwring_only：手写文字识别 = handprint_mix： 手写印刷混排识别
-    layout_analysis: false,                             //是否分析文档版面：包括layout（图、表、标题、段落、目录）；attribute（栏、页眉、页脚、页码、脚注）的分析输出
-    recg_long_division: false,                          //是否检测并识别手写竖式
-    recg_formula: true,                                 //控制是否检测并识别公式，默认为false
-  }
-
-
-  const resOcr = await bdyAPI_getOcrContent(token, base64Code, query);
-  if (resOcr.status !== 200) {
-    ElMessage.error("百度智能云图片识别错误");
+  const resOcr = await getOcrContent({ base64Code: base64Code });
+  if (resOcr.code !== 200) {
+    ElMessage.error("图片识别错误");
     return null;
   }
+  // const resToken = await bdyAPI_getToken();
+  // if (resToken.status !== 200) {
+  //   ElMessage.error("百度智能云用户标识有误");
+  //   return null;
+  // }
+
+  // const token = resToken.data?.access_token;
+  // let base64Code = urlBase64.split(",")[1];
+  // const query = {
+  //   image: base64Code,                                      //图片地址(base64)
+  //   line_probability: false,                            //是否返回每行识别结果的置信度。默认为false
+  //   disp_line_poly: false,                              //是否返回每行的四角点坐标。默认为false
+  //   words_type: 'handprint_mix',                        //文字类型。 默认：印刷文字识别 = handwring_only：手写文字识别 = handprint_mix： 手写印刷混排识别
+  //   layout_analysis: false,                             //是否分析文档版面：包括layout（图、表、标题、段落、目录）；attribute（栏、页眉、页脚、页码、脚注）的分析输出
+  //   recg_long_division: false,                          //是否检测并识别手写竖式
+  //   recg_formula: true,                                 //控制是否检测并识别公式，默认为false
+  // }
+
+
+  // const resOcr = await bdyAPI_getOcrContent(token, base64Code, query);
+  // if (resOcr.status !== 200) {
+  //   ElMessage.error("百度智能云图片识别错误");
+  //   return null;
+  // }
 
   return resOcr;
 }
@@ -264,7 +278,7 @@ const ocrImgPyJson = async (urlBase64) => {
     ElMessage.error("未检测到截图图片, 请截取图片后再识别");
     return null;
   }
-  
+
   const resOcr = await pyOCRAPI(urlBase64);
   if (resOcr.status !== 200) {
     ElMessage.error("图片识别错误");
@@ -351,7 +365,7 @@ const assembleExam = (eachSub) => {
 
   let regex = null;
   let titleAndWorkDesc = '',
-      answer = '';
+    answer = '';
 
 
   // 获取[题源] - 格式化
@@ -361,7 +375,7 @@ const assembleExam = (eachSub) => {
     subObj.worktag = workTag[0].replace(/^\d*[.．。]/g, '');
     subObj.worktag = subObj.worktag.replace('(', '（').replace(')', '）');
   }
-  
+
   // 去掉开头的序号和题源
   eachSub = eachSub.replace(regex, '');
   // 先判断是否存在答案
@@ -370,7 +384,7 @@ const assembleExam = (eachSub) => {
   if (!hasAnswer) {
     // 不存在答案, 仅处理[题干+选项]
     titleAndWorkDesc = eachSub;
-  }else {
+  } else {
     // 存在答案, 需处理[题干+选项]和[答案+解析]
     regex = /(<br \/>?\s*[【\[].*?[】\]])/g;
     let tmpList = eachSub.split(regex);
@@ -386,10 +400,10 @@ const assembleExam = (eachSub) => {
     // 第二部分[分析-答案] 处理
     let answerAndAnswer = {};
     // 将第二部分的内容做key-value绑定 - 键为【分析】、【讨论】、【方法】等. 值为随之分隔的内容
-    for (let i=1; i<tmpList.length-1; i=i+2){
+    for (let i = 1; i < tmpList.length - 1; i = i + 2) {
       let key = tmpList[i];
       key = key.replace(/<br \/>|【|】|\[|\]/g, '');
-      let value = tmpList[i+1];
+      let value = tmpList[i + 1];
       value = value.replace(/^<br \/>+|<br \/>+$/g, '');
       answerAndAnswer[key] = value;
     }
@@ -430,12 +444,12 @@ const assembleExam = (eachSub) => {
 
     // [答案] - 初步初始化 --- 根据答案判断试题大分类:   复合题(实际为大题) 或 其他基础题型(单选,多选,填空,判断)
     answer = answerAndAnswer['答案'].trim();
-    if(!answer) {
+    if (!answer) {
       answer = answerAndAnswer['答案及评分参考'].trim();
       answer = answer.replace(/^\d+[\u4e00-\u9fa5][.．。]\s*<br \/>/, '');    // 去掉 - 有些开头会有[xx分。]
     }
     // 将多余的空格替换为固定的4个空格
-    answer = answer.replaceAll("\\s{3,}","    ");
+    answer = answer.replaceAll("\\s{3,}", "    ");
     if (answer == null | answer == '') {
       subObj.err = '题目缺少[答案]';
       return subObj;
@@ -455,7 +469,7 @@ const assembleExam = (eachSub) => {
     let answerFind = regex.test(answer);
     regex = /(\d+[.．。]|\(\d+\)|（\d+）)/;
     let titleFind = regex.test(titleAndWorkDesc);
-    if(titleFind && answerFind){
+    if (titleFind && answerFind) {
       /** 
        * [复合题] - 处理逻辑 
        */
@@ -471,7 +485,7 @@ const assembleExam = (eachSub) => {
 
   if (tmpExam) {
     // 错误信息
-    if(tmpExam.errMsg !== '') {
+    if (tmpExam.errMsg !== '') {
       subObj.err = tmpExam.err;
       return subObj;
     }
@@ -484,7 +498,7 @@ const assembleExam = (eachSub) => {
       subObj.workanswer = JSON.stringify(tmpExam.arrWorkAnswer);
     }
   }
-  
+
   return subObj;
 }
 
@@ -508,7 +522,7 @@ const processExamSingle = function (titleAndWorkDesc, answer) {
   let matcher = null;
 
   /** [判断题]的处理逻辑, resp: -1-未找到  0-*为对应匹配的index */
-  let judgedStatus = answer!=='' ? containsExactMatch(answer) : -1;
+  let judgedStatus = answer !== '' ? containsExactMatch(answer) : -1;
 
   /** 其他基础题型(单选,多选,填空,判断)的处理逻辑 */
   // 先去掉开头的试题序号
@@ -524,7 +538,7 @@ const processExamSingle = function (titleAndWorkDesc, answer) {
     answer = answer.replace("<br />", "").trim();
 
     // [题型] - 格式化 - 根据答案字符个数区分[单选]或[多选]
-    examSingle.workType = answer==='' ? '单选题' : answer.length == 1 ? "单选题" : "多选题";
+    examSingle.workType = answer === '' ? '单选题' : answer.length == 1 ? "单选题" : "多选题";
 
     // 切分题干+选项
     regex = /<br \/>*\s*[A-H][.．。]/g;
@@ -535,12 +549,12 @@ const processExamSingle = function (titleAndWorkDesc, answer) {
 
     // [选项]-处理 --- ['ABC123','ABC123']
     for (let i = 1; i < tmpSplit.length; i++) {
-        let option = tmpSplit[i].replace("<br />", "").trim();
-        //option = option.replace("_", "");
-        // [选项] - 格式化
-        examSingle.arrWorkDesc.push(option);
+      let option = tmpSplit[i].replace("<br />", "").trim();
+      //option = option.replace("_", "");
+      // [选项] - 格式化
+      examSingle.arrWorkDesc.push(option);
     }
-    
+
     // [题目答案] --- ['0'] | ['0','1']
     if (answer !== '') {
       // 答案为空时, 置空后直接返回
@@ -570,7 +584,7 @@ const processExamSingle = function (titleAndWorkDesc, answer) {
       examSingle.arrWorkAnswer = answer.split("    ");
     }
   }
-  else if( judgedStatus != -1 ) {
+  else if (judgedStatus != -1) {
     /**
      * 判断题
      */
@@ -635,48 +649,48 @@ const processExamMulti = function (titleAndWorkDesc, answer) {
   // 先确定当前是以什么形式的小题序号来切分 --- 需要全部独立判断, 避免出现复合题中, 每小题内还包含小题的情况--- 1.回答以下问题 (1)***** (2)******
   let cliceSucc = false;
   let arrAnswer = []
-  if(!cliceSucc){
+  if (!cliceSucc) {
     regex = /<br \/>\s*\d+[.．。]\s*/;
     if (regex.test(titleAndWorkDesc)) {
       // 再次以答案中的序号同步匹配一次
       regex = /^\s*\d+[.．。]\s*/;
-      if(answer === '' || regex.test(answer)){
-          regex = /<br \/>\s*\d+[.．。]\s*/g;
-          tmpSplit = titleAndWorkDesc.split(regex);
-          if (answer !== '') {
-            // 存在答案时, 再校验
-            regex = /^\s*\d+[.．。]\s*|<br \/>\s*\d+[.．。]\s*|\s+\d+[.．。]\s*/g;
-            arrAnswer = answer.split(regex);
-          }
+      if (answer === '' || regex.test(answer)) {
+        regex = /<br \/>\s*\d+[.．。]\s*/g;
+        tmpSplit = titleAndWorkDesc.split(regex);
+        if (answer !== '') {
+          // 存在答案时, 再校验
+          regex = /^\s*\d+[.．。]\s*|<br \/>\s*\d+[.．。]\s*|\s+\d+[.．。]\s*/g;
+          arrAnswer = answer.split(regex);
+        }
 
-          cliceSucc = true;
+        cliceSucc = true;
       }
     }
   }
-  if (!cliceSucc){
+  if (!cliceSucc) {
     regex = /<br \/>\s*（\d+）\s*/;
     if (regex.test(titleAndWorkDesc)) {
       // 再次以答案中的序号同步匹配一次
       regex = /\s*（\d+）\s*/;
-      if(answer === '' || regex.test(answer)){
-          regex = /<br \/>\s*（\d+）\s*/g;
-          tmpSplit = titleAndWorkDesc.split(regex);
-          if (answer !== '') {
-            // 存在答案时, 再校验
-            regex = /^\s*（\d+）\s*|<br \/>\s*（\d+）\s*|\s+（\d+）\s*/g;
-            arrAnswer = answer.split(regex);
-          }
+      if (answer === '' || regex.test(answer)) {
+        regex = /<br \/>\s*（\d+）\s*/g;
+        tmpSplit = titleAndWorkDesc.split(regex);
+        if (answer !== '') {
+          // 存在答案时, 再校验
+          regex = /^\s*（\d+）\s*|<br \/>\s*（\d+）\s*|\s+（\d+）\s*/g;
+          arrAnswer = answer.split(regex);
+        }
 
-          cliceSucc = true;
+        cliceSucc = true;
       }
     }
   }
-  if (!cliceSucc){
+  if (!cliceSucc) {
     regex = /<br \/>\s*\(\d+\)\s*/;
     if (regex.test(titleAndWorkDesc)) {
       // 再次以答案中的序号同步匹配一次
       regex = /^\s*\(\d+\)\s*/;
-      if(answer === '' || regex.test(answer)){
+      if (answer === '' || regex.test(answer)) {
         regex = /<br \/>\s*\(\d+\)\s*/g;
         tmpSplit = titleAndWorkDesc.split(regex);
         if (answer !== '') {
@@ -689,19 +703,19 @@ const processExamMulti = function (titleAndWorkDesc, answer) {
       }
     }
   }
-  if (!cliceSucc){
+  if (!cliceSucc) {
     examMulti.errMsg = '[复合题]小题与答案序号[不匹配]';
     return examMulti;
   }
-  if (tmpSplit.length < 2){
+  if (tmpSplit.length < 2) {
     examMulti.errMsg = '[复合题]题干与小题[切分失败]';
     return examMulti;
   }
-  if (answer !== '' && arrAnswer.length < 2){
+  if (answer !== '' && arrAnswer.length < 2) {
     examMulti.errMsg = '[复合题]答案切分小题失败';
     return examMulti;
   }
-  if (answer !== ''  && tmpSplit.length != arrAnswer.length){
+  if (answer !== '' && tmpSplit.length != arrAnswer.length) {
     examMulti.errMsg = '[复合题]小题个数与答案个数[不一致]';
     return examMulti;
   }
@@ -710,13 +724,13 @@ const processExamMulti = function (titleAndWorkDesc, answer) {
   examMulti.title = tmpSplit[0].trim();
 
   // [选项]+[答案] - 逻辑处理
-  for (let i=1; i<tmpSplit.length; i++){
+  for (let i = 1; i < tmpSplit.length; i++) {
     const tmp = tmpSplit[i].trim();
     // 因arrAnswer[0]对应为分隔出来的首位空数组, 故这里也可直接使用i=1作为下标获取答案
     const tmpAnswer = answer === '' ? '' : arrAnswer[i].trim();
     // 单题处理
     const tmpExam = processExamSingle(tmp, tmpAnswer);
-    if(tmpExam.errMsg !== ''){
+    if (tmpExam.errMsg !== '') {
       examMulti.errMsg = '[复合题]小题解析失败';
       return examMulti;
     }
@@ -768,10 +782,10 @@ const containsExactMatch = function (answer) {
   answer = answer.replace("_____", "");
   let index = 0;
   for (let item of EXAM_JUDGED_DICTIONARY) {
-      if (answer === item) {
-          return index;
-      }
-      index++;
+    if (answer === item) {
+      return index;
+    }
+    index++;
   }
   return -1;
 }
\ No newline at end of file
diff --git a/src/renderer/src/views/classTask/teachClassTask.vue b/src/renderer/src/views/classTask/teachClassTask.vue
index 3db91ae..83b5ec9 100644
--- a/src/renderer/src/views/classTask/teachClassTask.vue
+++ b/src/renderer/src/views/classTask/teachClassTask.vue
@@ -163,8 +163,10 @@ import quizStats from '@/views/classTask/container/quizStats.vue'
 import ClassOverview from '@/views/classTask/container/classOverview.vue'
 import {sessionStore} from '@/utils/store'
 // import Chat from '@/utils/chat' // im 登录初始化
+import { Homework } from '@/AixPPTist/src/api/index'
 import MsgEnum from '@/plugins/imChat/msgEnum'  // im 消息枚举
 import ChatWs from '@/plugins/socket' // 聊天socket
+import { set } from 'lodash'
 if (!ChatWs.ws) ChatWs.init()
 const { proxy } = getCurrentInstance()
 const emit = defineEmits(['cle-click'])
@@ -719,14 +721,17 @@ const msgHandle = (msg) => {
     const { head, content, ...other } = msg
     switch(head) {
       case MsgEnum.HEADS.MSG_closed: // 下课:
+          Homework.win = null
           window.close() // 关闭窗口
       break 
       case MsgEnum.HEADS.MSG_finishHomework: // 跟新作业:
+        console.log('更新作业', head, content)
         const data = JSON.parse(localStorage.getItem('teachClassWorkItem'));
         openDialog(data, false);
       break
       case MsgEnum.HEADS.MSG_slideFlapping: // 切换页面
         console.log('切换页面-关闭窗口')
+        Homework.win = null
         window.close() // 关闭窗口
       break
       // case 'TIMAddRecvNewMsgCallback': // 收到新消息 data=[]
@@ -769,7 +774,7 @@ onMounted(() => {
       console.log('socket监听消息')
       ChatWs.watch((msg, e) => {
         try {
-          msgHandle(JSON.parse(msg))
+          msgHandle(JSON.parse(msg)?.msg)
         } catch (error) {
           console.error('socket 解析异常 ', error, e)
           msgHandle(msg)
diff --git a/src/renderer/src/views/teachingDesign/container/adjust-dialog.vue b/src/renderer/src/views/teachingDesign/container/adjust-dialog.vue
index fd887a2..a58bbd8 100644
--- a/src/renderer/src/views/teachingDesign/container/adjust-dialog.vue
+++ b/src/renderer/src/views/teachingDesign/container/adjust-dialog.vue
@@ -42,9 +42,10 @@
 <script setup>
 import { ref, reactive, onMounted } from 'vue'
 import { completion } from '@/api/mode/index'
+import { dataSetJson } from '@/utils/comm.js'
 import emitter from '@/utils/mitt';
 import { sessionStore } from '@/utils/store'
-import { ElMessage } from 'element-plus'
+import { sendChart } from '@/api/ai/index'
 
 const textarea = ref('')
 
@@ -56,6 +57,14 @@ const props = defineProps({
     default: () => {
       return { name: '11' }
     }
+  },
+  curMode:{
+    type: Number,
+    default: 1
+  },
+  conversation_id: {
+    type: [Number, String],
+    default: ''
   }
 })
 
@@ -77,13 +86,36 @@ const send = () => {
 }
 const curNode = reactive({})
 
-// 获取会话ID
+const params = reactive(
+  {
+    prompt: '',
+    dataset_id: '',
+    template: ''
+  }
+)
+
+// 大模型对话
 const getConversation = async (val) => {
   try {
-    const { data } = await completion({
-      dataset_id: 'cee3062a9fcf11efa6910242ac140006',
-      prompt: val
-    })
+    params.prompt = `按照${val}的要求，针对${curNode.edustage}${curNode.edusubject}课标，对${curNode.itemtitle}进行教学分析`
+    params.template = props.item.prompt
+    
+    let data = null;
+    // 教学大模型
+    if(props.curMode == 1){
+      const res = await sendChart({
+        content: params.prompt,
+        conversationId: props.conversation_id,
+        stream: false
+      })
+      data = res.data
+    }
+    else{
+      // 知识库模型
+      const res = await completion(params)
+      data = res.data
+    }
+    
     msgList.value.push({
       type: 'robot',
       msg: data.answer,
@@ -94,15 +126,16 @@ const getConversation = async (val) => {
 }
 
 const saveAdjust = (item) => {
-  // emit('saveAdjust', item.msg)
-  emitter.emit('changeAdjust', item.msg)
   isDialog.value = false
-  ElMessage.success('操作成功')
+  emitter.emit('onSaveAdjust', item.msg)
 }
 
 onMounted(() => {
   let data = sessionStore.get('subject.curNode')
   Object.assign(curNode, data);
+  // 框架设计 用课标的dataset_id
+  let jsonKey = `课标-${data.edustage}-${data.edusubject}`
+  params.dataset_id = dataSetJson[jsonKey]
 
 })
 
diff --git a/src/renderer/src/views/teachingDesign/container/right.vue b/src/renderer/src/views/teachingDesign/container/right.vue
index d757d60..c69a22b 100644
--- a/src/renderer/src/views/teachingDesign/container/right.vue
+++ b/src/renderer/src/views/teachingDesign/container/right.vue
@@ -2,14 +2,17 @@
   <div class="container-right flex">
     <div class="right-header flex">
       <div class="header-left">
-        <el-button type="primary" link>
+        <!-- <el-button type="primary" link>
           <i class="iconfont icon-jiahao"></i>新活动
         </el-button>
         <el-button type="primary" link>
           <i class="iconfont icon-baocun"></i>保存为教学模式
-        </el-button>
+        </el-button> -->
       </div>
       <div class="header-right">
+        <el-select v-model="curMode" placeholder="Select" class="mr-4 w-30">
+          <el-option v-for="item in modeOptions" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
         <el-button type="primary" :disabled="!(resultList.length)" @click="getCompletion">一键研读</el-button>
         <el-button type="primary">生成大纲</el-button>
         <el-button type="danger" @click="pptDialog = true">生成PPT</el-button>
@@ -21,21 +24,22 @@
         <div class="item-top flex">
           <span>{{ item.name }}</span>
           <el-popover placement="bottom-end" trigger="hover" popper-class="template-custom-popover">
-              <template #reference>
-                <el-button link type="primary">
-                  <i class="iconfont icon-shenglvehao"></i></el-button>
-              </template>
-              <template #default>
-                <el-button type="primary" link @click="editKeyWord(item, false)">编辑</el-button>
-                <el-button type="primary" link @click="removeItem(item, true)">移除</el-button>
-              </template>
-            </el-popover>
+            <template #reference>
+              <el-button link type="primary">
+                <i class="iconfont icon-shenglvehao"></i></el-button>
+            </template>
+            <template #default>
+              <el-button type="primary" link @click="editKeyWord(item, false)">编辑</el-button>
+              <el-button type="primary" link @click="removeItem(item, true)">移除</el-button>
+            </template>
+          </el-popover>
         </div>
         <div class="item-bom">
           <div class="item-prompt">{{ item.prompt }}</div>
           <div class="item-answer" v-if="item.answer">
             <div class="answer-text">
-              <TypingEffect v-if="isStarted[index]" :text="item.answer" :delay="10" :aiShow="item.aiShow" @complete="handleCompleteText($event,index)" @updateScroll="scrollToBottom($event,index)" />
+              <TypingEffect v-if="isStarted[index]" :text="item.answer" :delay="10" :aiShow="item.aiShow"
+                @complete="handleCompleteText($event, index)" @updateScroll="scrollToBottom($event, index)" />
             </div>
             <div class="item-btn flex">
               <el-button type="primary" link @click="againResult(index, item)">
@@ -58,11 +62,11 @@
     </div>
   </div>
   <EditDialog v-model="isEdit" :item="curItem" />
-  <AdjustDialog v-model="isAdjust" :item="curItem" />
-  <PptDialog @add-success="addAiPPT" :dataList="resultList" v-model="pptDialog"/>
+  <AdjustDialog v-model="isAdjust" :item="curItem" :curMode="curMode" :conversation_id="conversation_id" />
+  <PptDialog @add-success="addAiPPT" :dataList="resultList" v-model="pptDialog" />
   <progress-dialog v-model:visible="pgDialog.visible" v-bind="pgDialog" />
-    <!--添加、编辑提示词-->
-    <keywordDialog v-model="isWordDialog" :item="curItem" />
+  <!--添加、编辑提示词-->
+  <keywordDialog v-model="isWordDialog" :item="curItem" />
 </template>
 
 <script setup>
@@ -73,15 +77,17 @@ import emitter from '@/utils/mitt'
 import EditDialog from './edit-dialog.vue'
 import AdjustDialog from './adjust-dialog.vue'
 import progressDialog from './progress-dialog.vue'
-import { completion, tempResult, tempSave, removeChildTemp, editTempResult } from '@/api/mode/index.js'
+import { completion, tempResult, tempSave, removeChildTemp, editTempResult, modelList } from '@/api/mode/index.js'
+import { createChart, sendChart } from '@/api/ai/index'
 // import { dataSetJson } from '@/utils/comm.js'
 import * as commUtils from '@/utils/comm.js'
 import PptDialog from '@/views/prepare/container/pptist-dialog.vue'
 import keywordDialog from './keyword-dialog.vue'
 import TypingEffect from '@/components/typing-effect/index.vue'
+import { cloneDeep } from 'lodash'
 
 import useUserStore from '@/store/modules/user'
-import {PPTXFileToJson} from '@/AixPPTist/src/hooks/useImport' // ppt转json
+import { PPTXFileToJson } from '@/AixPPTist/src/hooks/useImport' // ppt转json
 import * as API_entpcourse from '@/api/education/entpcourse' // 相关api
 import * as API_entpcoursefile from '@/api/education/entpcoursefile' // 相关api
 import * as Api_server from '@/api/apiService' // 相关api
@@ -100,7 +106,7 @@ const pgDialog = reactive({ // 弹窗-进度条
   width: 300,
   showClose: false,
   draggable: true,
-  beforeClose: done => {}, // 阻止-弹窗事件
+  beforeClose: done => { }, // 阻止-弹窗事件
   pg: { // 进度条-参数
     percentage: 0, // 百分比
     color: [
@@ -110,6 +116,19 @@ const pgDialog = reactive({ // 弹窗-进度条
     ]
   }
 })
+
+const curMode = ref(1)
+const modeOptions = ref([
+  {
+    label: '教学大模型',
+    value: 1
+  },
+  {
+    label: '知识库模型',
+    value: 2
+  }
+])
+
 emitter.on('changeMode', (item) => {
   resultList.value = item.child
   getTempResult(item.id)
@@ -121,8 +140,8 @@ const getCompletion = async () => {
   isStarted.value = new Array(resultList.length).fill(false)
   isStarted.value[0] = true
 
-  resultList.value.forEach(item =>{
-    if(item.answer){
+  resultList.value.forEach(item => {
+    if (item.answer) {
       item.answer = ''
     }
   })
@@ -131,8 +150,28 @@ const getCompletion = async () => {
     try {
       item.loading = true
       item.aiShow = true
-      params.prompt = `按照${item.prompt}的要求，针对${curNode.edustage}${curNode.edusubject} 对${curNode.itemtitle}进行教学分析`
-      const { data } = await completion(params)
+
+      let str = cloneDeep(prompt.value)
+      str = str.replace(/{模板名称}/g, item.name)
+      params.prompt = str
+      params.template = item.prompt
+
+      // 教学大模型
+      let data = null
+      if (curMode.value == 1) {
+        const res = await sendChart({
+          content: params.prompt,
+          conversationId: conversation_id.value,
+          stream: false
+        })
+        data = res.data
+      }
+      // 知识库模型
+      else {
+        const res = await completion(params)
+        data = res.data
+      }
+
       item.answer = getResult(data.answer)
       onSaveTemp(item)
     } finally {
@@ -141,14 +180,14 @@ const getCompletion = async () => {
   }
 }
 
-const handleCompleteText = async (answer, index) =>{
+const handleCompleteText = async (answer, index) => {
   if (index < resultList.value.length - 1) {
     isStarted.value[index + 1] = true; // 开始显示下一个文本
   }
-  if(isAgain.value){
-    try{
+  if (isAgain.value) {
+    try {
       await editTempResult({ id: resultList.value[index].resultId, content: answer })
-    }finally{
+    } finally {
       isAgain.value = false
     }
   }
@@ -176,7 +215,7 @@ const editKeyWord = (item, val) => {
   Object.assign(curItem, item)
   curItem.isAdd = val
   isWordDialog.value = true
- 
+
 }
 
 
@@ -230,30 +269,30 @@ const getTempResult = (id) => {
         })
       })
     }
-    
+
   })
 }
 
-const scrollToBottom = (height,index) =>{
+const scrollToBottom = (height, index) => {
 
-if (listRef.value) {
-  let sum = 0 
-  let listDom = listRef.value.children
-  
-  if(index == 0){
-    // 220 去掉头部 
-    let screenHeight  = window.innerHeight - 220
-    if(height > screenHeight){
-      listRef.value.scrollTop = (height - screenHeight + 50)
+  if (listRef.value) {
+    let sum = 0
+    let listDom = listRef.value.children
+
+    if (index == 0) {
+      // 220 去掉头部 
+      let screenHeight = window.innerHeight - 220
+      if (height > screenHeight) {
+        listRef.value.scrollTop = (height - screenHeight + 50)
+      }
+    }
+    else {
+      for (let i = 0; i < index; i++) {
+        sum += listDom[i].clientHeight
+      }
+      listRef.value.scrollTop = sum + height
     }
   }
-  else{
-    for(let i = 0; i < index; i++){
-      sum += listDom[i].clientHeight
-    }
-    listRef.value.scrollTop = sum + height
-  }
-}
 }
 
 // 去掉字符串中的 ### **
@@ -265,11 +304,14 @@ let getResult = (str) => {
 const params = reactive(
   {
     prompt: '',
-    dataset_id: ''
+    dataset_id: '',
+    template: ''
   }
 )
+const prompt = ref('')
 
-const addAiPPT = async(res) => {
+
+const addAiPPT = async (res) => {
   let node = courseObj.node
   pptDialog.value = false;
   if (!node) return msgUtils.msgWarning('请选择章节?')
@@ -284,14 +326,14 @@ const addAiPPT = async(res) => {
   } else courseObj.entp = resEnpt?.rows?.[0] || null
   // 下载PPT 并解析json转换到我们自己数据库
   fetch(res.url)
-   .then(res => res.arrayBuffer())
-   .then(async buffer => {
+    .then(res => res.arrayBuffer())
+    .then(async buffer => {
       const resPptJson = await PPTXFileToJson(buffer)
       const { def, slides, ...content } = resPptJson
       // 转换图片|音频|视频 为线上地址
       let completed = 0
       const total = slides.length
-      for( let o of slides ) {
+      for (let o of slides) {
         completed++
         await toRousrceUrl(o)
         // 设置进度条
@@ -300,14 +342,14 @@ const addAiPPT = async(res) => {
       pgDialog.pg.percentage = 0
       pgDialog.visible = false
       // 生成ppt课件-父级
-      const p_params = {parentContent: JSON.stringify(content)}
+      const p_params = { parentContent: JSON.stringify(content) }
       const parentid = await HTTP_SERVER_API('addEntpcoursefile', p_params)
-      if (!!parentid??null) { // 生成内容幻灯片
+      if (!!parentid ?? null) { // 生成内容幻灯片
         // 生成备课资源-Smarttalk
-        HTTP_SERVER_API('addSmarttalk',{fileId: parentid})
+        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: '', slides: resSlides }
+          const resSlides = slides.map(({ id, ...slide }) => JSON.stringify(slide))
+          const params = { parentid, filetype: 'slide', title: '', slides: resSlides }
           const res_3 = await HTTP_SERVER_API('batchAddNew', params)
           if (res_3 && res_3.code == 200) {
             msgUtils.msgSuccess('生成PPT课件成功')
@@ -332,10 +374,10 @@ const againResult = async (index, item) => {
   isAgain.value = true
   isStarted.value[index] = false
   resultList.value[index].answer = ''
-  if(index == 0){
+  if (index == 0) {
     listRef.value.scrollTop = 0
-   
-  }else{
+
+  } else {
     scrollToBottom(50, index)
   }
 
@@ -343,8 +385,27 @@ const againResult = async (index, item) => {
     await nextTick()
     resultList.value[index].loading = true
     item.aiShow = true
-    params.prompt = `按照${item.prompt}的要求，针对${curNode.edustage}${curNode.edusubject}课标对${curNode.itemtitle}进行教学分析`
-    const { data } = await completion(params)
+
+    let str = cloneDeep(prompt.value)
+    str = str.replace(/{模板名称}/g, item.name)
+    params.prompt = str
+    params.template = item.prompt
+
+    let data = null;
+    // 教学大模型
+    if (curMode.value == 1) {
+      const res = await sendChart({
+        content: params.prompt,
+        conversationId: conversation_id.value,
+        stream: false
+      })
+      data = res.data
+    } else {
+      // 知识库模型
+      const res = await completion(params)
+      data = res.data
+    }
+
     resultList.value[index].answer = getResult(data.answer)
     isStarted.value[index] = true
   } finally {
@@ -360,11 +421,21 @@ const onAdjust = (index, item) => {
   Object.assign(curItem, item)
   isAdjust.value = true
 }
-emitter.on('changeAdjust', (item) => {
+
+// 替换分析结果
+emitter.on('onSaveAdjust', (item) => {
   resultList.value[curIndex.value].answer = item
+  onEditSave(resultList.value[curIndex.value])
 })
 
 
+// 保存 重新研读后的结果
+const onEditSave = async (item) => {
+  const { msg } = await editTempResult({ id: item.resultId, content: item.answer })
+  ElMessage.success(msg)
+  getChildTemplate()
+}
+
 // 编辑
 const onEdit = (index, item) => {
   curIndex.value = index
@@ -386,12 +457,12 @@ const HTTP_SERVER_API = (type, params = {}) => {
         fileFlag: 'aippt',
         fileShowName: node.itemtitle + '.aippt',
         textbookId: node.rootid,
-        levelFirstId: node.parentid||node.id,
+        levelFirstId: node.parentid || node.id,
         levelSecondId: node.parentid && node.id,
         fileSource: '个人',
         fileRoot: '备课'
       }
-      return API_smarttalk.creatAPT({...def, ...params})
+      return API_smarttalk.creatAPT({ ...def, ...params })
     }
     case 'addEntpcourse': { // 添加课程
       const node = courseObj.node || {}
@@ -428,7 +499,7 @@ const HTTP_SERVER_API = (type, params = {}) => {
     case 'getCourseList': { // 获取课程列表
       return API_entpcourse.listEntpcourse(params)
     }
-    case 'getCourseFileList':{ // 获取课程文件列表
+    case 'getCourseFileList': { // 获取课程文件列表
       return API_entpcoursefile.listEntpcoursefileNew(params)
     }
   }
@@ -455,7 +526,7 @@ const getDefParams = (params) => {
   return Object.assign(def, params)
 }
 // 图片|音频|视频 转换为在线地址
-const toRousrceUrl = async(o) => {
+const toRousrceUrl = async (o) => {
   if (!!o.src) { // 如果有src就转换
     const isBase64 = /^data:image\/(\w+);base64,/.test(o.src)
     const isBlobUrl = /^blob:/.test(o.src)
@@ -469,43 +540,73 @@ const toRousrceUrl = async(o) => {
       const formData = new FormData()
       formData.append('file', file)
       const res = await Api_server.Other.uploadFile(formData)
-      if (res && res.code == 200){
+      if (res && res.code == 200) {
         const url = res?.url
-        url &&(o.src = 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 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){
+      if (ress && ress.code == 200) {
         const url = ress?.url
-        url &&(o.src = 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);
-          }
-       }
+  if (o?.elements) {
+    for (let element of o.elements) {
+      await toRousrceUrl(element);
+    }
+  }
 }
 // ======== zdg end ============
 
+// 创建对话
+const conversation_id = ref('')
+const getChartId = () => {
+  createChart({ app_id: '712ff0df-ed6b-470f-bf87-8cfbaf757be5' }).then(res => {
+    localStorage.setItem("conversation_id", res.data.conversation_id);
+    conversation_id.value = res.data.conversation_id;
+  })
+}
+
+// 查询prompt 替换
+const getPrompt = async () => {
+  const { rows } = await modelList({ model: 5 })
+  let str = rows.find(item => item.name.indexOf('框架设计') != -1).prompt
+  str = str.replace('{学段}', curNode.edustage)
+  str = str.replace('{学科}', curNode.edusubject)
+  let bookV = curNode.roottitle.split('-')[1] + '版本'
+  str = str.replace('{教材版本}', bookV)
+  str = str.replace('{课程名称}', `《${curNode.itemtitle}》`)
+  prompt.value = str
+}
+
 const curNode = reactive({})
 onMounted(() => {
   let data = sessionStore.get('subject.curNode')
   Object.assign(curNode, data);
   courseObj.node = data
-
+  // 框架设计 用课标的dataset_id
   let jsonKey = `课标-${data.edustage}-${data.edusubject}`
   params.dataset_id = commUtils.dataSetJson[jsonKey]
+
+  // 获取百度千帆会话ID
+  conversation_id.value = localStorage.getItem('conversation_id')
+  if (!conversation_id.value) {
+    getChartId();
+  }
+
+  // 获取prompt
+  getPrompt()
 })
 
 
@@ -514,7 +615,7 @@ onUnmounted(() => {
   emitter.off('changeMode')
   emitter.off('changeResult')
   emitter.off('changeAdjust')
-
+  emitter.off('onSaveAdjust');
 })
 
 
@@ -539,7 +640,7 @@ onUnmounted(() => {
     background: #F6F6F6;
     padding: 15px;
     flex-direction: column;
-    overflow-y: scroll;
+    overflow-y: auto;
 
     .con-item {
       width: 100%;
@@ -548,7 +649,8 @@ onUnmounted(() => {
       position: relative;
       padding-left: 15px;
       box-sizing: border-box;
-      &::after{
+
+      &::after {
         content: '';
         width: 15px;
         height: 15px;
@@ -558,7 +660,8 @@ onUnmounted(() => {
         left: -8px;
         top: 5px;
       }
-      &::before{
+
+      &::before {
         content: '';
         width: 2px;
         height: 100%;
@@ -567,17 +670,20 @@ onUnmounted(() => {
         left: -1px;
         top: 5px;
       }
-      &:last-child{
-        &::before{
+
+      &:last-child {
+        &::before {
           content: '';
           width: 0
         }
       }
+
       .item-top {
         justify-content: space-between;
         align-items: center;
         margin-bottom: 5px;
-        .icon-shenglvehao{
+
+        .icon-shenglvehao {
           font-weight: bold
         }
       }
diff --git a/src/renderer/src/views/tool/components/upvote.vue b/src/renderer/src/views/tool/components/upvote.vue
index 317e270..f8a1a08 100644
--- a/src/renderer/src/views/tool/components/upvote.vue
+++ b/src/renderer/src/views/tool/components/upvote.vue
@@ -248,6 +248,8 @@ defineExpose({ trigger })
   position: fixed;
   // height: 90vh;
   // border: 1px solid;
+  z-index: 99;
+  pointer-events: none;
   inset: auto auto 3em 1em;
   display: flex;
   gap: 10px;