diff --git a/frontend/src/components/echarts/line/index.vue b/frontend/src/components/echarts/line/index.vue index 3f269d9..b65b25c 100644 --- a/frontend/src/components/echarts/line/index.vue +++ b/frontend/src/components/echarts/line/index.vue @@ -8,7 +8,9 @@ import { onBeforeUnmount, onMounted, ref, watch } from 'vue' // import echarts from './echarts' import * as echarts from 'echarts' // 全引入 -// import 'echarts/lib/component/dataZoom' +import 'echarts-gl' +import 'echarts-liquidfill' +import 'echarts/lib/component/dataZoom' const color = [ 'var(--el-color-primary)', @@ -39,11 +41,13 @@ const resizeHandler = () => { }) } const initChart = () => { + if (!props.isInterVal && !props.pieInterVal) { chart?.dispose() } // chart?.dispose() chart = echarts.init(chartRef.value as HTMLDivElement) + const options = { title: { left: 'center', diff --git a/frontend/src/views/home/components/compareDataCheckChart.vue b/frontend/src/views/home/components/compareDataCheckChart.vue index 794e8c5..77de2c0 100644 --- a/frontend/src/views/home/components/compareDataCheckChart.vue +++ b/frontend/src/views/home/components/compareDataCheckChart.vue @@ -7,7 +7,7 @@ +/* 或者设置最小高度 */ +.history_chart { + width: 100%; + min-height: 300px; /* 确保有最小高度 */ + margin-top: 10px; +} + \ No newline at end of file diff --git a/frontend/src/views/home/components/compareDataCheckSingleChannelSingleTestPopup.vue b/frontend/src/views/home/components/compareDataCheckSingleChannelSingleTestPopup.vue index ba29c6c..1ea855f 100644 --- a/frontend/src/views/home/components/compareDataCheckSingleChannelSingleTestPopup.vue +++ b/frontend/src/views/home/components/compareDataCheckSingleChannelSingleTestPopup.vue @@ -276,6 +276,7 @@ const currentRawTableData = computed(() => { }) const open = async (row: any, chnNum: string, deviceId: string | null, source: number) => { + activeTab.value = 'resultTab' isWaveData.value = false pattern.value = dictStore.getDictData('Pattern').find(item => item.name === modeStore.currentMode)?.id ?? '' //获取数据字典中对应的id rowList.value = {} @@ -412,7 +413,6 @@ const getBasicInformation = async (scriptType: any) => { }) formContent.dataRule = res.data.dataRule - console.log('formContent.dataRule',formContent.dataRule) formContent.deviceName = res.data.deviceName formContent.errorSysId = res.data.errorSysId chnMapList.value = res.data.chnMap @@ -528,7 +528,7 @@ const getResults = async (code: any) => { // 判断是否为录波数据请求 const isWaveDataRequest = code === 'wave_data' || isWaveData.value - console.log(checkStore.plan) + getContrastResult({ planId: checkStore.plan.id, scriptType: rowList.value.scriptType,