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

Reviewed-on: #84

electron.vite.config.mjs

@@ -34,7 +34,7 @@ export default defineConfig({
         '/dev-api': {
           target: 'http://27.128.240.72:7865',
           // target: 'http://36.134.181.164:7863',
-          // target: 'http://192.168.2.52:7863',
+          // target: 'http://192.168.0.102:7865',
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')
         },

src/renderer/index.html

@@ -8,7 +8,7 @@
       http-equiv="Content-Security-Policy"
       content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:"
     /> -->
-    <meta http-equiv="Content-Security-Policy" content="connect-src * blob: data:; default-src 'self'; script-src 'self' 'unsafe-eval' http://www.wiris.net 'unsafe-inline'; style-src 'self' 'unsafe-inline' http://www.wiris.net; media-src * blob:;img-src * 'self' data: blob:;font-src 'self' http://www.wiris.net;" />
+    <meta http-equiv="Content-Security-Policy" content="connect-src * blob: data:; default-src 'self' https://wzyzoss.eos-chongqing-3.cmecloud.cn/; script-src 'self' 'unsafe-eval' http://www.wiris.net 'unsafe-inline'; style-src 'self' 'unsafe-inline' http://www.wiris.net; media-src * blob:;img-src * 'self' data: blob:;font-src 'self' http://www.wiris.net;" />
 
   </head>
 

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

@@ -142,13 +142,19 @@ const handleNodeClick = (data) => {
  
   //增加一个label 之前取的label
   nodeData.label = nodeData.itemtitle
-  // 父级节点 如果当前是一级节点 父级则为null
-  let parent = {
-    id: nodeData.parentid,
-    label: nodeData.parenttitle,
-    itemtitle: nodeData.parenttitle
-  } 
-  const parentNode = nodeData.parentid ?  parent : null
+  let parentNode
+  // 存在children 则为一级节点
+  if(nodeData.children){
+    // 为一级节点
+    parentNode = null
+  }
+  else{
+    parentNode = {
+      id: nodeData.parentid,
+      label: nodeData.parenttitle,
+      itemtitle: nodeData.parenttitle
+    }
+  }
   nodeData.parentNode = parentNode
   let curData = {
     textBook: {

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

@@ -26,52 +26,52 @@
       </div>
     </div>
     <!--List-->
-    <div class="container-right-list">
-          <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 }}
-                  </div>
-                  <el-popover placement="bottom-end" trigger="hover" popper-class="template-custom-popover">
-                    <template #reference>
-                      <el-button link type="primary">
-                        <i class="iconfont icon-shenglvehao"></i></el-button>
-                    </template>
-                    <template #default>
-                      <el-button type="primary" link @click="editKeyWord(item)">编辑</el-button>
-                      <el-button type="primary" link @click="removeItem(item, true)">移除</el-button>
-                    </template>
-                  </el-popover>
-                </div>
-                <div class="item-text">
-                  {{ item.prompt }}
-                </div>
-                <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 :text="item.oldAnswer" :delay="10" :aiShow="item.aiShow"  @complete="onSaveTemp(item)" />
-                  </div>
-                </div>
-                <div class="ai-btn" v-if="item.answer">
-                  <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)">
-                    <i class="iconfont icon-duihua"></i>
-                    AI对话调整
-                  </el-button>
-                  <el-button type="primary" link @click="onEdit(index, item)">
-                    <i class="iconfont icon-bianji1"></i>
-                    手动编辑结果
-                  </el-button>
-                </div>
-              </div>
-          </template>
-          <el-empty v-if="!childTempList.length" description="暂无模板数据" />
+    <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 }}
+            </div>
+            <el-popover placement="bottom-end" trigger="hover" popper-class="template-custom-popover">
+              <template #reference>
+                <el-button link type="primary">
+                  <i class="iconfont icon-shenglvehao"></i></el-button>
+              </template>
+              <template #default>
+                <el-button type="primary" link @click="editKeyWord(item)">编辑</el-button>
+                <el-button type="primary" link @click="removeItem(item, true)">移除</el-button>
+              </template>
+            </el-popover>
+          </div>
+          <div class="item-text">
+            {{ item.prompt }}
+          </div>
+          <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)" />
+            </div>
+          </div>
+          <div class="ai-btn" v-if="item.answer">
+            <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)">
+              <i class="iconfont icon-duihua"></i>
+              AI对话调整
+            </el-button>
+            <el-button type="primary" link @click="onEdit(index, item)">
+              <i class="iconfont icon-bianji1"></i>
+              手动编辑结果
+            </el-button>
+          </div>
+        </div>
+      </template>
+      <el-empty v-if="!childTempList.length" description="暂无模板数据" />
     </div>
   </div>
   <!--编辑结果-->
