Merge pull request 'baigl' (#405) from baigl into main

Reviewed-on: #405

src/renderer/src/api/file/index.js

@@ -53,3 +53,14 @@ export const moveSmarttalk = (params) => {
     params
   })
 }
+
+export const addFileToPrepareThird = (data) => {
+  return request({
+    url: '/smarttalk/file/addFileToPrepareThird',
+    method: 'post',
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    },
+    data
+  })
+}

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

@@ -57,8 +57,8 @@
             style="margin-bottom: 1px"
             @change="tableRadioChange"
           >
-            <el-radio-button :value="1" :label="'已交' + '（' + tableRadio.num1 + '）'" />
+            <el-radio-button :value="1" :label="'已交' + '（' + tableRadio.num1 + '）'"/>
-            <el-radio-button :value="0" :label="'未交' + '（' + tableRadio.num0 + '）'" />
+            <el-radio-button :value="0" :label="'未交' + '（' + tableRadio.num0 + '）'"/>
           </el-radio-group>
           <!-- 学生列表：classWorkAnalysis.classworkdata; 已交未交：tableRadio.list  -->
           <el-table
@@ -179,7 +179,7 @@ const classWorkAnalysis = reactive({
   entpcourseworklistarray: [], // 当前学习任务所包含的试题ID
 })
 const tableRadio = reactive({
-  value: '1', // 已交
+  value: 1, // 已交
   list: [], // 已交list
   num1: 0, // 已交人数
   num0: 0 // 未交人数
@@ -219,7 +219,7 @@ const openDialog = (data, isInit=true) => {
     classWorkAnalysis.workclass = data.workclass
     // 重置学生列表
     tableRadio.list = []
-    tableRadio.value = '1'
+    tableRadio.value = 1
     tableRadio.num0 = 0
     tableRadio.num1 = 0
 
@@ -401,7 +401,7 @@ const getClassWorkStudentList = (rowId) => {
       tableRadio.list =
         classWorkAnalysis.classworkdata &&
         classWorkAnalysis.classworkdata.filter((item) => item.finishtimelength != '0')
-      tableRadio.value = '1'
+      tableRadio.value = 1
       tableRadio.num0 = classWorkAnalysis.classworkdata.length - tableRadio.list.length
       tableRadio.num1 = tableRadio.list.length
       // 自动批阅判断
@@ -417,7 +417,7 @@ const getClassWorkStudentList = (rowId) => {
  */
 const teacherCriticism = ()=>{
   // 已交的list才自动批阅判断
-  if(tableRadio.value == '1'&& classWorkAnalysis.worktype == '习题训练'){
+  if(tableRadio.value == 1 && classWorkAnalysis.worktype == '习题训练'){
     // 只有习题训练才会自动批阅
     tableRadio.list = tableRadio.list.map((item) => {
       return {
@@ -572,16 +572,16 @@ const tableRadioChange = (e) => {
   isopen_dtwk_table.value = false;
   console.log(e,'??????')
   console.log("学生列表：", classWorkAnalysis.classworkdata)
-  if(e=='1'){
+  if(e==1){
     tableRadio.list = classWorkAnalysis.classworkdata.filter(item => item.finishtimelength != '0')
-    tableRadio.value = '1';
+    tableRadio.value = 1;
     tableRadio.num0 = classWorkAnalysis.classworkdata.length - tableRadio.list.length;
     tableRadio.num1 = tableRadio.list.length;
     // 自动批阅判断
     teacherCriticism();
-  }else if(e=='0'){
+  }else if(e==0){
     tableRadio.list = classWorkAnalysis.classworkdata.filter(item => item.finishtimelength == '0')
-    tableRadio.value = '0';
+    tableRadio.value = 0;
     tableRadio.num0 = tableRadio.list.length;
     tableRadio.num1 = classWorkAnalysis.classworkdata.length - tableRadio.list.length;
   }

src/renderer/src/views/prepare/components/treeLog.vue

@@ -22,7 +22,7 @@
   import { ref, defineExpose,defineEmits } from 'vue'
   import ChooseTextbook from './chooseTextbook.vue'
   const emit = defineEmits(['onsuccess'])
-  
+
   const dialogVisible = ref(false)
   const getNodeInfo = ref({})
 
@@ -48,7 +48,7 @@
   const nodeClick = (data) => {
     getNodeInfo.value = {
       textbookId:data.node.rootid,
-      bookList:getFullObj(data.node)
+      cataList:getFullObj(data.node)
     }
     console.log(getNodeInfo.value,'log')
   }

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

@@ -2,7 +2,6 @@
   <div v-loading="isLoading" class="page-resource flex">
     <ChooseTextbook @node-click="nodeClick" />
     <div class="page-center-wrap">
-      <el-button @click="openChapter" type="primary">打开章节</el-button>
       <el-tabs v-model="activeAptTab" style="height: 100%;">
         <el-tab-pane label="教学课件" name="教学课件" class="prepare-center-jxkj">
           <div class="prepare-center-header">
@@ -141,8 +140,6 @@
   <!-- 上课配置 -->
   <class-start ref="calssRef" @close="closeChange"/>
   <PptDialog @add-success="addAiPPT" :currentNode="currentNode" :uploadData="uploadData" v-model="pptDialog"/>
-  <!-- 章节弹窗 -->
-  <TreeLog ref="treelogRef"/>
   <!-- <button @click="test">test</button> -->
 </template>
 <script setup>
@@ -637,7 +634,7 @@ export default {
     },
     async nodeClick(data) {
       console.log(data,'data');
-      
+
       if (this.currentNode.id === data.node.id) return
       this.curBookImg = data.textBook.curBookImg
       this.curBookPath = data.textBook.curBookPath
@@ -796,11 +793,6 @@ export default {
           '&reservId=' +
           id
       })
-    },
-    // 打开章节
-    openChapter(){
-      // 打开弹窗
-      this.$refs.treelogRef.openDialog()
     }
   }
 }

src/renderer/src/views/resource/container/third-list.vue

@@ -50,6 +50,10 @@
               </div>
             </div>
           </div>
+          <el-button v-loading="item.loading" size="small" plain round type="primary" @click.stop="openChapter(item)">
+            <i class="iconfont icon-jiahao"></i>
+            备课</el-button
+          >
         </li>
       </ul>
     </el-scrollbar>
@@ -66,25 +70,27 @@
       />
     </div>
     <FilePreview ref="thirdPreview" v-model="isViewImg"></FilePreview>
+    <TreeLog ref="treelogRef" @onsuccess="addToPrepare"/>
   </div>
 </template>
 
 <script setup>
 import { ref } from 'vue'
-// import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage } from 'element-plus'
-import { Clock,View,Folder,Search } from '@element-plus/icons-vue'
+import { Clock,View,Folder } from '@element-plus/icons-vue'
 import FileImage from '@/components/file-image/index.vue'
 import FilePreview from '@/components/thirdFile-preview/index.vue'
-import useUserStore from '@/store/modules/user'
 import useResoureStore from '../store'
+import { addFileToPrepareThird } from '@/api/file'
+import TreeLog from '@/views/prepare/components/treeLog.vue'
 
-const userstore = useUserStore()
 const sourceStore = useResoureStore()
 
-// const userInfo = userstore.user
 //判断是否预览图片
 const isViewImg = ref(false)
 const thirdPreview = ref()
+const treelogRef = ref()
+const currentItem = ref()
 
 // 分页change
 const handleSizeChange = (limit) => {
@@ -114,6 +120,31 @@ const handleRow = (item) => {
   isViewImg.value = true
   thirdPreview.value.init(item.itemId)
 }
+const openChapter = (item)=>{
+  currentItem.value = item
+  // 打开弹窗
+  treelogRef.value.openDialog()
+}
+const addToPrepare = (data) => {
+  console.log(data)
+  let chapterArr = []
+  for (let i = 0; i < data.cataList.length; i++) {
+    chapterArr.push({id: data.cataList[i].id,name: data.cataList[i].title})
+  }
+  let postData = {
+      itemId: currentItem.value.itemId,
+      textBookId: data.textbookId,
+      chapter: JSON.stringify(chapterArr)
+  }
+  currentItem.value.loading = true
+  addFileToPrepareThird(postData).then((res) => {
+    currentItem.value.loading = false
+    console.log(res)
+    if (res.code === 200) {
+      ElMessage.success("加入备课成功")
+    }
+  })
+}
 </script>
 
 <style lang="scss">