From 48c93b3efd07e557d4333970dea76f9409482aed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?= <43331987+JiaLiBai@users.noreply.github.com> Date: Fri, 20 Jun 2025 14:19:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=85=A8=E7=AD=89=E5=88=A4?= =?UTF-8?q?=E6=96=AD=20=E5=88=A0=E9=99=A4=E4=B8=8D=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E7=9A=84log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Ems/ZdBaseInfo/index.vue | 2 +- src/components/Ems/ZdSelect/index.vue | 7 ++++--- src/views/ems/dzjk/home/index.vue | 5 ++--- src/views/ems/zddt/BarChart.vue | 1 - src/views/ems/zddt/MapChart.vue | 5 ----- src/views/ems/zddt/index.vue | 7 ++++--- 6 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/components/Ems/ZdBaseInfo/index.vue b/src/components/Ems/ZdBaseInfo/index.vue index e32924d..8b1c05b 100644 --- a/src/components/Ems/ZdBaseInfo/index.vue +++ b/src/components/Ems/ZdBaseInfo/index.vue @@ -49,7 +49,7 @@ export default { methods: { setData(res = {}){ this.data.forEach((item)=>{ - item.num =(res[item.attr] || res[item.attr] == 0) ? res[item.attr] : '—' + item.num =(res[item.attr] || res[item.attr] === 0) ? res[item.attr] : '—' }) } }, diff --git a/src/components/Ems/ZdSelect/index.vue b/src/components/Ems/ZdSelect/index.vue index d2aab98..42e2dfa 100644 --- a/src/components/Ems/ZdSelect/index.vue +++ b/src/components/Ems/ZdSelect/index.vue @@ -49,9 +49,10 @@ import {getAllSites} from '@/api/ems/zddt' this.siteList = response.data || [] console.log("获取站点列表返回数据",response,this.siteList) // 页面初始化 设置默认选中的站点 - const defaultSite = this.defaultSiteId - if(defaultSite&& this.siteList.find(item=>item.id == defaultSite)){ - this.id = parseInt(defaultSite)//defaultSite会传来字符串类型 电站列表返回的书number类型 两个数据的类型不匹配时下拉框的默认值会显示有问题 + //defaultSite会传来字符串类型 getAllSites接口返回的id是number类型 两个数据的类型不匹配时下拉框的默认值会显示有问题 + const defaultSite = parseInt(this.defaultSiteId) + if(defaultSite&& this.siteList.find(item=>item.id === defaultSite)){ + this.id = defaultSite }else if(!defaultSite && this.siteList.length>0){ this.id = this.siteList[0].id } diff --git a/src/views/ems/dzjk/home/index.vue b/src/views/ems/dzjk/home/index.vue index e6ae350..21246ff 100644 --- a/src/views/ems/dzjk/home/index.vue +++ b/src/views/ems/dzjk/home/index.vue @@ -36,7 +36,7 @@ label="状态" > { - console.log(`获取单站监控id=${siteId}的基本信息`,response) const data = response.data || {} this.sjglData.forEach(item=>{ - item.value = (data[item.attr] || data[item.attr] == 0) ? data[item.attr] : '-' + item.value = (data[item.attr] || data[item.attr] === 0) ? data[item.attr] : '-' }) this.tableData = data?.siteMonitorHomeAlarmVo || [] this.$refs.nllzChart.setOption(data) diff --git a/src/views/ems/zddt/BarChart.vue b/src/views/ems/zddt/BarChart.vue index 527239f..c6c4efe 100644 --- a/src/views/ems/zddt/BarChart.vue +++ b/src/views/ems/zddt/BarChart.vue @@ -27,7 +27,6 @@ export default { }, methods: { setOption(data){ - console.log('初始化单个站点充、放电量柱状图',data) const source = [['日期','充电量','放电量']] data.forEach(item=>{ source.push([item.ammeterDate, item.chargedCap,item.disChargedCap]) diff --git a/src/views/ems/zddt/MapChart.vue b/src/views/ems/zddt/MapChart.vue index ffd66c9..d16b591 100644 --- a/src/views/ems/zddt/MapChart.vue +++ b/src/views/ems/zddt/MapChart.vue @@ -33,16 +33,11 @@ export default { initChart() { // ECharts 默认有提供了一个简单的加载动画。只需要调用 showLoading 方法显示。数据加载完成后再调用 hideLoading 方法隐藏加载动画。 this.chart = echarts.init(document.querySelector('#zddtChart')) - this.setOption([]) }, setOption(data) { this.chart.setOption({ color:['#FFBD00'], backgroundColor: 'transparent', //背景色 - // tooltip: { - // trigger: 'item', - // show: true, - // }, geo: { //地理坐标系组件 地理坐标系组件用于地图的绘制,支持在地理坐标系上绘制 map: 'china', //地图类型 这儿展示的是中国地图 aspectScale: 0.85, diff --git a/src/views/ems/zddt/index.vue b/src/views/ems/zddt/index.vue index 46131d4..24aa946 100644 --- a/src/views/ems/zddt/index.vue +++ b/src/views/ems/zddt/index.vue @@ -96,7 +96,8 @@ export default { methods:{ // 站点选中 submitSite(id){ - console.log('选中的站点id',id) + if(this.singleSiteId === id){return console.log(`点击搜索按钮 搜索相同的站点id= ${id}不再调用获取基本信息接口`)} + console.log('点击搜索按钮 选中的站点id',id) this.singleSiteId = id getSingleSiteBaseInfo(id).then(response => { console.log('单个站点详情数据',response) @@ -104,10 +105,10 @@ export default { this.singleSiteName = res?.siteName || ''//站点名称 this.singleSiteLocation = res?.siteLocation || []//站点坐标 this.singleZdSqaure.forEach(item=>{ - item.value =( res[item.attr] || res[item.attr] == 0 ) ? res[item.attr] : '-' + item.value =( res[item.attr] || res[item.attr] === 0 ) ? res[item.attr] : '-' }) this.singleZdInfo.forEach(item=>{ - item.value = ( res[item.attr] || res[item.attr] == 0 ) ? res[item.attr] : '-' + item.value = ( res[item.attr] || res[item.attr] === 0 ) ? res[item.attr] : '-' }) this.$refs.barChart.setOption(res?.sevenDayDisChargeStats || []) this.$refs.mapChart.setOption([{name:this.singleSiteName,value:this.singleSiteLocation}])