Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/renderer/src/components/file-image/index.vue
#	src/renderer/src/views/model/index.vue

.env.development

@@ -17,8 +17,8 @@ VITE_APP_RES_FILE_PATH = 'https://file.ysaix.com:7868/src/assets/textbook/booktx
 VITE_APP_BUILD_BASE_PATH = 'https://file.ysaix.com:7868/'
 
 # websocket 地址
-# VITE_APP_WS_URL = 'wss://file.ysaix.com:7868'
+VITE_APP_WS_URL = 'wss://file.ysaix.com:7868'
-VITE_APP_WS_URL = 'ws://192.168.2.16:7865'
+# VITE_APP_WS_URL = 'ws://192.168.2.16:7865'
 
 # 是否显示开发工具
 VITE_SHOW_DEV_TOOLS = 'true'

src/renderer/src/AixPPTist/src/App.vue

@@ -28,7 +28,6 @@ import * as API_entpcoursefile from '@/api/education/entpcoursefile' // 相关ap
 import { PPTApi } from './api'
 import { sessionStore } from '@/utils/store' // electron-store 状态管理
 import './api/watcher' // 监听
-import './api/classcourse' // 课程相关
 
 const loading = ref(true)
 const _isPC = isPC()

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

@@ -2,21 +2,51 @@
  * @author zdg
  * @description 上课相关内容
  */
-import type { Classcourse } from './types'
+// import type { Classcourse } from './types'
 import { sessionStore } from '@/utils/store' // electron-store 状态管理
 import * as useStore from '../store' // pptist-状态管理
-import { ChatWs } from '@/plugins/socket' // 聊天socket
+import ChatWs from '@/plugins/socket' // 聊天socket
+import msgUtils from '@/plugins/modal' // 消息工具
+
 const screenStore = useStore.useScreenStore() // 全屏-状态管理
 const classcourseStore = useStore.useClasscourseStore() // 课堂信息-状态管理
-const classcourse: Classcourse = sessionStore.get('curr.classcourse') // 课堂信息
+const classcourse = sessionStore.get('curr.classcourse') // 课堂信息
 
