From d5f17f079d4af2a173015dc86a4d6d472731fac6 Mon Sep 17 00:00:00 2001
From: gerson <1405270578@qq.com>
Date: 星期日, 07 七月 2024 16:59:53 +0800
Subject: [PATCH] echart 图表问题；raw_mode
---
src/components/chat/Chat.vue | 12 +-
src/components/chat/chatComponents/recordSetCom/RecordSetCom.vue | 72 ++++++++++++++---
src/views/project/ch/home/component/waterRight/center.vue | 4
src/stores/chatRoom.ts | 27 +++++-
src/views/project/ch/home/component/waterRight/bottom.vue | 3
src/layout/component/sidebar/components/MenuList.vue | 2
src/components/chat/chatComponents/summaryCom/SummaryCom.vue | 72 +++++++++++++++--
7 files changed, 156 insertions(+), 36 deletions(-)
diff --git a/src/components/chat/Chat.vue b/src/components/chat/Chat.vue
index 733a746..fd25519 100644
--- a/src/components/chat/Chat.vue
+++ b/src/components/chat/Chat.vue
@@ -57,7 +57,7 @@
import { GetHistoryAnswer, QueryHistoryDetail, QuestionAi, SetHistoryAnswerState, getQuestionProcess } from '/@/api/ai/chat';
import PlayBar from '/@/components/chat/components/playBar/PlayBar.vue';
import router from '/@/router';
-import { activeChatRoom, activeLLMId, activeRoomId, activeSampleId, activeSectionAId } from '/@/stores/chatRoom';
+import { activeChatRoom, activeLLMId, activeRoomId, activeSampleId, activeSectionAId, roomConfig } from '/@/stores/chatRoom';
import { v4 as uuidv4 } from 'uuid';
let isTalking = ref(false);
@@ -159,6 +159,7 @@
// FIXME: 鏆傛椂杩欐牱
section_a_id: currentSectionId,
history_group_id: currentRouteId,
+ raw_mode: roomConfig.value?.[currentRouteId]?.isAnswerByLLM ?? false,
} as any;
if (currentSampleId) {
@@ -191,14 +192,16 @@
let currentSampleId = null;
let currentLLMId = null;
+
const getAnswerById = async (historyId: string) => {
return await GetHistoryAnswer({
history_id: historyId,
});
};
+
const sendChatMessage = async (content: ChatContent = messageContent.value) => {
if (!messageContent.value?.values) return;
- if (messageList.value.length===0) {
+ if (messageList.value.length === 0) {
if (activeSampleId.value) {
currentSampleId = activeSampleId.value;
}
@@ -243,7 +246,6 @@
messageList.value.at(-1).content = content;
}
};
-
onMounted(async () => {
const res = await QueryHistoryDetail({
@@ -297,10 +299,10 @@
}
);
-onActivated(()=>{
+onActivated(() => {
if (forbidScroll) return;
nextTick(() => scrollToBottom());
-})
+});
//#region ====================== 鑱婂ぉ鍐呭鎿嶄綔 ======================
diff --git a/src/components/chat/chatComponents/recordSetCom/RecordSetCom.vue b/src/components/chat/chatComponents/recordSetCom/RecordSetCom.vue
index e7e677d..173d164 100644
--- a/src/components/chat/chatComponents/recordSetCom/RecordSetCom.vue
+++ b/src/components/chat/chatComponents/recordSetCom/RecordSetCom.vue
@@ -1,14 +1,14 @@
<template>
- <el-tabs v-model="activeName" class="demo-tabs min-w-[38rem] flex-column" @tab-click="handleClick">
+ <el-tabs v-model="activeName" class="demo-tabs min-w-[38rem] flex-column" @tab-click="handleClick">
<el-tab-pane class="h-full" label="Chart" name="first">
- <el-select class="flex-0 w-36" v-model="selectChartType" @change="selectChartTypeChange">
+ <!-- <el-select class="flex-0 w-36" v-model="selectChartType" @change="selectChartTypeChange">
<el-option
v-for="item in Object.keys(chartTypeMapName)"
:key="item"
:value="parseInt(item)"
:label="chartTypeMapName[item]"
></el-option>
- </el-select>
+ </el-select> -->
<div class="flex-auto">
<div ref="chartRef" class="h-full"></div>
</div>
@@ -42,8 +42,6 @@
},
});
-
-
const selectChartTypeChange = () => {
drawChart();
};
@@ -71,16 +69,65 @@
chartInstance.setOption({
grid: {
// bottom: 120,
- right:'15%',
- bottom: '15%',
+ right: '15%',
+ bottom: '5%',
},
tooltip: {
show: true,
+ trigger: 'axis',
},
+ toolbox: {
+ show: true,
+ feature: {
+ dataZoom: {
+ yAxisIndex: 'none',
+ },
+ myBar: {
+ title: '杞寲涓烘煴鐘跺浘',
+ show: true,
+ icon: 'path://M580.8 228.8h-136v500.8h136V228.8z m-40 460.8h-56V268.8h56v420.8zM788.8 420.8h-136v308.8h136V420.8z m-40 268.8h-56V460.8h56v228.8zM372.8 326.4h-136v401.6h136V326.4z m-40 363.2h-56V366.4h56v323.2zM208 788.8h608v40H208z',
+ onclick: () => {
+ chartInstance.setOption({
+ series: {
+ data: props.data.values,
+ type: 'bar',
+ },
+ });
+ },
+ },
+
+ myScatter: {
+ title: '杞寲涓烘暎鐐瑰浘',
+ show: true,
+ icon: 'path://M445.7 609.8c0 19.4 10.3 37.3 27.1 46.9 16.8 9.7 37.4 9.7 54.2 0 16.8-9.7 27.1-27.6 27.1-46.9 0-29.9-24.3-54.2-54.2-54.2s-54.2 24.3-54.2 54.2z m0 0M179.2 613.8c-42.2 0-76.5 34.3-76.5 76.5s34.3 76.5 76.5 76.5 76.5-34.3 76.5-76.5-34.3-76.5-76.5-76.5z m0 0M144.9 401.1c0 29 23.5 52.5 52.5 52.5s52.5-23.5 52.5-52.5-23.5-52.5-52.5-52.5-52.5 23.5-52.5 52.5z m0 0M598.7 404c0 42.2 34.3 76.5 76.5 76.5 42.3 0 76.5-34.3 76.5-76.5 0-42.3-34.3-76.5-76.5-76.5-42.3 0-76.5 34.3-76.5 76.5z m0 0M849.3 169.2c-42.2 0-76.5 34.3-76.5 76.5s34.3 76.5 76.5 76.5 76.5-34.3 76.5-76.5-34.3-76.5-76.5-76.5z m0 0M261.6 583.1c0 13.2 7.1 25.5 18.5 32.1 11.5 6.6 25.6 6.6 37.1 0s18.5-18.9 18.5-32.1c0-20.5-16.6-37.1-37.1-37.1-20.4 0.1-37 16.7-37 37.1z m0 0M276.8 425.1c0 42.3 34.3 76.5 76.5 76.5 42.3 0 76.5-34.3 76.5-76.5s-34.3-76.5-76.5-76.5-76.5 34.3-76.5 76.5z m0 0M445.7 421.4c0 18.5 9.9 35.5 25.8 44.8 16 9.2 35.7 9.2 51.7 0s25.8-26.3 25.8-44.8c0-28.5-23.1-51.7-51.7-51.7-28.5 0-51.6 23.2-51.6 51.7z m0 0M398.2 208.8c0 42.3 34.3 76.5 76.5 76.5s76.5-34.3 76.5-76.5c0-42.3-34.3-76.5-76.5-76.5s-76.5 34.3-76.5 76.5z m0 0M693.7 599.2c0 42.3 34.3 76.5 76.5 76.5s76.5-34.3 76.5-76.5-34.3-76.5-76.5-76.5c-42.3 0-76.5 34.3-76.5 76.5z m0 0M62.1 828.9H959v60.7H62.1z',
+ onclick: () => {
+ chartInstance.setOption({
+ data: props.data.values,
+ type: 'scatter',
+ });
+ },
+ },
+ myRestore: {
+ title: '杩樺師',
+ show: true,
+ icon: 'path://M909.637 478.524c-15.444-189.946-167.065-345.049-356.655-364.38-99.805-10.176-193.011 16.474-267.901 67.887l18.467-68.842c5.725-21.337-6.933-43.274-28.27-48.998s-43.274 6.934-48.998 28.271l-41.455 154.536c-5.724 21.337 6.933 43.273 28.271 48.998l154.536 41.455c21.337 5.724 43.273-6.934 48.998-28.271 5.724-21.337-6.934-43.274-28.271-48.998l-54.194-14.538c58.917-39.301 131.457-59.686 208.999-52.061 147.885 14.543 268.327 132.461 285.589 280.053 23.02 196.82-133.879 363.973-327.45 358.219-135.107-4.017-252.98-96.111-294.938-224.602-17.513-53.632-18.92-105.027-9.92-152.849 3.188-16.946-4.238-34.086-19.172-42.707l-0.049-0.028c-23.737-13.705-54.358-0.164-59.404 26.777-7.724 41.233-9.128 84.686-2.965 129.403 25.571 185.535 181.03 330.336 367.878 343.176C727.656 927.857 929.6 724.049 909.637 478.524z',
+ onclick: () => {
+ chartInstance.setOption({
+ data: props.data.values,
+ type: 'line',
+ });
+ },
+ },
+ dataView: {
+ readOnly: true,
+ },
+ saveAsImage: {},
+ },
+ },
+
title: {
text: props.data.title,
left: 'center',
-
},
xAxis: {
name: props.data?.names[0],
@@ -104,14 +151,13 @@
onMounted(() => {
setTimeout(() => {
-
const parent = chartRef.value.parentElement;
- if(!parent){
+ if (!parent) {
}
const parentBound = parent.getBoundingClientRect();
- chartInstance = echarts.init(chartRef.value,undefined,{
- width:parentBound.width,
- height:parentBound.height
+ chartInstance = echarts.init(chartRef.value, undefined, {
+ width: parentBound.width,
+ height: parentBound.height,
});
drawChart();
diff --git a/src/components/chat/chatComponents/summaryCom/SummaryCom.vue b/src/components/chat/chatComponents/summaryCom/SummaryCom.vue
index 2b105b0..cb5aa6d 100644
--- a/src/components/chat/chatComponents/summaryCom/SummaryCom.vue
+++ b/src/components/chat/chatComponents/summaryCom/SummaryCom.vue
@@ -13,15 +13,11 @@
</div>
</template>
- <div class="flex-column w-full mt-10" v-if="recordSetList && recordSetList.length > 0">
- <el-select class="flex-0 w-36 ml-auto mr-16" v-model="selectChartType" @change="selectChartTypeChange">
- <el-option
- v-for="item in Object.keys(chartTypeMapName)"
- :key="item"
- :value="parseInt(item)"
- :label="chartTypeMapName[item]"
- ></el-option>
- </el-select>
+ <div
+ class="flex-column w-full"
+ :class="{ 'mt-10': summaryList && summaryList.length > 0 }"
+ v-if="recordSetList && recordSetList.length > 0"
+ >
<div class="min-h-[48rem] flex-auto w-full">
<div ref="chartRefList" v-for="(item, index) in recordSetList" :key="index"></div>
</div>
@@ -134,15 +130,69 @@
type: chartTypeMapEchart[selectChartType.value],
};
});
-
instance.setOption({
grid: {
// bottom: 120,
// right: '15%',
- bottom: '15%',
+ bottom: '5%',
},
+ toolbox: {
+ show: true,
+ feature: {
+ dataZoom: {
+ yAxisIndex: 'none',
+ },
+
+ myBar: {
+ title: '杞寲涓烘煴鐘跺浘',
+ show: true,
+ icon: 'path://M580.8 228.8h-136v500.8h136V228.8z m-40 460.8h-56V268.8h56v420.8zM788.8 420.8h-136v308.8h136V420.8z m-40 268.8h-56V460.8h56v228.8zM372.8 326.4h-136v401.6h136V326.4z m-40 363.2h-56V366.4h56v323.2zM208 788.8h608v40H208z',
+ onclick: () => {
+ instance.setOption({
+ series: seriesData.map((item) => ({
+ ...item,
+ type: 'bar',
+ })),
+ });
+ },
+ },
+
+ myScatter: {
+ title: '杞寲涓烘暎鐐瑰浘',
+ show: true,
+ icon: 'path://M445.7 609.8c0 19.4 10.3 37.3 27.1 46.9 16.8 9.7 37.4 9.7 54.2 0 16.8-9.7 27.1-27.6 27.1-46.9 0-29.9-24.3-54.2-54.2-54.2s-54.2 24.3-54.2 54.2z m0 0M179.2 613.8c-42.2 0-76.5 34.3-76.5 76.5s34.3 76.5 76.5 76.5 76.5-34.3 76.5-76.5-34.3-76.5-76.5-76.5z m0 0M144.9 401.1c0 29 23.5 52.5 52.5 52.5s52.5-23.5 52.5-52.5-23.5-52.5-52.5-52.5-52.5 23.5-52.5 52.5z m0 0M598.7 404c0 42.2 34.3 76.5 76.5 76.5 42.3 0 76.5-34.3 76.5-76.5 0-42.3-34.3-76.5-76.5-76.5-42.3 0-76.5 34.3-76.5 76.5z m0 0M849.3 169.2c-42.2 0-76.5 34.3-76.5 76.5s34.3 76.5 76.5 76.5 76.5-34.3 76.5-76.5-34.3-76.5-76.5-76.5z m0 0M261.6 583.1c0 13.2 7.1 25.5 18.5 32.1 11.5 6.6 25.6 6.6 37.1 0s18.5-18.9 18.5-32.1c0-20.5-16.6-37.1-37.1-37.1-20.4 0.1-37 16.7-37 37.1z m0 0M276.8 425.1c0 42.3 34.3 76.5 76.5 76.5 42.3 0 76.5-34.3 76.5-76.5s-34.3-76.5-76.5-76.5-76.5 34.3-76.5 76.5z m0 0M445.7 421.4c0 18.5 9.9 35.5 25.8 44.8 16 9.2 35.7 9.2 51.7 0s25.8-26.3 25.8-44.8c0-28.5-23.1-51.7-51.7-51.7-28.5 0-51.6 23.2-51.6 51.7z m0 0M398.2 208.8c0 42.3 34.3 76.5 76.5 76.5s76.5-34.3 76.5-76.5c0-42.3-34.3-76.5-76.5-76.5s-76.5 34.3-76.5 76.5z m0 0M693.7 599.2c0 42.3 34.3 76.5 76.5 76.5s76.5-34.3 76.5-76.5-34.3-76.5-76.5-76.5c-42.3 0-76.5 34.3-76.5 76.5z m0 0M62.1 828.9H959v60.7H62.1z',
+ onclick: () => {
+ instance.setOption({
+ series: seriesData.map((item) => ({
+ ...item,
+ type: 'scatter',
+ })),
+ });
+ },
+ },
+ myRestore: {
+ title: '杩樺師',
+ show: true,
+ icon: 'path://M909.637 478.524c-15.444-189.946-167.065-345.049-356.655-364.38-99.805-10.176-193.011 16.474-267.901 67.887l18.467-68.842c5.725-21.337-6.933-43.274-28.27-48.998s-43.274 6.934-48.998 28.271l-41.455 154.536c-5.724 21.337 6.933 43.273 28.271 48.998l154.536 41.455c21.337 5.724 43.273-6.934 48.998-28.271 5.724-21.337-6.934-43.274-28.271-48.998l-54.194-14.538c58.917-39.301 131.457-59.686 208.999-52.061 147.885 14.543 268.327 132.461 285.589 280.053 23.02 196.82-133.879 363.973-327.45 358.219-135.107-4.017-252.98-96.111-294.938-224.602-17.513-53.632-18.92-105.027-9.92-152.849 3.188-16.946-4.238-34.086-19.172-42.707l-0.049-0.028c-23.737-13.705-54.358-0.164-59.404 26.777-7.724 41.233-9.128 84.686-2.965 129.403 25.571 185.535 181.03 330.336 367.878 343.176C727.656 927.857 929.6 724.049 909.637 478.524z',
+ onclick: () => {
+ instance.setOption({
+ series: seriesData.map((item) => ({
+ ...item,
+ type: 'line',
+ })),
+ });
+ },
+ },
+ dataView: {
+ readOnly: true,
+ },
+ saveAsImage: {},
+ },
+ },
+
tooltip: {
show: true,
+ trigger: 'axis',
},
title: {
text: data?.title,
diff --git a/src/layout/component/sidebar/components/MenuList.vue b/src/layout/component/sidebar/components/MenuList.vue
index 471c92b..359a087 100644
--- a/src/layout/component/sidebar/components/MenuList.vue
+++ b/src/layout/component/sidebar/components/MenuList.vue
@@ -37,7 +37,7 @@
</div>
</div>
</div>
- <div class="pc-login" v-show="state.isShowLogin">
+ <div class="pc-login items-center justify-center" style="display:flex" v-show="state.isShowLogin">
<div class="login_box">
<div class="sign_in">
<i class="ywicon icon-guanbi closes" @click="handleClose"></i>
diff --git a/src/stores/chatRoom.ts b/src/stores/chatRoom.ts
index 9ecf718..5d86755 100644
--- a/src/stores/chatRoom.ts
+++ b/src/stores/chatRoom.ts
@@ -2,12 +2,31 @@
import type { ChatRoomItem } from '../layout/component/sidebar/components/types';
import { Local } from '../utils/storage';
+export type RoomConfig = {
+ /** 鏄惁鐩存帴璋冪敤澶фā鍨嬶紙閫氫箟鍗冮棶锛夊洖绛� */
+ isAnswerByLLM: boolean;
+};
+
+export type RoomConfigKey = keyof RoomConfig;
+export const roomConfig = ref<Record<string, RoomConfig>>(null);
+
+export const setRoomConfig = <T extends RoomConfigKey>(roomId: string, key: T, value: RoomConfig[T]) => {
+ if (!roomConfig.value) {
+ roomConfig.value = {};
+ }
+ if (!roomConfig.value[roomId]) {
+ roomConfig.value[roomId] = {
+ [key]: value,
+ } as any;
+ } else {
+ roomConfig.value[roomId][key] = value;
+ }
+};
+
export const chatRoomList = ref<ChatRoomItem[]>([]);
-
-
export const activeRoomId = ref(null);
export const activeChatRoom = computed(() => chatRoomList.value?.find((item) => item.id === activeRoomId.value));
export const activeSampleId = ref(null);
-export const activeSectionAId= ref(null);
-export const activeLLMId= ref(null);
\ No newline at end of file
+export const activeSectionAId = ref(null);
+export const activeLLMId = ref(null);
diff --git a/src/views/project/ch/home/component/waterRight/bottom.vue b/src/views/project/ch/home/component/waterRight/bottom.vue
index f524457..6b37d7f 100644
--- a/src/views/project/ch/home/component/waterRight/bottom.vue
+++ b/src/views/project/ch/home/component/waterRight/bottom.vue
@@ -40,7 +40,7 @@
import { onMounted, reactive, computed } from 'vue';
import { getSectionList } from '/@/api/ai/chat';
import router from '/@/router';
-import { activeSectionAId } from '/@/stores/chatRoom';
+import { activeRoomId, activeSectionAId, setRoomConfig } from '/@/stores/chatRoom';
let state = reactive({
applicationScenarios: [],
@@ -48,6 +48,7 @@
});
const changeScenarios = async (item) => {
activeSectionAId.value = item.section_id;
+ setRoomConfig(activeRoomId.value, 'isAnswerByLLM', false);
};
const getMainSectionList = async () => {
const res = await getSectionList();
diff --git a/src/views/project/ch/home/component/waterRight/center.vue b/src/views/project/ch/home/component/waterRight/center.vue
index 0ec5aee..cf8dadc 100644
--- a/src/views/project/ch/home/component/waterRight/center.vue
+++ b/src/views/project/ch/home/component/waterRight/center.vue
@@ -152,7 +152,7 @@
import { Search } from '@element-plus/icons-vue';
import { computed, onMounted, reactive, ref, watch } from 'vue';
import { getSelectSample, getUserTemplateList } from '/@/api/ai/chat';
-import { activeSampleId } from '/@/stores/chatRoom';
+import { activeRoomId, activeSampleId, roomConfig, setRoomConfig } from '/@/stores/chatRoom';
import emitter from '/@/utils/mitt';
import { useSearch } from '/@/hooks/useSearch';
import { debounce, getRecentDateRange } from '/@/utils/util';
@@ -275,6 +275,7 @@
const changeExample = (item) => {
emitter.emit('updateChatInput', item.sample_question);
+ setRoomConfig(activeRoomId.value,'isAnswerByLLM',false);
activeSampleId.value = item.sample_id;
};
//鑾峰彇鐢ㄦ埛妯℃澘
@@ -320,6 +321,7 @@
};
//#region ====================== templateUseClick ======================
const templateUseClick = (row) => {
+ setRoomConfig(activeRoomId.value,'isAnswerByLLM',true);
emitter.emit('updateChatInput', row.template_value);
};
//#endregion
--
Gitblit v1.9.3