微调
This commit is contained in:
@@ -34,7 +34,6 @@ const fetchConfig = async (name: string) => {
|
|||||||
// fetchConfig()
|
// fetchConfig()
|
||||||
|
|
||||||
const emit = defineEmits(['getRegionByRegion', 'eliminate', 'clickMap'])
|
const emit = defineEmits(['getRegionByRegion', 'eliminate', 'clickMap'])
|
||||||
onMounted(() => {})
|
|
||||||
|
|
||||||
const GetEchar = async (name: string) => {
|
const GetEchar = async (name: string) => {
|
||||||
let chartDom = document.getElementById('chartMap')
|
let chartDom = document.getElementById('chartMap')
|
||||||
@@ -44,6 +43,7 @@ const GetEchar = async (name: string) => {
|
|||||||
name == dictData.state.area?.[0].name ? (showCircle.value = false) : (showCircle.value = true)
|
name == dictData.state.area?.[0].name ? (showCircle.value = false) : (showCircle.value = true)
|
||||||
|
|
||||||
echarts.registerMap(name, await fetchConfig(name)) //注册可用的地图
|
echarts.registerMap(name, await fetchConfig(name)) //注册可用的地图
|
||||||
|
|
||||||
let option = {
|
let option = {
|
||||||
title: {
|
title: {
|
||||||
left: 'center',
|
left: 'center',
|
||||||
@@ -99,6 +99,7 @@ const GetEchar = async (name: string) => {
|
|||||||
// top: 10,
|
// top: 10,
|
||||||
// bottom: 0,
|
// bottom: 0,
|
||||||
roam: true,
|
roam: true,
|
||||||
|
|
||||||
label: {
|
label: {
|
||||||
normal: {
|
normal: {
|
||||||
show: true,
|
show: true,
|
||||||
@@ -178,6 +179,7 @@ const GetEchar = async (name: string) => {
|
|||||||
}, 0)
|
}, 0)
|
||||||
window.addEventListener('resize', resizeHandler)
|
window.addEventListener('resize', resizeHandler)
|
||||||
const flag1 = ref(true)
|
const flag1 = ref(true)
|
||||||
|
|
||||||
// 点击事件
|
// 点击事件
|
||||||
myCharts.value.off('click')
|
myCharts.value.off('click')
|
||||||
myCharts.value.on('click', (e: any) => {
|
myCharts.value.on('click', (e: any) => {
|
||||||
|
|||||||
@@ -32,7 +32,7 @@
|
|||||||
<el-card v-for="(item, index) in tableStore.table.data" :key="index">
|
<el-card v-for="(item, index) in tableStore.table.data" :key="index">
|
||||||
<template #header>
|
<template #header>
|
||||||
<div style="cursor: pointer;" @click="queryline(item, false)">
|
<div style="cursor: pointer;" @click="queryline(item, false)">
|
||||||
<el-tag v-if="item.data < 60 && item.data >= 0"
|
<el-tag v-if="item.data < 60 && item.data >= 0 && item.data !== 3.14159"
|
||||||
style="color: #fff; background: #339966" size="small">
|
style="color: #fff; background: #339966" size="small">
|
||||||
优
|
优
|
||||||
</el-tag>
|
</el-tag>
|
||||||
@@ -56,7 +56,7 @@
|
|||||||
<div class="card-item" v-for="(item1, index1) in item.children"
|
<div class="card-item" v-for="(item1, index1) in item.children"
|
||||||
:key="index1" @click="queryline(item1, true)">
|
:key="index1" @click="queryline(item1, true)">
|
||||||
|
|
||||||
<el-tag v-if="item1.data < 60 && item1.data >= 0"
|
<el-tag v-if="item1.data < 60 && item1.data >= 0 && item1.data !== 3.14159"
|
||||||
style="color: #fff; background: #339966" size="small">
|
style="color: #fff; background: #339966" size="small">
|
||||||
优
|
优
|
||||||
</el-tag>
|
</el-tag>
|
||||||
|
|||||||
@@ -160,7 +160,7 @@ import { getFileNameAndFilePath } from '@/api/system-boot/file'
|
|||||||
import { getUserByDeptId, getPlanDetailsById } from '@/api/supervision-boot/plan/index'
|
import { getUserByDeptId, getPlanDetailsById } from '@/api/supervision-boot/plan/index'
|
||||||
import { Link, View } from '@element-plus/icons-vue'
|
import { Link, View } from '@element-plus/icons-vue'
|
||||||
import { useAdminInfo } from '@/stores/adminInfo'
|
import { useAdminInfo } from '@/stores/adminInfo'
|
||||||
import {download} from '@/utils/fileDownload'
|
import {download} from '@/utils/fileDownLoad'
|
||||||
defineOptions({ name: 'BpmUserReportDetail' })
|
defineOptions({ name: 'BpmUserReportDetail' })
|
||||||
const { query } = useRoute() // 查询参数
|
const { query } = useRoute() // 查询参数
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
|
|||||||
@@ -91,6 +91,8 @@ const info = (list: any, searchBeginTime: any, searchEndTime: any,selectedAreaNa
|
|||||||
},
|
},
|
||||||
...list.voltageStatistics.voltageLevelCalculation
|
...list.voltageStatistics.voltageLevelCalculation
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
let all = 0
|
let all = 0
|
||||||
|
|
||||||
list.monthlyStatistics.monthCalculation.forEach((item: any) => {
|
list.monthlyStatistics.monthCalculation.forEach((item: any) => {
|
||||||
@@ -103,6 +105,7 @@ const info = (list: any, searchBeginTime: any, searchEndTime: any,selectedAreaNa
|
|||||||
},
|
},
|
||||||
...list.monthlyStatistics.monthCalculation
|
...list.monthlyStatistics.monthCalculation
|
||||||
]
|
]
|
||||||
|
|
||||||
}
|
}
|
||||||
const formatter = (row: any) => {
|
const formatter = (row: any) => {
|
||||||
if (row.column.field == 'areaName') {
|
if (row.column.field == 'areaName') {
|
||||||
|
|||||||
@@ -112,7 +112,7 @@ const map = (res: any) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
console.log('areaData', areaData)
|
||||||
echartMapList.value = {
|
echartMapList.value = {
|
||||||
name: '',
|
name: '',
|
||||||
title: {
|
title: {
|
||||||
|
|||||||
@@ -165,8 +165,8 @@ const lineId = ref('')
|
|||||||
const handler = async ({ BMap, map }: any) => {
|
const handler = async ({ BMap, map }: any) => {
|
||||||
let data = props.mapList
|
let data = props.mapList
|
||||||
let r = 0.0035
|
let r = 0.0035
|
||||||
let list = data.filter((item: any) => item.lng != 0)
|
//let list = data.filter((item: any) => item.lng != 0)
|
||||||
|
let list = data
|
||||||
list.forEach((item: any) => {
|
list.forEach((item: any) => {
|
||||||
// 变电站图标
|
// 变电站图标
|
||||||
item.icon = {
|
item.icon = {
|
||||||
@@ -271,7 +271,7 @@ const syncCenterAndZoom = (e: any) => {
|
|||||||
zoom.value = e.target.getZoom()
|
zoom.value = e.target.getZoom()
|
||||||
}
|
}
|
||||||
const markerClick = (e: any) => {
|
const markerClick = (e: any) => {
|
||||||
console.log("🚀 ~ markerClick ~ e:", e)
|
//console.log("🚀 ~ markerClick ~ e:", e)
|
||||||
infoWindowPoint.value = e
|
infoWindowPoint.value = e
|
||||||
monitoringPoint.setValue('lineId', e.lineId)
|
monitoringPoint.setValue('lineId', e.lineId)
|
||||||
infoWindowPoint.value.show = true
|
infoWindowPoint.value.show = true
|
||||||
|
|||||||
Reference in New Issue
Block a user