修改南工程问题

2024-12-13 14:37:41 +08:00
parent 155cff879c
commit ce34572df5
7 changed files with 56 additions and 14 deletions
--- a/src/utils/dictionary.ts
+++ b/src/utils/dictionary.ts
@@ -236,7 +236,44 @@ export const inharmonicOptions = [
    { label: '12.5次', value: 13 },
    { label: '13.5次', value: 14 },
    { label: '14.5次', value: 15 },
-    { label: '15.5次', value: 16 }
+    { label: '15.5次', value: 16 },
+    { label: '16.5次', value: 17 },
+    { label: '17.5次', value: 18 },
+    { label: '18.5次', value: 19 },
+    { label: '19.5次', value: 20 },
+    { label: '20.5次', value: 21 },
+    { label: '21.5次', value: 22 },
+    { label: '22.5次', value: 23 },
+    { label: '23.5次', value: 24 },
+    { label: '24.5次', value: 25 },
+    { label: '25.5次', value: 26 },
+    { label: '26.5次', value: 27 },
+    { label: '27.5次', value: 28 },
+    { label: '28.5次', value: 29 },
+    { label: '29.5次', value: 30 },
+    { label: '30.5次', value: 31 },
+    { label: '31.5次', value: 32 },
+    { label: '32.5次', value: 33 },
+    { label: '33.5次', value: 34 }, 
+    { label: '34.5次', value: 35 },
+    { label: '35.5次', value: 36 },
+    { label: '36.5次', value: 37 },
+    { label: '37.5次', value: 38 }, 
+    { label: '38.5次', value: 39 }, 
+    { label: '39.5次', value: 40 },
+    { label: '40.5次', value: 41 },
+    { label: '41.5次', value: 42 },
+    { label: '42.5次', value: 43 },
+    { label: '43.5次', value: 44 },
+    { label: '44.5次', value: 45 },
+    { label: '45.5次', value: 46 },
+    { label: '46.5次', value: 47 },
+    { label: '47.5次', value: 48 },
+    { label: '48.5次', value: 49 },
+    { label: '49.5次', value: 50 }, 
+
+
+
 ]

 //值类型
--- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/gaojingshujutongji/index.vue
+++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/gaojingshujutongji/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <div style="display: flex; flex-direction: column; height: 100%; position: relative" v-loading="loading">
+    <div style="display: flex; flex-direction: column; height: 100%; position: relative" >
        <el-form :inline="true">
            <el-form-item label="多监测点">
                <el-checkbox v-model="checked" @change="checkChange" />
@@ -51,7 +51,7 @@
                <el-button type="primary" @click="init" icon="el-icon-Search">查询</el-button>
            </el-form-item>
        </el-form>
-        <div style="flex: 1; overflow: hidden" class="mt10">
+        <div style="flex: 1; overflow: hidden" class="mt10" v-loading="loading">
            <vxe-table height="auto" v-bind="defaultAttribute" :data="tableData">
                <vxe-column field="subName" title="变电站" min-width="120px"></vxe-column>
                <vxe-column field="lineName" title="监测点名称" min-width="120px"></vxe-column>
--- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue
+++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue
@@ -38,8 +38,8 @@
                <el-button type="primary" @click="init" icon="el-icon-Search">查询</el-button>
            </el-form-item>
        </el-form>
-        <div style="flex: 1; overflow-y: scroll" class="mt10">
-            <my-echart :options="item.option" v-for="item in list" style="height: 400px" />
+        <div style="flex: 1; overflow-y: scroll" class="mt10" v-loading="loading">
+            <my-echart :options="item.option" v-for="item in list" :style="height" />
        </div>
    </div>
 </template>
@@ -51,7 +51,7 @@ import MyEchart from '@/components/echarts/MyEchart.vue'
 import { useMonitoringPoint } from '@/stores/monitoringPoint'
 import { indexOptions, harmonicOptions, inharmonicOptions } from '@/utils/dictionary'
 import { getHistoryResult } from '@/api/harmonic-boot/harmonic'
