Merge pull request 'lyc-dev' (#148) from lyc-dev into main

src/renderer/src/api/ai/index.js

@@ -10,11 +10,10 @@ export const createChart = ({ headers, data }) => {
   })
 }
 // 大模型对话
-export const sendChart = ({ headers, data }) => {
+export const sendChart = (data) => {
   return request({
     url: '/qf/sendTalk',
     method: 'post',
-    headers,
     data,
   })
 }

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

@@ -30,7 +30,7 @@
         </div>
       </el-scrollbar>
       <div class="file-list">
-        <el-dropdown @command="changeFile">
+        <el-dropdown @command="changeFile" v-if="type == 3">
         <span class="el-dropdown-link">
           {{ curFile.fileName }}
           <i class="iconfont icon-xiangxia"></i>
@@ -54,7 +54,7 @@
 </template>
 
 <script setup>
-import { ref, reactive, onMounted, onUnmounted, watch } 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'
@@ -71,7 +71,7 @@ const props = defineProps({
   item: {
     type: Object,
     default: () => {
-      return { name: '11' }
+      return { name: '' }
     }
   },
   type: {
@@ -125,19 +125,6 @@ const saveAdjust = (item) =>{
   emitter.emit('onSaveAdjust', item.msg)
 }
 
-const modeType = ref('课标')
-watch(() => props.type, (newVal) => {
-  if (newVal == 1){
-    modeType.value = '课标'
-  }
-  if (newVal == 2){
-    modeType.value = '教材'
-  }
-  if (newVal == 2){
-    modeType.value = '考试'
-  }
-
-}, { immediate: false })
 
 const curFile = reactive({})
 const dataset_id = ref('')
@@ -160,11 +147,12 @@ const changeFile = (val) =>{
   params.document_ids = val.docId
 }
 
-
+const modeType = ref('')
 onMounted(() => {
   let data = sessionStore.get('subject.curNode')
-
   Object.assign(curNode, data);
+
+  modeType.value = props.type == 1 ? '课标' : props.type == 2 ? '教材' : '考试'
   let jsonKey = `${modeType.value}-${data.edustage}-${data.edusubject}`
   params.dataset_id = dataSetJson[jsonKey]
   if(props.type == 3){

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

@@ -14,7 +14,10 @@
           </el-dropdown-menu>
         </template>
       </el-dropdown>
-      <div>
+      <div class="flex">
+        <el-select v-model="curMode" placeholder="Select" class="mr-4 w-30">
+          <el-option v-for="item in modeOptions" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
         <el-button type="danger" link :disabled="!(templateList.length)" @click="removeItem(curTemplate, false)">
           删除
         </el-button>
@@ -52,7 +55,8 @@
               <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 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">
@@ -86,6 +90,7 @@
 import { ref, reactive, onMounted, onUnmounted, nextTick } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { tempSave, completion, modelList, removeChildTemp, tempResult, editTempResult } from '@/api/mode/index'
+import { createChart, sendChart } from '@/api/ai/index'
 import { sessionStore } from '@/utils/store'
 import keywordDialog from './keyword-dialog.vue';
 import AdjustDialog from './adjust-dialog.vue'
@@ -94,10 +99,23 @@ 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()
 
+const curMode = ref(1)
+const modeOptions = ref([
+  {
+    label: '教学大模型',
+    value: 1
+  },
+  {
+    label: '知识库模型',
+    value: 2
+  }
+])
+
 /*****************提示词相关****************/
 
 /**
@@ -252,7 +270,6 @@ const removeItem = async (item, isChild) => {
   }
 }
 
-
 // Ai对话调整
 const curIndex = ref(-1)
 const isAdjust = ref(false)
@@ -277,6 +294,7 @@ const params = reactive(
     dataset_id: ''
   }
 )
+const prompt = ref('')
 
 // 重新研读
 const isAgain = ref(false)
@@ -296,8 +314,28 @@ const againResult = async (index, item) => {
     await nextTick()
     childTempList.value[index].loading = true
     item.aiShow = true
-    params.prompt = `按照${item.prompt}的要求，针对${curNode.edustage}${curNode.edusubject}${modeType.value} 对${curNode.itemtitle}进行教学分析`
-    const { data } = await completion(params)
+
+    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 (mode.value == 1) {
+      const res = await sendChart({
+        content: params.prompt,
+        conversationId: conversation_id.value,
+        stream: false
+      })
+      data = res.data
+    } else {
+      // 知识库模型
+      const res = await completion(params)
+      data = res.data
+    }
+
     childTempList.value[index].answer = getResult(data.answer);
     isStarted.value[index] = true
 
@@ -305,6 +343,7 @@ const againResult = async (index, item) => {
     childTempList.value[index].loading = false
   }
 }
+
 // 一键研读
 const getCompletion = async () => {
   isStarted.value = new Array(childTempList.length).fill(false)
@@ -320,8 +359,27 @@ const getCompletion = async () => {
     try {
       item.loading = true
       item.aiShow = true
-      params.prompt = `按照${item.prompt}的要求，针对${curNode.edustage}${curNode.edusubject}${modeType.value} 对${curNode.itemtitle}进行教学分析`
-      const { data } = await completion(params)
+      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 {
+        const res = await completion(params)
+        data = res.data
+      }
+
       item.answer = getResult(data.answer)
       onSaveTemp(item)
     } finally {
@@ -386,6 +444,30 @@ emitter.on('onGetMain', () => {
 })
 
 
+// 创建对话
+const conversation_id = ref('')
+const getChartId = () => {
+  createChart({ app_id: '712ff0df-ed6b-470f-bf87-8cfbaf757be5' }).then(res => {
+    localStorage.setItem("conversation_id", res.data.conversation_id);
+    conversation_id.value = res.data.conversation_id;
+  })
+}
+
+// 查询prompt 替换
+const getPrompt = async () => {
+  const { rows } = await modelList({ model: 5 })
+  let str = rows.find(item => item.name.indexOf(modeType.value) != -1).prompt
+  str = str.replace('{学段}', curNode.edustage)
+  str = str.replace('{学科}', curNode.edusubject)
+  let bookV = curNode.roottitle.split('-')[1] + '版本'
+  str = str.replace('{教材版本}', bookV)
+  str = str.replace('{课程名称}', `《${curNode.itemtitle}》`)
+  if(modeType.value == '课标'){
+    str = str.replace('{课标名称}', `${curNode.edustage}${curNode.edusubject}课标`)
+  }
+  prompt.value = str
+}
+
 const curNode = reactive({})
 const modeType = ref('')
 onMounted(() => {
@@ -396,6 +478,15 @@ onMounted(() => {
   getTemplateList()
   let jsonKey = `${modeType.value}-${data.edustage}-${data.edusubject}`
   params.dataset_id = dataSetJson[jsonKey]
+  // 获取百度千帆会话ID
+  conversation_id.value = localStorage.getItem('conversation_id')
+  if (!conversation_id.value) {
+    getChartId();
+  }
+
+  // 获取prompt
+  getPrompt()
+
 })
 
 // 解绑

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

@@ -10,6 +10,9 @@
         </el-button>
       </div>
       <div class="header-right">
+        <el-select v-model="curMode" placeholder="Select" class="mr-4 w-30">
+          <el-option v-for="item in modeOptions" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
         <el-button type="primary" :disabled="!(resultList.length)" @click="getCompletion">一键研读</el-button>
         <el-button type="primary">生成大纲</el-button>
         <el-button type="danger" @click="pptDialog = true">生成PPT</el-button>
@@ -35,7 +38,8 @@
           <div class="item-prompt">{{ item.prompt }}</div>
           <div class="item-answer" v-if="item.answer">
             <div class="answer-text">
-              <TypingEffect v-if="isStarted[index]" :text="item.answer" :delay="10" :aiShow="item.aiShow" @complete="handleCompleteText($event,index)" @updateScroll="scrollToBottom($event,index)" />
+              <TypingEffect v-if="isStarted[index]" :text="item.answer" :delay="10" :aiShow="item.aiShow"
+                @complete="handleCompleteText($event, index)" @updateScroll="scrollToBottom($event, index)" />
             </div>
             <div class="item-btn flex">
               <el-button type="primary" link @click="againResult(index, item)">
@@ -73,12 +77,14 @@ import emitter from '@/utils/mitt'
 import EditDialog from './edit-dialog.vue'
 import AdjustDialog from './adjust-dialog.vue'
 import progressDialog from './progress-dialog.vue'
-import { completion, tempResult, tempSave, removeChildTemp, editTempResult } from '@/api/mode/index.js'
+import { completion, tempResult, tempSave, removeChildTemp, editTempResult, modelList } from '@/api/mode/index.js'
+import { createChart, sendChart } from '@/api/ai/index'
 // import { dataSetJson } from '@/utils/comm.js'
 import * as commUtils from '@/utils/comm.js'
 import PptDialog from '@/views/prepare/container/pptist-dialog.vue'
 import keywordDialog from './keyword-dialog.vue'
 import TypingEffect from '@/components/typing-effect/index.vue'
+import { cloneDeep } from 'lodash'
 
 import useUserStore from '@/store/modules/user'
 import { PPTXFileToJson } from '@/AixPPTist/src/hooks/useImport' // ppt转json
@@ -110,6 +116,19 @@ const pgDialog = reactive({ // 弹窗-进度条
     ]
   }
 })
+
+const curMode = ref(1)
+const modeOptions = ref([
+  {
+    label: '教学大模型',
+    value: 1
+  },
+  {
+    label: '知识库模型',
+    value: 2
+  }
+])
+
 emitter.on('changeMode', (item) => {
   resultList.value = item.child
   getTempResult(item.id)
@@ -131,8 +150,28 @@ const getCompletion = async () => {
     try {
       item.loading = true
       item.aiShow = true
-      params.prompt = `按照${item.prompt}的要求，针对${curNode.edustage}${curNode.edusubject} 对${curNode.itemtitle}进行教学分析`
-      const { data } = await completion(params)
+
+      let str = cloneDeep(prompt.value)
+      str = str.replace(/{模板名称}/g, item.name)
+      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 {
+        const res = await completion(params)
+        data = res.data
+      }
+
       item.answer = getResult(data.answer)
       onSaveTemp(item)
     } finally {
@@ -265,9 +304,12 @@ let getResult = (str) => {
 const params = reactive(
   {
     prompt: '',
-    dataset_id: ''
+    dataset_id: '',
+    template: ''
   }
 )
+const prompt = ref('')
+
 
 const addAiPPT = async (res) => {
   let node = courseObj.node
@@ -343,8 +385,27 @@ const againResult = async (index, item) => {
     await nextTick()
     resultList.value[index].loading = true
     item.aiShow = true
-    params.prompt = `按照${item.prompt}的要求，针对${curNode.edustage}${curNode.edusubject}课标对${curNode.itemtitle}进行教学分析`
-    const { data } = await completion(params)
+
+    let str = cloneDeep(prompt.value)
+    str = str.replace(/{模板名称}/g, item.name)
+    params.prompt = str
+    params.template = item.prompt
+
+    let data = null;
+    // 教学大模型
+    if (mode.value == 1) {
+      const res = await sendChart({
+        content: params.prompt,
+        conversationId: conversation_id.value,
+        stream: false
+      })
+      data = res.data
+    } else {
+      // 知识库模型
+      const res = await completion(params)
+      data = res.data
+    }
+
     resultList.value[index].answer = getResult(data.answer)
     isStarted.value[index] = true
   } finally {
@@ -498,6 +559,27 @@ const toRousrceUrl = async(o) => {
 }
 // ======== zdg end ============
 
+// 创建对话
+const conversation_id = ref('')
+const getChartId = () => {
+  createChart({ app_id: '712ff0df-ed6b-470f-bf87-8cfbaf757be5' }).then(res => {
+    localStorage.setItem("conversation_id", res.data.conversation_id);
+    conversation_id.value = res.data.conversation_id;
+  })
+}
+
+// 查询prompt 替换
+const getPrompt = async () => {
+  const { rows } = await modelList({ model: 5 })
+  let str = rows.find(item => item.name.indexOf('框架设计') != -1).prompt
+  str = str.replace('{学段}', curNode.edustage)
+  str = str.replace('{学科}', curNode.edusubject)
+  let bookV = curNode.roottitle.split('-')[1] + '版本'
+  str = str.replace('{教材版本}', bookV)
+  str = str.replace('{课程名称}', `《${curNode.itemtitle}》`)
+  prompt.value = str
+}
+
 const curNode = reactive({})
 onMounted(() => {
   let data = sessionStore.get('subject.curNode')
@@ -506,6 +588,15 @@ onMounted(() => {
 
   let jsonKey = `课标-${data.edustage}-${data.edusubject}`
   params.dataset_id = commUtils.dataSetJson[jsonKey]
+
+  // 获取百度千帆会话ID
+  conversation_id.value = localStorage.getItem('conversation_id')
+  if (!conversation_id.value) {
+    getChartId();
+  }
+
+  // 获取prompt
+  getPrompt()
 })
 
 
@@ -548,6 +639,7 @@ onUnmounted(() => {
       position: relative;
       padding-left: 15px;
       box-sizing: border-box;
+
       &::after {
         content: '';
         width: 15px;
@@ -558,6 +650,7 @@ onUnmounted(() => {
         left: -8px;
         top: 5px;
       }
+
       &::before {
         content: '';
         width: 2px;
@@ -567,16 +660,19 @@ onUnmounted(() => {
         left: -1px;
         top: 5px;
       }
+
       &:last-child {
         &::before {
           content: '';
           width: 0
         }
       }
+
       .item-top {
         justify-content: space-between;
         align-items: center;
         margin-bottom: 5px;
+
         .icon-shenglvehao {
           font-weight: bold
         }