@@ -83,7 +83,7 @@
 </template>
 
 <script setup>
-import { ref, reactive, onMounted, watch, onUnmounted } from 'vue'
+import { ref, reactive, onMounted, watch, onUnmounted, nextTick } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { tempSave, completion, modelList, removeChildTemp, tempResult, editTempResult } from '@/api/mode/index'
 import { sessionStore } from '@/utils/store'
@@ -146,14 +146,16 @@ const getChildTemplate = () => {
   tempLoading.value = true
   modelList({ model: props.type, type: 2, parentId: curTemplate.id }).then(res => {
     childTempList.value = res.rows
-
+    if(childTempList.value.length){
+      childTempList.value.forEach(item => item.answer = '')
+    }
     getTempResult()
   }).finally(() => {
     tempLoading.value = false
   })
 }
-
-
+const isStarted = ref([]);
+const listRef = ref()
 // 查询模板结果
 const getTempResult = () => {
   tempResult({ mainModelId: curTemplate.id, pageNum: 1, pageSize: 10000 }).then(res => {
@@ -161,14 +163,40 @@ const getTempResult = () => {
     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
         }
       })
     })
+    if(rows.length > 0){
+      isStarted.value = new Array(rows.length).fill(true)
+    }
+
   })
 }
 
+const scrollToBottom = (height,index) =>{
+
+  if (listRef.value) {
+    let sum = 0 
+    let listDom = listRef.value.children
+    
+    if(index == 0){
+      // 220 去掉头部 
+      let screenHeight  = window.innerHeight - 220
+      if(height > screenHeight){
+        listRef.value.scrollTop = (height - screenHeight + 50)
+      }
+    }
+    else{
+      for(let i = 0; i < index; i++){
+        sum += listDom[i].clientHeight
+      }
+      listRef.value.scrollTop = sum + height
+    }
+  }
+}
+
 // 模板切换
 const changeTemplate = (val) => {
   ElMessageBox.confirm(
@@ -203,11 +231,11 @@ const removeItem = async (item, isChild) => {
     ).then(() => {
       removeChildTemp(item.id).then(res => {
         ElMessage.success('操作成功')
-        if(isChild){
+        if (isChild) {
           // 获取子模板
           getChildTemplate()
         }
-        else{
+        else {
           // 获取主模板
           getTemplateList()
         }
@@ -215,7 +243,7 @@ const removeItem = async (item, isChild) => {
     })
   }
   else {
-    editKeyWord(item,!isChild)
+    editKeyWord(item, !isChild)
   }
 }
 
@@ -240,19 +268,18 @@ const onEdit = (index, item) => {
 
 const modeType = ref('课标')
 watch(() => props.type, (newVal) => {
-  if (newVal == 1){
+  if (newVal == 1) {
     modeType.value = '课标'
   }
-  if (newVal == 2){
+  if (newVal == 2) {
     modeType.value = '教材'
   }
-  if (newVal == 2){
+  if (newVal == 3) {
     modeType.value = '考试'
   }
 
 }, { immediate: false })
 
-
 // 重新研读
 const params = reactive(
   {
@@ -260,76 +287,102 @@ const params = reactive(
     dataset_id: ''
   }
 )
+
 // 重新研读
+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
-    childTempList.value[index].oldAnswer = ''
     params.prompt = `按照${item.name}的要求，针对${curNode.edustage}${curNode.edusubject}${modeType.value} 对${curNode.itemtitle}进行教学分析`
     const { data } = await completion(params)
-    let answer = data.answer
-    childTempList.value[index].oldAnswer = answer
-    childTempList.value[index].answer = getResult(answer);
-    // onEditSave(item)
+    childTempList.value[index].answer = getResult(data.answer);
+    isStarted.value[index] = true
+
   } finally {
     childTempList.value[index].loading = false
   }
 }
 // 一键研读
 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
       params.prompt = `按照${item.name}的要求，针对${curNode.edustage}${curNode.edusubject}${modeType.value} 对${curNode.itemtitle}进行教学分析`
       const { data } = await completion(params)
-      let answer = data.answer
-      item.oldAnswer = answer
-      item.answer = getResult(answer);
-
+      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
+    }
+  }
+}
+
 // 替换分析结果
 emitter.on('onSaveAdjust', (item) => {
-  childTempList.value[curIndex.value].oldAnswer = item
-  let answer = getResult(item);
-  childTempList.value[curIndex.value].oldAnswer = item
-  childTempList.value[curIndex.value].answer = answer
+  childTempList.value[curIndex.value].answer = item
   onEditSave(childTempList.value[curIndex.value])
 })
 
-
 // 保存 重新研读后的结果
-const onEditSave = async (item) =>{
-  const { res } = await editTempResult({id: item.resultId, content: item.oldAnswer})
+const onEditSave = async (item) => {
+  const { res } = await editTempResult({ id: item.resultId, content: item.answer })
   ElMessage.success(res)
   getChildTemplate()
 }
 
 // 保存模板
 const onSaveTemp = (item) => {
-  if(item.oldAnswer == '') return
+  if (item.answer == '') return
+
   const data = {
     mainModelId: curTemplate.id,
     modelId: item.id,
     examDocld: '',
-    content: item.oldAnswer
+    content: item.answer
   }
-  tempSave(data).then(res => {})
+  tempSave(data).then(res => { })
 }
 
-// 分析获取课标对话结果
-let getResult = (text) => {
-  text = text.replace(/^\n\n(.*?)\n\n$/s, '<div>$1</div>');
-  text = text.replace(/^\n(.*?)\n$/s, '<p>$1</p>');
-  text = text.replace(/\*\*(.*?)\*\*/g, "<div class='text-tit'>$1</div>");
-  text = text.replace(/(\d+\..*?)\n/g, "<div class='text-num'>$1</div>\n");
-  return text
+// 去掉字符串中的 ### **
+let getResult = (str) => {
+  let newStr = str.replace(/#+|(\*\*)/g, '');
+  return newStr
 }
 
 // 操作之后获取字模板
@@ -381,87 +434,85 @@ onUnmounted(() => {
     padding: 5px 15px;
     box-sizing: border-box;
 
-    
+    .template-item {
+      background: #fff;
+      padding: 10px;
+      margin-top: 10px;
+      border-radius: 5px;
 
-      .template-item {
-        background: #fff;
-        padding: 10px;
-        margin-top: 10px;
-        border-radius: 5px;
+      .item-header {
+        display: flex;
+        align-items: center;
+        font-size: 16px;
+        font-weight: bold;
+        color: #000;
+        justify-content: space-between;
 
-        .item-header {
-          display: flex;
-          align-items: center;
-          font-size: 16px;
-          font-weight: bold;
-          color: #000;
-          justify-content: space-between;
-
-          .blue {
-            font-size: 22px;
-            color: #409eff;
-            margin-right: 5px;
-          }
-        }
-
-        .item-text {
-          display: flex;
-          margin-top: 10px;
-          font-size: 14px;
-          text-align: left;
-          color: #606266;
-
-          .item-icon {
-            width: 30px;
-            height: 30px;
-            line-height: 30px;
-            text-align: center;
-            background: #F6F6F6;
-            border-radius: 50%;
-            margin-right: 10px;
-            flex-shrink: 0;
-          }
-
-          .item-answer {
-            flex-direction: column;
-            padding-top: 5px;
-            width: 100%;
-
-            :deep(.text-tit) {
-              font-weight: bold;
-              margin: 10px 0;
-            }
-
-            :deep(.text-num) {
-              padding-left: 2em;
-            }
-          }
-
-        }
-
-        .text-answer {
+        .blue {
+          font-size: 22px;
           color: #409eff;
-        }
-
-        .ai-btn {
-          margin-top: 10px;
-          display: flex;
-          justify-content: flex-end;
-
-          .iconfont {
-            margin-right: 3px;
-          }
-
-          :deep(.el-button) {
-            font-size: 13px;
-          }
-
-          .icon-ai1 {
-            font-size: 18px;
-          }
+          margin-right: 5px;
         }
       }
-    
+
+      .item-text {
+        display: flex;
+        margin-top: 10px;
+        font-size: 14px;
+        text-align: left;
+        color: #606266;
+
+        .item-icon {
+          width: 30px;
+          height: 30px;
+          line-height: 30px;
+          text-align: center;
+          background: #F6F6F6;
+          border-radius: 50%;
+          margin-right: 10px;
+          flex-shrink: 0;
+        }
+
+        .item-answer {
+          flex-direction: column;
+          padding-top: 5px;
+          width: 100%;
+
+          :deep(.text-tit) {
+            font-weight: bold;
+            margin: 10px 0;
+          }
+
+          :deep(.text-num) {
+            padding-left: 2em;
+          }
+        }
+
+      }
+
+      .text-answer {
+        color: #409eff;
+      }
+
+      .ai-btn {
+        margin-top: 10px;
+        display: flex;
+        justify-content: flex-end;
+
+        .iconfont {
+          margin-right: 3px;
+        }
+
+        :deep(.el-button) {
+          font-size: 13px;
+        }
+
+        .icon-ai1 {
+          font-size: 18px;
+        }
+      }
+    }
+
   }
 }
 </style>

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="typing-effect">
+  <div class="typing-effect" ref="typingEffectRef">
     <!-- <span v-html="displayedText"></span> -->
     <el-input
     v-model="displayedText"
@@ -14,11 +14,11 @@
 </template>
 
 <script setup>
-import { ref, onMounted, watch } from 'vue';
+import { ref, onMounted, watch, nextTick } from 'vue';
 
 const props = defineProps({
   text: {
-    type: String,
+    type: [String, Object],
     required: true
   },
   delay: {
@@ -26,35 +26,48 @@ const props = defineProps({
     default: 100 // 默认每个字符出现的延迟时间，单位是毫秒
   },
   aiShow: {
-    type: [Boolean]
+    type: [Boolean] // 为true 只展示
   }
 });
-const emit = defineEmits(['complete']);
+const typingEffectRef = ref(null);
+const emit = defineEmits(['complete', 'updateScroll']);
 const displayedText = ref('');
 const index = ref(0);
 
-const type = () => {
-  if(!props.aiShow) return
+const type = async () => {
+  await nextTick()
+  if(!props.aiShow) {
+    displayedText.value = props.text
+    return
+  }
   if (index.value <= props.text.length) {
     displayedText.value += props.text.charAt(index.value);
     index.value++;
-    setTimeout(() => type(), props.delay);
+    setTimeout(() => {
+      type();
+      emit('updateScroll', typingEffectRef.value.clientHeight); // 每次添加新字符后滚动到底部
+    }, props.delay);
   } else {
     // 当所有字符都显示完毕时，触发 complete 事件
-    emit('complete');
+    emit('complete',displayedText.value);
   }
 };
 
 onMounted(() => {
-  type();
+  resetAndType();
 });
 
-// 监听 props 的变化，以便当传入的 text 或 delay 发生改变时重新开始打字机效果
-watch([() => props.text, () => props.delay], () => {
+const resetAndType = () =>{
   displayedText.value = '';
   index.value = 0;
   type();
-});
+}
+
+// 监听 props 的变化，以便当传入的 text 或 delay 发生改变时重新开始打字机效果
+watch([() => props.text, () => props.delay], resetAndType);
+
+
+
 </script>
 
 <style scoped>

src/renderer/src/views/examination-analysis/container/dialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-model="isDialog" :show-close="false" width="900" destroy-on-close>
+  <el-dialog v-model="isDialog" :show-close="false" width="900" append-to-body destroy-on-close>
     <template #header>
       <div class="custom-header flex">
         <span>选择{{ title }}</span>
@@ -15,8 +15,10 @@
       </div>
       <div class="content-list">
         <ul>
-          <li v-for="(item, index) in fileList" :class="activeIndex == index ? 'li-active' : ''" @click="clickItem(index, item)">
+          <li v-for="(item, index) in fileList" :class="activeIndex == index ? 'li-active' : ''"
+            @click="clickItem(index, item)">
             <el-image class="img" :src="url" />
+            <el-button type="primary" class="prev-btn" @click.stop="onPrevItem(item)">预览</el-button>
             <el-text truncated>{{ item.fileName }}</el-text>
           </li>
         </ul>
@@ -24,8 +26,8 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <el-upload class="upload-demo" :action="uploadFileUrl" :limit="1" :show-file-list="false"
-        :headers="headers" :on-success="onSuccess">
+        <el-upload class="upload-demo" :action="uploadFileUrl" :limit="1" :show-file-list="false" :headers="headers"
+          :on-success="onSuccess">
           <el-button type="primary">上传</el-button>
         </el-upload>
         <div>
@@ -37,6 +39,31 @@
       </div>
     </template>
   </el-dialog>
+  <el-dialog v-model="prevVisible" fullscreen :show-close="false" class="prev-dialog">
+    <template #header>
+      <div class="custom-header flex">
+        <span>预览</span>
+        <i class="iconfont icon-guanbi" @click="prevVisible = false"></i>
+      </div>
+    </template>
+    <div style="height: calc(100vh - 120px);">
+      <template v-if="getFileSuffix(prevItem.fileUrl) == 'pdf'">
+        <iframe :src="prevItem.fileUrl"
+          frameborder="0" width="100%" height="100%"></iframe>
+      </template>
+      <template v-else>
+        <el-image :src="prevItem.fileUrl" style="height:100%"/>
+      </template>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <div></div>
+        <el-button type="primary" @click="prevVisible = false">
+          关闭
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
 </template>
 
 <script setup>
@@ -47,6 +74,7 @@ import { sessionStore } from '@/utils/store'
 import { dataSetJson } from '@/utils/comm.js'
 import { ElMessage } from 'element-plus'
 import useUserStore from '@/store/modules/user'
+import { getFileSuffix } from '@/utils/ruoyi.js'
 import emitter from '@/utils/mitt';
 
 const userInfo = useUserStore().user
@@ -56,6 +84,7 @@ const headers = ref({ Authorization: "Bearer " + getToken() });
 const url = 'https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fsafe-img.xhscdn.com%2Fbw1%2F11044b08-04c1-41a0-a453-1fd20b58a614%3FimageView2%2F2%2Fw%2F1080%2Fformat%2Fjpg&refer=http%3A%2F%2Fsafe-img.xhscdn.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1732953359&t=7ab1d1b3a903db85b1149914407aea35'
 
 const isDialog = defineModel()
+const prevVisible = ref(false)
 
 const props = defineProps({
   modeType: {
@@ -99,21 +128,21 @@ const activeIndex = ref(0)
 const dataset_id = ref('')
 
 // 上传成功
-const onSuccess = async (response) =>{
-  console.log(response,'response')
+const onSuccess = async (response) => {
+  console.log(response, 'response')
   let data = {
     url: response.url,
     dataset_id: dataset_id.value
   }
   const res = await completion(data)
 
-  if(res.data.code != 200) return
+  if (res.data.code != 200) return
   let docData = {
     fileUrl: response.url,
     fileId: response.file.id,
     fileName: response.file.fileName,
     filesize: response.file.fileSize,
-    datasetId:  dataset_id.value,
+    datasetId: dataset_id.value,
     docId: res.data.document_id,
     edustage: curNode.edustage,
     edusubject: curNode.edusubject
@@ -127,25 +156,32 @@ const curNode = reactive({})
 
 const fileList = ref([])
 const curFile = reactive({})
-const getList = () =>{
+const getList = () => {
   docList({
     userId: userInfo.userId,
-    dataset_id:  dataset_id.value
-  }).then( res =>{
+    dataset_id: dataset_id.value
+  }).then(res => {
     fileList.value = [...res.rows]
-    Object.assign(curFile,  fileList.value[0])
+    Object.assign(curFile, fileList.value[0])
   })
 }
 
 const clickItem = (index, item) => {
   activeIndex.value = index
-  Object.assign(curFile,  item)
-  emitter.emit('curFile',item)
+  Object.assign(curFile, item)
+  emitter.emit('curFile', item)
+}
+
+const prevItem = reactive({})
+const onPrevItem = (item) => {
+  console.log(item)
+  Object.assign(prevItem, item)
+  prevVisible.value = true
 }
 
 
 
-onMounted(() =>{
+onMounted(() => {
   let data = sessionStore.get('subject.curNode')
   Object.assign(curNode, data);
 
@@ -155,7 +191,6 @@ onMounted(() =>{
 })
 
 </script>
-
 <style lang="scss" scoped>
 .custom-header {
   justify-content: space-between;
@@ -192,9 +227,11 @@ onMounted(() =>{
         overflow: hidden;
         margin-right: 20px;
         margin-bottom: 10px;
+        position: relative;
+        overflow: hidden;
 
         .img {
-          width: 100px;
+          width: 100%;
           height: 130px;
           border: solid #ccc 1px;
           margin-bottom: 10px;
@@ -203,6 +240,10 @@ onMounted(() =>{
         &:hover {
           background: #E0EAFF;
         }
+
+        &:hover .prev-btn {
+          transform: translate(-50%, -50%)
+        }
       }
 
       .li-active {
@@ -212,9 +253,20 @@ onMounted(() =>{
     }
   }
 }
-.dialog-footer{
+
+.dialog-footer {
   display: flex;
   align-items: center;
   justify-content: space-between;
 }
+
+.prev-btn {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%) translateY(-110px);
+  /* 按钮初始位置在容器外 */
+  transition: transform 0.3s ease-in-out;
+  /* 设置过渡效果 */
+}
 </style>

src/renderer/src/views/examination-analysis/container/pdf.vue

@@ -14,8 +14,14 @@ const pdfUrl = ref('')
 
 onMounted(async () =>{
   await nextTick()
-  const { fileurl } = sessionStore.get('subject.curBook')
-  pdfUrl.value = import.meta.env.VITE_APP_RES_FILE_PATH + fileurl.replace('.txt','.pdf')
+
+  let data = sessionStore.get('subject.curBook')
+  let fileurl = data.fileurl
+
+  if(fileurl == ''){
+    fileurl = `${data.edustage}-${data.edusubject}-课标.txt`
+  }
+  pdfUrl.value = import.meta.env.VITE_APP_RES_FILE_PATH + fileurl.replace('.txt', '.pdf')
 })
 </script>
 

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

@@ -357,7 +357,7 @@ const getIcon = (o, type) => {
     justify-content: flex-start;
 
     .el-button {
-      flex: 1 1 15%; 
+      flex: 1 1 15%;
       max-width: 15%;
       min-width: 15%;
       box-sizing: border-box;
@@ -372,4 +372,4 @@ const getIcon = (o, type) => {
     }
   }
 }
-</style>
+</style>

src/renderer/src/views/prepare/container/ai-pptistV2.vue

@@ -57,11 +57,11 @@
         </el-row>
         <div>
           <el-button style="margin-bottom: 5px;" type="primary" @click="activeStep = 0">上一步</el-button>
-          <el-button style="margin-bottom: 5px;" type="primary" @click="outlineCreatePPT()">生成PPT</el-button>
+          <el-button style="margin-bottom: 5px;" type="primary" v-loading="createPPTLoading" @click="outlineCreatePPT()">生成PPT</el-button>
         </div>
       </el-card>
       <el-card v-if="activeStep === 2">
-        <el-progress :percentage="30" type="circle" v-if="percentage === 30"></el-progress>
+        <el-progress :percentage="percentage" type="circle"></el-progress>
       </el-card>
     </div>
   </div>
@@ -79,6 +79,7 @@ import {
 import CryptoJS from "crypto-js"
 
 import { getSignature } from "@/utils/index.js";
+import {sessionStore} from "@/utils/store";
 
 let appId = "01ec9aa3";
 let secret = "M2QxMDAxMjYyYTEzODMwMGRkZTQ4NmUy";
@@ -98,8 +99,8 @@ let secondArray = ref([]); //大纲的文字部分
 
 
 const backGroundList = ref([]);
-
-const inputTheme = ref("高中语文《沁园春雪》的授课课件"); // 输入的主题
+let subjectdata = sessionStore.get('subject.curNode')
+const inputTheme = ref(subjectdata.edustage + subjectdata.edusubject + "《" + subjectdata.itemtitle + "》的授课课件"); // 输入的主题
 const inputRequire = ref("") // 输入的需求
 const activeStep = ref(0);  // 上方进度条
 const combined = ref('')  // 修改完毕的大纲数据，准备传入ppt生成模型
@@ -109,6 +110,8 @@ const status = ref("init");
 
 const percentage = ref(0);
 
+const createPPTLoading = ref(false);
+
 const getBackgrounds = () => {
   treeData.value = [];
   getBackGroundV2().then((res) => {
@@ -126,6 +129,8 @@ const outlineData = ref({
   // templateId: 'auto',  // ppt生成主题
   author: 'AIX平台',
   isFigure: false,   // 是否自动配图
+  search: true,
+  language: "cn"
 }
 )
 
@@ -145,20 +150,17 @@ function updateStagingData(role, newData) {
 const outlineCreatePPT = () => {
   const newOutlineData = { ...outlineData.value, };
   newOutlineData.query = outputText.value;
-
+  createPPTLoading.value = true;
   createPPTV2(newOutlineData).then((res) => {
     console.log(res, "正在生成中");
+    createPPTLoading.value = false;
     activeStep.value = 2
 
     const checkProgress = () => {
-      getProgressV2(res.sid).then((response) => {
-        percentage.value = response.process;
-        if (response && response.pptUrl && response.pptUrl.length > 4) {
-          console.log('PPT',response)
-          // window.location.href = response.data.pptUrl;
-          //发消息到主进程，携带名称和URL，将URL下载下来后复制到文件列表并上传到服务
-          // let url = "https://bjcdn.openstorage.cn/xinghuo-privatedata/%2Ftmp/apiTempFiledf28bf990a4c40ffb7477ed4b65392c27232357022409613439/%E3%80%8A%E9%9D%99%E5%A5%B3%E3%80%8B%E6%B7%B1%E5%BA%A6%E8%A7%A3%E8%AF%BB%E4%B8%8E%E7%A0%94%E7%A9%B6.pptx"
-          emit('addSuccess',res)
+      getProgressV2(res.sid).then(response => {
+        percentage.value = Math.round(response?.donePages/response?.totalPages)*100;
+        if (response.pptStatus === "done") {
+          emit('addSuccess',{...res,url:response.pptUrl})
           ElMessage.success("生成成功");
         } else {
           const sleepTime = 2000;

src/renderer/src/views/prepare/container/kj-list-item.vue

@@ -332,10 +332,6 @@ export default {
         const { id, rootid } = sessionStore.get('subject.curNode')
         const path="/teaching/aptindex?id="+items.fileId + "&unitId=" + id + "&bookId=" + rootid;
         let configObj = outLink().getBaseData()
-        configObj.fullPath = 'https://localhost:7860/'
-        configObj.data.url = 'https://localhost:7860/'
-        configObj.data.domain = 'localhost'
-        console.log(configObj)
         let fullPath = configObj.fullPath + path
         fullPath = fullPath.replaceAll('//', '/')
         // 通知主进程

src/renderer/src/views/prepare/container/pptist-dialog.vue

@@ -13,7 +13,7 @@
 </template>
 
 <script setup>
-  import AiPptist from './ai-pptist.vue';
+  import AiPptist from './ai-pptistV2.vue';
   const model = defineModel()
   const emit = defineEmits(['addSuccess'])
   const props = defineProps({

src/renderer/src/views/profile/index.vue

@@ -5,7 +5,7 @@
       <div class="info">
         <div class="info-name">{{ state.user.nickName }}</div>
         <div class="infomation">
-          <selectClass/>
+          <selectClass v-if="!isSubject"/>
         </div>
       </div>
     </div>
@@ -46,8 +46,10 @@ const state = reactive({
   postGroup: {}
 })
 
+const isSubject = ref(false)
 async function getUser() {
   getUserProfile().then((response) => {
+    isSubject.value = response.roleGroup.indexOf('场馆管理员') != -1
     // response.data.avatar = import.meta.env.VITE_APP_BASE_API + response.data.avatar
     Object.assign(state.user,response.data)
     state.roleGroup = response.roleGroup

src/renderer/src/views/teachingDesign/container/right.vue

@@ -68,6 +68,7 @@ import {PPTXFileToJson} from '@/AixPPTist/src/hooks/useImport' // ppt转json
 import * as API_entpcourse from '@/api/education/entpcourse' // 相关api
 import * as API_entpcoursefile from '@/api/education/entpcoursefile' // 相关api
 import * as Api_server from '@/api/apiService' // 相关api
+import * as API_smarttalk from '@/api/file' // 文件相关api
 import msgUtils from '@/plugins/modal' // 消息工具
 
 const userStore = useUserStore()
@@ -136,6 +137,8 @@ const addAiPPT = async(res) => {
       const p_params = {parentContent: JSON.stringify(content)}
       const parentid = await HTTP_SERVER_API('addEntpcoursefile', p_params)
       if (!!parentid??null) { // 生成内容幻灯片
+        // 生成备课资源-Smarttalk
+        HTTP_SERVER_API('addSmarttalk',{fileId: parentid})
         if (slides.length > 0) {
           const resSlides = slides.map(({id, ...slide}) => JSON.stringify(slide))
           const params = {parentid, filetype: 'slide', title: '', slides: resSlides }
@@ -206,6 +209,20 @@ emitter.on('changeResult', (item) => {
 // 统一HTTP处理
 const HTTP_SERVER_API = (type, params = {}) => {
   switch (type) {
+    case 'addSmarttalk': { // 获取课程
+      const node = courseObj.node || {}
+      const def = {
+        fileId: '', // 文件id - Entpcoursefile 对应id
+        fileFlag: 'aptist',
+        fileShowName: node.itemtitle + '.aptist',
+        textbookId: node.rootid,
+        levelFirstId: node.parentid||node.id,
+        levelSecondId: node.parentid && node.id,
+        fileSource: '个人',
+        fileRoot: '备课'
+      }
+      return API_smarttalk.creatAPT({...def, ...params})
+    }
     case 'addEntpcourse': { // 添加课程
       const node = courseObj.node || {}
       if (!node) return msgUtils.msgWarning('请选择章节?')
@@ -298,6 +315,7 @@ const toRousrceUrl = async(o) => {
 const curNode = reactive({})
 onMounted(() => {
   let data = sessionStore.get('subject.curNode')
+  console.log('data', sessionStore)
   Object.assign(curNode, data);
   courseObj.node = data