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",
@@ -29,6 +29,7 @@
     "@vue-office/excel": "^1.7.11",
     "@vue-office/pdf": "^2.0.2",
     "@vueuse/core": "^10.11.0",
+    "circular-json": "^0.5.9",
     "cropperjs": "^1.6.2",
     "crypto-js": "^4.2.0",
     "echarts": "^5.5.1",

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/ai-chart/container/text.vue

@@ -16,7 +16,7 @@ import { ref, onMounted, nextTick  } from 'vue'
       default: 50, // 默认每字符间隔100毫秒
     },
   })
-  const emit = defineEmits(['loaded'])
+  const emit = defineEmits(['loaded', 'onSuccess'])
 
   const displayedText = ref('')
 

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

@@ -65,7 +65,7 @@
 </template>
 
 <script setup>
-import { ref, onMounted } from 'vue'
+import { ref, onMounted, watch } from 'vue'
 import useUserStore from '@/store/modules/user'
 import outLink from '@/utils/linkConfig'
 import Answer from './container/text.vue'
@@ -200,12 +200,16 @@ const closeChart = () =>{
   isOpen.value = false
 }
 
-
+watch(isOpen, (newVal)=>{
-onMounted(() => {
+  if(newVal){
-  conversation_id = localStorage.getItem("conversation_id");
     if (!conversation_id) {
       getChartId();
     }
+  }
+})
+
+onMounted(() => {
+  conversation_id = localStorage.getItem("conversation_id");
 })
 
 </script>

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

@@ -104,11 +104,16 @@ const getSubjectContent = async () => {
     pageSize: 10000
   }
 
-  let data;
+
+  if(localStorage.getItem('evaluationList')){
+    evaluationList.value = JSON.parse(localStorage.getItem('evaluationList'))
+  }
+  else{
     const { rows } = await listEvaluation(params)
     localStorage.setItem('evaluationList', JSON.stringify(rows))
     evaluationList.value = rows
-  data = rows
+  }
+ 
   treeLoading.value = false
 
   //获取教材版本
@@ -263,12 +268,16 @@ const transData = (data) => {
 
 //获取教材
 const getSubject = async () => {
-
+  if(localStorage.getItem('subjectList')){
+    subjectList.value = JSON.parse(localStorage.getItem('subjectList'))
+  }
+  else{
     const { rows } = await listEvaluation({ itemkey: "version", edusubject, edustage,  pageSize: 10000,orderby: 'orderidx asc', })
 
     // subjectList.value = rows.filter(item => item.edustage == edustage && item.edusubject == edusubject)
     subjectList.value = rows
     localStorage.setItem('subjectList', JSON.stringify(subjectList.value))
+  }
 
   // 默认第一个
   if(!subjectList.value.length) return

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]

src/renderer/src/components/upload-dialog/index.vue

@@ -49,7 +49,6 @@
 import { ref, watch } from 'vue'
 import FileImage from '@/components/file-image/index.vue'
 import { ElMessage } from 'element-plus'
-import { resourceType } from '@/utils/resourceDict'
 import { getFileSuffix, getFileName } from '@/utils/ruoyi'
 
 const props = defineProps({
@@ -58,6 +57,22 @@ const props = defineProps({
     default: false
   },
 })
+const resourceType = ref([
+  {
+    label: '素材',
+    value: '素材'
+  },
+
+  {
+    label: '课件',
+    value: '课件'
+  },
+
+  {
+    label: '教案',
+    value: '教案'
+  }
+])
 const dialogValue = ref(false)
 const limit = ref(5)
 // 定义要发送的emit事件

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/plugins/shareStore.js

@@ -4,6 +4,7 @@
 const isNode = typeof require !== 'undefined' // 是否支持node函数
 const { ipcRenderer } = isNode?require('electron'):{} // app使用
 import { sessionStore } from '@/utils/store'
+import CircularJSON from 'circular-json'
 // import { diff } from 'jsondiffpatch'
 // const Remote = isNode?require('@electron/remote'):{}  // 远程模块
 
@@ -173,6 +174,7 @@ const findDifferences = (obj1, obj2) => {
     for (const key in o1) {
       if (o1.hasOwnProperty(key)) {
         const newPath = path ? `${path}.${key}` : key;
+        if(!o2) return
         if (o2.hasOwnProperty(key)) {
           const v1 = toJsonStr(o1[key])
           const v2 = toJsonStr(o2[key])
@@ -202,6 +204,6 @@ const findDifferences = (obj1, obj2) => {
   return differences;
 }
 // 对象克隆
-const objClone = (obj) => JSON.parse(JSON.stringify(obj))
+const objClone = (obj) => JSON.parse(CircularJSON.stringify(obj))
 // 转换为json
-const toJsonStr = (obj) => JSON.stringify(obj)
+const toJsonStr = (obj) => CircularJSON.stringify(obj)

src/renderer/src/utils/date.js

@@ -88,6 +88,9 @@ export const getCurrentTime = (format)=> {
   const day = now.getDate().toString().padStart(2, '0');
   const hours = now.getHours().toString().padStart(2, '0');
   const minutes = now.getMinutes().toString().padStart(2, '0');
+  if(format == 'YYYY-MM-DD HH:mm'){
+    return `${year}-${month}-${day} ${hours}:${minutes}`;
+  } 
   if(format == 'YYYY-MM-DD'){
     return `${year}-${month}-${day}`;
   }

src/renderer/src/utils/resourceDict.js

@@ -1,14 +1,14 @@
 export const tabs = [
   {
-    label: '平台资源',
+    label: '平台',
     value: '平台'
   },
   {
-    label: '校本资源',
+    label: '校本',
     value: '校本'
   },
   {
-    label: '第三方资源',
+    label: '第三方',
     value: '第三方'
   },
 ]
@@ -57,18 +57,23 @@ export const  resourceFormat = [
 // 资源类型
 export const resourceType = [
   {
-    label: '素材',
+    label: '课例库',
-    value: '素材'
+    value: "'apt','课件','教案'"
+  },
+  {
+    label: '作业库',
+    value: '作业',
+    disabled: true
   },
 
   {
-    label: '课件',
+    label: '素材库',
-    value: '课件'
+    value: "'素材'"
   },
-
   {
-    label: '教案',
+    label: '习题库',
-    value: '教案'
+    value: '习题',
+    disabled: true
   }
 ]
 // 年级划分

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

@@ -140,7 +140,7 @@ const getClassWorkList = () => {
       edustage: userStore.edustage,// 学段
       edusubject: userStore.edusubject,//学科
       deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
-      orderby: 'uniquekey DESC',
+      orderby: 'concat(deaddate,uniquekey) DESC',
       pageSize: 100
     }).then((response) => {
       for (var i = 0; i < response.rows.length; i++) {
@@ -213,7 +213,8 @@ const getStudentClassWorkData = () => {
       edustage: userStore.edustage,// 学段
       edusubject: userStore.edusubject,//学科
       deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
-      orderby: "uniquekey DESC",
+      status: '1', // 作业状态：1-已发布
+      orderby: "uniquekey DESC",// TODO： 这里是否加 deaddate 的排序，后续看
       pageSize: 1000
     }).then((res) => {
       for (var t = 0; t < classWorkList.value.length; t++) {
@@ -369,7 +370,8 @@ const getStudentVisible = async () => {
     edustage: userStore.edustage,// 学段
     edusubject: userStore.edusubject,//学科
     deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
-    orderby: 'uniquekey DESC',
+    status: '1', // 作业状态：1-已发布
+    orderby: 'concat(deaddate,uniquekey) DESC',
     pageSize: 100
   })
   const curWorkList = response.rows

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

@@ -150,6 +150,7 @@
                             :min-scale="0.2"
                             :preview-src-list="stuItem.imagefile"
                             :initial-index="4"
+                            fit="contain"
                           />
                         </div>
                       </el-col>
@@ -233,6 +234,7 @@
                                     .map((item) => item.url)
                                 "
                                 :initial-index="4"
+                                fit="contain"
                               />
                             </div>
                           </div>
@@ -276,6 +278,7 @@
                               .map((item) => item.url)
                           "
                           :initial-index="4"
+                          fit="contain"
                         />
                       </div>
                     </div>
@@ -314,7 +317,6 @@
             </el-card>
           </div>
         </div>
-      </div>
 
         <!-- 批改评价与评语 -->
         <div class="tacher_conten_foot">
@@ -401,7 +403,7 @@
                   <el-input
                     v-model="classWorkFormScore.teacherremark"
                     type="textarea"
-                  rows="3"
+                    rows="1"
                     placeholder="请输入评语说明"
                   />
                 </el-col>
@@ -413,6 +415,7 @@
           </div>
         </div>
       </div>
+    </div>
 
     <!-- :style="{ height: dialogProps.maxheight + 'px' }" -->
     <el-dialog

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

@@ -10,7 +10,7 @@
     destory-on-close
     :before-close="onBeforeClose"
   >
-    <template #title>
+    <template #header>
       <div style="font-size: 18px; display: flex; flex-wrap: nowrap">
         <div style="flex: 1">
           {{ classWorkAnalysis.title }}答题情况

src/renderer/src/views/classTask/container/task-item.vue

@@ -2,7 +2,7 @@
   <div class="class-reserv-item">
     <div class="class-reserv-item-body">
       <div class="class-reserv-item-title1">
-        <el-tag style="margin-left: 5px" :type="item.workclass"> {{ item.worktype }}</el-tag>
+        <el-tag style="margin-left: 5px" :type="item.workclass?item.workclass:'info'"> {{ item.worktype }}</el-tag>
         <label style="margin-left: 10px">{{ item.uniquekey }}</label>
       </div>
 

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

@@ -81,8 +81,8 @@ import { toLinkWeb } from '@/utils/tool'
 
 import * as Http_ClassManage from '@/api/classManage'   // api接口
 import * as Http_Classcourse from '@/api/teaching/classcourse' // api接口
+import * as Http_Entpcoursefile from '@/api/education/entpcoursefile'   // api接口
 import useUserStore from "@/store/modules/user"         // 状态管理：user
-import { get } from 'lodash'
 
 const baseUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
 const userStore = useUserStore()
@@ -117,62 +117,63 @@ onMounted(() => {
  * @description 暴露方法-打开对话框
  * @param row 课件对象
  */
-const open = async (row) => {
+const open = async (id) => {
   visible.value = true
-  // if (row) myClassActive.value = row
+  // 获取apt详情
+  if (id) await getAptInfo(id)
   // 模拟数据
-  myClassActive.value = {
+  // myClassActive.value = {
-    "createBy": null,
+  //   "createBy": null,
-    "createTime": null,
+  //   "createTime": null,
-    "updateBy": null,
+  //   "updateBy": null,
-    "updateTime": null,
+  //   "updateTime": null,
-    "remark": null,
+  //   "remark": null,
-    "id": 14740,
+  //   "id": 14740,
-    "idarray": null,
+  //   "idarray": null,
-    "jsonarray": null,
+  //   "jsonarray": null,
-    "entpid": 255,
+  //   "entpid": 255,
-    "parentid": 14741,
+  //   "parentid": 14741,
-    "linkids": "",
+  //   "linkids": "",
-    "linklist": "",
+  //   "linklist": "",
-    "entpcourseid": 7300,
+  //   "entpcourseid": 7300,
-    "entpcourseidarray": null,
+  //   "entpcourseidarray": null,
-    "evalid": 39952,
+  //   "evalid": 39952,
-    "evaltitle": " 质点 参考系",
+  //   "evaltitle": " 质点 参考系",
-    "coursetitle": " 质点 参考系",
+  //   "coursetitle": " 质点 参考系",
-    "classid": 0,
+  //   "classid": 0,
-    "ppttype": "file",
+  //   "ppttype": "file",
-    "title": " 质点 参考系",
+  //   "title": " 质点 参考系",
-    "fileidx": 0,
+  //   "fileidx": 0,
-    "fileurl": "",
+  //   "fileurl": "",
-    "pathfile": null,
+  //   "pathfile": null,
-    "filetype": "ppt",
+  //   "filetype": "ppt",
-    "filesize": null,
+  //   "filesize": null,
-    "datacontent": "",
+  //   "datacontent": "",
-    "filekey": "",
+  //   "filekey": "",
-    "filetag": "",
+  //   "filetag": "",
-    "dflag": 0,
+  //   "dflag": 0,
-    "status": "",
+  //   "status": "",
-    "edituserid": 2781,
+  //   "edituserid": 2781,
-    "editusername": "张雪林",
+  //   "editusername": "张雪林",
-    "edituserheadimgurl": "/profile/avatar/2024/08/12/blob_20240812152930A001.jpeg",
+  //   "edituserheadimgurl": "/profile/avatar/2024/08/12/blob_20240812152930A001.jpeg",
-    "edituserentpname": "AIx数字平台内测中心",
+  //   "edituserentpname": "AIx数字平台内测中心",
-    "editstudentid": null,
+  //   "editstudentid": null,
-    "editstudentname": null,
+  //   "editstudentname": null,
-    "timestamp": "2024-09-10 15:07:20",
+  //   "timestamp": "2024-09-10 15:07:20",
-    "token": null,
+  //   "token": null,
-    "base64Code": null,
+  //   "base64Code": null,
-    "orderby": null,
+  //   "orderby": null,
-    "childcount": 4,
+  //   "childcount": 4,
-    "commentlikecount": 0,
+  //   "commentlikecount": 0,
-    "commenttextcount": 0,
+  //   "commenttextcount": 0,
-    "commentusecount": 0,
+  //   "commentusecount": 0,
-    "commentvisitcount": 90,
+  //   "commentvisitcount": 90,
-    "unixstamp": null,
+  //   "unixstamp": null,
-    "classworkcount": 0,
+  //   "classworkcount": 0,
-    "classworklist": "",
+  //   "classworklist": "",
-    "authjson": "",
+  //   "authjson": "",
-    "defaultslide": null
+  //   "defaultslide": null
-  }
+  // }
   // 获取班级列表
   getClassList()
 
@@ -203,6 +204,13 @@ const initData = () => {
     { label: '故障备用', prop: 'backup', show: false },
   ]
 }
+// 获取课件APT
+const getAptInfo = async (id) => {
+  const res = await Http_Entpcoursefile.getEntpcoursefile(id)
+  if (res.code == 200) {
+    myClassActive.value = res.data
+  }
+}
 // 获取当前账号-班级
 const getClassList = async () => {
   const res = await Http_ClassManage.listClassmain({

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

@@ -1,71 +1,113 @@
 <template>
-  <div class="desktop-item">
+  <div class="desktop-work-item">
     <div class="item-title flex">
-      <span>工作动态</span>
+      <span class="title">工作动态</span>
       <el-radio-group v-model="type">
         <el-radio-button label="全部" :value="-1" />
-        <el-radio-button label="备课" :value="1" />
-        <el-radio-button label="上课" :value="2" />
-        <el-radio-button label="作业" :value="3" />
       </el-radio-group>
     </div>
-    <div class="item-content">
+    <div class="item-content" v-loading="loading">
-      <el-button type="primary" size="small" @click.stop="initClass(item)">上课</el-button>
+      <el-scrollbar height="500px">
         <ul>
-        <li class="flex class-item" v-for="item in classList" :key="item.id">
+          <!--作业-->
+          <li class="flex class-item home-list" v-for="item in homeworkList" :key="item.id" @click="onClickItem(item)">
             <div class="class-left flex">
               <div class="class-name flex">
-              <span>{{ item.className }}</span>
+                <span class="name">{{ item.uniquekey }}</span>
-            </div>
+                <el-tag class="tag" round :type="tagType(item.deaddate)" effect="dark" size="small">{{
-            <div class="class-time"> {{ item.classDay }}&nbsp;{{ item.startTime }} ~ {{ item.classDay }}&nbsp;{{ item.endTime }}</div>
+                  getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate ? '已结束' : '进行中' }}</el-tag>
-            <div class="class-grade">
-              <span v-for="(tag, index) in item.classItemList" :key="index" style="margin-left: 5px">
-                {{ index === 0 ? tag.name : '、' + tag.name }}
-              </span>
               </div>
+              <div class="class-time">{{ item.classcaption }} | 截止时间：{{ item.deaddate }} </div>
             </div>
             <div class="class-right">
-            <el-button type="primary" size="small" @click.stop="initClass(item)">上课</el-button>
+              <div><span class="num">{{ item.workdataresultcount }}</span> / {{ item.workdatacount }}</div>
+              <div>已交</div>
             </div>
           </li>
+          <el-empty v-if="!homeworkList.length" description="暂无数据" />
         </ul>
+      </el-scrollbar>
     </div>
+    <item-dialog ref="itemDialogRef" @cle-click="closeDialog"></item-dialog>
   </div>
-  <!-- 上课配置 -->
-  <start-class ref="calssRef"/>
 </template>
 <script setup>
 import { ref, onMounted } from 'vue'
+import useUserStore from '@/store/modules/user'
 import { getSelfReserv } from '@/api/classManage'
-import startClass from './class-start.vue'
+import { homeworklist } from '@/api/teaching/classwork'
+import { getCurrentTime, getTomorrow } from '@/utils/date'
+import ItemDialog from '@/views/classTask/container/item-dialog.vue'
 
 const type = ref(-1)
+const user = useUserStore().user
+const loading = ref(false)
 const classList = ref([])
-  const calssRef = ref() // ref 获取组件实例
+const homeworkList = ref([])
+const itemDialogRef = ref(null)
 
 // 获取上课
-  const getClass = () =>{
+const getClass = async () => {
-    getSelfReserv().then((res) => {
+  loading.value = true
+  try {
+    const res = await getSelfReserv()
     let list = res.data || []
     list.sort((a, b) => { if (a.status == '上课中') return -1; else return 0 })
     classList.value = list.filter(item => item.status !== '已结束')
-
+  } finally {
+    loading.value = false
+  }
+}
+// 获取作业
+const getHomework = async () => {
+  loading.value = true
+  const { edustage, edusubject } = user
+  try {
+    const { rows } = await homeworklist({ edituserid: user.userId, edustage, edusubject, deaddate: getTomorrow(), status: '1', orderby: 'uniquekey DESC', pageSize: 500 })
+    // 只展示进行中的
+    homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate)
+    homeworkList.value.forEach((item) => {
+      item.workdatacount = JSON.parse('[' + item.classworkdatastudentids + ']').length
+      // 如果是习题训练任务，则检查一共有多少道
+      if (item.entpcourseworklist != '') {
+        item.entpcourseworklistarray = JSON.parse(
+          '[' + item.entpcourseworklist + ']'
+        )
+      } else {
+        item.entpcourseworklistarray = []
+      }
     })
+  } finally {
+    loading.value = false
   }
-  // 上课Apt
-  const initClass = (item) =>{
-    calssRef.value.open()
 }
+// 批改作业
+const onClickItem = (item) => {
+  console.log('开启弹窗')
+  itemDialogRef.value.openDialog(item)
+}
+// 批阅关闭
+const closeDialog = () => {
+  console.log('关闭弹窗,查询一下作业数据，更新界面')
+  getHomework()
+}
+
+const tagType = (time) => {
+  return getCurrentTime('YYYY-MM-DD HH:mm') > time ? 'info' : 'warning'
+}
+
 
 onMounted(() => {
-    getClass()
+  // getClass()
+  getHomework()
 })
 </script>
 
 <style lang="scss" scoped>
-  .desktop-item{
+.desktop-work-item {
-    margin-bottom: 20px;
   align-items: center;
+  height: 100%;
+
   .item-title {
     height: 32px;
     text-align: left;
@@ -73,29 +115,80 @@ import startClass from './class-start.vue'
     font-weight: bold;
     margin-bottom: 10px;
     align-items: center;
-      justify-content: space-between;
+
+    .title {
+      margin-right: 5px;
     }
+  }
+
   .item-content {
     background-color: #fff;
     border-radius: 5px;
     padding: 10px 15px;
     font-size: 13px;
+    height: calc(100% - 60px);
+
     .class-item {
       justify-content: space-between;
       align-items: center;
-        background: #e2e4f4;
+      background: #eff5fa;
       border-radius: 5px;
       margin-bottom: 10px;
       padding: 10px;
+
       .class-left {
         flex-direction: column;
         align-items: flex-start;
+        width: 90%;
+
+        .class-name {
+          display: flex;
+          align-items: center;
+
+          .name {
+            font-size: 14px;
+            font-weight: bold;
+          }
+
+          .tag {
+            margin-left: 5px;
+            border: none;
+
+            :deep(.el-tag__content) {
+              font-size: 12px;
+            }
+          }
+        }
+
         .class-time {
           font-size: 13px;
-            color: #bfbfbf;
+          color: #a5a4a4;
+          padding-top: 3px;
+          width: 100%;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          text-align: left;
+        }
+      }
+
+      .class-right {
+        font-size: 12px;
+        color: #a5a4a4;
+        flex-shrink: 0;
+        font-size: 13px;
+
+        .num {
+          font-size: 14px;
+          color: #409EFF;
+          font-weight: bold;
         }
       }
     }
+
+    .class-grade {
+      padding-top: 3px }
+
   }
 }
 </style>

src/renderer/src/views/desktop/index.vue

@@ -3,7 +3,7 @@
     <el-row :gutter="20">
     <el-col :span="17">
       <el-row :gutter="20">
-        <el-col :span="12" v-for="item in menuList">
+        <el-col :span="item.span" v-for="item in menuList" :key="item.id">
           <div class="desktop-item">
             <div class="item-title">{{ item.name }}</div>
             <div class="item-content">
@@ -54,6 +54,8 @@ let chartInstance = null
 
 const menuList = [{
     name: '教学分析',
+    span: 24,
+    id: 1,
     list: [
       {
         name: '课标分析',
@@ -77,16 +79,6 @@ const menuList = [{
         icon: 'icon-xueqingfenxi',
         disabled: true
       },
-      {
-        name: '资源分析',
-        icon: 'icon-ziyuanfenxi',
-        disabled: true
-      }
-    ]
-  },
-  {
-    name: '课程教学',
-    list: [
       {
         name: '教学设计',
         icon: 'icon-jiaoxuesheji',
@@ -95,7 +87,7 @@ const menuList = [{
       {
         name: '教学实施',
         icon: 'icon-jiaoxuefenxi',
-        path: '/classReserv'
+        path: '/prepare'
       },
       {
         name: '教学反思',
@@ -106,16 +98,20 @@ const menuList = [{
   },
   {
     name: '作业管理',
+    span: 12,
+    id: 2,
     list: [
       {
         name: '作业设计',
         icon: 'icon-jiaoxuefansi',
-        disabled: true
+        isOuter: true,
+        path: '/teaching/classtaskassign?titleName=作业布置&&openDialog=newClassTask'
       },
       {
         name: '作业布置',
         icon: 'icon-xiezuo1',
-        disabled: true
+        isOuter: true,
+        path: '/teaching/classtaskassign?titleName=作业布置'
       },
       {
         name: '作业批改',
@@ -131,6 +127,8 @@ const menuList = [{
   },
   {
     name: '教学管控',
+    span: 12,
+    id: 3,
     list: [
       {
         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,7 +62,10 @@
           <label>{{ curClassReserv.startTime }}-{{ curClassReserv.endTime }}</label>
         </el-button>
         <div class="top-zoom-style"></div>
-      </div>
+      </div>-->
+      <div style="padding: 0 20px;height: 100%;">
+        <el-tabs v-model="activeTab" class="prepare-tabs" >
+          <el-tab-pane label="素材" name="素材">
             <div class="prepare-body-header">
               <div>
                 <label style="font-size: 15px">共{{ currentFileList.length }}个文件</label>&nbsp;
@@ -58,26 +91,7 @@
                     </el-button>
                   </template>
                 </el-popover>
-        </div>
+                <el-button size="small" @click="isDialogOpen = true">上传资料</el-button>
-        <div style="display: flex">
-          <el-button @click="handleOutLink('feedback')">作业反馈</el-button>
-          <el-button @click="handleOutLink('homeWork')">布置作业</el-button>
-          <el-button @click="isDialogOpen = true">上传资料</el-button>
-          <el-dropdown trigger="click" style="margin-left: 12px">
-            <el-button type="primary">
-              新建课件<el-icon class="el-icon--right"><arrow-down /></el-icon>
-            </el-button>
-            <template #dropdown>
-              <el-dropdown-menu>
-                <el-dropdown-item style="padding: 0">
-                  <el-button type="default" style="" @click="createFile">PPT课件</el-button>
-                </el-dropdown-item>
-                <el-dropdown-item style="padding: 0">
-                  <el-button type="default" style="" @click="createAptFile">APT课件</el-button>
-                </el-dropdown-item>
-              </el-dropdown-menu>
-            </template>
-          </el-dropdown>
               </div>
             </div>
             <el-checkbox-group
@@ -86,7 +100,7 @@
               :style="{ 'margin-bottom': checkFileList.length > 0 ? '40px' : '0' }"
             >
               <file-list-item
-          v-for="(item, index) in currentFileList"
+                v-for="(item, index) in currentSCFileList"
                 :key="index"
                 :item="item"
                 :index="index"
@@ -98,6 +112,17 @@
               >
                 <el-checkbox v-if="!item.uniquekey" label="" :value="item" />
               </file-list-item>
+            </el-checkbox-group>
+          </el-tab-pane>
+          <el-tab-pane label="作业" name="作业">
+            <div class="prepare-body-header">
+              <div>
+                <label style="font-size: 15px">共{{ currentWorkList.length }}个作业</label>&nbsp;
+                <el-button size="small" @click="handleOutLink('feedback')">作业反馈</el-button>
+                <el-button size="small" @click="handleOutLink('homeWork')">布置作业</el-button>
+              </div>
+            </div>
+            <div class="prepare-work-wrap">
               <file-list-item
                 v-for="(item, index) in currentWorkList"
                 :key="index"
@@ -108,9 +133,11 @@
                 @on-set="openSet"
                 @on-delhomework="delhomework"
               >
-          <el-checkbox v-if="!item.uniquekey" label="" :value="item" />
               </file-list-item>
-      </el-checkbox-group>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
       <file-oper-batch
         v-show="checkFileList.length > 0"
         :indeterminate="checkFileList.length > 0 && checkFileList.length < currentFileList.length"
@@ -132,10 +159,11 @@
     :book-id="uploadData.textbookId"
     @add-success="initReserv"
   ></reserv>
-  <!-- <button @click="ipcMsgSend('tool-sphere:close')">测试</button> -->
+  <!-- 上课配置 -->
+  <class-start ref="calssRef"/>
 </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 +177,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 +188,11 @@ 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'
+import classStart from '@/views/desktop/container/class-start.vue' // 预备上课
 const toolStore = useToolState()
 
 const fs = require('fs')
@@ -175,9 +205,12 @@ export default {
     Refresh,
     uploadDialog,
     FileListItem,
+    KjListItem,
     FileOperBatch,
     MoveFile,
-    SetHomework
+    SetHomework,
+    ClassReserv,
+    classStart
   },
   data() {
     return {
@@ -196,6 +229,8 @@ export default {
       curClassReserv: {},
       downloadNum: 0,
       lastAsyncAllTime: '',
+      activeTab: "素材",
+      activeAptTab: "教学课件",
       uploadData: {
         textbookId: null,
         levelFirstId: 39103,
@@ -219,6 +254,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 +271,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 +297,21 @@ 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) {
-          this.curClassReserv = list[list.length - 1]
-        } else {
-          this.curClassReserv = {}
       }
+      if(item.fileFlag === 'apt') {
+        //TODO 打开apt
+        const { fileId: aptId } = item
+        this.$refs.calssRef.open(aptId)
+      }
+    },
+    initReserv(id) {
+      getClassInfo(id).then((res) => {
+        this.curClassReserv = res.data
+        this.openLesson(res.data.id);
       })
     },
     getBookPathFromServer() {
@@ -312,7 +358,7 @@ export default {
     },
     createAptFile() {
       listEntpcourse({
-        evalid: this.uploadData.levelSecondId,
+        evalid: this.currentNode.id,
         edituserid: this.userStore.userId,
         pageSize: 500
       }).then((response) => {
@@ -596,7 +642,7 @@ export default {
       })
     },
     // 上课-工具类悬浮
-    async openLesson() {
+    async openLesson(id) {
       // await startClass(this.curClassReserv.id)
       createWindow('tool-sphere', {
         url:
@@ -605,7 +651,7 @@ export default {
           '&label=' +
           this.currentNode.label +
           '&reservId=' +
-          this.curClassReserv.id
+          id
       })
     }
   }
@@ -643,20 +689,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 +846,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;
     }
   }

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

@@ -135,6 +135,8 @@ function submit() {
           userStore.login({username:props.user.userName,password:props.user.plainpwd}).then(() => {
             userStore.getInfo().then(res => {
               if(res.code === 200){
+                localStorage.removeItem('subjectList')
+                localStorage.removeItem('evaluationList')
                 ElMessage.success('修改成功')
               }else{
                 ElMessage.error(response.msg)

src/renderer/src/views/resource/container/resoure-search.vue

@@ -2,9 +2,9 @@
   <div class="resoure-search">
     <el-row justify="space-between">
       <el-col :span="12" class="tab-btns flex">
-        <el-button text v-for="item in sourceStore.tabs" :key="item.id"
+        <el-button text v-for="item in sourceStore.resourceTypeList" :key="item.id"
-          :type="sourceStore.query.fileSource == item.value ? 'primary' : ''"
+          :type="sourceStore.query.fileFlags == item.value ? 'primary' : ''"
-          @click="sourceStore.changeTab(item.value)">{{ item.label
+          @click="sourceStore.changeType(item.value)" :disabled="item.disabled">{{ item.label
           }}</el-button>
       </el-col>
 
@@ -19,7 +19,7 @@
     </el-row>
 
 <!--    第三方资源筛选-->
-    <el-row class="resoure-btns" v-if="isThird">
+    <!-- <el-row class="resoure-btns" v-if="isThird">
       <el-col :span="24" class="query-row flex">
         <div class="flex row-left">
           <el-button v-for="item in coursewareTypeList" :key="item.id"
@@ -29,8 +29,8 @@
           </el-button>
         </div>
       </el-col>
-    </el-row>
+    </el-row> -->
-    <el-row class="resoure-btns" v-else>
+    <el-row class="resoure-btns">
       <el-col :span="24" class="query-row flex">
         <div class="flex row-left"> <el-select v-model="sourceStore.query.fileSuffix" @change="sourceStore.changeSuffix"
             style="width: 110px">
@@ -38,9 +38,9 @@
               :value="item.value" />
           </el-select>
           <div class="line"></div>
-          <el-button v-for="item in sourceStore.resourceTypeList" :key="item.id"
+          <el-button v-for="item in sourceStore.tabs" :key="item.id"
-            :type="sourceStore.query.fileFlag == item.value ? 'primary' : ''" round
+            :type="sourceStore.query.fileSource == item.value ? 'primary' : ''"
-            @click="sourceStore.changeType(item.value)">{{
+            @click="sourceStore.changeTab(item.value)">{{
             item.label }}</el-button>
         </div>
         <div>
@@ -81,12 +81,12 @@ watch(() => sourceStore.query.fileSource,() => {
 </script>
 <style lang="scss" scoped>
 .resoure-search {
-  padding: 20px;
+  padding: 15px;
   border-bottom: solid #f1f1f1 1px;
 
   .tab-btns {
     .el-button {
-      font-size: 16px;
+      font-size: 18px;
     }
   }
 

src/renderer/src/views/resource/store.js

@@ -8,10 +8,6 @@ import { hasPermission } from '@/utils/hasPermission'
 const userStore = useUserStore()
 
 const resourceTypeList = [
-  {
-    label: '全部',
-    value: ''
-  },
   ...resourceType
 ]
 const resourceFormatList = [
@@ -54,7 +50,7 @@ export default defineStore('resource', {
       //资源格式  mp3 ppt ...
       fileSuffix: -1,
       // 资源类型 课件 素材 教案
-      fileFlag: '',
+      fileFlags: resourceType[0].value,
       fileRoot: '资源',
       fileName: '',
       orderByColumn: 'uploadTime',
@@ -123,7 +119,7 @@ export default defineStore('resource', {
       this.handleQuery()
     },
     changeType(val) {
-      this.query.fileFlag = val
+      this.query.fileFlags = val
       this.handleQuery()
     },
     thirdChangeType(val) {