Merge pull request 'zxl' (#182) from zxl into main

Reviewed-on: #182

.env.development

@@ -17,6 +17,7 @@ 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://prev.ysaix.com:7868'
 VITE_APP_WS_URL = 'wss://file.ysaix.com:7868'
 # VITE_APP_WS_URL = 'ws://192.168.2.16:7865'
 

.env.production

@@ -19,7 +19,7 @@ VITE_APP_RES_FILE_PATH = 'https://prev.ysaix.com:7868/src/assets/textbook/booktx
 VITE_APP_BUILD_BASE_PATH = 'https://prev.ysaix.com:7868/'
 
 # websocket 地址
-VITE_APP_WS_URL = 'wss://file.ysaix.com:7868'
+VITE_APP_WS_URL = 'wss://prev.ysaix.com:7868'
 
 # 是否显示开发工具
 VITE_SHOW_DEV_TOOLS = 'false'

.env.yc

@@ -0,0 +1,25 @@
+# 页面标题
+VITE_APP_TITLE = 文枢课堂
+
+# 生产环境配置
+VITE_APP_ENV = 'production'
+
+# AIx融合数字管理系统/生产环境
+VITE_APP_BASE_API = 'https://prev.ysaix.com:7868/prod-api'
+
+VITE_APP_DOMAIN = 'prev.ysaix.com'
+
+VITE_APP_UPLOAD_API = 'https://prev.ysaix.com:7868/prod-api'
+
+# 是否在打包时开启压缩，支持 gzip 和 brotli
+VITE_BUILD_COMPRESS = gzip
+
+VITE_APP_RES_FILE_PATH = 'https://prev.ysaix.com:7868/src/assets/textbook/booktxt/'
+
+VITE_APP_BUILD_BASE_PATH = 'https://prev.ysaix.com:7868/'
+
+# websocket 地址
+VITE_APP_WS_URL = 'wss://prev.ysaix.com:7868'
+
+# 是否显示开发工具
+VITE_SHOW_DEV_TOOLS = 'false'

.env.yc2

@@ -0,0 +1,25 @@
+# 页面标题
+VITE_APP_TITLE = 实训教学
+
+# 生产环境配置
+VITE_APP_ENV = 'production'
+
+# AIx融合数字管理系统/生产环境
+VITE_APP_BASE_API = 'https://prev.ysaix.com:7868/prod-api'
+
+VITE_APP_DOMAIN = 'prev.ysaix.com'
+
+VITE_APP_UPLOAD_API = 'https://prev.ysaix.com:7868/prod-api'
+
+# 是否在打包时开启压缩，支持 gzip 和 brotli
+VITE_BUILD_COMPRESS = gzip
+
+VITE_APP_RES_FILE_PATH = 'https://prev.ysaix.com:7868/src/assets/textbook/booktxt/'
+
+VITE_APP_BUILD_BASE_PATH = 'https://prev.ysaix.com:7868/'
+
+# websocket 地址
+VITE_APP_WS_URL = 'wss://prev.ysaix.com:7868'
+
+# 是否显示开发工具
+VITE_SHOW_DEV_TOOLS = 'false'

electron-builder-yc.yml

@@ -0,0 +1,54 @@
+appId: com.electron.app.yc
+productName: 文枢课堂
+directories:
+  output: dist
+  buildResources: build
+win:
+  executableName: 文枢课堂
+  icon: resources/yc-logo.png
+files:
+  - '!**/.vscode/*'
+  - '!src/*'
+  - '!electron.vite.config.{js,ts,mjs,cjs}'
+  - '!{.eslintignore,.eslintrc.cjs,.prettierignore,.prettierrc.yaml,dev-app-update.yml,CHANGELOG.md,README.md}'
+  - '!{.env,.env.*,.npmrc,pnpm-lock.yaml}'
+asarUnpack:
+  - resources/**
+nsis:
+  oneClick: false
+  allowToChangeInstallationDirectory: true
+  artifactName: ${name}-yc-${version}-setup.${ext}
+  shortcutName: ${productName}
+  uninstallDisplayName: ${productName}
+  createDesktopShortcut: always
+mac:
+  entitlementsInherit: build/entitlements.mac.plist
+  extendInfo:
+    - NSCameraUsageDescription: Application requests access to the device's camera.
+    - NSMicrophoneUsageDescription: Application requests access to the device's microphone.
+    - NSDocumentsFolderUsageDescription: Application requests access to the user's Documents folder.
+    - NSDownloadsFolderUsageDescription: Application requests access to the user's Downloads folder.
+  notarize: false
+dmg:
+  artifactName: ${name}-${version}.${ext}
+linux:
+  target:
+    - AppImage
+    - snap
+    - deb
+  maintainer: electronjs.org
+  category: Utility
+appImage:
+  artifactName: ${name}-${version}.${ext}
+npmRebuild: false
+publish:
+  provider: generic
+  url: https://prev.ysaix.com:7868/src/assets/smarttalkyc/
+electronDownload:
+  mirror: https://npmmirror.com/mirrors/electron/
+# 额外依赖打包到输出目录
+extraFiles:
+  - from: ./node_modules/im_electron_sdk/lib/
+    to: ./resources
+    filter:
+      - '**/*'

electron-builder-yc2.yml

@@ -0,0 +1,54 @@
+appId: com.electron.app.yc2
+productName: 实训教学
+directories:
+  output: dist
+  buildResources: build
+win:
+  executableName: 实训教学
+  icon: resources/yc-logo.png
+files:
+  - '!**/.vscode/*'
+  - '!src/*'
+  - '!electron.vite.config.{js,ts,mjs,cjs}'
+  - '!{.eslintignore,.eslintrc.cjs,.prettierignore,.prettierrc.yaml,dev-app-update.yml,CHANGELOG.md,README.md}'
+  - '!{.env,.env.*,.npmrc,pnpm-lock.yaml}'
+asarUnpack:
+  - resources/**
+nsis:
+  oneClick: false
+  allowToChangeInstallationDirectory: true
+  artifactName: ${name}-ycsx-${version}-setup.${ext}
+  shortcutName: ${productName}
+  uninstallDisplayName: ${productName}
+  createDesktopShortcut: always
+mac:
+  entitlementsInherit: build/entitlements.mac.plist
+  extendInfo:
+    - NSCameraUsageDescription: Application requests access to the device's camera.
+    - NSMicrophoneUsageDescription: Application requests access to the device's microphone.
+    - NSDocumentsFolderUsageDescription: Application requests access to the user's Documents folder.
+    - NSDownloadsFolderUsageDescription: Application requests access to the user's Downloads folder.
+  notarize: false
+dmg:
+  artifactName: ${name}-${version}.${ext}
+linux:
+  target:
+    - AppImage
+    - snap
+    - deb
+  maintainer: electronjs.org
+  category: Utility
+appImage:
+  artifactName: ${name}-${version}.${ext}
+npmRebuild: false
+publish:
+  provider: generic
+  url: https://prev.ysaix.com:7868/src/assets/smarttalkycsx/
+electronDownload:
+  mirror: https://npmmirror.com/mirrors/electron/
+# 额外依赖打包到输出目录
+extraFiles:
+  - from: ./node_modules/im_electron_sdk/lib/
+    to: ./resources
+    filter:
+      - '**/*'

electron.vite.config.mjs

@@ -33,6 +33,7 @@ export default defineConfig({
       proxy: {
         '/dev-api': {
           target: 'http://27.128.240.72:7865',
+          // target: 'https://prev.ysaix.com:7868/prod-api/',
           // target: 'http://36.134.181.164:7863',
           // target: 'http://192.168.0.102:7865',
           changeOrigin: true,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aix-win-ws",
-  "version": "2.5.4",
+  "version": "2.5.9",
   "description": "",
   "main": "./out/main/index.js",
   "author": "上海交大重庆人工智能研究院",
@@ -16,6 +16,8 @@
     "build:dev": "npm run build && electron-builder --win --config ./electron-builder-test.yml",
     "build:test": "electron-vite build --mode test && electron-builder --win --config ./electron-builder.yml",
     "build:prod": "electron-vite build --mode production && electron-builder --win --config ./electron-builder-prod.yml",
+    "build:yc": "electron-vite build --mode yc && electron-builder --win --config ./electron-builder-yc.yml",
+    "build:yc2": "electron-vite build --mode yc2 && electron-builder --win --config ./electron-builder-yc2.yml",
     "build:lt": "electron-vite build --mode lt && electron-builder --win --config ./electron-builder-lt.yml",
     "build:mac": "electron-vite build --mode production && electron-builder --mac --config ./electron-builder-prod.yml",
     "build:linux": "npm run build && electron-builder --linux"
@@ -92,6 +94,8 @@
     "tinycolor2": "^1.6.0",
     "tinymce": "6.8.3",
     "tippy.js": "^6.3.7",
+    "v-viewer": "^3.0.11",
+    "viewerjs": "^1.11.7",
     "vite-plugin-electron": "^0.28.8",
     "vue": "^3.4.34",
     "vue-cropper": "1.0.3",

src/main/index.js

@@ -7,6 +7,7 @@ import Logger from './logger' // 日志封装
 import chat from './chat'     // chat封装
 import Store from './store'   // Store封装
 import updateInit from './update'
+
 // 代理 electron/remote
 // 第一步：引入remote
 import remote from '@electron/remote/main'
@@ -41,19 +42,19 @@ if(!gotTheLock){
     }
   })
 }
-
+let logoIco = import.meta.env.MODE==='yc'||import.meta.env.MODE==='yc2'?'../../resources/yc-logo.png':'../../resources/logo2.ico'
 //登录窗口
 function createLoginWindow() {
   if (loginWindow) return
   loginWindow = new BrowserWindow({
-    width: 888,
+    width: import.meta.env.MODE==='yc'||import.meta.env.MODE==='yc2'?1060:888,
     height: 520,
     show: false,
     frame: false,
     autoHideMenuBar: true,
     maximizable: false,
     resizable: false,
-    icon: join(__dirname, '../../resources/logo2.ico'),
+    icon: join(__dirname, logoIco),
     ...(process.platform === 'linux' ? { icon } : {}),
     webPreferences: {
       defaultEncoding: 'utf-8',
@@ -95,7 +96,7 @@ function createMainWindow() {
     frame: false, // 无边框
     autoHideMenuBar: true,
     maximizable: false,
-    icon: join(__dirname, '../../resources/logo2.ico'),
+    icon: join(__dirname, logoIco),
     ...(process.platform === 'linux' ? { icon } : {}),
     webPreferences: {
       defaultEncoding: 'utf-8',

src/renderer/index.html

@@ -8,7 +8,7 @@
       http-equiv="Content-Security-Policy"
       content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:"
     /> -->
-    <meta http-equiv="Content-Security-Policy" content="connect-src * blob: data:; default-src 'self' https://wzyzoss.eos-chongqing-3.cmecloud.cn/; script-src 'self' 'unsafe-eval' http://www.wiris.net 'unsafe-inline'; style-src 'self' 'unsafe-inline' http://www.wiris.net; media-src * blob:;img-src * 'self' data: blob:;font-src 'self' http://www.wiris.net;" />
+    <meta http-equiv="Content-Security-Policy" content="connect-src * blob: data:; frame-src 'self' *; default-src 'self' https://wzyzoss.eos-chongqing-3.cmecloud.cn/; script-src 'self' 'unsafe-eval' http://www.wiris.net 'unsafe-inline'; style-src 'self' 'unsafe-inline' http://www.wiris.net; media-src * blob:;img-src * 'self' data: blob:;font-src 'self' http://www.wiris.net;" />
 
   </head>
 

src/renderer/public/pdfjs-dist/web/viewer.mjs

@@ -13097,15 +13097,15 @@ const PDFViewerApplication = {
       }
       if (isValidSpreadMode(spread)) {
         //默认双页
-        // this.pdfViewer.spreadMode = spread;
+        this.pdfViewer.spreadMode = spread;
-        this.pdfViewer.spreadMode = 1;
+        // this.pdfViewer.spreadMode = 1;
       }
     };
     this.isInitialViewSet = true;
     this.pdfSidebar?.setInitialView(sidebarView);
     //默认双页
-    // setViewerModes(scrollMode, spreadMode);
+    setViewerModes(scrollMode, spreadMode);
-    setViewerModes(scrollMode, 1);
+    // setViewerModes(scrollMode, 1);
     if (this.initialBookmark) {
       setRotation(this.initialRotation);
       delete this.initialRotation;

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

@@ -28,8 +28,9 @@ import msgUtils from '@/plugins/modal' // 消息工具
 import * as API_entpcoursefile from '@/api/education/entpcoursefile' // 相关api
 import { PPTApi } from './api'
 import { sessionStore } from '@/utils/store' // electron-store 状态管理
-import './api/watcher' // 监听
+import watcher from './api/watcher' // 监听
-
+import emitter from '@/utils/mitt' //mitt 事件总线
+watcher() // 监听启动
 const loading = ref(true)
 const _isPC = isPC()
 
@@ -39,8 +40,8 @@ const slidesStore = useSlidesStore()
 const { databaseId } = storeToRefs(mainStore)
 const { screening } = storeToRefs(useScreenStore())
 
-if (import.meta.env.MODE !== 'development') {
+if (import.meta.env.MODE === 'development') {
-  window.onbeforeunload = () => false
+  // window.onbeforeunload = () => false
 }
 
 onMounted(async () => {

src/renderer/src/AixPPTist/src/api/chat.ts

@@ -0,0 +1,55 @@
+/**
+ * 统一处理消息 发送 避免找不到
+ */
+
+import ChatWs from '@/plugins/socket' // 聊天socket
+import { sessionStore } from '@/utils/store' // electron-store 状态管理
+import { useClasscourseStore } from '../store'
+import * as API_classcourse from '@/api/teaching/classcourse' // 后端api
+import { MsgEnum } from './types'
+// import msgUtils from '@/plugins/modal' // 消息工具
+
+export default () => {
+  const classcourse = sessionStore.get('curr.classcourse') // 课堂信息
+  const courseId = classcourse?.id // 课堂id
+  const timgroupid = classcourse?.timgroupid // 群组id
+  const classcourseStore = useClasscourseStore() // 课堂信息-状态管理
+  // 上课状态才-初始化socket
+  if (!ChatWs.ws && !!courseId) ChatWs.init()
+  // 开课消息
+  const startCourse = async() => {
+    // await API_classcourse.updateClasscourse({ id: classcourse.id, status: 'open' })
+    ChatWs.sendMsg('open', {id: courseId})
+    return Promise.resolve()
+  }
+  // 下课消息
+  const exitCourse = async() => {
+    if(!timgroupid) throw new Error('未获取到群组ID')
+    await API_classcourse.updateClasscourse({ id: courseId, status: 'closed' })
+    return ChatWs.closedCourse(timgroupid)
+  }
+  // 翻页消息
+  const slideFlapping = (msg:object) => {
+    return new Promise(async (resolve, reject) => {
+      const isWs = !!ChatWs.ws && ChatWs.ws.readyState === 1 // 是否有socket连接
+      if(!timgroupid) return reject('未获取到群组ID')
+      else if(!isWs) return reject('信异常，请重试！')
+      const {current: paging, animationSteps: cartoonTimes} = msg || {}
+      const head = MsgEnum.HEADS.MSG_slideFlapping
+      ChatWs.sendMsg(head, msg) // 发送消息
+      API_classcourse.setPaging({ id: courseId, paging, cartoonTimes})
+      // 更新本地缓存
+      sessionStore.set('curr.classcourse.paging', paging)
+      sessionStore.set('curr.classcourse.cartoonTimes', cartoonTimes)
+      classcourseStore.classcourse.paging = paging
+      classcourseStore.classcourse.cartoonTimes = cartoonTimes
+      return resolve(true)
+    })
+  }
+  return {
+    groupid: timgroupid,
+    classcourse,
+    exitCourse,
+    slideFlapping,
+  }
+}

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

@@ -7,36 +7,60 @@ import { sessionStore } from '@/utils/store' // electron-store 状态管理
 import * as useStore from '../store' // pptist-状态管理
 import ChatWs from '@/plugins/socket' // 聊天socket
 import msgUtils from '@/plugins/modal' // 消息工具
+import emitter from '@/utils/mitt' //mitt 事件总线
+import { nextTick } from 'vue'
 
+const slidesStore = useStore.useSlidesStore() // 幻灯片-状态管理
 const screenStore = useStore.useScreenStore() // 全屏-状态管理
 const classcourseStore = useStore.useClasscourseStore() // 课堂信息-状态管理
 const classcourse = sessionStore.get('curr.classcourse') // 课堂信息
+const isPublic = sessionStore.get('curr.isPublic') // 是否公屏开课
 
 export class Classcourse {
   msgObj:ElMessageBox = null // 提示消息对象
+  classcourse:any = null // 课堂信息
+  id: number|string = null // 课堂id
 
   constructor() {
     this.load()
   }
+  // 延时
+  sleep = ms => new Promise(resolve => setTimeout(resolve, ms))
   /**
    * @description 加载
    */
-  load() {
+  async load() {
+    console.log('classcourse-load', classcourse)
     // 打开全屏
-    screenStore.setScreening(!!classcourse)
+    const isCourse = !!classcourse
+    screenStore.setScreening(isCourse)
     // 如果课堂信息有值，则连接socket
-    if (!!classcourse) {
+    if (isCourse) {
       // 连接socket
-      if (!ChatWs.ws) ChatWs.init()
       ChatWs.id = classcourse.timgroupid // 群组id
-      console.log('ws- ', classcourse)
+      if (!ChatWs.ws) {
+        ChatWs.init().then(_ => {
+          isPublic && ChatWs.sendMsg('open', {id: classcourse.id})
+          // isPublic && console.log('socket-开课消息-已发送')
+        })
+      }
+      this.classcourse = classcourse // 课堂信息
+      this.id = classcourse.id // 课堂id
+      // 如果课堂信息有paging，则更新当前页码
+      const { paging, cartoonTimes } = classcourse
+      const isPaging = !!paging || paging === 0
+      // 如果课堂信息有paging，则更新动画播放状态
+      const isAnim = !!cartoonTimes || cartoonTimes === 0
+      if (isPaging) slidesStore.updateSlideIndex(paging)
+      if (isAnim) slidesStore.updateAnimationIndex(cartoonTimes)
+      // 课堂信息-状态管理
       classcourseStore.setClasscourse(classcourse)
       // 待上课提示
       if (!classcourse.status) {
         this.msgObj = {
           type: 'success',
           title: '系统提示',
-          message: '公屏课堂已准备完毕，请等待老师开启课堂！',
+          message: '公屏课堂已准备完毕，等待老师开启课堂...',
           center: true,
           showClose: false,
           showCancelButton: false,

src/renderer/src/AixPPTist/src/api/gridPic.ts

@@ -0,0 +1,47 @@
+export default class gridPic {
+    private static Instance: gridPic | null = null;
+    private gridPicRef: any = null;
+
+    constructor(elRef?: any) {
+        if (elRef) {
+            this.gridPicRef = elRef;
+        }
+        if (!gridPic.Instance) {
+            gridPic.Instance = this;
+        }
+        return gridPic.Instance;
+    }
+
+    // 初始化
+    init(elRef) {
+        if (elRef) {
+            this.gridPicRef = elRef;
+        }
+        return this;
+    }
+
+    addPIc(data) {
+        if (this.gridPicRef && this.gridPicRef.value && typeof this.gridPicRef.value.addPic === 'function') {
+            this.gridPicRef.value.addPic(data);
+        }
+        return this;
+    }
+
+    // 静态方法 - 初始化
+    static init(elRef) {
+        if (!gridPic.Instance) {
+            gridPic.Instance = new gridPic(elRef);
+        } else {
+            gridPic.Instance.init(elRef);
+        }
+        return gridPic.Instance;
+    }
+
+    // 静态方法 - 打开推图上屏幕
+    static addPIc(data) {
+        if (gridPic.Instance) {
+            return gridPic.Instance.addPIc(data);
+        }
+        return null;
+    }
+}

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

@@ -3,16 +3,18 @@
  * @author zdg
  * @date 2024-11-26
  */
-import { toRaw } from 'vue'
+import { toRaw, nextTick } from 'vue'
 import type { Result } from './types' // 接口类型
 import msgUtils from '@/plugins/modal' // 消息工具
 import * as API_entpcoursefile from '@/api/education/entpcoursefile' // 相关api
 import * as API_smarttalk from '@/api/file' // 相关api
+import * as API_classwork from '@/api/teaching/classwork' // 相关api
 import * as useStore from '../store' // pptist-状态管理
 import { sessionStore } from '@/utils/store' // electron-store 状态管理
 import useUserStore from '@/store/modules/user' // 外部-用户信息
 import * as Api_server from '@/api/apiService' // 相关api
-import * as commUtils from '@/utils/comm.js'
+import * as commUtils from '@/utils/comm.js' // 工具
+import { toPng, toJpeg } from 'html-to-image' // 引入html-to-image库
 const slidesStore = useStore.useSlidesStore()
 const userStore = useUserStore()
 
@@ -48,6 +50,8 @@ export class Utils {
       }, delay)
     }
   }
+  // 延时
+  static sleep = ms => new Promise(resolve => setTimeout(resolve, ms))
 }
 
 /** ppt相关后端接口处理 */
@@ -55,12 +59,14 @@ export class PPTApi {
   // 变量
   static isUpdate = true // 是否更新数据
 
-  // 获取所有幻灯片列表
+  // 获取所有幻灯片列表 isUpdate为true不更新
-  static getSlideList(parentid: (Number | String)): Promise<Boolean> {
+  static getSlideList(parentid: (Number | String),isUpdate?:Boolean): Promise<Boolean> {
+    const classcourse = sessionStore.get('curr.classcourse') // 课堂信息
     return new Promise(async (resolve, reject) => {
       const params: object = { parentid, orderByColumn: 'fileidx', isAsc: 'asc', pageSize: 9999 }
       const res: Result = await API_entpcoursefile.listEntpcoursefileNew(params)
       if (res.code === 200) { 
+        if(!isUpdate){
           const slides = (res.rows || []).map(o => {
             if (!!o.datacontent) {
               const json = JSON.parse(o.datacontent)
@@ -70,16 +76,22 @@ export class PPTApi {
             // 如果没有数据，默认空白页
             return {id: o.id,elements:[],background:{type:"solid",color:"#fff"}}
           })
-        // 活动列表处理
-        const workList = (res.rows || []).map(o => o.activityContent)
-        const workItem = [...res.rows]
-        // 加入活动后刷新ppt数据内容，不跟换为第一页
           // slidesStore.updateSlideIndex(0) // 下标0 为第一页
           slidesStore.setSlides(slides) // 写入数据
-        // 写入作业列表数据
+        } 
-        slidesStore.setWorkList(workList)
+        // 活动列表处理
+        // const workList = (res.rows || []).map(o => o.activityContent)
+        const workItem = res.rows ? [...res.rows] : []
         // 获取所有的pptlist的数据
         slidesStore.setWorkItem(workItem)
+        // 没有上课时调用-作业列表
+        if(!classcourse) this.updateWorkList()
+        // 没有上课时调用-批量更新缩略图
+        if(!classcourse) {
+          Utils.sleep(1500).then(() => {
+            this.batchUpdateThumUrl()
+          })
+        }
         resolve(true)
       } else msgUtils.msgError(res.msg || '获取数据失败');resolve(false)
     })
@@ -132,11 +144,19 @@ export class PPTApi {
 
     const currentSlide = toRaw(slidesStore.currentSlide)
     const isAdd = !/^\d+$/.test(currentSlide.id) // 是否新增
+    const currInd = toRaw(slidesStore.slideIndex) // 当前页索引-new
+    const oldInd = oldData.findIndex(o => o.id == currentSlide.id) // 当前页索引-old
+    const isBatch = oldVal && oldVal.length && currInd != oldInd // 是否批量更新-排序
     if (isAdd) { // 新增的幻灯片(id 为非数字，说明是新增的幻灯片)
       const bool = await this.addSlide(currentSlide)
-      bool && this.batchUpdateSlides(newData, true) // 批量更新-排序
+      bool && await this.batchUpdateSlides(newData, true) // 批量更新-排序
+      const resource = sessionStore.get('curr.resource')||{}
+      await PPTApi.getSlideList(resource.id)
     } else { // 防抖-更新
       if (!this.isUpdate) return this.isUpdate = true // 下次更新数据
+      if (isBatch) { // 批量更新-排序
+        this.batchUpdateSlides(newData, true)
+      } else { // 更新当前页幻灯片
         const params = {
           id: currentSlide.id,
           datacontent: JSON.stringify(currentSlide),
@@ -144,12 +164,15 @@ export class PPTApi {
         Utils.mxThrottle(() => {this.updateSlide(params)}, 200, 2)
       }
     }
-  // 更新幻灯片
+  }
-  static updateSlide(data: object): Promise<Boolean> {
+  // 更新幻灯片 isThum 是否更新缩略图
+  static updateSlide(data: object, isThum = true): Promise<Boolean> {
     return new Promise(async (resolve, reject) => {
+      if (isThum) { // 更新缩略图
+        const thumUrl = await this.getSlideThumUrl()
+        data.base64Code = thumUrl // 更新缩略图
+      }
       const res: Result = await API_entpcoursefile.updateEntpcoursefileNew(data)
-      console.log(data,'data');
-      console.log(res,'dresata');
       if (res.code === 200) {
         resolve(true)
       } else msgUtils.msgError(res.msg || '更新失败');resolve(false)
@@ -192,21 +215,77 @@ export class PPTApi {
     })
   }
 
+  // 更新-活动列表
+  static async updateWorkList(): Promise<Boolean> {
+    const resolveData = (resolve, data = []) => {
+      slidesStore.setWorkList(data)
+      return resolve()
+    }
+    return new Promise(async (resolve, reject) => {
+      const workItem = slidesStore.workItem // 所有的pptlist的数据-原始数据
+      const currentSlide = slidesStore.currentSlide // 当前页幻灯片
+      const slideId = currentSlide.id // 当前页幻灯片id
+      if (!slideId) return resolveData(resolve)
+      // slide详情获取-作业id
+      // const res = await API_entpcoursefile.getEntpcoursefile(slideId)
+      // const workIds = res?.data?.activityContent||''
+      // workItem-获取作业id
+      const workIds = workItem.find(o => o.id == slideId)?.activityContent
+      if (!workIds) return resolveData(resolve)
+      // 获取作业列表
+      const resW = await API_classwork.homeworklist({ ids: workIds, pageSize: 1000 })
+      if (resW && resW.rows) return resolveData(resolve, resW.rows)
+      else msgUtils.msgError(resW.msg || '更新失败');return resolveData(resolve)
+    })
+  }
+
+  // 批量更新缩略图-异步
+  static batchUpdateThumUrl() {
+    return nextTick().then(async () => {
+      const list = slidesStore.workItem || []
+      if (!list.length) return
+      const upList = []
+      for (const [ind,o] of list.entries()) {
+        const isCreate = !o.fileurl // 是否创建
+        if (isCreate) {
+          const thumUrl = await this.getSlideThumUrl(ind)
+          upList.push({ id: o.id, fileurl: thumUrl })
+        }
+      }
+      if (!upList.length) return
+      // 批量更新
+      return await API_entpcoursefile.batchUpdateNew(upList)
+    })
+  }
+
+  // thumbnail-slide thumbnail 缩略图
+  static getSlideThumUrl(index?:number): Promise<Boolean> {
+    return nextTick().then(async() => {
+      const slideIndex = index ?? slidesStore.slideIndex
+      const elements = document.querySelectorAll('.thumbnail-slide')
+      if (elements.length && slideIndex >= 0) {
+        const element = elements[slideIndex]
+        return await toPng(element)
+      }
+      return null
+    })
+  }
   // 图片|音频|视频 转换为在线地址
   static  toRousrceUrl =async (o:any) => {
       const formData = new FormData()
       formData.append('file', o)
+      formData.append('ral', true)
       const res = await Api_server.Other.uploadFile(formData)
       if (res && res.code == 200){
         const url = res?.url
         url &&(o.src = url)
         return url
       }
-   
   }
 }
 
 export class Homework{
+  static win: null  // 作业弹窗
   // 作业弹窗
   static async showHomework(id: any) {
     let result = await getClassWorkList(id)
@@ -214,7 +293,14 @@ export class Homework{
       localStorage.setItem('teachClassWorkItem', JSON.stringify(result[0]));
       toolStore.isTaskWin=true; // 设置打开批改窗口
     //   emit('closeActive')
-      createWindow('open-taskwin',{url:'/teachClassTask'}); 
+    // 重复打开，先关闭弹窗
+    // if (this.win) this.win?.close?.()
+    this.win = await createWindow('open-taskwin',{url:'/teachClassTask'})
+     return this.win;
+  }
+  static closeHomework() {
+    if (this.win) this.win?.close?.()
+    this.win = null
   }
 }
 export default PPTApi

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

@@ -106,6 +106,8 @@ export class MsgEnum {
     MSG_anmationclick : 'anmationclick',
     /** @desc: 群组创建成功 */
     MSG_classcourseopen : 'classcourseopen',
+    /** @desc: 学生提交作业 */
+    MSG_finishHomework : 'finishHomework',
     /** @desc: 学生的测练结果反馈 */
     MSG_classquizfeedback : 'classquizfeedback',
     /** @desc: 老师端：接收到学生反馈消息-课堂测练中的其他任务 */
@@ -120,6 +122,18 @@ export class MsgEnum {
     MSG_classWorkOfPresentDataUpdate : 'classWorkOfPresentDataUpdate',
     /** @desc: 课堂讲授活动，选择不同的内容 */
     MSG_classlecturePagesrc : 'classlecturePagesrc',
+    /** @desc: 课堂作业|活动 */
+    MSG_homework : 'HOMEWORK',
+    /** @desc: 公屏 - 课堂作业|活动 */
+    MSG_pushSreen_work : 'pushSreen_work',
+    /** @desc: 公屏 - 实验 */
+    MSG_pushSreen_experiment : 'pushSreen_experiment',
+    /** @desc: 点赞 */
+    MSG_dz : 'dz',
+    /** @desc: 疑惑 */
+    MSG_yh : 'yh',
+    /** @desc: 推图片上屏 */
+    MSG_pushSreen_ImgList : 'pushSreen_ImgList',
     // === 新定义-消息头 ===
     /** @desc: 课程创建-待开课 */
     MSG_0000: 0x0000,

src/renderer/src/AixPPTist/src/api/upvote.ts

@@ -0,0 +1,33 @@
+/**
+ * 点赞组件-相关
+ */
+export default class Upvote {
+  instance: any = null // 自身实例
+  upvoteRef: any = null // 点赞组件
+  constructor(elRef?: any) {
+    if(!!elRef) this.upvoteRef = elRef // 点赞组件
+    if (!Upvote.Instance) {
+      Upvote.Instance = this
+    }
+    return Upvote.Instance
+  }
+
+  // 初始化
+  init(elRef) {
+    if(!!elRef) this.upvoteRef = elRef // 点赞组件
+    return this
+  }
+  // 打开点赞或者疑问 1点赞 2疑问
+  trigger(type) {
+    this.upvoteRef?.value?.trigger?.(type)
+    return this
+  }
+  // 静态方法-初始化
+  static init(elRef) {
+    return new Upvote(elRef)
+  }
+  // 静态方法-打开点赞或者疑问 1点赞 2疑问
+  static trigger(type) {
+    return new Upvote().trigger(type)
+  }
+}

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

@@ -10,13 +10,22 @@ import { MsgEnum } from './types' // 消息枚举
 import ChatWs from '@/plugins/socket' // 聊天socket
 import Classcourse from './classcourse' // 课程相关
 import msgUtils from '@/plugins/modal' // 消息工具
+import * as dialogUtils from '@/utils/dialog' // 弹窗-函数
+import { Homework } from './index' // api-作业相关
+import emitter from '@/utils/mitt' //mitt 事件总线
+import useExecPlay from '../views/Screen/hooks/useExecPlay' // 播放控制
+import hooksUpvote from './upvote' // 点赞-工具
+import gridPic from './gridPic' // 上屏-工具
+
+/**
+ * @description 监听器
+ */
+export default () => {
   const slidesStore = store.useSlidesStore()
   const classcourseStore = store.useClasscourseStore() // 课堂信息-状态管理
   const resource = sessionStore.get('curr.resource') // apt 资源
   const smarttalk = sessionStore.get('curr.smarttalk') // 备课资源
-/**
+  const { execNext, turnPrevSlide } = useExecPlay(false) // 不加载钩子
- * @description 监听器
- */
   // 监听幻灯片内容变化
   watch(() => slidesStore.slides, (newVal, oldVal) => {
     PPTApi.updateSlides(newVal, oldVal) // 更新幻灯片内容
@@ -28,15 +37,28 @@ watch(() => slidesStore.title, (newVal, oldVal) => {
     updatePPT({title: newVal})
   })
   
+  // 监听幻灯片下标变化
+  watch(() => slidesStore.slideIndex, (newVal, oldVal) => {
+    if (!!Classcourse.id) return // 上课状态，不更新右侧作业列表
+    PPTApi.updateWorkList() // 更新作业列表
+  })
+  // 监听幻灯片下画布尺寸比例变化
+  watch(() => slidesStore.viewportRatio, (newVal, oldVal) => {
+    const width = slidesStore.viewportSize
+    const widthandration={width, ratio:newVal}
+    const data = { id: resource.id,  parentContent: JSON.stringify(widthandration)}
+    PPTApi.updateSlide(data)
+  })
+
   // 消息监听ws
-console.log('监听器已开启', ChatWs)
+  // console.log('监听器已开启', ChatWs)
-if (ChatWs.ws) {
+  if (!!ChatWs.ws) {
-  ChatWs.watch((msg, e) => {
+    ChatWs.watch((data, e) => {
       try {
-      handleMessage(JSON.parse(msg))
+        handleMessage(JSON.parse(data)?.msg)
       } catch (error) {
         console.error('socket 解析异常 ', error, e)
-      handleMessage(msg)
+        handleMessage(data)
       }
     })
   }
@@ -58,6 +80,7 @@ const updatePPT = async (data) => {
   
   // ws消息处理
   const handleMessage = (msg) => {
+    console.log('ws消息处理', msg)
     if (typeof msg === 'object'){
       const { head, content, ...other } = msg
       switch (head) {
@@ -66,29 +89,73 @@ const handleMessage = (msg) => {
           if (Classcourse.id !== content.id) {
             msgUtils.alertError('老师开课信息异常，请重新进入公屏！')
             .then(() => { // 点击确定按钮，关闭窗口
-            window.close()
+              close()
             })
           } else { // 正常更新数据
             classcourseStore.classcourse.status = 'open'
+            sessionStore.set('curr.classcourse.status', 'open')
             // 更新课堂信息-关闭警告框
             Classcourse?.msgObj?.onVanish()
           }
           break
         case MsgEnum.HEADS.MSG_slideFlapping: // 幻灯片翻页
-        const slideIndex = content.current
+          emitter.emit('closegridPic') //如果有推图片窗口 就关闭
-        slidesStore.updateSlideIndex(slideIndex) // 更新幻灯片下标
+          const slideIndex = content?.current || 0
+          const type = content?.animation // 上下动作
+          const steps = content?.animationSteps // 动画步骤
+          if (type === 'Nextsteps') execNext(true) // 下一步-异步动画
+          else if (type === 'Previoustep') turnPrevSlide() // 上一步清空-动画
+          else slidesStore.updateSlideIndex(slideIndex) // 更新幻灯片下标
+          // 更新本地缓存
+          sessionStore.set('curr.classcourse.paging', slideIndex)
+          sessionStore.set('curr.classcourse.cartoonTimes', steps)
+          classcourseStore.classcourse.paging = slideIndex
+          classcourseStore.classcourse.cartoonTimes = steps
+          break
+        // case MsgEnum.HEADS.MSG_homework: // 作业|活动-布置 不处理
+        case MsgEnum.HEADS.MSG_pushSreen_work: // 打开-作业|活动
+          if (!content.id) return
+          Homework.showHomework(content.id)
+          break
+        case MsgEnum.HEADS.MSG_pushSreen_experiment: // 打开实验:
+          if (!content.url) return
+          dialogUtils.openLink(content.url)
           break
         case MsgEnum.HEADS.MSG_closed: // 下课:
-        window.close() // 关闭窗口
+          close()
+          break
+        case MsgEnum.HEADS.MSG_dz: // 点赞
+          hooksUpvote.trigger(1)
+          break
+        case MsgEnum.HEADS.MSG_yh: // 疑惑
+          hooksUpvote.trigger(2)
+          break
+          case MsgEnum.HEADS.MSG_pushSreen_ImgList: // 推图片上屏
+          const imgArray = content.ImgList.map((obj) => obj.url);
+          emitter.emit('opengridPic',{arr:imgArray}) // 打开推图片上屏窗口
+          break
+        case MsgEnum.HEADS.MSG_0010: // 备用
           break
         default:
           break
       }
     }
   }
-// console.log('监听器已开启', Classcourse)
+  // 关闭窗口
-// setTimeout(() => {
+  const close = () => {
-//   console.log('关闭弹窗')
+    ChatWs?.close() // 关闭ws
-//   // Classcourse.msgObj?.close()
+    setTimeout(() => {
-//   Classcourse?.msgObj?.onVanish()
+      window.close() // 关闭窗口
-// }, 10 * 1000)
+    }, 1000)
+  }
+  // setTimeout(async () => {
+  //   emitter.emit('opengridPic',{arr:['https://prev.ysaix.com:7868/src/assets/images/homecard4.jpg']})
+  // }, 3000)
+
+  // setTimeout(async () => {
+  //   emitter.emit('closegridPic')
+  // }, 6000)
+  // setTimeout(async () => {
+  //   emitter.emit('opengridPic',{arr:['https://prev.ysaix.com:7868/src/assets/images/homecard4.jpg','https://prev.ysaix.com:7868/src/assets/images/homecard4.jpg']})
+  // }, 9000)
+}

src/renderer/src/AixPPTist/src/hooks/useScreening.ts

@@ -1,5 +1,7 @@
 import { useScreenStore, useSlidesStore, useClasscourseStore } from '../store'
 import { enterFullscreen, exitFullscreen, isFullscreen } from '../utils/fullscreen'
+import { sessionStore } from '@/utils/store' // electron-store 状态管理
+import ChatWs from '@/plugins/socket' // 聊天socket
 
 export default () => {
   const screenStore = useScreenStore()
@@ -23,7 +25,13 @@ export default () => {
     const classcourse = classcourseStore.classcourse
     if (!!classcourse) { //DOTO 有课堂，执行退相关操作
       console.log('退出放映状态')
-      window.close()
+      ChatWs?.close() // 关闭ws
+      sessionStore.delete('curr.classcourse') // 清除课堂信息
+      sessionStore.delete('curr.resource')    // 清除课件信息
+      sessionStore.delete('curr.isPublic')    // 清除公屏状态
+      setTimeout(() => {
+        window.close() // 关闭窗口
+      }, 1000)
     } else screenStore.setScreening(false)
     if (isFullscreen()) exitFullscreen()
   }

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

@@ -3,16 +3,21 @@ import type { Classcourse } from '../api/types'
 
 export interface ClasscourseState {
   classcourse: Classcourse | any, // 课堂信息
+  isEmit: boolean, // 是否加载监听事件(动画播放)
 }
 
 export const useClasscourseStore = defineStore('classcourse', {
   state: (): ClasscourseState => ({
     classcourse: null, // 课堂信息
+    isEmit: false, // 是否加载监听事件(动画播放)
   }),
 
   actions: {
     setClasscourse(classcourse: Classcourse) {
       this.classcourse = classcourse
     },
+    setIsEmit(isEmit: boolean) {
+      this.isEmit = isEmit
+    },
   },
 })

src/renderer/src/AixPPTist/src/store/slides.ts

@@ -33,7 +33,8 @@ export interface SlidesState {
   slides: Slide[]
   slideIndex: number
   viewportSize: number
-  viewportRatio: number
+  viewportRatio: number,
+  animationIndex: number, // 不是从0开始
   workList:Object[],
   workItem:Object[],
 }
@@ -46,6 +47,7 @@ export const useSlidesStore = defineStore('slides', {
     slideIndex: 0, // 当前页面索引
     viewportSize: 1000, // 可视区域宽度基数
     viewportRatio: 0.5625, // 可视区域比例，默认16:9
+    animationIndex: 0, // 不是从0开始
     workList:[],// 活动的列表
     workItem:[],// 获取到的所有pptlist
   }),
@@ -145,48 +147,16 @@ export const useSlidesStore = defineStore('slides', {
     setWorkItem(list: Object[]) {
       this.workItem = list
     },
-    addWorkItem(data: any) {
-      const id = data?.parentid
-      if (!id) return
-      this.workItem.splice(this.slideIndex, 0, data)
-    },
   
     addSlide(slide: Slide | Slide[]) {
-      const resource = sessionStore.get('curr.resource')||{}
-      const enpt = sessionStore.get('curr.entp')||{}
-      const {id, ...content} = slide
-      const params = {
-        parentid: resource.id,
-        activityContent:null,
-        entpid: userStore.user.deptId,
-        entpcourseid: enpt.id,
-        ppttype: 'file',
-        title: '',
-        fileurl: '',
-        filetype: 'slide',
-        datacontent: JSON.stringify(content),
-        filekey: '',
-        filetag: '',
-        fileidx: 0,
-        dflag: 0,
-        status: '',
-        edituserid: userStore.id,
-      }
       const slides = Array.isArray(slide) ? slide : [slide]
       for (const slide of slides) {
         if (slide.sectionTag) delete slide.sectionTag
       }
-      API_entpcoursefile.addEntpcoursefileReturnId(params).then((rid:number) => {
-        if(!!rid){
-          params.id = rid
-          this.addWorkItem(params)
       const addIndex = this.slideIndex + 1
       this.slides.splice(addIndex, 0, ...slides)
       this.slideIndex = addIndex
-        }
-      })
     },
-  
     updateSlide(props: Partial<Slide>, slideId?: string) {
       const slideIndex = slideId ? this.slides.findIndex(item => item.id === slideId) : this.slideIndex
       this.slides[slideIndex] = { ...this.slides[slideIndex], ...props }
@@ -238,6 +208,9 @@ export const useSlidesStore = defineStore('slides', {
     updateSlideIndex(index: number) {
       this.slideIndex = index
     },
+    updateAnimationIndex(index: number) {
+      this.animationIndex = index
+    },
   
     addElement(element: PPTElement | PPTElement[]) {
       const elements = Array.isArray(element) ? element : [element]

src/renderer/src/AixPPTist/src/utils/image.ts

@@ -73,3 +73,54 @@ export const svg2File = (svg: string): File => {
   const blob = new Blob([svg], { type: 'image/svg+xml' })
   return new File([blob], `${Date.now()}.svg`, { type: 'image/svg+xml' })
 }
+
+/**
+ * 获取当前的时间
+ * @returns 
+ */
+export const getTime=()=>{
+  const now = new Date();
+  const year = now.getFullYear();
+  const month = ('0' + (now.getMonth() + 1)).slice(-2);
+  const day = ('0' + now.getDate()).slice(-2);
+  const hours = ('0' + now.getHours()).slice(-2);
+  const minutes = ('0' + now.getMinutes()).slice(-2);
+  const seconds = ('0' + now.getSeconds()).slice(-2);
+  return `${year}-${month}-${day}_${hours}:${minutes}:${seconds}`;
+};
+
+/**
+* base64转图片File
+* @param {String} base64 图片base64
+* @param {String} fileName 图片名称| 默认 → myimg
+* @returns File 返回转换后的file数据类型
+*/
+export const base64ToFile = (base64: string, fileName = '试题图片') => {
+  // 将base64按照 , 进行分割 将前缀  与后续内容分隔开
+  let data = base64.split(','),
+  // 利用正则表达式 从前缀中获取图片的类型信息（image/png、image/jpeg、image/webp等）
+  type = data[0].match(/:(.*?);/)[1],
+  // 从图片的类型信息中 获取具体的文件格式后缀（png、jpeg、webp）
+  suffix = type.split('/')[1],
+  // 使用atob()对base64数据进行解码  结果是一个文件数据流 以字符串的格式输出
+  bstr = window.atob(data[1]),
+  // 获取解码结果字符串的长度
+  n = bstr.length,
+  // 根据解码结果字符串的长度创建一个等长的整形数字数组
+  // 但在创建时 所有元素初始值都为 0
+  u8arr = new Uint8Array(n)
+
+  // 将整形数组的每个元素填充为解码结果字符串对应位置字符的UTF-16 编码单元
+  while (n--) {
+      // charCodeAt()：获取给定索引处字符对应的 UTF-16 代码单元
+      u8arr[n] = bstr.charCodeAt(n)
+  }
+  const filename = fileName+getTime()
+  // 利用构造函数创建File文件对象
+  // new File(bits, name, options)
+  const file = new File([u8arr], `${filename}.${suffix}`, {
+      type: type
+  })
+  // 返回file
+  return file
+}

src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue

@@ -19,7 +19,9 @@
 import { ref, reactive, onMounted, computed } from 'vue';
 import { sessionStore } from '@/utils/store'
 import { getSmarttalkPage } from '@/api/file'
-import { getFileSuffix, urlToBase64 } from '@/utils/ruoyi.js'
+import * as commUtils from '@/utils/comm.js'
+import { getFileSuffix } from '@/utils/ruoyi.js'
+import { PPTApi } from '../../../api'
 
 const emit = defineEmits(['insertMaterial', 'close'])
 
@@ -59,70 +61,31 @@ const fileUrl = computed(() => (item) =>{
   }
 })
 
-
 // 插入
 const onInsert = async (item) =>{
+  loading.value = true
+  const res = await fetch(item.fileFullPath)
+  const bolb = await res.blob()
+  const file = commUtils.blobToFile(bolb, item.fileShowName)
+
+  try {
+    const data = await PPTApi.toRousrceUrl(file)
     if(videoSuffix.indexOf(getFileSuffix(item.fileShowName)) != -1){
-    emit('insertMaterial',{ type: 'video', data: item.fileFullPath })
+      emit('insertMaterial',{ type: 'video', data })
     }
     else{
-    const base64 = await urlToBase64(item.fileFullPath)
+      emit('insertMaterial',{ type: 'img',  data })
-    emit('insertMaterial',{ type: 'img', data: base64 })
+    }
+  } finally {
+    loading.value = false
   }
 }
 
-
-
-const GetUrlParameters = (parameters) => {
-  let resData = "";
-
-  let url = document.location.toString();
-  let arrUrl = url.split("?");
-  // 判断是否有参数
-  if (arrUrl.length > 1) {
-    // 拆分参数字符串
-    let parametersArr = arrUrl[1].split("&");
-    // 循环查找参数
-    for (let i = 0; i <= parametersArr.length; i++) {
-      if (parametersArr[i]) {
-        // 拆分参数的键和值
-        let parameterStr = parametersArr[i].split("=");
-        if (parameters == parameterStr[0]) {
-            resData = parameterStr[1];
-            break;
-        }
-      }
-    }
-  }
-  return resData;
-}
-
-const proxyToBase64 = (url)=> {
-  const dourl = GetUrlParameters(url)
-  console.log(dourl,'dourl')
-  return
-  axios({
-    url: "/api/logo.png",
-    method: "get",
-    responseType: "blob",
-  }).then((res) => {
-    const reader = new FileReader();
-    reader.readAsDataURL(res.data);
-    reader.onload = () => {
-      console.log(reader.result);
-    };
-  });
-}
-
-
-
-
 // 关闭
 const onClose = () =>{
   emit('close')
 }
 
-
 onMounted(() => {
   let data = sessionStore.get('subject.curNode')
   Object.assign(curNode, data);

src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue

@@ -114,7 +114,7 @@
       />
     </Modal>
 
-    
+    <!--插入试题-->
     <el-dialog v-model="classWorkTaskVisible" append-to-body :show-close="false" width="70%">
       <QuestToPPTist 
         class="class-work-task-modal"
@@ -132,7 +132,7 @@
     <Modal
     v-model:visible="imgVisible" 
     :width="1300">
-      <TextCreateImg hasPPt @insertImg="(url: string) => { createImageElement(url); imgVisible = false }" />
+      <TextCreateImg hasPPt @insertImg="insertImg" />
     </Modal>
   </div>
 </template>
@@ -141,7 +141,7 @@
 import { ref } from 'vue'
 import { storeToRefs } from 'pinia'
 import { useMainStore, useSnapshotStore } from '../../../store'
-import { getImageDataURL } from '../../../utils/image'
+import { getImageDataURL, base64ToFile } from '../../../utils/image'
 import type { ShapePoolItem } from '../../../configs/shapes'
 import type { LinePoolItem } from '../../../configs/lines'
 import useScaleCanvas from '../../../hooks/useScaleCanvas'
@@ -165,6 +165,7 @@ import { PPTApi } from '../../../api'
 import TextCreateImg from '@/components/ai-kolors/index.vue'
 import { toPng } from 'html-to-image' // 引入html-to-image库
 
+
 const mainStore = useMainStore()
 const { creatingElement, creatingCustomShape, showSelectPanel, showSearchPanel, showNotesPanel } = storeToRefs(mainStore)
 const { canUndo, canRedo } = storeToRefs(useSnapshotStore())
@@ -209,8 +210,14 @@ const insertImageElement = (files: FileList) => {
 }
 
 const onhtml2canvas = async (html: HTMLElement) => {
-  const ele = await toPng(html);
+  const base64Dta = await toPng(html);
-  createImageElement(ele);
+  // base64转图片File
+  const toFile = base64ToFile(base64Dta) 
+  // 上传图片转为线上地址
+  PPTApi.toRousrceUrl(toFile).then(data=>{
+    createImageElement(data)
+  })
+  // createImageElement(ele);
 }
 
 const shapePoolVisible = ref(false)
@@ -276,7 +283,7 @@ interface MaterialParams {
   type: string,
   data: string
 }
-const insertMaterial = (item: MaterialParams) =>{
+const insertMaterial = async (item: MaterialParams) =>{
   const { type, data } = item
   if(type == 'video'){
     createVideoElement(data)
@@ -289,6 +296,13 @@ const insertMaterial = (item: MaterialParams) =>{
 
 // 文生图
 const imgVisible = ref(false)
+const insertImg = async (file: any) =>{
+  PPTApi.toRousrceUrl(file).then(data=>{
+    createImageElement(data)
+    imgVisible.value = false
+  })
+}
+
 </script>
 
 <style lang="scss" scoped>

src/renderer/src/AixPPTist/src/views/Editor/EditorHeader/index.vue

@@ -3,7 +3,7 @@
     <div class="left">
       <Popover trigger="click" placement="bottom-start" v-model:value="mainMenuVisible">
         <template #content>
-          <FileInput accept=".pptist"  @change="files => {
+          <!-- <FileInput accept=".pptist"  @change="files => {
             importSpecificFile(files)
             mainMenuVisible = false
           }">
@@ -15,8 +15,8 @@
           }">
             <PopoverMenuItem>导入 pptx 文件</PopoverMenuItem>
           </FileInput>
-          <PopoverMenuItem @click="setDialogForExport('pptx')">导出文件</PopoverMenuItem>
+          <PopoverMenuItem @click="setDialogForExport('pptx')">导出文件</PopoverMenuItem> -->
-          <PopoverMenuItem @click="resetSlides(); mainMenuVisible = false">重置幻灯片</PopoverMenuItem>
+          <!-- <PopoverMenuItem @click="resetSlides(); mainMenuVisible = false">重置幻灯片</PopoverMenuItem> -->
           <!-- <PopoverMenuItem @click="goLink('https://github.com/pipipi-pikachu/PPTist/issues')">意见反馈</PopoverMenuItem> -->
           <!-- <PopoverMenuItem @click="goLink('https://github.com/pipipi-pikachu/PPTist/blob/master/doc/Q&A.md')">常见问题</PopoverMenuItem> -->
           <PopoverMenuItem @click="mainMenuVisible = false; hotkeyDrawerVisible = true">快捷操作</PopoverMenuItem>
@@ -54,9 +54,9 @@
           <div class="arrow-btn"><IconDown class="arrow" /></div>
         </Popover>
       </div>
-      <div class="menu-item" v-tooltip="'导出'" @click="setDialogForExport('pptx')">
+      <!-- <div class="menu-item" v-tooltip="'导出'" @click="setDialogForExport('pptx')">
         <IconDownload class="icon" />
-      </div>
+      </div> -->
       <div class="menu-item" v-tooltip="`${userStore.user.parentDeptName}-${userStore.user.nickName}`">
         <el-avatar size="small" :src="avatar" />
       </div>

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

@@ -25,6 +25,12 @@
                     <div style="margin-top: 10px">常规作业</div>
                 </div>
             </el-button>
+            <el-button size="small" title="科学实验" text style="height: 54px;margin-left: 0" @click="showDialog('科学实验')">
+                <div class="buttonDiv">
+                    <svg width="26" height="26" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" fill="#646473"><path d="M901.705143 511.926857h-55.954286a8.045714 8.045714 0 0 1-8.045714-8.045714V183.881143H181.686857v656.091428H501.76c4.388571 0 8.045714 3.510857 8.045714 7.899429v56.027429c0 4.388571-3.657143 8.045714-8.045714 8.045714H141.750857a31.963429 31.963429 0 0 1-32.036571-32.036572V143.872c0-17.627429 14.336-31.963429 32.036571-31.963429H877.714286c17.700571 0 32.036571 14.336 32.036571 31.963429V503.954286c0 4.388571-3.657143 8.045714-8.045714 8.045714zM731.428571 911.945143a36.571429 36.571429 0 0 1-36.571428-36.571429v-109.714285H585.142857a36.571429 36.571429 0 0 1 0-73.142858h109.714286v-109.714285a36.571429 36.571429 0 0 1 73.142857 0v109.714285H877.714286a36.571429 36.571429 0 1 1 0 73.142858h-109.714286v109.714285a36.571429 36.571429 0 0 1-36.571429 36.571429z" p-id="22184"></path></svg>
+                    <div style="margin-top: 10px">科学实验</div>
+                </div>
+            </el-button>
         </div>
 
         <Divider />
@@ -32,22 +38,22 @@
         <!-- 作业列表 -->
         <div class="c-apt-r" v-loading='loadingActive'>
                 <!-- 显示-作业内容 -->
-            <template v-for="(item, index) in workList" :key="index">
+            <template v-for="(item, index) in slidesStore.workList" :key="index">
                 <div class="item">
                     <div class="item-title">
                         <el-tag :type="getTagType(item.worktype) || 'primary'">{{item.worktype}}</el-tag>
                         <el-tooltip :content="item.uniquekey" placement="top">
                             <div class="tt">{{item.uniquekey}}</div>
                         </el-tooltip>
-                        <el-button class="btn-del" type="danger" link @click="handleRemoveDemoActivityClassWork(item)">删除</el-button>
+                        <el-button class="btn-del" type="danger" link @click="removeWork(item, index)">删除</el-button>
                     </div>
                 </div>
             </template>
         </div>
         <!-- // 推送作业 -->
-        <el-dialog v-model="dialogVisible" append-to-body :show-close="false" width="90%" height="500">
+        <el-dialog v-model="dialogVisible" append-to-body :show-close="false" width="85%" height="500">
-            <el-scrollbar height="550">
+            <el-scrollbar>
-                <div style="height: 550px;">
+                <div style="height: 75vh;">
                     <NewClassTsakAssign :currentCourse='currentCourse' @getData="getData" />
                 </div>
             </el-scrollbar>
@@ -80,20 +86,13 @@
 <script setup lang="ts">
 import { ref, reactive, onMounted, nextTick, watch } from 'vue'
 import Divider from '../../../../../components/Divider.vue'
-import { listEntpcoursefile } from '@/api/education/entpcoursefile'
-import { homeworklist } from '@/api/teaching/classwork'
-import { processList } from "@/hooks/useProcessList";
-import { listEntpcoursework } from "@/api/classTask/index";
 import { ElMessageBox,ElMessage } from 'element-plus'
 import NewClassTsakAssign from '@/views/classTask/newClassTaskAssign/index.vue'
 import { sessionStore } from '@/utils/store'
 import { useGetHomework } from '@/hooks/useGetHomework'
 import { PPTApi } from '../../../../../api/index'
-import { storeToRefs } from 'pinia'
 import {useSlidesStore} from '../../../../../store' 
 const slidesStore = useSlidesStore()
-const { slides, slideIndex, currentSlide, workItem } = storeToRefs(slidesStore)
-
 interface CourseNode {
     rootid: number;
     parentNode: { id: number };
@@ -111,12 +110,6 @@ interface CurrentCourse {
     worktype: string;
 }
 
-interface Params {
-    parentid: number;
-    pageSize: number;
-    orderby: string;
-}
-
 interface WorkType {
     label: string;
     value: string;
@@ -167,63 +160,35 @@ const type = ref<WorkType[]>([
         label: '常规作业',
         value: 'primary'
     },
+    {
+        label: '框架梳理',
+        value: 'primary'
+    },
+    {
+        label: '科学实验',
+        value: 'primary'
+    }
 ])
 
-const objItem = ref<any>({})
-// 作业列表
-const workList = ref<WorkItem[]>([])
-
 // 获取所选择的作业列表
 const selectedWorkList = ref<WorkItem[]>([])
 // 活动页面的loading框
 const loadingActive = ref<boolean>(false)
 
-
+// 选择活动列表
-const paramData = ref<{ id: number, activityContent: string }>({} as { id: number, activityContent: string })
-
 const selectable = (row: WorkItem, index: number): boolean => {
     return row.status === '10';
 };
 
-
+// 删除作业
-const formatClassWorkFile = async (postData: WorkItem[]): Promise<void> => {
+const removeWork = (item: WorkItem, index: number) => {
-    for (let i = 0; i < postData.length; i++) {
-        let item = postData[i];
-        switch (item.worktype) {
-            case '框架梳理': {
-            }
-                break;
-            case '习题训练': {
-                // let workIds = item.quizlist!.map(items => items.id).join(',');
-                // let ress = await listEntpcoursework({ ids: workIds });
-                // const arr = ress.rows.map((item:{id:number}) => {
-                //     return item.id
-                // })
-                
-                // processList(ress.rows);
-            }
-                break;
-            case '课堂展示': {
-                // item.base64 = JSON.parse(item.workcodes).base64;
-            }
-                break;
-            case '常规作业': {
-                // item.prevData = JSON.parse(item.workcodes);
-            }
-        }       
-        workList.value.push(item)
-        loadingActive.value = false
-    }
-    await nextTick();
-}// 删除作业
-const handleRemoveDemoActivityClassWork = (item: WorkItem) => {
     ElMessageBox.confirm('是否确认删除？')
-        .then(() => {
+    .then(async() => {
-            workList.value = []
+      // 从workList中删除
-            const arr = paramData.value.activityContent.split(',')
+      // slidesStore.workList.splice(index, 1)
-            const filterArr = arr.filter(itemId => itemId!== item.id.toString())
+      console.log('删除作业', item)
-            paramData.value.activityContent = filterArr.join(',')
+      await upDateData('del', [item.id])
-            upDateData()
+      ElMessage.success('删除成功')
     })
     .catch(() => { });
 }
@@ -252,6 +217,7 @@ const showDialog = (item: string) => {
     dialogVisible.value = true
 }
 
+// 打开活动引用列表
 const openList = () => {
     activeVisible.value = true
     initHomeWork()
@@ -259,65 +225,44 @@ const openList = () => {
 
 // 添加活动引用列表作业
 const savePPtData = async () => {
-    if (selectedWorkList.value.length === 0) {
+  if (!selectedWorkList.value.length) {
     ElMessage.warning('请选择活动')
     return
   }
-    workList.value = []
   const arr = selectedWorkList.value.map(item => item.id)
-    // 应该是新加而不是覆盖
+  await upDateData('add', arr)
-    const existingIds = paramData.value.activityContent ? paramData.value.activityContent.split(',') : []
-    paramData.value.activityContent = Array.from(new Set([...existingIds, ...arr])).join(',')
-    upDateData()
   activeVisible.value = false
 }
 
-// 获取当前ppt页的数据
-const getCurrentPPtData = async () => {
-    workList.value = []
-    objItem.value = workItem.value[slideIndex.value]
-    paramData.value.id =  objItem.value.id
-    console.log(paramData.value.id,'paramData.value.id');
-    
-    paramData.value.activityContent = objItem.value?.activityContent
-    if (objItem.value?.activityContent) {
-        loadingActive.value = true
-        const res = await homeworklist({ ids: objItem.value?.activityContent, pageSize: 100 })
-        await formatClassWorkFile(res.rows)
-    }
-}
-
 // 接收习题训练的值
 const getData = async (data: WorkItem) => {
-    workList.value = []
+  await upDateData('add', [data.id])
-    if(paramData.value.activityContent){
-        const arr = paramData.value.activityContent.split(',')
-        arr.push(data.id.toString())
-        const unitArr = Array.from(new Set(arr))
-        paramData.value.activityContent = unitArr.join(',')
-    }else{
-        paramData.value.activityContent = data.id.toString()
-    }
-    upDateData()
   dialogVisible.value = false
 }
-const upDateData = async () => {
+// 更新数据-活动 type add/增加 | del/删除 ids 作业id
-    await PPTApi.updateSlide(paramData.value)
+const upDateData = (type: string, ids: number[]): Promise<any> => {
+  return new Promise(async (resolve, reject) => {
     loadingActive.value = true
-    const res = await homeworklist({ ids: paramData.value.activityContent, pageSize: 100 })
+    // 更新本地数据
-    await formatClassWorkFile(res.rows)
+    let workIds = slidesStore.workList.map((o:any) => o.id)
-    const resource = sessionStore.get('curr.resource')
+    const id = slidesStore.currentSlide.id
-    await PPTApi.getSlideList(resource.id)
+    if (type === 'del') { // 删除
+      workIds = workIds.filter(id => !ids.includes(id))
+    } else { // 增加
+      workIds = Array.from(new Set([...workIds, ...ids]))
     }
-// 判断是否做操作
+    // 保存到本地
-const objectsAreEqual = (obj1: any[], obj2: any[]) => {
+    const wItem:any = slidesStore.workItem.find((o:any) => o.id === id)
-    const keys1 = Object.keys(obj1);
+    const workIdsStr = workIds.join(',') // 作业id->字符串
-    const keys2 = Object.keys(obj2);
+    if (!!wItem) wItem.activityContent = workIdsStr
-    if (keys1.length !== keys2.length) return false;
+    const data = { id, activityContent: workIdsStr }
-    for (const key of keys1) {
+    // 修改数据库
-        if (obj1[key] !== obj2[key]) return false;
+    await PPTApi.updateSlide(data, false)
-    }
+    // 刷新活动列表
-    return true;
+    await PPTApi.updateWorkList()
+    loadingActive.value = false
+    resolve(true)
+  })
 }
 
 onMounted(() => {
@@ -327,16 +272,8 @@ onMounted(() => {
     currentCourse.levelSecondId = curNode.id
     currentCourse.coursetitle = curNode.itemtitle
     currentCourse.node = curNode
-    objItem.value = workItem.value[slideIndex.value]
-    getCurrentPPtData()
 })
-watch(() => [workItem.value.length,slideIndex.value], (newVal,oldVal) => {
+
-    if(!objectsAreEqual(newVal,oldVal))
-        getCurrentPPtData()
-})
-// watch(() =>  workItem.value.length, () => {
-//     getCurrentPPtData()
-// })
 </script>
 <style scoped lang="scss">
 .buttonDiv{

src/renderer/src/AixPPTist/src/views/Editor/Toolbar/ElementStylePanel/ImageStylePanel.vue

@@ -88,7 +88,9 @@ import Button from '../../../../components/Button.vue'
 import ButtonGroup from '../../../../components/ButtonGroup.vue'
 import Popover from '../../../../components/Popover.vue'
 import NumberInput from '../../../../components/NumberInput.vue'
-
+import { PPTApi } from '../../../../api'
+import { Console } from 'node:console'
+import { x64 } from 'crypto-js'
 const shapeClipPathOptions = CLIPPATHS
 const ratioClipOptions = [
   {
@@ -221,10 +223,14 @@ const presetImageClip = (shape: string, ratio = 0) => {
 const replaceImage = (files: FileList) => {
   const imageFile = files[0]
   if (!imageFile) return
-  getImageDataURL(imageFile).then(dataURL => {
+  PPTApi.toRousrceUrl(imageFile).then(data=>{
-    const props = { src: dataURL }
+    const props = { src: data }
       updateImage(props)
   })
+  // getImageDataURL(imageFile).then(dataURL => {
+    // const props = { src: dataURL }
+    // updateImage(props)
+  // })
 }
 
 // 重置图片：清除全部样式

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

@@ -30,18 +30,14 @@
       @close="timerlVisible = false" 
     />
 
-    <div class="tools-left">
+    <div class="tools-left" v-if="!classcourse">
       <IconLeftTwo class="tool-btn" theme="two-tone" :fill="['#111', '#fff']" @click="execPrev()" />
       <IconRightTwo class="tool-btn" theme="two-tone" :fill="['#111', '#fff']" @click="execNext()" />
     </div>
-    <!-- 点赞组件 -->
-    <div style="z-index: 999;position: absolute;top:10px">
-      <upvote-vue ref="upvoteRef"  type="2"></upvote-vue>
-    </div>
     <div 
       class="tools-right" :class="{ 'visible': rightToolsVisible }" 
-      @mouseleave="rightToolsVisible = false"
+      @mouseleave="toolTrigger('leave')"
-      @mouseenter="rightToolsVisible = true"
+      @mouseenter="toolTrigger('enter')"
     >
       <div class="content">
         <div class="tool-btn page-number" @click="slideThumbnailModelVisible = true">幻灯片 {{slideIndex + 1}} / {{slides.length}}</div>
@@ -52,15 +48,20 @@
         <IconOffScreenOne class="tool-btn" v-tooltip="'退出全屏'" v-if="fullscreenState" @click="manualExitFullscreen()" />
         <IconFullScreenOne class="tool-btn" v-tooltip="'进入全屏'" v-else @click="enterFullscreen()" />
         <IconPower class="tool-btn" v-tooltip="'结束放映'" @click="exitScreening()" />
+        <IconPower class="tool-btn close" v-if="chat.groupid" v-tooltip="'结束课堂'" @click="exitCourse()" />
+      </div>
+      <div :class="['tools-icon',{opacity:iconHide}]" @click.stop="toolTrigger('icon')">
+        <circle-double-down v-if="rightToolsVisible" theme="outline" size="30" fill="#409EFF"/>
+        <circle-double-up v-else="!rightToolsVisible" theme="outline" size="30" fill="#E6A23C"/>
       </div>
     </div>
   </div>
 </template>
 
 <script lang="ts" setup>
-import { ref , watchEffect} from 'vue'
+import { ref , watchEffect, onMounted, onUnmounted} from 'vue'
 import { storeToRefs } from 'pinia'
-import { useSlidesStore ,useScreenStore} from '../../store'
+import { useSlidesStore ,useScreenStore, useClasscourseStore} from '../../store'
 import type { ContextmenuItem } from '../../components/Contextmenu/types'
 import { enterFullscreen } from '../../utils/fullscreen'
 import useScreening from '../../hooks/useScreening'
@@ -72,14 +73,16 @@ import ScreenSlideList from './ScreenSlideList.vue'
 import SlideThumbnails from './SlideThumbnails.vue'
 import WritingBoardTool from './WritingBoardTool.vue'
 import CountdownTimer from './CountdownTimer.vue'
-import upvoteVue from '@/views/tool/components/upvote.vue' // 点赞-子组件
 import emitter from '@/utils/mitt';
+import Chat from '../../api/chat' // 聊天
+import { CircleDoubleDown, CircleDoubleUp } from '@icon-park/vue-next' // icon-park 图标库
 
 const props = defineProps<{
   changeViewMode: (mode: 'base' | 'presenter') => void
 }>()
 
 const { slides, slideIndex } = storeToRefs(useSlidesStore())
+const { classcourse, isEmit } = storeToRefs(useClasscourseStore()) // 课堂信息
 
 const {
   autoPlayTimer,
@@ -100,18 +103,20 @@ const {
   execNext,
   animationIndex,
 } = useExecPlay()
-
 const { slideWidth, slideHeight } = useSlideSize()
 const { exitScreening } = useScreening()
 const { fullscreenState, manualExitFullscreen } = useFullscreen()
+const chat:any = Chat() // 聊天室
 
+const screenStore =useScreenStore()
 const rightToolsVisible = ref(false)
 const writingBoardToolVisible = ref(false)
 const timerlVisible = ref(false)
 const slideThumbnailModelVisible = ref(false)
 const laserPen = ref(false)
-const upvoteRef = ref(null)
+const timer = ref(0) // 记录操作时间
-const screenStore =useScreenStore()
+const iconHide = ref(false) // 工具栏图标是否显示
+const timerId = ref(null) // 定时器id
 const contextmenus = (): ContextmenuItem[] => {
   return [
     {
@@ -193,11 +198,37 @@ const contextmenus = (): ContextmenuItem[] => {
     },
   ]
 }
-// 打开点赞或者疑问 1点赞 2疑问
-emitter.on('upvoteTrigger', (type) => {
-  upvoteRef.value?.trigger(type)
-});
 
+const toolTrigger = (type:string) => {
+  const curT = Date.now()
+  if (curT - timer.value < 200) return
+  iconHide.value = false // 显示图标按钮
+  if (timerId.value) clearTimeout(timerId.value) // 清除定时器
+  switch (type) {
+    case 'icon': // 点击图标
+      timer.value = curT
+      rightToolsVisible.value = !rightToolsVisible.value
+      break
+    case 'enter': // 移入
+      timer.value = curT
+      rightToolsVisible.value = true
+      break
+    case 'leave': // 移出
+      rightToolsVisible.value = false
+      break
+    default:
+      break
+  }
+  timerId.value = setTimeout(() => { // 定时器
+    iconHide.value = true // 隐藏图标按钮
+  }, 2000)
+}
+// 下课
+const exitCourse = async () => {
+  // console.log('下课', chat)
+  await chat.exitCourse() // 下课消息
+  exitScreening() // 结束放映
+}
 
 </script>
 
@@ -254,6 +285,18 @@ emitter.on('upvoteTrigger', (type) => {
     top: -66px;
   }
 
+  .tools-icon{
+    position: absolute;
+    right: 8px;
+    top: -35px;
+    z-index: 1;
+    cursor: pointer;
+    transition: opacity $transitionDelay;
+    &.opacity{
+      opacity: .35;
+    }
+  }
+
   .content {
     width: 100%;
     height: 100%;
@@ -279,6 +322,9 @@ emitter.on('upvoteTrigger', (type) => {
     & + .tool-btn {
       margin-left: 15px;
     }
+    &.close{
+      color: #d14424;
+    }
   }
   .page-number {
     font-size: 13px;

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

@@ -12,6 +12,7 @@
       </div>
       <Divider class="divider" />
       <div class="tool-btn" @click="exitScreening()"><IconPower class="tool-icon" /><span>结束放映</span></div>
+      <div class="tool-btn close" @click="exitCourse()" v-if="chat.groupid"><IconPower class="tool-icon" /><span>结束课堂</span></div>
     </div>
 
     <div class="content">
@@ -55,7 +56,7 @@
           :class="{ 'active': index === slideIndex }"
           v-for="(slide, index) in slides" 
           :key="slide.id"
-          @click="turnSlideToIndex(index)"
+          @click="turnSlideTo(index, $event)"
         >
           <ThumbnailSlide :slide="slide" :size="120 / viewportRatio" :visible="index < slidesLoadLimit" />
         </div>
@@ -77,9 +78,9 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, nextTick, ref, watch } from 'vue'
+import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
 import { storeToRefs } from 'pinia'
-import { useSlidesStore } from '../../store'
+import { useSlidesStore, useClasscourseStore } from '../../store'
 import type { ContextmenuItem } from '../../components/Contextmenu/types'
 import { enterFullscreen } from '../../utils/fullscreen'
 import { parseText2Paragraphs } from '../../utils/textParser'
@@ -94,12 +95,15 @@ import ScreenSlideList from './ScreenSlideList.vue'
 import WritingBoardTool from './WritingBoardTool.vue'
 import CountdownTimer from './CountdownTimer.vue'
 import Divider from '../../components/Divider.vue'
+import emitter from '@/utils/mitt';
+import Chat from '../../api/chat' // 聊天
 
 const props = defineProps<{
   changeViewMode: (mode: 'base' | 'presenter') => void
 }>()
 
 const { slides, slideIndex, viewportRatio, currentSlide } = storeToRefs(useSlidesStore())
+const { classcourse, isEmit } = storeToRefs(useClasscourseStore()) // 课堂信息
 
 const slideListWrapRef = ref<HTMLElement>()
 const thumbnailsRef = ref<HTMLElement>()
@@ -117,17 +121,31 @@ const {
   turnSlideToId,
   animationIndex,
 } = useExecPlay()
-
 const { slideWidth, slideHeight } = useSlideSize(slideListWrapRef)
 const { exitScreening } = useScreening()
 const { slidesLoadLimit } = useLoadSlides()
 const { fullscreenState, manualExitFullscreen } = useFullscreen()
+const chat:any = Chat() // 聊天室
 
 const remarkFontSize = ref(16)
 const currentSlideRemark = computed(() => {
   return parseText2Paragraphs(currentSlide.value.remark || '无备注')
 })
 
+// 切换到指定的幻灯片
+const turnSlideTo = (index: number, e: PointerEvent) => {
+  // 课堂信息存在时，不允许翻页
+  console.log('课堂信息', classcourse, index)
+  if (!!classcourse.value) return
+  turnSlideToIndex(index)
+}
+// 下课
+const exitCourse = async () => {
+  // console.log('下课', chat)
+  await chat.exitCourse() // 下课消息
+  exitScreening() // 结束放映
+}
+
 const handleMousewheelThumbnails = (e: WheelEvent) => {
   if (!thumbnailsRef.value) return
   thumbnailsRef.value.scrollBy(e.deltaY, 0)
@@ -192,6 +210,7 @@ const contextmenus = (): ContextmenuItem[] => {
     },
   ]
 }
+
 </script>
 
 <style lang="scss" scoped>
@@ -208,7 +227,7 @@ const contextmenus = (): ContextmenuItem[] => {
   background-color: #fff;
   border-right: solid 1px #eee;
   font-size: 12px;
-  margin: 20px 0;
+  padding: 20px 0;
 
   .tool-btn {
     display: flex;
@@ -224,6 +243,9 @@ const contextmenus = (): ContextmenuItem[] => {
     &:hover, &.active {
       color: $themeColor;
     }
+    &.close{
+      color: #d14424;
+    }
   }
 
   .divider {

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

@@ -1,17 +1,24 @@
 import { onMounted, onUnmounted, ref } from 'vue'
 import { throttle } from 'lodash'
 import { storeToRefs } from 'pinia'
-import { useSlidesStore } from '../../../store'
+import { useSlidesStore, useClasscourseStore } from '../../../store'
 import { KEYS } from '../../../configs/hotkey'
 import { ANIMATION_CLASS_PREFIX } from '../../../configs/animation'
 import message from '../../../utils/message'
+import emitter from '@/utils/mitt';
+import Chat from '../../../api/chat' // 聊天封装
+// import ChatWs from '@/plugins/socket' // 聊天socket
+// import { MsgEnum } from '../../../api/types' // 消息枚举
 
-export default () => {
+export default (isLoader?: boolean = true) => {
+  // isLoader 是否执行 onMounted, onUnmounted
+  const chatApi = Chat()
   const slidesStore = useSlidesStore()
-  const { slides, slideIndex, formatedAnimations } = storeToRefs(slidesStore)
+  const classcourseStore = useClasscourseStore() // 课堂信息-状态管理
+  const { slides, slideIndex, formatedAnimations, animationIndex } = storeToRefs(slidesStore)
 
   // 当前页的元素动画执行到的位置
-  const animationIndex = ref(0)
+  // const animationIndex = ref(0)
 
   // 动画执行状态
   const inAnimation = ref(false)
@@ -19,10 +26,10 @@ export default () => {
   // 最小已播放页面索引
   const playedSlidesMinIndex = ref(slideIndex.value)
 
-  // 执行元素动画
+  // 执行元素动画 isAsync 为 true 时，异步执行，否则同步执行
-  const runAnimation = () => {
+  const runAnimation = (isAsync: boolean) => {
     // 正在执行动画时，禁止其他新的动画开始
-    if (inAnimation.value) return
+    if (inAnimation.value && !isAsync) return
 
     const { animations, autoNext } = formatedAnimations.value[animationIndex.value]
     animationIndex.value += 1
@@ -69,7 +76,7 @@ export default () => {
       elRef.addEventListener('animationend', handleAnimationEnd, { once: true })
     }
   }
-
+  if (isLoader) { // 加载相关钩子
     onMounted(() => {
       const firstAnimations = formatedAnimations.value[0]
       if (firstAnimations && firstAnimations.animations.length) {
@@ -77,6 +84,7 @@ export default () => {
         if (autoExecFirstAnimations) runAnimation()
       }
     })
+  }
 
   // 撤销元素动画，除了将索引前移外，还需要清除动画状态
   const revokeAnimation = () => {
@@ -121,9 +129,9 @@ export default () => {
   // 遇到元素动画时，优先执行动画播放，无动画则执行翻页
   // 向上播放遇到动画时，仅撤销到动画执行前的状态，不需要反向播放动画
   // 撤回到上一页时，若该页从未播放过（意味着不存在动画状态），需要将动画索引置为最小值（初始状态），否则置为最大值（最终状态）
-  const execPrev = () => {
+  const execPrev = (isAsync: boolean) => {
     if (formatedAnimations.value.length && animationIndex.value > 0) {
-      revokeAnimation()
+      revokeAnimation(isAsync)
     }
     else if (slideIndex.value > 0) {
       slidesStore.updateSlideIndex(slideIndex.value - 1)
@@ -139,9 +147,9 @@ export default () => {
     }
     inAnimation.value = false
   }
-  const execNext = () => {
+  const execNext = (isAsync: boolean) => {
     if (formatedAnimations.value.length && animationIndex.value < formatedAnimations.value.length) {
-      runAnimation()
+      runAnimation(isAsync)
     }
     else if (slideIndex.value < slides.value.length - 1) {
       slidesStore.updateSlideIndex(slideIndex.value + 1)
@@ -173,50 +181,68 @@ export default () => {
   }
 
   // 鼠标滚动翻页
-  const mousewheelListener = throttle(function(e: WheelEvent) {
+  const mousewheelListener = (e: WheelEvent) => {
-    if (e.deltaY < 0) execPrev()
+    // console.log('mousewheel', e)
-    else if (e.deltaY > 0) execNext()
+    e.preventDefault() // 阻止默认事件
+    mousewheelListenerThrottle(e)
+  }
+  const mousewheelListenerThrottle = throttle(function(e: WheelEvent) {
+    if (e.deltaY < 0) turning(e, 'prev')
+    else if (e.deltaY > 0) turning(e, 'next')
   }, 500, { leading: true, trailing: false })
 
   // 触摸屏上下滑动翻页
   const touchInfo = ref<{ x: number; y: number; } | null>(null)
 
   const touchStartListener = (e: TouchEvent) => {
+    e.preventDefault() // 阻止默认事件
     touchInfo.value = {
-      x: e.changedTouches[0].pageX,
+      // x: e.changedTouches[0].pageX,
-      y: e.changedTouches[0].pageY,
+      // y: e.changedTouches[0].pageY,
+      x: e.changedTouches[0].clientX,
+      y: e.changedTouches[0].clientY,
     }
   }
   const touchEndListener = (e: TouchEvent) => {
     if (!touchInfo.value) return
-
+    const offsetX = Math.abs(touchInfo.value.x - e.changedTouches[0].clientX)
-    const offsetX = Math.abs(touchInfo.value.x - e.changedTouches[0].pageX)
+    const offsetY = e.changedTouches[0].clientY - touchInfo.value.y
-    const offsetY = e.changedTouches[0].pageY - touchInfo.value.y
-
     if ( Math.abs(offsetY) > offsetX && Math.abs(offsetY) > 50 ) {
       touchInfo.value = null
-
+      if (offsetY > 0) turning(e, 'prev')
-      if (offsetY > 0) execPrev()
+      else turning(e, 'next')
-      else execNext()
+    }
+  }
+  // 向上翻页/向下翻页
+  const turning = async (e, type) => {
+    e.preventDefault() // 阻止默认事件
+    if (type === 'prev') execPrev()
+    else if (type === 'next') execNext()
+    if (classcourseStore.classcourse) { // 上课中
+      const current = slideIndex.value
+      const animationSteps = animationIndex.value
+      const animation = type == 'next'?'Nextsteps':'Previoustep'
+      const msg = { current, animation, animationSteps}
+      chatApi.slideFlapping(msg)
     }
   }
-
   // 快捷键翻页
   const keydownListener = (e: KeyboardEvent) => {
     const key = e.key.toUpperCase()
 
-    if (key === KEYS.UP || key === KEYS.LEFT || key === KEYS.PAGEUP) execPrev()
+    if (key === KEYS.UP || key === KEYS.LEFT || key === KEYS.PAGEUP) turning(e, 'prev')
     else if (
       key === KEYS.DOWN || 
       key === KEYS.RIGHT ||
       key === KEYS.SPACE || 
       key === KEYS.ENTER ||
       key === KEYS.PAGEDOWN
-    ) execNext()
+    ) turning(e, 'next')
+  }
+  if (isLoader) { // 加载相关钩子
+    onMounted(() => {document.addEventListener('keydown', keydownListener)})
+    onUnmounted(() => {document.removeEventListener('keydown', keydownListener)})
   }
-
-  onMounted(() => document.addEventListener('keydown', keydownListener))
-  onUnmounted(() => document.removeEventListener('keydown', keydownListener))
   
   // 切换到上一张/上一张幻灯片（无视元素的入场动画）
   const turnPrevSlide = () => {

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

@@ -2,24 +2,46 @@
   <div class="pptist-screen">
     <BaseView  :changeViewMode="changeViewMode" v-if="viewMode === 'base'" />
     <PresenterView  :changeViewMode="changeViewMode" v-else-if="viewMode === 'presenter'" />
+    <!-- 点赞组件 -->
+    <upvote-vue ref="upvoteRef"  type="2"></upvote-vue>
+    <!-- <div style="z-index: 999;position: absolute;top:10px">
+    </div> -->
+    <!-- 推图上屏弹窗 -->
+    <el-dialog
+      v-model="dialogVisible"
+       :fullscreen="true"
+      class="gridPicRefdiv"
+      style="overflow: hidden;"
+      :show-close="false"
+    >
+      <grid-pic ref="gridPicRef" style="height:100%;"  @clear="clearchidrenPic"></grid-pic>
+  </el-dialog>
   </div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted, ref } from 'vue'
+import { onMounted, onUnmounted, ref , nextTick} from 'vue'
 import { KEYS } from '../../configs/hotkey'
 import useScreening from '../../hooks/useScreening'
+import hooksUpvote from '../../api/upvote' // 点赞-工具
 
 import BaseView from './BaseView.vue'
 import PresenterView from './PresenterView.vue'
+import upvoteVue from '@/views/tool/components/upvote.vue' // 点赞-子组件
+import gridPic from '@/components/grid-pic/index.vue' // 推图上屏弹子组件
+
+import emitter from '@/utils/mitt' //mitt 事件总线
 
 const viewMode = ref<'base' | 'presenter'>('base')
-
+const dialogVisible = ref(false)
+const gridPicRef:any= ref(null)
 const changeViewMode = (mode: 'base' | 'presenter') => {
   viewMode.value = mode
 }
 
 const { exitScreening } = useScreening()
+const upvoteRef = ref(null)
+hooksUpvote.init(upvoteRef) // 初始化点赞
 
 // 快捷键退出放映
 const keydownListener = (e: KeyboardEvent) => {
@@ -27,6 +49,23 @@ const keydownListener = (e: KeyboardEvent) => {
   if (key === KEYS.ESC) exitScreening()
 }
 
+const clearchidrenPic= ()=> {
+  dialogVisible.value = false
+}
+
+// 开启推图上屏幕
+emitter.on('opengridPic', async (data:object)=> {
+  if(gridPicRef.value)  gridPicRef.value.clearPic()
+  dialogVisible.value = true
+  await nextTick();
+  gridPicRef.value.addPic(data.arr)
+});
+// 关闭推图
+emitter.on('closegridPic', ()=> {
+  if(!gridPicRef.value) return
+  gridPicRef.value.clearPic()
+  dialogVisible.value = false
+});
 onMounted(() => document.addEventListener('keydown', keydownListener))
 onUnmounted(() => document.removeEventListener('keydown', keydownListener))
 </script>
@@ -38,4 +77,8 @@ onUnmounted(() => document.removeEventListener('keydown', keydownListener))
   width: 100%;
   height: 100%;
 }
+
+ :deep(.gridPicRefdiv .el-dialog__body){
+  height: 100% !important;
+}
 </style>

src/renderer/src/api/ai/index.js

@@ -10,11 +10,10 @@ export const createChart = ({ headers, data }) => {
   })
 }
 // 大模型对话
-export const sendChart = ({ headers, data }) => {
+export const sendChart = (data) => {
   return request({
     url: '/qf/sendTalk',
     method: 'post',
-    headers,
     data,
   })
 }

src/renderer/src/api/aiGeneratedImage/index.js

@@ -2,6 +2,8 @@ import axios from 'axios'
 import request from '@/utils/request'
 import { getToken } from "@/utils/auth";
 
+let rootPath = import.meta.env.VITE_APP_ENV === 'production' ? 'https://ai.ysaix.com:7864' : ''
+
 // 文生图片
 export function convertTextToPicture(data) {
   return axios({
@@ -42,7 +44,7 @@ export function getPicture(data) {
 // 大模型对话生成prompt模板
 export function chattoprompt(dataset_id,prompt) {
   return axios({
-    url: '/api/v1/parse/docs',
+    url: rootPath + '/api/v1/parse/docs',
     method: 'post',
     headers: {
       'Authorization': 'Bearer ragflow-IwMDI1MGU2YTU3NjExZWZiNWEzMDI0Mm',
@@ -68,7 +70,7 @@ export function textSensitiveWord(data) {
   // 图片上传资源库
   export function uploadPicture(data) {
     return axios({
-      url: '/dev-api/smarttalk/file/upload',
+      url: import.meta.env.VITE_APP_BASE_API + '/smarttalk/file/upload',
       method: 'post',
       headers: {
         'Accept': '*/*',

src/renderer/src/api/classTask/index.js

@@ -80,6 +80,15 @@ export function updateClassworkdata(data) {
   })
 }
 
+// 批阅后, 待所有学生都批改完成后自动结束当前作业为[已完成]
+export function updateClassWorkDataAutoFinish(data) {
+  return request({
+    url: '/education/classworkdata/updAutoFinish',
+    method: 'put',
+    data: data
+  })
+}
+
 // 修改classwork
 export function updateClasswork(data) {
   return request({

src/renderer/src/api/file/index.js

@@ -71,3 +71,11 @@ export const addFileToKj = (id) => {
     method: 'get'
   })
 }
+
+export const getModelInfo = (params) => {
+  return request({
+    url: '/education/llmModel/getModelInfo',
+    method: 'post',
+    params
+  })
+}

src/renderer/src/api/teaching/classcourse.js

@@ -95,3 +95,11 @@ export function getCourseTeachingMsg(id) {
   })
 }
 
+export function setPaging(data) {
+  return request({
+    url: '/education/classcourse/record/paging',
+    method: 'post',
+    data
+  })
+}
+

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

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4723712 */
-  src: url('iconfont.woff2?t=1733880548695') format('woff2'),
+  src: url('iconfont.woff2?t=1734337029245') format('woff2'),
-       url('iconfont.woff?t=1733880548695') format('woff'),
+       url('iconfont.woff?t=1734337029245') format('woff'),
-       url('iconfont.ttf?t=1733880548695') format('truetype');
+       url('iconfont.ttf?t=1734337029245') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-yinle:before {
+  content: "\e6c9";
+}
+
 .icon-yuyin:before {
   content: "\e648";
 }

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

@@ -5,6 +5,13 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "11819186",
+      "name": "音乐",
+      "font_class": "yinle",
+      "unicode": "e6c9",
+      "unicode_decimal": 59081
+    },
     {
       "icon_id": "6338162",
       "name": "语音生成",

src/renderer/src/components/ai-kolors/index.vue

@@ -482,10 +482,7 @@ export default {
 
     //保存图片到素材库
     async saveImage(resultIndex, index, url, resultItem) {
-      if(this.hasPPt){
+
-        this.$emit('insertImg', url)
-        return
-      }
       this.buttonStates[resultIndex][index].disabled = true;
       this.buttonStates[resultIndex][index].text = "正在保存...";
       const numberIndex = url.indexOf('filename=');
@@ -495,6 +492,7 @@ export default {
       try {
         const blob = await this.getImageBlob(`https://ai.ysaix.com:7853/view?filename=${finalPath}&type=temp`);
           
+
         const hash = CryptoJS.MD5(blob).toString();
 
         const formData = new FormData();
@@ -502,7 +500,10 @@ export default {
         let file = new File([blob], `${resultItem}.png`, {
           type: 'image/png'
         })
-
+        if(this.hasPPt){
+          this.$emit('insertImg', file)
+          return
+        }
         // 添加参数
         formData.append('md5', hash);
         formData.append('file', file);

src/renderer/src/components/choose-textbook/experimentBook.vue

@@ -0,0 +1,333 @@
+<template>
+    <div class="book-wrap">
+      <el-scrollbar height="100%">
+        <div class="book-name flex" @click="dialogVisible = true">
+          <span>{{ curBook.data.itemtitle }}</span>
+          <i class="iconfont icon-xiangyou"></i>
+        </div>
+        <div class="book-list" v-loading="treeLoading">
+          <el-tree :data="treeData" accordion :props="defaultProps" node-key="id"
+            :default-expanded-keys="defaultExpandedKeys" :current-node-key="curNode.data.id" highlight-current
+            @node-click="handleNodeClick">
+            <template #default="{ node }">
+              <span :title="node.label" class="tree-label">{{ node.label }}</span>
+            </template>
+          </el-tree>
+        </div>
+      </el-scrollbar>
+    </div>
+    <!--弹窗 选择教材-->
+    <el-dialog v-model="dialogVisible" append-to-body :show-close="false" width="550"
+      style="border-radius: 10px; padding: 10px 15px;">
+      <template #header>
+        <div class="choose-book-header flex">
+          <span>切换教材</span>
+          <i class="iconfont icon-guanbi" @click="dialogVisible = false"></i>
+        </div>
+      </template>
+  
+      <div class="textbook-container">
+        <el-scrollbar height="450px">
+          <div class="textbook-item flex" v-for="item in subjectList" :class="curBook.data.id == item.id ? 'active-item' : ''"
+            :key="item.id" @click="changeBook(item)">
+            <img v-if="item.avartar" :src="item.avartar.indexOf('http') === 0 ? item.avartar : BaseUrl + item.avartar" class="textbook-img" alt="">
+            <div v-else class="textbook-img">
+              <i class="iconfont icon-jiaocaixuanze" style="font-size: 40px;"></i>
+            </div>
+            <span class="book-name">{{ item.itemtitle }}</span>
+          </div>
+        </el-scrollbar>
+      </div>
+    </el-dialog>
+</template>
+  
+  <script setup>
+  import { onMounted, ref, nextTick, toRaw, reactive } from 'vue';
+  import { cloneDeep } from 'lodash'
+  import { listEvaluation } from '@/api/subject'
+  import { sessionStore } from '@/utils/store'
+  
+  const BaseUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
+  // 定义要发送的emit事件
+  const emit = defineEmits(['nodeClick', 'changeBook'])
+  // 章节List
+  const unitList = ref([])
+  const subjectList = ref([])
+  const dialogVisible = ref(false)
+  // 当前教材下面单元内容数据
+  const treeData = ref([])
+  const defaultProps = {
+    children: 'children',
+    label: 'itemtitle',
+    class: 'textbook-tree'
+  }
+  //查当前学科
+  const subjectParams = reactive(
+    {
+    edusubject: '科学',
+    edustage:'小学',
+    itemkey: 'version',
+    orderby: 'orderidx asc',
+    pageSize: 10000
+    }
+  )
+  // 查所有的学科
+  const unitParams = reactive({
+    edusubject:'科学',
+    edustage:'小学',
+    itemgroup: 'textbook',
+    orderby: 'orderidx asc',
+    pageSize: 10000
+    })
+  // 当前选中的教材
+  const curBook = reactive({
+    data: {}
+  })
+  // 当前节点
+  const curNode = reactive({
+    data:{}
+  })
+  const treeLoading = ref(false)
+  // 默认展开的节点
+  const defaultExpandedKeys = ref([])
+  
+  //选择教材
+  const changeBook = (data) => {
+    curBook.data = data
+    treeData.value = getTreeData(data.id)
+    //切换教材后默认展开第一个并选中
+    nextTick(() =>{
+      defaultExpandedKeys.value = [treeData.value[0].id]
+      curNode.data = getLastLevelData(treeData.value)[0]
+      handleNodeClick(curNode.data)
+    })
+    // 延迟关闭 视觉上选中
+    setTimeout(() => {
+      dialogVisible.value = false
+    }, 100);
+  }
+  
+  const getLastLevelData = (tree) => {
+    let lastLevelData = [];
+    // 递归函数遍历树形结构
+    function traverseTree(nodes) {
+      nodes.forEach((node) => {
+        // 如果当前节点有子节点，继续遍历
+        if (node.children && node.children.length > 0) {
+          traverseTree(node.children);
+        } else {
+          // 如果没有子节点，说明是最后一层的节点
+          lastLevelData.push(node);
+        }
+      });
+    }
+  
+    // 调用递归函数开始遍历
+    traverseTree(tree);
+  
+    // 返回最后一层的数据
+    return lastLevelData;
+  }
+  // 根据id 拿到父节点数据
+  const findParentByChildId = (treeData, targetNodeId) => {
+    // 递归查找函数
+    // 遍历树中的每个节点
+    for (let node of treeData) {
+      // 检查当前节点的子节点是否包含目标子节点 ID
+      if (node.children && node.children.some(child => child.id === targetNodeId)) {
+        // 如果当前节点的某个子节点的 ID 匹配目标子节点 ID，则当前节点即为父节点
+        return node;
+      }
+      // 如果当前节点没有匹配的子节点，则递归检查当前节点的子节点
+      if (node.children) {
+        let parentNode = findParentByChildId(node.children, targetNodeId);
+        if (parentNode) {
+          return parentNode;
+        }
+      }
+    }
+    // 如果未找到匹配的父节点，则返回 null 或者适当的默认值
+    return null;
+  }
+  
+  
+  const handleNodeClick = (data) => {
+    /**
+     * data : 当前节点数据
+     */
+    let nodeData = cloneDeep(toRaw(data));
+   
+    //增加一个label 之前取的label
+    nodeData.label = nodeData.itemtitle
+    // 父级节点 如果当前是一级节点 父级则为null
+    let parent = {
+      id: nodeData.parentid,
+      label: nodeData.parenttitle,
+      itemtitle: nodeData.parenttitle
+    } 
+    const parentNode = nodeData.parentid ?  parent : null
+    nodeData.parentNode = parentNode
+    let curData = {
+      textBook: {
+        curBookId: curBook.data.id,
+        curBookName: curBook.data.itemtitle,
+        curBookImg: BaseUrl + curBook.data.avartar,
+        curBookPath: curBook.data.fileurl
+      },
+      node: nodeData
+    }
+    // 本地存储:electron-store
+    emit('nodeClick', curData)
+  }
+  // 单元章节数据转为“树”结构
+  const getTreeData = (bookId) =>{
+    // 根据当前教材的id 查找出对应的章节 
+    let data = unitList.value.filter(item => item.rootid == bookId && item.level == 1)       
+    data.forEach( item => {
+      item.children = unitList.value.filter( item2 => item2.parentid == item.id && item2.level == 2)
+    }) 
+    return data
+  }
+
+
+  onMounted( async () => {
+    treeLoading.value = true
+    try{
+        //获取学科列表
+      const { rows } = await listEvaluation(subjectParams)
+        // 获取所有的教材
+      subjectList.value = rows
+      
+      const res = await listEvaluation(unitParams)
+      unitList.value = [...res.rows]
+      // 当前教材
+        curBook.data = rows[0]
+  
+      // 章节"树"rows
+      treeData.value = getTreeData(rows[0].id)
+      
+      nextTick(() =>{
+        // 默认展开 选中
+        defaultExpandedKeys.value = [treeData.value[0].id]
+        curNode.data = getLastLevelData(treeData.value)[0]
+        handleNodeClick(curNode.data)
+      })
+    
+    } finally{
+      treeLoading.value = false
+    }
+  
+  })
+  
+  </script>
+  
+  <style lang="scss" scoped>
+  .book-wrap {
+    width: 300px;
+    height: 100%;
+    background: #ffffff;
+    border-radius: 10px;
+    box-shadow: 0px 0px 20px 0px rgba(99, 99, 99, 0.06);
+    display: flex;
+    flex-direction: column;
+    position: relative;
+  
+    .book-name {
+      background-color: #ffffff;
+      position: absolute;
+      left: 0;
+      top: 0;
+      width: 100%;
+      height: 45px;
+      padding: 0 15px;
+      z-index: 1;
+      justify-content: space-between;
+      align-items: center;
+      color: #3b3b3b;
+      cursor: pointer;
+      border-bottom: solid #f4f5f7 1px;
+      font-size: 15px;
+      font-weight: 600;
+      border-radius: 10px 10px 0 0;
+    }
+  
+    .book-list {
+      padding: 45px 10px 0 10px;
+      flex: 1;
+    }
+  }
+  
+  :deep(.choose-dialog) {
+    border-radius: 10px;
+  }
+  
+  .choose-book-header {
+    justify-content: space-between;
+    font-size: 15px;
+    font-weight: bold;
+  
+    .icon-guanbi {
+      font-size: 20px;
+      cursor: pointer;
+    }
+  }
+  
+  .textbook-container {
+    .textbook-item {
+      padding: 10px 20px;
+      align-items: center;
+      border-radius: 5px;
+      cursor: pointer;
+  
+      .book-name {
+        margin-left: 20px;
+        color: #3b3b3b;
+        font-size: 13px;
+      }
+  
+      &:hover {
+        background: #f4f7f9;
+      }
+    }
+  
+    .active-item {
+      background-color: #f4f7f9;
+  
+      .book-name {
+        color: #368fff;
+        font-weight: bold
+      }
+    }
+  
+    .textbook-img {
+      width: 55px;
+      height: 70px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+  }
+  
+  :deep(.el-tree-node) {
+    .el-tree-node__content {
+      height: 40px;
+      border-radius: 10px;
+  
+      &:hover {
+        background-color: #eaf3ff;
+      }
+    }
+  }
+  
+  .tree-label {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  
+  :deep(.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content) {
+    background-color: #eaf3ff !important;
+    color: #409EFF
+  }
+  </style>
+  

src/renderer/src/components/choose-textbook/index.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="book-wrap">
     <el-scrollbar height="100%">
-      <div class="book-name flex" @click="dialogVisible = true">
+      <div class="book-name flex" v-if="isStadium() === true"> {{userStore.user.deptName}}</div>
+      <div v-else class="book-name flex" @click="dialogVisible = true">
         <span>{{ curBook.data.itemtitle }}</span>
         <i class="iconfont icon-xiangyou"></i>
       </div>
@@ -46,8 +47,14 @@ import { onMounted, ref, nextTick, toRaw, reactive } from 'vue';
 import { cloneDeep } from 'lodash'
 import { sessionStore } from '@/utils/store'
 import { useGetSubject } from '@/hooks/useGetSubject'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 
 const BaseUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
+const isStadium = () => {
+  let roles = userStore.user.roles
+  return  roles.some(item => item.roleKey === 'stadium')
+}
 // 定义要发送的emit事件
 const emit = defineEmits(['nodeClick', 'changeBook'])
 let useSubject = null
@@ -181,7 +188,11 @@ onMounted( async () => {
       curBook.data = sessionStore.get('subject.curBook')
     }
     else{
+      if (subjectList.value) {
         curBook.data = subjectList.value[0]
+      }else {
+        curBook.data = {}
+      }
     }
 
     // 章节"树"

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

@@ -41,6 +41,7 @@ const getFileTypeIcon = () => {
     airobot: 'icon-jiqirenfushi', // 数字人生成
     aiimg: 'icon-xiangmuicon_maobishufa', // 文生图片
     aidraw: 'icon-meishu-F', // 文生连环画
+    aiyinyue: 'icon-yinle' //文生音乐
   }
   if (iconObj[name]) {
     return '#' + iconObj[name]

src/renderer/src/components/grid-pic/index.vue

@@ -0,0 +1,269 @@
+<!--
+依赖： vuedraggable、v-viewer
+属性:    showToolbar   //是否显示工具栏  默认：false
+            工具栏   添加图片：默认6个测试图片，不输入框添加则添加默认，输入图片链接，展示图片链接的图片
+                    清空图片：清空图片
+事件:    clear       清空时触发
+        outIndex    超出九个图片时触发
+方法：   addPic    //添加图片
+          参数：  src  图片链接
+        clearPic  //清空图片
+          参数：  无
+使用方法： 加载组件后，通过ref调用addPic方法添加图片即可
+-->
+<template>
+  <div style="position: relative;height: 100%;width: 100%;">
+    <draggable handle=".header-btn" :draggable="false" item-key="backgroundColor" v-model="gridPicList" class="grid-pic-wrap" :style="getGrid">
+      <template #item="{ element, index }">
+        <div class="grid-pic-item" :key="element.backgroundColor" :style="getWH(element,index)">
+          <div class="delete-btn" @click="()=>{gridPicList.splice(index,1);if(!gridPicList.length) emits('clear')} ">X</div>
+          <div class="header-btn"></div> 
+          <ViewerItem :gridPicList="gridPicList" :index="index" :images="element"></ViewerItem>
+        </div>
+      </template>
+    </draggable>
+    <div class="grid-pic-toolbar">
+      <el-input v-if="showToolbar" style="width: 500px" v-model="inputValue" type="text" />
+      <el-button v-if="showToolbar" class="add-btn" @click="pushPic">
+        添加
+      </el-button>
+      <el-button class="add-btn" @click="clearPic">
+        清空
+      </el-button>
+    </div>
+<!--    <el-button style="position:fixed;bottom: 20px;right: 80px;" @click="startPencil">
+      画笔
+    </el-button>-->
+<!--    <div class="modal-mode">
+      <canvas id="canvas_pic_001" style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;"></canvas>
+    </div>-->
+  </div>
+</template>
+
+<script setup>
+  import {ref, computed, onMounted} from 'vue'
+  import Draggable from 'vuedraggable'
+  import ViewerItem from "./viewer-item.vue";
+  // import Fabric from 'fabric';
+  const gridPicList = ref([])
+  const inputValue = ref('')
+  const isShow = ref(false)
+  const emits = defineEmits(['clear','outIndex']);
+
+  const props = defineProps({
+    showToolbar: {
+      type: Boolean,
+      default: false
+    }
+  })
+  // 获取图片样式
+  const getWH = (item,index)=>{
+    return {
+      backgroundColor: item.backgroundColor,
+      'grid-area': 'a' + index
+    }
+  }
+
+  const picList = [
+    'https://prev.ysaix.com:7868/src/assets/images/homecard4.jpg',
+    'https://prev.ysaix.com:7868/src/assets/images/homecard3.jpg',
+    'https://prev.ysaix.com:7868/src/assets/images/homecard2.jpg',
+    'https://prev.ysaix.com:7868/src/assets/images/homecard1.jpg',
+    'https://prev.ysaix.com:7868/profile/avatar/2024/06/26/blob_20240626135106A001.png',
+    'https://prev.ysaix.com:7868/assets/app_download.b3fb227b.png'
+  ]
+  // 获取grid样式
+  const getGrid = computed(() => {
+    switch (gridPicList.value.length) {
+      case 1:
+        return {
+          'grid-template-areas':
+          `"a0"`
+        }
+      case 2:
+        return {
+          'grid-template-areas':
+            `"a0 a1"`
+        }
+      case 3:
+        return {
+          'grid-template-areas':
+            `"a0 a1"
+            "a0 a2"`
+        }
+      case 4:
+        return {
+          'grid-template-areas':
+            `"a0 a2"
+            "a1 a3"`
+        }
+      case 5:
+        return {
+          'grid-template-areas':
+            `"a0 a2 a4"
+            "a1 a3 a4"`
+        }
+      case 6:
+        return {
+          'grid-template-areas':
+            `"a0 a2 a4"
+            "a1 a3 a5"`
+        }
+      case 7:
+        return {
+          'grid-template-areas':
+            `"a0 a2 a4"
+            "a0 a2 a4"
+            "a0 a2 a5"
+            "a1 a3 a5"
+            "a1 a3 a6"
+            "a1 a3 a6"`
+        }
+      case 8:
+        return {
+          'grid-template-areas':
+            `"a0 a3 a6"
+            "a0 a3 a6"
+            "a1 a4 a6"
+            "a1 a4 a7"
+            "a2 a5 a7"
+            "a2 a5 a7"`
+        }
+      case 9:
+        return {
+          'grid-template-areas':
+            `"a0 a3 a6"
+            "a1 a4 a7"
+            "a2 a5 a8"`
+        }
+      default:
+        return {
+          width: '100%',
+          height: '100%'
+        }
+    }
+  })
+
+  const pushPic = () => {
+    let src = inputValue.value||picList[gridPicList.value.length]
+    addPic(src)
+  }
+  // 添加图片
+  const addPic = (data) => {
+    let list = Array.isArray(data)?data:[data]
+    if (gridPicList.value.length + list.length > 9) {
+      console.log("超出九个图片")
+      emits('outIndex')
+      return
+    }
+    let listArr = [];
+    for (let i = 0; i < list.length; i++) {
+      let src = list[i]
+      if (!src) {
+        console.log("图片链接不能为空")
+        return;
+      }
+      listArr.push({
+        src: src,
+        backgroundColor: getRandomColor()
+      })
+    }
+    gridPicList.value.push(...listArr)
+    inputValue.value = ''
+  }
+  // 清空图片
+  const clearPic = () => {
+    gridPicList.value = []
+    emits('clear')
+  }
+  //开始画笔
+  const startPencil = () => {
+    isShow.value = !isShow.value
+  }
+  // 生成随机颜色
+  function getRandomColor() {
+    let r = Math.floor(Math.random() * 256).toString(16);
+    let g = Math.floor(Math.random() * 256).toString(16);
+    let b = Math.floor(Math.random() * 256).toString(16);
+    // 如果生成的十六进制数字只有一位，前面补0
+    r = r.length === 1? '0' + r : r;
+    g = g.length === 1? '0' + g : g;
+    b = b.length === 1? '0' + b : b;
+    return `#${r}${g}${b}`;
+  }
+ /* //初始化画笔
+  const initPend = () => {
+    let canvas = new Fabric.fabric.Canvas('canvas_pic_001',{
+      interactive: false,
+      selection: true,
+      backgroundColor: "rgba(15,15,15,0)"
+    })
+    canvas.defaultCursor = 'default'
+    canvas.setHeight(300)
+    canvas.setWidth(400)
+    canvas.isDrawingMode = true;
+    canvas.freeDrawingBrush = new Fabric.fabric.PencilBrush(canvas)
+    canvas.freeDrawingBrush.width = 1//设置画笔粗细
+    canvas.freeDrawingBrush.color = "red"//设置画笔颜色
+  }*/
+  /*onMounted(() => {
+    initPend()
+  })*/
+  defineExpose({addPic,clearPic})
+</script>
+<style scoped lang="scss">
+.modal-mode{
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  z-index: 1001;
+  background-color: rgba(0, 0, 0, 0.2);
+}
+.grid-pic-wrap{
+  width: 100%;
+  height: 100%;
+  display: grid;
+  position: absolute;
+  overflow: hidden;
+  .grid-pic-item{
+    //animation: fadeIn 0.5s ease-in-out forwards;
+    background-color: #0a84ff;
+    position: relative;
+    .delete-btn{
+      position: absolute;
+      top: 0;
+      right: 10px;
+      z-index: 999;
+      &:hover{
+        color: #fff;
+        cursor: pointer;
+      }
+    }
+    .header-btn{
+      position: absolute;
+      z-index: 998;
+      height: 30px;
+      width: 100%;
+      border-bottom: 1px dotted #ccc;
+    }
+  }
+}
+.grid-pic-toolbar{
+  position: fixed;
+  right: 20px;
+  bottom: 20px;
+  display: flex;
+  .add-btn{
+  }
+}
+@keyframes fadeIn {
+  from {
+    opacity: 0;
+    transform: translateY(20px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+</style>

src/renderer/src/components/grid-pic/viewer-item.vue

@@ -0,0 +1,147 @@
+<template>
+  <div class="viewer-item-wrap" :id="'viewer_id'+index">
+    <Viewer @move="move" @moved="moved" @inited="inited" @zoomed="zoomed" :ref="collectRef('viewerRef'+index)" :options="optins" :images="[images.src]" class="images clearfix">
+      <template #default="scope">
+        <div class="viewer-img-box">
+          <img v-for="src in scope.images" :key="index" :src="src" style="display: none">
+        </div>
+      </template>
+    </Viewer>
+  </div>
+</template>
+<script setup>
+import {ref, watch, nextTick, onMounted} from "vue";
+import { component as Viewer } from 'v-viewer'
+// import Fabric from 'fabric';
+import 'viewerjs/dist/viewer.css'
+const props = defineProps({
+  images: {
+    type: Object,
+    default: () => {}
+  },
+  index: {
+    type: Number,
+    default: 0
+  },
+  gridPicList: {
+    type: Array,
+    default: () => []
+  }
+})
+let $viewer = null;
+const refs = ref([]);
+//初始化时
+const inited = (viewer) => {
+  $viewer = viewer
+}
+//缩放时
+const zoomed = (e) => {
+  // setImgStyle()
+}
+//移动时
+const moved = (e) => {
+  // setImgStyle()
+}
+const move = (e) => {
+}
+const appendCanvasToShow = () => {
+  initImgStyle()
+}
+
+const setImgStyle = () => {
+  let item = window.document.getElementById('viewer_id'+props.index)
+  let canvas = item.querySelectorAll('.viewer-canvas')[0]
+  let img = canvas.querySelectorAll('img')[0]
+  let imgStyle = img.getAttribute('style')
+  imgStyle = imgStyle.replace('relative', 'absolute') + 'z-index: 1002';
+  img.style = imgStyle;
+  let canvasNew = canvas.querySelectorAll('canvas')[0]
+  canvasNew.style = imgStyle;
+}
+
+const initImgStyle = () => {
+  let item = window.document.getElementById('viewer_id'+props.index)
+  let canvas = item.querySelectorAll('.viewer-canvas')[0]
+  let img = canvas.querySelectorAll('img')[0];
+  let imgStyle = img.getAttribute('style')
+  imgStyle = imgStyle.replace('relative', 'absolute') + 'z-index: 1002';
+  img.style = imgStyle;
+  const canvasNew = document.createElement('canvas');
+  canvasNew.style = imgStyle;
+  canvasNew.id = 'canvas_pic_'+props.index
+  canvas.appendChild(canvasNew);
+
+  initPend()
+}
+
+const collectRef = (key) => {
+  return (el) => {
+    refs.value[key] = el;
+  };
+};
+//viewer配置
+const optins = ref({
+  "inline": true,
+  "button": false,
+  "navbar": false,
+  "title": false,
+  "toolbar": false,
+  "tooltip": true,
+  "zoomable": true,
+  "rotatable": true,
+  "movable": true,
+  "scalable": true,
+  "transition": true,
+  "fullscreen": true,
+  "keyboard": true
+})
+const initViewers = () => {
+  refs.value['viewerRef'+props.index]?.rebuildViewer()
+  /*setTimeout(()=>{
+    initImgStyle()
+  },300)*/
+}
+//初始化画笔
+const initPend = () => {
+  let canvas = new Fabric.fabric.Canvas('canvas_pic_'+props.index,{
+    interactive: false,
+    selection: true,
+    backgroundColor: "rgba(15,15,15,0)"
+  })
+  canvas.defaultCursor = 'default'
+  canvas.setHeight(300)
+  canvas.setWidth(400)
+  canvas.isDrawingMode = true;
+  canvas.freeDrawingBrush = new Fabric.fabric.PencilBrush(canvas)
+  canvas.freeDrawingBrush.width = 1//设置画笔粗细
+  canvas.freeDrawingBrush.color = "red"//设置画笔颜色
+}
+
+watch(props.gridPicList, (newValue, oldValue) => {
+  nextTick(()=>{
+    initViewers()
+  })
+});
+
+/*
+watch(props.images, (newValue, oldValue) => {
+    // optins.value.movable = newValue.dragable
+  initPend()
+});
+*/
+
+/*onMounted(()=>{
+  setTimeout(()=>{
+    appendCanvasToShow()
+  }, 300)
+})*/
+</script>
+<style scoped lang="scss">
+.viewer-item-wrap{
+  width: 100%;
+  height: 100%;
+  :deep(.viewer-canvas img) {
+    display: block !important;
+  }
+}
+</style>

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

@@ -204,7 +204,11 @@ onMounted(async () => {
     curBook.data = sessionStore.get('subject.curBook')
   }
   else{
+    if (subjectList.value) {
       curBook.data = subjectList.value[0]
+    }else {
+      curBook.data = {}
+    }
   }
 
   // 章节"树"

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

@@ -30,7 +30,7 @@
         </div>
       </el-scrollbar>
       <div class="file-list">
-        <el-dropdown @command="changeFile">
+        <el-dropdown @command="changeFile" v-if="type == 3">
         <span class="el-dropdown-link">
           {{ curFile.fileName }}
           <i class="iconfont icon-xiangxia"></i>
@@ -54,11 +54,12 @@
 </template>
 
 <script setup>
-import { ref, reactive, onMounted, onUnmounted, watch } from 'vue'
+import { ref, reactive, onMounted, onUnmounted } from 'vue'
 import { completion, docList } from '@/api/mode/index'
 import { sessionStore } from '@/utils/store'
 import { dataSetJson } from '@/utils/comm.js'
 import useUserStore from '@/store/modules/user'
+import { sendChart } from '@/api/ai/index'
 import emitter from '@/utils/mitt';
 
 const userInfo = useUserStore().user
@@ -71,12 +72,20 @@ const props = defineProps({
   item: {
     type: Object,
     default: () => {
-      return { name: '11' }
+      return { name: '' }
     }
   },
   type: {
     type: Number,
     default: 1
+  },
+  curMode:{
+    type: Number,
+    default: 1
+  },
+  conversation_id: {
+    type: [Number, String],
+    default: ''
   }
 })
 
@@ -100,7 +109,8 @@ const curNode = reactive({})
 const params = reactive(
   {
     prompt: '',
-    dataset_id: ''
+    dataset_id: '',
+    template: ''
   }
 )
 
@@ -108,7 +118,24 @@ const params = reactive(
 const getCompletion = async (val) => {
   try {
     params.prompt = `按照${val}的要求，针对${curNode.edustage}${curNode.edusubject}${modeType.value} 对${curNode.itemtitle}进行教学分析`
-    const { data } = await completion(params)
+    params.template = props.item.prompt
+
+    let data = null;
+    // 教学大模型
+    if(props.curMode == 1){
+      const res = await sendChart({
+        content: params.prompt,
+        conversationId: props.conversation_id,
+        stream: false
+      })
+      data = res.data
+    }
+    else{
+      // 知识库模型
+      const res = await completion(params)
+      data = res.data
+    }
+
     let answer = data.answer
     msgList.value.push({
       type: 'robot',
@@ -125,19 +152,6 @@ const saveAdjust = (item) =>{
   emitter.emit('onSaveAdjust', item.msg)
 }
 
-const modeType = ref('课标')
-watch(() => props.type, (newVal) => {
-  if (newVal == 1){
-    modeType.value = '课标'
-  }
-  if (newVal == 2){
-    modeType.value = '教材'
-  }
-  if (newVal == 2){
-    modeType.value = '考试'
-  }
-
-}, { immediate: false })
 
 const curFile = reactive({})
 const dataset_id = ref('')
@@ -160,11 +174,12 @@ const changeFile = (val) =>{
   params.document_ids = val.docId
 }
 
-
+const modeType = ref('')
 onMounted(() => {
   let data = sessionStore.get('subject.curNode')
-
   Object.assign(curNode, data);
+
+  modeType.value = props.type == 1 ? '课标' : props.type == 2 ? '教材' : '考试'
   let jsonKey = `${modeType.value}-${data.edustage}-${data.edusubject}`
   params.dataset_id = dataSetJson[jsonKey]
   if(props.type == 3){

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

@@ -40,7 +40,7 @@ const props = defineProps({
     type: Number,
     default: 1
   },
-  item: { // 子模板
+  item: { // 当前操作的模板
     type: Object,
     default: () => {
       return { ex3: '' }
@@ -73,23 +73,25 @@ const loading = ref(false)
 const saveAdd = async () => {
   loading.value = true
   if (props.item.ex3 == '1') {
-
+    let id; // id 为主模板id
     if (props.item.isAdd) {
+      id = props.item.id
+    }
+    else{
+      // 编辑状态下 item 为子模板 主模板则是item.parentId
+      id = props.item.parentId
+    }
     try {
       // 系统预设模板 copy一份
-        const { msg } = await addKeyWords({ name: form.name, id: props.item.id })
+      const { msg } = await addKeyWords({ name: form.name, id })
       emitter.emit('onGetMain')
       ElMessage.success(msg)
       mode.value = false
     } finally {
       loading.value = false
     }
-    }
-    else{
-      onAddChildTemp(props.item.parentId)
-    }
-  } else {
   
+  } else {
     if (props.item.isAdd) {
       onAddChildTemp(props.item.id)
     }

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

@@ -16,12 +16,12 @@
 </template>
 
 <script setup>
-import { ref, onMounted, nextTick } from 'vue'
+import { ref, onMounted, nextTick, reactive } from 'vue'
 import { sessionStore } from '@/utils/store'
 import PDF from '@/components/PdfJs/index.vue'
 import LeftDialog from './left-dialog.vue'
 
-const props = defineProps(['curNode', 'type'])
+const props = defineProps(['type'])
 
 const showDialog = ref(false)
 const onClick = () => {
@@ -31,8 +31,13 @@ const onClick = () => {
 
 // 加载PDF
 const pdfUrl = ref('')
+const curNode = reactive({})
 onMounted(async () => {
   await nextTick()
+  // 当前节点
+  let nodeData = sessionStore.get('subject.curNode')
+  Object.assign(curNode, nodeData);
+
   let data = sessionStore.get('subject.curBook')
   let fileurl = data.fileurl
   if(props.type == 1){

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

@@ -14,7 +14,10 @@
           </el-dropdown-menu>
         </template>
       </el-dropdown>
-      <div>
+      <div class="flex">
+        <el-select v-model="curMode" placeholder="Select" class="mr-4 w-30">
+          <el-option v-for="item in modeOptions" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
         <el-button type="danger" link :disabled="!(templateList.length)" @click="removeItem(curTemplate, false)">
           删除
         </el-button>
@@ -52,7 +55,8 @@
               <i class="iconfont icon-ai"></i>
             </div>
             <div class="item-answer">
-              <TypingEffect v-if="isStarted[index]" :text="item.answer" :delay="10" :aiShow="item.aiShow" @complete="handleCompleteText($event,index)" @updateScroll="scrollToBottom($event,index)" />
+              <TypingEffect v-if="isStarted[index]" :text="item.answer" :delay="10" :aiShow="item.aiShow"
+                @complete="handleCompleteText($event, index)" @updateScroll="scrollToBottom($event, index)" />
             </div>
           </div>
           <div class="ai-btn" v-if="item.answer">
@@ -77,24 +81,40 @@
   <!--编辑结果-->
   <EditDialog v-model="isEdit" :item="editItem" />
   <!--AI 对话调整-->
-  <AdjustDialog v-model="isAdjust" :type="type" :item="editItem" />
+  <AdjustDialog v-model="isAdjust" :type="type" :item="editItem" :curMode="curMode" :conversation_id="conversation_id"/>
   <!--添加、编辑提示词-->
-  <keywordDialog v-model="isWordDialog" :item="editItem" />
+  <keywordDialog v-model="isWordDialog" :item="editItem" :modeType="type" />
 </template>
 
 <script setup>
-import { ref, reactive, onMounted, watch, onUnmounted, nextTick } from 'vue'
+import { ref, reactive, onMounted, onUnmounted, nextTick } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { tempSave, completion, modelList, removeChildTemp, tempResult, editTempResult } from '@/api/mode/index'
+import { createChart, sendChart } from '@/api/ai/index'
 import { sessionStore } from '@/utils/store'
 import keywordDialog from './keyword-dialog.vue';
 import AdjustDialog from './adjust-dialog.vue'
 import EditDialog from './edit-dialog.vue'
 import TypingEffect from '@/components/typing-effect/index.vue'
+import useUserStore from '@/store/modules/user'
 import emitter from '@/utils/mitt';
 import { dataSetJson } from '@/utils/comm.js'
+import { cloneDeep } from 'lodash'
 
-const props = defineProps(['curNode', 'type'])
+const props = defineProps(['type'])
+const { user } = useUserStore()
+
+const curMode = ref(2)
+const modeOptions = ref([
+  {
+    label: '教学大模型',
+    value: 1
+  },
+  {
+    label: '知识库模型',
+    value: 2
+  }
+])
 
 /*****************提示词相关****************/
 
@@ -137,7 +157,7 @@ const curTemplate = reactive({ name: '', id: '' })
 const templateList = ref([])
 const childTempList = ref([])
 const getTemplateList = () => {
-  modelList({ model: props.type, type: 1, pageNum: 1, pageSize: 10000, ex1: curNode.edustage, ex2: curNode.edusubject  }).then(res => {
+  modelList({ createUser: user.userId, model: props.type, type: 1, pageNum: 1, pageSize: 10000, ex1: curNode.edustage, ex2: curNode.edusubject }).then(res => {
     templateList.value = res.rows
     if (res.rows.length > 0) {
       Object.assign(curTemplate, res.rows[0]);
@@ -161,7 +181,7 @@ const isStarted = ref([]);
 const listRef = ref()
 // 查询模板结果
 const getTempResult = () => {
-  tempResult({ mainModelId: curTemplate.id, pageNum: 1, pageSize: 10000 }).then(res => {
+  tempResult({ mainModelId: curTemplate.id, pageNum: 1, pageSize: 10000, ex1: curNode.id }).then(res => {
     let rows = res.rows
     childTempList.value.forEach(item => {
       rows.forEach(el => {
@@ -250,7 +270,6 @@ const removeItem = async (item, isChild) => {
   }
 }
 
-
 // Ai对话调整
 const curIndex = ref(-1)
 const isAdjust = ref(false)
@@ -268,21 +287,6 @@ const onEdit = (index, item) => {
   isEdit.value = true
 }
 
-
-const modeType = ref('课标')
-watch(() => props.type, (newVal) => {
-  if (newVal == 1) {
-    modeType.value = '课标'
-  }
-  if (newVal == 2) {
-    modeType.value = '教材'
-  }
-  if (newVal == 3) {
-    modeType.value = '考试'
-  }
-
-}, { immediate: false })
-
 // 重新研读
 const params = reactive(
   {
@@ -290,6 +294,7 @@ const params = reactive(
     dataset_id: ''
   }
 )
+const prompt = ref('')
 
 // 重新研读
 const isAgain = ref(false)
@@ -309,8 +314,28 @@ const againResult = async (index, item) => {
     await nextTick()
     childTempList.value[index].loading = true
     item.aiShow = true
-    params.prompt = `按照${item.name}的要求，针对${curNode.edustage}${curNode.edusubject}${modeType.value} 对${curNode.itemtitle}进行教学分析`
+
-    const { data } = await completion(params)
+    let str = cloneDeep(prompt.value)
+    str = str.replace('{模板标题}',item.name)
+    str = str.replace('{模板内容}',item.prompt)
+    params.prompt = str
+    params.template = item.prompt
+
+    let data = null;
+    // 教学大模型
+    if (curMode.value == 1) {
+      const res = await sendChart({
+        content: params.prompt,
+        conversationId: conversation_id.value,
+        stream: false
+      })
+      data = res.data
+    } else {
+      // 知识库模型
+      const res = await completion(params)
+      data = res.data
+    }
+
     childTempList.value[index].answer = getResult(data.answer);
     isStarted.value[index] = true
 
@@ -318,6 +343,7 @@ const againResult = async (index, item) => {
     childTempList.value[index].loading = false
   }
 }
+
 // 一键研读
 const getCompletion = async () => {
   isStarted.value = new Array(childTempList.length).fill(false)
@@ -333,8 +359,27 @@ const getCompletion = async () => {
     try {
       item.loading = true
       item.aiShow = true
-      params.prompt = `按照${item.name}的要求，针对${curNode.edustage}${curNode.edusubject}${modeType.value} 对${curNode.itemtitle}进行教学分析`
+      let str = cloneDeep(prompt.value)
-      const { data } = await completion(params)
+      str = str.replace('{模板标题}',item.name)
+      str = str.replace('{模板内容}',item.prompt)
+      params.prompt = str
+      params.template = item.prompt
+      // 教学大模型
+      let data = null
+      if (curMode.value == 1) {
+        const res = await sendChart({
+          content: params.prompt,
+          conversationId: conversation_id.value,
+          stream: false
+        })
+        data = res.data
+      }
+      // 知识库模型
+      else {
+        const res = await completion(params)
+        data = res.data
+      }
+
       item.answer = getResult(data.answer)
       onSaveTemp(item)
     } finally {
@@ -370,16 +415,20 @@ const onEditSave = async (item) => {
 }
 
 // 保存模板
-const onSaveTemp = (item) => {
+const onSaveTemp = async (item) => {
   if (item.answer == '') return
 
   const data = {
     mainModelId: curTemplate.id,
     modelId: item.id,
     examDocld: '',
-    content: item.answer
+    content: item.answer,
+    ex1: curNode.id
+  }
+  const res = await tempSave(data)
+  if(!item.resultId){
+    item.resultId = res.data
   }
-  tempSave(data).then(res => { })
 }
 
 // 去掉字符串中的 ### **
@@ -398,13 +447,49 @@ emitter.on('onGetMain', () => {
 })
 
 
+// 创建对话
+const conversation_id = ref('')
+const getChartId = () => {
+  createChart({ app_id: '712ff0df-ed6b-470f-bf87-8cfbaf757be5' }).then(res => {
+    localStorage.setItem("conversation_id", res.data.conversation_id);
+    conversation_id.value = res.data.conversation_id;
+  })
+}
+
+// 查询prompt 替换
+const getPrompt = async () => {
+  const { rows } = await modelList({ model: 5 })
+  let str = rows.find(item => item.name.indexOf(modeType.value) != -1).prompt
+  str = str.replace('{学段}', curNode.edustage)
+  str = str.replace('{学科}', curNode.edusubject)
+  let bookV = curNode.roottitle.split('-')[1] + '版本'
+  str = str.replace('{教材版本}', bookV)
+  str = str.replace('{课程名称}', `《${curNode.itemtitle}》`)
+  if(modeType.value == '课标'){
+    str = str.replace('{课标名称}', `${curNode.edustage}${curNode.edusubject}课标`)
+  }
+  prompt.value = str
+}
+
 const curNode = reactive({})
+const modeType = ref('')
 onMounted(() => {
   let data = sessionStore.get('subject.curNode')
   Object.assign(curNode, data);
+  modeType.value = props.type == 1 ? '课标' : props.type == 2 ? '教材' : '考试'
+
   getTemplateList()
   let jsonKey = `${modeType.value}-${data.edustage}-${data.edusubject}`
   params.dataset_id = dataSetJson[jsonKey]
+  // 获取百度千帆会话ID
+  conversation_id.value = localStorage.getItem('conversation_id')
+  if (!conversation_id.value) {
+    getChartId();
+  }
+
+  // 获取prompt
+  getPrompt()
+
 })
 
 // 解绑

src/renderer/src/components/template-study/index.vue

@@ -2,18 +2,16 @@
   <div class="page-template flex">
     <el-row>
       <el-col :span="12">
-        <Left :curNode="curNode" :type="type" />
+        <Left :type="type" />
       </el-col>
       <el-col :span="12">
-        <Right :curNode="curNode" :type="type" />
+        <Right :type="type" />
       </el-col>
     </el-row>
   </div>
 </template>
 
 <script setup>
-import { reactive, onMounted } from 'vue'
-import { sessionStore } from '@/utils/store'
 import Left from './container/left.vue'
 import Right from './container/right.vue'
 
@@ -23,13 +21,6 @@ const props = defineProps({
     default: 1
   },
 })
-
-const curNode = reactive({})
-onMounted(() =>{
-  let data = sessionStore.get('subject.curNode')
-  Object.assign(curNode, data);
-})
-
 </script>
 
 <style lang="scss" scoped>

src/renderer/src/components/whiteboard/whiteboard.vue

@@ -15,7 +15,7 @@
           </el-tooltip>
         </div>
         <div class="blockBox">
-          <el-button @click="currentType = 'selection'"><el-image src="../../../src/assets/images/mouse-pointer.png"
+          <el-button @click="currentType = 'selection'"><el-image :src="pointerImg"
               style="width: 14px; height: 14px; color: silver" /></el-button>
         </div>
         <template v-if="type == 'design'">
@@ -145,7 +145,7 @@
           <!-- 边框粗细 -->
           <div class="blockBox">
             <el-dropdown @command="updateStyle('lineWidth', $event)" placement="top">
-              <el-button><el-image src="../../../src/assets/images/borderwidth.png"
+              <el-button><el-image :src="borderImg"
                   style="width: 14px; height: 14px"></el-image></el-button>
               <template #dropdown>
                 <el-dropdown-menu>
@@ -303,6 +303,9 @@ import {
 import Contextmenu from './components/Contextmenu.vue'
 import { fontFamilyList, fontSizeList } from './constants'
 
+const borderImg = new URL('../../../src/assets/images/borderwidth.png', import.meta.url).href
+const pointerImg = new URL('../../../src/assets/images/mouse-pointer.png', import.meta.url).href
+
 const props = defineProps({
   modelValue: {
     type: Boolean,
@@ -504,6 +507,11 @@ const backToCenter = () => {
   app.scrollToCenter()
 }
 
+const cancelActiveElement = () =>{
+  app.cancelActiveElement()
+}
+
+
 // 显示全部
 const showFit = () => {
   let elementList = app.elements.elementList
@@ -697,8 +705,6 @@ const getCanvasBlob = async () =>{
   })
 }
 
-
-
 watch(() => props.data, (newVal) => {
   if (newVal) {
     setCanvasData(newVal)
@@ -788,7 +794,8 @@ defineExpose({
   getCanvasJson,
   getCanvasBase64,
   setCanvasData,
-  getCanvasBlob
+  getCanvasBlob,
+  cancelActiveElement
 })
 </script>
 

src/renderer/src/components/window-tools/index.vue

@@ -38,6 +38,7 @@ const closeWindow = () => {
   ElMessageBox.confirm('确认退出系统吗?', '提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
+    customClass: 'login-close-tool',
     type: 'warning'
   }).then(() => {
     userStore.logOut().then(() => {
@@ -54,7 +55,11 @@ onMounted(() =>{
 })
 
 </script>
-
+<style>
+.login-close-tool {
+  -webkit-app-region: no-drag;
+}
+</style>
 <style lang="scss" scoped>
 .header-tool {
   width: 100%;

src/renderer/src/directive/scroll.js

@@ -0,0 +1,26 @@
+/**
+ * 无限滚动
+ */
+import { nextTick } from 'vue'
+const mountedHook = async (el, binding) => {
+  console.log(el, binding)
+  const value = binding.value
+  if (typeof value !== 'function') return console.error('v-scroll must be a function')
+  await nextTick()
+}
+export default {
+  // Hooks for Vue3
+  mounted(el, binding) {
+    mountedHook(el, binding)
+  },
+  // Hooks for Vue2
+  inserted(el, binding) {
+    mountedHook(el, binding)
+  },
+  
+  update(el, binding){
+  },
+  updated(el, binding){
+    
+  },
+}

src/renderer/src/hooks/useClassTask.js

@@ -32,7 +32,7 @@ export const editListItem = (row, courseObj) => {
       worktype: '', // 设计中的作业类型
       quizlist: [], // 设计中的试题列表
       chooseWorkLists: [],// 设计中的框架梳理list
-      fileHomeworkList: [],// 设计中的常规作业list
+      fileHomeworkList: [],//TODO 暂时共用这个字段(新增了 科学实验)  设计中的常规作业list 
       whiteboardObj: '',// 设计中的课堂展示对象
       question: '', // 设计中的[课堂展示]的问题
     };
@@ -112,6 +112,16 @@ export const editListItem = (row, courseObj) => {
           return resolve(classtaskObj);
         }
       }
+      else if (row.worktype == '科学实验') {
+        if(isJson(row.workcodes)){
+          classtaskObj.fileHomeworkList = JSON.parse(row.workcodes);
+          //
+          // console.log('科学实验', classtaskObj);
+          // 更新默认的科学实验（ 学段 学科 以及实验科目）
+          console.log('科学实验', classtaskObj);
+          return resolve(classtaskObj);
+        }
+      }
     }
   });
 }

src/renderer/src/hooks/useGetHomework.js

@@ -87,13 +87,15 @@ const getHomeWorkList = async () => {
       // } else 
       // 课标研读 目标设定 教材研读 框架梳理 学科定位  TODO 后续接入在添加
       if (res.rows[i].worktype == '课堂展示') {
-        res.rows[i].workclass = 'primary';
+        res.rows[i].workclass = 'success';
       } else if (res.rows[i].worktype == '框架梳理') {
         res.rows[i].workclass = 'warning';
       } else if (res.rows[i].worktype == '常规作业') {
         res.rows[i].workclass = 'info';
       } else if (res.rows[i].worktype == '习题训练') {
         res.rows[i].workclass = 'danger';
+      } else if (res.rows[i].worktype == '科学实验') {
+        res.rows[i].workclass = 'primary';
       } else {
         res.rows[i].workclass = 'primary';
       }

src/renderer/src/hooks/useGetSubject.js

@@ -17,6 +17,17 @@ export const useGetSubject = async () =>{
 
   // 根据学科 + 学段 获取所有单元章节
   const getSubjectUnit = async () =>{
+    if(isStadium(userStore.user)) {
+      //如果是基地人员，直接拿treeData
+      const unitParams = {
+        itemgroup: '基地课程',
+        orderby: 'orderidx asc',
+        entpid: userStore.user.deptId,
+        pageSize: 10000
+      }
+      const { rows } = await listEvaluation(unitParams)
+      unitList.value = rows
+    }else{
       if(sessionStore.get('subject.unitList')){
         unitList.value = sessionStore.get('subject.unitList')
       }
@@ -34,6 +45,11 @@ export const useGetSubject = async () =>{
       }
       await getSubject()
     }
+  }
+  const isStadium = (user) => {
+    let roles = user.roles
+    return  roles.some(item => item.roleKey === 'stadium')
+  }
 
   // 根据学科 + 学段 获取教材
   const getSubject = async () =>{
@@ -68,6 +84,9 @@ export const useGetSubject = async () =>{
 
   // 单元章节数据转为“树”结构
   const getTreeData = (bookId) =>{
+    if (!bookId) {
+      return unitList.value
+    }
     // 根据当前教材的id 查找出对应的章节
     let data = unitList.value.filter(item => item.rootid == bookId && item.level == 1)
     data.forEach( item => {

src/renderer/src/layout/components/Aside.vue

@@ -5,13 +5,13 @@
         <el-popover ref="popoverRef" placement="right" trigger="hover" popper-class="popoverStyle" :tabindex="999" >
           <template #reference>
             <div class="user-info">
-              <el-image class="user-img" :src="dev_api + userStore.user.avatar"  />
+              <el-image class="user-img" :src="userStore.user.avatar ==='/img/avatar-default.jpg' || userStore.user.avatar ==='/images/img-avatar.png' ? defaultUserImg : dev_api + userStore.user.avatar"  />
               <span>{{ userStore.user.nickName }}</span>
             </div>
           </template>
           <div class="head-aside">
             <ul >
-              <li  :class="computedregistertype==1 || computedregistertype==3?'auth-li':'auth-li pointer-events'" @click="onUserTo('/schoolCertification')"  >
+              <li v-if="isStadium() !== true" :class="computedregistertype==1 || computedregistertype==3?'auth-li':'auth-li pointer-events'" @click="onUserTo('/schoolCertification')"  >
                 <i class="iconfont icon-renzheng-" :style="computedregistertype==4?'color:green;':''"></i>
                 <span class="mlr-5"  v-if="computedregistertype!=4">学校认证</span>
                 <span class="mlr-5" v-else>{{ userStore.DeptInfo.register.schoolName }}</span>
@@ -19,8 +19,8 @@
               </li>
               <li v-if="computedregistertype!=4" :class="computedregistertype==1 || computedregistertype==2 ? '':'pointer-events'" @click="onUserTo('/joinSchool')">加入学校</li>
               <li @click="onUserTo('/profile')">个人中心</li>
-              <li @click="onUserTo('/schoolManagement')">学校管理</li>
+              <li v-if="isStadium() !== true" @click="onUserTo('/schoolManagement')">学校管理</li>
-              <li @click="onUserTo('/class')">班级中心</li>
+              <li v-if="isStadium() !== true" @click="onUserTo('/class')">班级中心</li>
               <li @click="logout">退出登录</li>
             </ul>
           </div>
@@ -53,12 +53,13 @@
 </template>
 
 <script setup>
-import { ref, watch , reactive, onMounted,computed} from 'vue'
+import { ref, watch , reactive, onMounted, onBeforeMount, computed} from 'vue'
 import { useRouter } from 'vue-router'
 import { ElMessageBox, ElMessage } from 'element-plus'
 import useUserStore from '@/store/modules/user'
-import { sessionStore } from '@/utils/store'
 import pkc from "../../../../../package.json"
+import defaultUserImg from '@/assets/images/img-avatar.png'
+import { sessionStore } from '@/utils/store'
 
 
 const { ipcRenderer } = window.electron || {}
@@ -74,19 +75,31 @@ const version = ref(pkc.version)
 
 const popoverRef = ref('')
 
-const headerMenus = [
+//是否是基地人员
+const isStadium = () => {
+  let user = userStore.user
+  let roles = user.roles
+  return  roles.some(item => item.roleKey === 'stadium')
+}
+
+const headerMenus = isStadium() ?[{
+    name: '教学实践',
+    id: 6,
+    icon: 'icon-jiaoxueshijian',
+    path: '/prepare'
+  },]:[
   {
     name: '教学大模型',
     id: 1,
     icon: 'icon-shouye',
     path: '/model/index'
   },
-  {
+  // {
-    name: '教学工作台',
+  //   name: '教学工作台',
-    id: 2,
+  //   id: 2,
-    icon: 'icon-gongzuotai',
+  //   icon: 'icon-gongzuotai',
-    path: '/desktop'
+  //   path: '/desktop'
-  },
+  // },
   {
     name: '教学实践',
     id: 4,
@@ -169,9 +182,9 @@ watch(
 
 
 const logout = () => {
-  const hasClass = sessionStore.has('activeClass.id')
+
-  const  hasTool = sessionStore.get('isToolWin')
+  if(!!sessionStore.get('curr.classcourse'))return ElMessage.warning('当前正在上课，请先结束上课')
-  if (hasClass || hasTool) return ElMessage.warning('当前正在上课，请先结束上课')
+
   ElMessageBox.confirm('确认退出系统吗?', '提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',

src/renderer/src/layout/components/Header.vue

@@ -44,7 +44,6 @@ const breadList = ref([])
 watch(
   () => router.currentRoute.value,
   (newValue) => {
-    console.log(newValue)
     const { showBread }  = newValue.meta
     if (showBread) {
       isShowBack.value = true

src/renderer/src/main.js

@@ -16,6 +16,7 @@ import router from './router'
 import log from 'electron-log/renderer' // 渲染进程日志-文件记录
 import customComponent from '@/components/common' // 自定义组件
 import plugins from './plugins' // plugins插件
+import useUserStore from '@/store/modules/user'
 
 if(process.env.NODE_ENV != 'development') { // 非开发环境，将日志打印到日志文件
   Object.assign(console, log.functions) // 渲染进程日志-控制台替换
@@ -23,7 +24,6 @@ if(process.env.NODE_ENV != 'development') { // 非开发环境，将日志打印
 
 const app = createApp(App)
 
-
 //专为菁优网配置的请求转发
 app.config.globalProperties.$requestGetJYW = (url,config)=>{
   config.params = config.params?config.params:{}
@@ -47,3 +47,16 @@ app.use(router)
     .use(Icon)
     .use(Directive)
     .mount('#app')
+
+const isStadium = (user) => {
+  let roles = user.roles
+  return  roles.some(item => item.roleKey === 'stadium')
+}
+
+router.beforeEach((to, from, next) => {
+  if (to.path === '/model/index') {
+    isStadium(useUserStore().user) === true ? next('/prepare') :next()
+  }else {
+    next()
+  }
+})

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

@@ -80,6 +80,8 @@ export class MsgEnum {
     MSG_anmationclick : 'anmationclick',
     /** @desc: 群组创建成功 */
     MSG_classcourseopen : 'classcourseopen',
+    /** @desc: 学生提交作业 */
+    MSG_finishHomework : 'finishHomework',
     /** @desc: 学生的测练结果反馈 */
     MSG_classquizfeedback : 'classquizfeedback',
     /** @desc: 老师端：接收到学生反馈消息-课堂测练中的其他任务 */
@@ -94,6 +96,16 @@ export class MsgEnum {
     MSG_classWorkOfPresentDataUpdate : 'classWorkOfPresentDataUpdate',
     /** @desc: 课堂讲授活动，选择不同的内容 */
     MSG_classlecturePagesrc : 'classlecturePagesrc',
+    /** @desc: 课堂作业|活动 */
+    MSG_homework : 'HOMEWORK',
+    /** @desc: 公屏 - 课堂作业|活动 */
+    MSG_pushSreen_work : 'pushSreen_work',
+    /** @desc: 公屏 - 实验 */
+    MSG_pushSreen_experiment : 'pushSreen_experiment',
+    /** @desc: 点赞 */
+    MSG_dz : 'dz',
+    /** @desc: 疑惑 */
+    MSG_yh : 'yh',
     // === 新定义-消息头 ===
     /** @desc: 课程创建-待开课 */
     MSG_0000: 0x0000,
@@ -138,4 +150,4 @@ export class MsgEnum {
   }
 }
 
-export { MsgEnum as default }
+export default MsgEnum;

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

@@ -28,6 +28,7 @@ export class ChatWs {
         const userStore = useUserStore() // 用户信息
         const wsBase = import.meta.env.VITE_APP_WS_URL; // ws地址
         this.url = `${wsBase||ChatWs.base}/ws/websocket/${userStore.id}`;
+        this.closed = false; // 关闭状态 防止重连失败
         // this.init(url);
       }
       ChatWs.instance = this;
@@ -38,6 +39,7 @@ export class ChatWs {
   // 初始化
   init(url) {
     !!url && (this.url = url);
+    this.closed = false; // 关闭状态 防止重连失败
     this.ws = null;
     const _this = this
     this.heartCheck = {
@@ -64,10 +66,11 @@ export class ChatWs {
         }, this.timeout);
       },
     };
-    this.reconnect();
+    return this.reconnect();
   }
   // 重连
   reconnect() {
+    return new Promise((resolve, reject) => {
       const self = this;
       if (!!this.ws) { // 关闭之前的链接
         this.ws.close()
@@ -77,6 +80,7 @@ export class ChatWs {
       this.ws.onopen = function () {
         console.log("websocket-连接成功")
         self.heartCheck.reset().start();
+        resolve()
       };
       this.ws.onmessage = function (e) {
         // console.log("websocket-收到消息", e)
@@ -97,10 +101,11 @@ export class ChatWs {
         console.log("websocket-连接断开", e)
         self.connectSocket() // 重连
       };
+    })
   }
   connectSocket() {
     this.heartCheck.reset() // 重置心跳
-    if (self.closed) return; // 关闭状态不重连
+    if (this.closed) return this.ws = null; // 关闭状态不重连
     // if(self.errCount <= 0) return; // 超过重连次数
     // self.errCount--; // 重连次数减1
     if (this.errTime) {
@@ -157,6 +162,13 @@ export class ChatWs {
     this.closed = true;
     this.ws.close();
   }
+  // 下课
+  closedCourse(id) {
+    return new Promise((resolve, reject) => {
+      this.sendMsg('closed', '下课', null, 'group', id)
+      resolve()
+    })
+  }
   // 延时 ms 毫秒
   sleep(ms){
     return new Promise(resolve => setTimeout(resolve, ms))

src/renderer/src/router/index.js

@@ -31,6 +31,11 @@ export const constantRoutes = [
     component: () => import('@/AixPPTist/src/App.vue'),
     hidden: true
   },
+  {
+    path: '/gridPic',
+    component: () => import('@/components/grid-pic/index.vue'),
+    hidden: true
+  },
   {
     path: '/model',
     component: Layout,
@@ -83,7 +88,7 @@ export const constantRoutes = [
         path: 'questionUpload',
         component: () => import('@/views/classTask/newClassTaskAssign/questionUpload/index.vue'),
         name: 'questionUpload',
-        meta: { title: '习题上传' }
+        meta: { title: '习题上传', showBread: true  }
       },
       {
         path: 'aiKolors',
@@ -101,7 +106,7 @@ const dynamicRoutes = [
   {
     path: '/',
     component: Layout,
-    redirect: '/desktop',
+    redirect: '/model/index',
     meta: { title: '教学工作台' },
     children: [
       {

src/renderer/src/store/modules/classTask.js

@@ -5,6 +5,12 @@ import { JYApiListCT, JYApiListOriginYear, JYApiListSO} from "@/utils/examQuesti
 
 const useClassTaskStore = defineStore('classTask',{
   state: () => ({
+    experimentObj:{
+      edustage: '小学', // 教育阶段
+      edusubject: '', // 学科
+      experimentList: [], // 实验科目列表
+    },
+    isOpenQuestUploadView: false, // 是否打开习题上传的页面
     classListIds: [],
     entpCourseWorkTypeList: [
       {value: 0, label: "不限"},

src/renderer/src/utils/comm.js

@@ -395,6 +395,19 @@ export const dataSetJson = {
   "课标-高中-英语": "e889fcac9fd011efb22a0242ac140006",
   "课标-高中-数学": "e03aa4fe9fd011ef91270242ac140006",
   "课标-高中-地理": "270516829fd111efb13c0242ac140006",
-  "课标-高中-政治": "a7df2b01aafd11ef8bb40242ac140002",
+  "课标-高中-政治": "a2f0b247b85d11ef84290242ac140005",
+  "教材-高中-语文": "cee3062a9fcf11efa6910242ac140006",
+  "教材-高中-生物": "fb5d01d59fd011ef9bb90242ac140006",
+  "教材-高中-历史": "f2f6c1fb9fd011ef98740242ac140006",
+  "教材-高中-英语": "e889fcac9fd011efb22a0242ac140006",
+  "教材-高中-数学": "e03aa4fe9fd011ef91270242ac140006",
+  "教材-高中-地理": "270516829fd111efb13c0242ac140006",
+  "教材-高中-政治": "a2f0b247b85d11ef84290242ac140005",
+  "课标-小学-科学": "935cfec8bf6a11ef98950242ac140006",
+  "课标-小学-数学": "3c4e298fbf7911ef8e8b0242ac140002",
+  "课标-小学-语文": "f76f1aa5bf7111ef90c80242ac140002",
+  "教材-小学-科学": "935cfec8bf6a11ef98950242ac140006",
+  "教材-小学-数学": "3c4e298fbf7911ef8e8b0242ac140002",
+  "教材-小学-语文": "f76f1aa5bf7111ef90c80242ac140002",
   "鉴权": "ragflow-IwMDI1MGU2YTU3NjExZWZiNWEzMDI0Mm"
 }

src/renderer/src/utils/dialog.js

@@ -0,0 +1,49 @@
+/**
+ * 弹窗-函数
+ */
+import { h, render } from 'vue'
+import { ElDialog } from 'element-plus'
+
+// 打开弹窗-函数
+export const openDialog = (option, content) => {
+  let vNode
+  const body = document.body
+  const dOpts = {
+    modelValue: true,
+    width: 800,
+    height: 600,
+    title: '添加-超连接',
+    draggable: true,
+    'onUpdate:modelValue': val => {
+      if (vNode && !val) render(null, body)
+    },
+    ...option
+  }
+  vNode = h(ElDialog, dOpts, {
+    default: typeof content == 'function' ? content(h) : content
+  })
+  render(vNode, body)
+}
+
+// 打开链接
+export const openLink = (option, title) => {
+  // https://phet.colorado.edu/sims/html/number-play/latest/number-play_zh_CN.html
+  const isStr = typeof option == 'string'
+  const opt = isStr ? {} : option
+  const url = isStr ? option : option?.url || option?.src || option?.href
+  const titleNew = isStr? title||'实验室' : option?.title || '添加-超连接'
+  openDialog({
+    title: titleNew,
+    ...opt
+  }, (h) => {
+    return h('iframe', {
+      src: url,
+      width: '100%',
+      style: {
+        height: 'calc(80vh - 75px)',
+      },
+      scrolling: 'no',
+      frameborder: '0',
+    })
+  })
+}

src/renderer/src/utils/phetData.json

@@ -0,0 +1,734 @@
+{
+  "title": "实验",
+  "data": {
+    "primary":[
+      {
+        "label": "数量比较",
+        "fileurl": "https://phet.colorado.edu/sims/html/number-compare/latest/number-compare_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "数字游戏",
+        "fileurl": "https://phet.colorado.edu/sims/html/number-play/latest/number-play_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "数轴：距离",
+        "fileurl": "https://phet.colorado.edu/sims/html/number-line-distance/latest/number-line-distance_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "比率和比例",
+        "fileurl": "https://phet.colorado.edu/sims/html/ratio-and-proportion/latest/ratio-and-proportion_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "数轴：运算",
+        "fileurl": "https://phet.colorado.edu/sims/html/number-line-operations/latest/number-line-operations_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "数轴：整数",
+        "fileurl": "https://phet.colorado.edu/sims/html/number-line-integers/latest/number-line-integers_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "向量的和：等式",
+        "fileurl": "https://phet.colorado.edu/sims/html/vector-addition-equations/latest/vector-addition-equations_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "向量相加",
+        "fileurl": "https://phet.colorado.edu/sims/html/vector-addition/latest/vector-addition_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "曲线拟合",
+        "fileurl": "https://phet.colorado.edu/sims/html/curve-fitting/latest/curve-fitting_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "分数：带分数",
+        "fileurl": "https://phet.colorado.edu/sims/html/fractions-mixed-numbers/latest/fractions-mixed-numbers_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "分数：入门",
+        "fileurl": "https://phet.colorado.edu/sims/html/fractions-intro/latest/fractions-intro_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "构建一个分数",
+        "fileurl": "https://phet.colorado.edu/sims/html/build-a-fraction/latest/build-a-fraction_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "分数：等式",
+        "fileurl": "https://phet.colorado.edu/sims/html/fractions-equality/latest/fractions-equality_zh_CN.html",
+        "subject": "math"
+      },
+
+
+      {
+        "label": "单位价格",
+        "fileurl": "https://phet.colorado.edu/sims/html/unit-rates/latest/unit-rates_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "获得一个10",
+        "fileurl": "https://phet.colorado.edu/sims/html/make-a-ten/latest/make-a-ten_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "木棒的计算问题",
+        "fileurl": "https://www.netpad.net.cn/resource_web/course/?pack_id=6dc2ab05-cb06-4716-92ca-e00fb89ad1e6#/20808",
+        "subject": "math"
+      },
+
+
+      {
+        "label": "几何光学",
+        "fileurl": "https://phet.colorado.edu/sims/html/geometric-optics/latest/geometric-optics_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "密度",
+        "fileurl": "https://phet.colorado.edu/sims/html/density/latest/density_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "能量滑板竞技场: 基础",
+        "fileurl": "https://phet.colorado.edu/sims/html/energy-skate-park-basics/latest/energy-skate-park-basics_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "法拉第定律",
+        "fileurl": "https://phet.colorado.edu/sims/html/faradays-law/latest/faradays-law_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "绳波",
+        "fileurl": "https://phet.colorado.edu/sims/html/wave-on-a-string/latest/wave-on-a-string_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "光的混合",
+        "fileurl": "https://phet.colorado.edu/sims/html/color-vision/latest/color-vision_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "平衡探究实验",
+        "fileurl": "https://phet.colorado.edu/sims/html/balancing-act/latest/balancing-act_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "受到压力",
+        "fileurl": "https://phet.colorado.edu/sims/html/under-pressure/latest/under-pressure_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "摩擦力",
+        "fileurl": "https://phet.colorado.edu/sims/html/friction/latest/friction_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "力和运动：基础",
+        "fileurl": "https://phet.colorado.edu/sims/html/forces-and-motion-basics/latest/forces-and-motion-basics_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "静电电压",
+        "fileurl": "https://phet.colorado.edu/sims/html/john-travoltage/latest/john-travoltage_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "万有引力实验",
+        "fileurl": "https://phet.colorado.edu/sims/html/gravity-force-lab/latest/gravity-force-lab_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "气球和静电（摩擦起电）",
+        "fileurl": "https://phet.colorado.edu/sims/html/balloons-and-static-electricity/latest/balloons-and-static-electricity_zh_CN.html",
+        "subject": "physics"
+      },
+
+
+
+
+      {
+        "label": "密度",
+        "fileurl": "https://phet.colorado.edu/sims/html/density/latest/density_zh_CN.html",
+        "subject": "biology"
+      },
+      {
+        "label": "基因表达基础",
+        "fileurl": "https://phet.colorado.edu/sims/html/gene-expression-essentials/latest/gene-expression-essentials_zh_CN.html",
+        "subject": "biology"
+      },
+
+
+
+      {
+        "label": "密度",
+        "fileurl": "https://phet.colorado.edu/sims/html/density/latest/density_zh_CN.html",
+        "subject": "sciences"
+      },
+
+      {
+        "label": "PH值",
+        "fileurl": "https://phet.colorado.edu/sims/html/ph-scale/latest/ph-scale_zh_CN.html",
+        "subject": "sciences"
+      },
+
+
+      {
+        "label": "密度",
+        "fileurl": "https://phet.colorado.edu/sims/html/density/latest/density_zh_CN.html",
+        "subject": "chemistry"
+      },
+      {
+        "label": "创造一个分子",
+        "fileurl": "https://phet.colorado.edu/sims/html/build-a-molecule/latest/build-a-molecule_zh_CN.html",
+        "subject": "chemistry"
+      },
+      {
+        "label": "扩散",
+        "fileurl": "https://phet.colorado.edu/sims/html/diffusion/latest/diffusion_zh_CN.html",
+        "subject": "chemistry"
+      }
+    ],
+    "junior": [
+      {
+        "label": "二项分布弹珠台几率",
+        "fileurl": "https://phet.colorado.edu/sims/html/plinko-probability/latest/plinko-probability_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "建立方程",
+        "fileurl": "https://phet.colorado.edu/sims/html/function-builder/latest/function-builder_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "三角函数之旅",
+        "fileurl": "https://phet.colorado.edu/sims/html/trig-tour/latest/trig-tour_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "四则运算",
+        "fileurl": "https://phet.colorado.edu/sims/html/arithmetic/latest/arithmetic_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "二次函数图像",
+        "fileurl": "https://phet.colorado.edu/sims/html/graphing-quadratics/latest/graphing-quadratics_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "质量和弹簧",
+        "fileurl": "https://phet.colorado.edu/sims/html/masses-and-springs/latest/masses-and-springs_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "等式探索:两个变量",
+        "fileurl": "https://phet.colorado.edu/sims/html/equality-explorer-two-variables/latest/equality-explorer-two-variables_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "等式探索:基础",
+        "fileurl": "https://phet.colorado.edu/sims/html/equality-explorer-basics/latest/equality-explorer-basics_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "等式探索",
+        "fileurl": "https://phet.colorado.edu/sims/html/equality-explorer/latest/equality-explorer_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "面积模型代数",
+        "fileurl": "https://phet.colorado.edu/sims/html/area-model-algebra/latest/area-model-algebra_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "面积模型：小数",
+        "fileurl": "https://phet.colorado.edu/sims/html/area-model-decimals/latest/area-model-decimals_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "面积模型乘法",
+        "fileurl": "https://phet.colorado.edu/sims/html/area-model-multiplication/latest/area-model-multiplication_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "面积模型入门",
+        "fileurl": "https://phet.colorado.edu/sims/html/area-model-introduction/latest/area-model-introduction_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "钟摆实验",
+        "fileurl": "https://phet.colorado.edu/sims/html/pendulum-lab/latest/pendulum-lab_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "斜抛运动",
+        "fileurl": "https://phet.colorado.edu/sims/html/projectile-motion/latest/projectile-motion_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "表达式变换",
+        "fileurl": "https://phet.colorado.edu/sims/html/expression-exchange/latest/expression-exchange_zh_CN.html",
+        "subject": "math"
+      },
+
+      {
+        "label": "电路建设工具包:交流",
+        "fileurl": "https://phet.colorado.edu/sims/html/circuit-construction-kit-ac/latest/circuit-construction-kit-ac_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "交流虚拟实验室",
+        "fileurl": "https://phet.colorado.edu/sims/html/circuit-construction-kit-ac-virtual-lab/latest/circuit-construction-kit-ac-virtual-lab_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "碰撞实验室",
+        "fileurl": "https://phet.colorado.edu/sims/html/collision-lab/latest/collision-lab_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "能量滑板竞技场",
+        "fileurl": "https://phet.colorado.edu/sims/html/energy-skate-park/latest/energy-skate-park_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "向量相加",
+        "fileurl": "https://phet.colorado.edu/sims/html/vector-addition/latest/vector-addition_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "曲线拟合",
+        "fileurl": "https://phet.colorado.edu/sims/html/curve-fitting/latest/curve-fitting_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "引力实验室：基础",
+        "fileurl": "https://phet.colorado.edu/sims/html/gravity-force-lab-basics/latest/gravity-force-lab-basics_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "波动入门",
+        "fileurl": "https://phet.colorado.edu/sims/html/waves-intro/latest/waves-intro_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "扩散",
+        "fileurl": "https://phet.colorado.edu/sims/html/diffusion/latest/diffusion_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "气体基础",
+        "fileurl": "https://phet.colorado.edu/sims/html/gases-intro/latest/gases-intro_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "气体性质",
+        "fileurl": "https://phet.colorado.edu/sims/html/gas-properties/latest/gas-properties_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "质量与弹簧：基础",
+        "fileurl": "https://phet.colorado.edu/sims/html/masses-and-springs-basics/latest/masses-and-springs-basics_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "黑体辐射",
+        "fileurl": "https://phet.colorado.edu/sims/html/blackbody-spectrum/latest/blackbody-spectrum_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "能量的形式和转换",
+        "fileurl": "https://phet.colorado.edu/sims/html/energy-forms-and-changes/latest/energy-forms-and-changes_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "波的干涉",
+        "fileurl": "https://phet.colorado.edu/sims/html/wave-interference/latest/wave-interference_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "库仑定律",
+        "fileurl": "https://phet.colorado.edu/sims/html/coulombs-law/latest/coulombs-law_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "质量和弹簧",
+        "fileurl": "https://phet.colorado.edu/sims/html/masses-and-springs/latest/masses-and-springs_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "电容器实验:基础",
+        "fileurl": "https://phet.colorado.edu/sims/html/capacitor-lab-basics/latest/capacitor-lab-basics_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "电路组建实验:直流虚拟实验室",
+        "fileurl": "https://phet.colorado.edu/sims/html/circuit-construction-kit-dc-virtual-lab/latest/circuit-construction-kit-dc-virtual-lab_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "电路组建实验:直流",
+        "fileurl": "https://phet.colorado.edu/sims/html/circuit-construction-kit-dc/latest/circuit-construction-kit-dc_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "钟摆实验",
+        "fileurl": "https://phet.colorado.edu/sims/html/pendulum-lab/latest/pendulum-lab_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "斜抛运动",
+        "fileurl": "https://phet.colorado.edu/sims/html/projectile-motion/latest/projectile-motion_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "物质状态：基础",
+        "fileurl": "https://phet.colorado.edu/sims/html/states-of-matter-basics/latest/states-of-matter-basics_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "物质状态",
+        "fileurl": "https://phet.colorado.edu/sims/html/states-of-matter/latest/states-of-matter_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "重力和轨道",
+        "fileurl": "https://phet.colorado.edu/sims/html/gravity-and-orbits/latest/gravity-and-orbits_zh_CN.html",
+        "subject": "physics"
+      },
+
+      {
+        "label": "分子与光",
+        "fileurl": "https://phet.colorado.edu/sims/html/molecules-and-light/latest/molecules-and-light_zh_CN.html",
+        "subject": "physics"
+      },
+
+      {
+        "label": "PH值",
+        "fileurl": "https://phet.colorado.edu/sims/html/ph-scale/latest/ph-scale_zh_CN.html",
+        "subject": "biology"
+      },
+      {
+        "label": "光的混合",
+        "fileurl": "https://phet.colorado.edu/sims/html/color-vision/latest/color-vision_zh_CN.html",
+        "subject": "biology"
+      },
+      {
+        "label": "自然选择",
+        "fileurl": "https://phet.colorado.edu/sims/html/natural-selection/latest/natural-selection_zh_CN.html",
+        "subject": "biology"
+      },
+
+      {
+        "label": "受到压力",
+        "fileurl": "https://phet.colorado.edu/sims/html/under-pressure/latest/under-pressure_zh_CN.html",
+        "subject": "sciences"
+      },
+      {
+        "label": "万有引力实验",
+        "fileurl": "https://phet.colorado.edu/sims/html/gravity-force-lab/latest/gravity-force-lab_zh_CN.html",
+        "subject": "sciences"
+      },
+      {
+        "label": "气球和静电（摩擦起电）",
+        "fileurl": "https://phet.colorado.edu/sims/html/balloons-and-static-electricity/latest/balloons-and-static-electricity_zh_CN.html",
+        "subject": "sciences"
+      },
+
+      {
+        "label": "气体基础",
+        "fileurl": "https://phet.colorado.edu/sims/html/gases-intro/latest/gases-intro_zh_CN.html",
+        "subject": "chemistry"
+      },
+      {
+        "label": "气体性质",
+        "fileurl": "https://phet.colorado.edu/sims/html/gas-properties/latest/gas-properties_zh_CN.html",
+        "subject": "chemistry"
+      },
+      {
+        "label": "黑体辐射",
+        "fileurl": "https://phet.colorado.edu/sims/html/blackbody-spectrum/latest/blackbody-spectrum_zh_CN.html",
+        "subject": "chemistry"
+      },
+      {
+        "label": "能量的形式和转换",
+        "fileurl": "https://phet.colorado.edu/sims/html/energy-forms-and-changes/latest/energy-forms-and-changes_zh_CN.html",
+        "subject": "chemistry"
+      },
+      {
+        "label": "库仑定律",
+        "fileurl": "https://phet.colorado.edu/sims/html/coulombs-law/latest/coulombs-law_zh_CN.html",
+        "subject": "chemistry"
+      },
+      {
+        "label": "分子极性",
+        "fileurl": "https://phet.colorado.edu/sims/html/molecule-polarity/latest/molecule-polarity_zh_CN.html",
+        "subject": "chemistry"
+      },
+      {
+        "label": "物质状态：基础",
+        "fileurl": "https://phet.colorado.edu/sims/html/states-of-matter-basics/latest/states-of-matter-basics_zh_CN.html",
+        "subject": "chemistry"
+      },
+      {
+        "label": "物质状态",
+        "fileurl": "https://phet.colorado.edu/sims/html/states-of-matter/latest/states-of-matter_zh_CN.html",
+        "subject": "chemistry"
+      },
+      {
+        "label": "原子的相互作用",
+        "fileurl": "https://phet.colorado.edu/sims/html/atomic-interactions/latest/atomic-interactions_zh_CN.html",
+        "subject": "chemistry"
+      },
+      {
+        "label": "卢瑟福散射",
+        "fileurl": "https://phet.colorado.edu/sims/html/rutherford-scattering/latest/rutherford-scattering_zh_CN.html",
+        "subject": "chemistry"
+      },
+      {
+        "label": "原子的相互作用",
+        "fileurl": "https://phet.colorado.edu/sims/html/atomic-interactions/latest/atomic-interactions_zh_CN.html",
+        "subject": "chemistry"
+      }
+    ],
+    "senior": [
+
+      {
+        "label": "一次线性函数的拟合",
+        "fileurl": "https://phet.colorado.edu/sims/html/least-squares-regression/latest/least-squares-regression_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "区域建造者",
+        "fileurl": "https://phet.colorado.edu/sims/html/area-builder/latest/area-builder_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "绳波",
+        "fileurl": "https://phet.colorado.edu/sims/html/wave-on-a-string/latest/wave-on-a-string_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "直线图形",
+        "fileurl": "https://phet.colorado.edu/sims/html/graphing-lines/latest/graphing-lines_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "分数配对",
+        "fileurl": "https://phet.colorado.edu/sims/html/fraction-matcher/latest/fraction-matcher_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "平衡探究实验",
+        "fileurl": "https://phet.colorado.edu/sims/html/balancing-act/latest/balancing-act_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "绘图:斜率与截距",
+        "fileurl": "https://phet.colorado.edu/sims/html/graphing-slope-intercept/latest/graphing-slope-intercept_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "函数构造器:基础",
+        "fileurl": "https://phet.colorado.edu/sims/html/function-builder-basics/latest/function-builder-basics_zh_CN.html",
+        "subject": "math"
+      },
+      {
+        "label": "比例游乐场",
+        "fileurl": "https://phet.colorado.edu/sims/html/proportion-playground/latest/proportion-playground_zh_CN.html",
+        "subject": "math"
+      },
+
+      {
+        "label": "二项分布弹珠台几率",
+        "fileurl": "https://phet.colorado.edu/sims/html/plinko-probability/latest/plinko-probability_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "原子的相互作用",
+        "fileurl": "https://phet.colorado.edu/sims/html/atomic-interactions/latest/atomic-interactions_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "电荷与电场",
+        "fileurl": "https://phet.colorado.edu/sims/html/charges-and-fields/latest/charges-and-fields_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "卢瑟福散射",
+        "fileurl": "https://phet.colorado.edu/sims/html/rutherford-scattering/latest/rutherford-scattering_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "光的折射",
+        "fileurl": "https://phet.colorado.edu/sims/html/bending-light/latest/bending-light_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "胡克定律",
+        "fileurl": "https://phet.colorado.edu/sims/html/hookes-law/latest/hookes-law_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "部分电路欧姆定律",
+        "fileurl": "https://phet.colorado.edu/sims/html/ohms-law/latest/ohms-law_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "电线的电阻",
+        "fileurl": "https://phet.colorado.edu/sims/html/resistance-in-a-wire/latest/resistance-in-a-wire_zh_CN.html",
+        "subject": "physics"
+      },
+      {
+        "label": "原子模型",
+        "fileurl": "https://phet.colorado.edu/sims/html/build-an-atom/latest/build-an-atom_zh_CN.html",
+        "subject": "physics"
+      },
+
+      {
+        "label": "分子极性",
+        "fileurl": "https://phet.colorado.edu/sims/html/molecule-polarity/latest/molecule-polarity_zh_CN.html",
+        "subject": "biology"
+      },
+      {
+        "label": "神经元",
+        "fileurl": "https://phet.colorado.edu/sims/html/neuron/latest/neuron_zh_CN.html",
+        "subject": "biology"
+      },
+
+      {
+        "label": "引力实验室：基础",
+        "fileurl": "https://phet.colorado.edu/sims/html/gravity-force-lab-basics/latest/gravity-force-lab-basics_zh_CN.html",
+        "subject": "sciences"
+      },
+      {
+        "label": "波动入门",
+        "fileurl": "https://phet.colorado.edu/sims/html/waves-intro/latest/waves-intro_zh_CN.html",
+        "subject": "sciences"
+      },
+      {
+        "label": "扩散",
+        "fileurl": "https://phet.colorado.edu/sims/html/diffusion/latest/diffusion_zh_CN.html",
+        "subject": "sciences"
+      },
+      {
+        "label": "气体基础",
+        "fileurl": "https://phet.colorado.edu/sims/html/gases-intro/latest/gases-intro_zh_CN.html",
+        "subject": "sciences"
+      },
+      {
+        "label": "气体性质",
+        "fileurl": "https://phet.colorado.edu/sims/html/gas-properties/latest/gas-properties_zh_CN.html",
+        "subject": "sciences"
+      },
+      {
+        "label": "分子与光",
+        "fileurl": "https://phet.colorado.edu/sims/html/molecules-and-light/latest/molecules-and-light_zh_CN.html",
+        "subject": "sciences"
+      },
+      {
+        "label": "绳波",
+        "fileurl": "https://phet.colorado.edu/sims/html/wave-on-a-string/latest/wave-on-a-string_zh_CN.html",
+        "subject": "sciences"
+      },
+      {
+        "label": "黑体辐射",
+        "fileurl": "https://phet.colorado.edu/sims/html/blackbody-spectrum/latest/blackbody-spectrum_zh_CN.html",
+        "subject": "sciences"
+      },
+      {
+        "label": "波的干涉",
+        "fileurl": "https://phet.colorado.edu/sims/html/wave-interference/latest/wave-interference_zh_CN.html",
+        "subject": "sciences"
+      },
+      {
+        "label": "重力和轨道",
+        "fileurl": "https://phet.colorado.edu/sims/html/gravity-and-orbits/latest/gravity-and-orbits_zh_CN.html",
+        "subject": "sciences"
+      },
+
+      {
+        "label": "同位素和原子的质量",
+        "fileurl": "https://phet.colorado.edu/sims/html/isotopes-and-atomic-mass/latest/isotopes-and-atomic-mass_zh_CN.html",
+        "subject": "chemistry"
+      },
+      {
+        "label": "分子与光",
+        "fileurl": "https://phet.colorado.edu/sims/html/molecules-and-light/latest/molecules-and-light_zh_CN.html",
+        "subject": "chemistry"
+      },
+      {
+        "label": "分子形状",
+        "fileurl": "https://phet.colorado.edu/sims/html/molecule-shapes/latest/molecule-shapes_zh_CN.html",
+        "subject": "chemistry"
+      },
+      {
+        "label": "分子形状:基础",
+        "fileurl": "https://phet.colorado.edu/sims/html/molecule-shapes-basics/latest/molecule-shapes-basics_zh_CN.html",
+        "subject": "chemistry"
+      },
+      {
+        "label": "反应物，生成物及未反应物",
+        "fileurl": "https://phet.colorado.edu/sims/html/reactants-products-and-leftovers/latest/reactants-products-and-leftovers_zh_CN.html",
+        "subject": "chemistry"
+      },
+      {
+        "label": "pH值:基础",
+        "fileurl": "https://phet.colorado.edu/sims/html/ph-scale-basics/latest/ph-scale-basics_zh_CN.html",
+        "subject": "chemistry"
+      },
+      {
+        "label": "绳波",
+        "fileurl": "https://phet.colorado.edu/sims/html/wave-on-a-string/latest/wave-on-a-string_zh_CN.html",
+        "subject": "chemistry"
+      },
+      {
+        "label": "PH值",
+        "fileurl": "https://phet.colorado.edu/sims/html/ph-scale/latest/ph-scale_zh_CN.html",
+        "subject": "chemistry"
+      },
+      {
+        "label": "配平化学方程式",
+        "fileurl": "https://phet.colorado.edu/sims/html/balancing-chemical-equations/latest/balancing-chemical-equations_zh_CN.html",
+        "subject": "chemistry"
+      },
+      {
+        "label": "酸碱溶度",
+        "fileurl": "https://phet.colorado.edu/sims/html/acid-base-solutions/latest/acid-base-solutions_zh_CN.html",
+        "subject": "chemistry"
+      },
+      {
+        "label": "浓度",
+        "fileurl": "https://phet.colorado.edu/sims/html/concentration/latest/concentration_zh_CN.html",
+        "subject": "chemistry"
+      },
+      {
+        "label": "气球和静电（摩擦起电）",
+        "fileurl": "https://phet.colorado.edu/sims/html/balloons-and-static-electricity/latest/balloons-and-static-electricity_zh_CN.html",
+        "subject": "chemistry"
+      },
+      {
+        "label": "比尔定律实验",
+        "fileurl": "https://phet.colorado.edu/sims/html/beers-law-lab/latest/beers-law-lab_zh_CN.html",
+        "subject": "chemistry"
+      },{
+        "label": "摩尔浓度",
+        "fileurl": "https://phet.colorado.edu/sims/html/molarity/latest/molarity_zh_CN.html",
+        "subject": "chemistry"
+      },
+      {
+        "label": "原子模型",
+        "fileurl": "https://phet.colorado.edu/sims/html/build-an-atom/latest/build-an-atom_zh_CN.html",
+        "subject": "chemistry"
+      }
+    ]
+  }
+}

src/renderer/src/utils/ppt/index.js

@@ -0,0 +1,87 @@
+/**
+ * ppt 转换为图片
+ */
+import { h, render, getCurrentInstance } from 'vue'
+import { toPng, toJpeg } from 'html-to-image' // 引入html-to-image库
+import { PPTXFileToJson } from "@/AixPPTist/src/hooks/useImport"
+import ThumbnailSlide from '@/AixPPTist/src/views/components/ThumbnailSlide/index.vue'
+import { useSlidesStore } from '@/AixPPTist/src/store'
+// 延时
+const sleep = ms => new Promise(resolve => setTimeout(resolve, ms))
+
+/**
+ * @description: 渲染组件
+ * @param {*} node 节点或属性
+ * @param {*} props 属性
+ * @param {*} children 子元素
+ * @param {*} container 容器
+ */
+const renderComponent = (node, props = {}, children, container) => {
+  let vNode, body
+  if (!node) throw new Error('vNode is required')
+  if (typeof container == 'string') {
+    if (node == 'slide') {
+      vNode = h(ThumbnailSlide, props, children)
+    } else throw new Error('vNode has no corresponding component')
+  } else {
+    vNode = h(node, props, children)
+  }
+  if (!container) body = document.body // 默认为body
+  else { // 判断是否为字符串
+    if (typeof container == 'string') {
+      body = document.querySelector(container)
+    } else {
+      body = container
+    }
+  }
+  return render(vNode, body)
+}
+
+/**
+ * @description: 幻灯片转换为图片
+ *  提示：icon组件找不到是应为 h() 渲染是底层创建的虚拟节点，找不到全局组件
+ * @param {*} slides  幻灯片数据
+ * @param {*} options 配置 number 为幻灯片宽度 | object 为配置项
+ * @returns 
+ */
+export const slidesToImg = (slides = [], options) => {
+  let width, option, ispng = true
+  if (typeof options =='number'){width = options; option = {}}
+  else {const { width: w, isPng, ...opt } = options;width = w; ispng=isPng; option = opt}
+  const slidesStore = useSlidesStore()
+  !!width && slidesStore.setViewportSize(width) // 设置幻灯片宽度
+  return new Promise(async(resolve) => {
+    const instance = getCurrentInstance()
+    console.log('instance', instance)
+    const slidesDom = []
+    for(const slide of slides) {
+      const props = { class: 'c-thumbnail', slide, size: 120, ...option }
+      const node = h(ThumbnailSlide, props)
+      slidesDom.push(node)
+    }
+    // 渲染组件到body
+    const props = { class: 'c-thumbnails', style:{position:'absolute',top:0,left:'-200vw'}}
+    renderComponent('div', props, slidesDom)
+    let imgs = []
+    const toImag = ispng? toPng : toJpeg
+    for(const slide of slidesDom) {
+      const img = await toImag(slide.el)
+      imgs.push(img)
+    }
+    // console.log('ppt生成图片: ', imgs)
+    // console.log('图片已生成，正在卸载组件')
+    !!width && slidesStore.setViewportSize(1000) // 设置幻灯片宽度-恢复
+    render(null, document.body) // 卸载组件
+    resolve(imgs)
+  })
+}
+/**
+ * description: ppt 文件转换为图片
+ * @param {*} file file 为文件对象| arrayBuffer 为数组
+ * @param {*} options 配置 number 为幻灯片宽度 | object 为配置项
+ * @returns 
+ */
+export const pptToImg = async(file, options) => {
+  const { slides } = await PPTXFileToJson(file)
+  return slidesToImg(slides, options)
+}

src/renderer/src/utils/resourceDict.js

@@ -57,24 +57,31 @@ export const  resourceFormat = [
 // 资源类型
 export const resourceType = [
   {
+    id:1,
     label: '课例库',
     value: "'apt','课件','教案'"
   },
-  {
+  // {
-    label: '作业库',
+  //   label: '作业库',
-    value: '作业',
+  //   value: '作业',
-    disabled: true
+  //   disabled: true
-  },
+  // },
 
   {
+    id:2,
     label: '素材库',
     value: "'素材'"
   },
   {
-    label: '习题库',
+    id:3,
-    value: '习题',
+    label: '实验室',
-    disabled: true
+    value: "'素材'"
-  }
+  },
+  // {
+  //   label: '习题库',
+  //   value: '习题',
+  //   disabled: true
+  // }
 ]
 // 年级划分
 export const gradeList = [

src/renderer/src/utils/talkFile/index.js

@@ -9,7 +9,7 @@ export const asyncLocalFile = (item) => {
         if (isAsync === true) {
           item.async = 'on'
           if (type === 'down') {
-            console.log(item)
+            // console.log(item)
             ipcRenderer.send('download-file-default', {
               url: item.fileFullPath,
               fileName: item.fileNewName

src/renderer/src/utils/tool.js

@@ -225,7 +225,7 @@ export const createWindow = async (type, data) => {
         .filter(k => typeof data[k] === 'function')
         .forEach(k => events[k] = data[k])
       eventHandles(type, win, events) // 事件监听处理
-      break
+      return win
     }
     default:
       break
@@ -248,10 +248,11 @@ export function toolWindow(type, {url, isConsole, isWeb=true, option={}}) {
   const devUrl = `${BaseUrl}${url}`
   const buildUrl = path.join(__dirname, 'index.html')
   const urlAll = isDev ? devUrl : buildUrl
+  let logoIco = import.meta.env.MODE==='yc'||import.meta.env.MODE==='yc2'?'/resources/yc-logo.png':'/resources/logo2.ico'
   return new Promise(async(resolve) => {
     const config = {
       width, height,
-      icon: path.join(appPath, '/resources/logo2.ico'),
+      icon: path.join(appPath, logoIco),
       webPreferences: {
         preload: path.join(API.preloadPath, '/index.js'),
         sandbox: false,
@@ -422,6 +423,19 @@ export const toLinkWeb = (path) => {
     cookieData: { ...config }
   })
 }
+
+/**
+ * @description 外部跳转-web网页
+ * @param {*} url
+ */
+export const toLinkLeftWeb = (url) => {
+  // 通知主进程
+  ipcRenderer.send('openWindow', {
+    key: `win-${Date.now()}`,
+    fullPath: url
+  })
+}
+
 /**
  * @description 外部跳转-web网页
  * @param {*} path

src/renderer/src/views/classManage/classReserv.vue

@@ -3,16 +3,16 @@
 <!--    <div class="class-reserv-tabs">
       <el-segmented v-model="tabActive" block :options="tabOptions" size="large" />
     </div>-->
-    <div class="class-reserv-body">
+    <div class="class-reserv-body" v-infinite-scroll="load">
       <template v-for="(item, index) in dataList" :key="index">
-        <reserv-item
+        <!-- <reserv-item
           :style="{'background-color': index%2==0?'#f5f5f5':''}"
           :item="item"
           v-if="item.bookImg"
           @open-edit="reservDialog.openDialog(item)"
           @delete-reserv="deleteReserv(item)"
           @change="(...o) => emit('change', ...o)"
-        ></reserv-item>
+        ></reserv-item> -->
         <reserv-item-apt
           v-if="!item.bookImg"
           :style="{'background-color': index%2==0?'#f5f5f5':''}"
@@ -22,13 +22,14 @@
           @change="(...o) => emit('change', ...o)"
         ></reserv-item-apt>
       </template>
+      <el-divider v-if="page.isEnd">到底了，没了</el-divider>
     </div>
     <reserv ref="reservDialog"></reserv>
   </el-container>
 </template>
 
 <script setup>
-import { ref, onMounted, computed, watch } from 'vue'
+import { ref, onMounted, computed, watch, reactive } from 'vue'
 import { getSelfReserv } from '@/api/classManage'
 import { listClasscourseNew } from '@/api/teaching/classcourse' // api接口
 import ReservItem from '@/views/classManage/reserv-item.vue'
@@ -36,6 +37,7 @@ import Reserv from '@/views/prepare/container/reserv.vue'
 import { useToolState } from '@/store/modules/tool'
 import useUserStore from '@/store/modules/user'
 import ReservItemApt from '@/views/classManage/reserv-item-apt.vue'
+import vScroll from '@/directive/scroll' // 指令--滚动
 // import Chat from '@/utils/chat' // im 登录初始化
 // if (!Chat.imChat) Chat.init()
 
@@ -44,6 +46,12 @@ const reservDialog = ref(null)
 const tabOptions = ref(['进行中', '已结束'])
 const tabActive = ref('进行中')
 const dataList = ref([])
+const page = reactive({
+  pageNum: 0, // 页码
+  pageSize: 10, // 每页条数
+  total: 0,  // 总条数
+  isEnd: false // 是否加载完
+})
 
 const toolStore = useToolState()
 const userStore = useUserStore()
@@ -72,21 +80,42 @@ const deleteReserv = (item) => {
 })*/
 // 获取数据
 const getData = () => {
-  Promise.all([listClasscourseNew({teacherid: userStore.id,evalid: props.curNode.id,pageSize:1000}), getSelfReserv({ex2:props.curNode.id})]).then(([res1,res2])=>{
+  const { pageNum, pageSize } = page
-    let list = res2.data || []
+  const params = {
-    let list2 = res1.rows || []
+    evalid: props.curNode.id,
-    // list.sort((a,b) => { if(a.status=='上课中') return -1; else return 0 })
+    teacherid: userStore.id,
-    list = list.concat(list2)
+    pageNum, pageSize
+  }
+  listClasscourseNew(params)
+  .then((res) => {
+    const list = res.rows || []
+    const total = res.total || 0
     list.sort((a,b) => { return new Date(b.createTime) - new Date(a.createTime) })
-    dataList.value = list
+    dataList.value.push(...list)
+    page.total = total // 总条数
+    page.isEnd = dataList.value.length == total // 是否结束
   })
+  // aippt+ppt 获取数据
+  // Promise.all([listClasscourseNew({teacherid: userStore.id,evalid: props.curNode.id,pageSize:1000}), getSelfReserv({ex2:props.curNode.id})]).then(([res1,res2])=>{
+  //   let list = res2.data || []
+  //   let list2 = res1.rows || []
+  //   // list.sort((a,b) => { if(a.status=='上课中') return -1; else return 0 })
+  //   list = list.concat(list2)
+  //   list.sort((a,b) => { return new Date(b.createTime) - new Date(a.createTime) })
+  //   dataList.value = list
+  // })
   /*getSelfReserv().then((res) => {
     const list = res.data || []
     list.sort((a,b) => { if(a.status=='上课中') return -1; else return 0 })
     dataList.value = list
   })*/
 }
-
+// 列表加载更多
+const load = () => {
+  if(page.isEnd) return console.log('已加载完-所有') // 结束
+  page.pageNum++
+  getData()
+}
 watch(
   () => [dataList,toolStore.isToolWin,props.curNode],
   () => {
@@ -96,13 +125,14 @@ watch(
   }
 )
 onMounted(() => {
-  getData() // 加载数据
+  // getData() // 加载数据
 })
 </script>
 
 <style scoped lang="scss">
 .class-reserv-wrap {
   height: 100%;
+  // height: 300px;
   display: flex;
   flex-direction: column;
   //padding: 15px 10px;

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

@@ -15,8 +15,7 @@
       </template>
       <template v-else-if="item.status === 'open'">
         <el-button :disabled="toolStore.isToolWin" size="small" type="primary" @click="startClassR(item)"
-        >继续上课</el-button
+        >继续上课</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>
@@ -24,7 +23,8 @@
     </div>
     <div class="class-reserv-item-tool" style="width: 50px;">
 <!--      <el-button v-if="item.status!='open'" size="small" type="danger" @click="deleteReserv">删除</el-button>-->
-      <el-tag>APT</el-tag>
+      <!-- <el-tag>APT</el-tag> -->
+      <el-tag>AIPPT</el-tag>
     </div>
     <div style="min-width: 150px;"><span> 浏览：25955 点赞：26605</span></div>
   </div>
@@ -86,6 +86,7 @@ const chatSend = () => {
 <style scoped lang="scss">
 .class-reserv-item {
   display: flex;
+  align-items: center;
   background-color: white;
   border-radius: 10px;
   padding: 5px;
@@ -111,7 +112,7 @@ const chatSend = () => {
     }
   }
   .class-reserv-item-tool {
-    margin-left: 15px;
+    margin: 0 7px;
     display: flex;
     align-items: center;
   }

src/renderer/src/views/classTask/classTask.vue

@@ -154,14 +154,14 @@ const getClassWorkList = async () => {
 
     // ----------------------------------------------
     // 处理任务类型的UI
-    if (list[i].worktype == '学习目标定位') {
+    if (list[i].worktype == '课堂展示') {
       list[i].workclass = 'success'
       list[i].workcodesList = JSON.parse(list[i].workcodes)
-    } else if (list[i].worktype == '教材研读') {
+    } else if (list[i].worktype == '科学实验') {
       list[i].workclass = 'primary'
     } else if (list[i].worktype == '框架梳理') {
       list[i].workclass = 'warning'
-    } else if (list[i].worktype == '学科定位') {
+    } else if (list[i].worktype == '常规作业') {
       list[i].workclass = 'info'
     } else if (list[i].worktype == '习题训练') {
       list[i].workclass = 'danger'

src/renderer/src/views/classTask/classTaskAssign.vue

@@ -437,13 +437,15 @@ const queryPushRecords = (row) => {
         // } else
         // 课标研读 目标设定 教材研读 框架梳理 学科定位  TODO 后续接入在添加
         if (res.rows[i].worktype == '课堂展示') {
-          res.rows[i].workclass = 'primary';
+          res.rows[i].workclass = 'success';
         } else if (res.rows[i].worktype == '框架梳理') {
           res.rows[i].workclass = 'warning';
         } else if (res.rows[i].worktype == '常规作业') {
           res.rows[i].workclass = 'info';
         } else if (res.rows[i].worktype == '习题训练') {
           res.rows[i].workclass = 'danger';
+        }  else if (res.rows[i].worktype == '科学实验') {
+          res.rows[i].workclass = 'primary';
         } else {
           res.rows[i].workclass = 'primary';
         }

src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue

@@ -141,7 +141,8 @@
           v-if="
             dialogProps.studentObj.worktype == '常规作业' ||
             dialogProps.studentObj.worktype == '课堂展示' ||
-            dialogProps.studentObj.worktype == '框架梳理'
+            dialogProps.studentObj.worktype == '框架梳理' ||
+            dialogProps.studentObj.worktype == '科学实验' 
           "
         >
           <div v-for="(stuItem, sIndex) in dialogProps.studentQuizAllList" :key="stuItem.id">
@@ -157,7 +158,8 @@
                 v-if="
                   dialogProps.studentObj.worktype == '常规作业' ||
                   dialogProps.studentObj.worktype == '课堂展示' ||
-                  dialogProps.studentObj.worktype == '框架梳理'
+                  dialogProps.studentObj.worktype == '框架梳理' ||
+                  dialogProps.studentObj.worktype == '科学实验'
                 "
               >
                 <!-- 文件内容格式：mp3/mp4/doc/docx/excel/pdf/ppt/pptx/jpg/jpeg/gif/png/txt ->
@@ -210,7 +212,13 @@
 
                 <!-- 学生答题展示 -->
                 <div v-if="feedContentList.length > 0">
-                  <div v-if="dialogProps.studentObj.worktype == '常规作业' && stuItem.rightanswer != ''&& stuItem.rightanswer != null">
+                  <div 
+                    v-if="
+                      (dialogProps.studentObj.worktype == '常规作业' || dialogProps.studentObj.worktype == '科学实验') && 
+                      stuItem.rightanswer != '' && 
+                      stuItem.rightanswer != null
+                    "
+                  >
                     <!-- 常规作业：学生有的会答复 -->
                      <p style="padding: 10px 0;text-align: left;">学生答复内容</p>
                      <div style="padding: 0 20px;text-align: left;">{{stuItem.rightanswer}}</div>
@@ -427,7 +435,7 @@ import useUserStore from '@/store/modules/user'
 import { ref, reactive } from 'vue'
 // import { Plus } from '@element-plus/icons-vue'
 import { ElMessageBox, ElMessage } from 'element-plus'
-import { updateClassworkeval, updateClassworkdata, getClassworkdata } from '@/api/classTask'
+import { updateClassworkeval, getClassworkdata, updateClassWorkDataAutoFinish } from '@/api/classTask'
 import { getTimeDate } from '@/utils/date'
 import ReFilePreview from '@/components/refile-preview/index.vue'
 import { quizStrToList } from '@/utils/comm';
@@ -700,6 +708,7 @@ const acceptParams = async (params) => {
       })
     } else {
       // 学生回答
+      if (params.studentObj.worktype == '常规作业' || params.studentObj.worktype == '科学实验') {
         if(params.studentObj.worktype == '常规作业'){
           try {
             // 老师布置的附件 datacontent TODO：常规作业、其他类型还未接入
@@ -725,6 +734,9 @@ const acceptParams = async (params) => {
           } catch (error) {
             console.error('Invalid JSON:', error)
           }
+        }else{
+          // TODO 科学实验 老师布置的活动 暂时不在批改中显示 2024-12-20
+        }
 
         params.studentQuizAllList.forEach((item) => {
           classWorkFormScore.teacherRating.push({
@@ -878,7 +890,7 @@ const onSubmit = () => {
     updatedate: getTimeDate(),// = year+'-'+month+'-'+day+' '+hh+':'+mm;
   };
   // 更新作业批改状态
-  updateClassworkdata(formd).then(res => {
+  updateClassWorkDataAutoFinish(formd).then(res => {
   })
 
   // 更新题目批改

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

@@ -29,14 +29,15 @@ import { ElMessage } from 'element-plus'
 
 const emit = defineEmits(['itemClick'])
 const items = shallowRef([
-  { title: '自主搜题', description: '上千万高质量习题资源，历届考试真题，每道题均有习题解析', icon: '#icon-soutibao-',type:'primary' },
+  { title: '自主搜题', description: '上千万高质量习题资源，历届考试真题，每道题均有习题解析', icon: '#icon-soutibao-',type:'danger' },
-  { title: '校本题库', description: '本校公共题库资源。', icon: '#icon-soutibao-',type:'primary' },
+  // { title: '校本题库', description: '本校公共题库资源。', icon: '#icon-soutibao-',type:'danger' },
-  { title: '个人题库', description: '老师上传维护自己的个人题库。', icon: '#icon-soutibao-',type:'primary' },
+  { title: '个人题库', description: '老师上传维护自己的个人题库。', icon: '#icon-soutibao-',type:'danger' },
-  { title: '智能推荐', description: '通过对学生的薄弱知识点分析，推送不同难度的习题进行强化训练。', icon: '#icon-tubiao_wuxing-',type:'primary' },
+  // { title: '智能推荐', description: '通过对学生的薄弱知识点分析，推送不同难度的习题进行强化训练。', icon: '#icon-tubiao_wuxing-',type:'primary' },
-  { title: '课堂展示', description: '通过课堂白板绘制作业，提升学生的创作思维能力。', icon: '#icon-huaban',type:'danger' },
+  { title: '课堂展示', description: '通过课堂白板绘制作业，提升学生的创作思维能力。', icon: '#icon-huaban',type:'success' },
-  { title: '常规作业', description: '推送pdf、视频、音频、图片，学生可以拍照上传。', icon: '#icon-zhaoxiangji',type:'danger' },
+  { title: '常规作业', description: '推送pdf、视频、音频、图片，学生可以拍照上传。', icon: '#icon-zhaoxiangji',type:'info' },
-  { title: 'AI设计作业', description: '通过AI助手，根据课标、教材、考试等分析结果，智能创建作业。', icon: '#icon-jiqiren_o',type:'danger' },
+  // { title: 'AI设计作业', description: '通过AI助手，根据课标、教材、考试等分析结果，智能创建作业。', icon: '#icon-jiqiren_o',type:'danger' },
   { title: '习题上传', description: '自己上传个人题库。', icon: '#icon-shangchuan',type:'danger' },
+  { title: '科学实验', description: '学生完成虚拟仿真实验，并提交实验结果。', icon: '#icon-shangchuan',type:'primary' },
 ]);
 
 const handleClick = (item) => {

src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/experimentList.vue

@@ -0,0 +1,54 @@
+<template>
+  <div style="display: flex;">
+    <el-select
+      v-model="value"
+      placeholder="请选择实验课程"
+      size="large"
+      style="width: 240px"
+      @change="onSelectOption"
+    >
+      <el-option
+        v-for="item in classTaskStore.experimentList"
+        :key="item.value"
+        :label="item.label"
+        :value="item.label"
+      />
+    </el-select>
+  </div>
+</template>
+
+<script setup>
+import useUserStore from '@/store/modules/user'
+import {ArrowDown} from '@element-plus/icons-vue'
+import { onMounted,ref } from 'vue';
+import useClassTaskStore from '@/store/modules/classTask'
+const userStore = useUserStore().user
+const subjectList = ref([])
+const classTaskStore = useClassTaskStore().experimentObj
+
+// 定义要发送的emit事件
+let emit = defineEmits(['selectItem'])
+const props = defineProps({
+  list: {
+    type: Array,
+    default: () => ([])
+  },
+})
+const value = ref('')
+
+
+
+
+onMounted(() => {
+})
+
+const onSelectOption = (option) => {
+  console.log(option,'选择的实验课-------')
+  emit('selectItem', classTaskStore.experimentList.filter(item => item.label === option)[0])
+}
+
+</script>
+<style scoped>
+
+</style>
+

src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/selectClass.vue

@@ -0,0 +1,199 @@
+<template>
+    <div style="display: flex;">
+        <div style="margin-left: 15px">
+            <el-dropdown @command="handleUserEduStage">
+            <span class="el-dropdown-link">
+                <el-button class="custom-button" type="default" round >{{ useClassTaskStore().experimentObj.edustage }}
+                    <el-icon><ArrowDown /></el-icon>
+                </el-button>
+            </span>
+            <template #dropdown>
+                <el-dropdown-menu>
+                <!-- <el-dropdown-item command="幼儿园">幼儿园</el-dropdown-item> -->
+                <el-dropdown-item command="小学">小学</el-dropdown-item>
+                <el-dropdown-item command="初中">初中</el-dropdown-item>
+                <el-dropdown-item command="高中">高中</el-dropdown-item>
+                </el-dropdown-menu>
+            </template>
+            </el-dropdown>
+        </div>
+        <div style="margin-left: 15px">
+            <el-dropdown @command="handleUserEduSubject">
+            <span class="el-dropdown-link">
+                <el-button class="custom-button" type="default" round>{{ useClassTaskStore().experimentObj.edusubject }}
+                    <el-icon><ArrowDown /></el-icon>
+                </el-button>
+            </span>
+            <template #dropdown>
+                <el-dropdown-menu>
+                <template v-for="(item, index) in subjectList">
+                    <el-dropdown-item v-if="item.edustage == useClassTaskStore().experimentObj.edustage && isExpList(item.itemtitle)" :command="item.itemtitle">{{
+                    item.itemtitle }}</el-dropdown-item>
+                </template>
+                </el-dropdown-menu>
+            </template>
+            </el-dropdown>
+        </div>
+    </div>
+</template>
+  
+<script setup>
+import useUserStore from '@/store/modules/user'
+import {ArrowDown} from '@element-plus/icons-vue'
+import { onMounted,ref } from 'vue';
+import { listEvaluation } from '@/api/subject/index'
+import jsonData from "@/utils/phetData.json";
+import useClassTaskStore from '@/store/modules/classTask'
+const userStore = useUserStore().user
+
+// 定义要发送的emit事件
+// let emit = defineEmits(['experlist'])
+// const expObj = ref({
+//     edustage: useClassTaskStore().experimentObj.edustage,
+//     edusubject: useClassTaskStore().experimentObj.edusubject,
+// })
+const subjectList = ref([])
+const chooseGrade= ref({})
+const expList = ref([]) // 当前年级的所有课程
+const checkList = ref([])// 当前年级对应学科的课程，
+
+
+// 获取基础的学科
+const getSubject = () => {
+  //没有学科则不进行下面的步骤
+//   if(!userStore.subject) return
+//   listEvaluation({ itemkey: 'subject', pageSize: 500 }).then((res) => {
+//     const arr = userStore.subject.split(',')
+//     subjectList.value = res.rows.filter(item => arr.includes(String(item.id))).map(items => items)
+//     console.log(subjectList,'subjectList');
+//   })
+    //这里获取死数据 学科list
+    const edustageList = ['小学','初中','高中'];
+    const subList = ['数学','物理','化学','生物','科学'];
+    edustageList.forEach((item) => {
+        subList.forEach((subItems) => {
+            subjectList.value.push({
+                edustage: item,
+                edusubject: subItems,
+                itemtitle: subItems
+            })
+        })
+    })
+    console.log(subjectList,'subjectList');
+    // 默认读取一个学科
+    handleUserEduStage(useClassTaskStore().experimentObj.edustage)
+}
+// 展示有 实验科目的学科
+const isExpList = (edusubject) => {
+    let list = [];
+    switch (edusubject){
+        case '数学':
+            list = expList.value.filter(item => item.subject === 'math')
+            break;
+        case '物理':
+            list = expList.value.filter(item => item.subject === 'physics')
+            break;
+        case '化学':
+            checkList.value = expList.value.filter(item => item.subject === 'chemistry')
+            break;
+        case '生物':
+            list = expList.value.filter(item => item.subject === 'biology')
+            break;
+        case '科学':
+            list = expList.value.filter(item => item.subject === 'sciences')
+            break;
+    } 
+    return list.length > 0
+}
+// 选择学段
+const handleUserEduStage = (item) => {
+    // userStore.edustage = item
+    useClassTaskStore().experimentObj.edustage = item
+    //清空操作
+    expList.value = []
+    if(item === '小学'){
+        chooseGrade.value = jsonData.data.primary
+        expList.value = chooseGrade.value
+        const newSubjectList = subjectList.value.filter(item => item.edustage === '小学');
+        for(let i in newSubjectList){
+            const name = newSubjectList[i].itemtitle
+            if(isExpList(name)){
+                useClassTaskStore().experimentObj.edusubject = name;
+                // 更改学科默认与学科下的实验科目
+                handleUserEduSubject(name)
+            }
+        }
+    }else if(item === '初中'){
+        chooseGrade.value = jsonData.data.junior
+        expList.value = chooseGrade.value
+        const newSubjectList = subjectList.value.filter(item => item.edustage === '初中');
+        for(let i in newSubjectList){
+            const name = newSubjectList[i].itemtitle
+            if(isExpList(name)){
+                useClassTaskStore().experimentObj.edusubject = name;
+                // 更改学科默认与学科下的实验科目
+                handleUserEduSubject(name)
+            }
+        }
+    }else if(item === '高中'){
+        chooseGrade.value = jsonData.data.senior
+        expList.value = chooseGrade.value
+        const newSubjectList = subjectList.value.filter(item => item.edustage === '高中');
+        for(let i in newSubjectList){
+            const name = newSubjectList[i].itemtitle
+            if(isExpList(name)){
+                useClassTaskStore().experimentObj.edusubject = name;
+                // 更改学科默认与学科下的实验科目
+                handleUserEduSubject(name)
+            }
+        }
+    }
+}
+// 选择学科
+const handleUserEduSubject = (item) => {
+    // userStore.edusubject = item;
+    useClassTaskStore().experimentObj.edusubject = item;
+    console.log(item,'选择的学科-------')
+    checkList.value = []
+    switch (item){
+        case '数学':
+            checkList.value = expList.value.filter(item => item.subject === 'math')
+            break;
+        case '物理':
+            checkList.value = expList.value.filter(item => item.subject === 'physics')
+            break;
+        case '化学':
+            checkList.value = expList.value.filter(item => item.subject === 'chemistry')
+            break;
+        case '生物':
+            checkList.value = expList.value.filter(item => item.subject === 'biology')
+            break;
+        case '科学':
+            checkList.value = expList.value.filter(item => item.subject === 'sciences')
+            break;
+    }
+    console.log(checkList.value,'checkList')
+    useClassTaskStore().experimentObj.experimentList = checkList.value;
+    // emit('experlist',checkList.value)
+}
+
+
+onMounted(() => {
+    getSubject()
+})
+</script>
+<style scoped>
+.custom-button {
+  width: auto;
+  border: 1px solid rgb(59, 130, 246);
+  outline: none;
+  outline-offset: none;
+  padding: 0 24px;
+}
+
+.custom-button i {
+  margin-left: 8px; /* 调整图标与文字之间的间距 */
+}
+</style>
+
+  

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

@@ -0,0 +1,105 @@
+<template>
+  <div class="experiment-page">
+    <div class="activeExp-header"> 
+      <div class="infomation" v-if="isStadium() !== true" >
+        <!-- <selectClass v-if="!isSubject" @experlist="getExperimentList" /> -->
+        <selectClass v-if="!isSubject" />
+      </div>
+      <div> 
+        <selectExperiment @selectItem="getExperimentListItem" />
+      </div>
+    </div>
+    <div ref="mainDiv" class="activeExp-main" style="overflow: auto">
+      <div v-if="!activeExp.fileurl"><el-empty description="暂无学科实验"></el-empty></div>
+      <iframe v-else :src="activeExp.fileurl" ref="myuunity" width="100%" height="100%" scrolling="no" frameborder="0"></iframe>
+      <!-- <phet/>-->
+    </div>
+  </div>
+</template>
+<script setup>
+import { Search } from '@element-plus/icons-vue'
+//import html2canvas from 'html2canvas';
+import { onMounted, ref,watch, reactive, getCurrentInstance,nextTick } from 'vue'
+import useUserStore from '@/store/modules/user'
+import useClassTaskStore from '@/store/modules/classTask'
+import selectClass from './components/selectClass.vue' //选择学校和班级
+import selectExperiment from './components/experimentList.vue' // 选择的 学科实验
+
+
+// 定义要发送的emit事件
+let emit = defineEmits(['clickExpObj'])
+const { proxy } = getCurrentInstance()
+const userStore = useUserStore().user
+
+const props = defineProps({
+  bookobj: {
+    type: Object,
+    default: () => ({})
+  },
+  expObj: {
+    type: Object,
+    default: () => ({})
+  }
+})
+// 学科的 实验列
+// const experimentList = ref([]);
+const activeExp = ref({});
+
+const isStadium = () => {
+  let roles = userStore.roles
+  return  roles.some(item => item.roleKey === 'stadium')
+}
+
+// const mainLeftBarHeight =  ref(0);
+
+onMounted(() => {
+  // var mainLeftBar = document.getElementById("mainLeftBar");
+  // mainLeftBarHeight.value = document.documentElement.clientHeight-50-mainLeftBar.offsetParent.offsetTop - 10;
+
+  // getDivHeight()
+  // window.addEventListener('resize', getDivHeight)
+})
+// const getDivHeight = () => {
+//   const screenheight = window.innerHeight;
+//   proxy.$refs.mainDiv.style.height = screenheight-140 > 320 ? screenheight-140+'px' : 320+'px';
+//   console.log("height", proxy.$refs.mainDiv.style.height);
+//   // 704 为 头部组件高度 + 底部组件高度
+//   // mainDiv 为需控制高度自适应盒子，通过 ref="mainDiv" 绑定
+// }
+
+// 选择的学科 获取实验课程信息
+// const getExperimentList = (val) => {
+//   console.log(val,'选择的学科，获取实验课程list信息')
+//   // experimentList.value = val;
+// }
+// 选择的实验课
+const getExperimentListItem = (val) => {
+  console.log(val,'选择的实验课程信息')
+  activeExp.value = val;
+  emit('clickExpObj', val)
+}
+// 监听实验课程信息
+watch(() => props.expObj.fileurl, (newVal, oldVal) => {
+  console.log(props.expObj,'科学实验科目')
+  activeExp.value = props.expObj;
+})
+
+</script>
+<style scoped lang="scss">
+.experiment-page {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+ 
+  .activeExp-header {
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .activeExp-main{
+    flex: auto;
+  }
+ 
+}
+
+</style>

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

@@ -58,9 +58,9 @@
           <el-tab-pane label="自主搜题" name="自主搜题" class="prepare-center-zzst">
             <SearchQuestion :bookobj="courseObj" @addQuiz="handleClassWorkQuizAdd" />
           </el-tab-pane>
-          <el-tab-pane label="校本题库" name="校本题库" class="prepare-center-xbtk">
+          <!-- <el-tab-pane label="校本题库" name="校本题库" class="prepare-center-xbtk">
             <SchoolQuestion />
-          </el-tab-pane>
+          </el-tab-pane> -->
           <el-tab-pane label="个人题库" name="个人题库" class="prepare-center-grst">
             <MyQuestion :bookobj="courseObj" @addQuiz="handleClassWorkQuizAdd"/>
           </el-tab-pane>
@@ -77,6 +77,11 @@
           <FileUpload v-model="classWorkForm.fileHomeworkList" :fileSize="800" :fileType="['mp3','mp4','doc','docx','xlsx','xls','pdf','ppt','pptx','jpg','jpeg','gif','png','txt']"/>
         </div>
       </div>
+      <div v-if="(currentRow.worktype == '科学实验' || classWorkForm.worktype == '科学实验')&& currentRow.id>0" class="page-center">
+        <div class="experiment-homework">
+          <ExperimentQuestion :expObj="classWorkForm.fileHomeworkList&&classWorkForm.fileHomeworkList[0]" @clickExpObj="getExpObj" />  
+        </div>
+      </div>
 
       <div v-if="currentRow.id>0 " class="page-right">
         <div class="prepare-top" >
@@ -140,6 +145,7 @@ import { editListItem } from '@/hooks/useClassTask'
 import MyQuestion from '@/views/classTask/newClassTaskAssign/myQuestion/index.vue'
 import SchoolQuestion from '@/views/classTask/newClassTaskAssign/schoolQuestion/index.vue'
 import SearchQuestion from '@/views/classTask/newClassTaskAssign/searchQuestion/index.vue'
+import ExperimentQuestion from "@/views/classTask/newClassTaskAssign/experimentQuestion/index.vue";
 import whiteboard from '@/components/whiteboard/whiteboard.vue'
 import FileUpload from "@/components/FileUpload/index.vue";
 import Right from './Right/index.vue'
@@ -149,10 +155,14 @@ import { useGetHomework } from '@/hooks/useGetHomework'
 import { sessionStore } from '@/utils/store'
 import { useRouter, useRoute } from 'vue-router'
 import useUserStore from '@/store/modules/user'
+import useClassTaskStore from '@/store/modules/classTask'
+
 const userStore = useUserStore().user
 const route = useRoute();
 const router = useRouter()
 const { proxy } = getCurrentInstance()
+const useClassTaskStores = useClassTaskStore();
+
 const props = defineProps({
   currentCourse: Object,
 })
@@ -189,7 +199,8 @@ const boardLoading = ref(false);
 const fileLoading = ref(false); // 常规作业loading
 
 onMounted(() => {
-  currentRow.value = {id:0};
+  console.log("----onMounted-------")
+  currentRow.value.id = 0
   if(propsQueryCourseObj){
     if(JSON.parse(propsQueryCourseObj)){
       courseObj.textbookId = JSON.parse(propsQueryCourseObj).bookObj  // 版本
@@ -216,7 +227,28 @@ onMounted(() => {
     }
   }
   initHomeWork();
+  isInToMyQuestion(); // 如果是上传习题后返回的，跳转到个人题库
 })
+// 是否进入个人题库
+const isInToMyQuestion = () => {
+  console.log('isOpenQuestUploadView',useClassTaskStores.isOpenQuestUploadView);
+  if(useClassTaskStores.isOpenQuestUploadView){
+    useClassTaskStores.isOpenQuestUploadView = false;
+
+    currentRow.value.id = 1; // 作业设计
+    activeAptTab.value = "个人题库";
+    //提交内容清空 重置
+    classWorkForm.id = 0;
+    classWorkForm.uniquekey = ""; // 作业唯一标识 作业名称
+    classWorkForm.worktype = "习题训练"; //作业类型
+    classWorkForm.title = ""; // 作业说明
+    classWorkForm.quizlist = [];  // 作业习题列表内容
+    classWorkForm.chooseWorkLists = [];  // 作业框架梳理list
+    classWorkForm.fileHomeworkList = [];  // 常规作业文件列表
+    classWorkForm.whiteboardObj = "";  // 作业资源 - 课堂展示 白板
+    classWorkForm.question = "";  // 作业资源 - 课堂展示 输入的问题
+  }
+}
 watch(() => props.currentCourse, (newVal, oldVal) => {
   if(newVal){
       courseObj.textbookId = newVal.textbookId  // 版本
@@ -232,6 +264,16 @@ watch(() => props.currentCourse, (newVal, oldVal) => {
     }
     console.log(newVal,'newval');
 },{deep:true})
+
+// ------------科学实验
+const getExpObj = (obj)=>{
+  // obj:{
+  //   fileurl: "https://phet.colorado.edu/sims/html/number-compare/latest/number-compare_zh_CN.html"
+  //   label: "数量比较"
+  //   subject: "math"
+  // }
+  classWorkForm.fileHomeworkList = [obj];
+}
 //---------作业设计---
 const handleItemClick = (itemName) => {
   console.log('itemName', itemName);
@@ -240,7 +282,7 @@ const handleItemClick = (itemName) => {
     return;
   }
 
-  currentRow.value = {id:1}; // 作业设计
+  currentRow.value.id = 1; // 作业设计
   /**
    * 智能推荐？AI设计作业？
    * 习题训练： 自主搜题 校本题库 个人题库
@@ -283,7 +325,7 @@ const initHomeWork = async()=> {
 
 const handleNewAllClass = () => {
   taskTable.value.setCurrentRow({});// 清除表格选中项背景色
-  currentRow.value = {id:0}; // 作业设计
+  currentRow.value.id = 0; // 作业设计
   //--------
   classWorkForm.id = 0;
   classWorkForm.uniquekey = ""; // 作业唯一标识 作业名称
@@ -310,7 +352,7 @@ const handleDelete =() => {
       return delClasswork(ids.join(','));
     }).then(() => {
       taskTable.value.setCurrentRow({});// 清除表格选中项背景色
-      currentRow.value = {id:0}; // 作业设计
+      currentRow.value.id = 0; // 作业设计
       taskList.value = [];
       // initHomeWork();
       setTimeout(() => {
@@ -404,7 +446,7 @@ const handleCurrentChange = (val) => {
 
   console.log(val,'???????????')
   if(val && val.id >0  ) {
-    currentRow.value = val;
+    currentRow.value.id = 1;
     classWorkForm.worktype = val.worktype; //作业类型
     editListItem(val, courseObj).then((obj) => {
       if(obj){
@@ -556,6 +598,32 @@ const handleClassWorkFormQuizRemove = (index) =>{
           fileLoading.value = false
         }
       }
+      else if(classWorkForm.worktype === "科学实验"){
+        if (classWorkForm.fileHomeworkList.length == 0) return ElMessage({ type: 'warning', message: '请选择科学实验的课程!'});
+        cform.workcodes = JSON.stringify(classWorkForm.fileHomeworkList);
+        cform.entpcourseworklist = JSON.stringify([{'id':-3, 'score': '10'}]);
+        try {
+          console.log(cform,'科学实验')
+          addClassworkReturnId(cform).then((res) => {
+            ElMessage({ type: 'success', message: '作业设计成功!'});
+            // 重置提交表单
+            classWorkForm.worktype = "科学实验";
+            classWorkForm.uniquekey = ''; // props.propsformobj.uniquekey, // 作业唯一标识 作业名称
+            classWorkForm.title = "";
+            classWorkForm.quizlist = [], // 作业习题列表内容
+
+            // 情况选择的资源缓存
+            classWorkForm.chooseWorkLists = []; // 框架梳理list
+            classWorkForm.whiteboardObj = ''; // ? // 清空白板
+            classWorkForm.fileHomeworkList = []; // 常规作业list
+            classWorkForm.id = res
+            emits('getData',classWorkForm)
+            // TODO 科学实验 待完善
+          })
+        } finally{
+          // 
+        }
+      }
       else {
         // 正常新任务
         var ll = [];
@@ -602,9 +670,9 @@ const handleClassWorkFormQuizRemove = (index) =>{
       console.log('该清空左侧列表数据了');
       // 清空左侧 选中的布置列表 并刷新列表
       if(isShow.value){
-        currentRow.value = {id:1};
+        currentRow.value.id = 1;
       }else{
-        currentRow.value = {id:0};
+        currentRow.value.id = 0;
       }
       initHomeWork();
 
@@ -641,7 +709,10 @@ const editWork = async (cform) =>{
     }else{
       if (classWorkForm.fileHomeworkList.length == 0) return ElMessage({ type: 'warning', message: '请上传常规作业附件!'});
     }
-  }else {
+  }else if( classWorkForm.worktype == '科学实验') {
+    if (classWorkForm.fileHomeworkList.length == 0) return ElMessage({ type: 'warning', message: '请选择科学实验科目!'});
+  }
+  else {
     if (classWorkForm.chooseWorkLists.length == 0) {
       // 框架梳理
       ElMessage.error('请先添加作业资源!');
@@ -733,13 +804,21 @@ const editWork = async (cform) =>{
     // 1.更新作业任务下的课堂展示内容 (这里未做校验, 直接将当前文件对象更新过去)
     cform.workcodes = JSON.stringify(classWorkForm.fileHomeworkList);
   }
+  else if (classWorkForm.worktype=='科学实验') { //TODO 注意，fileHomeworkList字段与常规作业共用
+    // 1.更新作业任务下的课堂展示内容 (这里未做校验, 直接将当前文件对象更新过去)
+    cform.workcodes = JSON.stringify(classWorkForm.fileHomeworkList);
+  }
 
   // 3.更新作业任务本身
   let res = await updateClasswork(cform);
   if (res.code == 200) {
     ElMessage.success('更新成功');
     // 清空左侧 选中的布置列表 并刷新列表
-    currentRow.value = {id:0};
+    if(isShow.value){
+      currentRow.value.id = 1;
+    }else{
+      currentRow.value.id = 0;
+    }
     initHomeWork();
     // // 返回上一页
     // router.back()
@@ -839,6 +918,11 @@ const editWork = async (cform) =>{
         padding: 20px;
         box-sizing: border-box;
       }
+
+      .experiment-homework{
+        padding: 15px;
+        height: 100%;
+      }
     }
     .page-right {
       overflow: hidden;

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

@@ -6,9 +6,9 @@
           <el-tab-pane label="自主搜题" name="自主搜题" class="prepare-center-zzst">
             <SearchQuestion :bookobj="courseObj" :isHtml2canvas="true"  @addQuizImgBs64="handleaddQuizImgBs64" />
           </el-tab-pane>
-          <el-tab-pane label="校本题库" name="校本题库" class="prepare-center-xbtk">
+          <!-- <el-tab-pane label="校本题库" name="校本题库" class="prepare-center-xbtk">
             <SchoolQuestion />
-          </el-tab-pane>
+          </el-tab-pane> -->
           <el-tab-pane label="个人题库" name="个人题库" class="prepare-center-grst">
             <MyQuestion :bookobj="courseObj" :isHtml2canvas="true" @addQuizImgBs64="handleaddQuizImgBs64"/>
           </el-tab-pane>

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

@@ -74,7 +74,7 @@
 <script setup>
 import "vue-cropper/dist/index.css";
 import { VueCropper } from "vue-cropper";
-import { onMounted, ref,watch, reactive, getCurrentInstance,nextTick } from 'vue'
+import { onMounted, ref,watch, reactive, getCurrentInstance,nextTick, onUnmounted } from 'vue'
 import { ElMessage } from 'element-plus'
 import { cloneDeep } from 'lodash'
 
@@ -88,6 +88,8 @@ import { useRouter, useRoute } from 'vue-router'
 
 import { ocrImg2ExamByManualUpl, ocrImg2ItemByManualUpl } from "@/views/classTask/newClassTaskAssign/questionUpload/ocrImg2ExamQues";
 import QuesItem from "@/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue";
+import useClassTaskStore from '@/store/modules/classTask'
+
 
 // const Remote = require('@electron/remote')
 // const fs = require('fs');
@@ -96,7 +98,9 @@ import useUserStore from '@/store/modules/user'
 const userStore = useUserStore().user
 const route = useRoute();
 const router = useRouter()
-const { proxy } = getCurrentInstance()
+const { proxy } = getCurrentInstance();
+const useClassTaskStores = useClassTaskStore();  
+
 const props = defineProps({
 })
 
@@ -151,6 +155,7 @@ const cropOption =  reactive({
 
 
 onMounted(() => {
+  useClassTaskStores.isOpenQuestUploadView = true; // 打开过习题上传界面
   console.log('propsQueryCourseObj', JSON.parse(propsQueryCourseObj));
   if(propsQueryCourseObj&&JSON.parse(propsQueryCourseObj)){
     courseObj.textbookId = JSON.parse(propsQueryCourseObj).bookObj  // 版本
@@ -161,7 +166,13 @@ onMounted(() => {
   }
   initHomeWork();
 })
-
+onUnmounted(()=>{
+  // 延迟1s 关闭习题上传界面，作业管理界面需要根据 isOpenQuestUploadView 来进行判断
+  setTimeout(()=>{
+    useClassTaskStores.isOpenQuestUploadView = false; // 关闭习题上传界面
+    console.log('onUnmounted 习题上传');
+  }, 1000)
+})
 
 /**
  * 获取 entpcourseid 获取作业列表

src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/ocrImg2ExamQues.js

@@ -1,6 +1,7 @@
 import { ElMessageBox, ElMessage } from "element-plus";
 import qs from "qs";
 import axios from 'axios'
+import request from '@/utils/request'
 import { pyOCRAPI } from "@/api/education/entpcoursework";
 
 
@@ -16,6 +17,13 @@ const baidubceConfig = {
   'client_secret': 'oWb0M0YWMmZPMQIhIUkJX99ddr7h61qf',
 };
 
+export function getOcrContent(data) {
+  return request({
+    url: '/ocr/exam',
+    method: 'post',
+    data: data
+  })
+}
 
 
 /**
@@ -226,30 +234,36 @@ const ocrImg2Json = async (urlBase64) => {
     ElMessage.error("未检测到截图图片, 请截取图片后再识别");
     return null;
   }
-  const resToken = await bdyAPI_getToken();
-  if (resToken.status !== 200) {
-    ElMessage.error("百度智能云用户标识有误");
-    return null;
-  }
-
-  const token = resToken.data?.access_token;
   let base64Code = urlBase64.split(",")[1];
-  const query = {
+  const resOcr = await getOcrContent({ base64Code: base64Code });
-    image: base64Code,                                      //图片地址(base64)
+  if (resOcr.code !== 200) {
-    line_probability: false,                            //是否返回每行识别结果的置信度。默认为false
+    ElMessage.error("图片识别错误");
-    disp_line_poly: false,                              //是否返回每行的四角点坐标。默认为false
-    words_type: 'handprint_mix',                        //文字类型。 默认：印刷文字识别 = handwring_only：手写文字识别 = handprint_mix： 手写印刷混排识别
-    layout_analysis: false,                             //是否分析文档版面：包括layout（图、表、标题、段落、目录）；attribute（栏、页眉、页脚、页码、脚注）的分析输出
-    recg_long_division: false,                          //是否检测并识别手写竖式
-    recg_formula: true,                                 //控制是否检测并识别公式，默认为false
-  }
-
-
-  const resOcr = await bdyAPI_getOcrContent(token, base64Code, query);
-  if (resOcr.status !== 200) {
-    ElMessage.error("百度智能云图片识别错误");
     return null;
   }
+  // const resToken = await bdyAPI_getToken();
+  // if (resToken.status !== 200) {
+  //   ElMessage.error("百度智能云用户标识有误");
+  //   return null;
+  // }
+
+  // const token = resToken.data?.access_token;
+  // let base64Code = urlBase64.split(",")[1];
+  // const query = {
+  //   image: base64Code,                                      //图片地址(base64)
+  //   line_probability: false,                            //是否返回每行识别结果的置信度。默认为false
+  //   disp_line_poly: false,                              //是否返回每行的四角点坐标。默认为false
+  //   words_type: 'handprint_mix',                        //文字类型。 默认：印刷文字识别 = handwring_only：手写文字识别 = handprint_mix： 手写印刷混排识别
+  //   layout_analysis: false,                             //是否分析文档版面：包括layout（图、表、标题、段落、目录）；attribute（栏、页眉、页脚、页码、脚注）的分析输出
+  //   recg_long_division: false,                          //是否检测并识别手写竖式
+  //   recg_formula: true,                                 //控制是否检测并识别公式，默认为false
+  // }
+
+
+  // const resOcr = await bdyAPI_getOcrContent(token, base64Code, query);
+  // if (resOcr.status !== 200) {
+  //   ElMessage.error("百度智能云图片识别错误");
+  //   return null;
+  // }
 
   return resOcr;
 }

src/renderer/src/views/classTask/teachClassTask.vue

@@ -4,7 +4,7 @@
       <div style="font-size: 18px; display: flex; flex-wrap: nowrap">
         <div style="flex: 1">
           {{ classWorkAnalysis.title }}完成情况
-          <el-tag :type="classWorkAnalysis.workclass" size="large" style="height: 25px">{{
+          <el-tag :type="classWorkAnalysis.workclass||'info'" size="large" style="height: 25px">{{
             classWorkAnalysis.worktype
           }}</el-tag>
         </div>
@@ -162,9 +162,12 @@ import ItemDialogScore from '@/views/classTask/container/classTask/item-dialog-s
 import quizStats from '@/views/classTask/container/quizStats.vue'
 import ClassOverview from '@/views/classTask/container/classOverview.vue'
 import {sessionStore} from '@/utils/store'
-import Chat from '@/utils/chat' // im 登录初始化
+// import Chat from '@/utils/chat' // im 登录初始化
-
+import { Homework } from '@/AixPPTist/src/api/index'
-
+import MsgEnum from '@/plugins/imChat/msgEnum'  // im 消息枚举
+import ChatWs from '@/plugins/socket' // 聊天socket
+import { set } from 'lodash'
+if (!ChatWs.ws) ChatWs.init()
 const { proxy } = getCurrentInstance()
 const emit = defineEmits(['cle-click'])
 const props = defineProps({
@@ -713,27 +716,48 @@ const closeDialog = () => {
 
 // im监听消息回调
 const msgHandle = (msg) => {
-  const { type, data } = msg
+  console.log('socket消息回调', msg)
-  switch(type) {
+  if (typeof msg === 'object'){
-    case 'TIMAddRecvNewMsgCallback': // 收到新消息 data=[]
+    const { head, content, ...other } = msg
-      {
+    switch(head) {
-        (data||[]).forEach(o => {
+      case MsgEnum.HEADS.MSG_closed: // 下课:
-          const msgArr = o?.message_elem_array||[]
+        Homework.win = null
-          msgArr.forEach(info => {
+        window.close() // 关闭窗口
-            const msgType = info?.elem_type // 消息类型 TIMElemType
-            const msgData = !!info.text_elem_content ? JSON.parse(info.text_elem_content)||'' : ''
-            // 处理学生端反馈得消息
-            //console.log('msgData->', msgData);
-            if (msgData.msgKey == "finishHomework"){
-              // 刷新
-              const data = JSON.parse(localStorage.getItem('teachClassWorkItem'));
-              //console.log('data->', data);
-              openDialog(data, false);
-            }
-          })
-        })
-      }
         break 
+      case MsgEnum.HEADS.MSG_finishHomework: // 跟新作业:
+        console.log('更新作业', head, content)
+        const data = JSON.parse(localStorage.getItem('teachClassWorkItem'));
+        openDialog(data, false);
+        break
+      case MsgEnum.HEADS.MSG_slideFlapping: // 切换页面
+        console.log('切换页面-关闭窗口')
+        Homework.win = null
+        window.close() // 关闭窗口
+        break
+      case MsgEnum.HEADS.MSG_pushSreen_experiment: // 实验:
+        Homework.win = null
+        window.close() // 关闭窗口
+        break
+      // case 'TIMAddRecvNewMsgCallback': // 收到新消息 data=[]
+      //   {
+      //     (data||[]).forEach(o => {
+      //       const msgArr = o?.message_elem_array||[]
+      //       msgArr.forEach(info => {
+      //         const msgType = info?.elem_type // 消息类型 TIMElemType
+      //         const msgData = !!info.text_elem_content ? JSON.parse(info.text_elem_content)||'' : ''
+      //         // 处理学生端反馈得消息
+      //         //console.log('msgData->', msgData);
+      //         if (msgData.msgKey == "finishHomework"){
+      //           // 刷新
+      //           const data = JSON.parse(localStorage.getItem('teachClassWorkItem'));
+      //           //console.log('data->', data);
+      //           openDialog(data, false);
+      //         }
+      //       })
+      //     })
+      //   }
+      //   break
+    }
   }
 }
 
@@ -750,12 +774,23 @@ onMounted(() => {
   isReloadTimer();
 
   // im监听消息
-  if (!Chat.imChat) {
+  if (ChatWs.ws) {
-    Chat.init(true, true, msgHandle);
+      console.log('socket监听消息')
-  } else {
+      ChatWs.watch((msg, e) => {
-    Chat.listenMsg(msgHandle);
+        try {
+          msgHandle(JSON.parse(msg)?.msg)
+        } catch (error) {
+          console.error('socket 解析异常 ', error, e)
+          msgHandle(msg)
         }
       })
+    }
+  // if (!Chat.imChat) {
+  //   Chat.init(true, true, msgHandle);
+  // } else {
+  //   Chat.listenMsg(msgHandle);
+  // }
+})
 const isReloadTimer = () =>{
   clearInterval(reloadTimer.value) // 关闭定时器 
   // 开启定时查询，作业id是否刷新了，刷新了就重新获取

src/renderer/src/views/desktop/container/work-trend.vue

@@ -59,10 +59,10 @@ const getHomework = async () => {
     homeworkList.value = rows || [];
     homeworkList.value.forEach((item) => {
       // 处理任务类型的UI
-      if (item.worktype == '学习目标定位') {
+      if (item.worktype == '课堂展示') {
         item.workclass = 'success'
         item.workcodesList = JSON.parse(item.workcodes)
-      } else if (item.worktype == '教材研读') {
+      } else if (item.worktype == '科学实验') {
         item.workclass = 'primary'
       } else if (item.worktype == '框架梳理') {
         item.workclass = 'warning'

src/renderer/src/views/login/defult-login.vue

@@ -0,0 +1,427 @@
+<template>
+  <div class="login-container">
+    <div class="box-item desc">
+      <div class="welcome">
+        <p>欢迎登录 {{ homeTitle }}</p>
+      </div>
+      <img class="welcome-img" :src="leftBg2" />
+    </div>
+    <div class="box-item login" v-if="isRegister">
+      <WindowTools :is-has-max="false" />
+      <div class="login-title">账号登录</div>
+      <el-form ref="formRef" class="login-form" :model="loginForm" :rules="rules" size="large">
+        <el-form-item prop="username">
+          <el-input v-model.trim="loginForm.username" placeholder="请输入用户名" />
+        </el-form-item>
+        <el-form-item prop="password" style="margin-bottom: 15px">
+          <el-input v-model="loginForm.password" autocomplete="on" type="password" placeholder="请输入密码" />
+        </el-form-item>
+        <div class="flex mb-5">
+          <el-checkbox v-model="loginForm.rememberMe">记住密码</el-checkbox>
+          <!-- <el-checkbox >阅读并同意《xxx》</el-checkbox> -->
+        </div>
+
+        <el-form-item>
+          <el-button :loading="btnLoading" class="btn" type="primary" @click="submitForm(formRef)">登录</el-button>
+        </el-form-item>
+        <div class="flex mb-4" style="display: flex;justify-content: center;color: #ccc;cursor: pointer;">
+          <a class="hover:text-sky-500" style="margin-right: 10px;" @click="gotoreRegister">注册账号</a>
+        </div>
+      </el-form>
+    </div>
+
+    <div class="box-item login" v-else>
+      <WindowTools :is-has-max="false" />
+      <div class="login-title">账号注册</div>
+      <el-form  ref="ruleFormRef" class="login-form"   :model="ruleForm" label-width="auto"  :rules="rules" size="large">
+        <el-form-item label="手机号" prop="username">
+          <el-input  v-model="ruleForm.username" placeholder="请输入手机号" />
+        </el-form-item>
+        <el-form-item label="验证码"  prop="smsCode" style="display: flex">
+          <el-input style="width:185px"  v-model="ruleForm.smsCode" placeholder="请输入验证码" /><el-button style="margin-left:10px;width:100px" :disabled="codeName=='发送验证码'?false:true"  type="primary" @click="sendyzm">{{ codeName }}</el-button>
+        </el-form-item>
+        <el-form-item label="密码" prop="password" >
+          <el-input  autocomplete="on" type="password" v-model="ruleForm.password" placeholder="请输入密码" />
+        </el-form-item>
+
+        <el-form-item>
+          <el-button  class="btn" type="primary"  @click="RegisterForm(ruleFormRef)">立即注册</el-button>
+        </el-form-item>
+        <div class="flex mb-4" style="display: flex;justify-content: center;color: #ccc;cursor: pointer;">
+          <a class="hover:text-sky-500" style="margin-right: 10px;" @click="gotoLogin"> 《 返回登录 </a>
+        </div>
+      </el-form>
+    </div>
+  </div>
+  <el-dialog v-model="showDownLoading" width="500" :show-close="false" :close-on-click-modal="false"
+    :close-on-press-escape="false" align-center>
+    <el-progress :text-inside="true" :stroke-width="22" :percentage="downloadProp" :show-text="false"
+      status="success" />
+  </el-dialog>
+  <el-dialog
+        v-model="isImg"
+        title="人机验证"
+        width="500"
+        style=" -webkit-app-region: no-drag;"
+      >
+        <span>根据图片回答相关问题1</span>
+        <div style="display: flex;align-items: center;;margin-top:30px">
+          <img :src="isPeopleImg" style="width:200px;height:60px;cursor: pointer;" alt="" srcset="" @click="refreshImg">
+          <el-input v-model="ruleForm.imgCode"  style="width: 250px;height:40px;margin-left:20px" placeholder="请根据图片填入答案" />
+        </div>
+        <div style="display: flex;justify-content: center;margin-top:30px">
+          <el-button  type="primary" @click="sbmitImg">确定</el-button>
+        </div>
+      </el-dialog>
+  <!--选择学科-->
+  <SelectSubject v-model="isSubject" :login-data="loginForm" />
+  <!--注册弹框-->
+  <Register ref="RegModel"></Register>
+
+
+</template>
+<script setup>
+import { onMounted, reactive, ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { encrypt, decrypt } from '@/utils/jsencrypt'
+import useUserStore from '@/store/modules/user'
+import leftBg2 from '@/assets/images/login/left-bg2.png'
+import WindowTools from '@/components/window-tools/index.vue'
+import SelectSubject from '@/components/select-subject/index.vue'
+import Register from './components/Register.vue'
+import { sessionStore } from '@/utils/store'
+import {sendcode,instructorregister,getCodeImg} from '@/api/login'
+
+const { session } = require('@electron/remote')
+const downloadProp = ref(0)
+const showDownLoading = ref(false)
+const { ipcRenderer } = window.electron || {}
+const formRef = ref()
+const userStore = useUserStore()
+const btnLoading = ref(false)
+const isSubject = ref(false)
+const RegModel = ref(false)
+const isRegister = ref(true)
+const ruleFormRef = ref(null)
+const codeName=ref('发送验证码')
+const timer=ref(null)
+const isImg=ref(false)
+const isPeopleImg=ref(null)
+const type=ref(1) // 1注册 2找回密码
+const resImg = reactive({ imgData: {} });
+
+//表单
+const loginForm = reactive({
+  username: '',
+  password: '',
+  rememberMe: false
+})
+// 注册表单
+const ruleForm = reactive({
+
+})
+//表单规则
+const rules = reactive({
+  username: [{ required: true, trigger: 'blur', message: '请输入您的账号' }],
+  password: [{ required: true, trigger: 'blur', message: '请输入您的密码' }],
+  smsCode: [{ required: true, trigger: 'blur', message: '请输入您的验证码' }],
+})
+
+let curWinUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
+let homeTitle = ref(import.meta.env.VITE_APP_TITLE)
+ipcRenderer.on('update-app-progress', (e, prop) => {
+  downloadProp.value = prop
+  showDownLoading.value = prop !== 100
+})
+const gotoreRegister=()=>{
+  codeName.value='发送验证码'
+  if(timer.value){
+    clearInterval(timer.value);
+  }
+  isRegister.value=false
+}
+// 刷新
+const refreshImg=()=>{
+  getCodeImg().then(res=>{
+    isPeopleImg.value='data:image/jpg;base64,'+res.img
+    resImg.imgData=res
+  })
+}
+// 提交人机验证
+const sbmitImg=()=>{
+   if(ruleForm.imgCode){
+    // {mobile:ruleForm.phoneNumber,code:ruleForm.imgCode,uuid:resImg.imgData.uuid}
+    const { username:username,imgCode:code } = ruleForm
+    const params = {
+      username, code,
+      uuid: resImg.imgData.uuid,
+      source:4
+    }
+    sendcode(params).then(res=>{
+      if(res.code==200){
+        ElMessage.success('短信发送成功')
+        ruleForm.Code=res.data
+        isImg.value=false
+        codeName.value=60
+            timer.value=setInterval(()=>{
+              codeName.value--
+              if(codeName.value==0){
+                codeName.value='发送验证码'
+                clearInterval(timer.value);
+              }
+            },1000)
+      }
+
+    })
+   }else{
+    ElMessage.error('请根据图片输入验证码')
+   }
+  //
+}
+// 发送验证码
+const sendyzm=()=>{
+  if(ruleForm.username){
+    const pattern = /^1[3-9]\d{9}$/;
+    if( pattern.test(ruleForm.username) ){
+
+      getCodeImg().then(res=>{
+          if(res.code==200){
+            ruleForm.imgCode=null
+            isPeopleImg.value='data:image/jpg;base64,'+res.img
+            isImg.value=true
+            resImg.imgData=res
+            // codeName.value=60
+            // timer.value=setInterval(()=>{
+            //   codeName.value--
+            //   if(codeName.value==0){
+            //     codeName.value='发送验证码'
+            //     clearInterval(timer.value);
+            //   }
+            // },1000)
+          }else{
+            ElMessage.error(res.msg)
+          }
+      })
+    }else{
+      ElMessage.error('请输入正确的手机号码')
+    }
+    // captchaImg({mobile:ruleForm.phoneNumber}).then(res=>{
+    //   console.log('res->', res)
+    // })
+  }else{
+    ElMessage.error('请输入手机号码')
+  }
+}
+// 打开弹窗
+const RegisterModel = type => {
+  RegModel.value.OpenModel(type)
+}
+//登录
+const submitForm = async (formEl) => {
+  if (!formEl) return
+  await formEl.validate(async (valid) => {
+    if (valid) {
+      btnLoading.value = true
+
+      // 勾选了需要记住密码设置在 cookie 中设置记住用户名和密码
+      if (loginForm.rememberMe) {
+        await setCookie('username', loginForm.username)
+        await setCookie('password', encrypt(loginForm.password))
+        await setCookie('rememberMe', loginForm.rememberMe.toString())
+      } else {
+        // 否则移除
+        await session.defaultSession.clearStorageData({
+          origin: curWinUrl,
+          storages: ['cookies']
+        })
+      }
+
+      try {
+        await userStore.login(loginForm)
+        await userStore.getInfo()
+        if (userStore.user.edustage || userStore.user.edusubject || isStadium(userStore.user)) {
+          ElMessage.success('登录成功')
+          ipcRenderer && ipcRenderer.send('openMainWindow')
+        } else {
+          isSubject.value = true
+        }
+      } finally {
+        btnLoading.value = false
+      }
+    }
+  })
+}
+
+const isStadium = (user) => {
+  let roles = user.roles
+  return  roles.some(item => item.roleKey === 'stadium')
+}
+
+const getCookie = async () => {
+  const username = (await getCookieDetail('username'))[0]
+  const password = (await getCookieDetail('password'))[0]
+  const rememberMe = (await getCookieDetail('rememberMe'))[0]
+  loginForm.username = username ? username.value : loginForm.username
+  loginForm.password = password ? decrypt(password.value) : loginForm.password
+  loginForm.rememberMe = rememberMe ? Boolean(rememberMe.value) : false
+}
+
+// 获取cookie
+const getCookieDetail = (name) => {
+  return session.defaultSession.cookies.get({ url: curWinUrl, name })
+}
+
+// 设置cookie
+const setCookie = (name, value) => {
+  // 30天过期
+  let Days = 30
+  let times = Math.round(Date.now() / 1000) + Days * 24 * 60 * 60
+  const cookie = {
+    url: curWinUrl,
+    name,
+    value,
+    expirationDate: times
+  }
+  return session.defaultSession.cookies.set(cookie)
+}
+const gotoLogin = () => {
+  codeName.value='发送验证码'
+  if (timer.value){
+    clearInterval(timer.value);
+  }
+  if (ruleFormRef.value) ruleFormRef.value.resetFields()
+  isRegister.value = true
+}
+// 注册
+const RegisterForm = async (formEl) => {
+  if (!formEl) return
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      instructorregister(ruleForm).then(res=>{
+          if(res.code==200){
+            ElMessage.success('您已注册成功')
+            if (ruleFormRef.value) ruleFormRef.value.resetFields()
+             gotoLogin()
+          }else{
+            ElMessage.error(res.msg)
+          }
+      })
+      console.log('submit!')
+    } else {
+      console.log('error submit!', fields)
+    }
+  })
+}
+onMounted(() => {
+  localStorage.clear()
+  sessionStore.set('subject', {
+    bookList: null,
+    curBook: null,
+    curNode: null,
+    defaultExpandedKeys: [],
+    subjectTree: []
+  })
+  getCookie()
+})
+</script>
+<style lang="scss" scoped>
+.login-container {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  -webkit-app-region: drag;
+
+  .box-item {
+    width: 444px;
+    height: 520px;
+
+    &.desc {
+      background: #ffffff;
+      border-radius: 12px 0px 0px 12px;
+      box-shadow: 0px 16px 73px 8px rgba(203, 203, 203, 0.2);
+      padding: 23px 25px;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: flex-start;
+      background-color: #003b94;
+    }
+
+    &.login {
+      background: #ffffff;
+      border-radius: 0px 12px 12px 0px;
+      padding: 34px 42px;
+      position: relative;
+    }
+
+    .welcome {
+      padding-top: 35px;
+
+      p {
+        color: #ffffff;
+        line-height: 25px;
+        letter-spacing: 0.26px;
+        text-align: center;
+        font-weight: 700;
+        font-size: 26px;
+      }
+    }
+
+    .welcome-img {
+      margin-top: 20px;
+      width: 350px;
+      height: 350px;
+    }
+
+    .login-title {
+      font-size: 20px;
+      text-align: center;
+      color: #1e1e1e;
+      margin-bottom: 35px;
+      margin-top: 50px;
+    }
+
+    .login-form {
+      -webkit-app-region: no-drag;
+
+      .captcha-input {
+        width: 60%;
+      }
+
+      .captcha-img {
+        cursor: pointer;
+      }
+    }
+
+    .btn {
+      width: 350px;
+      height: 50px;
+      border-radius: 4px;
+      font-size: 16px;
+      font-weight: 700;
+      text-align: center;
+      color: #ffffff;
+      line-height: 50px;
+      cursor: pointer;
+    }
+  }
+}
+
+.header-tool {
+  position: absolute;
+  right: 0;
+  top: 0;
+  -webkit-app-region: no-drag;
+
+  span {
+    padding: 5px 10px;
+    cursor: pointer;
+  }
+}
+
+.el-form-item {
+  margin-bottom: 40px;
+}
+</style>

src/renderer/src/views/login/index.vue

@@ -1,411 +1,13 @@
 <template>
-  <div class="login-container">
+  <ycLogin v-if="buildMode === 'yc'||buildMode === 'yc2'">
-    <div class="box-item desc">
+  </ycLogin>
-      <div class="welcome">
+  <defultLogin v-else>
-        <p>欢迎登录 {{ homeTitle }}</p>
+  </defultLogin>
-      </div>
-      <img class="welcome-img" :src="leftBg2" />
-    </div>
-    <div class="box-item login" v-if="isRegister">
-      <WindowTools :is-has-max="false" />
-      <div class="login-title">账号登录</div>
-      <el-form ref="formRef" class="login-form" :model="loginForm" :rules="rules" size="large">
-        <el-form-item prop="username">
-          <el-input v-model.trim="loginForm.username" placeholder="请输入用户名" />
-        </el-form-item>
-        <el-form-item prop="password" style="margin-bottom: 15px">
-          <el-input v-model="loginForm.password" autocomplete="on" type="password" placeholder="请输入密码" />
-        </el-form-item>
-        <div class="flex mb-5">
-          <el-checkbox v-model="loginForm.rememberMe">记住密码</el-checkbox>
-          <!-- <el-checkbox >阅读并同意《xxx》</el-checkbox> -->
-        </div>
-
-        <el-form-item>
-          <el-button :loading="btnLoading" class="btn" type="primary" @click="submitForm(formRef)">登录</el-button>
-        </el-form-item>
-        <div class="flex mb-4" style="display: flex;justify-content: center;color: #ccc;cursor: pointer;">
-          <a class="hover:text-sky-500" style="margin-right: 10px;" @click="gotoreRegister">注册账号</a>
-        </div>
-      </el-form>
-    </div>
-
-    <div class="box-item login" v-else>
-      <WindowTools :is-has-max="false" />
-      <div class="login-title">账号注册</div>
-      <el-form  ref="ruleFormRef" class="login-form"   :model="ruleForm" label-width="auto"  :rules="rules" size="large">
-        <el-form-item label="手机号" prop="username">
-          <el-input  v-model="ruleForm.username" placeholder="请输入手机号" />
-        </el-form-item>
-        <el-form-item label="验证码"  prop="smsCode" style="display: flex">
-          <el-input style="width:185px"  v-model="ruleForm.smsCode" placeholder="请输入验证码" /><el-button style="margin-left:10px;width:100px"  type="primary" @click="sendyzm">发送验证码</el-button>
-        </el-form-item>
-        <el-form-item label="密码" prop="password" >
-          <el-input  autocomplete="on" type="password" v-model="ruleForm.password" placeholder="请输入密码" />
-        </el-form-item>
-      
-        <el-form-item>
-          <el-button  class="btn" type="primary"  @click="RegisterForm(ruleFormRef)">立即注册</el-button>
-        </el-form-item>
-        <div class="flex mb-4" style="display: flex;justify-content: center;color: #ccc;cursor: pointer;">
-          <a class="hover:text-sky-500" style="margin-right: 10px;" @click="gotoLogin"> 《 返回登录 </a>
-        </div>
-      </el-form>
-    </div>
-  </div>
-  <el-dialog v-model="showDownLoading" width="500" :show-close="false" :close-on-click-modal="false"
-    :close-on-press-escape="false" align-center>
-    <el-progress :text-inside="true" :stroke-width="22" :percentage="downloadProp" :show-text="false"
-      status="success" />
-  </el-dialog>
-  <el-dialog
-        v-model="isImg"
-        title="人机验证"
-        width="500"
-        style=" -webkit-app-region: no-drag;"
-      >
-        <span>根据图片回答相关问题</span>
-        <div style="display: flex;align-items: center;;margin-top:30px">
-          <img :src="isPeopleImg" style="width:200px;height:60px;cursor: pointer;" alt="" srcset="" @click="refreshImg">
-          <el-input v-model="ruleForm.imgCode"  style="width: 250px;height:40px;margin-left:20px" placeholder="请根据图片填入答案" />
-        </div>
-        <div style="display: flex;justify-content: center;margin-top:30px">
-          <el-button  type="primary" @click="sbmitImg">确定</el-button>
-        </div>
-      </el-dialog>
-  <!--选择学科-->
-  <SelectSubject v-model="isSubject" :login-data="loginForm" />
-  <!--注册弹框-->
-  <Register ref="RegModel"></Register>
-  
-  
 </template>
 <script setup>
-import { onMounted, reactive, ref } from 'vue'
+import ycLogin from './yc-login.vue'
-import { ElMessage } from 'element-plus'
+import defultLogin from './defult-login.vue'
-import { encrypt, decrypt } from '@/utils/jsencrypt'
+const buildMode = import.meta.env.MODE
-import useUserStore from '@/store/modules/user'
-import leftBg2 from '@/assets/images/login/left-bg2.png'
-import WindowTools from '@/components/window-tools/index.vue'
-import SelectSubject from '@/components/select-subject/index.vue'
-import Register from './components/Register.vue'
-import { sessionStore } from '@/utils/store'
-import {sendcode,instructorregister,getCodeImg} from '@/api/login'
-
-const { session } = require('@electron/remote')
-const downloadProp = ref(0)
-const showDownLoading = ref(false)
-const { ipcRenderer } = window.electron || {}
-const formRef = ref()
-const userStore = useUserStore()
-const btnLoading = ref(false)
-const isSubject = ref(false)
-const RegModel = ref(false)
-const isRegister = ref(true)
-const ruleFormRef = ref(null)
-const codeName=ref('发送验证码')
-const timer=ref(null)
-const isImg=ref(false)
-const isPeopleImg=ref(null)
-const type=ref(1) // 1注册 2找回密码
-const resImg = reactive({ imgData: {} });
-
-//表单
-const loginForm = reactive({
-  username: '',
-  password: '',
-  rememberMe: false
-})
-// 注册表单
-const ruleForm = reactive({
-  
-})
-//表单规则
-const rules = reactive({
-  username: [{ required: true, trigger: 'blur', message: '请输入您的账号' }],
-  password: [{ required: true, trigger: 'blur', message: '请输入您的密码' }],
-  smsCode: [{ required: true, trigger: 'blur', message: '请输入您的验证码' }],
-})
-
-let curWinUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
-let homeTitle = ref(import.meta.env.VITE_APP_TITLE)
-ipcRenderer.on('update-app-progress', (e, prop) => {
-  downloadProp.value = prop
-  showDownLoading.value = prop !== 100
-})
-const gotoreRegister=()=>{
-  codeName.value='发送验证码'
-  if(timer.value){
-    clearInterval(timer.value);
-  }
-  isRegister.value=false
-}
-// 刷新
-const refreshImg=()=>{
-  getCodeImg().then(res=>{
-    isPeopleImg.value='data:image/jpg;base64,'+res.img
-    resImg.imgData=res
-  })
-}
-// 提交人机验证
-const sbmitImg=()=>{
-   if(ruleForm.imgCode){
-    // {mobile:ruleForm.phoneNumber,code:ruleForm.imgCode,uuid:resImg.imgData.uuid}
-    const { username:username,imgCode:code } = ruleForm
-    const params = {
-      username, code,
-      uuid: resImg.imgData.uuid,
-      source:4
-    }
-    sendcode(params).then(res=>{
-      if(res.code==200){
-        ElMessage.success('短信发送成功')
-        ruleForm.Code=res.data
-        isImg.value=false
-      }
-
-    })
-   }else{
-    ElMessage.error('请根据图片输入验证码')
-   }
-  //
-}
-// 发送验证码
-const sendyzm=()=>{
-  if(ruleForm.username){
-    const pattern = /^1[3-9]\d{9}$/;
-    if( pattern.test(ruleForm.username) ){
-      
-      getCodeImg().then(res=>{
-          if(res.code==200){
-            ruleForm.imgCode=null
-            isPeopleImg.value='data:image/jpg;base64,'+res.img
-            isImg.value=true
-            resImg.imgData=res
-            codeName.value=60
-            timer.value=setInterval(()=>{
-              codeName.value--
-              if(codeName.value==0){
-                codeName.value='发送验证码'
-                clearInterval(timer.value);
-              }
-            },1000)
-          }else{
-            ElMessage.error(res.msg)
-          }
-      })
-    }else{
-      ElMessage.error('请输入正确的手机号码')
-    }
-    // captchaImg({mobile:ruleForm.phoneNumber}).then(res=>{
-    //   console.log('res->', res)
-    // })
-  }else{
-    ElMessage.error('请输入手机号码')
-  }
-}
-// 打开弹窗
-const RegisterModel = type => {
-  RegModel.value.OpenModel(type)
-}
-//登录
-const submitForm = async (formEl) => {
-  if (!formEl) return
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      btnLoading.value = true
-
-      // 勾选了需要记住密码设置在 cookie 中设置记住用户名和密码
-      if (loginForm.rememberMe) {
-        await setCookie('username', loginForm.username)
-        await setCookie('password', encrypt(loginForm.password))
-        await setCookie('rememberMe', loginForm.rememberMe.toString())
-      } else {
-        // 否则移除
-        await session.defaultSession.clearStorageData({
-          origin: curWinUrl,
-          storages: ['cookies']
-        })
-      }
-
-      try {
-        await userStore.login(loginForm)
-        await userStore.getInfo()
-        if (userStore.user.edustage || userStore.user.edusubject) {
-          ElMessage.success('登录成功')
-          ipcRenderer && ipcRenderer.send('openMainWindow')
-        } else {
-          isSubject.value = true
-        }
-      } finally {
-        btnLoading.value = false
-      }
-    }
-  })
-}
-
-const getCookie = async () => {
-  const username = (await getCookieDetail('username'))[0]
-  const password = (await getCookieDetail('password'))[0]
-  const rememberMe = (await getCookieDetail('rememberMe'))[0]
-  loginForm.username = username ? username.value : loginForm.username
-  loginForm.password = password ? decrypt(password.value) : loginForm.password
-  loginForm.rememberMe = rememberMe ? Boolean(rememberMe.value) : false
-}
-
-// 获取cookie
-const getCookieDetail = (name) => {
-  return session.defaultSession.cookies.get({ url: curWinUrl, name })
-}
-
-// 设置cookie
-const setCookie = (name, value) => {
-  // 30天过期
-  let Days = 30
-  let times = Math.round(Date.now() / 1000) + Days * 24 * 60 * 60
-  const cookie = {
-    url: curWinUrl,
-    name,
-    value,
-    expirationDate: times
-  }
-  return session.defaultSession.cookies.set(cookie)
-}
-const gotoLogin = () => {
-  codeName.value='发送验证码'
-  if (ruleFormRef.value) ruleFormRef.value.resetFields()
-  isRegister.value = true
-}
-// 注册
-const RegisterForm = async (formEl) => {
-  if (!formEl) return
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      instructorregister(ruleForm).then(res=>{
-          if(res.code==200){
-            ElMessage.success('您已注册成功')
-            if (ruleFormRef.value) ruleFormRef.value.resetFields()
-             gotoLogin()
-          }else{
-            ElMessage.error(res.msg)
-          }
-      })
-      console.log('submit!')
-    } else {
-      console.log('error submit!', fields)
-    }
-  })
-}
-onMounted(() => {
-  localStorage.clear()
-  sessionStore.set('subject', {   
-    bookList: null, 
-    curBook: null, 
-    curNode: null, 
-    defaultExpandedKeys: [], 
-    subjectTree: [] 
-  })
-  getCookie()
-})
 </script>
 <style lang="scss" scoped>
-.login-container {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  -webkit-app-region: drag;
-
-  .box-item {
-    width: 444px;
-    height: 520px;
-
-    &.desc {
-      background: #ffffff;
-      border-radius: 12px 0px 0px 12px;
-      box-shadow: 0px 16px 73px 8px rgba(203, 203, 203, 0.2);
-      padding: 23px 25px;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      justify-content: flex-start;
-      background-color: #003b94;
-    }
-
-    &.login {
-      background: #ffffff;
-      border-radius: 0px 12px 12px 0px;
-      padding: 34px 42px;
-      position: relative;
-    }
-
-    .welcome {
-      padding-top: 35px;
-
-      p {
-        color: #ffffff;
-        line-height: 25px;
-        letter-spacing: 0.26px;
-        text-align: center;
-        font-weight: 700;
-        font-size: 26px;
-      }
-    }
-
-    .welcome-img {
-      margin-top: 20px;
-      width: 350px;
-      height: 350px;
-    }
-
-    .login-title {
-      font-size: 20px;
-      text-align: center;
-      color: #1e1e1e;
-      margin-bottom: 35px;
-      margin-top: 50px;
-    }
-
-    .login-form {
-      -webkit-app-region: no-drag;
-
-      .captcha-input {
-        width: 60%;
-      }
-
-      .captcha-img {
-        cursor: pointer;
-      }
-    }
-
-    .btn {
-      width: 350px;
-      height: 50px;
-      border-radius: 4px;
-      font-size: 16px;
-      font-weight: 700;
-      text-align: center;
-      color: #ffffff;
-      line-height: 50px;
-      cursor: pointer;
-    }
-  }
-}
-
-.header-tool {
-  position: absolute;
-  right: 0;
-  top: 0;
-  -webkit-app-region: no-drag;
-
-  span {
-    padding: 5px 10px;
-    cursor: pointer;
-  }
-}
-
-.el-form-item {
-  margin-bottom: 40px;
-}
 </style>

src/renderer/src/views/login/yc-login.vue

@@ -0,0 +1,463 @@
+<template>
+  <div class="login-container">
+    <div class="login-yc">
+      <img class="welcome-img" :src="buildMode === 'yc2'?leftBg2:leftBg1" />
+    </div>
+    <div class="box-item login" v-if="isRegister">
+      <WindowTools :is-has-max="false" />
+      <div style="display: flex;justify-content: center;"><img class="title-logo" :src="yclogo" /></div>
+      <div class="login-title">永川中小学</div>
+      <div class="login-title2">{{buildMode === 'yc2'?'虚拟仿真AI实训教学管理系统':'人工智能赋能科学素养与劳动技能系统'}}</div>
+      <el-form ref="formRef" class="login-form" :model="loginForm" :rules="rules" size="large">
+        <el-form-item prop="username">
+          <el-input v-model.trim="loginForm.username" placeholder="请输入用户名" />
+        </el-form-item>
+        <el-form-item prop="password" style="margin-bottom: 15px">
+          <el-input v-model="loginForm.password" autocomplete="on" type="password" placeholder="请输入密码" />
+        </el-form-item>
+        <div class="flex mb-5">
+          <el-checkbox v-model="loginForm.rememberMe">记住密码</el-checkbox>
+          <!-- <el-checkbox >阅读并同意《xxx》</el-checkbox> -->
+        </div>
+
+        <el-form-item style="margin-bottom: 20px">
+          <el-button :loading="btnLoading" class="btn" type="primary" @click="submitForm(formRef)">登录</el-button>
+        </el-form-item>
+        <div class="flex mb-4" style="display: flex;justify-content: center;color: #ccc;cursor: pointer;">
+          <a class="hover:text-sky-500" style="margin-right: 10px;" @click="gotoreRegister">注册账号</a>
+        </div>
+        <div class="title-bottom">
+          重庆市永川区教育委员会
+        </div>
+      </el-form>
+    </div>
+
+    <div class="box-item login" v-else>
+      <WindowTools :is-has-max="false" />
+      <div class="login-title">账号注册</div>
+      <el-form  ref="ruleFormRef" class="login-form"   :model="ruleForm" label-width="auto"  :rules="rules" size="large">
+        <el-form-item label="手机号" prop="username">
+          <el-input  v-model="ruleForm.username" placeholder="请输入手机号" />
+        </el-form-item>
+        <el-form-item label="验证码"  prop="smsCode" style="display: flex">
+          <el-input style="width:185px"  v-model="ruleForm.smsCode" placeholder="请输入验证码" /><el-button style="margin-left:10px;width:100px" :disabled="codeName=='发送验证码'?false:true"  type="primary" @click="sendyzm">{{ codeName }}</el-button>
+        </el-form-item>
+        <el-form-item label="密码" prop="password" >
+          <el-input  autocomplete="on" type="password" v-model="ruleForm.password" placeholder="请输入密码" />
+        </el-form-item>
+
+        <el-form-item>
+          <el-button  class="btn" type="primary"  @click="RegisterForm(ruleFormRef)">立即注册</el-button>
+        </el-form-item>
+        <div class="flex mb-4" style="display: flex;justify-content: center;color: #ccc;cursor: pointer;">
+          <a class="hover:text-sky-500" style="margin-right: 10px;" @click="gotoLogin"> 《 返回登录 </a>
+        </div>
+      </el-form>
+    </div>
+  </div>
+  <el-dialog v-model="showDownLoading" width="500" :show-close="false" :close-on-click-modal="false"
+    :close-on-press-escape="false" align-center>
+    <el-progress :text-inside="true" :stroke-width="22" :percentage="downloadProp" :show-text="false"
+      status="success" />
+  </el-dialog>
+  <el-dialog
+        v-model="isImg"
+        title="人机验证"
+        width="500"
+        style=" -webkit-app-region: no-drag;"
+      >
+        <span>根据图片回答相关问题1</span>
+        <div style="display: flex;align-items: center;;margin-top:30px">
+          <img :src="isPeopleImg" style="width:200px;height:60px;cursor: pointer;" alt="" srcset="" @click="refreshImg">
+          <el-input v-model="ruleForm.imgCode"  style="width: 250px;height:40px;margin-left:20px" placeholder="请根据图片填入答案" />
+        </div>
+        <div style="display: flex;justify-content: center;margin-top:30px">
+          <el-button  type="primary" @click="sbmitImg">确定</el-button>
+        </div>
+      </el-dialog>
+  <!--选择学科-->
+  <SelectSubject v-model="isSubject" :login-data="loginForm" />
+  <!--注册弹框-->
+  <Register ref="RegModel"></Register>
+
+
+</template>
+<script setup>
+import { onMounted, reactive, ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { encrypt, decrypt } from '@/utils/jsencrypt'
+import useUserStore from '@/store/modules/user'
+import WindowTools from '@/components/window-tools/index.vue'
+import SelectSubject from '@/components/select-subject/index.vue'
+import Register from './components/Register.vue'
+import { sessionStore } from '@/utils/store'
+import {sendcode,instructorregister,getCodeImg} from '@/api/login'
+import yclogo from '@/assets/images/login/yc-logo.png'
+import leftBg1 from '@/assets/images/login/ycpeitu.png'
+import leftBg2 from '@/assets/images/login/ycpeitu2.jpg'
+const { session } = require('@electron/remote')
+const buildMode = import.meta.env.MODE
+const downloadProp = ref(0)
+const showDownLoading = ref(false)
+const { ipcRenderer } = window.electron || {}
+const formRef = ref()
+const userStore = useUserStore()
+const btnLoading = ref(false)
+const isSubject = ref(false)
+const RegModel = ref(false)
+const isRegister = ref(true)
+const ruleFormRef = ref(null)
+const codeName=ref('发送验证码')
+const timer=ref(null)
+const isImg=ref(false)
+const isPeopleImg=ref(null)
+const type=ref(1) // 1注册 2找回密码
+const resImg = reactive({ imgData: {} });
+
+//表单
+const loginForm = reactive({
+  username: '',
+  password: '',
+  rememberMe: false
+})
+// 注册表单
+const ruleForm = reactive({
+
+})
+//表单规则
+const rules = reactive({
+  username: [{ required: true, trigger: 'blur', message: '请输入您的账号' }],
+  password: [{ required: true, trigger: 'blur', message: '请输入您的密码' }],
+  smsCode: [{ required: true, trigger: 'blur', message: '请输入您的验证码' }],
+})
+
+let curWinUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
+let homeTitle = ref(import.meta.env.VITE_APP_TITLE)
+ipcRenderer.on('update-app-progress', (e, prop) => {
+  downloadProp.value = prop
+  showDownLoading.value = prop !== 100
+})
+const gotoreRegister=()=>{
+  codeName.value='发送验证码'
+  if(timer.value){
+    clearInterval(timer.value);
+  }
+  isRegister.value=false
+}
+// 刷新
+const refreshImg=()=>{
+  getCodeImg().then(res=>{
+    isPeopleImg.value='data:image/jpg;base64,'+res.img
+    resImg.imgData=res
+  })
+}
+// 提交人机验证
+const sbmitImg=()=>{
+   if(ruleForm.imgCode){
+    // {mobile:ruleForm.phoneNumber,code:ruleForm.imgCode,uuid:resImg.imgData.uuid}
+    const { username:username,imgCode:code } = ruleForm
+    const params = {
+      username, code,
+      uuid: resImg.imgData.uuid,
+      source:4
+    }
+    sendcode(params).then(res=>{
+      if(res.code==200){
+        ElMessage.success('短信发送成功')
+        ruleForm.Code=res.data
+        isImg.value=false
+        codeName.value=60
+            timer.value=setInterval(()=>{
+              codeName.value--
+              if(codeName.value==0){
+                codeName.value='发送验证码'
+                clearInterval(timer.value);
+              }
+            },1000)
+      }
+
+    })
+   }else{
+    ElMessage.error('请根据图片输入验证码')
+   }
+  //
+}
+// 发送验证码
+const sendyzm=()=>{
+  if(ruleForm.username){
+    const pattern = /^1[3-9]\d{9}$/;
+    if( pattern.test(ruleForm.username) ){
+
+      getCodeImg().then(res=>{
+          if(res.code==200){
+            ruleForm.imgCode=null
+            isPeopleImg.value='data:image/jpg;base64,'+res.img
+            isImg.value=true
+            resImg.imgData=res
+            // codeName.value=60
+            // timer.value=setInterval(()=>{
+            //   codeName.value--
+            //   if(codeName.value==0){
+            //     codeName.value='发送验证码'
+            //     clearInterval(timer.value);
+            //   }
+            // },1000)
+          }else{
+            ElMessage.error(res.msg)
+          }
+      })
+    }else{
+      ElMessage.error('请输入正确的手机号码')
+    }
+    // captchaImg({mobile:ruleForm.phoneNumber}).then(res=>{
+    //   console.log('res->', res)
+    // })
+  }else{
+    ElMessage.error('请输入手机号码')
+  }
+}
+// 打开弹窗
+const RegisterModel = type => {
+  RegModel.value.OpenModel(type)
+}
+//登录
+const submitForm = async (formEl) => {
+  if (!formEl) return
+  await formEl.validate(async (valid) => {
+    if (valid) {
+      btnLoading.value = true
+
+      // 勾选了需要记住密码设置在 cookie 中设置记住用户名和密码
+      if (loginForm.rememberMe) {
+        await setCookie('username', loginForm.username)
+        await setCookie('password', encrypt(loginForm.password))
+        await setCookie('rememberMe', loginForm.rememberMe.toString())
+      } else {
+        // 否则移除
+        await session.defaultSession.clearStorageData({
+          origin: curWinUrl,
+          storages: ['cookies']
+        })
+      }
+
+      try {
+        await userStore.login(loginForm)
+        await userStore.getInfo()
+        if (userStore.user.edustage || userStore.user.edusubject || isStadium(userStore.user)) {
+          ElMessage.success('登录成功')
+          ipcRenderer && ipcRenderer.send('openMainWindow')
+        } else {
+          isSubject.value = true
+        }
+      } finally {
+        btnLoading.value = false
+      }
+    }
+  })
+}
+
+const isStadium = (user) => {
+  let roles = user.roles
+  return  roles.some(item => item.roleKey === 'stadium')
+}
+
+const getCookie = async () => {
+  const username = (await getCookieDetail('username'))[0]
+  const password = (await getCookieDetail('password'))[0]
+  const rememberMe = (await getCookieDetail('rememberMe'))[0]
+  loginForm.username = username ? username.value : loginForm.username
+  loginForm.password = password ? decrypt(password.value) : loginForm.password
+  loginForm.rememberMe = rememberMe ? Boolean(rememberMe.value) : false
+}
+
+// 获取cookie
+const getCookieDetail = (name) => {
+  return session.defaultSession.cookies.get({ url: curWinUrl, name })
+}
+
+// 设置cookie
+const setCookie = (name, value) => {
+  // 30天过期
+  let Days = 30
+  let times = Math.round(Date.now() / 1000) + Days * 24 * 60 * 60
+  const cookie = {
+    url: curWinUrl,
+    name,
+    value,
+    expirationDate: times
+  }
+  return session.defaultSession.cookies.set(cookie)
+}
+const gotoLogin = () => {
+  codeName.value='发送验证码'
+  if (timer.value){
+    clearInterval(timer.value);
+  }
+  if (ruleFormRef.value) ruleFormRef.value.resetFields()
+  isRegister.value = true
+}
+// 注册
+const RegisterForm = async (formEl) => {
+  if (!formEl) return
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      instructorregister(ruleForm).then(res=>{
+          if(res.code==200){
+            ElMessage.success('您已注册成功')
+            if (ruleFormRef.value) ruleFormRef.value.resetFields()
+             gotoLogin()
+          }else{
+            ElMessage.error(res.msg)
+          }
+      })
+      console.log('submit!')
+    } else {
+      console.log('error submit!', fields)
+    }
+  })
+}
+onMounted(() => {
+  localStorage.clear()
+  sessionStore.set('subject', {
+    bookList: null,
+    curBook: null,
+    curNode: null,
+    defaultExpandedKeys: [],
+    subjectTree: []
+  })
+  getCookie()
+})
+</script>
+<style lang="scss" scoped>
+.login-container {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  -webkit-app-region: drag;
+
+  .login-yc{
+    width: 100%;
+    height: 100%;
+    img{
+      width: 100%;
+      height: 100%;
+    }
+  }
+
+  .box-item {
+    width: 370px;
+    height: 520px;
+
+    &.desc {
+      background: #ffffff;
+      border-radius: 12px 0px 0px 12px;
+      box-shadow: 0px 16px 73px 8px rgba(203, 203, 203, 0.2);
+      padding: 23px 25px;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: flex-start;
+      background-color: #003b94;
+    }
+
+    &.login {
+      background: #ffffff;
+      border-radius: 0px 12px 12px 0px;
+      padding: 34px 42px;
+      position: relative;
+      .title-logo{
+        width: 50px;
+      }
+    }
+
+    .welcome {
+      padding-top: 35px;
+
+      p {
+        color: #ffffff;
+        line-height: 25px;
+        letter-spacing: 0.26px;
+        text-align: center;
+        font-weight: 700;
+        font-size: 26px;
+      }
+    }
+
+    .welcome-img {
+      margin-top: 20px;
+      width: 350px;
+      height: 350px;
+    }
+
+    .login-title {
+      font-size: 20px;
+      text-align: center;
+      color: #1e1e1e;
+      margin-bottom: 35px;
+      margin-top: 50px;
+    }
+
+    .login-title {
+      font-size: 20px;
+      text-align: center;
+      color: #1e1e1e;
+      margin-bottom: 10px;
+      margin-top: 5px;
+      font-width: bold;
+    }
+
+    .login-title2 {
+      margin-bottom: 20px;
+    }
+
+    .login-form {
+      -webkit-app-region: no-drag;
+
+      .captcha-input {
+        width: 60%;
+      }
+
+      .captcha-img {
+        cursor: pointer;
+      }
+
+      .title-bottom{
+        text-align: center;
+        width: 100%;
+        font-size: 14px;
+        color: rgba(0, 0, 0, 0.45);
+      }
+    }
+
+    .btn {
+      width: 350px;
+      height: 50px;
+      border-radius: 4px;
+      font-size: 16px;
+      font-weight: 700;
+      text-align: center;
+      color: #ffffff;
+      line-height: 50px;
+      cursor: pointer;
+    }
+  }
+}
+
+.header-tool {
+  position: absolute;
+  right: 0;
+  top: 0;
+  -webkit-app-region: no-drag;
+
+  span {
+    padding: 5px 10px;
+    cursor: pointer;
+  }
+}
+
+.el-form-item {
+  margin-bottom: 40px;
+}
+</style>

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

@@ -9,8 +9,8 @@
           <el-icon class="item-icon"><Flag /></el-icon>
           <div class="content-header-title">{{item.name}}</div>
           <div class="content-header-body">
-            <div class="content-header-num">6</div>
+            <div class="content-header-num">{{item.num}}</div>
-            <div class="content-header-text">分析结果</div>
+            <div class="content-header-text">{{item.type}}</div>
           </div>
         </div>
       </div>
@@ -18,7 +18,20 @@
         <div class="content-body-left">
           <div class="content-body-left-title">
             文枢课件
-            <el-button class="add-btn" size="small" type="primary" @click="createAIPPT">新建</el-button>
+<!--            <el-button class="add-btn" size="small" type="primary" @click="createAIPPT">新建</el-button>-->
+            <el-dropdown class="prepare-center-dropdown add-btn">
+              <el-button type="primary">
+                新建<el-icon class="el-icon--right"><arrow-down /></el-icon>
+              </el-button>
+              <template #dropdown>
+                <el-dropdown-menu>
+                  <el-dropdown-item @click="createAIPPT">新建文枢课件</el-dropdown-item>
+                  <el-dropdown-item @click="router.push({path: '/model/design'})">AI一键生成</el-dropdown-item>
+                  <el-dropdown-item @click="openFilePicker">导入PPT</el-dropdown-item>
+                  <input type="file" ref="fileInput" style="display: none;" @change="handleFileChange" accept="application/vnd.ms-powerpoint,application/vnd.openxmlformats-officedocument.presentationml.presentation">
+                </el-dropdown-menu>
+              </template>
+            </el-dropdown>
           </div>
           <div class="content-body-left-body">
             <kj-list-item
@@ -59,6 +72,7 @@
       </div>
     </div>
   </el-row>
+  <progress-dialog v-model:visible="pgDialog.visible" v-bind="pgDialog" />
 </template>
 
 <script setup>
@@ -69,19 +83,30 @@ import useUserStore from '@/store/modules/user' // 用户信息
 import ChooseTextbook from '@/components/choose-textbook/index.vue'
 import KjListItem from '@/views/prepare/container/kj-list-item.vue'
 import FileImage from '@/components/file-image/index.vue'
-import {creatAPT, getSmarttalkPage} from '@/api/file'
+import progressDialog from '@/views/teachingDesign/container/progress-dialog.vue'
-import {Flag, Position} from '@element-plus/icons-vue'
+import ThumbnailSlide from '@/AixPPTist/src/views/components/ThumbnailSlide/index.vue'
+import {creatAPT, getSmarttalkPage, getModelInfo} from '@/api/file'
+import {ArrowDown, Flag, Position} from '@element-plus/icons-vue'
 import {asyncLocalFile, parseCataByNode} from "@/utils/talkFile";
 import { dataSetJson } from '@/utils/comm' // 数据集id文生图
 import { sessionStore } from '@/utils/store'
 import {listEntpcourse} from "@/api/teaching/classwork";
 import {addEntpcoursefileReturnId, getEntpcoursefile} from "@/api/education/entpcoursefile";
-import {createWindow, ipcMsgSend} from "@/utils/tool";
+import {createWindow, toLinkLeftWeb} from "@/utils/tool";
-import {ElMessage} from "element-plus"; // 学科名字文生图
+import {ElMessage} from "element-plus";
+import {PPTXFileToJson} from "@/AixPPTist/src/hooks/useImport";
+import * as API_entpcoursefile from "@/api/education/entpcoursefile";
+import msgUtils from "@/plugins/modal";
+import * as commUtils from "@/utils/comm";
+import * as Api_server from "@/api/apiService"; // 学科名字文生图
+import useClassTaskStore from '@/store/modules/classTask'
+import { slidesToImg } from '@/utils/ppt' // ppt相关工具
+
 const router = useRouter()
 const userStore = useUserStore().user // 用户信息
 const currentNode = ref({})
 const refs = ref([]);
+const classTaskStore = useClassTaskStore();
 
 const collectRef = (key) => {
   return (el) => {
@@ -92,27 +117,33 @@ const collectRef = (key) => {
 const tags = reactive([{
   name: '课标分析',
   path: '/model/curriculum',
-  bgcolor: 'rgb(241,65,108)'
+  bgcolor: 'rgb(241,65,108)',
+  type: '分析结果'
 },{
   name: '教材分析',
   path: '/model/teaching',
-  bgcolor: 'rgb(114,57,234)'
+  bgcolor: 'rgb(114,57,234)',
+  type: '分析结果'
 },{
   name: '考试分析',
   path: '/model/examination',
-  bgcolor: 'rgb(251,132,4)'
+  bgcolor: 'rgb(251,132,4)',
+  type: '分析结果'
 },{
   name: '素材设计',
   path: '/model/aiKolors',
-  bgcolor: 'rgb(25,123,237)'
+  bgcolor: 'rgb(25,123,237)',
+  type: '素材'
 },{
   name: '作业设计',
   path: '/model/newClassTaskAssign',
-  bgcolor: 'rgb(23,198,83)'
+  bgcolor: 'rgb(23,198,83)',
+  type: '作业'
 },{
   name: '框架设计',
   path: '/model/design',
-  bgcolor: 'rgb(34,35,43)'
+  bgcolor: 'rgb(34,35,43)',
+  type: '设计框架'
 }])
 
 const tools = reactive([{
@@ -135,6 +166,11 @@ const tools = reactive([{
   name: '视频生成',
   path: '',
   img: 'aivideo'
+},{
+  name: '音乐生成',
+  path: 'https://ai.ysaix.com:7845/',
+  type: 'link',
+  img: 'aiyinyue'
 }])
 
 const uploadData = ref({
@@ -145,11 +181,13 @@ const uploadData = ref({
     fileRoot: '备课'
 })
 const currentFileList = ref([])
-// 页面加载
-onMounted(() => {
-})
 
 const gotoRoute = (item) => {
+  if (item.type === 'link') {
+    //link方式
+    toLinkLeftWeb(item.path);
+    return
+  }
   if (item.path) {
     if (item.path === '/model/aiKolors') {
       gotoAiKolors(item.path)
@@ -212,6 +250,156 @@ const createAIPPT = () => {
   })
 }
 
+const pgDialog = ref({ // 弹窗-进度条
+  visible: false,
+  title: 'PPT解析中...',
+  width: 300,
+  showClose: false,
+  draggable: true,
+  beforeClose: done => {}, // 阻止-弹窗事件
+  pg: { // 进度条-参数
+    percentage: 0, // 百分比
+    color: [
+      { color: '#1989fa', percentage: 50 }, // 蓝色
+      { color: '#e6a23c', percentage: 80 }, // 橙色
+      { color: '#5cb87a', percentage: 100 }, // 绿色
+    ]
+  }
+})
+
+const fileInput = ref(null)
+
+const openFilePicker = () =>{
+  fileInput.value.click();
+}
+
+const handleFileChange = ()=> {
+  const file = event.target.files[0];
+  if (file) {
+    console.log(file);
+    createAIPPTByFile(file)
+  }
+}
+// ppt文件转PPT线上数据
+const createAIPPTByFile = async (file)=> {
+  // pgDialog.value.visible = true
+  // pgDialog.value.pg.percentage = 0
+  const resPptJson = await PPTXFileToJson(file)
+  const { def, slides, ...content } = resPptJson
+  // 生成缩略图
+  const thumbnails = await slidesToImg(slides, content.width)
+  // 转换图片|音频|视频 为线上地址
+  let completed = 0
+  const total = slides.length
+  for( let o of slides ) {
+    completed++
+    await toRousrceUrl(o)
+    // 设置进度条
+    pgDialog.value.pg.percentage = Math.floor(completed / total * 100)
+  }
+  pgDialog.value.pg.percentage = 0
+  pgDialog.value.visible = false
+  listEntpcourse({
+    evalid: currentNode.value.id,
+    edituserid: userStore.userId,
+    pageSize: 500
+  }).then((response) => {
+    if (response.rows.length <= 0) return
+    let resCourse = response.rows[0]
+    // 添加
+    let form = {
+      parentid: 0,
+      entpid: userStore.deptId,
+      entpcourseid: resCourse.id,
+      ppttype: 'file',
+      title: resCourse.coursetitle,
+      fileurl: '',
+      filetype: 'aippt',
+      datacontent: '',
+      parentContent: JSON.stringify(content),
+      filekey: '',
+      filetag: '',
+      fileidx: 0,
+      dflag: 0,
+      status: '',
+      edituserid: userStore.userId
+    }
+    addEntpcoursefileReturnId(form).then((slideid) => {
+      creatAPT({
+        ...uploadData.value,
+        fileId: slideid,
+        fileFlag: 'aippt',
+        fileShowName: currentNode.value.itemtitle + '.aippt'
+      }).then(async (res) => {
+
+        const resSlides = slides.map(({id, ...slide}) => JSON.stringify(slide))
+        let params = {
+          parentid: slideid,
+          entpid: resCourse.entpid,
+          entpcourseid: resCourse.id,
+          title: '',
+          filetype: 'slide',
+          thumbnails, // 缩略图-列表
+          slides: resSlides,
+          edituserid: userStore.userId
+        }
+        const res_3 = await API_entpcoursefile.batchAddNew(params)
+        if (res_3 && res_3.code == 200) {
+          msgUtils.msgSuccess('导入PPT课件成功')
+          currentFileList.value.unshift(res.resData)
+          await nextTick();
+          refs.value['kjItemRef'+res.resData.id].openFileWin(res.resData);
+        } else {
+          msgUtils.msgWarning('导入PPT课件失败')
+        }
+      })
+    })
+  })
+}
+
+const toRousrceUrl = async (o) => {
+  if (!!o.src) { // 如果有src就转换
+    const isBase64 = /^data:image\/(\w+);base64,/.test(o.src)
+    const isBlobUrl = /^blob:/.test(o.src)
+    // console.log('isBase64', o, isBase64)
+    if (isBase64) {
+      const bolb = commUtils.base64ToBlob(o.src)
+      const fileName = Date.now() + '.png'
+      const file = commUtils.blobToFile(bolb, fileName)
+      // o.src = fileName
+      // console.log('file', file)
+      const formData = new FormData()
+      formData.append('file', file)
+      const res = await Api_server.Other.uploadFile(formData)
+      if (res && res.code == 200){
+        const url = res?.url
+        url &&(o.src = url)
+      }
+    } else if (isBlobUrl) { // 视频和音频
+      const res = await fetch(o.src)
+      const blob = await res.blob()
+      const fileName = o.type=='video'? Date.now() + '.mp4':Date.now() + '.mp3'
+      const file = commUtils.blobToFile(blob, fileName)
+      // o.src = fileName
+      // console.log('file', file)
+      const formData = new FormData()
+      formData.append('file', file)
+      const ress = await Api_server.Other.uploadFile(formData)
+      if (ress && ress.code == 200){
+        const url = ress?.url
+        url &&(o.src = url)
+      }
+    }
+  }
+
+  if (o?.background?.image) await toRousrceUrl(o.background.image)
+  if(o?.elements){
+    for (let element of o.elements) {
+      await toRousrceUrl(element);
+    }
+  }
+}
+
 const deleteTalk = (item) => {
   let index = currentFileList.value.indexOf(item)
   currentFileList.value.splice(index, 1)
@@ -219,13 +407,41 @@ const deleteTalk = (item) => {
 
 // 教材选中
 const changeBook = async(data) => {
-  console.log(data)
   let cata = parseCataByNode(data.node)
   currentNode.value = data.node
   uploadData.value.levelFirstId = cata[0]
   uploadData.value.levelSecondId = cata[1]
   uploadData.value.levelThirdId = cata[2]
   uploadData.value.textbookId = data.textBook.curBookId
+  getModelInfo({cataid: currentNode.value.id}).then(res=>{
+    console.log(res)
+    if (res&&res.data) {
+      tags.filter(item=>{
+        switch (item.name) {
+          case '课标分析':
+            item.num = res.data.kbs
+            break;
+          case '教材分析':
+            item.num = res.data.jcs
+            break;
+          case '考试分析':
+            item.num = res.data.kss
+            break;
+          case '素材设计':
+            item.num = res.data.scs
+            break;
+          case '作业设计':
+            item.num = res.data.zys
+            break;
+          case '框架设计':
+            item.num = res.data.kjs
+            break;
+          default:
+            break;
+        }
+      })
+    }
+  })
   getSmarttalkPage({
     ...uploadData.value,
     orderByColumn: 'createTime',
@@ -303,6 +519,13 @@ const changeClass = async (type, row, other) => {
       break
   }
 }
+
+// 页面加载
+onMounted(async () => {
+  // 更新第三方题型题类
+  await classTaskStore.initJYInfo(userStore);
+})
+
 </script>
 <style lang="scss" scoped>
 .model-wrap{

src/renderer/src/views/prepare/container/ai-pptistV2.vue

@@ -10,8 +10,8 @@
           <div class="paragraphs">
             {{ outputText }}
           </div>
-         <el-button style="margin-bottom: 5px;" type="primary" @click="addMessage">从新生成</el-button>
+         <el-button style="margin-bottom: 5px;" type="primary" @click="addMessage">{{ outputText ? '重新生成' : '生成大纲' }}</el-button>
-        <el-button style="margin-bottom: 5px;" type="primary" @click="activeStep = 1">下一步</el-button>
+        <el-button style="margin-bottom: 5px;" type="primary" @click="activeStep = 1" :disabled="!outputText">下一步</el-button>
       </el-card>
       <el-card v-if="activeStep === 1">
         <div style="padding-bottom: 10px">ppt模板选择</div>
@@ -57,7 +57,7 @@
         </el-row>
         <div>
           <el-button style="margin-bottom: 5px;" type="primary" @click="activeStep = 0">上一步</el-button>
-          <el-button style="margin-bottom: 5px;" type="primary" v-loading="createPPTLoading" @click="outlineCreatePPT()">生成PPT</el-button>
+          <el-button style="margin-bottom: 5px;" type="primary" :loading="createPPTLoading" @click="outlineCreatePPT()">生成PPT</el-button>
         </div>
       </el-card>
       <el-card v-if="activeStep === 2">
@@ -177,6 +177,8 @@ const outlineCreatePPT = () => {
     };
 
     checkProgress();
+  }).finally(()=>{
+    createPPTLoading.value = false
   })
 };
 

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

@@ -25,7 +25,7 @@
           <c-form v-bind="classForm">
             <template #item_classid="{prop, form}">
               <span v-if="dt.ctCourse">{{ dt.ctCourse?.caption }}</span>
-              <el-select v-else v-model="form[prop]" placeholder="请选择班级">
+              <el-select v-else v-model="form[prop]" placeholder="请选择班级" clearable>
                 <el-option v-for="item in listData.classList" :value="item.id"
                   :label="`${item.caption} (${item.classstudentcount}人)`" />
               </el-select>
@@ -61,7 +61,8 @@
               <div>
                 <div v-if="myClassActive.filetype=='apt'">开始新的课堂，需要点击先创建课堂，才能显示手机二维码</div>
                 <div v-else>开始新的课堂，需要点击先创建课堂</div>
-                <el-button type="warning" :loading="dt.loading" @click="createClasscourse">创建课堂</el-button>
+                <el-button type="warning" :loading="dt.loading" @click="createClasscourse()">创建课堂</el-button>
+                <el-button type="success"  @click="createClasscourse(true)">公屏上课</el-button>
               </div>
              </template>
              <!-- 故障备用 -->
@@ -146,6 +147,7 @@ const open = async (id, classObj) => {
     await getAptInfo(id)
     // 获取班级列表
     getClassList()
+    // console.log('classObj', classObj)
     // 继续上课
     if (!!classObj) {
       dt.ctCourse = classObj
@@ -244,18 +246,18 @@ const getClasscourseList = async type => {
     }
   }
 }
-// 创建课程
+// 创建课程  isPublic 公屏上课
-const createClasscourse = async () => {
+const createClasscourse = async (isPublic = false) => {
   const { classid } = classForm.form
-  if (!classid) {
+  // if (!classid) {
-    ElMessage.warning('请选择班级')
+  //   ElMessage.warning('请选择班级')
-    return
+  //   return
-  }
+  // }
   dt.loading = true
   const { entpcourseid, evalid, id, coursetitle } = myClassActive.value // 课件对象
   const curDate = commUtil.getDateNow('yyyy-MM-dd')
-  const params = {
+  const params = { // 公屏上课直接 status = open
-    id: 0, coursetype: '', courseverid: 0, coursedesc: '', status: '',
+    id: 0, coursetype: '', courseverid: 0, coursedesc: '', status: isPublic?'open':'',
     teacherid: userStore.id, entpcoursefileid: id, classid,
     entpcourseid, evalid, coursetitle,
     plandate: curDate, opendate: curDate
@@ -273,7 +275,7 @@ const createClasscourse = async () => {
       setTimeout(async() => {
         msgEl.close()
         const res = await Http_Classcourse.getClasscourse(teacherForm.form.classcourseid)
-        openPublicScreen(res.data)
+        openPublicScreen(res.data, isPublic)
       }, 2000);
     }, 1000);
   }
@@ -304,11 +306,11 @@ const classTeachingStart = async () => {
   const { classcourseid:id } = teacherForm.form
   if (id) { // 开始上课
     // 新版-pptList 打开公屏
-    if (myClassActive.value.filetype == 'aptist') {
+    if (myClassActive.value.filetype == 'aippt') {
       const msgEl = ElMessage.warning({message:'正在打开公屏，请稍后...',duration: 0})
       setTimeout(async () => {
         msgEl.close()
-        const res = await Http_Classcourse.getClasscourse(teacherForm.form.classcourseid)
+        const res = await Http_Classcourse.getClasscourse(id)
         openPublicScreen(res.data)
       }, 2000);
     }else {
@@ -316,6 +318,8 @@ const classTeachingStart = async () => {
       toLinkWeb(url)        // 跳转web-公屏
       visible.value = false // 关闭弹窗
     }
+  } else {
+    ElMessage.warning('请先创建课程')
   }
 }
 // 获取二维码地址
@@ -352,20 +356,25 @@ const getQrUrl = async() => {
 }
 
 // 打开公屏
-const openPublicScreen = (classcourse) => {
+const openPublicScreen = (classcourse, isPublic) => {
   console.log('打开公屏', classcourse)
+  if (!dt.ctCourse) { // 新开课需要发送消息-继续上课不需要直接打开
     // 发送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) // 缓存当前当前上课
+  // 公屏开课
+  sessionStore.set('curr.isPublic', isPublic) // 缓存是否公屏开课
   createWindow('open-win', {
     url: '/pptist', // 窗口关闭时，清除缓存
     close: () => {
-      sessionStore.set('curr.resource', null) // 清除缓存
+      sessionStore.delete('curr.resource') // 清除缓存
-      sessionStore.set('curr.classcourse', null) // 清除缓存
+      sessionStore.delete('curr.classcourse') // 清除缓存
+      sessionStore.delete('curr.isPublic') // 清除缓存
     }
   })
   visible.value = false // 关闭弹窗