Merge branch 'main' into zouyf_dev

src/renderer/src/api/education/entpCourseWork.js

@@ -83,6 +83,15 @@ export function listEntpcourseworkNew(query) {
 }
 
 
+export function listEntpcourseworkSmartNew(data) {
+  return request({
+    url: '/education/entpcoursework/smart/new',
+    method: 'post',
+    data: data
+  })
+}
+
+
 /**
  * @desc: 学科网接口api
  * @return: {*}

src/renderer/src/api/knowledge/student.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询KnowPointStudent列表
+export function listKnowPointStudent(query) {
+  return request({
+    url: '/student/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询KnowPointStudent
+export function getKnowPointStudent(id) {
+  return request({
+    url: '/student/' + id,
+    method: 'get'
+  })
+}
+
+// 添加KnowPointStudent
+export function addKnowPointStudent(data) {
+  return request({
+    url: '/student/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改KnowPointStudent
+export function updateKnowPointStudent(data) {
+  return request({
+    url: '/student/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除KnowPointStudent
+export function delKnowPointStudent(id) {
+  return request({
+    url: '/student/' + id,
+    method: 'delete'
+  })
+}

src/renderer/src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4723712 */
-  src: url('iconfont.woff2?t=1739948469020') format('woff2'),
-       url('iconfont.woff?t=1739948469020') format('woff'),
-       url('iconfont.ttf?t=1739948469020') format('truetype');
+  src: url('iconfont.woff2?t=1737434703828') format('woff2'),
+       url('iconfont.woff?t=1737434703828') format('woff'),
+       url('iconfont.ttf?t=1737434703828') format('truetype');
 }
 
 .iconfont {
@@ -13,10 +13,6 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-zhongxinshiyang:before {
-  content: "\e67b";
-}
-
 .icon-siweidaotu:before {
   content: "\e606";
 }

src/renderer/src/assets/iconfont/iconfont.json

@@ -5,13 +5,6 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
-    {
-      "icon_id": "4320365",
-      "name": "重新试样",
-      "font_class": "zhongxinshiyang",
-      "unicode": "e67b",
-      "unicode_decimal": 59003
-    },
     {
       "icon_id": "11685410",
       "name": "思维导图",

src/renderer/src/components/template-study/container/adjust-dialog.vue

@@ -1,9 +1,9 @@
 <template>
-  <el-dialog v-model="model" :show-close="false" width="800" append-to-body destroy-on-close>
+  <el-dialog v-model="isDialog" :show-close="false" width="800" append-to-body destroy-on-close>
     <template #header>
       <div class="custom-header flex">
         <span>{{ item.name }}</span>
-        <i class="iconfont icon-guanbi" @click="model = false"></i>
+        <i class="iconfont icon-guanbi" @click="isDialog = false"></i>
       </div>
     </template>
     <div class="dialog-content">
@@ -15,9 +15,7 @@
             </div>
             <div class="flex-start flex" v-else>
               <div class="flex" v-loading="!item.msg">
-                <div class="chart-item robot">
-                  <v-md-editor v-model="item.msg" mode="preview" />
-                </div>
+                <div class="chart-item robot">{{ item.msg }}</div>
               </div>
               <div class="flex flex-end replace-item">
                 <span @click="saveAdjust(item)"><i class="iconfont icon-tihuan"></i>替换分析结果</span>
@@ -56,7 +54,7 @@
 </template>
 
 <script setup>
-import { ref, reactive, onMounted, watch, onUnmounted } from 'vue'
+import { ref, reactive, onMounted, onUnmounted } from 'vue'
 import { completion, docList } from '@/api/mode/index'
 import { sessionStore } from '@/utils/store'
 import { dataSetJson } from '@/utils/comm.js'
@@ -68,7 +66,7 @@ const userInfo = useUserStore().user
 
 const textarea = ref('')
 
-const model = defineModel()
+const isDialog = defineModel()
 
 const props = defineProps({
   item: {
@@ -91,12 +89,6 @@ const props = defineProps({
   }
 })
 
-watch(model, (newVal) =>{
-  if(newVal){
-    msgList.value.length = 0
-  }
-})
-
 const emit = defineEmits(['saveEdit'])
 
 const loaded = ref(false)
@@ -156,7 +148,7 @@ const getCompletion = async (val) => {
 }
 
 const saveAdjust = (item) =>{
-  model.value = false
+  isDialog.value = false
   emitter.emit('onSaveAdjust', item.msg)
 }
 
@@ -166,17 +158,12 @@ const dataset_id = ref('')
 const fileList = ref([])
 const getList = () =>{
   docList({
-    createUser: userInfo.userId,
-    datasetId:  dataset_id.value,
-    edustage: curNode.edustage,
-    edusubject: curNode.edusubject
+    userId: userInfo.userId,
+    dataset_id:  dataset_id.value
   }).then( res =>{
-    if(res.rows.length){
-      fileList.value = res.rows
-
-      Object.assign(curFile,  fileList.value[0])
-      params.document_ids =  fileList.value[0].docId
-    }
+    fileList.value = res.rows
+    Object.assign(curFile,  fileList.value[0])
+    params.document_ids =  fileList.value[0].docId
   })
 }
 emitter.on('changeCurFile', (item) =>{
@@ -252,7 +239,6 @@ onUnmounted(() => {
     .robot {
       background: #409EFF;
       color: #FFF;
-      width: 100%;
     }
     .replace-item{
       font-size: 12px;
@@ -346,13 +332,4 @@ onUnmounted(() => {
   display: flex;
   margin-bottom: 10px;
 }
-
-:deep(.v-md-editor){
-  background-color: #409EFF;
-}
-:deep(.github-markdown-body) {
-  font-size: 14px;
-  padding: 10px;
-
-}
 </style>

src/renderer/src/components/template-study/container/keyword-dialog.vue

@@ -13,7 +13,7 @@
           <el-input v-model="form.name" />
         </el-form-item>
         <el-form-item label="提示词" v-if="item.ex3 == '1' ? false : true">
-          <el-input v-model="form.prompt" type="textarea" autosize  :rows="2" />
+          <el-input v-model="form.prompt" type="textarea" />
         </el-form-item>
       </el-form>
     </div>

src/renderer/src/components/template-study/container/left-dialog.vue

@@ -137,9 +137,7 @@ const curFile = reactive({})
 const getList = () => {
   docList({
     createUser: userInfo.userId,
-    datasetId: dataset_id.value,
-    edustage: curNode.edustage,
-    edusubject: curNode.edusubject
+    datasetId: dataset_id.value
   }).then((res) => {
     fileList.value = [...res.rows]
    if(res.rows.length){

src/renderer/src/components/template-study/container/right.vue

@@ -4,12 +4,12 @@
     <div class="container-right-header flex">
       <el-dropdown @command="changeTemplate" :hide-on-click="false">
         <span class="el-dropdown-link">
-          {{ curTemplate.ex3 ? `${curTemplate.name}(平台)` : `${curTemplate.name}(个人)` }}
+          {{ curTemplate.name }}
           <i class="iconfont icon-xiangxia"></i>
         </span>
         <template #dropdown>
           <el-dropdown-menu>
-            <el-dropdown-item v-for="item in templateList" :command="item" :key="item.id">{{ item.ex3 ? `${item.name}(平台)` : `${item.name}(个人)`
+            <el-dropdown-item v-for="item in templateList" :command="item" :key="item.id">{{ item.name
               }}</el-dropdown-item>
           </el-dropdown-menu>
         </template>
@@ -18,20 +18,20 @@
         <el-select v-model="curMode" placeholder="Select" class="mr-4 w-30">
           <el-option v-for="item in modeOptions" :key="item.value" :disabled="item.disabled" :label="item.label" :value="item.value" />
         </el-select>
-        <el-button type="danger" link :disabled="!(templateList.length)" @click="removeItem(curTemplate, false)" v-if="curTemplate.ex3 != 1">
+        <el-button type="danger" link :disabled="!(templateList.length)" @click="removeItem(curTemplate, false)">
           删除
         </el-button>
         <el-button type="primary" link :disabled="!(templateList.length)" @click="onAdd">
           <i class="iconfont icon-jiahao"></i>
-          {{ curTemplate.ex3 == 1 ? '复制并创建个人模板' : '添加提示词' }}
+          {{curTemplate.ex3 === '1' ? '复制并创建个人模板' : '添加提示词'}}
         </el-button>
-        <el-button type="primary" :disabled="!(childTempList.length)" @click="getModelResult('')">一键研读</el-button>
+        <el-button type="primary" :disabled="!(childTempList.length)" @click="getCompletion">一键研读</el-button>
       </div>
     </div>
     <!--List-->
-    <div class="container-right-list" ref="outerContainer">
-      <template v-for="(item, index) in childTempList" >
-        <div class="template-item" v-loading="item.loading" ref="messageElements">
+    <div class="container-right-list" ref="listRef">
+      <template v-for="(item, index) in childTempList">
+        <div class="template-item" v-loading="item.loading">
           <div class="item-header">
             <div>
               <span class="blue">#</span>{{ item.name }}
@@ -50,26 +50,18 @@
           <div class="item-text">
             {{ item.prompt }}
           </div>
-          <div class="item-text text-answer">
+          <div class="item-text text-answer" v-if="item.answer">
             <div class="item-icon">
               <i class="iconfont icon-ai"></i>
             </div>
             <div class="item-answer">
-              <!-- <TypingEffect v-if="isStarted[index]" :text="item.answer" :delay="10" :aiShow="item.aiShow"
-                @complete="handleCompleteText($event, index)" @updateScroll="scrollToBottom($event, index)" /> -->
-                <TypingEffect
-                  :text="item.answer"
-                  :showTypewriter="item.showTypewriter"
-                  :speed="30"
-                  :charsPerFrame="15"
-                  @scroll="handleScroll(index)"
-                  @done="handleDone(index)"
-                />
+              <TypingEffect v-if="isStarted[index]" :text="item.answer" :delay="10" :aiShow="item.aiShow"
+                @complete="handleCompleteText($event, index)" @updateScroll="scrollToBottom($event, index)" />
             </div>
           </div>
           <div class="ai-btn" v-if="item.answer">
-            <el-button type="primary" link @click="getModelResult(index, item)">
-              <i class="iconfont icon-zhongxinshiyang"></i>
+            <el-button type="primary" link @click="againResult(index, item)">
+              <i class="iconfont icon-ai1"></i>
               重新研读
             </el-button>
             <el-button type="primary" link @click="onAdjust(index, item)">
@@ -107,6 +99,7 @@ import TypingEffect from '@/components/typing-effect/index.vue'
 import useUserStore from '@/store/modules/user'
 import emitter from '@/utils/mitt';
 import { dataSetJson } from '@/utils/comm.js'
+import { cloneDeep } from 'lodash'
 
 const props = defineProps(['type'])
 const { user } = useUserStore()
@@ -130,7 +123,7 @@ const modeOptions = ref([
   },
   {
     label: 'deepseek模型',
-    value: 3,
+    value: 3
   }
 ])
 
@@ -145,7 +138,7 @@ const modeOptions = ref([
 const isWordDialog = ref(false)
 const editItem = reactive({})
 const onAdd = () => {
-
+  console.log(curTemplate)
   Object.assign(editItem, curTemplate)
   editItem.isAdd = true
   isWordDialog.value = true
@@ -183,253 +176,61 @@ const getTemplateList = () => {
     }
   })
 }
-const getChildTemplate = (val) => {
+const getChildTemplate = () => {
   tempLoading.value = true
   modelList({ model: props.type, type: 2, parentId: curTemplate.id, ex1: curNode.edustage, ex2: curNode.edusubject }).then(res => {
     childTempList.value = res.rows
     if (childTempList.value.length) {
-      childTempList.value.forEach(item => {
-        item.answer = '';
-        item.showTypewriter = false
-      })
+      childTempList.value.forEach(item => item.answer = '')
     }
-
-    // 获取研读结果
-    getTempResult(val)
-    
-    
+    getTempResult()
   }).finally(() => {
     tempLoading.value = false
   })
 }
-
-
+const isStarted = ref([]);
+const listRef = ref()
 // 查询模板结果
-const getTempResult = (val) => {
-  tempResult({ mainModelId: curTemplate.id, pageNum: 1, pageSize: 10000, ex1: curNode.id }).then(async res => {
+const getTempResult = () => {
+  tempResult({ mainModelId: curTemplate.id, pageNum: 1, pageSize: 10000, ex1: curNode.id }).then(res => {
     let rows = res.rows
     childTempList.value.forEach(item => {
       rows.forEach(el => {
         if (item.id == el.modelId) {
-          item.answer = el.content
+          item.answer = getResult(el.content)
           item.resultId = el.id
         }
       })
     })
-    // val : true 新增的子模板 然后研读
-    if(val){
-      // 添加了一个子模板 要等dom 更新完成 不然滚动无效
-      await nextTick()
-
-      // 研读最后一个
-      let lastIndex = childTempList.value.length - 1
-      getModelResult(lastIndex, childTempList.value[lastIndex], true)
+    if (rows.length > 0) {
+      isStarted.value = new Array(rows.length).fill(true)
     }
+
   })
 }
 
-const prompt = ref('')
+const scrollToBottom = (height, index) => {
 
-// 是否重新研读
-const isAgain = ref(false)
+  if (listRef.value) {
+    let sum = 0
+    let listDom = listRef.value.children
 
-// 研读
-const getModelResult = async (index, item, isLast) => {
-  /**
-   * 
-   * index: 当前项索引
-   * item: 当前项
-   * isLast: 是否最后一项 用于添加子模板后研读
-   */
-  let str = prompt.value
-  // 重新研读
-  if(index !== ''){
-    isAgain.value = true
-    // 清空研读结果
-    childTempList.value[index].answer = ''
-    // 设置需要打字机效果
-    childTempList.value[index].showTypewriter = true
-    // 滚动到该项的位置
-    if (messageElements.value[index]) {
-      messageElements.value[index].scrollIntoView({
-        behavior: 'smooth',
-        block: 'start',
-      });
-    }
-    // 设置当前模板prompt
-    str = str.replace('{模板标题}',item.name)
-    str = str.replace('{模板内容}',item.prompt)
-    params.prompt = str
-    params.template = item.prompt
-    // 请求数据
-    try {
-      childTempList.value[index].loading = true
-      const data = await requestModelData()
-      childTempList.value[index].answer = data.answer;
-      if(isLast){
-        await onSaveTemp(childTempList.value[index])
-      }else{
-        // 保存重新研读后的结果 
-        onEditResult(data.answer, index)
-      }
-  
-    } finally {
-      childTempList.value[index].loading = false
-    }
-    
-  }
-  // 一键研读
-  else{
-    // 清空所有模板结果
-    childTempList.value.forEach(item => {
-      if (item.answer) {
-        item.answer = ''
-      }
-    })
-    // 设置滚动到第一个位置
-    messageElements.value[0].scrollIntoView({
-      behavior: 'smooth',
-      block: 'start',
-    })
-
-    processNext(0)
-
-  }
-}
-
-// 打字机效果完成 后继续研读下一个
-const processNext = async (index) =>{
-  let str = prompt.value
-  // 当前项
-  const item = childTempList.value[index]
-  item.loading = true
-  str = str.replace('{模板标题}',item.name)
-  str = str.replace('{模板内容}',item.prompt)
-  params.prompt = str
-  params.template = item.prompt
-  // 请求数据
-  try {
-    const data = await requestModelData()
-    item.answer = data.answer
-    item.showTypewriter = true
-  
-
-    // 保存
-    await onSaveTemp(item)
-  } finally {
-    item.loading = false
-  }
-}
-
-// 打字机完成后触发
-const handleDone = (index) =>{
-  if(isAgain.value){
-    isAgain.value = false
-    return
-  }
-  else{
-    if(index == childTempList.value.length - 1) return
-    outerContainer.value.scrollTo({
-      top: outerContainer.value.scrollHeight,
-      behavior: 'smooth',
-    });
-    processNext(index + 1)
-  }
-}
-
-// 设置一个延迟函数 ms: 毫秒
-const delay = (ms) => new Promise(resolve => setTimeout(resolve, ms));
-
-// 请求大模型接口获取模板研读结果 知识库模型 or 教学大模型
-const requestModelData = async () =>{
-  // 教学大模型
-  let data = null
-  if (curMode.value == 1) {
-    const res = await sendChart({
-      content: params.prompt,
-      conversationId: conversation_id.value,
-      stream: false
-    })
-    // 一键研读 设置一个1s 延迟 防止百度千帆请求过于频繁
-    if(!isAdjust.value){
-      await delay(1000); // 每个请求之间延迟 1 秒
-    }
-    data = res.data
-  }
-  // 知识库模型
-  else {
-    if (curMode.value == 3) {
-      params.llm = 'deepseek-r1:8b'
-    }
-    const res = await completion(params)
-    data = res.data
-  }
-  return data
-}
-
-
-const messageElements = ref([]); // 存储所有消息元素的引用
-// 处理页面滚动
-// const animationId = ref(null)
-const animationIDs = ref([])
-
-const outerContainer = ref()
-let lastScrollTime = 0;
-const scrollInterval = 200
-const handleScroll  = (index) => {
-  const now = Date.now();
-  if (now - lastScrollTime >= scrollInterval) {
-    const container = document.querySelector('.container-right-list');
-    if(isAgain.value){
-      scrollToTmp(index)
-    }
-    else{
-     
-      if (container) {
-        if(index == 0){
-          const item =  messageElements.value[index]
-          if(item.clientHeight > outerContainer.value.clientHeight ){
-            item.scrollIntoView({ behavior: 'smooth', block: 'end' })
-          }
-        }
-        else{
-          // 平滑滚动到底部
-          const id = requestAnimationFrame(() => {
-            container.scrollTo({
-              top: container.scrollHeight,
-              behavior: 'smooth',
-            });
-          });
-          animationIDs.value.push(id)
-        }
+    if (index == 0) {
+      // 220 去掉头部
+      let screenHeight = window.innerHeight - 220
+      if (height > screenHeight) {
+        listRef.value.scrollTop = (height - screenHeight + 50)
       }
     }
-    lastScrollTime = now;
-  }
-}
-
-// 处理重新研读 滚动
-const scrollToTmp = (index) =>{
-  // 最后一个 滚到底部
-  if(index == childTempList.value.length - 1){
-    const id = requestAnimationFrame(() => {
-      outerContainer.value.scrollTo({
-        top: outerContainer.value.scrollHeight,
-        behavior: 'smooth',
-      });
-    });
-    animationIDs.value.push(id)
-  }
-  else{
-    const item =  messageElements.value[index]
-    if(item.clientHeight > outerContainer.value.clientHeight ){
-      item.scrollIntoView({ behavior: 'smooth', block: 'end' })
+    else {
+      for (let i = 0; i < index; i++) {
+        sum += listDom[i].clientHeight
+      }
+      listRef.value.scrollTop = sum + height
     }
-  } 
+  }
 }
 
-
-
 // 模板切换
 const changeTemplate = (val) => {
   ElMessageBox.confirm(
@@ -497,10 +298,122 @@ const onEdit = (index, item) => {
   isEdit.value = true
 }
 
-// 保存编辑后的研读内容
-const onEditResult = async (answer, index) => {
+// 重新研读
 
-  await editTempResult({ id: childTempList.value[index].resultId, content: answer })
+const prompt = ref('')
+
+// 重新研读
+const isAgain = ref(false)
+const againResult = async (index, item) => {
+  isAgain.value = true
+  isStarted.value[index] = false
+  childTempList.value[index].answer = ''
+
+  if (index == 0) {
+    listRef.value.scrollTop = 0
+
+  } else {
+    scrollToBottom(50, index)
+  }
+
+  try {
+    await nextTick()
+    childTempList.value[index].loading = true
+    item.aiShow = true
+
+    let str = cloneDeep(prompt.value)
+    str = str.replace('{模板标题}',item.name)
+    str = str.replace('{模板内容}',item.prompt)
+    params.prompt = str
+    params.template = item.prompt
+
+    let data = null;
+    // 教学大模型
+    if (curMode.value == 1) {
+      const res = await sendChart({
+        content: params.prompt,
+        conversationId: conversation_id.value,
+        stream: false
+      })
+      data = res.data
+    } else {
+      if (curMode.value == 3) {
+        params.llm = 'deepseek-r1:8b'
+      }
+      // 知识库模型
+      const res = await completion(params)
+      data = res.data
+    }
+
+    childTempList.value[index].answer = getResult(data.answer);
+    isStarted.value[index] = true
+
+  } finally {
+    childTempList.value[index].loading = false
+  }
+}
+
+
+const delay = (ms) => new Promise(resolve => setTimeout(resolve, ms));
+// 一键研读
+const getCompletion = async () => {
+  isStarted.value = new Array(childTempList.length).fill(false)
+  isStarted.value[0] = true
+
+  childTempList.value.forEach(item => {
+    if (item.answer) {
+      item.answer = ''
+    }
+  })
+
+  for (let item of childTempList.value) {
+    try {
+      item.loading = true
+      item.aiShow = true
+      let str = cloneDeep(prompt.value)
+      str = str.replace('{模板标题}',item.name)
+      str = str.replace('{模板内容}',item.prompt)
+      params.prompt = str
+      params.template = item.prompt
+      // 教学大模型
+      let data = null
+      if (curMode.value == 1) {
+        const res = await sendChart({
+          content: params.prompt,
+          conversationId: conversation_id.value,
+          stream: false
+        })
+        await delay(1000); // 每个请求之间延迟 1 秒
+        data = res.data
+      }
+      // 知识库模型
+      else {
+        if (curMode.value == 3) {
+          params.llm = 'deepseek-r1:8b'
+        }
+        const res = await completion(params)
+        data = res.data
+      }
+
+      item.answer = getResult(data.answer)
+      onSaveTemp(item)
+    } finally {
+      item.loading = false
+    }
+  }
+}
+
+const handleCompleteText = async (answer, index) => {
+  if (index < childTempList.value.length - 1) {
+    isStarted.value[index + 1] = true; // 开始显示下一个文本
+  }
+  if (isAgain.value) {
+    try {
+      await editTempResult({ id: childTempList.value[index].resultId, content: answer })
+    } finally {
+      isAgain.value = false
+    }
+  }
 }
 
 // 替换分析结果
@@ -533,13 +446,19 @@ const onSaveTemp = async (item) => {
   }
 }
 
+// 去掉字符串中的 ### **
+let getResult = (str) => {
+  let newStr = str.replace(/#+|(\*\*)/g, '');
+  newStr = newStr.replace(/<think>[\s\S]*?<\/think>/g, '');
+  return newStr
+}
 
-// 操作之后获取子模板
+// 操作之后获取字模板
 emitter.on('onGetChild', () => {
-  getChildTemplate(true)
+  getChildTemplate()
 })
 // 操作之后获取主模板
-emitter.on('onGetMain====》', () => {
+emitter.on('onGetMain', () => {
   getTemplateList()
 })
 
@@ -577,8 +496,8 @@ onMounted(() => {
 
   getTemplateList()
   let jsonKey = `${modeType.value}-${data.edustage}-${data.edusubject}`
- 
- 
+
+
   params.dataset_id = dataSetJson[jsonKey]
   if(!params.dataset_id){
     curMode.value = 1
@@ -605,11 +524,7 @@ onUnmounted(() => {
   emitter.off('onGetMain');
   emitter.off('onGetChild');
   emitter.off('onSaveAdjust');
-  // 组件卸载时取消动画帧
-  animationIDs.value.forEach(id => cancelAnimationFrame(id))
 })
-
-
 </script>
 
 <style lang="scss" scoped>
@@ -701,15 +616,14 @@ onUnmounted(() => {
 
         .iconfont {
           margin-right: 3px;
-          font-size: 18px;
         }
 
         :deep(.el-button) {
-          font-size: 14px;
+          font-size: 13px;
         }
 
-        .icon-zhongxinshiyang {
-          font-size: 20px;
+        .icon-ai1 {
+          font-size: 18px;
         }
       }
     }

src/renderer/src/components/typing-effect/index.vue

@@ -1,122 +1,90 @@
 <template>
   <div class="typing-effect" ref="typingEffectRef">
     <!-- <span v-html="displayedText"></span> -->
-    <!-- <el-input
-      v-model="currentText"
-      :autosize="{ minRows: 2 }"
-      type="textarea"
-      readonly
-      resize="none"
-      style="width: 100%;"
-      input-style="border:none;outline: none;box-shadow:none;color:000;fontSize:14px"
-    /> -->
-    <v-md-editor v-model="currentText" mode="preview" />
+    <el-input
+    v-model="displayedText"
+    :autosize="{ minRows: 2 }"
+    type="textarea"
+    readonly
+    resize="none"
+    style="width: 100%;"
+    input-style="border:none;outline: none;box-shadow:none;color:000;fontSize:14px"
+  />
   </div>
 </template>
 
 <script setup>
-import { ref, onMounted, watch, onUnmounted } from 'vue';
+import { ref, onMounted, watch, nextTick } from 'vue';
 
 const props = defineProps({
   text: {
-    type: String,
-    required: true,
+    type: [String, Object],
+    required: true
   },
-  speed: {
+  delay: {
     type: Number,
-    default: 50, // 默认每个字符的展示间隔时间（毫秒）
+    default: 100 // 默认每个字符出现的延迟时间，单位是毫秒
   },
-  charsPerFrame: {
-    type: Number,
-    default: 1, // 默认每次展示的字符数
-  },
-  showTypewriter: {
-    type: Boolean,
-    default: true, // 是否展示打字机效果
-  },
-});
-
-// 定义 emits
-const emit = defineEmits(['scroll','done']);
-
-// 数据
-const currentText = ref(''); // 当前展示的文本
-const currentCharIndex = ref(0); // 当前展示到的字符索引
-const isTyping = ref(false); // 是否正在展示
-const animationFrameId = ref(null); // 用于存储 requestAnimationFrame 的 ID
-
-// 打字机效果逻辑
-const typeText = () => {
-
-  if (currentCharIndex.value < props.text.length) {
-    // 每次展示 charsPerFrame 个字符
-    currentText.value += props.text.slice(
-      currentCharIndex.value,
-      currentCharIndex.value + props.charsPerFrame
-    );
-    currentCharIndex.value += props.charsPerFrame;
-    emit('scroll'); // 触发滚动事件
-    // 使用 requestAnimationFrame 递归调用
-    animationFrameId.value = requestAnimationFrame(() => {
-      setTimeout(() => {
-        typeText();
-      }, props.speed);
-    });
-  } else {
-    isTyping.value = false;
-    emit('done')
+  aiShow: {
+    type: [Boolean] // 为true 只展示
   }
-};
+});
+const typingEffectRef = ref(null);
+const emit = defineEmits(['complete', 'updateScroll']);
+const displayedText = ref('');
+const index = ref(0);
 
-// 直接展示全部内容
-const showFullText = () =>{
-  currentText.value = props.text
-}
-
-// 启动打字机效果
-const startTypeWriter = () => {
-  isTyping.value = true;
-  currentText.value = '';
-  currentCharIndex.value = 0;
-  typeText();
-};
-
-// 监听 text 的变化
-watch(
-  () => props.text,
-  () => {
-    if(props.showTypewriter && props.text){
-      startTypeWriter();
+const type = async () => {
+  await nextTick()
+  if(!props.aiShow) {
+    displayedText.value = props.text
+    return
+  }
+  //限制多久内打印完ms
+  let allLength = props.text.length
+  let allTime = 3000
+  let addIndex = allLength/(allTime/props.delay);
+  //一次添加5个字符
+  for (let i = 0; i < addIndex; i++) {
+    if (index.value <= allLength) {
+      displayedText.value += props.text.charAt(index.value);
+      index.value++;
     } else {
-      showFullText();
+      break;
     }
   }
-);
-
-// 组件挂载时启动打字机效果
-onMounted(() => {
-  // startTypeWriter();
-});
-
-// 组件卸载时取消动画帧
-onUnmounted(() => {
-  if (animationFrameId.value) {
-    cancelAnimationFrame(animationFrameId.value);
+  if (index.value <= props.text.length) {
+    // displayedText.value += props.text.charAt(index.value);
+    // index.value++;
+    setTimeout(() => {
+      type();
+      emit('updateScroll', typingEffectRef.value.clientHeight); // 每次添加新字符后滚动到底部
+    }, props.delay);
+  } else {
+    // 当所有字符都显示完毕时，触发 complete 事件
+    emit('complete',displayedText.value);
   }
+};
+
+onMounted(() => {
+  resetAndType();
 });
 
+const resetAndType = () =>{
+  displayedText.value = '';
+  index.value = 0;
+  type();
+}
+
+// 监听 props 的变化，以便当传入的 text 或 delay 发生改变时重新开始打字机效果
+watch([() => props.text, () => props.delay], resetAndType);
+
+
+
 </script>
 
 <style scoped>
 :deep(.el-textarea__inner:hover){
   box-shadow: none;
 }
-
-.typing-effect{
-  :deep(.github-markdown-body){
-    padding: 0;
-    font-size: 14px;
-  }
-}
-
 </style>

src/renderer/src/router/index.js

@@ -90,6 +90,12 @@ export const constantRoutes = [
         name: 'questionUpload',
         meta: { title: '习题上传', showBread: true  }
       },
+      {
+        path: 'questionGrade',
+        component: () => import('@/views/classTask/newClassTaskAssign/questionGrade/index.vue'),
+        name: 'questionGrade',
+        meta: { title: '智能推题', showBread: true  }
+      },
       {
         path: 'groupTestPaper',
         component: () => import('@/views/classTask/groupTestPaper/index.vue'),

src/renderer/src/views/classTask/newClassTaskAssign/Right/index.vue

@@ -39,6 +39,7 @@ const items = shallowRef([
   { title: '习题上传', description: '自己上传个人题库。', icon: '#icon-shangchuan',type:'danger' },
   { title: '科学实验', description: '学生完成虚拟仿真实验，并提交实验结果。', icon: '#icon-shangchuan',type:'primary' },
   // { title: '自主组卷', description: '老师自主选择试题组卷。', icon: '#icon-shangchuan',type:'primary' },
+  { title: '智能推题', description: '根据学生知识点掌握程度，自主智能推题。', icon: '#icon-shangchuan',type:'primary' },
 ]);
 
 const handleClick = (item) => {

src/renderer/src/views/classTask/newClassTaskAssign/index.vue

@@ -297,6 +297,10 @@ const handleItemClick = (itemName) => {
     router.push({ path: '/model/groupTestPaper', query: { courseObj: JSON.stringify(courseObj) } });
     return;
   }
+  if (itemName == '智能推题') {
+    router.push({ path: '/model/questionGrade', query: { courseObj: JSON.stringify(courseObj) } });
+    return;
+  }
 
   currentRow.value.id = 1; // 作业设计
   /**

src/renderer/src/views/classTask/newClassTaskAssign/questionGrade/components/knowPointModel.vue

@@ -0,0 +1,105 @@
+<template>
+  <el-row class="c-warp" :gutter="10">
+    <el-col class="left" :span="10">
+      <!-- <el-collapse class="c-item" v-model="activeTopic" accordion>
+        <template v-for="(item, index) in pointList">
+          <el-collapse-item class="collapse-item" :name="index+1" :id="'collapse-'+(index+1)" @click="clickItem(index)">
+            <template #title>
+              <el-popover :width="500" placement="right">
+                <p>{{item.def?.titletext}}</p>
+                <template #reference>
+                  <el-button type="primary" size="small" round>{{index+1}}</el-button>
+                </template>
+              </el-popover>
+              <span class="item-title-o">{{item.type}} {{getRatioTxt(item)}} </span>
+              <el-tag type="success" size="small">{{item.points}}%</el-tag>
+            </template>
+            <div class="respond">
+              <div class="c-label">
+                <b t1>作答情况</b>
+                <template v-if="item.type=='单选题'||item.type == '多选题'||item.type == '判断题'">
+                  <span>(已经完成 <el-text type="danger">{{item.accSum}}</el-text> 人-</span>
+                  <span>回答正确 <el-text type="danger">{{item.rightSum}}</el-text> 人)</span>
+                </template>
+                <template v-else>
+                  <span>(已经完成 <el-text type="danger">{{item.accSum}}</el-text> 人)</span>
+                </template>
+              </div>
+              <div class="c-childen">
+                <template v-for="(it, ind) in item.children">
+                  <el-collapse v-model="item.active">
+                    <el-collapse-item class="collapse-item" :name="ind+1">
+                      <template #title>
+                        <div class="t-left">
+                          <el-tooltip placement="right" :content="it.def">
+                            <el-tag size="small" style="vertical-align: 2px;" v-html="it.code"></el-tag>
+                          </el-tooltip>
+                          <el-text t1>{{it.studentIds.length}} 人/占 {{ratio_1(it, item.accSum)}}%</el-text>
+                        </div>
+                        <div style="flex: 1;">
+                          <el-progress :status="getStatus(it)" :stroke-width="10" :percentage="ratio_1(it, item.accSum)" />
+                        </div>
+                      </template>
+                      <div class="c-respond">
+                        <template v-for="(sid, indStu) in it.studentIds">
+                          <el-tag>{{getStudentName(sid)}}</el-tag>
+                        </template>
+                      </div>
+                    </el-collapse-item>
+                  </el-collapse>
+                </template>
+              </div>
+            </div>
+          </el-collapse-item>
+        </template>
+      </el-collapse> -->
+      <el-button type="success" @click="test()">测试</el-button>
+    </el-col>
+  </el-row>
+</template>
+
+<script setup>
+
+
+import { onMounted, ref, watch, reactive, getCurrentInstance, nextTick, defineEmits } from 'vue'
+
+import { listKnowPointStudent } from '@/api/knowledge/student'
+import { listEntpcourseworkSmartNew } from '@/api/education/entpcoursework'
+
+const props = defineProps({
+  courseObj: Object,
+})
+
+const activeTopic = ref(1)        // 需展开的知识点
+
+const initKnowPointList = async () => {
+  const eid = props.courseObj.levelSecondId ? props.courseObj.levelSecondId : props.courseObj.levelFirstId;
+  const res = await listKnowPointStudent({eid: eid});
+  console.log('res', res);
+}
+
+const test = async () => {
+  const query = {
+    edustage: '高中',
+    edusubject: '地理',
+    evalId: '40222',
+    requestsList: [{
+      pointThirdIdList: ['371213'],
+      difficulty: 5,
+      workType: 1,
+      count: 3,
+    }],
+  }
+  listEntpcourseworkSmartNew(query).then(res => {
+    console.log('res', res);
+  })
+}
+
+onMounted(() => {
+  //initKnowPointList();
+})
+
+</script>
+
+<style scoped lang="scss">
+</style>

src/renderer/src/views/classTask/newClassTaskAssign/questionGrade/components/studentModel.vue

@@ -0,0 +1,3 @@
+<template>
+  <div>学生掌握展示</div>
+</template>

src/renderer/src/views/classTask/newClassTaskAssign/questionGrade/index.vue

@@ -0,0 +1,90 @@
+<template>
+  <div  class="page-testpaper">
+    <div class="page-center">
+      <el-tabs v-model="activeAptTab" style="height: 100%;">
+        <el-tab-pane label="知识点一览" name="知识点一览" class="prepare-center-zzst">
+          <KnowPointModel v-if="isCourseObjLoaded" :courseObj="courseObj"/>
+        </el-tab-pane>
+        <el-tab-pane label="学生掌握一览" name="学生掌握一览" class="prepare-center-grst">
+          <StudentModel v-if="isCourseObjLoaded" :courseObj="courseObj"/>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { onMounted, ref, watch, reactive, getCurrentInstance, nextTick, defineEmits } from 'vue'
+import { useRouter, useRoute } from 'vue-router'
+
+import KnowPointModel from '@/views/classTask/newClassTaskAssign/questionGrade/components/knowPointModel.vue'
+import StudentModel from '@/views/classTask/newClassTaskAssign/questionGrade/components/studentModel.vue'
+
+const route = useRoute();
+const propsQueryCourseObj = route.query.courseObj;//作业布置的内容对象
+const isCourseObjLoaded = ref(false);
+const courseObj = reactive({
+  // 课程相关参数: 教材id,单元id,章节id,课程名称
+  textbookId: '',
+  levelFirstId: '',
+  levelSecondId: '',
+  coursetitle:'',
+  node: null, // 选择的课程节点
+  //
+})
+
+const activeAptTab = ref("知识点一览");
+
+onMounted(() => {
+  console.log('propsQueryCourseObj', JSON.parse(propsQueryCourseObj));
+  if(propsQueryCourseObj&&JSON.parse(propsQueryCourseObj)){
+    courseObj.textbookId = JSON.parse(propsQueryCourseObj).bookObj  // 版本
+    courseObj.levelFirstId = JSON.parse(propsQueryCourseObj).levelFirstId  // 单元
+    courseObj.levelSecondId = JSON.parse(propsQueryCourseObj).levelSecondId // 章节
+    courseObj.coursetitle = JSON.parse(propsQueryCourseObj).coursetitle  // (单元/章节) 名称
+    courseObj.node = JSON.parse(propsQueryCourseObj).node; // 保存当前节点
+  }
+  isCourseObjLoaded.value = true;
+})
+</script>
+
+<style scoped lang="scss">
+:deep(.el-tabs__nav) {
+  .el-tabs__item {
+    font-weight: bold;
+    font-size: 18px;
+  }
+}
+
+.page-testpaper {
+  height: 100%;
+  display: flex;
+  flex-direction: row;
+  .page-center{
+    flex: 1;
+    //min-width: calc(100% - 675px);
+    height: 100%;
+    padding: 0 20px;
+    margin: 0 5px;
+    overflow: hidden;
+    border-radius: 10px;
+    background-color: white;
+
+    .prepare-center-zzst{
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+    }
+    .prepare-center-xbtk{
+      height: 100%;
+    }
+    .prepare-center-grst{
+      height: 100%;
+    }
+  }
+  .page-right{
+    flex: 1;
+  }
+}
+
+</style>