|
|
@@ -1000,7 +1000,7 @@
|
|
|
<!-- 导出报告 -->
|
|
|
<el-dialog v-model="dialog.exportreport" align-center :modal="false" :close-on-click-modal="false"
|
|
|
:append-to-body="true" draggable :fullscreen="false" :modal-append-to-body="false" modal-class="summary-dlg"
|
|
|
- :before-close="handleClose" width="600" class="dialog_class bgcolor tianjia sel" style="max-height: 70%;">
|
|
|
+ :before-close="handleClose" width="400" class="dialog_class bgcolor tianjia sel" style="max-height: 70%;">
|
|
|
|
|
|
<template #header="{ titleId, titleClass }">
|
|
|
<div class="my-header ">
|
|
|
@@ -1482,7 +1482,7 @@
|
|
|
</div>
|
|
|
<div v-if="footerShow">
|
|
|
<div class="footerTextBox" v-if="activeIndex == 0">
|
|
|
- <el-input class="footerText" type="textarea" id="textarea_id" v-model="logs"></el-input>
|
|
|
+ <el-input class="footerText" type="textarea" id="textarea_id" v-model="logs" spellcheck="false"></el-input>
|
|
|
</div>
|
|
|
<div class="youhualog" v-if="activeIndex == 1">
|
|
|
<ul>
|
|
|
@@ -2048,7 +2048,7 @@ let question = ref([
|
|
|
{ url: 'kk6.png', titlie: "横条图" },
|
|
|
{ url: 'kk7.png', titlie: "雷达图" },
|
|
|
|
|
|
- { url: 'kk9.png', titlie: "云图/等值线" },
|
|
|
+ // { url: 'kk9.png', titlie: "云图/等值线" },
|
|
|
{ url: 'kk10.png', titlie: "查看报告" },
|
|
|
{ url: 'kk11.png', titlie: "导出报告" },
|
|
|
])
|
|
|
@@ -2797,9 +2797,9 @@ const dialogbolen = () => {
|
|
|
case "数据流连线":
|
|
|
vuefval.value.linestrokeWidth('data');
|
|
|
break;
|
|
|
- case "模块组合":
|
|
|
- vuefval.value.bgcolorfunc(colortier.value);
|
|
|
- vuefval.value.onSelection();
|
|
|
+ case "模块组合":
|
|
|
+ //vuefval.value.bgcolorfunc(colortier.value);
|
|
|
+ //vuefval.value.onSelection();
|
|
|
break;
|
|
|
case "开始":
|
|
|
// optmonitor1.value.echatinit();
|
|
|
@@ -4174,9 +4174,24 @@ const websocketonmessage = (res) => {
|
|
|
|
|
|
|
|
|
|
|
|
- // 新增：记录结构化 JSON 数据到日志
|
|
|
- const cleanedJsonLog = res.data.split('\n').filter(line => line.trim() !== '').join('\n');
|
|
|
- logs.value = logs.value + '\n' + cleanedJsonLog;
|
|
|
+ // 新增：记录结构化 JSON 数据到日志（仅打印 step, vars, vals）
|
|
|
+ const lines = res.data.split('\n');
|
|
|
+ const filteredLogs = lines
|
|
|
+ .filter(line => line.trim() !== '')
|
|
|
+ .map(line => {
|
|
|
+ try {
|
|
|
+ const json = JSON.parse(line);
|
|
|
+ const { step, vars, vals } = json;
|
|
|
+ return JSON.stringify({ step, vars, vals });
|
|
|
+ } catch (e) {
|
|
|
+ // 如果不是合法 JSON，就原样返回
|
|
|
+ return line;
|
|
|
+ }
|
|
|
+ })
|
|
|
+ .join('\n');
|
|
|
+
|
|
|
+ logs.value = logs.value + '\n' + filteredLogs;
|
|
|
+
|
|
|
// 自动滚动日志到底部
|
|
|
let textarea = document.getElementById("textarea_id");
|
|
|
textarea.scrollTop = textarea.scrollHeight;
|
tangjunhao
