Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev

Reviewed-on: #141

electron.vite.config.mjs

@@ -33,6 +33,7 @@ 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,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aix-win-ws",
-  "version": "2.5.5",
+  "version": "2.5.6",
   "description": "",
   "main": "./out/main/index.js",
   "author": "上海交大重庆人工智能研究院",

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,6 +74,8 @@ const initLoad: Function = () => {
       !!(opt.ratio??null) && slidesStore.setViewportRatio(opt.ratio)// 有比例配置项
     }
     return PPTApi.getSlideList(resource.id)
+    // PPTApi.updateWorkList()
+    // return Promise.resolve()
   }
   return Promise.resolve()
 }

src/renderer/src/AixPPTist/src/api/classcourse.ts

@@ -7,7 +7,6 @@ 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 * as Fullscreen  from '../utils/fullscreen' // 全屏
 import useExecPlay from '../views/Screen/hooks/useExecPlay' // 播放控制
 
 const slidesStore = useStore.useSlidesStore() // 幻灯片-状态管理
@@ -31,10 +30,9 @@ export class Classcourse {
     console.log('classcourse-load', classcourse)
     // 打开全屏
     const isCourse = !!classcourse
-    if (isCourse) Fullscreen.enterFullscreen()
     screenStore.setScreening(isCourse)
     // 如果课堂信息有值，则连接socket
-    if (!!classcourse) {
+    if (isCourse) {
       // 连接socket
       if (!ChatWs.ws) ChatWs.init()
       ChatWs.id = classcourse.timgroupid // 群组id

src/renderer/src/AixPPTist/src/api/index.ts

@@ -3,16 +3,18 @@
  * @author zdg
  * @date 2024-11-26
  */
-import { toRaw } from 'vue'
+import { toRaw, nextTick } 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 * as commUtils from '@/utils/comm.js' // 工具
+import { toPng, toJpeg } from 'html-to-image' // 引入html-to-image库
 const slidesStore = useStore.useSlidesStore()
 const userStore = useUserStore()
 
@@ -75,12 +77,14 @@ export class PPTApi {
           slidesStore.setSlides(slides) // 写入数据
         } 
         // 活动列表处理
-        const workList = (res.rows || []).map(o => o.activityContent)
+        // const workList = (res.rows || []).map(o => o.activityContent)
         const workItem = res.rows ? [...res.rows] : []
         // 写入作业列表数据
-        slidesStore.setWorkList(workList)
+        // slidesStore.setWorkList(workList)
         // 获取所有的pptlist的数据
         slidesStore.setWorkItem(workItem)
+
+        this.updateWorkList()
         resolve(true)
       } else msgUtils.msgError(res.msg || '获取数据失败');resolve(false)
     })
@@ -133,6 +137,9 @@ 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) // 批量更新-排序
@@ -140,16 +147,24 @@ export class PPTApi {
       await PPTApi.getSlideList(resource.id)
     } else { // 防抖-更新
       if (!this.isUpdate) return this.isUpdate = true // 下次更新数据
-      const params = {
+      if (isBatch) { // 批量更新-排序
-        id: currentSlide.id,
+        this.batchUpdateSlides(newData, true)
-        datacontent: JSON.stringify(currentSlide),
+      } else { // 更新当前页幻灯片
+        const params = {
+          id: currentSlide.id,
+          datacontent: JSON.stringify(currentSlide),
+        }
+        Utils.mxThrottle(() => {this.updateSlide(params)}, 200, 2)
       }
-      Utils.mxThrottle(() => {this.updateSlide(params)}, 200, 2)
     }
   }
-  // 更新幻灯片
+  // 更新幻灯片 isThum 是否更新缩略图
-  static updateSlide(data: object): Promise<Boolean> {
+  static updateSlide(data: object, isThum = true): 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)
@@ -193,6 +208,42 @@ 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()
@@ -203,8 +254,7 @@ export class PPTApi {
         url &&(o.src = url)
         return url
       }
