9 changed files with 98 additions and 159 deletions
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "aix-win",
-  "version": "2.1.30",
+  "version": "2.1.28",
  "description": "",
  "main": "./out/main/index.js",
  "author": "上海交大重庆人工智能研究院",
--- a/src/renderer/src/api/file/index.js
+++ b/src/renderer/src/api/file/index.js
@ -24,13 +24,6 @@ export const getPrepareById = (id) => {
  })
 }

-export const addFileToKj = (id) => {
-  return request({
-    url: '/smarttalk/file/addFileToKj/' + id,
-    method: 'get'
-  })
-}
-
 export function deleteSmarttalk(id) {
  return request({
    url: '/smarttalk/file/' + id,
@ -60,14 +53,3 @@ export const moveSmarttalk = (params) => {
    params
  })
 }
-
-export const addFileToPrepareThird = (data) => {
-  return request({
-    url: '/smarttalk/file/addFileToPrepareThird',
-    method: 'post',
-    headers: {
-      'Content-Type': 'multipart/form-data'
-    },
-    data
-  })
-}
--- a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
+++ b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
@ -55,7 +55,6 @@
                      <el-col :span="11">
                        <el-form-item label="知识点" label-width="70">
                          <el-cascader
-                            disabled
                            v-model="entpCourseWorkQueryParams.point"
                            clearable
                            style="width: 100%"
@ -91,12 +90,7 @@
                    </el-row>
                    <!-- 习题表格 -->
                    <div class="infinite-list-wrapper" >
-                      <el-table 
-                        :data="workResource.entpCourseWorkList" 
-                        style="width: 100%; height: 100%;"
-                        v-loading="pageParams.loading"
-                        ref="tableRef"
-                      >
+                      <!-- <el-table :data="workResource.entpCourseWorkList" style="width: 100%; height: 100%;">
                        <el-table-column type="index" width="60" />
                        <el-table-column align="left" >
                          <template #header>
@ -120,18 +114,22 @@
                            <el-button type="primary" @click="handleClassWorkQuizAdd('entpcourseworklist', scope.row.id)">添加</el-button>
                          </template>
                        </el-table-column>
-                      </el-table>
-                      
-                      <!-- <ul 
+                      </el-table> -->
+                      <ul 
                        v-infinite-scroll="pageLoad" 
                        class="infinite-list" 
                        infinite-scroll-immediate="false" 
-                        infinite-scroll-distance='100'
+                        infinite-scroll-distance='1'
                        infinite-scroll-delay="1000"
                        :infinite-scroll-disabled="pageDisabled"
                      >
                        <li v-for="(item,index) in workResource.entpCourseWorkList" :key="item" class="infinite-list-item">
                          <div align="left" style="width: 100%;" >
+                            <!-- <template #header>
+                              <div style="display: flex">
+                                <div style="align-items: center;">题目内容</div>
+                              </div>
+                            </template> -->
                            <div @click="showExamAnalyseDrawer(item)">
                              <div>
                                <span style="width: 20px;">{{ index +1 }}. </span>
@ -157,18 +155,18 @@
                          description="未找到相关试题"
                          style="width: 100%; height: 200px; margin-top: 20px;"
                        ></el-empty>
-                      </div> -->
+                      </div>
                    </div>
                    <!-- 分页 这里不用-->
-                    <div style="height: 55px;">
-                      <el-pagination
-                        v-show="pageParams.total > 0"
+                    <!-- <div style="height: 55px;">
+                      <pagination
+                        v-show="entpCourseWorkTotal > 0"
                        v-model:page="paginationParams.pageNum"
                        v-model:limit="paginationParams.pageSize"
-                        :total="pageParams.total"
+                        :total="entpCourseWorkTotal"
                        :style="{ position: 'relative', 'margin-top': '5px' }"
-                        @change="getPaginationList" />
-                    </div>
+                        @pagination="getPaginationList" />
+                    </div> -->
                  </div>
                  <!-- 非习题训练：常规作业、 -->
                  <div v-if="classWorkForm.worktype!='习题训练'">
@ -278,7 +276,6 @@ import { onMounted, ref, nextTick, watch, reactive, getCurrentInstance, computed
 import { ElMessage } from 'element-plus'
 import { cloneDeep } from 'lodash'
 import { useRouter } from 'vue-router'
-import { Search } from '@element-plus/icons-vue'

 import {listEntpcoursework, listEntpcourseworkNew, getEntpcoursework} from '@/api/education/entpCourseWork'
 import { addClassworkReturnId } from '@/api/teaching/classwork'
@ -287,7 +284,6 @@ import { listEvaluation } from '@/api/subject'
 import { listEntpcoursefile } from '@/api/education/entpcoursefile'
 import { listKnowledgePoint } from "@/api/knowledge/knowledgePoint";

-
 import { useGetHomework } from '@/hooks/useGetHomework'
 import { processList } from '@/hooks/useProcessList'
 import { getCurrentTime } from '@/utils/date'
@ -413,15 +409,15 @@ const fileLoading = ref(false); // 常规作业loading

 // 下拉滚动参数

-// const BASE_LIMIT_COUT = 50;   // 总加载额外试题数
-// const pageNoMore = computed( () => {
-//   if (pageParams.value.total < 1) {
-//     return false;
-//   }
-//   let count = BASE_LIMIT_COUT >= pageParams.value.total ? pageParams.value.total : pageParams.value.originCount+BASE_LIMIT_COUT;
-//   return workResource.entpCourseWorkList.length >= count;
-// });
-// const pageDisabled  = computed(() => pageParams.value.loading || pageNoMore.value);
+const BASE_LIMIT_COUT = 50;   // 总加载额外试题数
+const pageNoMore = computed( () => {
+  if (pageParams.value.total < 1) {
+    return false;
+  }
+  let count = BASE_LIMIT_COUT >= pageParams.value.total ? pageParams.value.total : pageParams.value.originCount+BASE_LIMIT_COUT;
+  return workResource.entpCourseWorkList.length >= count;
+});
+const pageDisabled  = computed(() => pageParams.value.loading || pageNoMore.value);
 const pageParams = ref({
  loading: false,     // 是否正在加载中
  originCount: 0,     // 初始条目数量
@ -501,7 +497,7 @@ function Apis(key) {
      // 年份
      yearStr: entpCourseWorkQueryParams.yearStr !== '-1' ? entpCourseWorkQueryParams.yearStr:'',
      // 知识点
-      thirdId: entpCourseWorkQueryParams.point && entpCourseWorkQueryParams.point.length > 0 ? entpCourseWorkQueryParams.point[0]:'',
+      thirdId: entpCourseWorkQueryParams.point.length > 0 ? entpCourseWorkQueryParams.point[0]:'',
      // 关键字
      keyword: entpCourseWorkQueryParams.keyWord && entpCourseWorkQueryParams.keyWord !== '' ? entpCourseWorkQueryParams.keyWord:'',

@ -512,7 +508,9 @@ function Apis(key) {
   })
  }
 const handleQueryFromEntpCourseWork= async (queryType) => {
+  
  pageParams.value.loading = true;
+  

  // 初中政治特殊处理( warn: 需确认是否修改 )
  // if (this.courseObj.edusubject=='政治' && this.courseObj.edustage=='初中') {
@ -521,43 +519,44 @@ const handleQueryFromEntpCourseWork= async (queryType) => {
  // }
  
  client(t('任务1', 1500)).then(res => {
-    //console.log("请求返回",res);
-    // if(paginationParams.pageNum == 1){
-    //   workResource.entpCourseWorkList = [];
-    //   workResource.entpCourseWorkTotal = 0;
+    console.log("请求返回",res);
+    if(paginationParams.pageNum == 1){
+      workResource.entpCourseWorkList = [];
+      workResource.entpCourseWorkTotal = 0;

-    //    // 初始化下拉滚动条参数
-    //   // pageParams.value.loading = false;
-    //   // pageParams.value.isFirst = true;
-    //   // pageParams.value.originCount = 0;
-    // }
+       // 初始化下拉滚动条参数
+      // pageParams.value.loading = false;
+      // pageParams.value.isFirst = true;
+      // pageParams.value.originCount = 0;
+    }
    const data = res.data || [];
    if(data && data.length>0){
    // workResource.entpCourseWorkList = entpcourseworkres.data;
    // workResource.entpCourseWorkTotal = entpcourseworkres.data.length;

-      data.forEach(item=> {
-        if (item.worktype == '选择题') {
-          item.worktype = '单选题'
-        }
-      })
-
-      // 格式化试题信息
-      processList(data);
-      //workResource.entpCourseWorkList.push(...data);    
-      workResource.entpCourseWorkList = data;
-
-      // 初次加载时更新当前试题数量
-      if (pageParams.value.isFirst) {
-        pageParams.value.isFirst = false;
-        pageParams.value.originCount = workResource.entpCourseWorkList.length;
-        pageParams.value.total = parseInt(res.msg);
-        paginationParams.pageNum = Math.ceil(parseInt(res.msg)/paginationParams.pageSize);
-        //console.log('first->', pageParams.value, paginationParams);
+    data.forEach(item=> {
+      if (item.worktype == '选择题') {
+        item.worktype = '单选题'
      }
+    })
+
+    // 格式化试题信息
+    processList(data);
+    workResource.entpCourseWorkList.push(...data);    
+
+    // 初次加载时更新当前试题数量
+    if (pageParams.value.isFirst) {
+      pageParams.value.isFirst = false;
+      pageParams.value.originCount = workResource.entpCourseWorkList.length;
+      pageParams.value.total = parseInt(res.msg);
    }
-    pageParams.value.loading = false;
+  }
+  pageParams.value.loading = false;
  });
+
+  //const entpcourseworkres = await listEntpcourseworkNew(queryForm);
+
+  // const data = entpcourseworkres.data;
  
 }

@ -978,15 +977,6 @@ const showExamAnalyseDrawer = (row) => {
  })
 }

-const tableRef = ref();
-const getPaginationList = ( page, limit ) => {
-  paginationParams.pageNum = page;
-  paginationParams.pageSize = limit;
-  //console.log(page, limit)
-  handleQueryFromEntpCourseWork(0);
-  // 重置滚动条至顶部
-  tableRef.value.setScrollTop(0);
-}

 const pageLoad = async() => {
  console.log("加载中...")
--- a/src/renderer/src/views/classTask/teachClassTask.vue
+++ b/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="0" :label="'未交' + '（' + tableRadio.num0 + '）'"/>
+            <el-radio-button :value="1" :label="'已交' + '（' + tableRadio.num1 + '）'" />
+            <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;
  }
--- a/src/renderer/src/views/prepare/components/treeLog.vue
+++ b/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,
-      cataList:getFullObj(data.node)
+      bookList:getFullObj(data.node)
    }
    console.log(getNodeInfo.value,'log')
  }
--- a/src/renderer/src/views/prepare/container/file-list-item.vue
+++ b/src/renderer/src/views/prepare/container/file-list-item.vue
@ -126,12 +126,6 @@
                    <span>下载</span>
                  </el-button>
                </div>
-                <div v-if="item.fileSuffix === 'ppt' || item.fileSuffix === 'pptx'" class="item-popover-item">
-                  <el-button text @click="adToKj(item)">
-                    <i class="iconfont icon-jiahao"></i>
-                    <span>加入课件</span>
-                  </el-button>
-                </div>
                <div class="item-popover-item">
                  <el-button text @click="moveSmarttalkFun(item)">
                    <el-icon>
@ -159,7 +153,7 @@ 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, addFileToKj } from '@/api/file'
+import { deleteSmarttalk, updateSmarttalk, getPrepareById } from '@/api/file'
 import useUserStore from '@/store/modules/user'
 import outLink from '@/utils/linkConfig'

