From cf7eda004123f2ee07bfa7d05f51f71f9dbb4bcd Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期四, 18 七月 2024 11:48:59 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/WI/Web.V1.0
---
src/components/chat/chatComponents/summaryCom/SummaryCom.vue | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/components/chat/chatComponents/summaryCom/SummaryCom.vue b/src/components/chat/chatComponents/summaryCom/SummaryCom.vue
index 09d39a9..ab0a51f 100644
--- a/src/components/chat/chatComponents/summaryCom/SummaryCom.vue
+++ b/src/components/chat/chatComponents/summaryCom/SummaryCom.vue
@@ -1,5 +1,5 @@
<template>
- <div style="width: calc(100ch - 28px)">
+ <div class="w-full">
<template v-if="data && data.length > 0">
<template v-if="summaryList && summaryList.length > 0">
<div class="w-full" v-for="(item, idx) in summaryList" :key="idx">
@@ -19,15 +19,15 @@
:class="{ 'mt-10': summaryList && summaryList.length > 0 }"
v-if="recordSetList && recordSetList.length > 0"
>
- <div class="min-h-[48rem] flex-auto w-full">
+ <div class="h-[20rem] flex-auto w-full">
<div ref="chartRefList" v-for="(item, index) in recordSetList" :key="index"></div>
</div>
</div>
<div v-if="urlList && urlList.length > 0" class="w-full">
- <HTMLCom :data="`${SERVE_URL}/views/project/ch/demo/Overview.html`" v-for="(item, index) in urlList" :key="index"></HTMLCom>
+ <!-- <HTMLCom data="http://101.133.133.173:8019/ai_html/views/demo/html/MonthlyPay.html" v-for="(item, index) in urlList" :key="index"></HTMLCom> -->
+ <HTMLCom :data="item.url" v-for="(item, index) in urlList" :key="index"></HTMLCom>
</div>
</template>
- <div v-else class="text-red-500">{{ error }}</div>
</div>
</template>
@@ -37,12 +37,11 @@
import _ from 'lodash';
import { computed, onMounted, ref } from 'vue';
import { AnswerType } from '../../model/types';
-import { PATH_ICON, SCATTER_SYMBOL_SIZE, timeDataOptionToContent } from '../common';
+import { PATH_ICON, SCATTER_SYMBOL_SIZE, chatComProps, timeDataOptionToContent } from '../common';
import HTMLCom from '../htmlCom/HTMLCom.vue';
import { ChartTypeEnum, chartTypeMapEchart } from '../types';
-import { SERVE_URL } from '/@/constants/index';
import { axisLabelFormatter } from '/@/utils/chart';
-const props = defineProps(['data', 'error']);
+const props = defineProps(chatComProps);
const selectChartType = ref<ChartTypeEnum>(ChartTypeEnum.Line);
@@ -146,7 +145,9 @@
grid: {
// bottom: 120,
// right: '15%',
- bottom: '5%',
+ left: '5%',
+ right: '5%',
+ bottom: '8%',
},
toolbox: {
show: true,
--
Gitblit v1.9.3