Web/admin-govern
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并

Browse Source
This commit is contained in:
仲么了
2024-01-04 10:39:37 +08:00
parent d4ee8e7821 0b37e797c3
commit f14b778c05
4 changed files with 111 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/echarts/MyEchartMap.vue
View File

@@ -29,9 +29,8 @@ const GetEchar = async (name: string) => {
let chartDom = document.getElementById('chartMap') let chartDom = document.getElementById('chartMap')
myCharts.value?.dispose() myCharts.value?.dispose()
myCharts.value = echarts.init(chartDom) myCharts.value = echarts.init(chartDom)
if (name != '中国') { name == '中国' ? (showCircle.value = false) : (showCircle.value = true)
showCircle.value = true
}
echarts.registerMap(name, await fetchConfig(name)) //注册可用的地图 echarts.registerMap(name, await fetchConfig(name)) //注册可用的地图
let option = { let option = {
title: { title: {
@@ -127,7 +126,7 @@ const GetEchar = async (name: string) => {
shadowOffsetY: 0, shadowOffsetY: 0,
borderWidth: 0 borderWidth: 0
} }
}, }
// regions: [ // regions: [
// { // {
// name: '南海诸岛', // name: '南海诸岛',
@@ -161,11 +160,9 @@ const GetEchar = async (name: string) => {
} }
const MapReturn = (name: string) => { const MapReturn = (name: string) => {
let area = dictData.state.area[0].children let area = dictData.state.area?.[0]?.children ?? []
let list = {} let list = {}
let flag = true let flag = true
for (let i = 0; i < area.length; i++) { for (let i = 0; i < area.length; i++) {
if (area[i].name == name) { if (area[i].name == name) {
console.log(11111) console.log(11111)

51
src/views/Event-boot/Region/distribution.vue
View File

@@ -33,27 +33,29 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<my-echart class="tall" :options="echartList" /> <my-echart class="tall" :options="echartList" />
<el-table class="tall" stripe :data="distributionData" border> <div class="tall">
<el-table-column <vxe-table height="auto" auto-resize :data="distributionData" v-bind="defaultAttribute">
prop="qy" >
:label=" <vxe-column
titleA == '电压等级' field="qy"
? '电压等级' :title="
: titleA == '终端厂家' titleA == '电压等级'
? '终端厂家' ? '电压等级'
: titleA == '干扰源类型' : titleA == '终端厂家'
? '干扰源类型' ? '终端厂家'
: titleA == '电网拓扑' : titleA == '干扰源类型'
? '区域' ? '干扰源类型'
: '' : titleA == '电网拓扑'
" ? '区域'
align="center" : ''
show-overflow-tooltip "
></el-table-column> show-overflow-tooltip
<el-table-column prop="jcd" label="监测点数(个数)" align="center"></el-table-column> ></vxe-column>
<el-table-column prop="zc" label="通讯正常(个数)" sortable align="center"></el-table-column> <vxe-column field="jcd" title="监测点数(个数)"></vxe-column>
<el-table-column prop="zd" label="通讯中断(个数)" sortable align="center"></el-table-column> <vxe-column field="zc" title="通讯正常(个数)" sortable></vxe-column>
</el-table> <vxe-column field="zd" title="通讯中断(个数)" sortable></vxe-column>
</vxe-table>
</div>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -63,6 +65,7 @@
import Area from '@/components/form/area/index.vue' import Area from '@/components/form/area/index.vue'
import { getAreaLineDetail } from '@/api/Region' import { getAreaLineDetail } from '@/api/Region'
import { useDictData } from '@/stores/dictData' import { useDictData } from '@/stores/dictData'
import { defaultAttribute } from '@/components/table/defaultAttribute'
import MyEchartMap from '@/components/echarts/MyEchartMap.vue' import MyEchartMap from '@/components/echarts/MyEchartMap.vue'
import MyEchart from '@/components/echarts/MyEchart.vue' import MyEchart from '@/components/echarts/MyEchart.vue'
import { ref, reactive, onMounted, provide } from 'vue' import { ref, reactive, onMounted, provide } from 'vue'
@@ -247,7 +250,7 @@ const histogram = (res: any) => {
: '' // 给X轴加单位 : '' // 给X轴加单位
}, },
tooltip: { tooltip: {
formatter: function (params) { formatter: function (params: any) {
// console.log(params); // console.log(params);
var tips = '' var tips = ''
for (var i = 0; i < params.length; i++) { for (var i = 0; i < params.length; i++) {
@@ -269,7 +272,7 @@ const histogram = (res: any) => {
: titleA.value == '电网拓扑' : titleA.value == '电网拓扑'
? '(区域)' ? '(区域)'
: '', // 给X轴加单位 : '', // 给X轴加单位
data: distributionData.value.map(item => item.qy) data: distributionData.value.map((item: any) => item.qy)
}, },
yAxis: { yAxis: {
name: '监测点数（个）' // 给X轴加单位 name: '监测点数（个）' // 给X轴加单位
@@ -279,7 +282,7 @@ const histogram = (res: any) => {
{ {
// name: '暂降次数', // name: '暂降次数',
type: 'bar', type: 'bar',
data: distributionData.value.map(item => item.jcd), data: distributionData.value.map((item: any) => item.jcd),
barMaxWidth: 30, barMaxWidth: 30,
itemStyle: { itemStyle: {
normal: { normal: {

76
src/views/dashboard/components/Tableabove.vue
View File

@@ -5,59 +5,51 @@
</span> </span>
<el-tabs tab-position="left" class="demo-tabs" style="margin-top: 10px"> <el-tabs tab-position="left" class="demo-tabs" style="margin-top: 10px">
<el-tab-pane label="区域"> <el-tab-pane label="区域">
<el-table :data="areaData" border height="calc(100vh - 220px)" stripe style="width: 100%"> <div class="default-main">
<template v-for="item in tableHeaderAera"> <vxe-table :data="areaData" v-bind="defaultAttribute" height="auto" auto-resize>
<el-table-column <vxe-column
align="center" v-for="item in tableHeaderAera"
:prop="item.prop" :field="item.prop"
:label="item.label" :title="item.label"
:min-width="item.width" :min-width="item.width"
:sortable="item.sortable" :sortable="item.sortable"
></el-table-column> :formatter="formatter"
</template> ></vxe-column>
</el-table> </vxe-table>
</div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="电压等级"> <el-tab-pane label="电压等级">
<el-table :data="levelData" border height="calc(100vh - 220px)" stripe style="width: 100%"> <div class="default-main">
<template v-for="item in tableHeaderLevel"> <vxe-table :data="levelData" v-bind="defaultAttribute" height="auto" auto-resize>
<el-table-column <vxe-column
align="center" v-for="item in tableHeaderLevel"
:prop="item.prop" :field="item.prop"
:label="item.label" :title="item.label"
:min-width="item.width" :min-width="item.width"
:sortable="item.sortable" :sortable="item.sortable"
></el-table-column> ></vxe-column>
</template> </vxe-table>
</el-table> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="月份"> <el-tab-pane label="月份">
<el-table :data="shareData" border height="calc(100vh - 220px)" stripe style="width: 100%"> <div class="default-main">
<el-table-column <vxe-table :data="shareData" v-bind="defaultAttribute" height="auto" auto-resize>
prop="month" <vxe-column field="month" title="月份" min-width="120px" sortable></vxe-column>
label="月份" <vxe-column field="notAssociated" title="电压暂降次数" sortable></vxe-column>
align="center" </vxe-table>
min-width="120px" </div>
sortable
></el-table-column>
<el-table-column prop="notAssociated" align="center" label="电压暂降次数" sortable>
<!-- <template slot-scope="scope">
<span v-if="scope.row.month != '总计'">
{{ scope.row.linked + scope.row.notAssociated }}
</span>
<span v-else>{{ scope.row.notAssociated }}</span>
</template> -->
</el-table-column>
</el-table>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, reactive, defineExpose } from 'vue' import { ref, reactive, defineExpose, computed } from 'vue'
const tableData = ref<any[]>([]) import { defaultAttribute } from '@/components/table/defaultAttribute'
const areaData = ref<any[]>([]) const areaData = ref<any[]>([])
const levelData = ref<any[]>([]) const levelData = ref<any[]>([])
const shareData = ref<any[]>([]) const shareData = ref<any[]>([])
const tableHeaderAera = ref<any[]>([ const tableHeaderAera = ref<any[]>([
{ prop: 'areaName', label: '区域名称', width: '120px' }, { prop: 'areaName', label: '区域名称', width: '120px' },
{ prop: 'monitoringPoints', label: '监测点数', sortable: true }, { prop: 'monitoringPoints', label: '监测点数', sortable: true },
@@ -104,10 +96,20 @@ const info = (list: any) => {
...list.monthlyStatistics.monthCalculation ...list.monthlyStatistics.monthCalculation
] ]
} }
const formatter = (row: any) => {
if (row.column.field == 'areaName') {
return (row.cellValue = row.cellValue.replace('\n', ''))
} else {
return row.cellValue
}
}
defineExpose({ info }) defineExpose({ info })
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
::v-deep(.el-tabs--left) { ::v-deep(.el-tabs--left) {
height: calc(100vh - 220px); height: calc(100vh - 220px);
} }
.default-main {
height: calc(100vh - 220px);
}
</style> </style>

104
src/views/voltage/sags/operationsManagement/statistics.vue
View File

@@ -120,48 +120,32 @@ const tableStore = new TableStore({
text: '区域' text: '区域'
}, },
xAxis: { xAxis: {
type: 'category',
data: tableStore.table.data.area.areaInfo.map( data: tableStore.table.data.area.areaInfo.map(
(item: any) => item.areaName + `(${item.numberOfTerminals})` (item: any) => item.areaName + `(${item.numberOfTerminals})`
) )
}, },
yAxis: { tooltip: {
type: 'value' formatter: function (params:any) {
}, var tips = ''
options: { tips += params[0].name + '</br/>'
tooltip: { for (var i = 0; i < params.length; i++) {
trigger: 'axis', if (params[i].value == 3.14159) {
axisPointer: { tips += params[i].seriesName + ':暂无数据<br/>'
type: 'shadow', } else {
label: { tips += params[i].seriesName + ':' + params[i].value + '%<br/>'
color: '#fff',
fontSize: 16
} }
},
textStyle: {
color: '#fff',
fontStyle: 'normal',
opacity: 0.35,
fontSize: 14
},
backgroundColor: 'rgba(0,0,0,0.35)',
formatter: function (params: any) {
var tips = ''
tips += params[0].name + '</br/>'
for (var i = 0; i < params.length; i++) {
if (params[i].value == 3.14159) {
tips += params[i].seriesName + ':暂无数据<br/>'
} else {
tips += params[i].seriesName + ':' + params[i].value + '%<br/>'
}
}
return tips
} }
}, return tips
}
},
yAxis: { name: '%' },
options: {
series: [ series: [
{ {
stack: 'one', stack: 'one',
name: '投运', name: '投运',
barMaxWidth: 30,
barMinHeight: 5,
data: tableStore.table.data.area.areaInfo.map((item: any) => item.normalRate), data: tableStore.table.data.area.areaInfo.map((item: any) => item.normalRate),
itemStyle: { itemStyle: {
normal: { normal: {
@@ -189,6 +173,8 @@ const tableStore = new TableStore({
{ {
name: '热备用', name: '热备用',
stack: 'one', stack: 'one',
barMaxWidth: 30,
barMinHeight: 5,
data: tableStore.table.data.area.areaInfo.map((item: any) => item.shutdownRate), data: tableStore.table.data.area.areaInfo.map((item: any) => item.shutdownRate),
type: 'bar', type: 'bar',
itemStyle: { itemStyle: {
@@ -216,6 +202,8 @@ const tableStore = new TableStore({
{ {
name: '在线率', name: '在线率',
stack: 'two', stack: 'two',
barMaxWidth: 30,
barMinHeight: 5,
data: tableStore.table.data.area.areaInfo.map((item: any) => item.onlineRate), data: tableStore.table.data.area.areaInfo.map((item: any) => item.onlineRate),
itemStyle: { itemStyle: {
normal: { normal: {
@@ -265,47 +253,33 @@ const tableStore = new TableStore({
text: '终端厂家' text: '终端厂家'
}, },
xAxis: { xAxis: {
type: 'category',
data: tableStore.table.data.factory.areaInfo.map( data: tableStore.table.data.factory.areaInfo.map(
(item: any) => item.areaName + `(${item.numberOfTerminals})` (item: any) => item.areaName + `(${item.numberOfTerminals})`
) )
}, },
yAxis: { yAxis: {
type: 'value' name: '%'
},
tooltip: {
formatter: function (params: any) {
var tips = ''
tips += params[0].name + '</br/>'
for (var i = 0; i < params.length; i++) {
if (params[i].value == 3.14159) {
tips += params[i].seriesName + ':暂无数据<br/>'
} else {
tips += params[i].seriesName + ':' + params[i].value + '%<br/>'
}
}
return tips
}
}, },
options: { options: {
tooltip: {
trigger: 'axis',
axisPointer: {
type: 'shadow',
label: {
color: '#fff',
fontSize: 16
}
},
textStyle: {
color: '#fff',
fontStyle: 'normal',
opacity: 0.35,
fontSize: 14
},
backgroundColor: 'rgba(0,0,0,0.35)',
formatter: function (params: any) {
var tips = ''
tips += params[0].name + '</br/>'
for (var i = 0; i < params.length; i++) {
if (params[i].value == 3.14159) {
tips += params[i].seriesName + ':暂无数据<br/>'
} else {
tips += params[i].seriesName + ':' + params[i].value + '%<br/>'
}
}
return tips
}
},
series: [ series: [
{ {
stack: 'one', stack: 'one',
barMaxWidth: 30,
barMinHeight: 5,
name: '投运', name: '投运',
data: tableStore.table.data.factory.areaInfo.map((item: any) => item.normalRate), data: tableStore.table.data.factory.areaInfo.map((item: any) => item.normalRate),
itemStyle: { itemStyle: {
@@ -334,6 +308,8 @@ const tableStore = new TableStore({
{ {
name: '热备用', name: '热备用',
stack: 'one', stack: 'one',
barMaxWidth: 30,
barMinHeight: 5,
data: tableStore.table.data.factory.areaInfo.map((item: any) => item.shutdownRate), data: tableStore.table.data.factory.areaInfo.map((item: any) => item.shutdownRate),
type: 'bar', type: 'bar',
itemStyle: { itemStyle: {
@@ -361,6 +337,8 @@ const tableStore = new TableStore({
{ {
name: '在线率', name: '在线率',
stack: 'two', stack: 'two',
barMaxWidth: 30,
barMinHeight: 5,
data: tableStore.table.data.factory.areaInfo.map((item: any) => item.onlineRate), data: tableStore.table.data.factory.areaInfo.map((item: any) => item.onlineRate),
itemStyle: { itemStyle: {
normal: { normal: {