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

@@ -81,8 +81,5 @@ const initLoad: Function = () => {
 <style lang="scss">
 #app {
   height: 100%;
-  svg, canvas, img, audio, video, iframe {
-    display: unset;
-  }
 }
 </style>

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

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

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

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

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>
@@ -230,7 +230,7 @@ const HTTP_SERVER_API = (type, params = {}) => {
         ppttype: 'file',
         title: enpt.coursetitle,
         fileurl: '',
-        filetype: 'aippt',
+        filetype: 'aptist',
         datacontent: '',
         filekey: '',
         filetag: '',
@@ -287,7 +287,7 @@ const handleAll = async(type, row) =>{
       break;
     }
     case 'open': {    // 打开资源-pptist
-      if (row.filetype != 'aippt') return msgUtils.msgWarning('暂不支持该类型文件操作!')
+      if (row.filetype != 'aptist') return msgUtils.msgWarning('暂不支持该类型文件操作!')
       sessionStore.set('curr.resource', row) // 缓存当前资源信息
       createWindow('open-win', {
         url: '/pptist', // 窗口关闭时，清除缓存
@@ -312,7 +312,7 @@ const handleAll = async(type, row) =>{
 // icons 处理 type 代表传递svg
 const getIcon = (o, type) => {
   let icon = typeof o == 'string' ? o : o?.filetype
-  if (['aippt'].includes(o?.filetype)) icon = 'pptx'
+  if (['aptist'].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*100/response?.totalPages);
+        percentage.value = Math.round(response?.donePages/response?.totalPages)*100;
         if (response.pptStatus === "done") {
           emit('addSuccess',{...res,url:response.pptUrl})
           ElMessage.success("生成成功");
@@ -267,6 +267,7 @@ 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

@@ -262,7 +262,7 @@ const createClasscourse = async () => {
   // getClasscourseList('update') // 更新列表
   ElMessage.success('创建课程-成功')
   // 新版-pptList 打开公屏
-  if (myClassActive.value.filetype == 'aippt') {
+  if (myClassActive.value.filetype == 'aptist') {
     const msgEl = ElMessage.warning({message:'正在打开公屏，请稍后...',duration: 0})
     setTimeout(() => {
       msgEl.close()

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

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

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

@@ -2,20 +2,8 @@
   <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>
@@ -157,7 +145,7 @@
   <!-- <button @click="test">test</button> -->
 </template>
 <script setup>
-import {Check, Plus, Position} from '@element-plus/icons-vue'
+import { Check,Plus } 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'
@@ -265,11 +253,11 @@ export default {
     },
     currentKJFileList() {
       // return this.currentFileList.filter((item) => item.fileFlag === 'apt' || item.fileFlag === '课件')
-      return this.currentFileList.filter((item) => ['apt','aippt','课件'].includes(item.fileFlag))
+      return this.currentFileList.filter((item) => ['apt','aptist','课件'].includes(item.fileFlag))
     },
     currentSCFileList() {
       // return this.currentFileList.filter((item) => item.fileFlag !== 'apt' && item.fileFlag !== '课件')
-      return this.currentFileList.filter((item) => !['apt','aippt','课件'].includes(item.fileFlag))
+      return this.currentFileList.filter((item) => !['apt','aptist','课件'].includes(item.fileFlag))
     }
   },
 
@@ -333,7 +321,7 @@ export default {
       if(item.fileFlag === 'apt') {
         this.$refs.calssRef.open(item.fileId, classObj)
       }
-      if(item.fileFlag === 'aippt') {
+      if(item.fileFlag === 'aptist') {
         this.$refs.calssRef.open(item.fileId, classObj)
       }
     },
@@ -390,8 +378,8 @@ export default {
           }, 1000)
           break
         }
-        case 'click': { // 点击-打开课件-aippt
-          if (row.fileFlag === 'aippt' && !!row.fileId) {
+        case 'click': { // 点击-打开课件-aptist
+          if (row.fileFlag === 'aptist' && !!row.fileId) {
             const res = await getEntpcoursefile(row.fileId)
             if (res && res.code === 200) {
               sessionStore.set('curr.resource', res.data) // 缓存当前资源信息
@@ -473,93 +461,6 @@ 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,
@@ -752,7 +653,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 === 'aippt') continue;
+            if (item.fileFlag === 'aptist') continue;
             await asyncLocalFile(item)
           }
           this.asyncAllFileVisiable = false
@@ -971,13 +872,6 @@ 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/teachingDesign/container/right.vue

@@ -131,7 +131,6 @@ 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
@@ -239,8 +238,8 @@ const HTTP_SERVER_API = (type, params = {}) => {
       const node = courseObj.node || {}
       const def = {
         fileId: '', // 文件id - Entpcoursefile 对应id
-        fileFlag: 'aippt',
-        fileShowName: node.itemtitle + '.aippt',
+        fileFlag: 'aptist',
+        fileShowName: node.itemtitle + '.aptist',
         textbookId: node.rootid,
         levelFirstId: node.parentid||node.id,
         levelSecondId: node.parentid && node.id,
@@ -299,7 +298,7 @@ const getDefParams = (params) => {
     ppttype: 'file',
     title: enpt.coursetitle,
     fileurl: '',
-    filetype: 'aippt',
+    filetype: 'aptist',
     datacontent: '',
     filekey: '',
     filetag: '',