冲突合并

2024-01-09 14:01:05 +08:00
parent 300d34c1bf 1fe43e1d70
commit fcbf724b95
7 changed files with 321 additions and 17 deletions
--- a/src/views/Event-boot/Region/components/Tableabove.vue
+++ b/src/views/Event-boot/Region/components/Tableabove.vue
--- a/src/views/Event-boot/Region/components/TypeStatistics.vue
+++ b/src/views/Event-boot/Region/components/TypeStatistics.vue
@@ -0,0 +1,144 @@
+<template>
+    <span style="color: red; font-size: 12px">注:暂降类型仅统计暂降原因为短路故障事件</span>
+
+    <div class="statistics-main">
+        <template v-if="flag">
+            <div>
+                <my-echart :options="descent" />
+            </div>
+            <div>
+                <vxe-table height="auto" auto-resize :data="descentData" v-bind="defaultAttribute">
+                    <vxe-column field="name" title="暂降原因"></vxe-column>
+                    <vxe-column field="value" title="暂降次数"></vxe-column>
+                </vxe-table>
+            </div>
+            <div>
+                <my-echart :options="resemble" />
+            </div>
+            <div>
+                <vxe-table height="auto" auto-resize :data="resembleData" v-bind="defaultAttribute">
+                    <vxe-column field="name" title="暂降原因"></vxe-column>
+                    <vxe-column field="value" title="暂降次数"></vxe-column>
+                </vxe-table>
+            </div>
+        </template>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, reactive } from 'vue'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import { mainHeight } from '@/utils/layout'
+const descent = ref({})
+const descentData = ref([])
+const resemble = ref({})
+const resembleData = ref([])
+const flag = ref(true)
+
+const info = (res: any) => {
+    flag.value = false
+    descentData.value = res.reason
+    resembleData.value = res.type
+
+    descent.value = {
+        title: {
+            text: '暂降原因'
+        },
+        legend: {
+            type: 'scroll',
+            orient: 'vertical',
+            left: 10,
+            top: '5%',
+            tooltip: {
+                show: true
+            }
+        },
+        xAxis: {
+            show: false
+        },
+        yAxis: {
+            show: false
+        },
+        dataZoom: { show: false },
+        tooltip: {
+            trigger: 'item',
+            formatter: '{a} <br/>{b} : {c} (次)'
+        },
+        options: {
+            series: [
+                {
+                    name: '暂降原因',
+                    type: 'pie',
+                    center: ['50%', '50%'],
+                    selectedOffset: 30,
+                    clockwise: true,
+                    label: {
+                        show: false,
+                        position: 'outside',
+                        textStyle: {
+                            //数值样式
+                        }
+                    },
+
+                    data: res.reason?.filter((item: any) => item.name != '总计')
+                }
+            ]
+        }
+    }
+    resemble.value = {
+        title: {
+            text: '暂降类型'
+        },
+        legend: {
+            type: 'scroll',
+            orient: 'vertical',
+            left: 10,
+            top: '5%'
+        },
+        tooltip: {
+            formatter: '{a} <br/>{b} : {c} (次)',
+            confine: true
+        },
+        xAxis: {
+            show: false
+        },
+        yAxis: {
+            show: false
+        },
+        dataZoom: { show: false },
+        options: {
+            series: [
+                {
+                    name: '暂降类型',
+                    type: 'pie',
+                    center: ['50%', '50%'],
+                    selectedOffset: 30,
+                    clockwise: true,
+                    label: {
+                        show: false,
+                        position: 'outside'
+                    },
+
+                    data: res.type?.filter((item: any) => item.name != '总计')
+                }
+            ]
+        }
+    }
+    flag.value = true
+}
+
+defineExpose({ info })
+const layout = mainHeight(170) as any
+</script>
+
+<style lang="scss" scoped>
+.statistics-main {
+    box-sizing: border-box;
+    height: v-bind('layout.height');
+    padding: 0 10px 10px;
+    display: grid;
+    grid-template-columns: 1fr 600px;
+    grid-template-rows: 1fr 1fr;
+    grid-gap: 10px;
+}
+</style>
--- a/src/views/Event-boot/Region/components/echart.vue
+++ b/src/views/Event-boot/Region/components/echart.vue
@@ -35,7 +35,6 @@ const Processing = (list: any) => {
        },
        tooltip: {
            formatter: function (params: any) {
-                // console.log(params);
                let html = '区域：' + params[0].name
                params.forEach((item: any) => {
                    if (item.value == 1.1) {
@@ -105,7 +104,6 @@ const Grade = (list: any) => {
        },
        tooltip: {
            formatter: function (params: any) {
-                // console.log(params);
                let html = '电压等级：' + params[0].name
                params.forEach((item: any) => {
                    if (item.value == 1.1) {
@@ -139,7 +137,6 @@ const Grade = (list: any) => {
                        normal: {
                            //这里是颜色
                            color: function (params: any) {
-                                // console.log(params,'1111111111111111111111');
                                if (params.data == 1.1) {
                                    return '#B3B3B3'
                                } else {
@@ -241,7 +238,6 @@ const Relation = (list: any, interval: number) => {
                                }
                            },
                            color: function (params: any) {
-                                // console.log(params,'1111111111111111111111');
                                if (params.data == 1.1) {
                                    return '#B3B3B3'
                                } else {
--- a/src/views/Event-boot/Region/overview.vue
+++ b/src/views/Event-boot/Region/overview.vue
@@ -0,0 +1,72 @@
+<template>
+    <div class="default-main">
+        <TableHeader date-picker>
+            <template v-slot:select>
+                <el-form-item label="区域">
+                    <Area v-model="tableStore.table.params.deptIndex" />
+                </el-form-item>
+            </template>
+        </TableHeader>
+        <el-tabs v-model="activeName" type="border-card" v-loading="tableStore.table.loading">
+            <el-tab-pane label="图形" name="1">
+                <Echart :list="list" ref="echarts" />
+            </el-tab-pane>
+            <el-tab-pane label="表格" name="2"><Tableabove ref="table" /></el-tab-pane>
+        </el-tabs>
+    </div>
+</template>
+
+<script setup lang="ts">
+import TableHeader from '@/components/table/header/index.vue'
+import Area from '@/components/form/area/index.vue'
+import { useDictData } from '@/stores/dictData'
+import Echart from './components/echart.vue'
+import Tableabove from './components/Tableabove.vue'
+import TableStore from '@/utils/tableStore'
+import { onMounted, reactive, ref, provide } from 'vue'
+import { mainHeight } from '@/utils/layout'
+defineOptions({
+    name: 'Region/overview'
+})
+const activeName = ref('1')
+const list = ref([])
+const echarts = ref()
+const Picker = ref()
+const table = ref()
+const dictData = useDictData()
+
+const tableStore = new TableStore({
+    url: '/event-boot/areaStatistics/getAreaCalculation',
+    method: 'POST',
+    column: [],
+    loadCallback: () => {
+        list.value = tableStore.table.data
+        echarts.value.Processing(tableStore.table.data.areaStatistics)
+        echarts.value.Grade(tableStore.table.data.voltageStatistics)
+        echarts.value.Relation(tableStore.table.data.monthlyStatistics)
+        table.value.info(tableStore.table.data)
+    }
+})
+provide('tableStore', tableStore)
+
+tableStore.table.params.deptIndex = dictData.state.area[0].id
+tableStore.table.params.statisticalType = dictData.getBasicData('Statistical_Type', ['Load_Type'])[3]
+tableStore.table.params.monitorFlag = 2
+tableStore.table.params.powerFlag = 2
+tableStore.table.params.serverName = 'event-boot'
+onMounted(() => {
+    tableStore.index()
+})
+const layout = mainHeight(123) as any
+</script>
+
+<style lang="scss" scoped>
+.bars_w {
+    width: 100%;
+    height: 500px;
+}
+::v-deep(.el-tabs__content) {
+    height: v-bind('layout.height');
+    overflow-y: auto;
+}
+</style>
--- a/src/views/Event-boot/Region/statistics.vue
+++ b/src/views/Event-boot/Region/statistics.vue
@@ -0,0 +1,76 @@
+<template>
+    <div class="default-main">
+        <TableHeader date-picker>
+            <template v-slot:select>
+                <el-form-item label="区域">
+                    <Area v-model="tableStore.table.params.deptIndex" />
+                </el-form-item>
+            </template>
+        </TableHeader>
+        <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick" v-loading="tableStore.table.loading">
+            <el-tab-pane label="暂降原因及类型统计" name="1">
+                <TypeStatistics ref="Statistics" />
+            </el-tab-pane>
+            <el-tab-pane label="电压容忍度曲线兼容性统计" name="2"></el-tab-pane>
+        </el-tabs>
+    </div>
+</template>
+
+<script setup lang="ts">
+import TableHeader from '@/components/table/header/index.vue'
+import Area from '@/components/form/area/index.vue'
+import { useDictData } from '@/stores/dictData'
+import TableStore from '@/utils/tableStore'
+import { onMounted, reactive, ref, provide } from 'vue'
+import TypeStatistics from './components/TypeStatistics.vue'
+import { mainHeight } from '@/utils/layout'
+defineOptions({
+    name: 'Region/overview'
+})
+const activeName = ref('1')
+const Statistics = ref()
+const flag = ref(true)
+const dictData = useDictData()
+
+const tableStore = new TableStore({
+    url: '/event-boot/areaAnalysis/getEventReason',
+    method: 'POST',
+    column: [],
+    loadCallback: () => {
+        if (activeName.value == '1') {
+            Statistics.value.info(tableStore.table.data)
+        } else {
+        }
+    }
+})
+provide('tableStore', tableStore)
+
+tableStore.table.params.deptIndex = dictData.state.area[0].id
+tableStore.table.params.statisticalType = dictData.getBasicData('Statistical_Type', ['Load_Type'])[3]
+tableStore.table.params.monitorFlag = 2
+tableStore.table.params.powerFlag = 2
+tableStore.table.params.serverName = 'event-boot'
+onMounted(() => {
+    tableStore.index()
+})
+const handleClick = async () => {
+    if (activeName.value == '1') {
+        tableStore.url = '/event-boot/areaAnalysis/getEventReason'
+    } else {
+        tableStore.url = '/event-boot/areaAnalysis/getVoltageToleranceCurve'
+    }
+    await tableStore.onTableAction('search', {})
+}
+const layout = mainHeight(123) as any
+</script>
+
+<style lang="scss" scoped>
+.bars_w {
+    width: 100%;
+    height: 500px;
+}
+::v-deep(.el-tabs__content) {
+    height: v-bind('layout.height');
+    overflow-y: auto;
+}
+</style>