From 349020eb32ec1c8589b568b767b674df71075e80 Mon Sep 17 00:00:00 2001 From: yangyin <1850366751@qq.com> Date: 星期三, 17 七月 2024 09:26:08 +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, 7 insertions(+), 10 deletions(-) diff --git a/src/components/chat/chatComponents/summaryCom/SummaryCom.vue b/src/components/chat/chatComponents/summaryCom/SummaryCom.vue index 3c9ea77..3751769 100644 --- a/src/components/chat/chatComponents/summaryCom/SummaryCom.vue +++ b/src/components/chat/chatComponents/summaryCom/SummaryCom.vue @@ -1,5 +1,5 @@ <template> - <div class="w-full"> + <div style="width: calc(100ch - 28px)"> <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,17 +19,16 @@ :class="{ 'mt-10': summaryList && summaryList.length > 0 }" v-if="recordSetList && recordSetList.length > 0" > - <div class="h-[20rem] flex-auto w-full"> + <div class="min-h-[48rem] 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="http://127.0.0.1:5500/src/views/project/ch/demo/MonthlyPay.html" + data="http://127.0.0.1:5500/src/views/project/ch/demo/Overview.html" v-for="(item, index) in urlList" :key="index" ></HTMLCom> - <MapCom /> </div> </template> <div v-else class="text-red-500">{{ error }}</div> @@ -41,13 +40,11 @@ import type { TableInstance } from 'element-plus'; import _ from 'lodash'; import { computed, onMounted, ref } from 'vue'; -import { ChartTypeEnum, chartTypeMapEchart, chartTypeMapName } from '../types'; -import { axisLabelFormatter } from '/@/utils/chart'; -import { PATH_ICON, SCATTER_SYMBOL_SIZE, timeDataOptionToContent } from '../common'; import { AnswerType } from '../../model/types'; +import { PATH_ICON, SCATTER_SYMBOL_SIZE, timeDataOptionToContent } from '../common'; import HTMLCom from '../htmlCom/HTMLCom.vue'; -import MapCom from '../mapCom/MapCom.vue'; - +import { ChartTypeEnum, chartTypeMapEchart } from '../types'; +import { axisLabelFormatter } from '/@/utils/chart'; const props = defineProps(['data', 'error']); const selectChartType = ref<ChartTypeEnum>(ChartTypeEnum.Line); @@ -152,7 +149,7 @@ grid: { // bottom: 120, // right: '15%', - bottom: '8%', + bottom: '5%', }, toolbox: { show: true, -- Gitblit v1.9.3