diff --git a/src/components/ChartsBar/index.vue b/src/components/ChartsBar/index.vue index f06efec..34315b5 100644 --- a/src/components/ChartsBar/index.vue +++ b/src/components/ChartsBar/index.vue @@ -247,6 +247,7 @@ nameTextStyle: {//y轴上方单位的颜色 color: '#464b50' }, + scale: true, nameGap: 50, axisLine: { show: true, diff --git a/src/components/ChartsDataZoom/index.vue b/src/components/ChartsDataZoom/index.vue index 7644aad..b37a96a 100644 --- a/src/components/ChartsDataZoom/index.vue +++ b/src/components/ChartsDataZoom/index.vue @@ -281,6 +281,7 @@ nameTextStyle: {//y轴上方单位的颜色 color: '#464b50' }, + scale: true, nameGap: 50, axisLine: { show: true, diff --git a/src/components/ZhengBian/index.vue b/src/components/ZhengBian/index.vue index 7e5b45d..096ed21 100644 --- a/src/components/ZhengBian/index.vue +++ b/src/components/ZhengBian/index.vue @@ -10,7 +10,7 @@ - + @@ -353,7 +353,7 @@ const handleStationChange = async (stnmId, options, stnm) => { queryParams.stnm = stnm queryParams.stnmId = stnmId - queryParams.stnmIds = stnmId + queryParams.stnmIds = queryParams.stnmId const data = options.filter(item => item.stnmId != stnmId) // const data = options stationOptions.value = data @@ -364,10 +364,11 @@ uploadUrl = `${import.meta.env.VUE_APP_BASE_API}${props.requestPrefix}/updatedatabyexcel?stnmId=${queryParams.stnmId}&stationType=${props.stationType}&ycMethod=2` try { await Promise.all([ - drawTable1(), - drawTable2(), - drawTable3(), - getEchartsData() + getEchartsData(), + // drawTable1(), + // drawTable2(), + // drawTable3(), + ]); } catch (error) { @@ -416,10 +417,11 @@ } } await Promise.all([ - drawTable1(), - drawTable2(), - drawTable3(), - getEchartsData() + getEchartsData(), + // drawTable1(), + // drawTable2(), + // drawTable3(), + ]); } @@ -531,6 +533,7 @@ // 获取预处理数据 const drawTable1 = async () => { + gridOptions1.data = [] gridOptions1.loading = true try { let url = props.requestPrefix + '/originaldata' @@ -568,6 +571,7 @@ }) // 获取小时数居 const drawTable2 = async () => { + gridOptions2.data = [] gridOptions2.loading = true try { let url = props.requestPrefix + '/countdata' @@ -589,6 +593,7 @@ }) // 获取遥测数居 const drawTable3 = async () => { + gridOptions3.data = [] gridOptions3.loading = true try { let url = props.requestPrefix + '/xindaodaydata' @@ -641,6 +646,10 @@ let url = props.requestPrefix + baseUrl let res = await proxy.axiosPost2(url, queryParams); if (res.code === 0) { + let data = res.data + gridOptions1.data = data.origionDataList + gridOptions2.data = data.hourDataList + gridOptions3.data = data.xindaoDataList legendData.value = res.data.legend if (props.stationType !== 'A' && staticType.value == '1') { @@ -734,10 +743,10 @@ const handleQuery = async () => { try { await Promise.all([ - drawTable1(), - drawTable2(), - drawTable3(), - getEchartsData() + getEchartsData(), + // drawTable1(), + // drawTable2(), + // drawTable3(), ]); } catch (error) { @@ -750,7 +759,12 @@ queryParams.dataType = val handleQuery() } - // 对比站点改变 + // 余姚站点改变 + const changeStnmId=(val)=>{ + queryParams.stnmId = val + queryParams.stnmIds = val + } + // 余姚对比站点改变 let compareStation = ref([]) const changeCompareStnmIds = (val) => { compareStation.value = val