Merge pull request 'edit 模板' (#142) from lyc-dev into main

This commit is contained in:
lyc 2024-12-16 16:18:02 +08:00
commit a255b1af71
6 changed files with 113 additions and 34 deletions

View File

@ -392,9 +392,9 @@ onMounted(() => {
let data = sessionStore.get('subject.curNode')
Object.assign(curNode, data);
modeType.value = props.type == 1 ? '课标' : props.type == 2 ? '教材' : '考试'
getTemplateList()
let jsonKey = `${modeType.value}-${data.edustage}-${data.edusubject}`
params.dataset_id = dataSetJson[jsonKey]
})

View File

@ -65,7 +65,6 @@ import defaultUserImg from '@/assets/images/img-avatar.png'
const { ipcRenderer } = window.electron || {}
const dev_api = ref(import.meta.env.VITE_APP_BASE_API)
const userStore = useUserStore()
console.log(userStore)
const router = useRouter()
const currentRoute = ref('')
const activeId = ref('/home')

View File

@ -396,5 +396,12 @@ export const dataSetJson = {
"课标-高中-数学": "e03aa4fe9fd011ef91270242ac140006",
"课标-高中-地理": "270516829fd111efb13c0242ac140006",
"课标-高中-政治": "a2f0b247b85d11ef84290242ac140005",
"教材-高中-语文": "cee3062a9fcf11efa6910242ac140006",
"教材-高中-生物": "fb5d01d59fd011ef9bb90242ac140006",
"教材-高中-历史": "f2f6c1fb9fd011ef98740242ac140006",
"教材-高中-英语": "e889fcac9fd011efb22a0242ac140006",
"教材-高中-数学": "e03aa4fe9fd011ef91270242ac140006",
"教材-高中-地理": "270516829fd111efb13c0242ac140006",
"教材-高中-政治": "a2f0b247b85d11ef84290242ac140005",
"鉴权": "ragflow-IwMDI1MGU2YTU3NjExZWZiNWEzMDI0Mm"
}

View File

@ -85,7 +85,7 @@ const saveAdd = async () => {
try {
// copy
const { msg } = await addKeyWords({ name: form.name, id })
emitter.emit('onGetMain')
emitter.emit('onGetMain', props.item)
ElMessage.success(msg)
mode.value = false
} finally {

View File

@ -3,7 +3,7 @@
<div class="left-header flex">教学模式</div>
<div class="left-con" v-loading="loading">
<el-empty v-if="!(tempList.length)" description="暂无数据" />
<div class="con-item" v-for="item in tempList" :key="item.id">
<div class="con-item" v-for="item in tempList" :key="item.id" :class=" actId == item.id ? 'item-act' : ''">
<div class="item-header flex">
<span>{{ item.name }}</span>
<el-button type="primary" link @click="onSelect(item)">选择模式</el-button>
@ -49,6 +49,7 @@ const getTemplate = async (id) => {
}
//
const actId = ref('')
const loading = ref(false)
const tempList = ref([])
const getChildTemp = async (parentId) => {
@ -65,6 +66,7 @@ const getChildTemp = async (parentId) => {
} finally {
loading.value = false
}
actId.value = tempList.value[0].id
}
if(parentId){
const item = tempList.value.find(item => item.id == parentId)
@ -90,6 +92,7 @@ emitter.on('onGetMain', (item) => {
//
const emit = defineEmits([''])
const onSelect = (item) =>{
actId.value = item.id
emitter.emit('changeMode', item)
}
@ -98,8 +101,6 @@ const curNode = reactive({})
onMounted(() => {
let data = sessionStore.get('subject.curNode')
Object.assign(curNode, data);
getTemplate()
})
@ -143,10 +144,16 @@ onUnmounted(() => {
.con-item {
margin-bottom: 20px;
display: flex;
flex-direction: column
flex-direction: column;
padding: 10px;
}
.item-list{
margin-bottom: 10px;
padding: 10px;
}
.item-act{
border: solid 1px #409eff;
border-radius: 5px;
}
.item-card {
width: 130px;

View File

@ -15,7 +15,7 @@
<el-button type="danger" @click="pptDialog = true">生成PPT</el-button>
</div>
</div>
<div class="right-con flex">
<div class="right-con flex" ref="listRef">
<el-empty v-if="!(resultList.length)" description="暂无数据" />
<div class="con-item flex" v-for="(item, index) in resultList" :key="item.id" v-loading="item.loading">
<div class="item-top flex">
@ -30,14 +30,12 @@
<el-button type="primary" link @click="removeItem(item, true)">移除</el-button>
</template>
</el-popover>
<!-- <el-button type="info" link>
<i class="iconfont icon-xiazai9"></i>
</el-button> -->
</div>
<div class="item-bom">
<div class="item-prompt">{{ item.prompt }}</div>
<div class="item-answer" v-if="item.answer">
<div class="answer-text" v-html="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)" />
</div>
<div class="item-btn flex">
<el-button type="primary" link @click="againResult(index, item)">
@ -68,18 +66,19 @@
</template>
<script setup>
import { ref, onMounted, onUnmounted, reactive } from 'vue'
import { ref, onMounted, onUnmounted, reactive, nextTick } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { sessionStore } from '@/utils/store'
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 } from '@/api/mode/index.js'
import { completion, tempResult, tempSave, removeChildTemp, editTempResult } from '@/api/mode/index.js'
// 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 useUserStore from '@/store/modules/user'
import {PPTXFileToJson} from '@/AixPPTist/src/hooks/useImport' // pptjson
@ -119,11 +118,19 @@ emitter.on('changeMode', (item) => {
//
const getCompletion = async () => {
isStarted.value = new Array(resultList.length).fill(false)
isStarted.value[0] = true
resultList.value.forEach(item =>{
if(item.answer){
item.answer = ''
}
})
for (let item of resultList.value) {
console.log(item)
try {
item.loading = true
item.aiShow = true
params.prompt = `按照${item.prompt}的要求,针对${curNode.edustage}${curNode.edusubject}${curNode.itemtitle}进行教学分析`
const { data } = await completion(params)
item.answer = getResult(data.answer)
@ -134,6 +141,19 @@ const getCompletion = async () => {
}
}
const handleCompleteText = async (answer, index) =>{
if (index < resultList.value.length - 1) {
isStarted.value[index + 1] = true; //
}
if(isAgain.value){
try{
await editTempResult({ id: resultList.value[index].resultId, content: answer })
}finally{
isAgain.value = false
}
}
}
//
const onSaveTemp = (item) => {
if (item.answer == '') return
@ -193,24 +213,49 @@ const removeItem = async (item, isChild) => {
// editKeyWord(item, !isChild)
}
}
const listRef = ref()
//
const isStarted = ref([]);
const getTempResult = (id) => {
tempResult({ mainModelId: id }).then(res => {
let rows = res.rows
if (rows.length > 0) {
isStarted.value = new Array(rows.length).fill(true)
resultList.value.forEach(item => {
rows.forEach(el => {
if (item.id == el.modelId) {
item.answer = el.content
item.reultId = el.id
item.answer = getResult(el.content)
item.resultId = el.id
}
})
})
}
})
}
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
}
}
}
// ### **
let getResult = (str) => {
let newStr = str.replace(/#+|(\*\*)/g, '');
@ -282,17 +327,32 @@ const curIndex = ref(-1)
const curItem = reactive({})
//
const isAgain = ref(false)
const againResult = async (index, item) => {
isAgain.value = true
isStarted.value[index] = false
resultList.value[index].answer = ''
if(index == 0){
listRef.value.scrollTop = 0
}else{
scrollToBottom(50, index)
}
try {
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)
resultList.value[index].answer = data.answer
resultList.value[index].answer = getResult(data.answer)
isStarted.value[index] = true
} finally {
resultList.value[index].loading = false
}
}
//
const isAdjust = ref(false)
const onAdjust = (index, item) => {
@ -507,6 +567,12 @@ onUnmounted(() => {
left: -1px;
top: 5px;
}
&:last-child{
&::before{
content: '';
width: 0
}
}
.item-top {
justify-content: space-between;
align-items: center;