@ -189,14 +183,6 @@ export default {
    }
  },
  methods: {
-    adToKj(item) {
-      addFileToKj(item.id).then(res=>{
-        console.log(res)
-        item.fileFlag = "课件"
-      },error=>{
-        console.log(error)
-      })
-    },
    editTalk(item) {
      console.log(item,this.userInfo,'this.userInfo')
      ElMessageBox.prompt('请输入新的名称', '重命名', {
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@ -2,6 +2,7 @@
  <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">
@ -140,6 +141,8 @@
  <!-- 上课配置 -->
  <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>
@ -634,7 +637,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
@ -793,6 +796,11 @@ export default {
          '&reservId=' +
          id
      })
+    },
+    // 打开章节
+    openChapter(){
+      // 打开弹窗
+      this.$refs.treelogRef.openDialog()
    }
  }
 }
--- a/src/renderer/src/views/resource/container/resoure-search.vue
+++ b/src/renderer/src/views/resource/container/resoure-search.vue
@ -18,17 +18,21 @@
      </el-col>
    </el-row>

-    <el-row class="resoure-btns">
+<!--    第三方资源筛选-->
+    <!-- <el-row class="resoure-btns" v-if="isThird">
      <el-col :span="24" class="query-row flex">
        <div class="flex row-left">
