Merge branch 'zouyf_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl

.env.development

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

.env.production

@@ -18,4 +18,8 @@ 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_SHOW_DEV_TOOLS = 'false'

env.d.ts

@@ -0,0 +1,5 @@
+declare module '*.vue' {
+  import { ComponentOptions } from 'vue'
+  const componentOptions: ComponentOptions
+  export default componentOptions
+}

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

@@ -28,6 +28,7 @@ import * as API_entpcoursefile from '@/api/education/entpcoursefile' // 相关ap
 import { PPTApi } from './api'
 import { sessionStore } from '@/utils/store' // electron-store 状态管理
 import './api/watcher' // 监听
+import './api/classcourse' // 课程相关
 
 const loading = ref(true)
 const _isPC = isPC()
@@ -81,5 +82,8 @@ const initLoad: Function = () => {
 <style lang="scss">
 #app {
   height: 100%;
+  svg, canvas, img, audio, video, iframe {
+    display: unset;
+  }
 }
 </style>

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

@@ -0,0 +1,22 @@
+/**
+ * @author zdg
+ * @description 上课相关内容
+ */
+import type { Classcourse } from './types'
+import { sessionStore } from '@/utils/store' // electron-store 状态管理
+import * as useStore from '../store' // pptist-状态管理
+import { ChatWs } from '@/plugins/socket' // 聊天socket
+const screenStore = useStore.useScreenStore() // 全屏-状态管理
+const classcourseStore = useStore.useClasscourseStore() // 课堂信息-状态管理
+const classcourse: Classcourse = sessionStore.get('curr.classcourse') // 课堂信息
+
+// 如果课堂信息有值，则连接socket
+if (!!classcourse) {
+  // 连接socket
+  const ws = new ChatWs()
+  console.log('ws- ',ws)
+  // ChatWs.connect(classcourse.id)
+  classcourseStore.setClasscourse(classcourse)
+}
+// 打开全屏
+screenStore.setScreening(!!classcourse)

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

@@ -136,13 +136,15 @@ export class PPTApi {
         id: currentSlide.id,
         datacontent: JSON.stringify(currentSlide),
       }