-   
+  }
-}
 }
 
 export class Homework{

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> {
+  static delSlide(id: string): Promise<Boolean> {
-      return new Promise(async (resolve, reject) => {
+    return new Promise(async (resolve, reject) => {
-        const res: Result = await API_entpcoursefile.delEntpcoursefile(id)
+      const res: Result = await API_entpcoursefile.delEntpcoursefile(id)
-        if (res.code === 200) {
+      if (res.code === 200) {
-          resolve(true)
+        resolve(true)
-        } else msgUtils.msgError(res.msg || '删除失败');resolve(false)
+      } else msgUtils.msgError(res.msg || '删除失败');resolve(false)
-      })
+    })
-    }
+  }
 }

src/renderer/src/AixPPTist/src/api/watcher.ts

@@ -35,6 +35,11 @@ export default () => {
     updatePPT({title: newVal})
   })
   
+  // 监听幻灯片下标变化
+  watch(() => slidesStore.slideIndex, (newVal, oldVal) => {
+    PPTApi.updateWorkList()
+  })
+  
   // 消息监听ws
   // console.log('监听器已开启', ChatWs)
   if (!!ChatWs.ws) {
@@ -86,8 +91,8 @@ export default () => {
         case MsgEnum.HEADS.MSG_slideFlapping: // 幻灯片翻页
           const slideIndex = content?.current || 0
           const type = content?.animation
-          if (type === 'Nextsteps') execPlay.execNext() // 下一步
+          if (type === 'Nextsteps') emitter.emit('useExecPlay', 'execNext') // 下一步
-          else if (type === 'Previoustep') execPlay.execPrev() // 上一步
+          else if (type === 'Previoustep') emitter.emit('useExecPlay', 'turnPrevSlide') // 上一步清空-动画
           else slidesStore.updateSlideIndex(slideIndex) // 更新幻灯片下标
           break
         case MsgEnum.HEADS.MSG_homework: // 作业|活动-布置

src/renderer/src/AixPPTist/src/views/Editor/Toolbar/ElementStylePanel/Active/index.vue

@@ -32,14 +32,14 @@
         <!-- 作业列表 -->
         <div class="c-apt-r" v-loading='loadingActive'>
                 <!-- 显示-作业内容 -->
-            <template v-for="(item, index) in workList" :key="index">
+            <template v-for="(item, index) in slidesStore.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="handleRemoveDemoActivityClassWork(item)">删除</el-button>
+                        <el-button class="btn-del" type="danger" link @click="removeWork(item, index)">删除</el-button>
                     </div>
                 </div>
             </template>
@@ -80,21 +80,13 @@
 <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 };
@@ -112,12 +104,6 @@ interface CurrentCourse {
     worktype: string;
 }
 
-interface Params {
-    parentid: number;
-    pageSize: number;
-    orderby: string;
-}
-
 interface WorkType {
     label: string;
     value: string;
@@ -174,63 +160,27 @@ const type = ref<WorkType[]>([
     }
 ])
 
-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 formatClassWorkFile = async (postData: WorkItem[]): Promise<void> => {
+const removeWork = (item: WorkItem, index: number) => {
-    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(() => {
+    .then(async() => {
-            workList.value = []
+      // 从workList中删除
-            const arr = paramData.value.activityContent.split(',')
+      // slidesStore.workList.splice(index, 1)
-            const filterArr = arr.filter(itemId => itemId!== item.id.toString())
+      console.log('删除作业', item)
-            paramData.value.activityContent = filterArr.join(',')
+      await upDateData('del', [item.id])
-            upDateData()
+      ElMessage.success('删除成功')
-        })
+    })
-        .catch(() => { });
+    .catch(() => { });
 }
 
 // 获取tag的样式
@@ -257,6 +207,7 @@ const showDialog = (item: string) => {
     dialogVisible.value = true
 }
 
+// 打开活动引用列表
 const openList = () => {
     activeVisible.value = true
     initHomeWork()
@@ -264,65 +215,44 @@ const openList = () => {
 
 // 添加活动引用列表作业
 const savePPtData = async () => {
-    if (selectedWorkList.value.length === 0) {
+  if (!selectedWorkList.value.length) {
-        ElMessage.warning('请选择活动')
+    ElMessage.warning('请选择活动')
-        return
+    return
-    }
+  }
-    workList.value = []
+  const arr = selectedWorkList.value.map(item => item.id)
-    const arr = selectedWorkList.value.map(item => item.id)
+  await upDateData('add', arr)
-    // 应该是新加而不是覆盖
+  activeVisible.value = false
-    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) => {
-    workList.value = []
+  await upDateData('add', [data.id])
-    if(paramData.value.activityContent){
+  dialogVisible.value = false
-        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()
-    }
-    upDateData()
-    dialogVisible.value = false
 }
-const upDateData = async () => {
+// 更新数据-活动 type add/增加 | del/删除 ids 作业id
+const upDateData = (type: string, ids: number[]): Promise<any> => {
+  return new Promise(async (resolve, reject) => {
     loadingActive.value = true
-    await PPTApi.updateSlide(paramData.value)
+    // 更新本地数据
-    // await updateEntpcoursefileNew(paramData.value)
+    let workIds = slidesStore.workList.map((o:any) => o.id)
-    const resource = sessionStore.get('curr.resource')
+    const id = slidesStore.currentSlide.id
-    await PPTApi.getSlideList(resource.id)
+    if (type === 'del') { // 删除
-    const res = await homeworklist({ ids: paramData.value.activityContent, pageSize: 100 })
+      workIds = workIds.filter(id => !ids.includes(id))
-    await formatClassWorkFile(res.rows)
+    } else { // 增加
-}
+      workIds = Array.from(new Set([...workIds, ...ids]))
-// 判断是否做操作
-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;
+    // 保存到本地
+    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)
+  })
 }
 
 onMounted(() => {
@@ -332,17 +262,8 @@ onMounted(() => {
     currentCourse.levelSecondId = curNode.id
     currentCourse.coursetitle = curNode.itemtitle
     currentCourse.node = curNode
-    objItem.value = workItem.value[slideIndex.value]
-    getCurrentPPtData()
 })
-watch(() => [workItem.value.length,workItem.value[slideIndex.value]?.id], (newVal,oldVal) => {
+
-    if(!objectsAreEqual(newVal,oldVal))
-        if(workItem.value[slideIndex.value])
-            getCurrentPPtData()
-})
-// watch(() =>  workItem.value.length, () => {
-//     getCurrentPPtData()
-// })
 </script>
 <style scoped lang="scss">
 .buttonDiv{

src/renderer/src/AixPPTist/src/views/Screen/BaseView.vue

@@ -100,7 +100,6 @@ const {
   execNext,
   animationIndex,
 } = useExecPlay()
-
 const { slideWidth, slideHeight } = useSlideSize()
 const { exitScreening } = useScreening()
 const { fullscreenState, manualExitFullscreen } = useFullscreen()
@@ -197,6 +196,37 @@ 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>

src/renderer/src/AixPPTist/src/views/Screen/hooks/useExecPlay.ts

@@ -174,9 +174,8 @@ export default () => {
 
   // 鼠标滚动翻页
   const mousewheelListener = throttle(function(e: WheelEvent) {
-    e.preventDefault() // 阻止默认事件
+    if (e.deltaY < 0) turning(e, 'prev')
-    if (e.deltaY < 0) execPrev()
+    else if (e.deltaY > 0) turning(e, 'next')
-    else if (e.deltaY > 0) execNext()
   }, 500, { leading: true, trailing: false })
 
   // 触摸屏上下滑动翻页
@@ -197,24 +196,28 @@ export default () => {
     const offsetY = e.changedTouches[0].clientY - touchInfo.value.y
     if ( Math.abs(offsetY) > offsetX && Math.abs(offsetY) > 50 ) {
       touchInfo.value = null
-      if (offsetY > 0) execPrev()
+      if (offsetY > 0) turning(e, 'prev')
-      else execNext()
+      else turning(e, 'next')
     }
   }
-
+  // 向上翻页/向下翻页
+  const turning = (e, type) => {
+    e.preventDefault() // 阻止默认事件
+    if (type === 'prev') execPrev()
+    else if (type === 'next') execNext()
+  }
   // 快捷键翻页
   const keydownListener = (e: KeyboardEvent) => {
-    e.preventDefault() // 阻止默认事件
     const key = e.key.toUpperCase()
 
-    if (key === KEYS.UP || key === KEYS.LEFT || key === KEYS.PAGEUP) execPrev()
+    if (key === KEYS.UP || key === KEYS.LEFT || key === KEYS.PAGEUP) turning(e, 'prev')
     else if (
       key === KEYS.DOWN || 
       key === KEYS.RIGHT ||
       key === KEYS.SPACE || 
       key === KEYS.ENTER ||
       key === KEYS.PAGEDOWN
-    ) execNext()
+    ) turning(e, 'next')
   }
 
   onMounted(() => document.addEventListener('keydown', keydownListener))

src/renderer/src/components/template-study/container/right.vue

@@ -392,9 +392,9 @@ 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]
 })
 

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' ? defaultUserImg : dev_api + userStore.user.avatar"  />
+              <el-image class="user-img" :src="userStore.user.avatar ==='/img/avatar-default.jpg' || '/images/img-avatar.png' ? defaultUserImg : dev_api + userStore.user.avatar"  />
               <span>{{ userStore.user.nickName }}</span>
             </div>
           </template>
@@ -65,7 +65,6 @@ 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')

src/renderer/src/utils/comm.js

@@ -396,5 +396,12 @@ export const dataSetJson = {
   "课标-高中-数学": "e03aa4fe9fd011ef91270242ac140006",
   "课标-高中-地理": "270516829fd111efb13c0242ac140006",
   "课标-高中-政治": "a2f0b247b85d11ef84290242ac140005",
+  "教材-高中-语文": "cee3062a9fcf11efa6910242ac140006",
+  "教材-高中-生物": "fb5d01d59fd011ef9bb90242ac140006",
+  "教材-高中-历史": "f2f6c1fb9fd011ef98740242ac140006",
+  "教材-高中-英语": "e889fcac9fd011efb22a0242ac140006",
+  "教材-高中-数学": "e03aa4fe9fd011ef91270242ac140006",
+  "教材-高中-地理": "270516829fd111efb13c0242ac140006",
+  "教材-高中-政治": "a2f0b247b85d11ef84290242ac140005",
   "鉴权": "ragflow-IwMDI1MGU2YTU3NjExZWZiNWEzMDI0Mm"
 }

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" size="large" style="height: 25px">{{
+          <el-tag :type="classWorkAnalysis.workclass||'info'" size="large" style="height: 25px">{{
             classWorkAnalysis.worktype
           }}</el-tag>
         </div>
@@ -726,6 +726,7 @@ const msgHandle = (msg) => {
         openDialog(data, false);
       break
       case MsgEnum.HEADS.MSG_slideFlapping: // 切换页面
+        console.log('切换页面-关闭窗口')
         window.close() // 关闭窗口
       break
       // case 'TIMAddRecvNewMsgCallback': // 收到新消息 data=[]
@@ -765,6 +766,7 @@ onMounted(() => {
 
   // im监听消息
   if (ChatWs.ws) {
+      console.log('socket监听消息')
       ChatWs.watch((msg, e) => {
         try {
           msgHandle(JSON.parse(msg))

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"  type="primary" @click="sendyzm">发送验证码</el-button>
+          <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-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>根据图片回答相关问题</span>
+        <span>根据图片回答相关问题1</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,6 +162,14 @@ 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)
       }
 
     })
@@ -182,14 +190,14 @@ const sendyzm=()=>{
             isPeopleImg.value='data:image/jpg;base64,'+res.img
             isImg.value=true
             resImg.imgData=res
-            codeName.value=60
+            // codeName.value=60
-            timer.value=setInterval(()=>{
+            // timer.value=setInterval(()=>{
-              codeName.value--
+            //   codeName.value--
-              if(codeName.value==0){
+            //   if(codeName.value==0){
-                codeName.value='发送验证码'
+            //     codeName.value='发送验证码'
-                clearInterval(timer.value);
+            //     clearInterval(timer.value);
-              }
+            //   }
-            },1000)
+            // },1000)
           }else{
             ElMessage.error(res.msg)
           }
@@ -278,6 +286,9 @@ const setCookie = (name, value) => {
 }
 const gotoLogin = () => {
   codeName.value='发送验证码'
+  if (timer.value){
+    clearInterval(timer.value);
+  }
   if (ruleFormRef.value) ruleFormRef.value.resetFields()
   isRegister.value = true
 }

src/renderer/src/views/model/index.vue

@@ -10,7 +10,7 @@
           <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">分析结果</div>
+            <div class="content-header-text">{{item.type}}</div>
           </div>
         </div>
       </div>
@@ -112,27 +112,33 @@ const collectRef = (key) => {
 const tags = reactive([{
   name: '课标分析',
   path: '/model/curriculum',
-  bgcolor: 'rgb(241,65,108)'
+  bgcolor: 'rgb(241,65,108)',
+  type: '分析结果'
 },{
   name: '教材分析',
   path: '/model/teaching',
-  bgcolor: 'rgb(114,57,234)'
+  bgcolor: 'rgb(114,57,234)',
+  type: '分析结果'
 },{
   name: '考试分析',
   path: '/model/examination',
-  bgcolor: 'rgb(251,132,4)'
+  bgcolor: 'rgb(251,132,4)',
+  type: '分析结果'
 },{
   name: '素材设计',
   path: '/model/aiKolors',
-  bgcolor: 'rgb(25,123,237)'
+  bgcolor: 'rgb(25,123,237)',
+  type: '素材'
 },{
   name: '作业设计',
   path: '/model/newClassTaskAssign',
-  bgcolor: 'rgb(23,198,83)'
+  bgcolor: 'rgb(23,198,83)',
+  type: '作业'
 },{
   name: '框架设计',
   path: '/model/design',
-  bgcolor: 'rgb(34,35,43)'
+  bgcolor: 'rgb(34,35,43)',
+  type: '设计框架'
 }])
 
 const tools = reactive([{

src/renderer/src/views/profile/userAvatar.vue

@@ -33,7 +33,7 @@ const dev_api = ref(import.meta.env.VITE_APP_BASE_API)
 
 //图片裁剪数据
 const options = reactive({
-  img: userStore.user.avatar ==='/img/avatar-default.jpg' ? defaultUserImg : dev_api.value + userStore.user.avatar, // 裁剪图片的地址
+  img: userStore.user.avatar ==='/img/avatar-default.jpg' || '/images/img-avatar.png' ? defaultUserImg : dev_api.value + userStore.user.avatar, // 裁剪图片的地址
   autoCrop: true, // 是否默认生成截图框
   autoCropWidth: 400, // 默认生成截图框宽度
   autoCropHeight: 400, // 默认生成截图框高度
@@ -69,7 +69,7 @@ function uploadImg(data) {
 
 /** 关闭窗口 */
 function closeDialog() {
-  options.img = userStore.user.avatar ==='/img/avatar-default.jpg' ? defaultUserImg : dev_api.value + userStore.user.avatar
+  options.img = userStore.user.avatar ==='/img/avatar-default.jpg' || '/images/img-avatar.png' ? defaultUserImg : dev_api.value + userStore.user.avatar
   options.visible = false
 }
 const cancle = () => {

src/renderer/src/views/teachingDesign/container/keyword-dialog.vue

@@ -85,7 +85,7 @@ const saveAdd = async () => {
     try {
       // 系统预设模板 copy一份
       const { msg } = await addKeyWords({ name: form.name, id })
-      emitter.emit('onGetMain')
+      emitter.emit('onGetMain', props.item)
       ElMessage.success(msg)
       mode.value = false
     } finally {

src/renderer/src/views/teachingDesign/container/left.vue

@@ -3,26 +3,26 @@
     <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">
+      <div class="con-item" v-for="item in tempList" :key="item.id" :class=" actId == item.id ? 'item-act' : ''">
         <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">
+          <div class="item-list flex" >
-              <el-card class="item-card" shadow="never" v-for="el in item.child" :key="el.id">
+            <el-card class="item-card" shadow="never" v-for="el in item.child" :key="el.id">
-                <p class="card-name">
+              <p class="card-name">
-                  <el-text line-clamp="1" :title="el.name">
+                <el-text line-clamp="1" :title="el.name">
-                    {{ el.name }}
+                  {{ el.name }}
-                  </el-text>
+                </el-text>
-                  </p>
+                </p>
-                <div class="card-text">
+              <div class="card-text">
-                  <el-text line-clamp="4" :title="el.prompt">
+                <el-text line-clamp="4" :title="el.prompt">
-                    {{ el.prompt }}
+                  {{ el.prompt }}
-                  </el-text>
+                </el-text>
-                </div>
+              </div>
-              </el-card>
+            </el-card>
-            </div>
+          </div>
         </div>
       </div>
     </div>
@@ -49,6 +49,7 @@ const getTemplate = async (id) => {
 }
 
 // 获取子模板
+const actId = ref('')
 const loading = ref(false)
 const tempList = ref([])
 const getChildTemp = async (parentId) => {
@@ -65,6 +66,7 @@ const getChildTemp = async (parentId) => {
     } finally {
       loading.value = false
     }
+    actId.value = tempList.value[0].id
   }
   if(parentId){
     const item = tempList.value.find(item => item.id == parentId)
@@ -90,6 +92,7 @@ emitter.on('onGetMain', (item) => {
 // 选择模板
 const emit = defineEmits([''])
 const onSelect = (item) =>{
+  actId.value = item.id
   emitter.emit('changeMode', item)
 }
 
@@ -98,8 +101,6 @@ const curNode = reactive({})
 onMounted(() => {
   let data = sessionStore.get('subject.curNode')
   Object.assign(curNode, data);
-
-
   getTemplate()
 })
 
@@ -143,10 +144,16 @@ onUnmounted(() => {
     .con-item {
       margin-bottom: 20px;
       display: flex;
-      flex-direction: column
+      flex-direction: column;
+      padding: 10px;
     }
     .item-list{
-      margin-bottom: 10px;
+
+      padding: 10px;
+    }
+    .item-act{
+      border: solid 1px #409eff;
+      border-radius: 5px;
     }
     .item-card {
       width: 130px;

src/renderer/src/views/teachingDesign/container/right.vue

@@ -15,7 +15,7 @@
         <el-button type="danger" @click="pptDialog = true">生成PPT</el-button>
       </div>
     </div>
-    <div class="right-con flex">
+    <div class="right-con flex" ref="listRef">
       <el-empty v-if="!(resultList.length)" description="暂无数据" />
       <div class="con-item flex" v-for="(item, index) in resultList" :key="item.id" v-loading="item.loading">
         <div class="item-top flex">
@@ -30,14 +30,12 @@
                 <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" v-html="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>
             <div class="item-btn flex">
               <el-button type="primary" link @click="againResult(index, item)">
@@ -68,18 +66,19 @@
 </template>
 
 <script setup>
-import { ref, onMounted, onUnmounted, reactive } from 'vue'
+import { ref, onMounted, onUnmounted, reactive, nextTick } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 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 } from '@/api/mode/index.js'
+import { completion, tempResult, tempSave, removeChildTemp, editTempResult } 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
@@ -119,11 +118,19 @@ emitter.on('changeMode', (item) => {
 
 // 一键研读
 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) {
-    console.log(item)
+
     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)
@@ -134,6 +141,19 @@ const getCompletion = async () => {
   }
 }
 
+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
@@ -193,24 +213,49 @@ const removeItem = async (item, isChild) => {
     // 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 = el.content
+            item.answer = getResult(el.content)
-            item.reultId = el.id
+            item.resultId = 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, '');
@@ -282,17 +327,32 @@ 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 = data.answer
+    resultList.value[index].answer = getResult(data.answer)
+    isStarted.value[index] = true
   } finally {
     resultList.value[index].loading = false
   }
 }
 
+
 // 对话调整
 const isAdjust = ref(false)
 const onAdjust = (index, item) => {
@@ -484,8 +544,35 @@ onUnmounted(() => {
     .con-item {
       width: 100%;
       flex-direction: column;
-      margin-bottom: 20px;
+      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
+        }
+      }
       .item-top {
         justify-content: space-between;
         align-items: center;