-      <!--    第三方资源筛选-->
-          <el-select v-if="isThird" v-model="sourceStore.thirdQuery.type" @change="sourceStore.thirdChangeType"
-            style="width: 110px">
-            <el-option v-for="item in coursewareTypeList" :key="item.value" :label="item.label"
-              :value="item.value" />
-          </el-select>
-
-         <el-select v-else v-model="sourceStore.query.fileSuffix" @change="sourceStore.changeSuffix"
+          <el-button v-for="item in coursewareTypeList" :key="item.id"
+                     :type="sourceStore.thirdQuery.type == item.value ? 'primary' : ''" round
+                     @click="sourceStore.thirdChangeType(item.value)">
+            {{item.label }}
+          </el-button>
+        </div>
+      </el-col>
+    </el-row> -->
+    <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">
            <el-option v-for="item in sourceStore.resourceFormatList" :key="item.value" :label="item.label"
              :value="item.value" />
--- a/src/renderer/src/views/resource/container/third-list.vue
+++ b/src/renderer/src/views/resource/container/third-list.vue
@ -50,10 +50,6 @@
              </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>
@ -70,27 +66,25 @@
      />
    </div>
    <FilePreview ref="thirdPreview" v-model="isViewImg"></FilePreview>
-    <TreeLog ref="treelogRef" @onsuccess="addToPrepare"/>
  </div>
 </template>

 <script setup>
 import { ref } from 'vue'
-import { ElMessage } from 'element-plus'
-import { Clock,View,Folder } from '@element-plus/icons-vue'
+// import { ElMessage, ElMessageBox } from 'element-plus'
+import { Clock,View,Folder,Search } 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) => {
@ -120,31 +114,6 @@ 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">