-      Utils.mxThrottle(() => {this.updateSlide(params)}, 1000, 2)
+      Utils.mxThrottle(() => {this.updateSlide(params)}, 200, 2)
     }
   }
   // 更新幻灯片
   static updateSlide(data: object): Promise<Boolean> {
     return new Promise(async (resolve, reject) => {
       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)

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

@@ -6,3 +6,19 @@ export interface Result {
   rows?: Array<any>,
   total?: number
 }
+
+/** 课程信息 */
+export interface Classcourse {
+  id?: number|string, // 课程id
+  coursetitle?: string, // 课程名称
+  coursetype?: string, // 课程类型
+  courseverid?: string, // 课程版本id
+  coursedesc?: string, // 课程描述
+  status?: number, // 课程状态
+  teacherid?: number|string, // 教师id
+  entpcoursefileid?: number|string, // 课程文件id
+  classid?: number|string, // 班级id
+  entpcourseid?: number|string, // 章节中间表id
+  plandate?: string, // 计划时间
+  opendate?: string, // 开课时间
+}

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

@@ -1,9 +1,10 @@
-import { useScreenStore, useSlidesStore } from '../store'
+import { useScreenStore, useSlidesStore, useClasscourseStore } from '../store'
 import { enterFullscreen, exitFullscreen, isFullscreen } from '../utils/fullscreen'
 
 export default () => {
   const screenStore = useScreenStore()
   const slidesStore = useSlidesStore()
+  const classcourseStore = useClasscourseStore() // 课堂信息
 
   // 进入放映状态（从当前页开始）
   const enterScreening = () => {
@@ -19,7 +20,11 @@ export default () => {
 
   // 退出放映状态
   const exitScreening = () => {
-    screenStore.setScreening(false)
+    const classcourse = classcourseStore.classcourse
+    if (!!classcourse) { //DOTO 有课堂，执行退相关操作
+      console.log('退出放映状态')
+      window.close()
+    } else screenStore.setScreening(false)
     if (isFullscreen()) exitFullscreen()
   }
 

src/renderer/src/AixPPTist/src/plugins/icon.ts

@@ -125,7 +125,8 @@ import {
   User,
   Switch,
   More,
-  Material
+  Material,
+  AddPicture
 } from '@icon-park/vue-next'
 
 export interface Icons {
@@ -256,7 +257,8 @@ export const icons: Icons = {
   IconUser: User,
   IconSwitch: Switch,
   IconMore: More,
-  IconMaterial: Material
+  IconMaterial: Material,
+  IconAddPicture: AddPicture
 }
 
 export default {

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

@@ -0,0 +1,18 @@
+import { defineStore } from 'pinia'
+import type { Classcourse } from '../api/types'
+
+export interface ClasscourseState {
+  classcourse: Classcourse
+}
+
+export const useClasscourseStore = defineStore('classcourse', {
+  state: (): ClasscourseState => ({
+    classcourse: null, // 课堂信息
+  }),
+
+  actions: {
+    setClasscourse(classcourse: Classcourse) {
+      this.classcourse = classcourse
+    },
+  },
+})

src/renderer/src/AixPPTist/src/store/index.ts

@@ -3,6 +3,7 @@ import { useSlidesStore } from './slides'
 import { useSnapshotStore } from './snapshot'
 import { useKeyboardStore } from './keyboard'
 import { useScreenStore } from './screen'
+import { useClasscourseStore } from './classcourse'
 
 export {
   useMainStore,
@@ -10,4 +11,5 @@ export {
   useSnapshotStore,
   useKeyboardStore,
   useScreenStore,
+  useClasscourseStore,
 }

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

@@ -11,6 +11,7 @@
       </div>
       <el-button type="primary" @click="onInsert(item)">插入</el-button>
     </div>
+    <el-empty description="暂无素材" v-if="!list.length" />
   </div>
 </template>
 
@@ -93,11 +94,9 @@ const GetUrlParameters = (parameters) => {
       }
     }
   }
-
   return resData;
 }
 
-
 const proxyToBase64 = (url)=> {
   const dourl = GetUrlParameters(url)
   console.log(dourl,'dourl')

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

@@ -83,6 +83,7 @@
       </Popover>
       <IconPreviewOpen class="handler-item" v-tooltip="'插入试题'" @click="classWorkTaskVisible = true" />
       <IconMaterial class="handler-item" v-tooltip="'插入素材'" @click="materiaVisible = true"/>
+      <IconAddPicture class="handler-item" v-tooltip="'文生图'" @click="imgVisible = true" />
     </div>
 
     <div class="right-handler">
@@ -121,14 +122,18 @@
         @update="data => { onhtml2canvas(data); classWorkTaskVisible = false }"
       />
     </el-dialog>
-
+    <!--插入素材-->
     <Modal
     v-model:visible="materiaVisible" 
     :width="880">
       <MaterialDialog  @close="materiaVisible = false" @insertMaterial="insertMaterial"/>
     </Modal>
- 
+    <!--文生图-->
-
+    <Modal
+    v-model:visible="imgVisible" 
+    :width="1300">
+      <TextCreateImg hasPPt @insertImg="(url: string) => { createImageElement(url); imgVisible = false }" />
+    </Modal>
   </div>
 </template>
 
@@ -156,6 +161,8 @@ import Popover from '../../../components/Popover.vue'
 import PopoverMenuItem from '../../../components/PopoverMenuItem.vue'
 import QuestToPPTist from '@/views/classTask/newClassTaskAssign/questToPPTist/index.vue'
 import MaterialDialog from './MaterialDialog.vue'
+import TextCreateImg from '@/components/ai-kolors/index.vue'
+import { toPng, toJpeg } from 'html-to-image' // 引入html-to-image库
 
 const mainStore = useMainStore()
 const { creatingElement, creatingCustomShape, showSelectPanel, showSearchPanel, showNotesPanel } = storeToRefs(mainStore)
@@ -193,8 +200,10 @@ const insertImageElement = (files: FileList) => {
   getImageDataURL(imageFile).then(dataURL => createImageElement(dataURL))
 }
 
-const onhtml2canvas = (imgbs64: string) => {
+const onhtml2canvas = async (html: HTMLElement) => {
-  createImageElement(imgbs64)
+  //createImageElement(imgbs64);
+  const ele = await toPng(html)
+  createImageElement(ele);
 }
 
 const shapePoolVisible = ref(false)
@@ -269,8 +278,10 @@ const insertMaterial = (item: MaterialParams) =>{
     createImageElement(data)
   }
   materiaVisible.value = false
-
 }
+
+// 文生图
+const imgVisible = ref(false)
 </script>
 
 <style lang="scss" scoped>

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

@@ -162,6 +162,10 @@ const setDialogForExport = (type: DialogForExportTypes) => {
   .icon {
     font-size: 18px;
     color: #666;
+    
+    :deep(svg) {
+      display: block !important;
+    }
   }
 
   &:hover {

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

@@ -67,8 +67,6 @@
 
     <div class="page-number">幻灯片 {{slideIndex + 1}} / {{slides.length}}</div>
 
-    <!-- 引入活动的列表页面 -->
-    <Active ref="activeRef" v-show="false"/>
   </div>
 </template>
 
@@ -88,7 +86,6 @@ import ThumbnailSlide from '../../../views/components/ThumbnailSlide/index.vue'
 import LayoutPool from './LayoutPool.vue'
 import Popover from '../../../components/Popover.vue'
 import Draggable from 'vuedraggable'
-import Active from '../Toolbar/ElementStylePanel/Active/index.vue'
 
 const mainStore = useMainStore()
 const slidesStore = useSlidesStore()
@@ -127,7 +124,6 @@ const {
   updateSectionTitle,
 } = useSectionHandler()
 
-const activeRef = ref()
 
 // 页面被切换时
 const thumbnailsRef = ref<InstanceType<typeof Draggable>>()
@@ -151,8 +147,6 @@ watch(() => slideIndex.value, () => {
 
 // 切换页面
 const changeSlideIndex = (index: number) => {
-  console.log(workItem.value[index],'hasSection');
-  activeRef.value.clickPPTList(workItem.value[index])
   
   mainStore.setActiveElementIdList([])
 
@@ -402,12 +396,17 @@ const contextmenusThumbnailItem = (): ContextmenuItem[] => {
   .icon {
     margin-right: 3px;
     font-size: 14px;
+    
+    :deep(svg) {
+      display: block !important;
+    }
   }
 }
 .thumbnail-list {
   padding: 5px 0;
   flex: 1;
   overflow: auto;
+  border-bottom: 1px solid $borderColor;
 }
 .thumbnail-item {
   display: flex;
@@ -486,7 +485,6 @@ const contextmenusThumbnailItem = (): ContextmenuItem[] => {
 .page-number {
   height: 40px;
   font-size: 12px;
-  border-top: 1px solid $borderColor;
   line-height: 40px;
   text-align: center;
   color: #666;

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

@@ -32,12 +32,12 @@
         <!-- 作业列表 -->
         <div class="c-apt-r">
                 <!-- 显示-作业内容 -->
-            <template v-for="(item, index) in workList">
+            <template v-for="(item, index) in workList" :key="index">
                 <div class="item">
                     <div class="item-title">
                         <el-tag :type="getTagType(item.worktype) || 'primary'">{{item.worktype}}</el-tag>
-                        <el-tooltip :content="item.title||item.uniquekey" placement="top">
+                        <el-tooltip :content="item.evaltitle" placement="top">
-                        <div class="tt">{{item.title||item.uniquekey}}</div>
+                            <div class="tt">{{item.evaltitle}}</div>
                         </el-tooltip>
                         <el-button class="btn-del" type="danger" link @click="handleRemoveDemoActivityClassWork(item)">删除</el-button>
                     </div>
@@ -45,8 +45,10 @@
             </template>
         </div>
         <!-- // 推送作业 -->
-        <el-dialog v-model="dialogVisible" append-to-body :show-close="false" width="80%">
+        <el-dialog v-model="dialogVisible" append-to-body :show-close="false" width="80%" height="500">
-            <NewClassTsakAssign :currentCourse='currentCourse'/>
+            <el-scrollbar height="500">
+                <NewClassTsakAssign :currentCourse='currentCourse' @getData="getData" />
+            </el-scrollbar>
         </el-dialog>
         <!-- 活动引用 -->
         <el-dialog 
@@ -55,9 +57,9 @@
             append-to-body
             :show-close="false"
             width="40%"
-            @selection-change="handleSelectionChange">
+        >
-            <el-table :data="taskList" style="width: 100%" height="500">
+            <el-table :data="taskList" style="width: 100%" height="500" @selection-change="handleSelectionChange">
-                <el-table-column type="selection" :selectable="selectable" width="55" />
+                <el-table-column type="selection" width="55" :selectable="selectable"/>
                 <el-table-column prop="evaltitle" label="活动名称" width="150" />
                 <el-table-column prop="worktype" label="活动类型" width="120" sortable>
                     <template #default="scope">
@@ -68,160 +70,246 @@
             </el-table>
             <template #footer>
                 <el-button @click="activeVisible = false">取 消</el-button>
-                <el-button type="primary" @click="save">确 定</el-button>
+                <el-button type="primary" @click="savePPtData">确 定</el-button>
             </template>
         </el-dialog>
     </div>
 </template>
-<script setup>
+<script setup lang="ts">
-import { ref, reactive, onMounted, onBeforeMount, defineExpose } from 'vue'
+import { ref, reactive, onMounted, nextTick, watch } from 'vue'
 import Divider from '../../../../../components/Divider.vue'
-import {listEntpcoursefile} from '@/api/education/entpcoursefile'
+import { listEntpcoursefile } from '@/api/education/entpcoursefile'
-import {homeworklist} from '@/api/teaching/classwork'
+import { homeworklist } from '@/api/teaching/classwork'
 import { processList } from "@/hooks/useProcessList";
 import { listEntpcoursework } from "@/api/classTask/index";
-import { ElMessageBox } from 'element-plus'
+import { ElMessageBox,ElMessage } from 'element-plus'
 import NewClassTsakAssign from '@/views/classTask/newClassTaskAssign/index.vue'
 import { sessionStore } from '@/utils/store'
 import { useGetHomework } from '@/hooks/useGetHomework'
-const currentCourse = reactive({
+import { PPTApi } from '../../../../../api/index'
-    textbookId:0,
+import { storeToRefs } from 'pinia'
-    levelFirstId:0,
+import {useSlidesStore} from '../../../../../store'
-    levelSecondId:0,
+const slidesStore = useSlidesStore()
-    coursetitle:'',
+const { slides, slideIndex, currentSlide, workItem } = storeToRefs(slidesStore)
-    node:{},
+
-    id:1,
+interface CourseNode {
-    worktype:'',
+    rootid: number;
-})
+    parentNode: { id: number };
-const dataList = ref([])
+    id: number;
-const dialogVisible = ref(false)
+    itemtitle: string;
-const tasklist_loading = ref(false)
-// 活动列表
-const taskList = ref([])
-// 活动引用的弹窗
-const activeVisible = ref(false)
-const params = reactive({
-    parentid:14766,
-    pageSize:500,
-    orderby:'fileidx'
-})
-const type = ref([
-    {
-        label:'习题训练',
-        value:'danger'
-    },
-    {
-        label:'课堂展示',
-        value:'success'
-    },
-    {
-        label:'常规作业',
-        value:'primary'
-    },
-])
-// 作业列表
-const workList = ref([])
-const selectable = (row,index) => {
-    console.log(row,index,'row,index');
-    return true
 }
 
-const clickPPTList = (item) => {
+interface CurrentCourse {
-    console.log(item,'点击了')
+    textbookId: number;
-    workList.value = []
+    levelFirstId: number;
-    let datacontent = item.datacontent;
+    levelSecondId: number;
-    let pptJson = "";
+    coursetitle: string;
-    if(typeof datacontent === 'string') pptJson = JSON.parse(datacontent)
+    node: CourseNode;
-    if(pptJson&&pptJson[0]&&pptJson[0].classworkList) {
+    id: number;
-        homeworklist({ids:pptJson[0].classworkList, pageSize: 100}).then( async res => {
+    worktype: string;
-            await formatClassWorkFile(res.rows)
-        })
-    }
 }
-const formatClassWorkFile = async (postData) => {
+
-    return new Promise(async (resolve, reject)=>{
+interface Params {
-        for (let i = 0; i < postData.length; i++) {
+    parentid: number;
-            let item = postData[i];
+    pageSize: number;
-            switch (item.worktype) {
+    orderby: string;
-                case '框架梳理': {
+}
-                }
+
-                    break;
+interface WorkType {
-                case '习题训练': {
+    label: string;
-                    item.entpcourseworklistarray = item.entpcourseworklist?JSON.parse('['+item.entpcourseworklist+']'):[];
+    value: string;
-                    let workIds = item.entpcourseworklistarray.map(items=>items.id).join(',')
+}
-                    let ress = await listEntpcoursework({ids:workIds})
+
-                    processList(ress.rows)
+interface WorkItem {
-                    item.workShowList = ress.rows
+    status: string;
-                }
+    activityContent?: string;
-                    break;
+    worktype: string;
-                case '课堂展示': {
+    quizlist?: { id: number }[];
-                    item.base64 = JSON.parse(item.workcodes).base64
+    workcodes: string;
-                }
+    base64?: string;
-                    break;
+    prevData?: any;
-                case '常规作业': {
+    id: number;
-                    item.prevData = JSON.parse(item.workcodes)
+    evaltitle?: string; // 添加 evaltitle 属性
-                }
+}
+
+const currentCourse = reactive<CurrentCourse>({
+    textbookId: 0,
+    levelFirstId: 0,
+    levelSecondId: 0,
+    coursetitle: '',
+    node: {} as CourseNode,
+    id: 1,
+    worktype: '',
+})
+
+const dataList = ref<WorkItem[]>([])
+const dialogVisible = ref<boolean>(false)
+const tasklist_loading = ref<boolean>(false)
+
+// 活动列表
+const taskList = ref<WorkItem[]>([])
+
+// 活动引用的弹窗
+const activeVisible = ref<boolean>(false)
+
+const params = reactive<Params>({
+    parentid: 14766,
+    pageSize: 500,
+    orderby: 'fileidx'
+})
+
+const type = ref<WorkType[]>([
+    {
+        label: '习题训练',
+        value: 'danger'
+    },
+    {
+        label: '课堂展示',
+        value: 'success'
+    },
+    {
+        label: '常规作业',
+        value: 'primary'
+    },
+])
+
+const objItem = ref<any>({})
+// 作业列表
+const workList = ref<WorkItem[]>([])
+
+// 获取所选择的作业列表
+const selectedWorkList = ref<WorkItem[]>([])
+
+
+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> => {
+    for (let i = 0; i < postData.length; i++) {
+        let item = postData[i];
+        switch (item.worktype) {
+            case '框架梳理': {
+            }
+                break;
+            case '习题训练': {
+                console.log(item,'item');
+                // let workIds = item.quizlist!.map(items => items.id).join(',');
+                // let ress = await listEntpcoursework({ ids: workIds });
+                // const arr = ress.rows.map((item:{id:number}) => {
+                //     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)
         }
-        resolve()
+        const arr = paramData.value.activityContent.split(',')
-    })
+        arr.push(item.id.toString()) 
+        await PPTApi.updateSlide(paramData.value)
+        addWorkList(item)
+    }
+    await nextTick();
+}
+// 添加的活动回显到页面上面去
+const addWorkList = (item: WorkItem) => {
+    workList.value.push(item)
 }
 // 删除作业
-const handleRemoveDemoActivityClassWork = (item) => {
+const handleRemoveDemoActivityClassWork = (item: WorkItem) => {
     ElMessageBox.confirm('是否确认删除？')
-    .then(function () {
+        .then(() => {
-        workList.value.splice(workList.value.indexOf(item), 1);
+            workList.value.splice(workList.value.indexOf(item), 1);
-    })
+        })
-    .catch(() => {});
+        .catch(() => { });
 }
+
 // 获取tag的样式
-const getTagType = (worktype) => {
+const getTagType = (worktype: string): string => {
-    return type.value.find(item => item.label == worktype).value
+    return type.value.find(item => item.label === worktype)!.value
 }
+
 // 获取活动引用的列表数据
-const initHomeWork = async()=> {
+const initHomeWork = async () => {
-  tasklist_loading.value = true;
+    tasklist_loading.value = true;
-  const { res, chapterId } = await useGetHomework(sessionStore.get('subject.curNode'));
+    const { res, chapterId } = await useGetHomework(sessionStore.get('subject.curNode'));
-  taskList.value = res;
+    taskList.value = res;
-  tasklist_loading.value = false;
+    tasklist_loading.value = false;
 }
+
 // 多选活动引用
-const handleSelectionChange = (val) => {
+const handleSelectionChange = (val: WorkItem[]) => {
-    console.log(val,'多选')
+    selectedWorkList.value = [...val]
 }
+
 // 打开添加作业活动
-const showDialog = (item) => {
+const showDialog = (item: string) => {
     currentCourse.worktype = item
     dialogVisible.value = true
 }
+
 const openList = () => {
     activeVisible.value = true
     initHomeWork()
 }
+
 // 添加活动引用列表作业
-const save = () => {
+const savePPtData = async () => {
-    console.log('添加了')
+    if (selectedWorkList.value.length === 0) {
+        ElMessage.warning('请选择活动')
+        return
+    }
+    const arr = selectedWorkList.value.map(item => item.id)
+    // 应该是新加而不是覆盖
+    paramData.value.activityContent = arr.join(',')
+    await PPTApi.updateSlide(paramData.value)
     activeVisible.value = false
 }
+
 onMounted(() => {
-    // console.log(sessionStore.get('subject.curBook'),'curBook');
+    const curNode = sessionStore.get('subject.curNode') as CourseNode
-    // console.log(sessionStore.get('subject.subjectTree'),'subjectTree');
-    // console.log(sessionStore.get('subject.bookList'),'bookList');
-    console.log(sessionStore.get('subject.curNode'),'curNode');
-    const curNode = sessionStore.get('subject.curNode')
     currentCourse.textbookId = curNode.rootid
     currentCourse.levelFirstId = curNode.parentNode.id
     currentCourse.levelSecondId = curNode.id
-    currentCourse.coursetitle = curNode.itemtitle,
+    currentCourse.coursetitle = curNode.itemtitle
     currentCourse.node = curNode
-    listEntpcoursefile(params).then((res) => {
+    listEntpcoursefile(params).then((res: { rows: WorkItem[] }) => {
         dataList.value = [...res.rows]
     })
+    objItem.value = workItem.value[slideIndex.value]
+    getCurrentPPtData()
 })
-defineExpose({
+watch(() => slideIndex.value, () => {
-    clickPPTList
+    getCurrentPPtData()
 })
+// 获取当前ppt页的数据
+const getCurrentPPtData = async () => {
+    workList.value = []
+    objItem.value = workItem.value[slideIndex.value]
+    paramData.value.id =  objItem.value.id
+    if (objItem.value?.activityContent) {
+        paramData.value.activityContent = objItem.value?.activityContent
+        const res = await homeworklist({ ids: objItem.value?.activityContent, pageSize: 100 })
+        await formatClassWorkFile(res.rows)
+    }
+}
+
+// 接收习题训练的值
+const getData = async (data: WorkItem) => {
+    console.log(data, 'data')
+    await formatClassWorkFile([data])
+}
+
 </script>
 <style scoped lang="scss">
 .buttonDiv{

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

@@ -144,8 +144,14 @@ import { convertTextToPicture, getQueue, getPromptId, getPicture, chattoprompt,
 import CryptoJS from 'crypto-js'
 import { useRoute } from 'vue-router'
 export default {
-
+  props: {
+    hasPPt: {
+      type: Boolean,
+      default: false
+    }
+  },
   data() {
+  
     return {
       form: {
         ratio: "512",
@@ -384,7 +390,7 @@ export default {
           urls.push(url0)
           buttonState.push({
           disabled: false,
-          text: "插入本课素材资源库",
+          text: this.hasPPt ? '插入' : "插入本课素材资源库",
         })
         }
         this.skeletonNumber = 0
@@ -476,6 +482,10 @@ 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=');

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

@@ -35,7 +35,7 @@ const getFileTypeIcon = () => {
     txt: 'icon-txt',
     rar: 'icon-rar',
     apt: 'icon-A',
-    aptist: 'icon-A',
+    aippt: 'icon-A',
   }
   if (iconObj[name]) {
     return '#' + iconObj[name]

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

@@ -87,6 +87,12 @@ const headerMenus = [
     icon: 'icon-gongzuotai',
     path: '/desktop'
   },
+  {
+    name: '教学实践',
+    id: 4,
+    icon: 'icon-jiaoxueshijian',
+    path: '/prepare'
+  },
   {
     name: '资源中心',
     id: 3,

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

@@ -0,0 +1,164 @@
+/**
+ * websocket 工具类(im 自己实现)
+* 单例模式:  保证一个类仅有一个实例，并提供一个访问它的全局访问点。
+* 实现的方法为先判断实例存在与否，如果存在则直接返回，不存在就创建了再返回，这就确保了一个类只有一个实例对象。
+*/
+import useUserStore from '@/store/modules/user' // 用户信息
+
+export class ChatWs {
+  instance = null; // 实例
+  id = null; // 群聊id || 单聊id-用户id(userId)
+  closed = false; // 关闭状态
+  onmessage = null; // 自定义处理
+  errCount = 5; // 重连次数 (ms) 暂时不使用
+  errTime = null; // 重连时间 (ms) 1秒内zhi间内不重连
+  // 类型定义
+  TYPES = {
+    group: 'group', // 群发
+    single: 'single', // 单发
+    beat: 'heart_beat', // 心跳
+  }
+  static base = 'wss://file.ysaix.com:7868'
+  constructor() {
+    if (!ChatWs.instance) {
+      const userStore = useUserStore() // 用户信息
+      const wsBase = import.meta.env.VITE_APP_WS_URL; // ws地址
+      const url = `${wsBase||ChatWs.base}/ws/websocket/${userStore.id}`;
+      this.init(url);
+      ChatWs.instance = this;
+    }
+    return ChatWs.instance;
+  }
+
+  // 初始化
+  init(url) {
+    this.url = url;
+    this.ws = null;
+    const _this = this
+    this.heartCheck = {
+      timeout: 1000 * 10, // 60s
+      timeoutObj: null,
+      serverTimeoutObj: null,
+      reset() {
+        clearTimeout(this.timeoutObj);
+        clearTimeout(this.serverTimeoutObj);
+        return this;
+      },
+      start() {
+        const self = this;
+        this.timeoutObj = setTimeout(function () {
+          // 这里发送一个心跳，后端收到后，返回一个心跳消息，
+          // onmessage拿到返回的心跳就说明连接正常
+          console.log("websocket-发送心跳")
+          _this.sendMsgBeat();
+          self.serverTimeoutObj = setTimeout(function () {
+            console.log("websocket-心跳响应超时")
+            // 如果超过一定时间还没重置，说明后端主动断开了
+            _this.ws.close(); // 如果onclose会执行reconnect，我们执行ws.close()就行了.如果直接执行reconnect 会触发onclose导致重连两次
+          }, self.timeout);
+        }, this.timeout);
+      },
+    };
+    this.reconnect();
+  }
+  // 重连
+  reconnect() {
+    const self = this;
+    if (!!this.ws) { // 关闭之前的链接
+      this.ws.close()
+      this.ws = null
+    }
+    this.ws = new WebSocket(this.url);
+    this.ws.onopen = function () {
+      console.log("websocket-连接成功")
+      self.heartCheck.reset().start();
+    };
+    this.ws.onmessage = function (e) {
+      // console.log("websocket-收到消息", e)
+      // 拿到任何消息都说明当前连接是正常的
+      const isBeat = e.data == 'pong'
+      isBeat && self.heartCheck.reset().start();
+      const exts = ['sessionId', 'pong'] // 不处理的消息头
+      const isEmpty = !e.data
+      const isExts = exts.some(item => e.data.includes(item))
+      if (isEmpty && isExts) return;
+      // 自定义处理
+      self.onmessage && self.onmessage(e.data, e);
+    };
+    this.ws.onerror = function (e) {
+      console.log("websocket-连接异常", e)
+      self.connectSocket() // 重连
+    };
+    this.ws.onclose = function (e) {
+      console.log("websocket-连接断开", e)
+      self.connectSocket() // 重连
+    };
+  }
+  connectSocket() {
+    this.heartCheck.reset() // 重置心跳
+    if (self.closed) return; // 关闭状态不重连
+    // if(self.errCount <= 0) return; // 超过重连次数
+    // self.errCount--; // 重连次数减1
+    if (this.errTime) {
+      const nowTime = Date.now();
+      const bool = nowTime - this.errTime < 1000 // 1s内zhi间内不重连
+      if (bool) return; // 1s内不重连
+    }
+    this.errTime = Date.now();
+    // 延时5s 后重连
+    console.log('重连中...')
+    this.sleep(5000).then(_ => {this.reconnect()})
+  }
+  // 发送消息
+  send(msg) {
+    if (!msg) throw new Error("msg is not null")
+    if (!this.ws) throw new Error("ws is not null")
+    if (typeof msg === "object") msg = JSON.stringify(msg)
+    if (!msg.includes('"msg":')) throw new Error("msg 格式错误请重试")
+    this.ws.send(msg)
+  }
+  // 发送消息-带消息头(key)
+  sendMsg(head, content, option = {}) {
+    if (!head) throw new Error("head is not null")
+    if (!content) throw new Error("content is not null")
+    let msg = { head, content, ...option }
+    // 发送消息
+    this.send(this.getMsgObj(msg))
+  }
+  // 发送心跳
+  sendMsgBeat() {
+    // this.send(this.getMsgObj('ping', this.TYPES.beat))
+    this.ws.send('ping')
+  }
+  /**
+   * @description 获取消息对象
+   * @param {*} msg 消息内容
+   * @param {*} chatType 群发 group| 单发 single| 心态 heart_beat
+   * @param {*} id 群聊id || 单聊id-用户id(userId)
+   */
+  getMsgObj(msg, chatType = 'group', id) {
+    if (typeof msg === "object") msg = JSON.stringify(msg)
+    const res = {msg, chatType}
+    // if (!id) throw new Error(`${type=='group'?'群ID':'用户ID'} is not null`)
+    if (chatType == 'group') res.groupId = id || this.id || ''
+    else if (chatType == 'single') res.to = id || this.id || ''
+    return res
+  }
+  // 监听
+  watch(callback) {
+    callback && (this.onmessage = callback);
+  }
+  // 关闭链接
+  close() {
+    this.closed = true;
+    this.ws.close();
+  }
+  // 延时 ms 毫秒
+  sleep(ms){
+    return new Promise(resolve => setTimeout(resolve, ms))
+  }
+}
+// 连接socket
+export const connect = () => new ChatWs()
+// 默认实例
+export default new ChatWs()

src/renderer/src/utils/tool.js

@@ -208,6 +208,10 @@ export const createWindow = async (type, data) => {
         autoHideMenuBar: true,
         maximizable: false,
       }
+      // pptlist的时候可以选择最大化
+      if (data.url == '/pptist'){
+        defOption.maximizable = true;
+      }
       data.isConsole = true // 是否开启控制台
       data.option = {...defOption, ...option}
       const win = await toolWindow(type, data)

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

@@ -126,7 +126,7 @@
   </div>
 </template>
 <script setup>
-import { onMounted, ref, watch, reactive, getCurrentInstance, nextTick } from 'vue'
+import { onMounted, ref, watch, reactive, getCurrentInstance, nextTick, defineEmits } from 'vue'
 import { ElMessage } from 'element-plus'
 import { cloneDeep } from 'lodash'
 import { Plus, Delete } from '@element-plus/icons-vue'
@@ -156,6 +156,7 @@ const { proxy } = getCurrentInstance()
 const props = defineProps({
   currentCourse: Object,
 })
+const emits = defineEmits(['getData'])
 const isShow = ref(false)
 
 const propsQueryCourseObj = route.query.courseObj;//作业布置的内容对象
@@ -460,10 +461,8 @@ const handleClassWorkFormQuizRemove = (index) =>{
   await nextTick(); // 确保DOM更新完成
   proxy.$refs["classWorkFormRef"].validate(async valid => {
     if (valid) {
-      //
       // const { chapterId } = await useGetHomework(courseObj.node)
       // this.entpcourseid = chapterId
-
       const cform = {
         id: 0,
         workdate: classWorkForm.workdate, // //作业类型？web端这里貌似没有这个时间
@@ -507,7 +506,7 @@ const handleClassWorkFormQuizRemove = (index) =>{
         cform.workcodes = JSON.stringify({json: canvasJson, base64: canvasBase64});
         cform.entpcourseworklist = JSON.stringify([{'id':-1, 'score': '10'}]);
         try {
-          addClassworkReturnId(cform).then(() => {
+          addClassworkReturnId(cform).then((res) => {
             ElMessage({ type: 'success', message: '作业设计成功!'});
             // 重置提交表单
             classWorkForm.worktype = "课堂展示";
@@ -519,7 +518,8 @@ const handleClassWorkFormQuizRemove = (index) =>{
             // 情况选择的资源缓存
             classWorkForm.chooseWorkLists = []; // 框架梳理list
             classWorkForm.whiteboardObj = ''; // ? // 清空白板
-
+            classWorkForm.id = res
+            emits('getData',classWorkForm)
             boardLoading.value = false
           })
         } finally {
@@ -531,7 +531,7 @@ const handleClassWorkFormQuizRemove = (index) =>{
         cform.workcodes = JSON.stringify(classWorkForm.fileHomeworkList);
         cform.entpcourseworklist = JSON.stringify([{'id':-2, 'score': '10'}]);
         try {
-          addClassworkReturnId(cform).then(() => {
+          addClassworkReturnId(cform).then((res) => {
             ElMessage({ type: 'success', message: '作业设计成功!'});
             // 重置提交表单
             classWorkForm.worktype = "常规作业";
@@ -543,7 +543,8 @@ const handleClassWorkFormQuizRemove = (index) =>{
             classWorkForm.chooseWorkLists = []; // 框架梳理list
             classWorkForm.whiteboardObj = ''; // ? // 清空白板
             classWorkForm.fileHomeworkList = []; // 常规作业list
-
+            classWorkForm.id = res
+            emits('getData',classWorkForm)
             fileLoading.value = false
           })
         } finally {
@@ -574,7 +575,7 @@ const handleClassWorkFormQuizRemove = (index) =>{
         console.log(cform,'提交的数据');
         if(cform.entpcourseworklist == '') return ElMessage({ type: 'warning', message: '请先添加作业资源!'});
 
-        addClassworkReturnId(cform).then(workres => {
+        addClassworkReturnId(cform).then(res => {
           ElMessage({ type: 'success', message: '作业设计成功!'});
           // 重置提交表单
           classWorkForm.worktype = "习题训练";
@@ -585,6 +586,8 @@ const handleClassWorkFormQuizRemove = (index) =>{
           // 情况选择的资源缓存
           classWorkForm.chooseWorkLists = [];
           classWorkForm.whiteboardObj = ''; // ? // 清空白板
+          classWorkForm.id = res
+          emits('getData',classWorkForm)
           // refresh the list
           //这里分离了，所以不需要更新表单数据了
           // this.getClassWorkAllList();
@@ -604,6 +607,7 @@ const handleClassWorkFormQuizRemove = (index) =>{
       //   // 首页进入的，跳转到作业布置页面
       //   router.push({ path: '/classTaskAssign' });
       // }
+
     }
   });
 };

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

@@ -1,5 +1,5 @@
 <template>
-  <div  class="page">
+  <div class="page">
     <!-- 习题筛选1 -->
     <el-row style="width: 100%; height: 50px;">
       <el-col :span="7">
@@ -60,7 +60,7 @@
     <div class="page-table" >
       <el-table 
         :data="workResource.entpCourseWorkList" 
-        style="width: 100%; height: calc(100% - 55px);"
+        style="width: 100%; height: calc(100% - 50px);"
         v-loading="pageParams.loading"
       >
         <el-table-column type="index" width="60" />
@@ -89,13 +89,13 @@
         </el-table-column>
       </el-table>
       <!-- 分页-->
-      <div style="height: 55px;">
+      <div style="height: 50px;">
         <el-pagination
           v-show="pageParams.total > 0"
           v-model:page="paginationParams.pageNum"
           v-model:limit="paginationParams.pageSize"
           :total="pageParams.total"
-          :style="{ position: 'relative', 'margin-top': '5px' }"
+          :style="{ position: 'relative', 'padding-top': '10px' }"
           @change="getPaginationList" />
       </div>
     </div>
@@ -105,8 +105,7 @@
 </template>
 <script setup>
 import { Search } from '@element-plus/icons-vue'
-import html2canvas from 'html2canvas';
+//import html2canvas from 'html2canvas';
-import { toPng } from 'html-to-image';
 import { onMounted, ref,watch, reactive, getCurrentInstance,nextTick } from 'vue'
 
 import {listEntpcoursework, listEntpcourseworkNew, getEntpcoursework} from '@/api/education/entpCourseWork'
@@ -189,6 +188,7 @@ const workResource = reactive({
 }); // 作业资源
 
 onMounted(() => {
+  console.log('entpCourseWorkTypeList', entpCourseWorkTypeList);
   debounceQueryData(); // 查询习题列表
 })
 
@@ -439,26 +439,16 @@ const getPaginationList = ( page, limit ) => {
  */
 const  captureScreenshot = (id) => {
   const targetElement = document.getElementById('screenshot-target-' + id);
+  if (targetElement) {
+    emit('addQuizImgBs64', targetElement);
+  }
   // html2canvas(targetElement).then(canvas => {
-  //   console.log(canvas);
   //   // 将canvas转换为图像URL
   //   const screenshotUrl = canvas.toDataURL('image/png');
   //   // 在这里可以将截图保存到本地或上传到服务器
   //   // console.log(screenshotUrl);
   //   emit('addQuizImgBs64', screenshotUrl);
   // });
-  // const node = document.querySelector('#img')
-      console.log(targetElement)
-      toPng(targetElement).then((dataUrl) => {
-        // 使用图片数据URL
-        console.log(dataUrl);
-        // this.imgUrl = dataUrl
-        //  console.log(this.imgUrl)
-        emit('addQuizImgBs64', dataUrl);
-      })
-        .catch(function (error) {
-          console.error('转换错误:', error);
-        });
 }
 
 

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

@@ -10,7 +10,7 @@
         <el-button type="primary" @click="onchange('/model/newClassTaskAssign')">作业管理</el-button>
         <el-button type="success" @click="onchange('/model/teaching')">教材研读</el-button>
         <el-button type="info" @click="onchange('/model/design')">教学框架设计</el-button>
-        <el-button type="success" @click="openPPTist">打开PPTist</el-button>
+<!--        <el-button type="success" @click="openPPTist">打开PPTist</el-button>-->
         <el-button type="info" @click="onchange('/model/examination')">考试分析</el-button>
         <el-button type="primary" v-menus="dt.menus">测试</el-button>
         <el-button type="success" @click="onchange('/model/aiKolors')">文生图片</el-button>
@@ -61,7 +61,6 @@ import { sessionStore } from '@/utils/store' // 学科名字文生图
 // 组件引入
 import ChooseTextbook from '@/components/choose-textbook/index.vue'
 import { menusEvent } from '@/plugins/vue3-menus' // 右键菜单
-
 const router = useRouter()
 const userStore = useUserStore() // 用户信息
 
@@ -197,6 +196,19 @@ const getResourceList = async () => {
 // 统一HTTP处理
 const HTTP_SERVER_API = (type, params = {}) => {
   switch (type) {
+    case 'addSmarttalk': { // 获取课程
+      const def = {
+        fileId: '', // 文件id - Entpcoursefile 对应id
+        fileFlag: 'aptist',
+        fileShowName: courseObj.coursetitle + '.aptist',
+        textbookId: courseObj.textbookId,
+        levelFirstId: courseObj.levelFirstId,
+        levelSecondId: courseObj.levelSecondId,
+        fileSource: '个人',
+        fileRoot: '备课'
+      }
+      return API_smarttalk.creatAPT({...def, ...params})
+    }
     case 'addEntpcourse': { // 添加课程
       const node = courseObj.node || {}
       if (!node) return msgUtils.msgWarning('请选择章节?')
@@ -230,7 +242,7 @@ const HTTP_SERVER_API = (type, params = {}) => {
         ppttype: 'file',
         title: enpt.coursetitle,
         fileurl: '',
-        filetype: 'aptist',
+        filetype: 'aippt',
         datacontent: '',
         filekey: '',
         filetag: '',
@@ -279,6 +291,8 @@ const handleAll = async(type, row) =>{
         }
         // 生成ppt课件-子级(slide)
         await HTTP_SERVER_API('addEntpcoursefile', params)
+        // 生成备课资源-Smarttalk
+        await HTTP_SERVER_API('addSmarttalk',{fileId: id})
         // 刷新资源列表
         await getResourceList()
       } else {
@@ -287,7 +301,7 @@ const handleAll = async(type, row) =>{
       break;
     }
     case 'open': {    // 打开资源-pptist
-      if (row.filetype != 'aptist') return msgUtils.msgWarning('暂不支持该类型文件操作!')
+      if (row.filetype != 'aippt') return msgUtils.msgWarning('暂不支持该类型文件操作!')
       sessionStore.set('curr.resource', row) // 缓存当前资源信息
       createWindow('open-win', {
         url: '/pptist', // 窗口关闭时，清除缓存
@@ -312,7 +326,7 @@ const handleAll = async(type, row) =>{
 // icons 处理 type 代表传递svg
 const getIcon = (o, type) => {
   let icon = typeof o == 'string' ? o : o?.filetype
-  if (['aptist'].includes(o?.filetype)) icon = 'pptx'
+  if (['aippt'].includes(o?.filetype)) icon = 'pptx'
   if (!!type) { // 其他格式icon
     switch(type) {
       case 'svg': // 返回svg格式

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

@@ -158,7 +158,7 @@ const outlineCreatePPT = () => {
 
     const checkProgress = () => {
       getProgressV2(res.sid).then(response => {
-        percentage.value = Math.round(response?.donePages/response?.totalPages)*100;
+        percentage.value = Math.round(response?.donePages*100/response?.totalPages);
         if (response.pptStatus === "done") {
           emit('addSuccess',{...res,url:response.pptUrl})
           ElMessage.success("生成成功");
@@ -267,7 +267,6 @@ function webSocketSend(ws, data) {
 
 function result1(resultData) {
   let jsonData = JSON.parse(resultData);
-  console.log(jsonData)
   outputText.value += jsonData.payload.choices.text[0].content;
   const div = document.querySelector('.paragraphs');
   if (div) {

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

@@ -78,7 +78,7 @@
     </div>
   </el-dialog>
   <!-- im-chat 聊天组件 -->
-  <im-chat ref="imChatRef" v-if="visible" @change="chatChange" />
+  <!-- <im-chat ref="imChatRef" v-if="visible" @change="chatChange" /> -->
 </template>
 
 <script setup>
@@ -90,7 +90,7 @@ import vueQr from 'vue-qr/src/packages/vue-qr.vue'      // 插件: 二维码
 import imChat from '@/views/tool/components/imChat.vue' // im-chat-子组件
 import MsgEnum from '@/plugins/imChat/msgEnum'          // 消息头-相关定义(nuem)
 import * as commUtil from '@/utils/comm'                // 工具类-通用
-import { toLinkWeb, getStaticUrl } from '@/utils/tool'  // 工具类-主进程相关
+import { toLinkWeb, createWindow, getStaticUrl, sessionStore } from '@/utils/tool'  // 工具类-主进程相关
 
 import * as Http_ClassManage from '@/api/classManage'   // api接口
 import * as Http_Classcourse from '@/api/teaching/classcourse' // api接口
@@ -103,7 +103,7 @@ let baseUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
 const userStore = useUserStore()
 const visible = ref(false)      // 是否打开窗口
 const myClassActive = ref({})   // 我的课件：准备上课的APT课件
-const imChatRef = ref(null)     // im-chat ref
+// const imChatRef = ref(null)     // im-chat ref
 const emit = defineEmits(['close'])
 const classForm = reactive({    // 班级(左侧)：表单数据 表单配置
   form: {}, itemOption: [], option: {}
@@ -177,7 +177,7 @@ const initData = () => {
   teacherForm.itemOption = [
     // { label: '班级', prop: 'classid' },
     // { label: '上课', prop: 'classcourseid' },
-    { label: '老师扫码', prop: 'qrUrl', show: false },
+    // { label: '老师扫码', prop: 'qrUrl', show: false },
     { label: '手机登录', prop: 'mobile', show: false },
     { label: '故障备用', prop: 'backup', show: false },
   ]
@@ -257,18 +257,22 @@ const createClasscourse = async () => {
     entpcourseid, evalid, coursetitle,
     plandate: curDate, opendate: curDate
   }
+  // teacherForm.form.classcourseid = 100
   teacherForm.form.classcourseid = await Http_Classcourse.addClasscourseReturnId(params)
   dt.loading = false
   // getClasscourseList('update') // 更新列表
-  ElMessage.success('创建课程-成功')
+  let msgEl = ElMessage.success('创建课程-成功')
   // 新版-pptList 打开公屏
-  if (myClassActive.value.filetype == 'aptist') {
+  if (myClassActive.value.filetype == 'aippt') {
-    const msgEl = ElMessage.warning({message:'正在打开公屏，请稍后...',duration: 0})
     setTimeout(() => {
       msgEl.close()
-      const classcourse = {...params, id: teacherForm.form.classcourseid}
+      msgEl = ElMessage.warning({message:'正在打开公屏，请稍后...',duration: 0})
-      openPublicScreen(classcourse)
+      setTimeout(() => {
-    }, 1500);
+        msgEl.close()
+        const classcourse = {...params, id: teacherForm.form.classcourseid}
+        openPublicScreen(classcourse)
+      }, 2000);
+    }, 1000);
   }
 }
 // 删除课程
@@ -296,14 +300,23 @@ const removeClasscourse = async () => {
 const classTeachingStart = async () => {
   const { classcourseid:id } = teacherForm.form
   if (id) { // 开始上课
-    const url = `/teaching/classteaching?classcourseid=${id}&actor=classTeachingOnPublicScreen`
+    // 新版-pptList 打开公屏
-    toLinkWeb(url)        // 跳转web-公屏
+    if (myClassActive.value.filetype == 'aptist') {
-    visible.value = false // 关闭弹窗
+      const msgEl = ElMessage.warning({message:'正在打开公屏，请稍后...',duration: 0})
-    handleClose()         // 关闭im-chat
+      setTimeout(() => {
+        msgEl.close()
+        openPublicScreen({id})
+      }, 2000);
+    }else {
+      const url = `/teaching/classteaching?classcourseid=${id}&actor=classTeachingOnPublicScreen`
+      toLinkWeb(url)        // 跳转web-公屏
+      visible.value = false // 关闭弹窗
+    }
   }
 }
 // 获取二维码地址
 const getQrUrl = async() => {
+  // console.log('获取二维码地址')
   const { classcourseid:id } = teacherForm.form
   const { userName, userId } = userStore.user
   if (!id||!userName) return
@@ -336,6 +349,7 @@ const getQrUrl = async() => {
 
 // 打开公屏
 const openPublicScreen = (classcourse) => {
+  console.log('打开公屏', classcourse)
   const resource = toRaw(myClassActive.value)
   sessionStore.set('curr.resource', resource) // 缓存当前资源信息
   sessionStore.set('curr.classcourse', classcourse) // 缓存当前当前上课
@@ -346,6 +360,7 @@ const openPublicScreen = (classcourse) => {
       sessionStore.set('curr.classcourse', null) // 清除缓存
     }
   })
+  visible.value = false // 关闭弹窗
 }
 
 // 定时器监听
@@ -386,12 +401,14 @@ watch(() => classForm.form.classid, (val)=> {
 // 监听-课程id
 watch(() => teacherForm.form.classcourseid, (val) => {
   const bool = !!val
+  const isApt = myClassActive.filetype=='apt'
   // 获取选中课程-生成二维码地址
-  bool && getQrUrl()
+  isApt && bool && getQrUrl()
   // 监听课程id，是否显示功能
   teacherForm.itemOption.forEach(o => {
     // 有课程id，触发
-    if (['qrUrl','backup'].includes(o.prop)) o.show = bool
+    const arr = isApt ? ['qrUrl','backup'] : ['backup']
+    if (arr.includes(o.prop)) o.show = bool
     // 课程id为空，触发
     if (['mobile'].includes(o.prop)) o.show = !bool
   })

src/renderer/src/views/prepare/container/kj-list-item.vue

@@ -341,7 +341,7 @@ export default {
           cookieData: { ...configObj.data }
         })
         return
-      } else if(items.fileFlag === 'aptist') { // aptist 被点击 打开PPT-List 课件
+      } else if(items.fileFlag === 'aippt') { // aippt 被点击 打开PPT-List 课件
         return this.$emit('change', 'click', items)
       }
       if (!items||!items.fileSuffix) return;

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

@@ -2,8 +2,20 @@
   <div v-loading="isLoading" class="page-resource flex">
     <ChooseTextbook @node-click="nodeClick" />
     <div class="page-center-wrap">
+      <el-dropdown class="prepare-center-dropdown">
+        <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="createAptFile">新建文枢课件</el-dropdown-item>
+            <el-dropdown-item>AI一键生成</el-dropdown-item>
+            <el-dropdown-item>导入PPT</el-dropdown-item>
+          </el-dropdown-menu>
+        </template>
+      </el-dropdown>
       <el-tabs v-model="activeAptTab" style="height: 100%;">
-        <el-tab-pane label="教学课件" name="教学课件" class="prepare-center-jxkj">
+        <el-tab-pane label="文枢课件" name="教学课件" class="prepare-center-jxkj">
           <div class="prepare-center-header">
             <div class="center-create-btn" style="background-color: rgb(64,158,255)" @click="createAptFile">
               <div class="create-btn-title"><el-icon><Plus /></el-icon><label>创建APT</label></div>
@@ -145,7 +157,7 @@
   <!-- <button @click="test">test</button> -->
 </template>
 <script setup>
-import { Check,Plus } from '@element-plus/icons-vue'
+import {Check, Plus, Position} from '@element-plus/icons-vue'
 import Reserv from '@/views/prepare/container/reserv.vue'
 import { ArrowDown } from '@element-plus/icons-vue'
 import PptDialog from '@/views/prepare/container/ppt-dialog.vue'
@@ -180,8 +192,11 @@ import ClassReserv from '@/views/classManage/classReserv.vue'
 import TreeLog from '@/views/prepare/components/treeLog.vue'
 import classStart from './container/class-start.vue' // 预备上课
 import MsgEnum from '@/plugins/imChat/msgEnum'  // im 消息枚举
-import Chat from '@/utils/chat' // im 登录初始化
+// import Chat from '@/utils/chat' // im 登录初始化
-if (!Chat.imChat) Chat.init()
+// if (!Chat.imChat) Chat.init()
+// import ChatWs from '@/plugins/socket'
+// console.log('xxxx',ChatWs)
+// ChatWs.watch((data,e) => console.log('ws', data, e))
 
 const toolStore = useToolState()
 const fs = require('fs')
@@ -253,11 +268,11 @@ export default {
     },
     currentKJFileList() {
       // return this.currentFileList.filter((item) => item.fileFlag === 'apt' || item.fileFlag === '课件')
-      return this.currentFileList.filter((item) => ['apt','aptist','课件'].includes(item.fileFlag))
+      return this.currentFileList.filter((item) => ['apt','aippt','课件'].includes(item.fileFlag))
     },
     currentSCFileList() {
       // return this.currentFileList.filter((item) => item.fileFlag !== 'apt' && item.fileFlag !== '课件')
-      return this.currentFileList.filter((item) => !['apt','aptist','课件'].includes(item.fileFlag))
+      return this.currentFileList.filter((item) => !['apt','aippt','课件'].includes(item.fileFlag))
     }
   },
 
@@ -321,7 +336,7 @@ export default {
       if(item.fileFlag === 'apt') {
         this.$refs.calssRef.open(item.fileId, classObj)
       }
-      if(item.fileFlag === 'aptist') {
+      if(item.fileFlag === 'aippt') {
         this.$refs.calssRef.open(item.fileId, classObj)
       }
     },
@@ -378,8 +393,8 @@ export default {
           }, 1000)
           break
         }
-        case 'click': { // 点击-打开课件-aptist
+        case 'click': { // 点击-打开课件-aippt
-          if (row.fileFlag === 'aptist' && !!row.fileId) {
+          if (row.fileFlag === 'aippt' && !!row.fileId) {
             const res = await getEntpcoursefile(row.fileId)
             if (res && res.code === 200) {
               sessionStore.set('curr.resource', res.data) // 缓存当前资源信息
@@ -461,6 +476,93 @@ export default {
         },500)
       })
     },
+    createAIPPT() {
+      listEntpcourse({
+        evalid: this.currentNode.id,
+        edituserid: this.userStore.userId,
+        pageSize: 500
+      }).then((response) => {
+        if (response.rows.length <= 0) return
+        let resCourse = response.rows[0]
+        // 添加
+        let form = {
+          parentid: 0,
+          entpid: this.userStore.deptId,
+          entpcourseid: resCourse.id,
+          ppttype: 'file',
+          title: resCourse.coursetitle,
+          fileurl: '',
+          filetype: 'aippt',
+          datacontent: '',
+          filekey: '',
+          filetag: '',
+          fileidx: 0,
+          dflag: 0,
+          status: '',
+          edituserid: this.userStore.userId
+        }
+        addEntpcoursefileReturnId(form).then((slideid) => {
+          let pagearray = []
+          // 公屏
+          pagearray.push({
+            key: '公屏',
+            title: '公屏页',
+            slidedata: {
+              attrs: { width: 1333, height: 749.8125 },
+              className: 'Stage',
+              children: [
+                {
+                  attrs: {},
+                  className: 'Layer',
+                  children: [
+                    {
+                      attrs: {
+                        width: 1333,
+                        height: 749.8125,
+                        fill: 'white',
+                        name: 'fixedbackground',
+                        listening: true
+                      },
+                      className: 'Rect'
+                    }
+                  ]
+                }
+              ]
+            }
+          })
+
+          // 添加
+          var form = {
+            parentid: slideid,
+            entpid: resCourse.entpid,
+            entpcourseid: resCourse.id,
+            ppttype: 'file',
+            title: '第一页',
+            fileurl: '',
+            filetype: 'slide',
+            datacontent: JSON.stringify(pagearray),
+            filekey: '',
+            filetag: '',
+            fileidx: 0,
+            dflag: 0,
+            status: '',
+            edituserid: this.userStore.userId
+          }
+          addEntpcoursefileReturnId(form).then((res) => {
+            creatAPT({
+              ...this.uploadData,
+              fileId: slideid,
+              fileShowName: this.currentNode.itemtitle + '.apt'
+            }).then((res) => {
+              this.currentFileList.unshift(res.resData)
+              setTimeout(()=>{
+                this.$refs['kjItemRef'+res.resData.id][0].openFileWin(res.resData);
+              },500)
+            })
+          })
+        })
+      })
+    },
     createAptFile() {
       listEntpcourse({
         evalid: this.currentNode.id,
@@ -653,7 +755,7 @@ export default {
           for (let i = 0; i < this.currentFileList.length; i++) {
             let item = this.currentFileList[i]
             if (item.fileFlag === 'apt') continue;
-            if (item.fileFlag === 'aptist') continue;
+            if (item.fileFlag === 'aippt') continue;
             await asyncLocalFile(item)
           }
           this.asyncAllFileVisiable = false
@@ -872,6 +974,13 @@ export default {
     margin: 0 5px;
     border-radius: 10px;
     background-color: white;
+    position: relative;
+    .prepare-center-dropdown{
+      z-index: 9999;
+      position: absolute;
+      right: 10px;
+      top: 4px;
+    }
     .prepare-center-jxkj{
       height: 100%;
       display: flex;

src/renderer/src/views/profile/userInfo.vue

@@ -34,7 +34,6 @@ import {getDept } from '@/api/login'
 import { listEvaluation } from '@/api/subject/index'
 import useUserStore from '@/store/modules/user'
 import {ElMessage} from 'element-plus'
-import { clearBookInfo } from '@/utils/ruoyi'
 import { sessionStore } from '@/utils/store'
 import {listClassmain} from '@/api/classManage/index'
 //班级列表

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

@@ -131,6 +131,7 @@ const params = reactive(
 
 const addAiPPT = async(res) => {
   let node = courseObj.node
+  pptDialog.value = false;
   if (!node) return msgUtils.msgWarning('请选择章节?')
   pgDialog.visible = true
   pgDialog.pg.percentage = 0
@@ -238,8 +239,8 @@ const HTTP_SERVER_API = (type, params = {}) => {
       const node = courseObj.node || {}
       const def = {
         fileId: '', // 文件id - Entpcoursefile 对应id
-        fileFlag: 'aptist',
+        fileFlag: 'aippt',
-        fileShowName: node.itemtitle + '.aptist',
+        fileShowName: node.itemtitle + '.aippt',
         textbookId: node.rootid,
         levelFirstId: node.parentid||node.id,
         levelSecondId: node.parentid && node.id,
@@ -298,7 +299,7 @@ const getDefParams = (params) => {
     ppttype: 'file',
     title: enpt.coursetitle,
     fileurl: '',
-    filetype: 'aptist',
+    filetype: 'aippt',
     datacontent: '',
     filekey: '',
     filetag: '',