36 changed files with 345 additions and 856 deletions
--- a/electron.vite.config.mjs
+++ b/electron.vite.config.mjs
@ -33,7 +33,6 @@ export default defineConfig({
      proxy: {
        '/dev-api': {
          target: 'http://27.128.240.72:7865',
-          // target: 'https://prev.ysaix.com:7868/prod-api/',
          // target: 'http://36.134.181.164:7863',
          // target: 'http://192.168.0.102:7865',
          changeOrigin: true,
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "aix-win-ws",
-  "version": "2.5.6",
+  "version": "2.5.5",
  "description": "",
  "main": "./out/main/index.js",
  "author": "上海交大重庆人工智能研究院",
--- a/src/renderer/src/AixPPTist/src/App.vue
+++ b/src/renderer/src/AixPPTist/src/App.vue
@ -28,8 +28,8 @@ import msgUtils from '@/plugins/modal' // 消息工具
 import * as API_entpcoursefile from '@/api/education/entpcoursefile' // 相关api
 import { PPTApi } from './api'
 import { sessionStore } from '@/utils/store' // electron-store 状态管理
+// import './api/watcher' // 监听
 import watcher from './api/watcher' // 监听
-import emitter from '@/utils/mitt' //mitt 事件总线
 watcher() // 监听启动
 const loading = ref(true)
 const _isPC = isPC()
@ -74,8 +74,6 @@ const initLoad: Function = () => {
      !!(opt.ratio??null) && slidesStore.setViewportRatio(opt.ratio)// 有比例配置项
    }
    return PPTApi.getSlideList(resource.id)
-    // PPTApi.updateWorkList()
-    // return Promise.resolve()
  }
  return Promise.resolve()
 }
--- a/src/renderer/src/AixPPTist/src/api/classcourse.ts
+++ b/src/renderer/src/AixPPTist/src/api/classcourse.ts
@ -7,13 +7,11 @@ 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' // 播放控制

 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 // 提示消息对象
@ -29,25 +27,17 @@ export class Classcourse {
  load() {
    console.log('classcourse-load', classcourse)
    // 打开全屏
-    const isCourse = !!classcourse
-    screenStore.setScreening(isCourse)
+    screenStore.setScreening(!!classcourse)
    // 如果课堂信息有值，则连接socket
-    if (isCourse) {
+    if (!!classcourse) {
      // 连接socket
      if (!ChatWs.ws) ChatWs.init()
      ChatWs.id = classcourse.timgroupid // 群组id
      this.classcourse = classcourse // 课堂信息
      this.id = classcourse.id // 课堂id
      // 如果课堂信息有paging，则更新当前页码
-      const isPaging = !!classcourse.paging
+      const isPaging = !!classcourse.paging||classcourse.paging==0
      if (isPaging) slidesStore.updateSlideIndex(classcourse.paging)
-        // 如果课堂信息有paging，则更新动画播放状态
-      const isAnim = !!classcourse.cartoonTimes
-      if (isAnim) { // 动画播放
-        for (let i = 0; i <= classcourse.cartoonTimes; i++) {
-          execPlay.runAnimation(true) // 异步执行动画
-        }
-      }
      // 课堂信息-状态管理
      classcourseStore.setClasscourse(classcourse)
      // 待上课提示
--- a/src/renderer/src/AixPPTist/src/api/index.ts
+++ b/src/renderer/src/AixPPTist/src/api/index.ts
@ -3,18 +3,16 @@
 * @author zdg
 * @date 2024-11-26
 */
-import { toRaw, nextTick } from 'vue'
+import { toRaw } from 'vue'
 import type { Result } from './types' // 接口类型
 import msgUtils from '@/plugins/modal' // 消息工具
 import * as API_entpcoursefile from '@/api/education/entpcoursefile' // 相关api
 import * as API_smarttalk from '@/api/file' // 相关api
-import * as API_classwork from '@/api/teaching/classwork' // 相关api
 import * as useStore from '../store' // pptist-状态管理
 import { sessionStore } from '@/utils/store' // electron-store 状态管理
 import useUserStore from '@/store/modules/user' // 外部-用户信息
 import * as Api_server from '@/api/apiService' // 相关api
-import * as commUtils from '@/utils/comm.js' // 工具
-import { toPng, toJpeg } from 'html-to-image' // 引入html-to-image库
+import * as commUtils from '@/utils/comm.js'
 const slidesStore = useStore.useSlidesStore()
 const userStore = useUserStore()

@ -57,34 +55,30 @@ export class PPTApi {
  // 变量
  static isUpdate = true // 是否更新数据

-  // 获取所有幻灯片列表 isUpdate为true不更新
-  static getSlideList(parentid: (Number | String),isUpdate?:Boolean): Promise<Boolean> {
+  // 获取所有幻灯片列表
+  static getSlideList(parentid: (Number | String)): Promise<Boolean> {
    return new Promise(async (resolve, reject) => {
      const params: object = { parentid, orderByColumn: 'fileidx', isAsc: 'asc', pageSize: 9999 }
      const res: Result = await API_entpcoursefile.listEntpcoursefileNew(params)
-      if (res.code === 200) { 
-        if(!isUpdate){
-          const slides = (res.rows || []).map(o => {
-            if (!!o.datacontent) {
-              const json = JSON.parse(o.datacontent)
-              !!json && (json.id = o.id)
-              return json
-            }
-            // 如果没有数据，默认空白页
-            return {id: o.id,elements:[],background:{type:"solid",color:"#fff"}}
-          })
-          // slidesStore.updateSlideIndex(0) // 下标0 为第一页
-          slidesStore.setSlides(slides) // 写入数据
-        } 
+      if (res.code === 200) {        
+        const slides = (res.rows || []).map(o => {
+          if (!!o.datacontent) {
+            const json = JSON.parse(o.datacontent)
+            !!json && (json.id = o.id)
+            return json
+          }
+          // 如果没有数据，默认空白页
+          return {id: o.id,elements:[],background:{type:"solid",color:"#fff"}}
+        })
        // 活动列表处理
-        // const workList = (res.rows || []).map(o => o.activityContent)
-        const workItem = res.rows ? [...res.rows] : []
+        const workList = (res.rows || []).map(o => o.activityContent)
+        const workItem = [...res.rows]
+        // slidesStore.updateSlideIndex(0) // 下标0 为第一页
+        slidesStore.setSlides(slides) // 写入数据
        // 写入作业列表数据
-        // slidesStore.setWorkList(workList)
+        slidesStore.setWorkList(workList)
        // 获取所有的pptlist的数据
        slidesStore.setWorkItem(workItem)
-
-        this.updateWorkList()
        resolve(true)
      } else msgUtils.msgError(res.msg || '获取数据失败');resolve(false)
    })
@ -117,6 +111,7 @@ export class PPTApi {
        data.id = rid
        slidesStore.updateSlide(data)
        // msgUtils.msgSuccess('新增成功')
+        PPTApi.getSlideList(resource.id)
        this.isUpdate = false // 新增后会触发监听，不再更新数据
        resolve(true)
      } else msgUtils.msgError('新增失败');resolve(false)
@ -137,34 +132,21 @@ export class PPTApi {

    const currentSlide = toRaw(slidesStore.currentSlide)
    const isAdd = !/^\d+$/.test(currentSlide.id) // 是否新增
-    const currInd = toRaw(slidesStore.slideIndex) // 当前页索引-new
-    const oldInd = oldData.findIndex(o => o.id == currentSlide.id) // 当前页索引-old
-    const isBatch = oldVal && oldVal.length && currInd != oldInd // 是否批量更新-排序
    if (isAdd) { // 新增的幻灯片(id 为非数字，说明是新增的幻灯片)
      const bool = await this.addSlide(currentSlide)
-      bool && await this.batchUpdateSlides(newData, true) // 批量更新-排序
-      const resource = sessionStore.get('curr.resource')||{}
-      await PPTApi.getSlideList(resource.id)
+      bool && this.batchUpdateSlides(newData, true) // 批量更新-排序
    } else { // 防抖-更新
      if (!this.isUpdate) return this.isUpdate = true // 下次更新数据
-      if (isBatch) { // 批量更新-排序
-        this.batchUpdateSlides(newData, true)
-      } else { // 更新当前页幻灯片
-        const params = {
-          id: currentSlide.id,
-          datacontent: JSON.stringify(currentSlide),
-        }
-        Utils.mxThrottle(() => {this.updateSlide(params)}, 200, 2)
+      const params = {
+        id: currentSlide.id,
+        datacontent: JSON.stringify(currentSlide),
      }
+      Utils.mxThrottle(() => {this.updateSlide(params)}, 200, 2)
    }
  }
-  // 更新幻灯片 isThum 是否更新缩略图
-  static updateSlide(data: object, isThum = true): Promise<Boolean> {
+  // 更新幻灯片
+  static updateSlide(data: object): Promise<Boolean> {
    return new Promise(async (resolve, reject) => {
-      if (isThum) { // 更新缩略图
-        const thumUrl = await this.getSlideThumUrl()
-        data.base64Code = thumUrl // 更新缩略图
-      }
      const res: Result = await API_entpcoursefile.updateEntpcoursefileNew(data)
      if (res.code === 200) {
        resolve(true)
@ -208,42 +190,6 @@ export class PPTApi {
    })
  }

-  // 更新-活动列表
-  static async updateWorkList(): Promise<Boolean> {
-    const resolveData = (resolve, data = []) => {
-      slidesStore.setWorkList(data)
-      return resolve()
-    }
-    return new Promise(async (resolve, reject) => {
-      const workItem = slidesStore.workItem // 所有的pptlist的数据-原始数据
-      const currentSlide = slidesStore.currentSlide // 当前页幻灯片
-      const slideId = currentSlide.id // 当前页幻灯片id
-      if (!slideId) return resolveData(resolve)
-      // slide详情获取-作业id
-      // const res = await API_entpcoursefile.getEntpcoursefile(slideId)
-      // const workIds = res?.data?.activityContent||''
-      // workItem-获取作业id
-      const workIds = workItem.find(o => o.id == slideId)?.activityContent
-      if (!workIds) return resolveData(resolve)
-      // 获取作业列表
-      const resW = await API_classwork.homeworklist({ ids: workIds, pageSize: 1000 })
-      if (resW && resW.rows) return resolveData(resolve, resW.rows)
-      else msgUtils.msgError(resW.msg || '更新失败');return resolveData(resolve)
-    })
-  }
-
-  // thumbnail-slide thumbnail 缩略图
-  static getSlideThumUrl(): Promise<Boolean> {
-    return nextTick().then(async() => {
-      const slideIndex = slidesStore.slideIndex
-      const elements = document.querySelectorAll('.thumbnail-slide')
-      if (elements.length && slideIndex >= 0) {
-        const element = elements[slideIndex]
-        return await toPng(element)
-      }
-      return null
-    })
-  }
  // 图片|音频|视频 转换为在线地址
  static  toRousrceUrl =async (o:any) => {
      const formData = new FormData()
@ -254,7 +200,8 @@ export class PPTApi {
        url &&(o.src = url)
        return url
      }
-  }
+   
+}
 }

 export class Homework{
--- a/src/renderer/src/AixPPTist/src/api/store.ts
+++ b/src/renderer/src/AixPPTist/src/api/store.ts
@ -7,13 +7,13 @@ import msgUtils from '@/plugins/modal' // 消息工具
 import * as API_entpcoursefile from '@/api/education/entpcoursefile' // 相关api

 export default class {
-  // 删除幻灯片
-  static delSlide(id: string): Promise<Boolean> {
-    return new Promise(async (resolve, reject) => {
-      const res: Result = await API_entpcoursefile.delEntpcoursefile(id)
-      if (res.code === 200) {
-        resolve(true)
-      } else msgUtils.msgError(res.msg || '删除失败');resolve(false)
-    })
-  }
+    // 删除幻灯片
+    static delSlide(id: string): Promise<Boolean> {
+      return new Promise(async (resolve, reject) => {
+        const res: Result = await API_entpcoursefile.delEntpcoursefile(id)
+        if (res.code === 200) {
+          resolve(true)
+        } else msgUtils.msgError(res.msg || '删除失败');resolve(false)
+      })
+    }
 }
--- a/src/renderer/src/AixPPTist/src/api/watcher.ts
+++ b/src/renderer/src/AixPPTist/src/api/watcher.ts
@ -12,7 +12,6 @@ import Classcourse from './classcourse' // 课程相关
 import msgUtils from '@/plugins/modal' // 消息工具
 import { Homework } from './index' // api-作业相关
 import emitter from '@/utils/mitt' //mitt 事件总线
-import useExecPlay from '../views/Screen/hooks/useExecPlay' // 播放控制

 /**
 * @description 监听器
@ -22,7 +21,6 @@ export default () => {
  const classcourseStore = store.useClasscourseStore() // 课堂信息-状态管理
  const resource = sessionStore.get('curr.resource') // apt 资源
  const smarttalk = sessionStore.get('curr.smarttalk') // 备课资源
-  const execPlay = useExecPlay() // 播放控制
  
  // 监听幻灯片内容变化
  watch(() => slidesStore.slides, (newVal, oldVal) => {
@ -35,11 +33,6 @@ export default () => {
    updatePPT({title: newVal})
  })
  
-  // 监听幻灯片下标变化
-  watch(() => slidesStore.slideIndex, (newVal, oldVal) => {
-    PPTApi.updateWorkList()
-  })
-  
  // 消息监听ws
  // console.log('监听器已开启', ChatWs)
  if (!!ChatWs.ws) {
@ -89,11 +82,8 @@ export default () => {
          }
          break
        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') // 上一步清空-动画
-          else slidesStore.updateSlideIndex(slideIndex) // 更新幻灯片下标
+          const slideIndex = content.current
+          slidesStore.updateSlideIndex(slideIndex) // 更新幻灯片下标
          break
        case MsgEnum.HEADS.MSG_homework: // 作业|活动-布置
          if (!content.classWorkId) return
--- a/src/renderer/src/AixPPTist/src/store/slides.ts
+++ b/src/renderer/src/AixPPTist/src/store/slides.ts
@ -145,16 +145,21 @@ export const useSlidesStore = defineStore('slides', {
    setWorkItem(list: Object[]) {
      this.workItem = list
    },
+    addWorkItem(data: any) {
+      const id = data?.id
+      if (!id) return
+      this.workItem.splice(this.slideIndex + 1, 0, data)
+      this.slideIndex += 1
+    },
  
    addSlide(slide: Slide | Slide[]) {
      const slides = Array.isArray(slide) ? slide : [slide]
      for (const slide of slides) {
        if (slide.sectionTag) delete slide.sectionTag
      }
-      const addIndex = this.slideIndex + 1
-      this.slides.splice(addIndex, 0, ...slides)
-      this.slideIndex = addIndex
+      this.slides.splice(this.slideIndex, 0, ...slides)
    },
+  
    updateSlide(props: Partial<Slide>, slideId?: string) {
      const slideIndex = slideId ? this.slides.findIndex(item => item.id === slideId) : this.slideIndex
      this.slides[slideIndex] = { ...this.slides[slideIndex], ...props }
--- a/src/renderer/src/AixPPTist/src/views/Editor/Toolbar/ElementStylePanel/Active/index.vue
+++ b/src/renderer/src/AixPPTist/src/views/Editor/Toolbar/ElementStylePanel/Active/index.vue
@ -32,22 +32,22 @@
        <!-- 作业列表 -->
        <div class="c-apt-r" v-loading='loadingActive'>
                <!-- 显示-作业内容 -->
-            <template v-for="(item, index) in slidesStore.workList" :key="index">
+            <template v-for="(item, index) in workList" :key="index">
                <div class="item">
                    <div class="item-title">
                        <el-tag :type="getTagType(item.worktype) || 'primary'">{{item.worktype}}</el-tag>
                        <el-tooltip :content="item.uniquekey" placement="top">
                            <div class="tt">{{item.uniquekey}}</div>
                        </el-tooltip>
-                        <el-button class="btn-del" type="danger" link @click="removeWork(item, index)">删除</el-button>
+                        <el-button class="btn-del" type="danger" link @click="handleRemoveDemoActivityClassWork(item)">删除</el-button>
                    </div>
                </div>
            </template>
        </div>
        <!-- // 推送作业 -->
-        <el-dialog v-model="dialogVisible" append-to-body :show-close="false" width="85%" height="500">
-            <el-scrollbar>
-                <div style="height: 75vh;">
+        <el-dialog v-model="dialogVisible" append-to-body :show-close="false" width="90%" height="500">
+            <el-scrollbar height="550">
+                <div style="height: 550px;">
                    <NewClassTsakAssign :currentCourse='currentCourse' @getData="getData" />
                </div>
            </el-scrollbar>
@ -80,13 +80,21 @@
 <script setup lang="ts">
 import { ref, reactive, onMounted, nextTick, watch } from 'vue'
 import Divider from '../../../../../components/Divider.vue'
+import { listEntpcoursefile } from '@/api/education/entpcoursefile'
+import { homeworklist } from '@/api/teaching/classwork'
+import { processList } from "@/hooks/useProcessList";
+import { listEntpcoursework } from "@/api/classTask/index";
 import { ElMessageBox,ElMessage } from 'element-plus'
 import NewClassTsakAssign from '@/views/classTask/newClassTaskAssign/index.vue'
 import { sessionStore } from '@/utils/store'
 import { useGetHomework } from '@/hooks/useGetHomework'
 import { PPTApi } from '../../../../../api/index'
+import { storeToRefs } from 'pinia'
 import {useSlidesStore} from '../../../../../store' 
+import { updateEntpcoursefileNew } from '@/api/education/entpcoursefile'
 const slidesStore = useSlidesStore()
+const { slides, slideIndex, currentSlide, workItem } = storeToRefs(slidesStore)
+
 interface CourseNode {
    rootid: number;
    parentNode: { id: number };
@ -104,6 +112,12 @@ interface CurrentCourse {
    worktype: string;
 }

+interface Params {
+    parentid: number;
+    pageSize: number;
+    orderby: string;
+}
+
 interface WorkType {
    label: string;
    value: string;
@ -154,33 +168,65 @@ const type = ref<WorkType[]>([
        label: '常规作业',
        value: 'primary'
    },
-    {
-        label: '框架梳理',
-        value: 'primary'
-    }
 ])

+const objItem = ref<any>({})
+// 作业列表
+const workList = ref<WorkItem[]>([])
+
 // 获取所选择的作业列表
 const selectedWorkList = ref<WorkItem[]>([])
 // 活动页面的loading框
 const loadingActive = ref<boolean>(false)

-// 选择活动列表
+
+const paramData = ref<{ id: number, activityContent: string }>({} as { id: number, activityContent: string })
+
 const selectable = (row: WorkItem, index: number): boolean => {
    return row.status === '10';
 };

-// 删除作业
-const removeWork = (item: WorkItem, index: number) => {
+
+const formatClassWorkFile = async (postData: WorkItem[]): Promise<void> => {
+    for (let i = 0; i < postData.length; i++) {
+        let item = postData[i];
+        switch (item.worktype) {
+            case '框架梳理': {
+            }
+                break;
+            case '习题训练': {
+                // let workIds = item.quizlist!.map(items => items.id).join(',');
+                // let ress = await listEntpcoursework({ ids: workIds });
+                // const arr = ress.rows.map((item:{id:number}) => {
+                //     return item.id
+                // })
+                
+                // processList(ress.rows);
+            }
+                break;
+            case '课堂展示': {
+                // item.base64 = JSON.parse(item.workcodes).base64;
+            }
+                break;
+            case '常规作业': {
+                // item.prevData = JSON.parse(item.workcodes);
+            }
+        }       
+        workList.value.push(item)
+        loadingActive.value = false
+    }
+    await nextTick();
+}// 删除作业
+const handleRemoveDemoActivityClassWork = (item: WorkItem) => {
    ElMessageBox.confirm('是否确认删除？')
-    .then(async() => {
-      // 从workList中删除
-      // slidesStore.workList.splice(index, 1)
-      console.log('删除作业', item)
-      await upDateData('del', [item.id])
-      ElMessage.success('删除成功')
-    })
-    .catch(() => { });
+        .then(() => {
+            workList.value = []
+            const arr = paramData.value.activityContent.split(',')
+            const filterArr = arr.filter(itemId => itemId!== item.id.toString())
+            paramData.value.activityContent = filterArr.join(',')
+            upDateData()
+        })
+        .catch(() => { });
 }

 // 获取tag的样式
@ -207,7 +253,6 @@ const showDialog = (item: string) => {
    dialogVisible.value = true
 }

-// 打开活动引用列表
 const openList = () => {
    activeVisible.value = true
    initHomeWork()
@ -215,44 +260,65 @@ const openList = () => {

 // 添加活动引用列表作业
 const savePPtData = async () => {
-  if (!selectedWorkList.value.length) {
-    ElMessage.warning('请选择活动')
-    return
-  }
-  const arr = selectedWorkList.value.map(item => item.id)
-  await upDateData('add', arr)
-  activeVisible.value = false
+    if (selectedWorkList.value.length === 0) {
+        ElMessage.warning('请选择活动')
+        return
+    }
+    workList.value = []
+    const arr = selectedWorkList.value.map(item => item.id)
+    // 应该是新加而不是覆盖
+    const existingIds = paramData.value.activityContent ? paramData.value.activityContent.split(',') : []
+    paramData.value.activityContent = Array.from(new Set([...existingIds, ...arr])).join(',')
+    upDateData()
+    activeVisible.value = false
+}
+
+// 获取当前ppt页的数据
+const getCurrentPPtData = async () => {
+    workList.value = []
+    objItem.value = workItem.value[slideIndex.value]
+    paramData.value.id =  objItem.value.id
+    
+    paramData.value.activityContent = objItem.value?.activityContent
+    if (objItem.value?.activityContent) {
+        loadingActive.value = true
+        const res = await homeworklist({ ids: objItem.value?.activityContent, pageSize: 100 })
+        await formatClassWorkFile(res.rows)
+    }
 }

 // 接收习题训练的值
 const getData = async (data: WorkItem) => {
-  await upDateData('add', [data.id])
-  dialogVisible.value = false
-}
-// 更新数据-活动 type add/增加 | del/删除 ids 作业id
-const upDateData = (type: string, ids: number[]): Promise<any> => {
-  return new Promise(async (resolve, reject) => {
-    loadingActive.value = true
-    // 更新本地数据
-    let workIds = slidesStore.workList.map((o:any) => o.id)
-    const id = slidesStore.currentSlide.id
-    if (type === 'del') { // 删除
-      workIds = workIds.filter(id => !ids.includes(id))
-    } else { // 增加
-      workIds = Array.from(new Set([...workIds, ...ids]))
+    workList.value = []
+    if(paramData.value.activityContent){
+        const arr = paramData.value.activityContent.split(',')
+        arr.push(data.id.toString())
+        const unitArr = Array.from(new Set(arr))
+        paramData.value.activityContent = unitArr.join(',')
+    }else{
+        paramData.value.activityContent = data.id.toString()
    }
-    // 保存到本地
-    const wItem:any = slidesStore.workItem.find((o:any) => o.id === id)
-    const workIdsStr = workIds.join(',') // 作业id->字符串
-    if (!!wItem) wItem.activityContent = workIdsStr
-    const data = { id, activityContent: workIdsStr }
-    // 修改数据库
-    await PPTApi.updateSlide(data, false)
-    // 刷新活动列表
-    await PPTApi.updateWorkList()
-    loadingActive.value = false
-    resolve(true)
-  })
+    upDateData()
+    dialogVisible.value = false
+}
+const upDateData = async () => {
+    // await PPTApi.updateSlide(paramData.value)
+    loadingActive.value = true
+    await updateEntpcoursefileNew(paramData.value)
+    const resource = sessionStore.get('curr.resource')
+    await PPTApi.getSlideList(resource.id)
+    const res = await homeworklist({ ids: paramData.value.activityContent, pageSize: 100 })
+    await formatClassWorkFile(res.rows)
+}
+// 判断是否做操作
+const objectsAreEqual = (obj1: Record<string, any>, obj2: Record<string, any>) => {
+    const keys1 = Object.keys(obj1);
+    const keys2 = Object.keys(obj2);
+    if (keys1.length !== keys2.length) return false;
+    for (const key of keys1) {
+        if (obj1[key] !== obj2[key]) return false;
+    }
+    return true;
 }

 onMounted(() => {
@ -262,8 +328,16 @@ onMounted(() => {
    currentCourse.levelSecondId = curNode.id
    currentCourse.coursetitle = curNode.itemtitle
    currentCourse.node = curNode
+    objItem.value = workItem.value[slideIndex.value]
+    getCurrentPPtData()
 })
-
+watch(() => [workItem.value.length,slideIndex.value], (newVal,oldVal) => {
+    if(!objectsAreEqual(newVal,oldVal))
+        getCurrentPPtData()
+})
+// watch(() =>  workItem.value.length, () => {
+//     getCurrentPPtData()
+// })
 </script>
 <style scoped lang="scss">
 .buttonDiv{
--- a/src/renderer/src/AixPPTist/src/views/Screen/BaseView.vue
+++ b/src/renderer/src/AixPPTist/src/views/Screen/BaseView.vue
@ -100,6 +100,7 @@ const {
  execNext,
  animationIndex,
 } = useExecPlay()
+
 const { slideWidth, slideHeight } = useSlideSize()
 const { exitScreening } = useScreening()
 const { fullscreenState, manualExitFullscreen } = useFullscreen()
@ -196,37 +197,6 @@ const contextmenus = (): ContextmenuItem[] => {
 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('方法不存在')
-  }
-})


 </script>
--- a/src/renderer/src/AixPPTist/src/views/Screen/hooks/useExecPlay.ts
+++ b/src/renderer/src/AixPPTist/src/views/Screen/hooks/useExecPlay.ts
@ -19,10 +19,10 @@ export default () => {
  // 最小已播放页面索引
  const playedSlidesMinIndex = ref(slideIndex.value)

-  // 执行元素动画 isAsync 为 true 时，异步执行，否则同步执行
-  const runAnimation = (isAsync: boolean) => {
+  // 执行元素动画
+  const runAnimation = () => {
    // 正在执行动画时，禁止其他新的动画开始
-    if (inAnimation.value && !isAsync) return
+    if (inAnimation.value) return

    const { animations, autoNext } = formatedAnimations.value[animationIndex.value]
    animationIndex.value += 1
@ -69,7 +69,7 @@ export default () => {
      elRef.addEventListener('animationend', handleAnimationEnd, { once: true })
    }
  }
-  
+
  onMounted(() => {
    const firstAnimations = formatedAnimations.value[0]
    if (firstAnimations && firstAnimations.animations.length) {
@ -174,50 +174,45 @@ export default () => {

  // 鼠标滚动翻页
  const mousewheelListener = throttle(function(e: WheelEvent) {
-    if (e.deltaY < 0) turning(e, 'prev')
-    else if (e.deltaY > 0) turning(e, 'next')
+    if (e.deltaY < 0) execPrev()
+    else if (e.deltaY > 0) execNext()
  }, 500, { leading: true, trailing: false })

  // 触摸屏上下滑动翻页
  const touchInfo = ref<{ x: number; y: number; } | null>(null)

  const touchStartListener = (e: TouchEvent) => {
-    e.preventDefault() // 阻止默认事件
    touchInfo.value = {
-      // x: e.changedTouches[0].pageX,
-      // y: e.changedTouches[0].pageY,
-      x: e.changedTouches[0].clientX,
-      y: e.changedTouches[0].clientY,
+      x: e.changedTouches[0].pageX,
+      y: e.changedTouches[0].pageY,
    }
  }
  const touchEndListener = (e: TouchEvent) => {
    if (!touchInfo.value) return
-    const offsetX = Math.abs(touchInfo.value.x - e.changedTouches[0].clientX)
-    const offsetY = e.changedTouches[0].clientY - touchInfo.value.y
+
+    const offsetX = Math.abs(touchInfo.value.x - e.changedTouches[0].pageX)
+    const offsetY = e.changedTouches[0].pageY - touchInfo.value.y
+
    if ( Math.abs(offsetY) > offsetX && Math.abs(offsetY) > 50 ) {
      touchInfo.value = null
-      if (offsetY > 0) turning(e, 'prev')
-      else turning(e, 'next')
+
+      if (offsetY > 0) execPrev()
+      else execNext()
    }
  }
-  // 向上翻页/向下翻页
-  const turning = (e, type) => {
-    e.preventDefault() // 阻止默认事件
-    if (type === 'prev') execPrev()
-    else if (type === 'next') execNext()
-  }
+
  // 快捷键翻页
  const keydownListener = (e: KeyboardEvent) => {
    const key = e.key.toUpperCase()

-    if (key === KEYS.UP || key === KEYS.LEFT || key === KEYS.PAGEUP) turning(e, 'prev')
+    if (key === KEYS.UP || key === KEYS.LEFT || key === KEYS.PAGEUP) execPrev()
    else if (
      key === KEYS.DOWN || 
      key === KEYS.RIGHT ||
      key === KEYS.SPACE || 
      key === KEYS.ENTER ||
      key === KEYS.PAGEDOWN
-    ) turning(e, 'next')
+    ) execNext()
  }

  onMounted(() => document.addEventListener('keydown', keydownListener))
--- a/src/renderer/src/api/file/index.js
+++ b/src/renderer/src/api/file/index.js
@ -71,11 +71,3 @@ export const addFileToKj = (id) => {
    method: 'get'
  })
 }
-
-export const getModelInfo = (params) => {
-  return request({
-    url: '/education/llmModel/getModelInfo',
-    method: 'post',
-    params
-  })
-}
--- a/src/renderer/src/assets/iconfont/iconfont.css
+++ b/src/renderer/src/assets/iconfont/iconfont.css
@ -1,8 +1,8 @@
@font-face {
  font-family: "iconfont"; /* Project id 4723712 */
-  src: url('iconfont.woff2?t=1734337029245') format('woff2'),
-       url('iconfont.woff?t=1734337029245') format('woff'),
-       url('iconfont.ttf?t=1734337029245') format('truetype');
+  src: url('iconfont.woff2?t=1733880548695') format('woff2'),
+       url('iconfont.woff?t=1733880548695') format('woff'),
+       url('iconfont.ttf?t=1733880548695') format('truetype');
 }

 .iconfont {
@ -13,10 +13,6 @@
  -moz-osx-font-smoothing: grayscale;
 }

-.icon-yinle:before {
-  content: "\e6c9";
-}
-
 .icon-yuyin:before {
  content: "\e648";
 }
--- a/src/renderer/src/assets/iconfont/iconfont.js
+++ b/src/renderer/src/assets/iconfont/iconfont.js
--- a/src/renderer/src/assets/iconfont/iconfont.json
+++ b/src/renderer/src/assets/iconfont/iconfont.json
@ -5,13 +5,6 @@
  "css_prefix_text": "icon-",
  "description": "",
  "glyphs": [
-    {
-      "icon_id": "11819186",
-      "name": "音乐",
-      "font_class": "yinle",
-      "unicode": "e6c9",
-      "unicode_decimal": 59081
-    },
    {
      "icon_id": "6338162",
      "name": "语音生成",
--- a/src/renderer/src/assets/iconfont/iconfont.ttf
+++ b/src/renderer/src/assets/iconfont/iconfont.ttf
--- a/src/renderer/src/assets/iconfont/iconfont.woff
+++ b/src/renderer/src/assets/iconfont/iconfont.woff
--- a/src/renderer/src/assets/iconfont/iconfont.woff2
+++ b/src/renderer/src/assets/iconfont/iconfont.woff2
--- a/src/renderer/src/components/file-image/index.vue
+++ b/src/renderer/src/components/file-image/index.vue
@ -41,7 +41,6 @@ const getFileTypeIcon = () => {
    airobot: 'icon-jiqirenfushi', // 数字人生成
    aiimg: 'icon-xiangmuicon_maobishufa', // 文生图片
    aidraw: 'icon-meishu-F', // 文生连环画
-    aiyinyue: 'icon-yinle' //文生音乐
  }
  if (iconObj[name]) {
    return '#' + iconObj[name]
--- a/src/renderer/src/components/template-study/container/keyword-dialog.vue
+++ b/src/renderer/src/components/template-study/container/keyword-dialog.vue
@ -40,7 +40,7 @@ const props = defineProps({
    type: Number,
    default: 1
  },
-  item: { // 当前操作的模板
+  item: { // 子模板
    type: Object,
    default: () => {
      return { ex3: '' }
@ -73,25 +73,23 @@ const loading = ref(false)
 const saveAdd = async () => {
  loading.value = true
  if (props.item.ex3 == '1') {
-    let id; // id 为主模板id
+
    if (props.item.isAdd) {
-      id = props.item.id
+      try {
+        // 系统预设模板 copy一份
+        const { msg } = await addKeyWords({ name: form.name, id: props.item.id })
+        emitter.emit('onGetMain')
+        ElMessage.success(msg)
+        mode.value = false
+      } finally {
+        loading.value = false
+      }
    }
    else{
-      // 编辑状态下 item 为子模板 主模板则是item.parentId
-      id = props.item.parentId
+      onAddChildTemp(props.item.parentId)
    }
-    try {
-      // 系统预设模板 copy一份
-      const { msg } = await addKeyWords({ name: form.name, id })
-      emitter.emit('onGetMain')
-      ElMessage.success(msg)
-      mode.value = false
-    } finally {
-      loading.value = false
-    }
-  
  } else {
+
    if (props.item.isAdd) {
      onAddChildTemp(props.item.id)
    }
--- a/src/renderer/src/components/template-study/container/left.vue
+++ b/src/renderer/src/components/template-study/container/left.vue
@ -16,12 +16,12 @@
 </template>

 <script setup>
-import { ref, onMounted, nextTick, reactive } from 'vue'
+import { ref, onMounted, nextTick } from 'vue'
 import { sessionStore } from '@/utils/store'
 import PDF from '@/components/PdfJs/index.vue'
 import LeftDialog from './left-dialog.vue'

-const props = defineProps(['type'])
+const props = defineProps(['curNode', 'type'])

 const showDialog = ref(false)
 const onClick = () => {
@ -31,13 +31,8 @@ const onClick = () => {

 // 加载PDF
 const pdfUrl = ref('')
-const curNode = reactive({})
 onMounted(async () => {
  await nextTick()
-  // 当前节点
-  let nodeData = sessionStore.get('subject.curNode')
-  Object.assign(curNode, nodeData);
-
  let data = sessionStore.get('subject.curBook')
  let fileurl = data.fileurl
  if(props.type == 1){
--- a/src/renderer/src/components/template-study/container/right.vue
+++ b/src/renderer/src/components/template-study/container/right.vue
@ -83,7 +83,7 @@
 </template>

 <script setup>
-import { ref, reactive, onMounted, onUnmounted, nextTick } from 'vue'
+import { ref, reactive, onMounted, watch, onUnmounted, nextTick } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { tempSave, completion, modelList, removeChildTemp, tempResult, editTempResult } from '@/api/mode/index'
 import { sessionStore } from '@/utils/store'
@ -91,12 +91,10 @@ import keywordDialog from './keyword-dialog.vue';
 import AdjustDialog from './adjust-dialog.vue'
 import EditDialog from './edit-dialog.vue'
 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'

-const props = defineProps(['type'])
-const { user } = useUserStore()
+const props = defineProps(['curNode', 'type'])

 /*****************提示词相关****************/

@ -139,7 +137,7 @@ 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({ 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){
      Object.assign(curTemplate, res.rows[0]);
@ -163,7 +161,7 @@ const isStarted = ref([]);
 const listRef = ref()
 // 查询模板结果
 const getTempResult = () => {
-  tempResult({ mainModelId: curTemplate.id, pageNum: 1, pageSize: 10000, ex1: curNode.id }).then(res => {
+  tempResult({ mainModelId: curTemplate.id, pageNum: 1, pageSize: 10000 }).then(res => {
    let rows = res.rows
    childTempList.value.forEach(item => {
      rows.forEach(el => {
@ -270,6 +268,21 @@ const onEdit = (index, item) => {
  isEdit.value = true
 }

+
+const modeType = ref('课标')
+watch(() => props.type, (newVal) => {
+  if (newVal == 1) {
+    modeType.value = '课标'
+  }
+  if (newVal == 2) {
+    modeType.value = '教材'
+  }
+  if (newVal == 3) {
+    modeType.value = '考试'
+  }
+
+}, { immediate: false })
+
 // 重新研读
 const params = reactive(
  {
@ -296,7 +309,7 @@ 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}进行教学分析`
+    params.prompt = `按照${item.name}的要求，针对${curNode.edustage}${curNode.edusubject}${modeType.value} 对${curNode.itemtitle}进行教学分析`
    const { data } = await completion(params)
    childTempList.value[index].answer = getResult(data.answer);
    isStarted.value[index] = true
@ -320,7 +333,7 @@ const getCompletion = async () => {
    try {
      item.loading = true
      item.aiShow = true
-      params.prompt = `按照${item.prompt}的要求，针对${curNode.edustage}${curNode.edusubject}${modeType.value} 对${curNode.itemtitle}进行教学分析`
+      params.prompt = `按照${item.name}的要求，针对${curNode.edustage}${curNode.edusubject}${modeType.value} 对${curNode.itemtitle}进行教学分析`
      const { data } = await completion(params)
      item.answer = getResult(data.answer)
      onSaveTemp(item)
@ -364,8 +377,7 @@ const onSaveTemp = (item) => {
    mainModelId: curTemplate.id,
    modelId: item.id,
    examDocld: '',
-    content: item.answer,
-    ex1: curNode.id
+    content: item.answer
  }
  tempSave(data).then(res => { })
 }
@ -387,12 +399,9 @@ emitter.on('onGetMain', () => {


 const curNode = reactive({})
-const modeType = ref('')
 onMounted(() => {
  let data = sessionStore.get('subject.curNode')
  Object.assign(curNode, data);
-  modeType.value = props.type == 1 ? '课标' : props.type == 2 ? '教材' : '考试'
-
  getTemplateList()
  let jsonKey = `${modeType.value}-${data.edustage}-${data.edusubject}`
  params.dataset_id = dataSetJson[jsonKey]
--- a/src/renderer/src/components/template-study/index.vue
+++ b/src/renderer/src/components/template-study/index.vue
@ -2,16 +2,18 @@
  <div class="page-template flex">
    <el-row>
      <el-col :span="12">
-        <Left :type="type" />
+        <Left :curNode="curNode" :type="type" />
      </el-col>
      <el-col :span="12">
-        <Right :type="type" />
+        <Right :curNode="curNode" :type="type" />
      </el-col>
    </el-row>
  </div>
 </template>

 <script setup>
+import { reactive, onMounted } from 'vue'
+import { sessionStore } from '@/utils/store'
 import Left from './container/left.vue'
 import Right from './container/right.vue'

@ -21,6 +23,13 @@ const props = defineProps({
    default: 1
  },
 })
+
+const curNode = reactive({})
+onMounted(() =>{
+  let data = sessionStore.get('subject.curNode')
+  Object.assign(curNode, data);
+})
+
 </script>

 <style lang="scss" scoped>
--- a/src/renderer/src/layout/components/Aside.vue
+++ b/src/renderer/src/layout/components/Aside.vue
@ -5,7 +5,7 @@
        <el-popover ref="popoverRef" placement="right" trigger="hover" popper-class="popoverStyle" :tabindex="999" >
          <template #reference>
            <div class="user-info">
-              <el-image class="user-img" :src="userStore.user.avatar ==='/img/avatar-default.jpg' || userStore.user.avatar ==='/images/img-avatar.png' ? defaultUserImg : dev_api + userStore.user.avatar"  />
+              <el-image class="user-img" :src="dev_api + userStore.user.avatar"  />
              <span>{{ userStore.user.nickName }}</span>
            </div>
          </template>
@ -59,12 +59,12 @@ import { ElMessageBox, ElMessage } from 'element-plus'
 import useUserStore from '@/store/modules/user'
 import { sessionStore } from '@/utils/store'
 import pkc from "../../../../../package.json"
-import defaultUserImg from '@/assets/images/img-avatar.png'


 const { ipcRenderer } = window.electron || {}
 const dev_api = ref(import.meta.env.VITE_APP_BASE_API)
 const userStore = useUserStore()
+console.log(userStore)
 const router = useRouter()
 const currentRoute = ref('')
 const activeId = ref('/home')
--- a/src/renderer/src/utils/comm.js
+++ b/src/renderer/src/utils/comm.js
@ -396,12 +396,5 @@ export const dataSetJson = {
  "课标-高中-数学": "e03aa4fe9fd011ef91270242ac140006",
  "课标-高中-地理": "270516829fd111efb13c0242ac140006",
  "课标-高中-政治": "a2f0b247b85d11ef84290242ac140005",
-  "教材-高中-语文": "cee3062a9fcf11efa6910242ac140006",
-  "教材-高中-生物": "fb5d01d59fd011ef9bb90242ac140006",
-  "教材-高中-历史": "f2f6c1fb9fd011ef98740242ac140006",
-  "教材-高中-英语": "e889fcac9fd011efb22a0242ac140006",
-  "教材-高中-数学": "e03aa4fe9fd011ef91270242ac140006",
-  "教材-高中-地理": "270516829fd111efb13c0242ac140006",
-  "教材-高中-政治": "a2f0b247b85d11ef84290242ac140005",
  "鉴权": "ragflow-IwMDI1MGU2YTU3NjExZWZiNWEzMDI0Mm"
 }
--- a/src/renderer/src/utils/tool.js
+++ b/src/renderer/src/utils/tool.js
@ -422,19 +422,6 @@ export const toLinkWeb = (path) => {
    cookieData: { ...config }
  })
 }
-
-/**
- * @description 外部跳转-web网页
- * @param {*} url
- */
-export const toLinkLeftWeb = (url) => {
-  // 通知主进程
-  ipcRenderer.send('openWindow', {
-    key: `win-${Date.now()}`,
-    fullPath: url
-  })
-}
-
 /**
 * @description 外部跳转-web网页
 * @param {*} path
--- a/src/renderer/src/views/classTask/teachClassTask.vue
+++ b/src/renderer/src/views/classTask/teachClassTask.vue
@ -4,7 +4,7 @@
      <div style="font-size: 18px; display: flex; flex-wrap: nowrap">
        <div style="flex: 1">
          {{ classWorkAnalysis.title }}完成情况
-          <el-tag :type="classWorkAnalysis.workclass||'info'" size="large" style="height: 25px">{{
+          <el-tag :type="classWorkAnalysis.workclass" size="large" style="height: 25px">{{
            classWorkAnalysis.worktype
          }}</el-tag>
        </div>
@ -726,7 +726,6 @@ const msgHandle = (msg) => {
        openDialog(data, false);
      break
      case MsgEnum.HEADS.MSG_slideFlapping: // 切换页面
-        console.log('切换页面-关闭窗口')
        window.close() // 关闭窗口
      break
      // case 'TIMAddRecvNewMsgCallback': // 收到新消息 data=[]
@ -766,7 +765,6 @@ onMounted(() => {

  // im监听消息
  if (ChatWs.ws) {
-      console.log('socket监听消息')
      ChatWs.watch((msg, e) => {
        try {
          msgHandle(JSON.parse(msg))
--- a/src/renderer/src/views/login/index.vue
+++ b/src/renderer/src/views/login/index.vue
@ -38,7 +38,7 @@
          <el-input  v-model="ruleForm.username" placeholder="请输入手机号" />
        </el-form-item>
        <el-form-item label="验证码"  prop="smsCode" style="display: flex">
-          <el-input style="width:185px"  v-model="ruleForm.smsCode" placeholder="请输入验证码" /><el-button style="margin-left:10px;width:100px" :disabled="codeName=='发送验证码'?false:true"  type="primary" @click="sendyzm">{{ codeName }}</el-button>
+          <el-input style="width:185px"  v-model="ruleForm.smsCode" placeholder="请输入验证码" /><el-button style="margin-left:10px;width:100px"  type="primary" @click="sendyzm">发送验证码</el-button>
        </el-form-item>
        <el-form-item label="密码" prop="password" >
          <el-input  autocomplete="on" type="password" v-model="ruleForm.password" placeholder="请输入密码" />
@ -64,7 +64,7 @@
        width="500"
        style=" -webkit-app-region: no-drag;"
      >
-        <span>根据图片回答相关问题1</span>
+        <span>根据图片回答相关问题</span>
        <div style="display: flex;align-items: center;;margin-top:30px">
          <img :src="isPeopleImg" style="width:200px;height:60px;cursor: pointer;" alt="" srcset="" @click="refreshImg">
          <el-input v-model="ruleForm.imgCode"  style="width: 250px;height:40px;margin-left:20px" placeholder="请根据图片填入答案" />
@ -162,14 +162,6 @@ const sbmitImg=()=>{
        ElMessage.success('短信发送成功')
        ruleForm.Code=res.data
        isImg.value=false
-        codeName.value=60
-            timer.value=setInterval(()=>{
-              codeName.value--
-              if(codeName.value==0){
-                codeName.value='发送验证码'
-                clearInterval(timer.value);
-              }
-            },1000)
      }

    })
@ -190,14 +182,14 @@ const sendyzm=()=>{
            isPeopleImg.value='data:image/jpg;base64,'+res.img
            isImg.value=true
            resImg.imgData=res
-            // codeName.value=60
-            // timer.value=setInterval(()=>{
-            //   codeName.value--
-            //   if(codeName.value==0){
-            //     codeName.value='发送验证码'
-            //     clearInterval(timer.value);
-            //   }
-            // },1000)
+            codeName.value=60
+            timer.value=setInterval(()=>{
+              codeName.value--
+              if(codeName.value==0){
+                codeName.value='发送验证码'
+                clearInterval(timer.value);
+              }
+            },1000)
          }else{
            ElMessage.error(res.msg)
          }
@ -286,9 +278,6 @@ const setCookie = (name, value) => {
 }
 const gotoLogin = () => {
  codeName.value='发送验证码'
-  if (timer.value){
-    clearInterval(timer.value);
-  }
  if (ruleFormRef.value) ruleFormRef.value.resetFields()
  isRegister.value = true
 }
--- a/src/renderer/src/views/model/index.vue
+++ b/src/renderer/src/views/model/index.vue
@ -9,8 +9,8 @@
          <el-icon class="item-icon"><Flag /></el-icon>
          <div class="content-header-title">{{item.name}}</div>
          <div class="content-header-body">
-            <div class="content-header-num">{{item.num}}</div>
-            <div class="content-header-text">{{item.type}}</div>
+            <div class="content-header-num">6</div>
+            <div class="content-header-text">分析结果</div>
          </div>
        </div>
      </div>
@ -83,14 +83,14 @@ import useUserStore from '@/store/modules/user' // 用户信息
 import ChooseTextbook from '@/components/choose-textbook/index.vue'
 import KjListItem from '@/views/prepare/container/kj-list-item.vue'
 import FileImage from '@/components/file-image/index.vue'
-import {creatAPT, getSmarttalkPage, getModelInfo} from '@/api/file'
+import {creatAPT, getSmarttalkPage} from '@/api/file'
 import {ArrowDown, Flag, Position} from '@element-plus/icons-vue'
 import {asyncLocalFile, parseCataByNode} from "@/utils/talkFile";
 import { dataSetJson } from '@/utils/comm' // 数据集id文生图
 import { sessionStore } from '@/utils/store'
 import {listEntpcourse} from "@/api/teaching/classwork";
 import {addEntpcoursefileReturnId, getEntpcoursefile} from "@/api/education/entpcoursefile";
-import {createWindow, toLinkLeftWeb} from "@/utils/tool";
+import {createWindow, ipcMsgSend} from "@/utils/tool";
 import {ElMessage} from "element-plus";
 import {PPTXFileToJson} from "@/AixPPTist/src/hooks/useImport";
 import * as API_entpcoursefile from "@/api/education/entpcoursefile";
@ -112,33 +112,27 @@ const collectRef = (key) => {
 const tags = reactive([{
  name: '课标分析',
  path: '/model/curriculum',
-  bgcolor: 'rgb(241,65,108)',
-  type: '分析结果'
+  bgcolor: 'rgb(241,65,108)'
 },{
  name: '教材分析',
  path: '/model/teaching',
-  bgcolor: 'rgb(114,57,234)',
-  type: '分析结果'
+  bgcolor: 'rgb(114,57,234)'
 },{
  name: '考试分析',
  path: '/model/examination',
-  bgcolor: 'rgb(251,132,4)',
-  type: '分析结果'
+  bgcolor: 'rgb(251,132,4)'
 },{
  name: '素材设计',
  path: '/model/aiKolors',
-  bgcolor: 'rgb(25,123,237)',
-  type: '素材'
+  bgcolor: 'rgb(25,123,237)'
 },{
  name: '作业设计',
  path: '/model/newClassTaskAssign',
-  bgcolor: 'rgb(23,198,83)',
-  type: '作业'
+  bgcolor: 'rgb(23,198,83)'
 },{
  name: '框架设计',
  path: '/model/design',
-  bgcolor: 'rgb(34,35,43)',
-  type: '设计框架'
+  bgcolor: 'rgb(34,35,43)'
 }])

 const tools = reactive([{
@ -161,11 +155,6 @@ const tools = reactive([{
  name: '视频生成',
  path: '',
  img: 'aivideo'
-},{
-  name: '音乐生成',
-  path: 'https://ai.ysaix.com:7845/',
-  type: 'link',
-  img: 'aiyinyue'
 }])

 const uploadData = ref({
@ -176,13 +165,11 @@ const uploadData = ref({
    fileRoot: '备课'
 })
 const currentFileList = ref([])
+// 页面加载
+onMounted(() => {
+})

 const gotoRoute = (item) => {
-  if (item.type === 'link') {
-    //link方式
-    toLinkLeftWeb(item.path);
-    return
-  }
  if (item.path) {
    if (item.path === '/model/aiKolors') {
      gotoAiKolors(item.path)
@ -402,38 +389,9 @@ const changeBook = async(data) => {
  let cata = parseCataByNode(data.node)
  currentNode.value = data.node
  uploadData.value.levelFirstId = cata[0]
-  uploadData.value.levelSecondId = cata[1]==null||cata[1]== undefined ? '' : cata[1]
-  uploadData.value.levelThirdId = cata[2]==null||cata[2]== undefined ? '' : cata[2]
+  uploadData.value.levelSecondId = cata[1]
+  uploadData.value.levelThirdId = cata[2]
  uploadData.value.textbookId = data.textBook.curBookId
-  getModelInfo({cataid: currentNode.value.id}).then(res=>{
-    console.log(res)
-    if (res&&res.data) {
-      tags.filter(item=>{
-        switch (item.name) {
-          case '课标分析':
-            item.num = res.data.kbs
-            break;
-          case '教材分析':
-            item.num = res.data.jcs
-            break;
-          case '考试分析':
-            item.num = res.data.kss
-            break;
-          case '素材设计':
-            item.num = res.data.scs
-            break;
-          case '作业设计':
-            item.num = res.data.zys
-            break;
-          case '框架设计':
-            item.num = res.data.kjs
-            break;
-          default:
-            break;
-        }
-      })
-    }
-  })
  getSmarttalkPage({
    ...uploadData.value,
    orderByColumn: 'createTime',
@ -511,11 +469,6 @@ const changeClass = async (type, row, other) => {
      break
  }
 }
-
-// 页面加载
-onMounted(() => {
-})
-
 </script>
 <style lang="scss" scoped>
 .model-wrap{
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@ -419,7 +419,7 @@ export default {
            } else { // 列表-下课
              other.loading.value = false
              row.status = isApt ? head : '已结束'
-            }
+            }   
            ElMessage({ type: 'success', message: `下课成功！` })
          }, 1000)
          break
@ -1131,7 +1131,6 @@ export default {
      position: absolute;
      right: 10px;
      top: 4px;
-      z-index: 10;
    }
    .prepare-center-jxkj{
      height: 100%;
--- a/src/renderer/src/views/profile/cropperImage.vue
+++ b/src/renderer/src/views/profile/cropperImage.vue
@ -11,7 +11,7 @@
          <!-- 裁剪+效果 -->
          <div class="box">
            <div class="box_1">
-              <img :src="filePath" ref="image" />
+              <img :src="dev_api + filePath" ref="image" />
            </div>

            <!--裁剪完的图片-->
@ -164,7 +164,7 @@ export default {
    // 页面刷新自动执行
    onMounted(() => {
      if (props.filePath) {
-        dataFile.image.src = props.filePath;
+        dataFile.image.src = dev_api.value + props.filePath;
        copper();
      }
    });
--- a/src/renderer/src/views/profile/userAvatar.vue
+++ b/src/renderer/src/views/profile/userAvatar.vue
@ -1,6 +1,6 @@
 <template>
  <div class="user-info-head" @click="editCropper()">
-    <img :src="options.img" title="点击上传头像" class="img-circle img-lg" />
+    <img :src="dev_api + options.img" title="点击上传头像" class="img-circle img-lg" />
    <el-dialog
      v-model="open"
      append-to-body
@ -23,7 +23,6 @@ import { uploadAvatar } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
 import { ElMessage } from 'element-plus'
 import CropperImage from './cropperImage.vue'
-import defaultUserImg from '@/assets/images/img-avatar.png'

 const userStore = useUserStore()

@ -33,7 +32,7 @@ const dev_api = ref(import.meta.env.VITE_APP_BASE_API)

 //图片裁剪数据
 const options = reactive({
-  img: userStore.user.avatar ==='/img/avatar-default.jpg' || userStore.user.avatar ==='/images/img-avatar.png' ? defaultUserImg : dev_api.value + userStore.user.avatar, // 裁剪图片的地址
+  img: userStore.user.avatar, // 裁剪图片的地址
  autoCrop: true, // 是否默认生成截图框
  autoCropWidth: 400, // 默认生成截图框宽度
  autoCropHeight: 400, // 默认生成截图框高度
@ -41,6 +40,7 @@ const options = reactive({
  outputType: 'png', // 默认生成截图为PNG格式
  previews: {} //预览数据
 })
+
 const cropper = ref(null)

 /** 编辑头像 */
@ -69,7 +69,7 @@ function uploadImg(data) {

 /** 关闭窗口 */
 function closeDialog() {
-  options.img = userStore.user.avatar ==='/img/avatar-default.jpg' || userStore.user.avatar ==='/images/img-avatar.png' ? defaultUserImg : dev_api.value + userStore.user.avatar
+  options.img = userStore.user.avatar
  options.visible = false
 }
 const cancle = () => {
--- a/src/renderer/src/views/profile/userInfo.vue
+++ b/src/renderer/src/views/profile/userInfo.vue
@ -8,7 +8,7 @@
    </el-form-item>
    <el-form-item label="所属学校" prop="identity">
        <div style="display: flex;">
-          <div>{{ userStore.DeptInfo.register ? userStore.DeptInfo.register.schoolName : '' }}</div>
+          <div>{{ userStore.DeptInfo.register.schoolName }}</div>
          <div>
            <el-button type="primary" link>更改学校</el-button>
          </div>
--- a/src/renderer/src/views/teachingDesign/container/keyword-dialog.vue
+++ b/src/renderer/src/views/teachingDesign/container/keyword-dialog.vue
@ -1,159 +0,0 @@
-<template>
-  <el-dialog v-model="mode" :show-close="false" width="600" append-to-body destroy-on-close>
-    <template #header>
-      <div class="custom-header flex">
-        <span>{{ item.ex3 == '1' ? '请输入新的模板名称' : item.isAdd ? '添加提示词' : '编辑提示词' }}</span>
-        <i class="iconfont icon-guanbi" @click="mode = false"></i>
-      </div>
-    </template>
-    <div class="dialog-content" v-loading="loading">
-      <p class="small-tip" v-if="item && item.ex3 == '1'">*当前模板为系统预设，不支持直接操作。需要复制一份为自己的然后再操作</p>
-      <el-form :model="form" label-width="auto">
-        <el-form-item label="名称">
-          <el-input v-model="form.name" />
-        </el-form-item>
-        <el-form-item label="提示词" v-if="item.ex3 == '1' ? false : true">
-          <el-input v-model="form.prompt" type="textarea" />
-        </el-form-item>
-      </el-form>
-    </div>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button @click="mode = false">取消</el-button>
-        <el-button type="primary" @click="saveAdd">
-          确定
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
-</template>
-
-<script setup>
-import { ref, reactive, watch } from 'vue'
-import { ElMessage } from 'element-plus'
-import emitter from '@/utils/mitt';
-import { addKeyWords, addChildTemp, editChildTemp } from '@/api/mode/index'
-
-const mode = defineModel()
-const props = defineProps({
-  modeType: {
-    type: Number,
-    default: 1
-  },
-  item: { // 当前操作的模板
-    type: Object,
-    default: () => {
-      return { ex3: '' }
-    }
-  },
-
-})
-
-const form = reactive({
-  name: '',
-  prompt: '',
-})
-
-
-watch(() => mode.value, (newVal) => {
-  if(newVal){
-    if (props.item.isAdd) {
-      form.name = ''
-      form.prompt = ''
-    }
-    else{
-      form.name = props.item?.name
-      form.prompt = props.item?.prompt
-     
-    }
-  }
-},{ deep: true})
-
-const loading = ref(false)
-const saveAdd = async () => {
-  loading.value = true
-
-  if (props.item.ex3 == '1') {
-    let id; // id 为主模板id
-    if (props.item.isAdd) {
-      id = props.item.id
-    }
-    else{
-      // 编辑状态下 item 为子模板 主模板则是item.parentId
-      id = props.item.parentId
-    }
-    try {
-      // 系统预设模板 copy一份
-      const { msg } = await addKeyWords({ name: form.name, id })
-      emitter.emit('onGetMain', props.item)
-      ElMessage.success(msg)
-      mode.value = false
-    } finally {
-      loading.value = false
-    }
-  
-  } else {
-    if (props.item.isAdd) {
-      onAddChildTemp(props.item.id)
-    }
-    else {
-      try {
-        let data = JSON.parse(JSON.stringify(props.item))
-        data.name = form.name;
-        data.prompt = form.prompt
-        const { msg } = await editChildTemp(data)
-        emitter.emit('onGetChild', data )
-        ElMessage.success(msg)
-        mode.value = false
-      } finally {
-        loading.value = false
-      }
-    }
-  }
-}
-
-// 添加子模板
-const onAddChildTemp = async (parentId) => {
-  // 添加子模板
-  let obj = {
-    name: form.name,
-    type: 2, // 子模板 固定值为2
-    sortNum: 1,
-    parentId,
-    lmType: 1,
-    model: props.modeType,
-    prompt: form.prompt,
-    ex1: props.item.ex1, //学段
-    ex2: props.item.ex2, // 学科
-    ex3: '', //是否系统预设 这里默认空
-  }
-  try {
-    var { msg } = await addChildTemp(obj)
-    emitter.emit('onGetChild')
-    ElMessage.success(msg)
-    mode.value = false
-  } finally {
-    loading.value = false
-  }
-}
-
-</script>
-
-<style lang="scss" scoped>
-.custom-header {
-  justify-content: space-between;
-  align-items: center;
-
-  .icon-guanbi {
-    cursor: pointer;
-    font-weight: bold;
-  }
-}
-
-.small-tip {
-  text-align: left;
-  font-size: 12px;
-  margin-bottom: 15px;
-  color: #F56C6C;
-}
-</style>
--- a/src/renderer/src/views/teachingDesign/container/left.vue
+++ b/src/renderer/src/views/teachingDesign/container/left.vue
@ -2,27 +2,26 @@
  <div class="container-left flex">
    <div class="left-header flex">教学模式</div>
    <div class="left-con" v-loading="loading">
-      <el-empty v-if="!(tempList.length)" description="暂无数据" />
-      <div class="con-item" v-for="item in tempList" :key="item.id" :class=" actId == item.id ? 'item-act' : ''">
+      <div class="con-item" v-for="item in tempList" :key="item.id">
        <div class="item-header flex">
          <span>{{ item.name }}</span>
          <el-button type="primary" link @click="onSelect(item)">选择模式</el-button>
        </div>
        <div class="content-list"> 
-          <div class="item-list flex" >
-            <el-card class="item-card" shadow="never" v-for="el in item.child" :key="el.id">
-              <p class="card-name">
-                <el-text line-clamp="1" :title="el.name">
-                  {{ el.name }}
-                </el-text>
-                </p>
-              <div class="card-text">
-                <el-text line-clamp="4" :title="el.prompt">
-                  {{ el.prompt }}
-                </el-text>
-              </div>
-            </el-card>
-          </div>
+            <div class="item-list flex">
+              <el-card class="item-card" shadow="never" v-for="el in item.child" :key="el.id">
+                <p class="card-name">
+                  <el-text line-clamp="1" :title="el.name">
+                    {{ el.name }}
+                  </el-text>
+                  </p>
+                <div class="card-text">
+                  <el-text line-clamp="4" :title="el.prompt">
+                    {{ el.prompt }}
+                  </el-text>
+                </div>
+              </el-card>
+            </div>
        </div>
      </div>
    </div>
@ -30,34 +29,27 @@
 </template>

 <script setup>
-import { ref, reactive, onMounted, onUnmounted } from 'vue';
+import { ref, onMounted } from 'vue';
 import emitter from '@/utils/mitt';
 import { modelList } from '@/api/mode/index'
-import useUserStore from '@/store/modules/user'
-import { sessionStore } from '@/utils/store'
-
-const { user } = useUserStore()

 // 获取模板
-let list = ref([])
-const getTemplate = async (id) => {
-  const { rows } = await modelList({ createUser: user.userId, model: 4, type: 1, pageNum: 1, pageSize: 10000})
-  list.value = rows
-  if(list.value.length){
-    getChildTemp(id)
-  }
+let list = []
+const getTemplate = () => {
+  modelList({ model: 1, type: 1, ex3: 1 }).then(res => {
+    list = res.rows
+    getChildTemp()
+  })
 }

 // 获取子模板
-const actId = ref('')
 const loading = ref(false)
 const tempList = ref([])
-const getChildTemp = async (parentId) => {
-  tempList.value.length = 0
+const getChildTemp = async () => {
  loading.value = true
-  for (let item of list.value) {
+  for (let item of list) {
    try {
-      const { rows } = await modelList({ model: 4, type: 2, parentId: item.id  })
+      const { rows } = await modelList({ model: 1, type: 2, parentId: item.id })
      tempList.value.push({
        id: item.id,
        name: item.name,
@ -65,52 +57,20 @@ const getChildTemp = async (parentId) => {
      })
    } finally {
      loading.value = false
+      emitter.emit('changeMode', tempList.value[0])
    }
-    actId.value = tempList.value[0].id
-  }
-  if(parentId){
-    const item = tempList.value.find(item => item.id == parentId)
-    emitter.emit('changeMode', item)
-  }
-  else{
-    emitter.emit('changeMode', tempList.value[0])
  }
 }

-
-// 操作之后获取子模板
-emitter.on('onGetChild', async (data) => {
-
-  await getTemplate(data.parentId)
-
-})
-// 操作之后获取主模板
-emitter.on('onGetMain', (item) => {
-  getTemplate(item.parentId)
-})
-
 // 选择模板
 const emit = defineEmits([''])
 const onSelect = (item) =>{
-  actId.value = item.id
  emitter.emit('changeMode', item)
 }

-
-const curNode = reactive({})
 onMounted(() => {
-  let data = sessionStore.get('subject.curNode')
-  Object.assign(curNode, data);
  getTemplate()
 })
-
-
-// 解绑
-onUnmounted(() => {
-
-  emitter.off('onGetMain');
-  emitter.off('onGetChild');
-})
 </script>

 <style lang="scss" scoped>
@ -136,7 +96,7 @@ onUnmounted(() => {
    padding: 15px;
    box-sizing: border-box;
    font-size: 14px;
-    overflow: auto;
+
    .item-header {
      justify-content: space-between;
      margin-bottom: 5px;
@ -144,16 +104,10 @@ onUnmounted(() => {
    .con-item {
      margin-bottom: 20px;
      display: flex;
-      flex-direction: column;
-      padding: 10px;
+      flex-direction: column
    }
    .item-list{
-
-      padding: 10px;
-    }
-    .item-act{
-      border: solid 1px #409eff;
-      border-radius: 5px;
+      margin-bottom: 10px;
    }
    .item-card {
      width: 130px;
--- a/src/renderer/src/views/teachingDesign/container/right.vue
+++ b/src/renderer/src/views/teachingDesign/container/right.vue
@ -10,32 +10,22 @@
        </el-button>
      </div>
      <div class="header-right">
-        <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>
      </div>
    </div>
-    <div class="right-con flex" ref="listRef">
-      <el-empty v-if="!(resultList.length)" description="暂无数据" />
+    <div class="right-con flex">
      <div class="con-item flex" v-for="(item, index) in resultList" :key="item.id" v-loading="item.loading">
        <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>
+          <el-button type="info" link>
+            <i class="iconfont icon-xiazai9"></i>
+          </el-button>
        </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)" />
+            <div class="answer-text" v-html="item.answer">
            </div>
            <div class="item-btn flex">
              <el-button type="primary" link @click="againResult(index, item)">
@ -61,24 +51,19 @@
  <AdjustDialog v-model="isAdjust" :item="curItem" />
  <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" />
 </template>

 <script setup>
-import { ref, onMounted, onUnmounted, reactive, nextTick } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ref, onMounted, onUnmounted, reactive } from 'vue'
 import { sessionStore } from '@/utils/store'
 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 } from '@/api/mode/index.js'
 // 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 useUserStore from '@/store/modules/user'
 import {PPTXFileToJson} from '@/AixPPTist/src/hooks/useImport' // ppt转json
@ -112,155 +97,28 @@ const pgDialog = reactive({ // 弹窗-进度条
 })
 emitter.on('changeMode', (item) => {
  resultList.value = item.child
+  // conversation()
  getTempResult(item.id)
 })


-// 一键研读
-const getCompletion = async () => {
-  isStarted.value = new Array(resultList.length).fill(false)
-  isStarted.value[0] = true
-
-  resultList.value.forEach(item =>{
-    if(item.answer){
-      item.answer = ''
-    }
-  })
-  for (let item of resultList.value) {
-
-    try {
-      item.loading = true
-      item.aiShow = true
-      params.prompt = `按照${item.prompt}的要求，针对${curNode.edustage}${curNode.edusubject} 对${curNode.itemtitle}进行教学分析`
-      const { data } = await completion(params)
-      item.answer = getResult(data.answer)
-      onSaveTemp(item)
-    } finally {
-      item.loading = false
-    }
-  }
-}
-
-const handleCompleteText = async (answer, index) =>{
-  if (index < resultList.value.length - 1) {
-    isStarted.value[index + 1] = true; // 开始显示下一个文本
-  }
-  if(isAgain.value){
-    try{
-      await editTempResult({ id: resultList.value[index].resultId, content: answer })
-    }finally{
-      isAgain.value = false
-    }
-  }
-}
-
-// 保存模板
-const onSaveTemp = (item) => {
-  if (item.answer == '') return
-
-  const data = {
-    mainModelId: item.parentId,
-    modelId: item.id,
-    examDocld: '',
-    content: item.answer,
-    ex1: curNode.id
-  }
-  tempSave(data).then(res => { })
-}
-
-const isWordDialog = ref(false)
-const editKeyWord = (item, val) => {
-  /**
-   * isAdd: 子模板中的移除 为编辑false  头部删除 添加提示词为新增 true
-   */
-  Object.assign(curItem, item)
-  curItem.isAdd = val
-  isWordDialog.value = true
- 
-}
-
-
-// 移除模板
-const removeItem = async (item, isChild) => {
-  /**
-   * item: 当前操作的模板
-   * isChild: 子模板中的移除为 true  
-   */
-  if (item.ex3 != '1') {
-    ElMessageBox.confirm(
-      '确认是否移除?',
-      '提示',
-      {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }
-    ).then(() => {
-      removeChildTemp(item.id).then(res => {
-        ElMessage.success('操作成功')
-        if (isChild) {
-          // 获取子模板
-          emitter.emit('onGetChild', item)
-        }
-        else {
-          // 获取主模板
-          // getTemplateList()
-        }
-      })
-    })
-  }
-  else {
-    // editKeyWord(item, !isChild)
-  }
-}
-const listRef = ref()
 // 查询模板结果
-const isStarted = ref([]);
 const getTempResult = (id) => {
  tempResult({ mainModelId: id }).then(res => {
    let rows = res.rows
    if (rows.length > 0) {
-      isStarted.value = new Array(rows.length).fill(true)
      resultList.value.forEach(item => {
        rows.forEach(el => {
          if (item.id == el.modelId) {
-            item.answer = getResult(el.content)
-            item.resultId = el.id
+            item.answer = el.content
+            item.reultId = el.id
          }
        })
      })
    }
-    
  })
 }

-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)
-    }
-  }
-  else{
-    for(let i = 0; i < index; i++){
-      sum += listDom[i].clientHeight
-    }
-    listRef.value.scrollTop = sum + height
-  }
-}
-}
-
-// 去掉字符串中的 ### **
-let getResult = (str) => {
-  let newStr = str.replace(/#+|(\*\*)/g, '');
-  return newStr
-}

 const params = reactive(
  {
@ -318,7 +176,18 @@ const addAiPPT = async(res) => {
      }
    })
 }
-
+const conversation = async () => {
+  for (let item of resultList.value) {
+    item.loading = true
+    try {
+      params.prompt = `按照${item.prompt}的要求，针对${curNode.edustage}${curNode.edusubject}课标对${curNode.itemtitle}进行教学分析`
+      const { data } = await completion(params)
+      item.answer = data.answer
+    } finally {
+      item.loading = false
+    }
+  }
+}

 const isEdit = ref(false)
 // 当前操作的索引
@ -327,32 +196,17 @@ const curIndex = ref(-1)
 const curItem = reactive({})

 // 重新生成
-const isAgain = ref(false)
 const againResult = async (index, item) => {
-  isAgain.value = true
-  isStarted.value[index] = false
-  resultList.value[index].answer = ''
-  if(index == 0){
-    listRef.value.scrollTop = 0
-   
-  }else{
-    scrollToBottom(50, index)
-  }
-
  try {
-    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)
-    resultList.value[index].answer = getResult(data.answer)
-    isStarted.value[index] = true
+    resultList.value[index].answer = data.answer
  } finally {
    resultList.value[index].loading = false
  }
 }

-
 // 对话调整
 const isAdjust = ref(false)
 const onAdjust = (index, item) => {
@ -492,8 +346,8 @@ const toRousrceUrl = async(o) => {
  if (o?.background?.image) await toRousrceUrl(o.background.image)
  if(o?.elements){
          for (let element of o.elements) {
-              await toRousrceUrl(element);
-          }
+              await this.toRousrceUrl(element);
+          } 
       }
 }
 // ======== zdg end ============
@ -514,10 +368,8 @@ onUnmounted(() => {
  emitter.off('changeMode')
  emitter.off('changeResult')
  emitter.off('changeAdjust')
-
 })

-
 </script>

 <style lang="scss" scoped>
@ -544,42 +396,12 @@ onUnmounted(() => {
    .con-item {
      width: 100%;
      flex-direction: column;
-      padding-bottom: 20px;
-      position: relative;
-      padding-left: 15px;
-      box-sizing: border-box;
-      &::after{
-        content: '';
-        width: 15px;
-        height: 15px;
-        border-radius: 50%;
-        background: #409eff;
-        position: absolute;
-        left: -8px;
-        top: 5px;
-      }
-      &::before{
-        content: '';
-        width: 2px;
-        height: 100%;
-        background: #409eff;
-        position: absolute;
-        left: -1px;
-        top: 5px;
-      }
-      &:last-child{
-        &::before{
-          content: '';
-          width: 0
-        }
-      }
+      margin-bottom: 20px;
+
      .item-top {
        justify-content: space-between;
        align-items: center;
        margin-bottom: 5px;
-        .icon-shenglvehao{
-          font-weight: bold
-        }
      }

      .item-bom {
@ -624,9 +446,3 @@ onUnmounted(() => {
  }
 }
 </style>
-<style>
-.template-custom-popover {
-  width: 110px !important;
-  min-width: 110px !important;
-}
-</style>