-// 如果课堂信息有值，则连接socket
+export class Classcourse {
-if (!!classcourse) {
+  msgObj:ElMessageBox = null // 提示消息对象
-  // 连接socket
+
-  const ws = new ChatWs()
+  constructor() {
-  console.log('ws- ',ws)
+    this.load()
-  // ChatWs.connect(classcourse.id)
+  }
-  classcourseStore.setClasscourse(classcourse)
+  /**
+   * @description 加载
+   */
+  load() {
+    // 打开全屏
+    screenStore.setScreening(!!classcourse)
+    // 如果课堂信息有值，则连接socket
+    if (!!classcourse) {
+      // 连接socket
+      if (!ChatWs.ws) ChatWs.init()
+      ChatWs.id = classcourse.timgroupid // 群组id
+      console.log('ws- ', classcourse)
+      classcourseStore.setClasscourse(classcourse)
+      // 待上课提示
+      if (!classcourse.status) {
+        this.msgObj = {
+          type: 'success',
+          title: '系统提示',
+          message: '公屏课堂已准备完毕，请等待老师开启课堂！',
+          center: true,
+          showClose: false,
+          showCancelButton: false,
+          showConfirmButton: false,
+          beforeClose: () => {}
+        }
+        msgUtils.ElMessageBox(this.msgObj)
+      }
+    }
+  }
 }
-// 打开全屏
+
-screenStore.setScreening(!!classcourse)
+export default new Classcourse()

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

@@ -3,22 +3,22 @@
  * @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_server from '@/api/apiService' // 相关api
+import * as CreateHomework from '@/views/tool/createHomework' // 统计相关
 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 { toPng, toJpeg } from 'html-to-image' // 引入html-to-image库
-import * as commUtils from '@/utils/comm.js'
+// import * as commUtils from '@/utils/comm.js'
+import { createWindow } from '@/utils/tool'
+import { useToolState } from '@/store/modules/tool'
 const slidesStore = useStore.useSlidesStore()
 const userStore = useUserStore()
-
-import { getClassWorkList,getStudentClassWorkData } from '@/views/tool/createHomework'
-import {createWindow} from '@/utils/tool'
-import { useToolState } from '@/store/modules/tool'
 const toolStore = useToolState()
 /** 工具类 */
 export class Utils {
@@ -60,7 +60,6 @@ export class PPTApi {
     return new Promise(async (resolve, reject) => {
       const params: object = { parentid, orderByColumn: 'fileidx', isAsc: 'asc', pageSize: 9999 }
       const res: Result = await API_entpcoursefile.listEntpcoursefileNew(params)
-      console.log(res.rows,'res.rows');
       if (res.code === 200) {        
         const slides = (res.rows || []).map(o => {
           if (!!o.datacontent) {
@@ -74,7 +73,8 @@ export class PPTApi {
         // 活动列表处理
         const workList = (res.rows || []).map(o => o.activityContent)
         const workItem = [...res.rows]
-        slidesStore.updateSlideIndex(0) // 下标0 为第一页
+        // 加入活动后刷新ppt数据内容，不跟换为第一页
+        // slidesStore.updateSlideIndex(0) // 下标0 为第一页
         slidesStore.setSlides(slides) // 写入数据
         // 写入作业列表数据
         slidesStore.setWorkList(workList)
@@ -147,6 +147,8 @@ export class PPTApi {
   // 更新幻灯片
   static updateSlide(data: object): Promise<Boolean> {
     return new Promise(async (resolve, reject) => {
+      const thumUrl = await this.getSlideThumUrl()
+      data.base64Code = thumUrl // 更新缩略图
       const res: Result = await API_entpcoursefile.updateEntpcoursefileNew(data)
       console.log(data,'data');
       console.log(res,'dresata');
@@ -191,30 +193,40 @@ export class PPTApi {
       else msgUtils.msgError(res.msg || '更新失败');return false
     })
   }
+  // 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) => {
+  static  toRousrceUrl =async (file: File|any) => {
-      const formData = new FormData()
+    const formData = new FormData()
-      formData.append('file', o)
+    formData.append('file', file)
-      const res = await Api_server.Other.uploadFile(formData)
+    const res = await Api_server.Other.uploadFile(formData)
-      if (res && res.code == 200){
+    if (res && res.code == 200){
-        const url = res?.url
+      const url = res?.url
-        url &&(o.src = url)
+      url &&(o.src = url)
-        return url
+      return url
-      }
+    }
-   
+  }
-}
 }
 
 export class Homework{
   // 作业弹窗
   static async showHomework(id: any) {
-    let result = await getClassWorkList(id)
+    let result = await CreateHomework.getClassWorkList(id)
-      result = await getStudentClassWorkData()
+      result = await CreateHomework.getStudentClassWorkData()
-      localStorage.setItem('teachClassWorkItem', JSON.stringify(result[0]));
+      localStorage.setItem('teachClassWorkItem', JSON.stringify(result[0]));
-      toolStore.isTaskWin=true; // 设置打开批改窗口
+      toolStore.isTaskWin=true; // 设置打开批改窗口
-    //   emit('closeActive')
+      createWindow('open-taskwin',{url:'/teachClassTask'}); 
-      createWindow('open-taskwin',{url:'/teachClassTask'}); 
   }
 }
 export default PPTApi

src/renderer/src/AixPPTist/src/api/types.ts

@@ -19,6 +19,147 @@ export interface Classcourse {
   entpcoursefileid?: number|string, // 课程文件id
   classid?: number|string, // 班级id
   entpcourseid?: number|string, // 章节中间表id
+  timgroupid?: number|string, // ws 群组id
   plandate?: string, // 计划时间
   opendate?: string, // 开课时间
-}
+}
+
+/**
+ * @description 消息枚举
+ * @author zdg
+ * @date 2021-07-05 14:07:01
+ */
+
+export class MsgEnum {
+  /**
+   * @description: 消息类型
+   * 
+   *  |  名称   | 含义   | 值（enum）    |
+   *  |  ----  | ----  | ----  |
+   *  | SYSTEM | 系统消息 | system |
+   *  | TEACHER | 老师消息 | teacher |
+   *  | STUDENT | 学生消息 | student |
+   *  | NOTICE  | 通知消息 | notice  |
+   */
+  static TYPES = {
+    /** @desc: 系统消息 */
+    SYSTEM: 'system',
+    /** @desc: 老师消息 */
+    TEACHER: 'teacher',
+    /** @desc: 学生消息 */
+    STUDENT: 'student',
+    /** @desc: 通知消息 */
+    NOTICE: 'notice'
+  }
+    /**
+   * @description: 消息头-类型
+   * 
+   *  |  名称   | 含义   | 值（enum）    |
+   *  |  ----  | ----  | ----  |
+   *  | --- | 以下为旧定义-消息头 | --- |
+   *  | MSG_closed | 结束课程(下课) | closed |
+   *  | MSG_onlineStatus | 在线状态 | onlineStatus |
+   *  | MSG_pushQuizOfClassWorkdata2Public | 老师端：把选中的学生习题作业，推到大屏 | pushQuizOfClassWorkdata2Public |
+   *  | MSG_pushClassWorkdata2Public | 老师端：把选中的学生作业，推到大屏 | pushClassWorkdata2Public |
+   *  | MSG_shareStudentPresentdata2All | 把某个学生的展示成果数据推给全班所有学生 | shareStudentPresentdata2All |
+   *  | MSG_pushStudentPresentdata2Public | 老师端：课堂展示活动，把选中的学生展示数据，推到大屏 | pushStudentPresentdata2Public |
+   *  | MSG_pushClassWorkPresentList2Public | 老师端：课堂展示活动，任务列表，推到大屏 | pushClassWorkPresentList2Public |
+   *  | MSG_activePageType | 课标研读-分页切换 | activePageType |
+   *  | MSG_slideFlapping | 幻灯片-切换 | slideFlapping |
+   *  | MSG_anmationclick | 幻灯片-动画切换 | anmationclick |
+   *  | MSG_classcourseopen | 群组创建成功 | classcourseopen |
+   *  | MSG_classquizfeedback | 学生的测练结果反馈 | classquizfeedback |
+   *  | MSG_classtaskfeedback | 老师端：接收到学生反馈消息-课堂测练中的其他任务 | classtaskfeedback |
+   *  | MSG_studentfeedback | 老师端：学生反馈的消息，具体要看其中的feedbackkey，类别较繁杂 | studentfeedback |
+   *  | MSG_studentfeedbackcancel | 老师端：学生反馈的消息取消，如取消学会了，取消困惑 | studentfeedbackcancel |
+   *  | MSG_classshowdata | 学生提交的课堂展示数据-要在老师端显示，再由老师选择推送到公屏上 | classshowdata |
+   *  | MSG_classWorkOfPresentDataUpdate | 学生在公屏上展示并完善后，保存后，老师端要更新 | classWorkOfPresentDataUpdate |
+   *  | MSG_classlecturePagesrc | 课堂讲授活动，选择不同的内容 | classlecturePagesrc |
+   *  | --- | 以下为新定义-消息头 | --- |
+   *  | MSG_0001 | 点赞 | 0x0001 |
+   *  | MSG_0002 | xx | 0x0002 |
+   *  | MSG_0003 | xx | 0x0003 |
+   */
+  static HEADS = {
+    // === 旧定义-消息头(兼容以前) ===
+    /** @desc: 开课 */
+    MSG_open : 'open',
+    /** @desc: 结束课程(下课) */
+    MSG_closed : 'closed',
+    /** @desc: 在线状态 */
+    MSG_onlineStatus : 'onlineStatus',
+    /** @desc: 老师端：把选中的学生习题作业，推到大屏 */
+    MSG_pushQuizOfClassWorkdata2Public : 'pushQuizOfClassWorkdata2Public',
+    /** @desc: 老师端：把选中的学生作业，推到大屏 */
+    MSG_pushClassWorkdata2Public : 'pushClassWorkdata2Public',
+    /** @desc: 把某个学生的展示成果数据推给全班所有学生 */
+    MSG_shareStudentPresentdata2All : 'shareStudentPresentdata2All',
+    /** @desc: 老师端：课堂展示活动，把选中的学生展示数据，推到大屏 */
+    MSG_pushStudentPresentdata2Public : 'pushStudentPresentdata2Public',
+    /** @desc: 老师端：课堂展示活动，任务列表，推到大屏 */
+    MSG_pushClassWorkPresentList2Public : 'pushClassWorkPresentList2Public',
+    /** @desc: 课标研读-分页切换 */
+    MSG_activePageType : 'activePageType',
+    /** @desc: 幻灯片-切换 */
+    MSG_slideFlapping : 'slideFlapping',
+    /** @desc: 幻灯片-动画切换 */
+    MSG_anmationclick : 'anmationclick',
+    /** @desc: 群组创建成功 */
+    MSG_classcourseopen : 'classcourseopen',
+    /** @desc: 学生的测练结果反馈 */
+    MSG_classquizfeedback : 'classquizfeedback',
+    /** @desc: 老师端：接收到学生反馈消息-课堂测练中的其他任务 */
+    MSG_classtaskfeedback : 'classtaskfeedback',
+    /** @desc: 老师端：学生反馈的消息，具体要看其中的feedbackkey，类别较繁杂 */
+    MSG_studentfeedback : 'studentfeedback',
+    /** @desc: 老师端：学生反馈的消息取消，如取消学会了，取消困惑 */
+    MSG_studentfeedbackcancel : 'studentfeedbackcancel',
+    /** @desc: 学生提交的课堂展示数据-要在老师端显示，再由老师选择推送到公屏上 */
+    MSG_classshowdata : 'classshowdata',
+    /** @desc: 学生在公屏上展示并完善后，保存后，老师端要更新 */
+    MSG_classWorkOfPresentDataUpdate : 'classWorkOfPresentDataUpdate',
+    /** @desc: 课堂讲授活动，选择不同的内容 */
+    MSG_classlecturePagesrc : 'classlecturePagesrc',
+    // === 新定义-消息头 ===
+    /** @desc: 课程创建-待开课 */
+    MSG_0000: 0x0000,
+    /** @desc: 点赞 */
+    MSG_0001: 0x0001,
+    /** @desc: 疑惑 */
+    MSG_0002: 0x0002,
+    MSG_0003: 0x0003,
+    MSG_0004: 0x0004,
+    MSG_0005: 0x0005,
+    MSG_0006: 0x0006,
+    MSG_0007: 0x0007,
+    MSG_0008: 0x0008,
+    MSG_0009: 0x0009,
+    MSG_0010: 0x000a,
+    MSG_0011: 0x000b,
+    MSG_0012: 0x000c,
+    MSG_0013: 0x000d,
+    MSG_0014: 0x000e,
+    MSG_0015: 0x000f,
+    /** @desc: 作业推送 */
+    MSG_0016: 0x0010,
+    MSG_0017: 0x0011,
+    MSG_0018: 0x0012,
+    MSG_0019: 0x0013,
+    MSG_0020: 0x0014,
+    MSG_0021: 0x0015,
+    MSG_0022: 0x0016,
+    MSG_0023: 0x0017,
+    MSG_0024: 0x0018,
+    MSG_0025: 0x0019,
+    MSG_0026: 0x001a,
+    MSG_0027: 0x001b,
+    MSG_0028: 0x001c,
+    MSG_0029: 0x001d,
+    MSG_0030: 0x001e,
+    MSG_0031: 0x001f,
+    MSG_0032: 0x0020,
+    MSG_0033: 0x0021,
+    MSG_0034: 0x0022,
+    MSG_0035: 0x0023,
+  }
+}

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

@@ -6,13 +6,17 @@ import { watch } from 'vue'
 import { PPTApi } from './index'
 import * as store from '../store'
 import { sessionStore } from '@/utils/store' // electron-store 状态管理
+import { MsgEnum } from './types' // 消息枚举
+import ChatWs from '@/plugins/socket' // 聊天socket
+import Classcourse from './classcourse' // 课程相关
+import msgUtils from '@/plugins/modal' // 消息工具
 const slidesStore = store.useSlidesStore()
+const classcourseStore = store.useClasscourseStore() // 课堂信息-状态管理
 const resource = sessionStore.get('curr.resource') // apt 资源
 const smarttalk = sessionStore.get('curr.smarttalk') // 备课资源
 /**
  * @description 监听器
  */
-
 // 监听幻灯片内容变化
 watch(() => slidesStore.slides, (newVal, oldVal) => {
   PPTApi.updateSlides(newVal, oldVal) // 更新幻灯片内容
@@ -24,6 +28,20 @@ watch(() => slidesStore.title, (newVal, oldVal) => {
   updatePPT({title: newVal})
 })
 
+// 消息监听ws
+console.log('监听器已开启', ChatWs)
+if (ChatWs.ws) {
+  ChatWs.watch((msg, e) => {
+    try {
+      handleMessage(JSON.parse(msg))
+    } catch (error) {
+      console.error('socket 解析异常 ', error, e)
+      handleMessage(msg)
+    }
+  })
+}
+
+// 更新ppt内容
 const updatePPT = async (data) => {
   if (!resource) return
   data.id = resource.id
@@ -36,4 +54,41 @@ const updatePPT = async (data) => {
     await PPTApi.updateSmarttalk(params) // 更新ppt内容
     sessionStore.set('curr.smarttalk.fileShowName', params.fileShowName)
   }
-}
+}
+
+// ws消息处理
+const handleMessage = (msg) => {
+  if (typeof msg === 'object'){
+    const { head, content, ...other } = msg
+    switch (head) {
+      case MsgEnum.HEADS.MSG_open: // 开课
+        // 课堂信息不一致
+        if (Classcourse.id !== content.id) {
+          msgUtils.alertError('老师开课信息异常，请重新进入公屏！')
+          .then(() => { // 点击确定按钮，关闭窗口
+            window.close()
+          })
+        } else { // 正常更新数据
+          classcourseStore.classcourse.status = 'open'
+          // 更新课堂信息-关闭警告框
+          Classcourse?.msgObj?.onVanish()
+        }
+        break
+      case MsgEnum.HEADS.MSG_slideFlapping: // 幻灯片翻页
+        const slideIndex = content.current
+        slidesStore.updateSlideIndex(slideIndex) // 更新幻灯片下标
+        break
+      case MsgEnum.HEADS.MSG_closed: // 下课:
+        window.close() // 关闭窗口
+        break
+      default:
+        break
+    }
+  }
+}
+// console.log('监听器已开启', Classcourse)
+// setTimeout(() => {
+//   console.log('关闭弹窗')
+//   // Classcourse.msgObj?.close()
+//   Classcourse?.msgObj?.onVanish()
+// }, 10 * 1000)

src/renderer/src/AixPPTist/src/hooks/useImport.ts

@@ -33,6 +33,48 @@ const { theme } = storeToRefs(useSlidesStore())
 
 const { addSlidesFromData } = useAddSlidesOrElements()
 const { isEmptySlide } = useSlideHandler()
+const parseLineElement = (el: Shape) => {
+  let start: [number, number] = [0, 0]
+  let end: [number, number] = [0, 0]
+
+  if (!el.isFlipV && !el.isFlipH) { // 右下
+    start = [0, 0]
+    end = [el.width, el.height]
+  }
+  else if (el.isFlipV && el.isFlipH) { // 左上
+    start = [el.width, el.height]
+    end = [0, 0]
+  }
+  else if (el.isFlipV && !el.isFlipH) { // 右上
+    start = [0, el.height]
+    end = [el.width, 0]
+  }
+  else { // 左下
+    start = [el.width, 0]
+    end = [0, el.height]
+  }
+
+  const data: PPTLineElement = {
+    type: 'line',
+    id: nanoid(10),
+    width: el.borderWidth || 1,
+    left: el.left,
+    top: el.top,
+    start,
+    end,
+    style: el.borderType,
+    color: el.borderColor,
+    points: ['', /straightConnector/.test(el.shapType) ? 'arrow' : '']
+  }
+  if (/bentConnector/.test(el.shapType)) {
+    data.broken2 = [
+      Math.abs(start[0] - end[0]) / 2,
+      Math.abs(start[1] - end[1]) / 2,
+    ]
+  }
+
+  return data
+}
 export default () => {
 
   const exporting = ref(false)
@@ -59,48 +101,7 @@ export default () => {
     reader.readAsText(file)
   }
 
-  const parseLineElement = (el: Shape) => {
+ 
-    let start: [number, number] = [0, 0]
-    let end: [number, number] = [0, 0]
-
-    if (!el.isFlipV && !el.isFlipH) { // 右下
-      start = [0, 0]
-      end = [el.width, el.height]
-    }
-    else if (el.isFlipV && el.isFlipH) { // 左上
-      start = [el.width, el.height]
-      end = [0, 0]
-    }
-    else if (el.isFlipV && !el.isFlipH) { // 右上
-      start = [0, el.height]
-      end = [el.width, 0]
-    }
-    else { // 左下
-      start = [el.width, 0]
-      end = [0, el.height]
-    }
-
-    const data: PPTLineElement = {
-      type: 'line',
-      id: nanoid(10),
-      width: el.borderWidth || 1,
-      left: el.left,
-      top: el.top,
-      start,
-      end,
-      style: el.borderType,
-      color: el.borderColor,
-      points: ['', /straightConnector/.test(el.shapType) ? 'arrow' : '']
-    }
-    if (/bentConnector/.test(el.shapType)) {
-      data.broken2 = [
-        Math.abs(start[0] - end[0]) / 2,
-        Math.abs(start[1] - end[1]) / 2,
-      ]
-    }
-
-    return data
-  }
 
   // 导入PPTX文件
   const importPPTXFile = (files: FileList) => {
@@ -493,6 +494,7 @@ export default () => {
     importPPTXFile,
     PPTXFileToJson,
     exporting,
+    parseLineElement
   }
 }
 
@@ -664,6 +666,7 @@ export const PPTXFileToJson = (data: File|ArrayBuffer) => {
           }
           else if (el.type === 'shape') {
             if (el.shapType === 'line' || /Connector/.test(el.shapType)) {
+              // 从返回对象中解构出 xx 函数并调用
               const lineElement = parseLineElement(el)
               slide.elements.push(lineElement)
             }

src/renderer/src/AixPPTist/src/store/classcourse.ts

@@ -2,7 +2,7 @@ import { defineStore } from 'pinia'
 import type { Classcourse } from '../api/types'
 
 export interface ClasscourseState {
-  classcourse: Classcourse
+  classcourse: Classcourse | any, // 课堂信息
 }
 
 export const useClasscourseStore = defineStore('classcourse', {

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

@@ -30,7 +30,7 @@
         <Divider />
 
         <!-- 作业列表 -->
-        <div class="c-apt-r">
+        <div class="c-apt-r" v-loading='loadingActive'>
                 <!-- 显示-作业内容 -->
             <template v-for="(item, index) in workList" :key="index">
                 <div class="item">
@@ -45,9 +45,11 @@
             </template>
         </div>
         <!-- // 推送作业 -->
-        <el-dialog v-model="dialogVisible" append-to-body :show-close="false" width="80%" height="500">
+        <el-dialog v-model="dialogVisible" append-to-body :show-close="false" width="90%" height="500">
-            <el-scrollbar height="500">
+            <el-scrollbar height="550">
-                <NewClassTsakAssign :currentCourse='currentCourse' @getData="getData" />
+                <div style="height: 550px;">
+                    <NewClassTsakAssign :currentCourse='currentCourse' @getData="getData" />
+                </div>
             </el-scrollbar>
         </el-dialog>
         <!-- 活动引用 -->
@@ -142,7 +144,6 @@ const currentCourse = reactive<CurrentCourse>({
     worktype: '',
 })
 
-const dataList = ref<WorkItem[]>([])
 const dialogVisible = ref<boolean>(false)
 const tasklist_loading = ref<boolean>(false)
 
@@ -152,11 +153,6 @@ const taskList = ref<WorkItem[]>([])
 // 活动引用的弹窗
 const activeVisible = ref<boolean>(false)
 
-const params = reactive<Params>({
-    parentid: 14766,
-    pageSize: 500,
-    orderby: 'fileidx'
-})
 
 const type = ref<WorkType[]>([
     {
@@ -179,6 +175,8 @@ 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 })
@@ -196,7 +194,6 @@ const formatClassWorkFile = async (postData: WorkItem[]): Promise<void> => {
             }
                 break;
             case '习题训练': {
-                console.log(item,'item');
                 // let workIds = item.quizlist!.map(items => items.id).join(',');
                 // let ress = await listEntpcoursework({ ids: workIds });
                 // const arr = ress.rows.map((item:{id:number}) => {
@@ -213,23 +210,20 @@ const formatClassWorkFile = async (postData: WorkItem[]): Promise<void> => {
             case '常规作业': {
                 // item.prevData = JSON.parse(item.workcodes);
             }
-        }
+        }       
-        const arr = paramData.value.activityContent.split(',')
+        workList.value.push(item)
-        arr.push(item.id.toString()) 
+        loadingActive.value = false
-        await PPTApi.updateSlide(paramData.value)
-        addWorkList(item)
     }
     await nextTick();
-}
+}// 删除作业
-// 添加的活动回显到页面上面去
-const addWorkList = (item: WorkItem) => {
-    workList.value.push(item)
-}
-// 删除作业
 const handleRemoveDemoActivityClassWork = (item: WorkItem) => {
     ElMessageBox.confirm('是否确认删除？')
         .then(() => {
-            workList.value.splice(workList.value.indexOf(item), 1);
+            workList.value = []
+            const arr = paramData.value.activityContent.split(',')
+            const filterArr = arr.filter(itemId => itemId!== item.id.toString())
+            paramData.value.activityContent = filterArr.join(',')
+            upDateData()
         })
         .catch(() => { });
 }
@@ -269,13 +263,51 @@ const savePPtData = async () => {
         ElMessage.warning('请选择活动')
         return
     }
+    workList.value = []
     const arr = selectedWorkList.value.map(item => item.id)
     // 应该是新加而不是覆盖
-    paramData.value.activityContent = arr.join(',')
+    const existingIds = paramData.value.activityContent ? paramData.value.activityContent.split(',') : []
-    await PPTApi.updateSlide(paramData.value)
+    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 = []
+    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()
+    }
+    upDateData()
+    dialogVisible.value = false
+}
+const upDateData = async () => {
+    await PPTApi.updateSlide(paramData.value)
+    loadingActive.value = true
+    const res = await homeworklist({ ids: paramData.value.activityContent, pageSize: 100 })
+    await formatClassWorkFile(res.rows)
+    const resource = sessionStore.get('curr.resource')
+    await PPTApi.getSlideList(resource.id)
+}
+
 onMounted(() => {
     const curNode = sessionStore.get('subject.curNode') as CourseNode
     currentCourse.textbookId = curNode.rootid
@@ -283,33 +315,12 @@ onMounted(() => {
     currentCourse.levelSecondId = curNode.id
     currentCourse.coursetitle = curNode.itemtitle
     currentCourse.node = curNode
-    listEntpcoursefile(params).then((res: { rows: WorkItem[] }) => {
-        dataList.value = [...res.rows]
-    })
     objItem.value = workItem.value[slideIndex.value]
     getCurrentPPtData()
 })
 watch(() => slideIndex.value, () => {
     getCurrentPPtData()
 })
-// 获取当前ppt页的数据
-const getCurrentPPtData = async () => {
-    workList.value = []
-    objItem.value = workItem.value[slideIndex.value]
-    paramData.value.id =  objItem.value.id
-    if (objItem.value?.activityContent) {
-        paramData.value.activityContent = objItem.value?.activityContent
-        const res = await homeworklist({ ids: objItem.value?.activityContent, pageSize: 100 })
-        await formatClassWorkFile(res.rows)
-    }
-}
-
-// 接收习题训练的值
-const getData = async (data: WorkItem) => {
-    console.log(data, 'data')
-    await formatClassWorkFile([data])
-}
-
 </script>
 <style scoped lang="scss">
 .buttonDiv{
@@ -375,5 +386,8 @@ const getData = async (data: WorkItem) => {
       --el-border-color: var(--current-color);
     }
   }
+  .page .page-resource{
+    height: 500px !important;
+  }
 }
 </style>

src/renderer/src/api/apiService.js

@@ -56,4 +56,5 @@ export class Other {
   static baseUrl = "/common/upload"
   //  测试
   static uploadFile = data => ApiService.publicHttp(this.baseUrl, data, 'post', null, 'file')
+  
 }

src/renderer/src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4723712 */
-  src: url('iconfont.woff2?t=1732240267757') format('woff2'),
+  src: url('iconfont.woff2?t=1733880548695') format('woff2'),
-       url('iconfont.woff?t=1732240267757') format('woff'),
+       url('iconfont.woff?t=1733880548695') format('woff'),
-       url('iconfont.ttf?t=1732240267757') format('truetype');
+       url('iconfont.ttf?t=1733880548695') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,26 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-yuyin:before {
+  content: "\e648";
+}
+
+.icon-dianying:before {
+  content: "\e693";
+}
+
+.icon-jiqirenfushi:before {
+  content: "\e624";
+}
+
+.icon-xiangmuicon_maobishufa:before {
+  content: "\e651";
+}
+
+.icon-meishu-F:before {
+  content: "\e638";
+}
+
 .icon-shangchuan:before {
   content: "\e61b";
 }

src/renderer/src/assets/iconfont/iconfont.json

@@ -5,6 +5,41 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "6338162",
+      "name": "语音生成",
+      "font_class": "yuyin",
+      "unicode": "e648",
+      "unicode_decimal": 58952
+    },
+    {
+      "icon_id": "6880941",
+      "name": "视频生成",
+      "font_class": "dianying",
+      "unicode": "e693",
+      "unicode_decimal": 59027
+    },
+    {
+      "icon_id": "11532042",
+      "name": "数字人生成",
+      "font_class": "jiqirenfushi",
+      "unicode": "e624",
+      "unicode_decimal": 58916
+    },
+    {
+      "icon_id": "13522843",
+      "name": "文生图片",
+      "font_class": "xiangmuicon_maobishufa",
+      "unicode": "e651",
+      "unicode_decimal": 58961
+    },
+    {
+      "icon_id": "37635062",
+      "name": "文生连环画",
+      "font_class": "meishu-F",
+      "unicode": "e638",
+      "unicode_decimal": 58936
+    },
     {
       "icon_id": "4942656",
       "name": "上传",

src/renderer/src/components/file-image/index.vue

@@ -36,6 +36,11 @@ const getFileTypeIcon = () => {
     rar: 'icon-rar',
     apt: 'icon-A',
     aippt: 'icon-a-ziyuan91',
+    aiyuyin: 'icon-yuyin', // 语音生成
+    aivideo: 'icon-dianying', // 视频生成
+    airobot: 'icon-jiqirenfushi', // 数字人生成
+    aiimg: 'icon-xiangmuicon_maobishufa', // 文生图片
+    aidraw: 'icon-meishu-F', // 文生连环画
   }
   if (iconObj[name]) {
     return '#' + iconObj[name]

src/renderer/src/components/template-study/container/adjust-dialog.vue

@@ -29,6 +29,20 @@
           </template>
         </div>
       </el-scrollbar>
+      <div class="file-list">
+        <el-dropdown @command="changeFile">
+        <span class="el-dropdown-link">
+          {{ curFile.fileName }}
+          <i class="iconfont icon-xiangxia"></i>
+        </span>
+        <template #dropdown>
+          <el-dropdown-menu>
+            <el-dropdown-item v-for="item in fileList" :command="item" :key="item.id">{{ item.fileName
+              }}</el-dropdown-item>
+          </el-dropdown-menu>
+        </template>
+      </el-dropdown>
+      </div>
       <div class="input-box flex">
         <el-input v-model="textarea"  @keyup.enter="send" :disabled="loaded"/>
         <div class="ipt-icon" @click="send">
@@ -40,13 +54,15 @@
 </template>
 
 <script setup>
-import { ref, reactive, onMounted, watch } from 'vue'
+import { ref, reactive, onMounted, onUnmounted, watch } from 'vue'
-import { completion } from '@/api/mode/index'
+import { completion, docList } from '@/api/mode/index'
 import { sessionStore } from '@/utils/store'
-import { ElMessage } from 'element-plus'
 import { dataSetJson } from '@/utils/comm.js'
+import useUserStore from '@/store/modules/user'
 import emitter from '@/utils/mitt';
 
+const userInfo = useUserStore().user
+
 const textarea = ref('')
 
 const isDialog = defineModel()
@@ -106,7 +122,6 @@ const getCompletion = async (val) => {
 
 const saveAdjust = (item) =>{
   isDialog.value = false
-  ElMessage.success('操作成功')
   emitter.emit('onSaveAdjust', item.msg)
 }
 
@@ -124,6 +139,27 @@ watch(() => props.type, (newVal) => {
 
 }, { immediate: false })
 
+const curFile = reactive({})
+const dataset_id = ref('')
+const fileList = ref([])
+const getList = () =>{
+  docList({
+    userId: userInfo.userId,
+    dataset_id:  dataset_id.value
+  }).then( res =>{
+    fileList.value = res.rows
+    Object.assign(curFile,  fileList.value[0])
+    params.document_ids =  fileList.value[0].docId
+  })
+}
+emitter.on('changeCurFile', (item) =>{
+  changeFile(item)
+})
+const changeFile = (val) =>{
+  Object.assign(curFile, val);
+  params.document_ids = val.docId
+}
+
 
 onMounted(() => {
   let data = sessionStore.get('subject.curNode')
@@ -131,6 +167,15 @@ onMounted(() => {
   Object.assign(curNode, data);
   let jsonKey = `${modeType.value}-${data.edustage}-${data.edusubject}`
   params.dataset_id = dataSetJson[jsonKey]
+  if(props.type == 3){
+    getList()
+  }
+
+})
+
+// 解绑
+onUnmounted(() => {
+  emitter.off('changeCurFile');
 
 })
 
@@ -267,4 +312,9 @@ onMounted(() => {
   transform: scale(0.01);
 }
 }
+
+.file-list{
+  display: flex;
+  margin-bottom: 10px;
+}
 </style>

src/renderer/src/components/template-study/container/keyword-dialog.vue

@@ -2,7 +2,7 @@
   <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' ? '请输入新的模板名称' : isAdd ? '添加提示词' : '编辑提示词' }}</span>
+        <span>{{ item.ex3 == '1' ? '请输入新的模板名称' : item.isAdd ? '添加提示词' : '编辑提示词' }}</span>
         <i class="iconfont icon-guanbi" @click="mode = false"></i>
       </div>
     </template>
@@ -40,10 +40,6 @@ const props = defineProps({
     type: Number,
     default: 1
   },
-  isAdd: {
-    type: Boolean,
-    default: true
-  },
   item: { // 子模板
     type: Object,
     default: () => {
@@ -58,21 +54,27 @@ const form = reactive({
   prompt: '',
 })
 
-watch(() => props.isAdd, (newVal) => {
+
-  if (!newVal) {
+watch(() => mode.value, (newVal) => {
-    form.name = props.item?.name
+  if(newVal){
-    form.prompt = props.item?.prompt
+    if (props.item.isAdd) {
+      form.name = ''
+      form.prompt = ''
+    }
+    else{
+      form.name = props.item?.name
+      form.prompt = props.item?.prompt
+     
+    }
   }
-
+},{ deep: true})
-}, { immediate: false })
-
 
 const loading = ref(false)
 const saveAdd = async () => {
   loading.value = true
   if (props.item.ex3 == '1') {
 
-    if (props.isAdd) {
+    if (props.item.isAdd) {
       try {
         // 系统预设模板 copy一份
         const { msg } = await addKeyWords({ name: form.name, id: props.item.id })
@@ -88,7 +90,7 @@ const saveAdd = async () => {
     }
   } else {
 
-    if (props.isAdd) {
+    if (props.item.isAdd) {
       onAddChildTemp(props.item.id)
     }
     else {

src/renderer/src/components/template-study/container/left-dialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-model="isDialog" :show-close="false" width="900" destroy-on-close>
+  <el-dialog v-model="isDialog" :show-close="false" width="900" append-to-body destroy-on-close>
     <template #header>
       <div class="custom-header flex">
         <span>选择{{ title }}</span>
@@ -7,25 +7,54 @@
       </div>
     </template>
     <div class="dialog-content">
-      <div class="flex">
+
-        <el-radio-group v-model="radio" @change="changeRadio">
-          <el-radio :value="item.value" v-for="item in radioList">{{ item.label }}</el-radio>
-        </el-radio-group>
-      </div>
       <div class="content-list">
         <ul>
-          <li v-for="(item, index) in list" :class="activeIndex == index ? 'li-active' : ''" @click="clickItem(index)">
+          <li v-for="(item, index) in fileList" :class="activeIndex == index ? 'li-active' : ''"
-            <el-image class="img" :src="item.url" />
+            @click="clickItem(index, item)">
-            <span>{{ item.name }}</span>
+            <el-image class="img" :src="url" />
+            <el-button type="primary" class="prev-btn" @click.stop="onPrevItem(item)">预览</el-button>
+            <el-text truncated>{{ item.fileName }}</el-text>
           </li>
         </ul>
       </div>
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <el-button @click="isDialog = false">取消</el-button>
+        <el-upload class="upload-demo" :action="uploadFileUrl" :limit="1" :show-file-list="false" :headers="headers"
-        <el-button type="primary" @click="isDialog = false">
+          :on-success="onSuccess">
-          确定
+          <el-button type="primary">上传</el-button>
+        </el-upload>
+        <div>
+          <el-button @click="isDialog = false">取消</el-button>
+          <el-button type="primary" @click="isDialog = false">
+            确定
+          </el-button>
+        </div>
+      </div>
+    </template>
+  </el-dialog>
+  <el-dialog v-model="prevVisible" fullscreen :show-close="false" class="prev-dialog">
+    <template #header>
+      <div class="custom-header flex">
+        <span>预览</span>
+        <i class="iconfont icon-guanbi" @click="prevVisible = false"></i>
+      </div>
+    </template>
+    <div style="height: calc(100vh - 120px);">
+      <template v-if="getFileSuffix(prevItem.fileUrl) == 'pdf'">
+        <iframe :src="prevItem.fileUrl"
+          frameborder="0" width="100%" height="100%"></iframe>
+      </template>
+      <template v-else>
+        <el-image :src="prevItem.fileUrl" style="height:100%"/>
+      </template>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <div></div>
+        <el-button type="primary" @click="prevVisible = false">
+          关闭
         </el-button>
       </div>
     </template>
@@ -33,11 +62,24 @@
 </template>
 
 <script setup>
-import { ref, computed } from 'vue'
+import { ref, computed, onMounted, reactive } from 'vue'
+import { completion, addDoc, docList } from '@/api/mode/index.js'
+import { getToken } from "@/utils/auth";
+import { sessionStore } from '@/utils/store'
+import { dataSetJson } from '@/utils/comm.js'
+import { ElMessage } from 'element-plus'
+import useUserStore from '@/store/modules/user'
+import { getFileSuffix } from '@/utils/ruoyi.js'
+import emitter from '@/utils/mitt';
+
+const userInfo = useUserStore().user
+const uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload");
+const headers = ref({ Authorization: "Bearer " + getToken() });
 
 const url = 'https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fsafe-img.xhscdn.com%2Fbw1%2F11044b08-04c1-41a0-a453-1fd20b58a614%3FimageView2%2F2%2Fw%2F1080%2Fformat%2Fjpg&refer=http%3A%2F%2Fsafe-img.xhscdn.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1732953359&t=7ab1d1b3a903db85b1149914407aea35'
 
 const isDialog = defineModel()
+const prevVisible = ref(false)
 
 const props = defineProps({
   modeType: {
@@ -52,14 +94,13 @@ const title = computed(() => {
   if (props.modeType == 3) return '考试';
 })
 
-
 const radio = ref(1)
 const radioList = ref([
   { label: '浏览研读', value: 1 },
-  // { label: '跨学科研读', value: 2 },
+  { label: '跨学科研读', value: 2 },
-  // { label: '跨学段研读', value: 3 },
+  { label: '跨学段研读', value: 3 },
-  // { label: '课标修订研读', value: 4 },
+  { label: '课标修订研读', value: 4 },
-  // { label: '自由研读', value: 5 },
+  { label: '自由研读', value: 5 },
 ])
 const list = ref([
   {
@@ -76,15 +117,70 @@ const changeRadio = () => {
     })
   }
 }
+const activeIndex = ref(0)
 
-const activeIndex = ref(-1)
+const dataset_id = ref('')
 
-const clickItem = (index) => {
+// 上传成功
-  activeIndex.value = index
+const onSuccess = async (response) => {
+  let data = {
+    url: response.url,
+    dataset_id: dataset_id.value
+  }
+  const res = await completion(data)
+
+  if (res.data.code != 200) return
+  let docData = {
+    fileUrl: response.url,
+    fileId: response.file.id,
+    fileName: response.file.fileName,
+    filesize: response.file.fileSize,
+    datasetId: dataset_id.value,
+    docId: res.data.document_id,
+    edustage: curNode.edustage,
+    edusubject: curNode.edusubject
+  }
+  const { msg } = await addDoc(docData)
+  ElMessage.success(msg)
+  getList()
+
+}
+const curNode = reactive({})
+
+const fileList = ref([])
+const curFile = reactive({})
+const getList = () => {
+  docList({
+    userId: userInfo.userId,
+    dataset_id: dataset_id.value
+  }).then(res => {
+    fileList.value = [...res.rows]
+    Object.assign(curFile, fileList.value[0])
+  })
 }
 
-</script>
+const clickItem = (index, item) => {
+  activeIndex.value = index
+  Object.assign(curFile, item)
+  emitter.emit('changeCurFile', item)
+}
 
+const prevItem = reactive({})
+const onPrevItem = (item) => {
+  Object.assign(prevItem, item)
+  prevVisible.value = true
+}
+
+onMounted(() => {
+  let data = sessionStore.get('subject.curNode')
+  Object.assign(curNode, data);
+  // 暂时写死"考试-" 目前只有考试分析才会弹出来
+  let jsonKey = `考试-${curNode.edustage}-${curNode.edusubject}`
+  dataset_id.value = dataSetJson[jsonKey]
+  getList()
+})
+
+</script>
 <style lang="scss" scoped>
 .custom-header {
   justify-content: space-between;
@@ -98,13 +194,16 @@ const clickItem = (index) => {
 
 .dialog-content {
   padding-top: 10px;
+
   .content-list {
     padding-top: 10px;
+
     ul {
       display: flex;
       flex-wrap: wrap;
 
       li {
+        width: 130px;
         display: flex;
         flex-direction: column;
         font-size: 13px;
@@ -114,9 +213,11 @@ const clickItem = (index) => {
         overflow: hidden;
         margin-right: 20px;
         margin-bottom: 10px;
+        position: relative;
+        overflow: hidden;
 
         .img {
-          width: 100px;
+          width: 100%;
           height: 130px;
           border: solid #ccc 1px;
           margin-bottom: 10px;
@@ -125,6 +226,10 @@ const clickItem = (index) => {
         &:hover {
           background: #E0EAFF;
         }
+
+        &:hover .prev-btn {
+          transform: translate(-50%, -40px)
+        }
       }
 
       .li-active {
@@ -134,4 +239,20 @@ const clickItem = (index) => {
     }
   }
 }
+
+.dialog-footer {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.prev-btn {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%) translateY(-110px);
+  /* 按钮初始位置在容器外 */
+  transition: transform 0.3s ease-in-out;
+  /* 设置过渡效果 */
+}
 </style>

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

@@ -2,12 +2,13 @@
   <div class="container-left-page flex">
     <div class="container-left-header flex">
       <el-button link @click="onClick">
-        {{ curNode.edustage }}{{ curNode.edusubject }}{{ type == 1 ? '课标研读' : '教材分析' }}<i
+        {{ curNode.edustage }}{{ curNode.edusubject }}{{ type == 1 ? '课标研读' : type == 2 ? '教材分析' : '考试分析' }}<i
           class="iconfont icon-xiangxia"></i>
       </el-button>
     </div>
     <div class="container-left-pdf">
       <PDF :url="pdfUrl" :showCatalog="false" v-if="pdfUrl" />
+      <el-empty v-else description="暂无数据" />
     </div>
     <!--弹窗-->
     <LeftDialog v-model="showDialog" :modeType="type" />
@@ -24,7 +25,7 @@ const props = defineProps(['curNode', 'type'])
 
 const showDialog = ref(false)
 const onClick = () => {
-  if (props.type == 1) return
+  if (props.type != 3) return
   showDialog.value = true
 }
 
@@ -37,7 +38,9 @@ onMounted(async () => {
   if(props.type == 1){
     fileurl = `${data.edustage}-${data.edusubject}-课标.txt`
   }
+  if(fileurl == '') return
   pdfUrl.value = import.meta.env.VITE_APP_RES_FILE_PATH + fileurl.replace('.txt', '.pdf')
+  
 })
 </script>
 

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

@@ -39,7 +39,7 @@
                   <i class="iconfont icon-shenglvehao"></i></el-button>
               </template>
               <template #default>
-                <el-button type="primary" link @click="editKeyWord(item)">编辑</el-button>
+                <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>
@@ -79,7 +79,7 @@
   <!--AI 对话调整-->
   <AdjustDialog v-model="isAdjust" :type="type" :item="editItem" />
   <!--添加、编辑提示词-->
-  <keywordDialog v-model="isWordDialog" :isAdd="isAdd" :item="editItem" />
+  <keywordDialog v-model="isWordDialog" :item="editItem" />
 </template>
 
 <script setup>
@@ -105,21 +105,22 @@ const props = defineProps(['curNode', 'type'])
  */
 
 const isWordDialog = ref(false)
-const isAdd = ref(false)
 const editItem = reactive({})
 const onAdd = () => {
-  isAdd.value = true
+
   Object.assign(editItem, curTemplate)
+  editItem.isAdd = true
   isWordDialog.value = true
 }
 
 const editKeyWord = (item, val) => {
   /**
-   * isAdd: 字模板中的移除 为编辑  头部删除 添加提示词为新增
+   * isAdd: 子模板中的移除 为编辑false  头部删除 添加提示词为新增 true
    */
-  isAdd.value = val
   Object.assign(editItem, item)
+  editItem.isAdd = val
   isWordDialog.value = true
+ 
 }
 
 /*******************模板相关**********************/
@@ -361,8 +362,8 @@ emitter.on('onSaveAdjust', (item) => {
 
 // 保存 重新研读后的结果
 const onEditSave = async (item) => {
-  const { res } = await editTempResult({ id: item.resultId, content: item.answer })
+  const { msg } = await editTempResult({ id: item.resultId, content: item.answer })
-  ElMessage.success(res)
+  ElMessage.success(msg)
   getChildTemplate()
 }
 

src/renderer/src/components/typing-effect/index.vue

@@ -8,7 +8,7 @@
     readonly
     resize="none"
     style="width: 100%;"
-    input-style="border:none;outline: none;box-shadow:none;color:000;fontSize:15px"
+    input-style="border:none;outline: none;box-shadow:none;color:000;fontSize:14px"
   />
   </div>
 </template>
@@ -71,9 +71,6 @@ watch([() => props.text, () => props.delay], resetAndType);
 </script>
 
 <style scoped>
-.typing-effect {
-  font-family: monospace;
-}
 :deep(.el-textarea__inner:hover){
   box-shadow: none;
 }

src/renderer/src/plugins/imChat/msgEnum.js

@@ -56,6 +56,8 @@ export class MsgEnum {
    */
   static HEADS = {
     // === 旧定义-消息头(兼容以前) ===
+    /** @desc: 开课 */
+    MSG_open : 'open',
     /** @desc: 结束课程(下课) */
     MSG_closed : 'closed',
     /** @desc: 在线状态 */
@@ -93,6 +95,8 @@ export class MsgEnum {
     /** @desc: 课堂讲授活动，选择不同的内容 */
     MSG_classlecturePagesrc : 'classlecturePagesrc',
     // === 新定义-消息头 ===
+    /** @desc: 课程创建-待开课 */
+    MSG_0000: 0x0000,
     /** @desc: 点赞 */
     MSG_0001: 0x0001,
     /** @desc: 疑惑 */

src/renderer/src/plugins/modal.js

@@ -5,51 +5,51 @@ let loadingInstance;
 export default {
   // 消息提示
   msg(content) {
-    ElMessage.info(content)
+    return ElMessage.info(content)
   },
   // 错误消息
   msgError(content) {
-    ElMessage.error(content)
+    return ElMessage.error(content)
   },
   // 成功消息
   msgSuccess(content) {
-    ElMessage.success(content)
+    return ElMessage.success(content)
   },
   // 警告消息
   msgWarning(content) {
-    ElMessage.warning(content)
+    return ElMessage.warning(content)
   },
   // 弹出提示
-  alert(content) {
+  alert(content, option = {}) {
-    ElMessageBox.alert(content, "系统提示")
+    return ElMessageBox.alert(content, "系统提示", option)
   },
   // 错误提示
-  alertError(content) {
+  alertError(content, option = {}) {
-    ElMessageBox.alert(content, "系统提示", { type: 'error' })
+    return ElMessageBox.alert(content, "系统提示", { type: 'error', ...option })
   },
   // 成功提示
-  alertSuccess(content) {
+  alertSuccess(content, option = {}) {
-    ElMessageBox.alert(content, "系统提示", { type: 'success' })
+    return ElMessageBox.alert(content, "系统提示", { type: 'success', ...option })
   },
   // 警告提示
-  alertWarning(content) {
+  alertWarning(content, option = {}) {
-    ElMessageBox.alert(content, "系统提示", { type: 'warning' })
+    return ElMessageBox.alert(content, "系统提示", { type: 'warning', ...option })
   },
   // 通知提示
   notify(content) {
-    ElNotification.info(content)
+    return ElNotification.info(content)
   },
   // 错误通知
   notifyError(content) {
-    ElNotification.error(content);
+    return ElNotification.error(content);
   },
   // 成功通知
   notifySuccess(content) {
-    ElNotification.success(content)
+    return ElNotification.success(content)
   },
   // 警告通知
   notifyWarning(content) {
-    ElNotification.warning(content)
+    return ElNotification.warning(content)
   },
   // 确认窗体
   confirm(content) {
@@ -78,5 +78,8 @@ export default {
   // 关闭遮罩层
   closeLoading() {
     loadingInstance.close();
-  }
+  },
+  // messageBox: opt => ElMessageBox(opt),
+  // 其他实例放出去，方便调用
+  ElMessage, ElMessageBox, ElNotification, ElLoading
 }

src/renderer/src/plugins/socket/index.js

@@ -8,6 +8,7 @@ import useUserStore from '@/store/modules/user' // 用户信息
 export class ChatWs {
   instance = null; // 实例
   id = null; // 群聊id || 单聊id-用户id(userId)
+  url = null; // ws地址
   closed = false; // 关闭状态
   onmessage = null; // 自定义处理
   errCount = 5; // 重连次数 (ms) 暂时不使用
@@ -19,12 +20,16 @@ export class ChatWs {
     beat: 'heart_beat', // 心跳
   }
   static base = 'wss://file.ysaix.com:7868'
-  constructor() {
+
+  // 构造函数 是否自动连接
+  constructor(bool = true) {
     if (!ChatWs.instance) {
-      const userStore = useUserStore() // 用户信息
+      if (bool) { // 是否自动连接
-      const wsBase = import.meta.env.VITE_APP_WS_URL; // ws地址
+        const userStore = useUserStore() // 用户信息
-      const url = `${wsBase||ChatWs.base}/ws/websocket/${userStore.id}`;
+        const wsBase = import.meta.env.VITE_APP_WS_URL; // ws地址
-      this.init(url);
+        this.url = `${wsBase||ChatWs.base}/ws/websocket/${userStore.id}`;
+        // this.init(url);
+      }
       ChatWs.instance = this;
     }
     return ChatWs.instance;
@@ -32,11 +37,11 @@ export class ChatWs {
 
   // 初始化
   init(url) {
-    this.url = url;
+    !!url && (this.url = url);
     this.ws = null;
     const _this = this
     this.heartCheck = {
-      timeout: 1000 * 10, // 60s
+      timeout: 1000 * 60, // 60s
       timeoutObj: null,
       serverTimeoutObj: null,
       reset() {
@@ -78,10 +83,9 @@ export class ChatWs {
       // 拿到任何消息都说明当前连接是正常的
       const isBeat = e.data == 'pong'
       isBeat && self.heartCheck.reset().start();
-      const exts = ['sessionId', 'pong'] // 不处理的消息头
       const isEmpty = !e.data
-      const isExts = exts.some(item => e.data.includes(item))
+      const isExts = e.data.includes('sessionId') || e.data == ('pong')
-      if (isEmpty && isExts) return;
+      if (isEmpty || isExts) return;
       // 自定义处理
       self.onmessage && self.onmessage(e.data, e);
     };
@@ -118,12 +122,12 @@ export class ChatWs {
     this.ws.send(msg)
   }
   // 发送消息-带消息头(key)
-  sendMsg(head, content, option = {}) {
+  sendMsg(head, content, option = {}, ...arg) {
-    if (!head) throw new Error("head is not null")
+    if (!head && head!==0) throw new Error("head is not null")
-    if (!content) throw new Error("content is not null")
+    if (!content && content!==0) throw new Error("content is not null")
     let msg = { head, content, ...option }
     // 发送消息
-    this.send(this.getMsgObj(msg))
+    this.send(this.getMsgObj(msg, ...arg))
   }
   // 发送心跳
   sendMsgBeat() {
@@ -137,7 +141,7 @@ export class ChatWs {
    * @param {*} id 群聊id || 单聊id-用户id(userId)
    */
   getMsgObj(msg, chatType = 'group', id) {
-    if (typeof msg === "object") msg = JSON.stringify(msg)
+    // if (typeof msg === "object") msg = JSON.stringify(msg)
     const res = {msg, chatType}
     // if (!id) throw new Error(`${type=='group'?'群ID':'用户ID'} is not null`)
     if (chatType == 'group') res.groupId = id || this.id || ''
@@ -160,5 +164,6 @@ export class ChatWs {
 }
 // 连接socket
 export const connect = () => new ChatWs()
+export const getInstance = () => new ChatWs(false)
 // 默认实例
 export default new ChatWs()

src/renderer/src/views/classManage/reserv-item-apt.vue

@@ -7,15 +7,20 @@
       <span>{{item.caption}}</span>
     </div>
     <div class="class-reserv-item-tool" style="width: 200px;max-width: 300px">
-      <el-tag v-if="item.status === 'closed'" style="margin-right: 5px" type="success">已结束</el-tag>
+      <el-tag v-if="item.status === ''" style="margin-right: 5px" type="warning">待开课</el-tag>
-      <el-tag v-if="item.status === 'open'" style="margin-right: 5px" type="danger">上课中</el-tag>
+      <el-tag v-else-if="item.status === 'closed'" style="margin-right: 5px" type="success">已结束</el-tag>
-      <el-button v-if="item.status === 'open'" :disabled="toolStore.isToolWin" size="small" type="primary" @click="startClassR(item)"
+      <el-tag v-else-if="item.status === 'open'" style="margin-right: 5px" type="danger">上课中</el-tag>
-      >继续上课</el-button
+      <template v-if="!item.status">
-      >
+        <el-button size="small" type="primary" :icon="ChatDotRound" @click="chatSend()">上课(APP)</el-button>
-      <!--      <el-button v-if="item.status === '未开始'" @click="openEdit">编辑</el-button>-->
+      </template>
-      <el-button v-if="item.status === 'open'" :loading="loading" size="small" type="info" @click="endClassR(item)"
+      <template v-else-if="item.status === 'open'">
-      >下课{{ loading?'中...':'' }}</el-button
+        <el-button :disabled="toolStore.isToolWin" size="small" type="primary" @click="startClassR(item)"
-      >
+        >继续上课</el-button
+        >
+        <!--<el-button v-if="item.status === '未开始'" @click="openEdit">编辑</el-button>-->
+        <el-button :loading="loading" size="small" type="info" @click="endClassR(item)"
+        >下课{{ loading?'中...':'' }}</el-button>
+      </template>
     </div>
     <div class="class-reserv-item-tool" style="width: 50px;">
 <!--      <el-button v-if="item.status!='open'" size="small" type="danger" @click="deleteReserv">删除</el-button>-->
@@ -25,10 +30,12 @@
   </div>
 </template>
 <script setup>
-import { ref } from 'vue'
+import { ref, reactive } from 'vue'
 import { useToolState } from '@/store/modules/tool'
 import { deleteSmartReserv } from '@/api/classManage'
 import { ElMessage } from 'element-plus'
+import { ChatDotRound } from '@element-plus/icons-vue'
+
 const emit = defineEmits(['openEdit', 'deleteReserv', 'change'])
 const props = defineProps({
   item: {
@@ -39,6 +46,7 @@ const props = defineProps({
 const basePath = import.meta.env.VITE_APP_BUILD_BASE_PATH
 const toolStore = useToolState() // 获取状态管理-tool
 const loading = ref(false)  // 下课中的loading
+const msg = reactive({ id: null, time: null }) // 发送消息的对象
 const openEdit = () => {
   emit('openEdit', props.item)
 }
@@ -61,6 +69,18 @@ const startClassR = (item) => {
 const endClassR = (item) => {
   emit('change', 'close', item, { type: 2, loading })
 }
+// 发送上课消息
+const chatSend = () => {
+  const time = Date.now()
+  if(msg.id) { // 同一个人30秒内不能重复发送
+    const isEq = msg.id == props.item.id && (time - msg.time) < 30 * 1000
+    if(isEq) return ElMessage.warning('请勿重复发送(30秒内)!')
+  } else { // 记录发送信息
+    msg.id = props.item.id
+    msg.time = time
+  }
+  emit('change', 'wsApp', props.item)
+}
 
 </script>
 <style scoped lang="scss">

src/renderer/src/views/classTask/newClassTaskAssign/index.vue

@@ -157,6 +157,7 @@ const props = defineProps({
   currentCourse: Object,
 })
 const emits = defineEmits(['getData'])
+// 这个代表的是是否从ppt里面添加的作业
 const isShow = ref(false)
 
 const propsQueryCourseObj = route.query.courseObj;//作业布置的内容对象
@@ -490,11 +491,13 @@ const handleClassWorkFormQuizRemove = (index) =>{
 
 
       // 当前为[编辑]状态下点进来得处理  newWorkSpaceEdit true 为编辑状态
-      if(classWorkForm.id != '' ) {// 编辑状态 有id
+      if(isShow.value === false){
-
+        if(classWorkForm.id != '' ) {// 编辑状态 有id
-        editWork(cform); // 编辑作业
+          editWork(cform); // 编辑作业
         return;
+        }
       }
+      
 
       if (classWorkForm.worktype === "课堂展示") {
         boardLoading.value = true
@@ -596,7 +599,11 @@ const handleClassWorkFormQuizRemove = (index) =>{
       }
       console.log('该清空左侧列表数据了');
       // 清空左侧 选中的布置列表 并刷新列表
-      currentRow.value = {id:0};
+      if(isShow.value){
+        currentRow.value = {id:1};
+      }else{
+        currentRow.value = {id:0};
+      }
       initHomeWork();
 
 

src/renderer/src/views/examination-analysis/container/adjust-dialog.vue

@@ -1,306 +0,0 @@
-<template>
-  <el-dialog v-model="isDialog" :show-close="false" width="800" destroy-on-close>
-    <template #header>
-      <div class="custom-header flex">
-        <span>{{ item.name }}</span>
-        <i class="iconfont icon-guanbi" @click="isDialog = false"></i>
-      </div>
-    </template>
-    <div class="dialog-content">
-      <el-scrollbar height="400px">
-        <div class="chart-con flex">
-          <template v-for="item in msgList">
-            <div class="flex-end flex" v-if="item.type == 'user'">
-              <div class="chart-item user">{{ item.msg }}</div>
-            </div>
-            <div class="flex-start flex" v-else>
-              <div class="flex" v-loading="!item.msg">
-                <div class="chart-item robot">{{ item.msg }}</div>
-              </div>
-              <div class="flex flex-end replace-item">
-                <span @click="saveAdjust(item)"><i class="iconfont icon-tihuan"></i>替换分析结果</span>
-              </div>
-            </div>
-            <div v-if="loaded" class="chart-loading">
-              <div></div>
-              <div></div>
-              <div></div>
-            </div>
-          </template>
-        </div>
-      </el-scrollbar>
-      <div class="file-list">
-        <el-dropdown @command="changeFile">
-        <span class="el-dropdown-link">
-          {{ curFile.fileName }}
-          <i class="iconfont icon-xiangxia"></i>
-        </span>
-        <template #dropdown>
-          <el-dropdown-menu>
-            <el-dropdown-item v-for="item in fileList" :command="item" :key="item.id">{{ item.fileName
-              }}</el-dropdown-item>
-          </el-dropdown-menu>
-        </template>
-      </el-dropdown>
-      </div>
-      <div class="input-box flex">
-        <el-input v-model="textarea"  @keyup.enter="send" :disabled="loaded"/>
-        <div class="ipt-icon" @click="send">
-          <i class="iconfont icon-fasong"></i>
-        </div>
-      </div>
-    </div>
-  </el-dialog>
-</template>
-
-<script setup>
-import { ref, reactive, onMounted } from 'vue'
-import { conversation, completion, docList } from '@/api/mode/index'
-import { sessionStore } from '@/utils/store'
-import { ElMessage } from 'element-plus'
-import { dataSetJson } from '@/utils/comm.js'
-import useUserStore from '@/store/modules/user'
-import emitter from '@/utils/mitt';
-
-const userInfo = useUserStore().user
-const textarea = ref('')
-
-const isDialog = defineModel()
-
-const props = defineProps({
-  item: {
-    type: Object,
-    default: () => {
-      return { name: '11' }
-    }
-  },
-  modeType: {
-    type: Number,
-    default: 1
-  }
-})
-
-const emit = defineEmits(['saveEdit'])
-
-const loaded = ref(false)
-
-const msgList = ref([])
-
-const send = () =>{
-  if(loaded.value) return
-  msgList.value.push({
-    type: 'user',
-    msg: textarea.value
-  })
-  loaded.value = true
-  getConversation(textarea.value)
-  textarea.value = ''
-}
-const curNode = reactive({})
-const params = reactive(
-  {
-    prompt: '',
-    dataset_id: '',
-    document_ids: '',
-  }
-)
-// 获取会话ID
-const getConversation =  (val) => {
-
- getCompletion(val)
-}
-// 大模型对话
-const getCompletion = async (val) => {
-  try {
-
-    params.prompt = `按照${val}的要求，针对${curNode.edustage}${curNode.edusubject}考试 对${curNode.itemtitle}进行教学分析`
-    const { data } = await completion(params)
-    let answer = data.answer
-    msgList.value.push({
-      type: 'robot',
-      msg: answer,
-    })
-
-  } finally {
-    loaded.value = false
-  }
-}
-
-const saveAdjust = (item) =>{
-  emit('saveAdjust', item.msg)
-  isDialog.value = false
-  ElMessage.success('操作成功')
-}
-
-
-const curFile = reactive({})
-const dataset_id = ref('')
-const fileList = ref([])
-const getList = () =>{
-  docList({
-    userId: userInfo.userId,
-    dataset_id:  dataset_id.value
-  }).then( res =>{
-    fileList.value = res.rows
-    Object.assign(curFile,  fileList.value[0])
-    params.document_ids =  fileList.value[0].docId
-  })
-}
-emitter.on('curFile', (item) =>{
-  changeFile(item)
-})
-const changeFile = (val) =>{
-  Object.assign(curFile, val);
-  params.document_ids = val.docId
-}
-
-onMounted(() => {
-  let data = sessionStore.get('subject.curNode')
-  Object.assign(curNode, data);
-  let text = props.modeType == 1 ||props.modeType == 2 ? '课标' : '考试'
-
-  let jsonKey = `${text}-${data.edustage}-${data.edusubject}`
-  params.dataset_id = dataSetJson[jsonKey]
-  dataset_id.value = dataSetJson[jsonKey]
-  getList()
-})
-
-</script>
-
-<style lang="scss" scoped>
-.custom-header {
-  justify-content: space-between;
-  align-items: center;
-
-  .icon-guanbi {
-    cursor: pointer;
-    font-weight: bold;
-  }
-}
-
-.dialog-content {
-  padding-top: 10px;
-  padding-bottom: 20px;
-
-  .chart-con {
-    flex-direction: column;
-    align-items: flex-start;
-    .flex-end{
-      width: 100%;
-      justify-content: flex-end;
-    }
-    .flex-start{
-      width: 100%;
-      justify-content: flex-start;
-      flex-direction: column;
-
-    }
-    .chart-item {
-      border-radius: 5px;
-      padding: 5px;
-      text-align: left;
-    }
-
-    .user {
-      background: #F2F2F2;
-      margin-bottom: 10px;
-
-    }
-
-    .robot {
-      background: #409EFF;
-      color: #FFF;
-    }
-    .replace-item{
-      font-size: 12px;
-      color: #409EFF;
-      align-items: center;
-      cursor: pointer;
-    }
-  }
-
-  .input-box {
-    position: relative;
-
-    .ipt-icon {
-      cursor: pointer;
-      padding: 0 5px;
-      .icon-fasong {
-        font-size: 26px;
-        color: #409EFF;
-
-      }
-    }
-
-  }
-}
-.chart-loading,
-.chart-loading>div {
-  position: relative;
-  box-sizing: border-box;
-}
-
-.chart-loading {
-  display: block;
-  font-size: 0;
-  color: #66b1ff;
-}
-
-.chart-loading.la-dark {
-  color: #66b1ff;
-}
-
-.chart-loading>div {
-  display: inline-block;
-  float: none;
-  background-color: currentColor;
-  border: 0 solid currentColor;
-}
-
-.chart-loading {
-  width: 54px;
-  height: 18px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.chart-loading>div:nth-child(1) {
-  animation-delay: -200ms;
-}
-
-.chart-loading>div:nth-child(2) {
-  animation-delay: -100ms;
-}
-
-.chart-loading>div:nth-child(3) {
-  animation-delay: 0ms;
-}
-
-.chart-loading>div {
-  width: 8px;
-  height: 8px;
-  border-radius: 100%;
-  margin-right: 4px;
-  animation: ball-pulse 1s ease infinite;
-}
-@keyframes ball-pulse {
-
-0%,
-60%,
-100% {
-  opacity: 1;
-  transform: scale(1);
-}
-
-30% {
-  opacity: 0.1;
-  transform: scale(0.01);
-}
-}
-
-.file-list{
-  display: flex;
-  margin-bottom: 10px;
-}
-</style>

src/renderer/src/views/examination-analysis/container/dialog.vue

@@ -1,268 +0,0 @@
-<template>
-  <el-dialog v-model="isDialog" :show-close="false" width="900" append-to-body destroy-on-close>
-    <template #header>
-      <div class="custom-header flex">
-        <span>选择{{ title }}</span>
-        <i class="iconfont icon-guanbi" @click="isDialog = false"></i>
-      </div>
-    </template>
-    <div class="dialog-content">
-      <div class="flex dialog-top">
-        <!-- <el-radio-group v-model="radio" @change="changeRadio">
-          <el-radio :value="item.value" v-for="item in radioList">{{ item.label }}</el-radio>
-        </el-radio-group> -->
-
-      </div>
-      <div class="content-list">
-        <ul>
-          <li v-for="(item, index) in fileList" :class="activeIndex == index ? 'li-active' : ''"
-            @click="clickItem(index, item)">
-            <el-image class="img" :src="url" />
-            <el-button type="primary" class="prev-btn" @click.stop="onPrevItem(item)">预览</el-button>
-            <el-text truncated>{{ item.fileName }}</el-text>
-          </li>
-        </ul>
-      </div>
-    </div>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-upload class="upload-demo" :action="uploadFileUrl" :limit="1" :show-file-list="false" :headers="headers"
-          :on-success="onSuccess">
-          <el-button type="primary">上传</el-button>
-        </el-upload>
-        <div>
-          <el-button @click="isDialog = false">取消</el-button>
-          <el-button type="primary" @click="isDialog = false">
-            确定
-          </el-button>
-        </div>
-      </div>
-    </template>
-  </el-dialog>
-  <el-dialog v-model="prevVisible" fullscreen :show-close="false" class="prev-dialog">
-    <template #header>
-      <div class="custom-header flex">
-        <span>预览</span>
-        <i class="iconfont icon-guanbi" @click="prevVisible = false"></i>
-      </div>
-    </template>
-    <div style="height: calc(100vh - 120px);">
-      <template v-if="getFileSuffix(prevItem.fileUrl) == 'pdf'">
-        <iframe :src="prevItem.fileUrl"
-          frameborder="0" width="100%" height="100%"></iframe>
-      </template>
-      <template v-else>
-        <el-image :src="prevItem.fileUrl" style="height:100%"/>
-      </template>
-    </div>
-    <template #footer>
-      <div class="dialog-footer">
-        <div></div>
-        <el-button type="primary" @click="prevVisible = false">
-          关闭
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
-</template>
-
-<script setup>
-import { ref, computed, onMounted, reactive } from 'vue'
-import { completion, addDoc, docList } from '@/api/mode/index.js'
-import { getToken } from "@/utils/auth";
-import { sessionStore } from '@/utils/store'
-import { dataSetJson } from '@/utils/comm.js'
-import { ElMessage } from 'element-plus'
-import useUserStore from '@/store/modules/user'
-import { getFileSuffix } from '@/utils/ruoyi.js'
-import emitter from '@/utils/mitt';
-
-const userInfo = useUserStore().user
-const uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload");
-const headers = ref({ Authorization: "Bearer " + getToken() });
-
-const url = 'https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fsafe-img.xhscdn.com%2Fbw1%2F11044b08-04c1-41a0-a453-1fd20b58a614%3FimageView2%2F2%2Fw%2F1080%2Fformat%2Fjpg&refer=http%3A%2F%2Fsafe-img.xhscdn.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1732953359&t=7ab1d1b3a903db85b1149914407aea35'
-
-const isDialog = defineModel()
-const prevVisible = ref(false)
-
-const props = defineProps({
-  modeType: {
-    type: Number,
-    default: 1
-  }
-})
-
-const title = computed(() => {
-  if (props.modeType == 1) return '课标';
-  if (props.modeType == 2) return '教材';
-  if (props.modeType == 3) return '考试';
-})
-
-
-const radio = ref(1)
-const radioList = ref([
-  { label: '浏览研读', value: 1 },
-  { label: '跨学科研读', value: 2 },
-  { label: '跨学段研读', value: 3 },
-  { label: '课标修订研读', value: 4 },
-  { label: '自由研读', value: 5 },
-])
-const list = ref([
-  {
-    name: '高中语文课程标准',
-    url
-  }
-])
-const changeRadio = () => {
-  list.value = []
-  for (let i = 0; i < Math.floor(Math.random() * 5) + 1; i++) {
-    list.value.push({
-      name: '高中语文课程标准',
-      url
-    })
-  }
-}
-const activeIndex = ref(0)
-
-const dataset_id = ref('')
-
-// 上传成功
-const onSuccess = async (response) => {
-  let data = {
-    url: response.url,
-    dataset_id: dataset_id.value
-  }
-  const res = await completion(data)
-
-  if (res.data.code != 200) return
-  let docData = {
-    fileUrl: response.url,
-    fileId: response.file.id,
-    fileName: response.file.fileName,
-    filesize: response.file.fileSize,
-    datasetId: dataset_id.value,
-    docId: res.data.document_id,
-    edustage: curNode.edustage,
-    edusubject: curNode.edusubject
-  }
-  const { msg } = await addDoc(docData)
-  ElMessage.success(msg)
-  getList()
-
-}
-const curNode = reactive({})
-
-const fileList = ref([])
-const curFile = reactive({})
-const getList = () => {
-  docList({
-    userId: userInfo.userId,
-    dataset_id: dataset_id.value
-  }).then(res => {
-    fileList.value = [...res.rows]
-    Object.assign(curFile, fileList.value[0])
-  })
-}
-
-const clickItem = (index, item) => {
-  activeIndex.value = index
-  Object.assign(curFile, item)
-  emitter.emit('curFile', item)
-}
-
-const prevItem = reactive({})
-const onPrevItem = (item) => {
-  Object.assign(prevItem, item)
-  prevVisible.value = true
-}
-
-onMounted(() => {
-  let data = sessionStore.get('subject.curNode')
-  Object.assign(curNode, data);
-
-  let jsonKey = `考试-${curNode.edustage}-${curNode.edusubject}`
-  dataset_id.value = dataSetJson[jsonKey]
-  getList()
-})
-
-</script>
-<style lang="scss" scoped>
-.custom-header {
-  justify-content: space-between;
-  align-items: center;
-
-  .icon-guanbi {
-    cursor: pointer;
-    font-weight: bold;
-  }
-}
-
-.dialog-content {
-  padding-top: 10px;
-
-  .dialog-top {
-    justify-content: space-between;
-  }
-
-  .content-list {
-    padding-top: 10px;
-
-    ul {
-      display: flex;
-      flex-wrap: wrap;
-
-      li {
-        width: 130px;
-        display: flex;
-        flex-direction: column;
-        font-size: 13px;
-        padding: 10px;
-        cursor: pointer;
-        border-radius: 5px;
-        overflow: hidden;
-        margin-right: 20px;
-        margin-bottom: 10px;
-        position: relative;
-        overflow: hidden;
-
-        .img {
-          width: 100%;
-          height: 130px;
-          border: solid #ccc 1px;
-          margin-bottom: 10px;
-        }
-
-        &:hover {
-          background: #E0EAFF;
-        }
-
-        &:hover .prev-btn {
-          transform: translate(-50%, -50%)
-        }
-      }
-
-      .li-active {
-        background: #E0EAFF;
-      }
-
-    }
-  }
-}
-
-.dialog-footer {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-
-.prev-btn {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%) translateY(-110px);
-  /* 按钮初始位置在容器外 */
-  transition: transform 0.3s ease-in-out;
-  /* 设置过渡效果 */
-}
-</style>

src/renderer/src/views/examination-analysis/container/edit-dialog.vue

@@ -1,78 +0,0 @@
-<template>
-  <el-dialog v-model="isDialog" :show-close="false" width="900">
-    <template #header>
-      <div class="custom-header flex">
-        <span>{{ item.name }}</span>
-        <i class="iconfont icon-guanbi" @click="isDialog = false"></i>
-      </div>
-    </template>
-    <div class="dialog-content">
-      <el-row>
-        <el-col :span="24">
-          <el-input v-model="textarea" :autosize="{ minRows: 5, maxRows: 15 }" type="textarea" />
-        </el-col>
-      </el-row>
-
-    </div>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button @click="isDialog = false">取消</el-button>
-        <el-button type="primary" @click="onSave">
-          确定
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
-</template>
-
-<script setup>
-import { ref, watch} from 'vue'
-import { ElMessage } from 'element-plus'
-import { editTempResult } from '@/api/mode/index.js'
-
-const textarea = ref('')
-
-const isDialog = defineModel()
-
-const props = defineProps({
-  item: {
-    type: Object,
-    default: () => {
-      return { name: '11' }
-    }
-  }
-})
-
-watch(() => props.item.answer, (newVal) => {
-  if (newVal) {
-    textarea.value = newVal
-  }
-},{ deep: true })
-
-const emit = defineEmits(['saveEdit'])
-const onSave = () =>{
-  editTempResult({id: props.item.resultId, content: textarea.value}).then( res =>{
-    isDialog.value = false
-    ElMessage.success('操作成功')
-    emit('saveEdit', textarea.value)
-  })
-}
-
-</script>
-
-<style lang="scss" scoped>
-.custom-header {
-  justify-content: space-between;
-  align-items: center;
-
-  .icon-guanbi {
-    cursor: pointer;
-    font-weight: bold;
-  }
-}
-
-.dialog-content {
-  padding-top: 10px;
-
-}
-</style>

src/renderer/src/views/examination-analysis/container/header.vue

@@ -1,143 +0,0 @@
-<template>
-  <div class="container-header flex">
-    <div class="header-left flex">
-      <el-button link @click="showDialog = true">
-        {{ curNode.edustage}}{{ curNode.edusubject }}考试分析<i class="iconfont icon-xiangxia"></i>
-      </el-button>
-    </div>
-
-    <div class="header-right flex">
-      <el-dropdown @command="changeTemplate" :hide-on-click="false">
-        <span class="el-dropdown-link">
-          {{ curTemplate.name }}
-          <i class="iconfont icon-xiangxia"></i>
-        </span>
-        <template #dropdown>
-          <el-dropdown-menu>
-            <el-dropdown-item v-for="item in templateList" :command="item" :key="item.id">{{ item.name
-              }}</el-dropdown-item>
-          </el-dropdown-menu>
-        </template>
-      </el-dropdown>
-      <div>
-        <el-button type="primary" link @click="onAdd">
-          <el-icon>
-            <Plus />
-          </el-icon>
-          添加提示词
-        </el-button>
-        <el-button type="primary" link>保存模板</el-button>
-        <el-button type="primary" @click="aiRead">一键研读</el-button>
-      </div>
-    </div>
-  </div>
-  <!--添加提示词-->
-  <keywordDialog v-model="wordDialog" :modeType="type" :isAdd="wordDialog" :item="curTemplate" />
-  <Dialog v-model="showDialog" :modeType="type" />
-</template>
-
-<script setup>
-import { ref, reactive, onMounted, onUnmounted, watch } from 'vue'
-import { Plus } from '@element-plus/icons-vue'
-import { ElMessageBox } from 'element-plus'
-import { modelList } from '@/api/mode/index'
-import Dialog from './dialog.vue'
-import keywordDialog from './keyword-dialog.vue'
-import emitter from '@/utils/mitt';
-import { sessionStore } from '@/utils/store'
-
-
-const wordDialog = ref(false)
-const props = defineProps({
-  type: {
-    type: Number,
-    default: 1
-  }
-})
-
-
-const emit = defineEmits(['changeTemp', 'onRead'])
-
-const showDialog = ref(false)
-
-const aiRead = () => {
-  emit('onRead')
-}
-
-
-// 当前模板名称
-const curTemplate = reactive({ name: '', id: '' })
-// 模板列表
-const templateList = ref([])
-// 获取模板列表
-const getTemplateList = () => {
-  modelList({ model: props.type, type: 1, pageNum: 1, pageSize: 10000 }).then(res => {
-    templateList.value = res.rows
-    Object.assign(curTemplate, res.rows[0]);
-    emit('changeTemp', res.rows[0].id)
-  })
-}
-// 模板切换
-const changeTemplate = (val) => {
-
-  ElMessageBox.confirm(
-    '切换模板将清除当前研读结果?',
-    '提示',
-    {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }
-  )
-    .then(() => {
-      Object.assign(curTemplate, val);
-      emit('changeTemp', curTemplate.id)
-    })
-}
-
-emitter.on('onGetMain', () =>{
-  getTemplateList()
-})
-
-const onAdd = () => {
-  wordDialog.value = true
-}
-
-onUnmounted(() => {
-  emitter.off('onGetMain')
-})
-const curNode = reactive({})
-
-onMounted(() => {
-  let data = sessionStore.get('subject.curNode')
-  Object.assign(curNode, data);
-  getTemplateList()
-})
-</script>
-
-<style lang="scss" scoped>
-.container-header {
-  height: 45px;
-  background: #fff;
-  border-radius: 5px 5px 0 0;
-  box-shadow: 0px 0px 20px 0px rgba(99, 99, 99, 0.06);
-
-  .header-left {
-    width: 50%;
-    align-items: center;
-    padding-left: 20px;
-  }
-
-  .header-right {
-    width: 50%;
-    justify-content: space-between;
-    align-items: center;
-    padding: 0 10px;
-  }
-
-  .icon-xiangxia {
-    margin-left: 5px;
-    font-weight: bold;
-  }
-}
-</style>

src/renderer/src/views/examination-analysis/container/keyword-dialog.vue

@@ -1,161 +0,0 @@
-<template>
-  <el-dialog v-model="mode" :show-close="false" width="600" destroy-on-close>
-    <template #header>
-      <div class="custom-header flex">
-        <span>{{ item.ex3 == '1' ? '请输入新的模板名称' : 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
-  },
-  isAdd: {
-    type: Boolean,
-    default: true
-  },
-  item: { // 子模板
-    type: Object,
-    default: () => {
-      return { ex3: '' }
-    }
-  },
-  tempId: {
-    type: [String, Number],
-    default: ''
-  },
-})
-
-
-
-const form = reactive({
-  name: '',
-  prompt: '',
-})
-
-watch(() => props.isAdd, (newVal) => {
-  if (!newVal) {
-    form.name = props.item?.name
-    form.prompt = props.item?.prompt
-  }
-
-}, { immediate: false })
-
-const loading = ref(false)
-const saveAdd = async () => {
-
-  loading.value = true
-  if (props.item.ex3 == '1') {
-    if (props.isAdd) {
-      try {
-        // 系统预设模板 copy一份
-        const { msg } = await addKeyWords({ name: form.name, id: props.item.id })
-        emitter.emit('onGetChild')
-        ElMessage.success(msg)
-        mode.value = false
-      } finally {
-        loading.value = false
-      }
-    }
-    else{
-      onAddChildTemp(props.item.parentId)
-    }
-  } else {
-
-    if (props.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')
-        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>

src/renderer/src/views/examination-analysis/container/pdf.vue

@@ -1,32 +0,0 @@
-<template>
-  <div class="container-pdf">
-    <PDF :url="pdfUrl" :showCatalog="false" v-if="pdfUrl" />
-  </div>
-  
-</template>
-
-<script setup>
-import { ref, onMounted, nextTick } from 'vue';
-import PDF from '@/components/PdfJs/index.vue'
-import { sessionStore } from '@/utils/store'
-
-const pdfUrl = ref('')
-
-onMounted(async () =>{
-  await nextTick()
-
-  let data = sessionStore.get('subject.curBook')
-  let fileurl = data.fileurl
-
-  if(fileurl == ''){
-    fileurl = `${data.edustage}-${data.edusubject}-课标.txt`
-  }
-  pdfUrl.value = import.meta.env.VITE_APP_RES_FILE_PATH + fileurl.replace('.txt', '.pdf')
-})
-</script>
-
-<style lang="scss" scoped>
-.container-pdf{
-  height: 100%;
-}
-</style>

src/renderer/src/views/examination-analysis/container/result.vue

@@ -1,513 +0,0 @@
-<template>
-  <div class="read-container">
-
-    <el-scrollbar height="100%">
-      <div class="template-list">
-        <el-row v-for="(item, index) in childTempList">
-          <el-col :span="24">
-            <div class="template-item" v-loading="item.loading">
-              <div class="item-header">
-                <div>
-                  <span class="blue">#</span>{{ item.name }}
-                </div>
-                <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)">编辑</el-button>
-                    <el-button type="primary" link @click="removeItem(item)">移除</el-button>
-                  </template>
-                </el-popover>
-              </div>
-              <div class="item-text" >
-                {{ item.prompt }}
-              </div>
-              <div class="item-text text-answer" v-if="item.answer">
-                <div class="item-icon">
-                  <i class="iconfont icon-ai"></i>
-                </div>
-                <div class="item-answer" v-html="item.answer"></div>
-              </div>
-              <div class="ai-btn" v-if="item.answer">
-                <el-button type="primary" link @click="againResult(index, item)">
-                  <i class="iconfont icon-ai1"></i>
-                  重新研读
-                </el-button>
-                <el-button type="primary" link @click="onAdjust(index, item)">
-                  <i class="iconfont icon-duihua"></i>
-                  AI对话调整
-                </el-button>
-                <el-button type="primary" link @click="onEdit(index, item)">
-                  <i class="iconfont icon-bianji1"></i>
-                  手动编辑结果
-                </el-button>
-              </div>
-            </div>
-          </el-col>
-        </el-row>
-        <el-empty v-if="!childTempList.length" description="暂无模板数据" />
-      </div>
-    </el-scrollbar>
-    <!--编辑结果-->
-    <EditDialog v-model="isEdit" :item="editItem" @saveEdit="saveEdit" />
-    <!--AI 对话调整-->
-    <AdjustDialog v-model="isAdjust" :modeType="modeType" :item="editItem" @saveAdjust="saveAdjust" />
-    <!--编辑提示词-->
-    <keywordDialog v-model="isEditKeyWord" :isAdd="isAdd" :item="keywordItem" :tempId="tempId" />
-  </div>
-</template>
-
-<script setup>
-import { ref, reactive, onMounted, watch, onUnmounted } from 'vue';
-import { ElMessage, ElMessageBox } from 'element-plus'
-import EditDialog from './edit-dialog.vue'
-import AdjustDialog from './adjust-dialog.vue'
-import keywordDialog from './keyword-dialog.vue';
-import { sessionStore } from '@/utils/store'
-import useUserStore from '@/store/modules/user'
-import { tempSave, completion, modelList, removeChildTemp, tempResult, editTempResult } from '@/api/mode/index'
-import { dataSetJson } from '@/utils/comm.js'
-import emitter from '@/utils/mitt';
-
-const userStore = useUserStore()
-
-const props = defineProps({
-  tempId: {
-    type: [String, Number],
-    default: ''
-  },
-  modeType: {
-    type: Number,
-    default: 1
-  }
-})
-
-emitter.on('onGetChild', () =>{
-  getChildTemplate()
-})
-
-// 获取子模板
-const tempLoading = ref(false)
-const childTempList = ref([])
-const getChildTemplate = () => {
-
-  tempLoading.value = true
-  modelList({ model: props.modeType, type: 2, parentId: props.tempId }).then(res => {
-    childTempList.value = res.rows
-    getTempResult()
-  }).finally(() => {
-    tempLoading.value = false
-  })
-}
-// 查询模板结果
-const getTempResult = () => {
-  tempResult({ mainModelId: props.tempId }).then(res => {
-    let rows = res.rows
-    childTempList.value.forEach(item => {
-      rows.forEach(el => {
-        if (item.id == el.modelId) {
-          item.answer = el.content
-          item.resultId = el.id
-        }
-      })
-    })
-  })
-}
-
-const isEdit = ref(false)
-watch(() => props.tempId, (newVal) => {
-  if (newVal) {
-    // isEdit.value = true
-    getChildTemplate()
-
-  }
-})
-
-
-// 获取会话ID
-const params = reactive(
-  {
-    prompt: '',
-    dataset_id: ''
-  }
-)
-const curNode = reactive({})
-const getConversation = () => {
-
-  getCompletion()
-}
-// 大模型对话
-const getCompletion = async () => {
-  for (let item of childTempList.value) {
-    try {
-      item.loading = true
-      params.prompt = `按照${item.prompt}的要求，针对${curNode.edustage}${curNode.edusubject}考试 对${curNode.itemtitle}进行教学分析`
-      const { data } = await completion(params)
-      let answer = data.answer
-      item.oldAnswer = answer
-      item.answer = getResult(answer);
-      onSaveTemp(item)
-    } finally {
-      item.loading = false
-    }
-  }
-}
-
-// 保存模板
-const onSaveTemp = (item) => {
-  const data = {
-    mainModelId: props.tempId,
-    modelId: item.id,
-    examDocld: '',
-    content: item.oldAnswer
-  }
-  tempSave(data).then(res => {
-    console.log(res)
-  })
-}
-
-
-
-// 重新研读
-const againResult = async (index, item) => {
-  try {
-    childTempList.value[index].loading = true
-    params.prompt = `按照${item.name}的要求，针对${curNode.edustage}${curNode.edusubject}考试 对${curNode.itemtitle}进行教学分析`
-    const { data } = await completion(params)
-    let answer = data.answer
-    childTempList.value[index].oldAnswer = answer
-    childTempList.value[index].answer = getResult(answer);
-    onEditSave(childTempList.value[index])
-  } finally {
-    childTempList.value[index].loading = false
-  }
-}
-
-// 保存 重新研读后的结果
-const onEditSave = async (item) =>{
-  const { res } = await editTempResult({id: item.resultId, content: item.oldAnswer})
-  ElMessage.success(res)
-  getChildTemplate()
-}
-
-
-// 分析获取课标对话结果
-let getResult = (text) => {
-  text = text.replace(/^\n\n(.*?)\n\n$/s, '<div>$1</div>');
-  text = text.replace(/^\n(.*?)\n$/s, '<p>$1</p>');
-  text = text.replace(/\*\*(.*?)\*\*/g, "<div class='text-tit'>$1</div>");
-  text = text.replace(/(\d+\..*?)\n/g, "<div class='text-num'>$1</div>\n");
-  return text
-}
-
-// 编辑
-const curIndex = ref(-1)
-const editItem = reactive({})
-const onEdit = (index, item) => {
-  curIndex.value = index
-  Object.assign(editItem, item)
-  isEdit.value = true
-}
-
-// 保存编辑
-const saveEdit = (data) => {
-  // childTempList.value[curIndex.value].oldAnswer = data
-  // let answer = getResult(data);
-  // childTempList.value[curIndex.value].answer = answer
-  getChildTemplate()
-}
-
-const isAdjust = ref(false)
-const onAdjust = (index, item) => {
-  curIndex.value = index
-  Object.assign(editItem, item)
-  isAdjust.value = true
-}
-const saveAdjust = (item) => {
-  childTempList.value[curIndex.value].oldAnswer = item
-  let answer = getResult(item);
-  childTempList.value[curIndex.value].answer = answer
-}
-
-// 编辑提示词
-const keywordItem = reactive({})
-const isEditKeyWord = ref(false)
-const isAdd = ref(true)
-const editKeyWord = (item) => {
-  console.log(item)
-  isAdd.value = false
-  isEditKeyWord.value = true
-  Object.assign(keywordItem, item)
-}
-
-// 移除子模板
-const removeItem = async (item) => {
-  if (item.ex3 != '1') {
-    ElMessageBox.confirm(
-      '确认是否移除?',
-      '提示',
-      {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }
-    ).then(() => {
-        console.log(item)
-        removeChildTemp(item.id).then(res => {
-          ElMessage.success('操作成功')
-          getChildTemplate()
-        })
-      })
-  }
-  else{
-    isAdd.value = false
-    Object.assign(keywordItem, item)
-    isEditKeyWord.value = true
-
-  }
-
-  // const { msg }  = await removeChildTemp(item.id)
-  // ElMessage.success(msg)
-  // getChildTemplate()
-}
-
-
-onMounted(() => {
-  let data = sessionStore.get('subject.curNode')
-  Object.assign(curNode, data);
-  let text = props.modeType == 1 || props.modeType == 2? '课标' : '考试'
-  let jsonKey = `${text}-${data.edustage}-${data.edusubject}`
-  params.dataset_id = dataSetJson[jsonKey]
-
-})
-// 解绑
-onUnmounted(() => {
-  emitter.off('onGetChild')
-})
-
-
-defineExpose({
-  getConversation
-})
-</script>
-
-<style lang="scss" scoped>
-.read-container {
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  padding: 15px 0;
-  height: 100%;
-  position: relative;
-
-  .el-scrollbar {
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    left: 0;
-    top: 0;
-  }
-
-  .el-dropdown-link {
-    font-weight: bold;
-
-    .el-icon--right {
-      font-weight: bold;
-    }
-  }
-
-  .read-header {
-    justify-content: space-between;
-    align-items: center;
-
-    .add-btn {
-      font-size: 13px;
-
-      .icon-jiahao {
-        margin-right: 3px;
-        font-size: 14px;
-      }
-    }
-
-  }
-
-  .right-con {
-    display: flex;
-  }
-
-  .template-list {
-
-    .template-item {
-      background: #fff;
-      padding: 10px;
-      margin-top: 10px;
-      border-radius: 5px;
-
-      .item-header {
-        display: flex;
-        align-items: center;
-        font-size: 16px;
-        font-weight: bold;
-        color: #000;
-        justify-content: space-between;
-
-        .blue {
-          font-size: 22px;
-          color: #409eff;
-          margin-right: 5px;
-        }
-      }
-
-      .item-text {
-        display: flex;
-        margin-top: 10px;
-        font-size: 14px;
-        text-align: left;
-        color: #606266;
-
-        .item-icon {
-          width: 30px;
-          height: 30px;
-          line-height: 30px;
-          text-align: center;
-          background: #F6F6F6;
-          border-radius: 50%;
-          margin-right: 10px;
-          flex-shrink: 0;
-        }
-
-        .item-answer {
-          flex-direction: column;
-          padding-top: 5px;
-
-          :deep(.text-tit) {
-            font-weight: bold;
-            margin: 10px 0;
-          }
-
-          :deep(.text-num) {
-            padding-left: 2em;
-          }
-        }
-
-      }
-
-      .text-answer {
-        color: #409eff;
-      }
-
-      .ai-btn {
-        margin-top: 10px;
-        display: flex;
-        justify-content: flex-end;
-
-        .iconfont {
-          margin-right: 3px;
-        }
-
-        :deep(.el-button) {
-          font-size: 13px;
-        }
-
-        .icon-ai1 {
-          font-size: 18px;
-        }
-      }
-    }
-  }
-
-  .template-item-result {
-    background: #DDEAFD !important;
-
-    .result-item-header {
-      display: flex;
-      align-items: flex-start;
-      text-align: left;
-      font-size: 16px;
-      font-weight: bold;
-      color: #3D3D3D;
-
-      .icon-xiaoxi {
-        color: #5881D5;
-        font-weight: bold;
-        font-size: 20px;
-        margin-right: 10px;
-      }
-    }
-
-    .result-icon-btn {
-      justify-content: space-between;
-      font-size: 13px;
-      margin-top: 5px;
-
-      span {
-        display: flex;
-        align-items: center;
-        cursor: pointer;
-        margin-right: 10px;
-
-        &:hover {
-          background: #cfe0fa
-        }
-      }
-
-      .iconfont {
-        margin-right: 3px;
-        color: #3498fc;
-      }
-    }
-
-    .line {
-      height: 1px;
-      background: #D8D8D8;
-      margin: 10px 0;
-    }
-
-    .other-msg {
-      font-size: 13px;
-
-      .other-user {
-        align-items: center;
-        color: #BA4B0F;
-        font-size: 12px;
-
-        .icon-touxiang {
-          color: #BA4B0F;
-          font-weight: bold;
-          font-size: 16px;
-          margin-right: 5px;
-        }
-      }
-
-      .other-text {
-        color: #191919;
-        text-align: left;
-      }
-    }
-
-
-  }
-}
-
-.icon-shenglvehao {
-  font-weight: bold;
-  font-size: 22px;
-}
-
-:deep(.el-popover) {
-  min-width: 50px;
-  width: 50px !important;
-}
-
-.pl-25 {
-  padding-left: 25px;
-}
-</style>
-<style>
-.template-custom-popover {
-  width: 110px !important;
-  min-width: 110px !important;
-}
-</style>

src/renderer/src/views/examination-analysis/index.vue

@@ -1,52 +1,11 @@
 <template>
-  <div class="page-template flex">
+  <TemplateStudy :type="3"/>
-    <!--头部-->
-    <Header :type="type" @changeTemp="changeTemp" @onRead="onRead"/>
-    <el-row :gutter="20" class="tempalte-main">
-      <el-col :span="12">
-        <!--左侧pdf-->
-        <Pdf />
-      </el-col>
-      <el-col :span="12">
-        <!--右侧模板研读-->
-        <Result ref="resultRef" :modeType="type" :tempId="tempId"/>
-      </el-col>
-    </el-row>
-
-  </div>
 </template>
 
 <script setup>
-import { ref } from 'vue'
+import TemplateStudy from '@/components/template-study/index.vue'
-import Header from './container/header.vue'
-import Pdf from './container/pdf.vue'
-import Result from './container/result.vue'
-
-const props = defineProps({
-  type: {
-    type: Number,
-    default: 3
-  },
-})
-
-
-const resultRef = ref()
-const tempId = ref('')
-const changeTemp = (id) =>{
-  tempId.value = id
-}
-
-const onRead = () =>{
-  resultRef.value.getConversation()
-}
 </script>
 
 <style lang="scss" scoped>
-.page-template {
+
-  flex-direction: column;
-  height: 100%;
-  .tempalte-main {
-    flex: 1;
-  }
-}
 </style>

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

@@ -248,6 +248,138 @@ const onchange = (item) => {
     router.push(path)
   }
 }
+// 获取资源列表
+const getResourceList = async () => {
+  const entpcourseidarray = courseObj?.entp?.id
+  if (!entpcourseidarray) return msgUtils.msgWarning('请选择章节?')
+  const params = {
+    pageSize: 100, parentid: 0, entpcourseidarray,
+    orderByColumn: 'timestamp', isAsc: 'desc',
+  }
+  const res = await HTTP_SERVER_API('getCourseFileList', params)
+  if (res?.code == 200) {
+    sourceOpt.data = res?.rows || []
+  } else {
+    msgUtils.msgWarning('获取资源列表, 请重试')
+  }
+}
+// 统一HTTP处理
+const HTTP_SERVER_API = (type, params = {}) => {
+  switch (type) {
+    case 'addSmarttalk': { // 获取课程
+      const def = {
+        fileId: '', // 文件id - Entpcoursefile 对应id
+        fileFlag: 'aippt',
+        fileShowName: courseObj.coursetitle + '.aippt',
+        textbookId: courseObj.textbookId,
+        levelFirstId: courseObj.levelFirstId,
+        levelSecondId: courseObj.levelSecondId,
+        fileSource: '个人',
+        fileRoot: '备课'
+      }
+      return API_smarttalk.creatAPT({...def, ...params})
+    }
+    case 'addEntpcourse': { // 添加课程
+      const node = courseObj.node || {}
+      if (!node) return msgUtils.msgWarning('请选择章节?')
+      const def = { // 默认参数
+        entpid: userStore.user.deptId, // 部门id
+        level: 1, // 层级
+        parentid: 0, // 父级id
+        dictid: 0, // 字典id
+        evalid: node.id, // 章节id
+        evalparentid: node.parentid, // 单元id(父级id)
+        edusubject: node.edusubject, // 学科
+        edudegree: node.edudegree, // 年级
+        edustage: node.edustage, // 阶段
+        coursetype: '课标学科', // 课程类型
+        coursetitle: node.itemtitle, // 课程名称
+        coursedesc: '', // 课程描述
+        status: '', // 状态
+        dflag: 0, // 状态
+        edituserid: userStore.id, // 编辑人id
+        createblankfile: 'no', // 创建空白文件
+      }
+      courseObj.entp = def
+      return API_entpcourse.addEntpcourse(def)
+    }
+    case 'addEntpcoursefile': { // 添加课程文件
+      const enpt = courseObj.entp
+      const def = {
+        parentid: 0,
+        entpid: userStore.user.deptId,
+        entpcourseid: enpt.id,
+        ppttype: 'file',
+        title: enpt.coursetitle,
+        fileurl: '',
+        filetype: 'aippt',
+        datacontent: '',
+        filekey: '',
+        filetag: '',
+        fileidx: 0,
+        dflag: 0,
+        status: '',
+        edituserid: userStore.id
+      }
+      // return Promise.resolve(1)
+      return API_entpcoursefile.addEntpcoursefileReturnId({...def,...params})
+    }
+    case 'getCourseList': { // 获取课程列表
+      return API_entpcourse.listEntpcourse(params)
+    }
+    case 'getCourseFileList':{ // 获取课程文件列表
+      return API_entpcoursefile.listEntpcoursefileNew(params)
+    }
+  }
+}
+// 事件回调
+const handleAll = async(type, row) =>{
+  // console.log(type)
+  switch (type) {
+    case 'refresh':   // 刷新
+      getResourceList()
+      break;
+    case 'resource':  // 资源库
+      break;
+    case 'upload':    // 上传
+      break;
+    case 'add':{      // 添加PPT-list - 课程文件
+      const enpt = courseObj.entp // 获取课程信息
+      if (!enpt) { // 如果没有，就新增课程
+        const resid = await HTTP_SERVER_API('addEntpcourse')
+        courseObj.entp.id = resid
+      }
+      // 生成ppt课件-父级
+      const p_params = {parentContent: '{"width":1000,"ratio":0.5625}'}
+      const id = await HTTP_SERVER_API('addEntpcoursefile', p_params)
+      if (!!id??null) { // 生成第一个幻灯片
+        const params = {
+          parentid: id,
+          title: '第一页',
+          filetype: 'slide',
+          datacontent: '{"elements":[],"background":{"type":"solid","color":"#fff"}}' // json内容
+        }
+        // 生成ppt课件-子级(slide)
+        await HTTP_SERVER_API('addEntpcoursefile', params)
+        // 生成备课资源-Smarttalk
+        await HTTP_SERVER_API('addSmarttalk',{fileId: id})
+        // 刷新资源列表
+        await getResourceList()
+      } else {
+        msgUtils.msgWarning('添加失败!')
+      }
+      break;
+    }
+    case 'open': {    // 打开资源-pptist
+      if (row.filetype != 'aippt') return msgUtils.msgWarning('暂不支持该类型文件操作!')
+      sessionStore.set('curr.resource', row) // 缓存当前资源信息
+      createWindow('open-win', {
+        url: '/pptist', // 窗口关闭时，清除缓存
+        close: () => {
+          sessionStore.set('curr.resource', null) // 清除缓存
+          getResourceList() // 刷新资源列表
+        }
+      })
 const changeClass = async (type, row, other) => {
   switch(type) {
     case 'click': { // 点击-打开课件-aippt

src/renderer/src/views/prepare/container/class-start.vue

@@ -87,7 +87,8 @@ import { onMounted, reactive, ref, watchEffect, watch, nextTick, toRaw } from 'v
 import { Refresh } from '@element-plus/icons-vue'
 import { ElMessage, ElMessageBox } from 'element-plus'  // ui框架: 消息提示
 import vueQr from 'vue-qr/src/packages/vue-qr.vue'      // 插件: 二维码
-import imChat from '@/views/tool/components/imChat.vue' // im-chat-子组件
+// import imChat from '@/views/tool/components/imChat.vue' // im-chat-子组件
+import ChatWs from '@/plugins/socket' // 聊天socket
 import MsgEnum from '@/plugins/imChat/msgEnum'          // 消息头-相关定义(nuem)
 import * as commUtil from '@/utils/comm'                // 工具类-通用
 import { toLinkWeb, createWindow, getStaticUrl, sessionStore } from '@/utils/tool'  // 工具类-主进程相关
@@ -151,9 +152,11 @@ const open = async (id, classObj) => {
       teacherForm.form.classcourseid = classObj.id
     }
     // 初始化im-chat
-    // nextTick(async() => {
+    nextTick(async() => {
-    //   chat = await imChatRef.value?.initImChat()
+      // chat = await imChatRef.value?.initImChat()
-    // })
+      // 连接socket
+      if (!ChatWs.ws) ChatWs.init()
+    })
   }
 }
 // 关闭弹窗
@@ -267,10 +270,10 @@ const createClasscourse = async () => {
     setTimeout(() => {
       msgEl.close()
       msgEl = ElMessage.warning({message:'正在打开公屏，请稍后...',duration: 0})
-      setTimeout(() => {
+      setTimeout(async() => {
         msgEl.close()
-        const classcourse = {...params, id: teacherForm.form.classcourseid}
+        const res = await Http_Classcourse.getClasscourse(teacherForm.form.classcourseid)
-        openPublicScreen(classcourse)
+        openPublicScreen(res.data)
       }, 2000);
     }, 1000);
   }
@@ -303,9 +306,10 @@ const classTeachingStart = async () => {
     // 新版-pptList 打开公屏
     if (myClassActive.value.filetype == 'aptist') {
       const msgEl = ElMessage.warning({message:'正在打开公屏，请稍后...',duration: 0})
-      setTimeout(() => {
+      setTimeout(async () => {
         msgEl.close()
-        openPublicScreen({id})
+        const res = await Http_Classcourse.getClasscourse(teacherForm.form.classcourseid)
+        openPublicScreen(res.data)
       }, 2000);
     }else {
       const url = `/teaching/classteaching?classcourseid=${id}&actor=classTeachingOnPublicScreen`
@@ -350,6 +354,10 @@ const getQrUrl = async() => {
 // 打开公屏
 const openPublicScreen = (classcourse) => {
   console.log('打开公屏', classcourse)
+  // 发送app端待开课消息
+  const data = { id: classcourse.id }
+  ChatWs.sendMsg(MsgEnum.HEADS.MSG_0000, data, {}, ChatWs.TYPES.single, userStore.id)
+  // 缓存当前资源信息
   const resource = toRaw(myClassActive.value)
   sessionStore.set('curr.resource', resource) // 缓存当前资源信息
   sessionStore.set('curr.classcourse', classcourse) // 缓存当前当前上课
@@ -367,25 +375,25 @@ const openPublicScreen = (classcourse) => {
 
 // ================== 监听 =======================
 // im-chat: 聊天事件 {type, data}
-const chatChange = (type, data, ...args) => {
+// const chatChange = (type, data, ...args) => {
-  if (type == 'msg') {   // im-chat 消息监听
+//   if (type == 'msg') {   // im-chat 消息监听
-    console.log('msg:===== ',data, args)
+//     console.log('msg:===== ',data, args)
-    // const msgId = (args||[])[0].message_msg_id
+//     // const msgId = (args||[])[0].message_msg_id
-    const { msgKey:head, msgcontent:msg, senduserid:sendId, msgType } = data
+//     const { msgKey:head, msgcontent:msg, senduserid:sendId, msgType } = data
-    switch(head) {
+//     switch(head) {
-      case MsgEnum.HEADS.MSG_classcourseopen:{ // 开课, 跳转公屏
+//       case MsgEnum.HEADS.MSG_classcourseopen:{ // 开课, 跳转公屏
-        const { classcourseid:id } = teacherForm.form
+//         const { classcourseid:id } = teacherForm.form
-        const { classcourseid: imId, status } = data
+//         const { classcourseid: imId, status } = data
-        if (imId == id && status == 'open') {
+//         if (imId == id && status == 'open') {
-          classTeachingStart() // 开始跳转
+//           classTeachingStart() // 开始跳转
-        }
+//         }
-        break}
+//         break}
-      default:
+//       default:
-        console.log('未知消息:', data)
+//         console.log('未知消息:', data)
-        break
+//         break
-    }
+//     }
-  }
+//   }
-}
+// }
 
 // 监听-班级id
 watch(() => classForm.form.classid, (val)=> {

src/renderer/src/views/prepare/index.vue

@@ -202,17 +202,14 @@ import ClassReserv from '@/views/classManage/classReserv.vue'
 import TreeLog from '@/views/prepare/components/treeLog.vue'
 import classStart from './container/class-start.vue' // 预备上课
 import MsgEnum from '@/plugins/imChat/msgEnum'  // im 消息枚举
-import Chat from '@/utils/chat'
 import * as commUtils from "@/utils/comm";
 import * as Api_server from "@/api/apiService";
 import msgUtils from "@/plugins/modal";
-import * as API_entpcoursefile from "@/api/education/entpcoursefile"; // im 登录初始化
+import * as API_entpcoursefile from "@/api/education/entpcoursefile";
-if (!Chat.imChat) Chat.init()
+import ChatWs from '@/plugins/socket' // 聊天socket
+if (!ChatWs.ws) ChatWs.init()
 // import Chat from '@/utils/chat' // im 登录初始化
 // if (!Chat.imChat) Chat.init()
-// import ChatWs from '@/plugins/socket'
-// console.log('xxxx',ChatWs)
-// ChatWs.watch((data,e) => console.log('ws', data, e))
 
 const toolStore = useToolState()
 const fs = require('fs')
@@ -344,6 +341,8 @@ export default {
   //   }
   // },
   methods: {
+    // 延时
+    sleep(ms){return new Promise(resolve => setTimeout(resolve, ms))},
     addAiPPT(item) {
       this.currentFileList.unshift(item.resData)
       KjListItem.methods.openFileWin(item.resData);
@@ -446,6 +445,33 @@ export default {
           ElMessage.warning('该功能暂未开放！')
           break
         }
+        case 'wsApp': { // 发送app端待开课消息
+          // console.log('wsApp', row)
+          const head = MsgEnum.HEADS.MSG_0000
+          const data = { id: row.id }
+          const type = ChatWs.TYPES.single
+          const userId = this.userStore.userId
+          ElMessage.success('APP端待开课消息-发送成功！')
+          await this.sleep(1000) // 等待1s
+          // 打开公屏
+          const msgEl = ElMessage.warning({message:'正在打开公屏，请稍后...',duration: 0})
+          const res = await getEntpcoursefile(row.entpcoursefileid)
+          await this.sleep(2000) // 等待2s
+          ChatWs.sendMsg(head, data, null, type, userId)
+          msgEl.close() // 关闭提示
+          const resource = res?.data||{}
+          const classcourse = row
+          sessionStore.set('curr.resource', resource) // 缓存当前资源信息
+          sessionStore.set('curr.classcourse', classcourse) // 缓存当前当前上课
+          createWindow('open-win', {
+            url: '/pptist', // 窗口关闭时，清除缓存
+            close: () => {
+              sessionStore.set('curr.resource', null) // 清除缓存
+              sessionStore.set('curr.classcourse', null) // 清除缓存
+            }
+          })
+          break
+        }
         default:
           break
       }
@@ -524,7 +550,7 @@ export default {
       if (!!o.src) { // 如果有src就转换
         const isBase64 = /^data:image\/(\w+);base64,/.test(o.src)
         const isBlobUrl = /^blob:/.test(o.src)
-        console.log('isBase64', o, isBase64)
+        // console.log('isBase64', o, isBase64)
         if (isBase64) {
           const bolb = commUtils.base64ToBlob(o.src)
           const fileName = Date.now() + '.png'
@@ -539,11 +565,29 @@ export default {
             url &&(o.src = url)
           }
         } else if (isBlobUrl) { // 视频和音频
-
+          const res = await fetch(o.src)
+          const blob = await res.blob()
+          const fileName = o.type=='video'? Date.now() + '.mp4':Date.now() + '.mp3'
+          const file = commUtils.blobToFile(blob, fileName)
+          // o.src = fileName
+          // console.log('file', file)
+          const formData = new FormData()
+          formData.append('file', file)
+          const ress = await Api_server.Other.uploadFile(formData)
+          if (ress && ress.code == 200){
+            const url = ress?.url
+            url &&(o.src = url)
+          }
         }
       }
+      
       if (o?.background?.image) await this.toRousrceUrl(o.background.image)
-      if (o?.elements) o.elements.forEach(async o => {await this.toRousrceUrl(o)})
+      // if (o?.elements) o.elements.forEach(async o => {await this.toRousrceUrl(o)})
+       if(o?.elements){
+          for (let element of o.elements) {
+              await this.toRousrceUrl(element);
+          } 
+       } 
     },
     async createAIPPTByFile(file) {
       this.pgDialog.visible = true
@@ -559,6 +603,8 @@ export default {
         // 设置进度条
         this.pgDialog.pg.percentage = Math.floor(completed / total * 100)
       }
+      console.log('结束', slides)
+      return
       this.pgDialog.pg.percentage = 0
       this.pgDialog.visible = false
       listEntpcourse({
@@ -595,6 +641,8 @@ export default {
           }).then(async (res) => {
 
             const resSlides = slides.map(({id, ...slide}) => JSON.stringify(slide))
+            console.log(resSlides)
+            return
             let params = {
               parentid: slideid,
               entpid: resCourse.entpid,

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

@@ -330,11 +330,27 @@ const toRousrceUrl = async(o) => {
         url &&(o.src = url)
       }
     } else if (isBlobUrl) { // 视频和音频
-
+      const res = await fetch(o.src)
+      const blob = await res.blob()
+      const fileName = o.type=='video'? Date.now() + '.mp4':Date.now() + '.mp3'
+      const file = commUtils.blobToFile(blob, fileName)
+      // o.src = fileName
+      // console.log('file', file)
+      const formData = new FormData()
+      formData.append('file', file)
+      const ress = await Api_server.Other.uploadFile(formData)
+      if (ress && ress.code == 200){
+        const url = ress?.url
+        url &&(o.src = url)
+      }
     }
   }
   if (o?.background?.image) await toRousrceUrl(o.background.image)
-  if (o?.elements) o.elements.forEach(async o => {await toRousrceUrl(o)})
+  if(o?.elements){
+          for (let element of o.elements) {
+              await this.toRousrceUrl(element);
+          } 
+       }
 }
 // ======== zdg end ============