提交 35ba81ea authored 作者: 张伊明's avatar 张伊明

Merge branch 'ayp-dev' of http://8.140.26.4:10003/caijian/risk-monitor into ayp-dev

流水线 #218 已通过 于阶段
in 1 分 30 秒
...@@ -52,6 +52,10 @@ export const useWrittingAsstaintStore = defineStore('writtingAsstaint', { ...@@ -52,6 +52,10 @@ export const useWrittingAsstaintStore = defineStore('writtingAsstaint', {
containerRef:null containerRef:null
}, },
// ==================================
// 显示全部进度
isProcessLog:false,
// ====头 // ====头
isSsearchFor:false, isSsearchFor:false,
//list //list
...@@ -78,7 +82,7 @@ export const useWrittingAsstaintStore = defineStore('writtingAsstaint', { ...@@ -78,7 +82,7 @@ export const useWrittingAsstaintStore = defineStore('writtingAsstaint', {
resultWriteData:null, //文档分析结束之后 写报使用 resultWriteData:null, //文档分析结束之后 写报使用
// 写报 // 写报
isWriteStart:false,// 写报进行中 isWriteStart:false,// 写报进行中
processWriteLog:'', //写报步骤 processLogAlone:'', //写报步骤
writeProgressNum:0, //写报 假进度 writeProgressNum:0, //写报 假进度
}), }),
...@@ -123,14 +127,15 @@ export const useWrittingAsstaintStore = defineStore('writtingAsstaint', { ...@@ -123,14 +127,15 @@ export const useWrittingAsstaintStore = defineStore('writtingAsstaint', {
this.abortController = null; this.abortController = null;
this.isProcessLog=false
this.headerTabType='translate', this.headerTabType='translate',
// 底部 // 底部
this.bottomProgressNum=0, //文档解析 假进度 this.bottomProgressNum=0, //文档解析 假进度
this.resultWriteData=null, //文档分析结束之后 写报使用 this.resultWriteData=null, //文档分析结束之后 写报使用
this.processLogAlone='', //写报步骤
// 写报 // 写报
this.isWriteStart=false,// 写报进行中 this.isWriteStart=false,// 写报进行中
this.processWriteLog='', //写报步骤 // this.processWriteLog='', //写报步骤
this.writeProgressNum=0, //写报 假进度 this.writeProgressNum=0, //写报 假进度
this.tabList[1].active=false this.tabList[1].active=false
this.tabList[2].active=false this.tabList[2].active=false
...@@ -212,7 +217,7 @@ export const useWrittingAsstaintStore = defineStore('writtingAsstaint', { ...@@ -212,7 +217,7 @@ export const useWrittingAsstaintStore = defineStore('writtingAsstaint', {
// this.bottomProgressNum=100 // this.bottomProgressNum=100
this.headerTabType='translate' this.headerTabType='translate'
this.writeProgressNum=0 this.writeProgressNum=0
this.processWriteLog='' this.processLogAlone=''
this.tabList[2].active=false this.tabList[2].active=false
this.abortController.abort() this.abortController.abort()
}, },
...@@ -405,7 +410,8 @@ export const useWrittingAsstaintStore = defineStore('writtingAsstaint', { ...@@ -405,7 +410,8 @@ export const useWrittingAsstaintStore = defineStore('writtingAsstaint', {
case 'progress': case 'progress':
// 仅更新执行步骤 // 仅更新执行步骤
if (jsonData.message) { if (jsonData.message) {
this.processLog = `${this.formattedTime}:${jsonData.message}\r\n`; this.processLog += `${this.formattedTime}:${jsonData.message}\r\n`;
this.processLogAlone=`${this.formattedTime}:${jsonData.message}\r\n`;
} }
this.bottomProgressNum+=1 this.bottomProgressNum+=1
break; break;
...@@ -435,7 +441,7 @@ export const useWrittingAsstaintStore = defineStore('writtingAsstaint', { ...@@ -435,7 +441,7 @@ export const useWrittingAsstaintStore = defineStore('writtingAsstaint', {
this.bottomProgressNum=100 // 假进度完成 this.bottomProgressNum=100 // 假进度完成
this.resultWriteData=jsonData //给写报使用 this.resultWriteData=jsonData //给写报使用
this.tabList[1].active=true //放开思维导图 this.tabList[1].active=true //放开思维导图
this.processLog = `点击查看`; this.processLogAlone = `点击查看`;
// await this.fetchReportData({ // await this.fetchReportData({
// query: this.writtingTitle, // query: this.writtingTitle,
// desc: this.descText, // desc: this.descText,
...@@ -482,8 +488,8 @@ export const useWrittingAsstaintStore = defineStore('writtingAsstaint', { ...@@ -482,8 +488,8 @@ export const useWrittingAsstaintStore = defineStore('writtingAsstaint', {
console.log(">") console.log(">")
if (this.abortController) this.abortController.abort(); if (this.abortController) this.abortController.abort();
this.abortController = new AbortController(); this.abortController = new AbortController();
this.processLog = ''; // this.processLog = '';
this.processWriteLog='' // this.processLogAlone=''
this.writeProgressNum=1 this.writeProgressNum=1
...@@ -576,7 +582,7 @@ export const useWrittingAsstaintStore = defineStore('writtingAsstaint', { ...@@ -576,7 +582,7 @@ export const useWrittingAsstaintStore = defineStore('writtingAsstaint', {
this.writeProgressNum=100 //写报假进度 this.writeProgressNum=100 //写报假进度
this.processWriteLog= '点击查看'; this.processLogAlone= '点击查看';
// 这里不再调用 resetGenerateState,因为可能需要保留翻译内容 // 这里不再调用 resetGenerateState,因为可能需要保留翻译内容
} }
...@@ -589,7 +595,7 @@ export const useWrittingAsstaintStore = defineStore('writtingAsstaint', { ...@@ -589,7 +595,7 @@ export const useWrittingAsstaintStore = defineStore('writtingAsstaint', {
this.tabList[2].active=true //写报生成之后放开写报按钮 this.tabList[2].active=true //写报生成之后放开写报按钮
this.writeProgressNum=100 //写报假进度 this.writeProgressNum=100 //写报假进度
this.processWriteLog= '点击查看'; this.processLogAlone= '点击查看';
} else if ((msgData.event_type || '').toLowerCase().includes('error')) { } else if ((msgData.event_type || '').toLowerCase().includes('error')) {
// 优先从 data.error 获取详细错误描述 // 优先从 data.error 获取详细错误描述
const errorMsg = msgData.data?.error || str || '生成失败'; const errorMsg = msgData.data?.error || str || '生成失败';
...@@ -598,8 +604,8 @@ export const useWrittingAsstaintStore = defineStore('writtingAsstaint', { ...@@ -598,8 +604,8 @@ export const useWrittingAsstaintStore = defineStore('writtingAsstaint', {
// 老版 --index.vue 行为:步骤栏直接追加服务端发来的完整步骤内容,不加时间戳、不强行换行 // 老版 --index.vue 行为:步骤栏直接追加服务端发来的完整步骤内容,不加时间戳、不强行换行
// 这样可以避免 SSE 分片导致的“步骤破碎”(一条步骤被拆成多条显示) // 这样可以避免 SSE 分片导致的“步骤破碎”(一条步骤被拆成多条显示)
if (str) { if (str) {
// this.processLog += str; this.processLog += str;
this.processWriteLog+= str; this.processLogAlone+= str;
if(this.writeProgressNum<=90){ if(this.writeProgressNum<=90){
this.writeProgressNum+=0.05 this.writeProgressNum+=0.05
} }
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<el-button @click="store.handleIsSsearchFor"><img style="width: 16px;" src="@/assets/icons/aiBox/search.png" alt=""> 查找</el-button> <el-button @click="store.handleIsSsearchFor"><img style="width: 16px;" src="@/assets/icons/aiBox/search.png" alt=""> 查找</el-button>
</div> </div>
<div v-else> <div v-else style="margin-right: 22px;">
<el-button @click="onExport">导出</el-button> <el-button @click="onExport">导出</el-button>
</div> </div>
</div> </div>
......
...@@ -11,7 +11,7 @@ import { useWrittingAsstaintStore } from "@/stores/writtingAsstaintStore"; ...@@ -11,7 +11,7 @@ import { useWrittingAsstaintStore } from "@/stores/writtingAsstaintStore";
// 子组件直接获取Pinia Store(核心优化) // 子组件直接获取Pinia Store(核心优化)
const store = useWrittingAsstaintStore(); const store = useWrittingAsstaintStore();
// pushfenzhi
let mindMapData = { let mindMapData = {
id: 'root', id: 'root',
label: '名称', label: '名称',
...@@ -19,7 +19,7 @@ let mindMapData = { ...@@ -19,7 +19,7 @@ let mindMapData = {
] ]
} }
console.log(store.resultWriteData.政令深度分析.条款分析.科技条款内容[0].领域举措,890)
let uniqueId = 1; let uniqueId = 1;
function convertMindMap(rawData) { function convertMindMap(rawData) {
...@@ -214,7 +214,8 @@ defineExpose({ ...@@ -214,7 +214,8 @@ defineExpose({
background: #f5f7fa; background: #f5f7fa;
} }
.mind-map { .mind-map {
width: 100%; width: 92%;
height: 100%; height: 100%;
margin: 0 auto;
} }
</style> </style>
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论