package.json

@@ -1,6 +1,6 @@
 {
   "name": "aix-win",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "An Electron application with Vue",
   "main": "./out/main/index.js",
   "author": "example.com",

src/main/file.js

@@ -224,7 +224,7 @@ export default async function ({ app, shell, BrowserWindow, ipcMain }) {
           formData.append(key, uploadData[key])
         }
       }
-      formData.append('fileFlag', '教案')
+      formData.append('fileFlag', '课件')
       uploadFileByFS({
         url: uploadUrl,
         path,

src/main/index.js

@@ -68,7 +68,7 @@ function createLoginWindow() {
 function createMainWindow() {
   mainWindow = new BrowserWindow({
     width: 1200,
-    minWidth: 1200,
+    minWidth: 1350,
     height: 700,
     show: false,
     frame: false, // 无边框
@@ -142,9 +142,9 @@ async function createLinkWin(data) {
     .catch((error) => {})
   data.fullPath = data.fullPath.replaceAll('//', '/')
   if (data.fullPath.indexOf('?') !== -1) {
-    data.fullPath += '&urlSource=smarttalk'
+    data.fullPath += '&urlSource=smarttalk&t' + Date.now()
   }else {
-    data.fullPath += '?urlSource=smarttalk'
+    data.fullPath += '?urlSource=smarttalk&t' + Date.now()
   }
   linkWin[data.key].loadURL(data.fullPath)
 

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

@@ -34,7 +34,7 @@ const getFileTypeIcon = () => {
     gif: 'icon-gif',
     txt: 'icon-txt',
     rar: 'icon-rar',
-
+    apt: 'icon-lunwen'
   }
   if (iconObj[name]) {
     return '#' + iconObj[name]
@@ -47,4 +47,4 @@ const getFileTypeIcon = () => {
 
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped></style>

src/renderer/src/layout/components/AppMain.vue

@@ -9,7 +9,7 @@
       </div>
     </div> -->
     <transition mode="out-in" name="fade-transform">
-      <div v-show="$route != null" style="height: 100%; flex: 1">
+      <div v-show="$route != null" style="height: 100%; flex: 1;width: 100%">
         <router-view v-slot="{ Component, route }">
           <keep-alive>
             <component :is="Component" v-if="route.meta.keepAlive" :key="route.name" />

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

@@ -0,0 +1,323 @@
+<template>
+  <div class="prepare-body-main-item">
+    <div class="prepare-body-main-item-icon">
+      <slot name="default"></slot>
+      <FileImage :size="50" :file-name="item.fileShowName" @click="openFileWin(item)" />
+    </div>
+    <div class="prepare-body-main-item-info" @click="openFileWin(item)">
+      <div class="prepare-item-info-title" :title="item.fileShowName">
+        <div
+          style="
+            flex: 1;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            width: 200px;
+          "
+        >
+          {{ item.fileShowName.substring(0, item.fileShowName.lastIndexOf('.')) }}
+          <el-tag type="danger" effect="dark">{{item.fileShowName.substring(item.fileShowName.lastIndexOf('.')+1)}}</el-tag>
+          <template v-if="item.fileTag">
+            <el-tag v-for="(item1, index1) in item.fileTag.split(',')" :key="index1" type="success" effect="dark" style="margin-left: 5px">{{item1}}</el-tag>
+          </template>
+        </div>
+      </div>
+      <div class="prepare-item-info-message">
+        <div v-if="item.fileFlag ==='课件'" style="width: 60px">
+          <el-icon
+            v-loading="item.async === 'on'"
+            style="background-color: green; border-radius: 20px; color: white; top: 2px"
+          >
+            <Check v-if="item.async === true" />
+            <UploadFilled v-if="!item.async" />
+          </el-icon>
+          {{ item.async === true ? '已同步' : '' }}
+          {{ !item.async ? '待同步' : '' }}
+          {{ item.async === 'on' ? '同步中' : '' }}
+        </div>
+        <template v-if="item.fileFlag ==='课件'">|</template>
+        <div style="width: 70px">访问 100</div>
+        |
+        <div style="width: 70px">引用 50</div>
+        |
+        <div
+            style="
+            flex: 1;
+            text-align: left;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            width: 200px;
+          ">点赞 20</div>
+      </div>
+    </div>
+    <div class="prepare-body-main-item-btn">
+      <el-button type="primary" @click="clickStartClass(item)">上课</el-button>
+    </div>
+    <div class="prepare-body-main-item-tool">
+      <el-popover
+        :ref="'popover_' + index"
+        placement="left-start"
+        :hide-after="100"
+        popper-class="prepare-popper"
+        trigger="click"
+      >
+        <template #default>
+          <div style="width: 100%">
+            <div class="item-popover" @click="closePopver(index)">
+              <div v-if="userInfo.userId === Number(item.createUserId)" class="item-popover-item">
+                <el-button text @click="editTalk(item, index)">
+                  <i class="iconfont icon-bianji"></i>
+                  <span>标签</span>
+                </el-button>
+              </div>
+              <div v-if="userInfo.userId === Number(item.createUserId)" class="item-popover-item">
+                <el-button text @click="deleteTalk(item)">
+                  <i class="iconfont icon-shanchu"></i>
+                  <span>删除</span>
+                </el-button>
+              </div>
+            </div>
+          </div>
+        </template>
+        <template #reference>
+          <span class="iconfont icon-shenglvehao" style="cursor: pointer" @click.stop></span>
+        </template>
+      </el-popover>
+    </div>
+  </div>
+</template>
+<script setup>
+import { Check, UploadFilled, Switch } from '@element-plus/icons-vue'
+</script>
+<script>
+import FileImage from '@/components/file-image/index.vue'
+import { asyncLocalFile } from '@/utils/talkFile'
+import { toTimeText } from '@/utils/date'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { deleteSmarttalk, updateSmarttalk, getPrepareById } from '@/api/file'
+import useUserStore from '@/store/modules/user'
+import outLink from '@/utils/linkConfig'
+
+const { ipcRenderer } = window.electron || {}
+export default {
+  name: 'FileListItem',
+  components: { FileImage },
+  props: {
+    item: {
+      type: Object,
+      default: function () {
+        return {}
+      }
+    },
+    index: {
+      type: Number,
+      default: function () {
+        return 0
+      }
+    }
+  },
+  emits: { 'on-start-class': null, 'on-delete': null, 'on-set': null, 'on-delhomework': null,'on-filearg': null },
+  data() {
+    return {
+      listenList: [],
+      userInfo:{}
+    }
+  },
+  mounted() {
+    this.userInfo = useUserStore().user
+  },
+  methods: {
+    clickStartClass(item) {
+      this.$emit('on-start-class', item)
+    },
+    editTalk(item) {
+      ElMessageBox.prompt('请输入新的标签', '添加标签', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        inputValue: "",
+        inputPattern: /^[a-zA-Z0-9\u4e00-\u9fa5]{1,5}$/,
+        inputErrorMessage: '请输入最多五个字的标签,不能携带标点符号'
+      })
+        .then(({ value }) => {
+          let fileTagList = []
+          if (!item.fileTag) {
+            item.fileTag="";
+            fileTagList = [];
+          }else {
+            fileTagList = item.fileTag.split(',');
+          }
+          fileTagList.push(value);
+          item.fileTagList = fileTagList;
+          item.fileTag = fileTagList.join(",")
+          updateSmarttalk({ id: item.id, fileTag: item.fileTag, fileShowName: item.fileShowName }).then((res) => {
+            if (res.data === true) {
+              ElMessage({
+                type: 'success',
+                message: `添加成功！`
+              })
+            }
+          })
+        })
+        .catch(() => {})
+    },
+    downloadFile(item) {
+      ipcRenderer.send('save-as', item.fileFullPath, item.fileShowName)
+    },
+    deleteTalk(item) {
+      deleteSmarttalk(item.id).then((res) => {
+        if (res.data === true) {
+          this.$emit('on-delete', item)
+        }
+      })
+    },
+    closePopver(index) {
+      this.$refs['popover_' + index].hide()
+    },
+    formatFileSize(fileSize) {
+      if (fileSize < 1024) {
+        return fileSize + 'B'
+      } else if (fileSize < 1024 * 1024) {
+        let temp = fileSize / 1024
+        temp = temp.toFixed(2)
+        return temp + 'KB'
+      } else if (fileSize < 1024 * 1024 * 1024) {
+        let temp = fileSize / (1024 * 1024)
+        temp = temp.toFixed(2)
+        return temp + 'MB'
+      } else {
+        let temp = fileSize / (1024 * 1024 * 1024)
+        temp = temp.toFixed(2)
+        return temp + 'GB'
+      }
+    },
+    openFileWin(items) {
+      if (items.fileFlag === 'apt') {
+        console.log(items);
+        const path="/teaching/aptindex?id="+items.fileId
+        let configObj = outLink().getBaseData()
+        let fullPath = configObj.fullPath + path
+        fullPath = fullPath.replaceAll('//', '/')
+        // 通知主进程
+        ipcRenderer.send('openWindow', {
+          key: path,
+          fullPath: fullPath,
+          cookieData: { ...configObj.data }
+        })
+        return
+      }
+      if (!items||!items.fileSuffix) return;
+      getPrepareById(items.id).then((item) => {
+        Object.assign(items, item)
+        asyncLocalFile(items).then(() => {
+          ipcRenderer.send('open-path-app', item.fileNewName)
+          if (this.listenList.indexOf(item.fileNewName) === -1) {
+            this.listenList.push(item.fileNewName)
+            let cookie = localStorage.getItem('Admin-Token')
+            ipcRenderer.send('listen-file-change', {
+              id: item.id,
+              fileNewName: item.fileNewName,
+              md5: item.fileMd5,
+              cookie,
+              fileType: item.fileType
+            })
+            ipcRenderer.on('listen-file-change-on' + item.fileNewName, () => {
+              items.async = 'on'
+            })
+            ipcRenderer.on('listen-file-change-success' + item.fileNewName, (e, { data, md5 }) => {
+              items.fileSize = data.fileSize
+              items.md5 = md5
+              items.async = true
+            })
+          }
+        })
+      })
+    },
+    //布置
+    setHomeWork(item) {
+      // this.$emit('on-set', item)
+    },
+    // 删除作业
+    deleteHomework(item){
+      this.$emit('on-delhomework', item)
+    },
+    // 文件资源打开web AIX 布置作业
+    openFileLink(item){
+      let unitId = item.levelSecondId ? item.levelSecondId : item.levelFirstId
+      // key 对应的 linkConfig.js 外部链接配置
+      let key = 'filehomework'
+      let configObj = outLink()[key]
+      // 通知主进程
+      ipcRenderer.send('openWindow', {
+        key,
+        fullPath: configObj.fullPath + `&fileShowName=${item.fileShowName}&fileFullPath=${item.fileFullPath}&unitId=${unitId}`,
+        cookieData: { ...configObj.data }
+      })
+
+      this.$emit('on-filearg', item)
+    }
+  }
+}
+</script>
+<style>
+.prepare-item-info-message {
+  .circular {
+    width: 100% !important;
+  }
+}
+</style>
+<style scoped lang="scss">
+.prepare-body-main-item {
+  display: flex;
+  align-items: center;
+  border-bottom: 1px solid rgba(131, 131, 127, 0.17);
+  padding: 10px 0;
+
+  &:hover {
+    background-color: rgba(144, 147, 153, 0.2);
+    cursor: pointer;
+  }
+
+  .prepare-body-main-item-icon {
+    width: 80px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    .icon-zuoye {
+      font-size: 40px;
+      color: #707070;
+    }
+  }
+
+  .prepare-body-main-item-tool {
+    font-size: 18px !important;
+    font-weight: bold;
+    width: 40px;
+    text-align: center;
+  }
+
+  .prepare-body-main-item-info {
+    display: flex;
+    flex-direction: column;
+    min-width: 0;
+    flex: 1;
+
+    .prepare-item-info-title {
+      text-align: left;
+      font-size: 16px;
+      display: flex;
+    }
+
+    .prepare-item-info-message {
+      font-size: 12px;
+      line-height: 23px;
+      color: #909399;
+      display: flex;
+
+      .circular {
+        width: 100% !important;
+      }
+    }
+  }
+}
+</style>

src/renderer/src/views/prepare/container/reserv.vue

@@ -2,7 +2,7 @@
   <el-dialog
     v-model="centerDialogVisible"
     class="reserv-dialog"
-    title="预约课程"
+    title="上课"
     destroy-on-close
     :before-close="closeDialog"
     width="600"
@@ -74,7 +74,7 @@
     <template #footer>
       <div class="dialog-footer">
         <el-button @click="centerDialogVisible = false">取消</el-button>
-        <el-button type="primary" @click="submitForm"> 提交 </el-button>
+        <el-button type="primary" @click="submitForm"> 上课 </el-button>
       </div>
     </template>
   </el-dialog>
@@ -105,7 +105,7 @@ const userStore = useUserStore().user
 const centerDialogVisible = ref(false)
 const form = reactive({
   name: '',
-  type: '常规课',
+  type: '互动课',
   day: '',
   time: [],
   resource: [],
@@ -126,12 +126,6 @@ const ruleForm = reactive({
   resource: [{ required: true, message: '请选择授课对象', trigger: 'change' }]
 })
 const locationOptions = [
-  {
-    label: '常规课',
-    value: '常规课',
-    disabled: false,
-    message: '现场公屏授课，学生无需长时间打开平板上。'
-  },
   {
     label: '互动课',
     value: '互动课',
@@ -288,13 +282,13 @@ const addClassReserv = (formData) => {
     ex2: props.currentNode.id
   }
   addSmartClassReserv(param).then((res) => {
-    if (res.data === true) {
+    if (res.msg) {
       closeDialog()
       ElMessage({
         type: 'success',
         message: '预约成功！'
       })
-      emit('addSuccess')
+      emit('addSuccess',res.msg)
     } else {
       ElMessage({
         type: 'error',

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

@@ -1,8 +1,38 @@
 <template>
   <div v-loading="isLoading" class="page-resource flex">
     <ChooseTextbook @change-book="nodeClick" @node-click="nodeClick" />
+    <div class="page-center-wrap">
+      <el-tabs v-model="activeAptTab" style="height: 100%;">
+        <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>
+              <div class="create-btn-info">智能交互课件</div>
+            </div>
+            <div class="center-create-btn" style="background-color: rgb(112,182,3)" @click="createFile">
+              <div class="create-btn-title"><el-icon><Plus /></el-icon><label>创建PPT</label></div>
+              <div class="create-btn-info">传统课件</div>
+            </div>
+          </div>
+          <div class="prepare-center-body">
+            <kj-list-item
+              v-for="(item, index) in currentKJFileList"
+              :key="index"
+              :item="item"
+              :index="index"
+              @on-delete="deleteTalk"
+              @on-start-class="startClass"
+            >
+            </kj-list-item>
+          </div>
+        </el-tab-pane>
+        <el-tab-pane label="教学实录" name="教学实录" class="prepare-center-jxsl">
+          <class-reserv></class-reserv>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
     <div class="page-right">
-      <div class="header-top flex">
+<!--      <div class="header-top flex">
         <div class="textbook-img" @click="navtoPdf">
           <el-image style="width: 80px; height: 110px" :src="curBookImg" />
           <el-progress
@@ -32,85 +62,82 @@
           <label>{{ curClassReserv.startTime }}-{{ curClassReserv.endTime }}</label>
         </el-button>
         <div class="top-zoom-style"></div>
-      </div>
+      </div>-->
-      <div class="prepare-body-header">
+      <div style="padding: 0 20px;height: 100%;">
-        <div>
+        <el-tabs v-model="activeTab" class="prepare-tabs" >
-          <label style="font-size: 15px">共{{ currentFileList.length }}个文件</label>&nbsp;
+          <el-tab-pane label="素材" name="素材">
-          <el-popover placement="top-start" :width="250" trigger="hover">
+            <div class="prepare-body-header">
-            <template #default>
               <div>
-                <el-button
+                <label style="font-size: 15px">共{{ currentFileList.length }}个文件</label>&nbsp;
-                  v-if="lastAsyncAllTime"
+                <el-popover placement="top-start" :width="250" trigger="hover">
-                  type="success"
+                  <template #default>
-                  size="small"
+                    <div>
-                  :icon="Check"
+                      <el-button
-                  circle
+                        v-if="lastAsyncAllTime"
-                />
+                        type="success"
-                {{ lastAsyncAllTime ? toTimeText(lastAsyncAllTime) + '同步成功' : '' }}
+                        size="small"
+                        :icon="Check"
+                        circle
+                      />
+                      {{ lastAsyncAllTime ? toTimeText(lastAsyncAllTime) + '同步成功' : '' }}
+                    </div>
+                  </template>
+                  <template #reference>
+                    <el-button size="small" text @click="asyncAllFile">
+                      <el-icon v-loading="asyncAllFileVisiable">
+                        <Refresh />
+                      </el-icon>
+                      {{ asyncAllFileVisiable ? '同步中' : '云同步' }}
+                    </el-button>
+                  </template>
+                </el-popover>
+                <el-button size="small" @click="isDialogOpen = true">上传资料</el-button>
               </div>
-            </template>
+            </div>
-            <template #reference>
+            <el-checkbox-group
-              <el-button size="small" text @click="asyncAllFile">
+              v-model="checkFileList"
-                <el-icon v-loading="asyncAllFileVisiable">
+              class="prepare-body-main"
-                  <Refresh />
+              :style="{ 'margin-bottom': checkFileList.length > 0 ? '40px' : '0' }"
-                </el-icon>
+            >
-                {{ asyncAllFileVisiable ? '同步中' : '云同步' }}
+              <file-list-item
-              </el-button>
+                v-for="(item, index) in currentSCFileList"
-            </template>
+                :key="index"
-          </el-popover>
+                :item="item"
-        </div>
+                :index="index"
-        <div style="display: flex">
+                @on-move="onMoveSingleFile"
-          <el-button @click="handleOutLink('feedback')">作业反馈</el-button>
+                @on-delete="deleteTalk"
-          <el-button @click="handleOutLink('homeWork')">布置作业</el-button>
+                @on-set="openSet"
-          <el-button @click="isDialogOpen = true">上传资料</el-button>
+                @on-delhomework="delhomework"
-          <el-dropdown trigger="click" style="margin-left: 12px">
+                @on-filearg="isOpenHomework = true"
-            <el-button type="primary">
+              >
-              新建课件<el-icon class="el-icon--right"><arrow-down /></el-icon>
+                <el-checkbox v-if="!item.uniquekey" label="" :value="item" />
-            </el-button>
+              </file-list-item>
-            <template #dropdown>
+            </el-checkbox-group>
-              <el-dropdown-menu>
+          </el-tab-pane>
-                <el-dropdown-item style="padding: 0">
+          <el-tab-pane label="作业" name="作业">
-                  <el-button type="default" style="" @click="createFile">PPT课件</el-button>
+            <div class="prepare-body-header">
-                </el-dropdown-item>
+              <div>
-                <el-dropdown-item style="padding: 0">
+                <label style="font-size: 15px">共{{ currentWorkList.length }}个作业</label>&nbsp;
-                  <el-button type="default" style="" @click="createAptFile">APT课件</el-button>
+                <el-button size="small" @click="handleOutLink('feedback')">作业反馈</el-button>
-                </el-dropdown-item>
+                <el-button size="small" @click="handleOutLink('homeWork')">布置作业</el-button>
-              </el-dropdown-menu>
+              </div>
-            </template>
+            </div>
-          </el-dropdown>
+            <div class="prepare-work-wrap">
-        </div>
+              <file-list-item
+                v-for="(item, index) in currentWorkList"
+                :key="index"
+                :item="item"
+                :index="index"
+                @on-move="onMoveSingleFile"
+                @on-delete="deleteTalk"
+                @on-set="openSet"
+                @on-delhomework="delhomework"
+              >
+              </file-list-item>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
       </div>
-      <el-checkbox-group
-        v-model="checkFileList"
-        class="prepare-body-main"
-        :style="{ 'margin-bottom': checkFileList.length > 0 ? '40px' : '0' }"
-      >
-        <file-list-item
-          v-for="(item, index) in currentFileList"
-          :key="index"
-          :item="item"
-          :index="index"
-          @on-move="onMoveSingleFile"
-          @on-delete="deleteTalk"
-          @on-set="openSet"
-          @on-delhomework="delhomework"
-          @on-filearg="isOpenHomework = true"
-        >
-          <el-checkbox v-if="!item.uniquekey" label="" :value="item" />
-        </file-list-item>
-        <file-list-item
-          v-for="(item, index) in currentWorkList"
-          :key="index"
-          :item="item"
-          :index="index"
-          @on-move="onMoveSingleFile"
-          @on-delete="deleteTalk"
-          @on-set="openSet"
-          @on-delhomework="delhomework"
-        >
-          <el-checkbox v-if="!item.uniquekey" label="" :value="item" />
-        </file-list-item>
-      </el-checkbox-group>
       <file-oper-batch
         v-show="checkFileList.length > 0"
         :indeterminate="checkFileList.length > 0 && checkFileList.length < currentFileList.length"
@@ -132,10 +159,9 @@
     :book-id="uploadData.textbookId"
     @add-success="initReserv"
   ></reserv>
-  <!-- <button @click="ipcMsgSend('tool-sphere:close')">测试</button> -->
 </template>
 <script setup>
-import { Check } 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'
 </script>
@@ -149,6 +175,7 @@ import useUserStore from '@/store/modules/user'
 import { useToolState } from '@/store/modules/tool'
 import MoveFile from '@/components/move-file/index.vue'
 import FileListItem from '@/views/prepare/container/file-list-item.vue'
+import KjListItem from '@/views/prepare/container/kj-list-item.vue'
 import { getSmarttalkPage, moveSmarttalk, creatAPT } from '@/api/file'
 import { toTimeText } from '@/utils/date'
 import { ElMessage } from 'element-plus'
@@ -159,10 +186,10 @@ import outLink from '@/utils/linkConfig'
 import { createWindow, sessionStore } from '@/utils/tool'
 import { cloneDeep } from 'lodash'
 import { delClasswork, listEntpcourse } from '@/api/teaching/classwork'
-import { getSelfReserv } from '@/api/classManage'
+import { getClassInfo, getSelfReserv } from '@/api/classManage'
 import { useGetHomework } from '@/hooks/useGetHomework'
 import { addEntpcoursefileReturnId } from '@/api/education/entpcoursefile'
-
+import ClassReserv from '@/views/classManage/classReserv.vue'
 const toolStore = useToolState()
 
 const fs = require('fs')
@@ -175,9 +202,11 @@ export default {
     Refresh,
     uploadDialog,
     FileListItem,
+    KjListItem,
     FileOperBatch,
     MoveFile,
-    SetHomework
+    SetHomework,
+    ClassReserv
   },
   data() {
     return {
@@ -196,6 +225,8 @@ export default {
       curClassReserv: {},
       downloadNum: 0,
       lastAsyncAllTime: '',
+      activeTab: "素材",
+      activeAptTab: "教学课件",
       uploadData: {
         textbookId: null,
         levelFirstId: 39103,
@@ -219,6 +250,12 @@ export default {
       return (
         this.checkFileList.length > 0 && this.checkFileList.length === this.currentFileList.length
       )
+    },
+    currentKJFileList() {
+      return this.currentFileList.filter((item) => item.fileFlag === 'apt' || item.fileFlag === '课件')
+    },
+    currentSCFileList() {
+      return this.currentFileList.filter((item) => item.fileFlag !== 'apt' && item.fileFlag !== '课件')
     }
   },
 
@@ -230,13 +267,13 @@ export default {
       this.callback(param)
     })
     this.lastAsyncAllTime = localStorage.getItem('lastAsyncAllTime')
-    this.initReserv()
+    // this.initReserv()
   },
   mounted() {
     this.$watch(
       () => toolStore.isToolWin,
       (newD, oldD) => {
-        setTimeout(this.initReserv, 500)
+        // setTimeout(this.initReserv, 500)
       }
     )
     // electron 当前窗口
@@ -256,16 +293,19 @@ export default {
   //   }
   // },
   methods: {
-    initReserv() {
+    startClass(item) {
-      getSelfReserv().then((res) => {
+      console.log(item)
-        let list = res.data.filter((item) => {
+      if(item.fileFlag === '课件') {
-          return item.status !== '已结束'
+        this.openReserv()
-        })
+      }
-        if (list.length > 0) {
+      if(item.fileFlag === 'apt') {
-          this.curClassReserv = list[list.length - 1]
+        //TODO 打开apt
-        } else {
+      }
-          this.curClassReserv = {}
+    },
-        }
+    initReserv(id) {
+      getClassInfo(id).then((res) => {
+        this.curClassReserv = res.data
+        this.openLesson(res.data.id);
       })
     },
     getBookPathFromServer() {
@@ -312,7 +352,7 @@ export default {
     },
     createAptFile() {
       listEntpcourse({
-        evalid: this.uploadData.levelSecondId,
+        evalid: this.currentNode.id,
         edituserid: this.userStore.userId,
         pageSize: 500
       }).then((response) => {
@@ -596,7 +636,7 @@ export default {
       })
     },
     // 上课-工具类悬浮
-    async openLesson() {
+    async openLesson(id) {
       // await startClass(this.curClassReserv.id)
       createWindow('tool-sphere', {
         url:
@@ -605,7 +645,7 @@ export default {
           '&label=' +
           this.currentNode.label +
           '&reservId=' +
-          this.curClassReserv.id
+          id
       })
     }
   }
@@ -643,20 +683,78 @@ export default {
   user-select: none;
   padding-top: 10px;
   height: 100%;
-
+  :deep(.el-tabs__nav) {
+    .el-tabs__item{
+      font-weight: bold;
+      font-size: 18px;
+    }
+  }
+  .page-center-wrap{
+    flex: 1;
+    height: 100%;
+    padding: 0 10px;
+    .prepare-center-jxkj{
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+      .prepare-center-header{
+        display: flex;
+        cursor: pointer;
+        .center-create-btn{
+          cursor: pointer;
+          margin: 5px;
+          flex: 1;
+          height: 60px;
+          border-radius: 5px;
+          .create-btn-title{
+            font-weight: 900;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            font-size: 15px;
+            color: #ffffff;
+            height: 15px;
+            margin-top: 15px;
+            label{
+              cursor: pointer;
+            }
+          }
+          .create-btn-info{
+            cursor: pointer;
+            font-size: 12px;
+            color: #ffffff;
+            margin-top: 5px;
+          }
+        }
+      }
+      .prepare-center-body{
+        flex: 1;
+        overflow: auto;
+      }
+    }
+    .prepare-center-jxsl{
+      height: 100%;
+    }
+  }
   .page-right {
     overflow: hidden;
     position: relative;
-    min-width: 0;
+    min-width: 375px;
-    flex: 1;
+    width: 375px;
-    margin-left: 20px;
     height: 100%;
     background: #ffffff;
     border-radius: 10px;
     box-shadow: 0px 0px 20px 0px rgba(99, 99, 99, 0.06);
     display: flex;
     flex-direction: column;
-
+    .prepare-tabs{
+      height: 100%;
+      :deep(.el-tab-pane) {
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+      }
+    }
     .header-top {
       height: 150px;
       align-items: center;
@@ -742,20 +840,24 @@ export default {
     }
 
     .prepare-body-header {
-      height: 60px;
+      //height: 60px;
       width: 100%;
       display: flex;
       align-items: center;
       flex-wrap: wrap;
       justify-content: space-between;
-      padding: 0 20px;
+      //padding: 0 20px;
+    }
+    .prepare-work-wrap{
+      width: 100%;
+      flex: 1;
+      overflow: auto;
     }
-
     .prepare-body-main {
       flex: 1;
       width: 100%;
       overflow: auto;
-      padding: 0 30px;
+      //padding: 0 30px;
       line-height: normal;
     }
   }