-
+import { mainHeight } from '@/utils/layout'
 const datePickerRef = ref()
 const monitoringPoint = useMonitoringPoint()
 const checked = ref(monitoringPoint.state.showCheckBox)
@@ -75,6 +75,7 @@ const formData = reactive<{
    inHarmonic: 1,
    ptType: 0
 })
+const height: any = ref(mainHeight(200, 1))
 const options = ref({})
 const traceability = ref<any>([])
 const list = ref<any>([])
@@ -118,7 +119,8 @@ const init = () => {
        }
        list.value = []
        shujuchuli(res)
-    })
+        loading.value = false
+    }).catch(() => { loading.value = false })
 }
 const shujuchuli = (res: any) => {
    let shujuData = res.data
@@ -1091,6 +1093,8 @@ const shujuchuli = (res: any) => {
    rendering()
 }
 const rendering = () => {
+    height.value = mainHeight(200, list.value.length > 1 ? 2 : 1)
+
    list.value.forEach((item: any) => {
        let opitonserise: any[] = []
        item.legend.forEach((item2: any) => {
--- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaizhibiaohegelv/index.vue
+++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaizhibiaohegelv/index.vue
@@ -14,7 +14,7 @@
                <el-button type="primary" @click="init" icon="el-icon-Search">查询</el-button>
            </el-form-item>
        </el-form>
-        <div style="flex: 1" class="mt10">
+        <div style="flex: 1" class="mt10" v-loading="loading">
            <my-echart :options="options" />
        </div>
    </div>
--- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/xiebopingpu/index.vue
+++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/xiebopingpu/index.vue
@@ -23,7 +23,7 @@
                width="80px"
            ></vxe-column>
        </vxe-table>
-        <div style="flex: 1" class="mt10">
+        <div style="flex: 1" class="mt10"  v-loading="loading">
            <my-echart :options="options" />
        </div>
    </div>
@@ -90,6 +90,7 @@ const init = () => {
            yAxis: {
                type: 'value'
            },
+            color: ['#2E8B57', '#DAA520'],
            series: analysisData.value.map((item: any) => {
                return {
                    name: item.name,
@@ -98,7 +99,7 @@ const init = () => {
                }
            }),
            options: {
-                dataZoom: null
+                // dataZoom: null
            }
        }
        nextTick(() => {
--- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/yunxingzhuangtai/index.vue
+++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/yunxingzhuangtai/index.vue
@@ -18,7 +18,7 @@
                <el-button type="primary" @click="init" icon="el-icon-Search">查询</el-button>
            </el-form-item>
        </el-form>
-        <div style="flex: 1; display: flex; overflow: hidden" class="mt10">
+        <div style="flex: 1; display: flex; overflow: hidden" class="mt10" v-loading="loading">
            <div style="flex: 1">
                <my-echart :options="options1" />
            </div>
@@ -84,7 +84,8 @@ const init = () => {
    Promise.all([getComFlagInfoData(formData), getRunInfoData(formData)]).then((res: any) => {
        handlerOptions1(res[0].data)
        handlerOptions2(res[1].data)
-    })
+        loading.value = false
+    }).catch(() => { loading.value = false })
 }
 const handlerOptions1 = (data: any) => {
    options1.value = {
--- a/src/views/pqs/voltageSags/monitoringPoint/online/aaa.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/online/aaa.vue
@@ -2,8 +2,7 @@
    <div>
        <baidu-map class="map" @ready="initMap" :center="{ lng: 116.403765, lat: 39.914850 }" :zoom="10"
            :scroll-wheel-zoom='true'>
-            <BmBoundary name="北京市" :strokeWeight="12" strokeColor="blue" fillColor="blue" uid="110000"
-                @mouseover="mouseover"></BmBoundary>
+            <bm-boundary name="北京市海淀区" :strokeWeight="2" strokeColor="blue"></bm-boundary>
            <!-- <bm-polygon :path="polygonPath" stroke-color="blue" :stroke-opacity="0.5" :stroke-weight="2" :editing="true"
                @lineupdate="updatePolygonPath" /> -->