diff --git a/src/renderer/src/views/model/index.vue b/src/renderer/src/views/model/index.vue
index 3af46e0..0617ab3 100644
--- a/src/renderer/src/views/model/index.vue
+++ b/src/renderer/src/views/model/index.vue
@@ -52,12 +52,8 @@ import { useRouter } from 'vue-router'
 import { Plus, Refresh, Upload, Files, UploadFilled } from '@element-plus/icons-vue'
 import useUserStore from '@/store/modules/user' // 用户信息
 import msgUtils from '@/plugins/modal' // 消息工具
-<<<<<<< HEAD
 import { createWindow } from '@/utils/tool' // 相关工具
-=======
-import { createWindow, sessionStore } from '@/utils/tool' // 相关工具
 import * as API_smarttalk from '@/api/file' // 文件相关api
->>>>>>> c22b360e0fc344cad791625894423981d45c5cb2
 import * as API_entpcourse from '@/api/education/entpcourse' // 相关api
 import * as API_entpcoursefile from '@/api/education/entpcoursefile' // 相关api
 import { dataSetJson } from '@/utils/comm' // 数据集id文生图
@@ -201,19 +197,6 @@ 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('请选择章节?')
@@ -296,8 +279,6 @@ const handleAll = async(type, row) =>{
         }
         // 生成ppt课件-子级(slide)
         await HTTP_SERVER_API('addEntpcoursefile', params)
-        // 生成备课资源-Smarttalk
-        await HTTP_SERVER_API('addSmarttalk',{fileId: id})
         // 刷新资源列表
         await getResourceList()
       } else {