Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aix-win-ws",
-  "version": "2.5.17",
+  "version": "2.5.18",
   "description": "",
   "main": "./out/main/index.js",
   "author": "上海交大重庆人工智能研究院",
@@ -141,4 +141,4 @@
     "vue-tsc": "^1.8.25",
     "windicss": "^3.5.6"
   }
-}
+}

src/renderer/src/AixPPTist/src/views/Screen/ScreenSlideList.vue

@@ -80,6 +80,7 @@ provide(injectKeySlideScale, scale)
   position: relative;
   width: 100%;
   height: 100%;
+  overflow: hidden;
 }
 .slide-item {
   position: absolute;

src/renderer/src/AixPPTist/src/views/Screen/hooks/useExecPlay.ts

@@ -198,7 +198,7 @@ export default (isLoader?: boolean = true) => {
   const touchInfo = ref<{ x: number; y: number; } | null>(null)
 
   const touchStartListener = (e: TouchEvent) => {
-    e.preventDefault() // 阻止默认事件
+    // e.preventDefault() // 阻止默认事件
     touchInfo.value = {
       // x: e.changedTouches[0].pageX,
       // y: e.changedTouches[0].pageY,
@@ -208,6 +208,7 @@ export default (isLoader?: boolean = true) => {
   }
   const touchEndListener = (e: TouchEvent) => {
     if (!touchInfo.value) return
+    // window.scrollTo(0, 0) // 滚动到顶部
     const offsetX = Math.abs(touchInfo.value.x - e.changedTouches[0].clientX)
     const offsetY = e.changedTouches[0].clientY - touchInfo.value.y
     if ( Math.abs(offsetY) > offsetX && Math.abs(offsetY) > 50 ) {

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

@@ -23,7 +23,7 @@
         </el-button>
         <el-button type="primary" link :disabled="!(templateList.length)" @click="onAdd">
           <i class="iconfont icon-jiahao"></i>
-          添加提示词
+          {{curTemplate.ex3 === '1' ? '复制并创建个人模板' : '添加提示词'}}
         </el-button>
         <el-button type="primary" :disabled="!(childTempList.length)" @click="getCompletion">一键研读</el-button>
       </div>
@@ -120,6 +120,10 @@ const modeOptions = ref([
     label: '知识库模型',
     value: 2,
     disabled: false
+  },
+  {
+    label: 'deepseek模型',
+    value: 3
   }
 ])
 
@@ -134,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
@@ -333,6 +337,9 @@ const againResult = async (index, item) => {
       })
       data = res.data
     } else {
+      if (curMode.value == 3) {
+        params.llm = 'deepseek-r1:8b'
+      }
       // 知识库模型
       const res = await completion(params)
       data = res.data
@@ -381,6 +388,9 @@ const getCompletion = async () => {
       }
       // 知识库模型
       else {
+        if (curMode.value == 3) {
+          params.llm = 'deepseek-r1:8b'
+        }
         const res = await completion(params)
         data = res.data
       }
@@ -439,6 +449,7 @@ const onSaveTemp = async (item) => {
 // 去掉字符串中的 ### **
 let getResult = (str) => {
   let newStr = str.replace(/#+|(\*\*)/g, '');
+  newStr = newStr.replace(/<think>[\s\S]*?<\/think>/g, '');
   return newStr
 }
 
@@ -485,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

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

@@ -40,9 +40,22 @@ const type = async () => {
     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 {
+      break;
+    }
+  }
   if (index.value <= props.text.length) {
-    displayedText.value += props.text.charAt(index.value);
+    // displayedText.value += props.text.charAt(index.value);
-    index.value++;
+    // index.value++;
     setTimeout(() => {
       type();
       emit('updateScroll', typingEffectRef.value.clientHeight); // 每次添加新字符后滚动到底部
@@ -74,4 +87,4 @@ watch([() => props.text, () => props.delay], resetAndType);
 :deep(.el-textarea__inner:hover){
   box-shadow: none;
 }
-</style>
+</style>

src/renderer/src/views/model/index.vue

@@ -438,17 +438,23 @@ const toRousrceUrl = async (o) => {
   if (!!o.src) { // 如果有src就转换
     const isBase64 = /^data:image\/(\w+);base64,/.test(o.src)
     const isBlobUrl = /^blob:/.test(o.src)
-    let onLineUrl = '' // 线上地址
+    let onLineUrl = '', typeExt = '' // 线上地址|文件后缀
-    if (!!o.zipPath) onLineUrl = pptMedia[o.zipPath] || '' // 是否已上传过
+    if (!!o.zipPath) {
+      onLineUrl = pptMedia[o.zipPath] || '' // 是否已上传过
+      typeExt = o.zipPath.split('.').pop()
+    }
     if (onLineUrl) o.src = onLineUrl // 已存在线上地址直接赋值
     else { // 不存在重新上传
       if (isBase64) { // 相同资源处理
-        const url = await getOnlineFileUrl(o.src)
+        if(!typeExt) typeExt = 'png'
+        const url = await getOnlineFileUrl(o.src, typeExt)
+        url &&(o.src = url)
         url && o.zipPath && (pptMedia[o.zipPath] = url) // 缓存
       } else if (isBlobUrl) { // 视频和音频
+        if(!typeExt) typeExt = o.type=='video'?'mp4':'mp3'
         const res = await fetch(o.src)
         const blob = await res.blob()
-        const url = await getOnlineFileUrl(blob, o.type=='video'?'mp4':'mp3')
+        const url = await getOnlineFileUrl(blob, typeExt)
         URL.revokeObjectURL(o.src) // 释放内存
         url &&(o.src = url)
         url && o.zipPath && (pptMedia[o.zipPath] = url) // 缓存

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

@@ -653,17 +653,23 @@ export default {
       if (!!o.src) { // 如果有src就转换
         const isBase64 = /^data:image\/(\w+);base64,/.test(o.src)
         const isBlobUrl = /^blob:/.test(o.src)
-        let onLineUrl = '' // 线上地址
+        let onLineUrl = '', typeExt = '' // 线上地址|文件后缀
-        if (!!o.zipPath) onLineUrl = this.pptMedia[o.zipPath] || '' // 是否已上传过
+        if (!!o.zipPath) {
+          onLineUrl = this.pptMedia[o.zipPath] || '' // 是否已上传过
+          typeExt = o.zipPath.split('.').pop()
+        }
         if (onLineUrl) o.src = onLineUrl // 已存在线上地址直接赋值
         else { // 不存在重新上传
           if (isBase64) { // 相同资源处理
-            const url = await this.getOnlineFileUrl(o.src)
+            if(!typeExt) typeExt = 'png'
+            const url = await this.getOnlineFileUrl(o.src, typeExt)
+            url &&(o.src = url)
             url && o.zipPath && (this.pptMedia[o.zipPath] = url) // 缓存
           } else if (isBlobUrl) { // 视频和音频
+            if(!typeExt) typeExt = o.type=='video'?'mp4':'mp3'
             const res = await fetch(o.src)
             const blob = await res.blob()
-            const url = await this.getOnlineFileUrl(blob, o.type=='video'?'mp4':'mp3')
+            const url = await this.getOnlineFileUrl(blob, typeExt)
             URL.revokeObjectURL(o.src) // 释放内存
             url &&(o.src = url)
             url && o.zipPath && (this.pptMedia[o.zipPath] = url) // 缓存