修改 有用功率趋势分析页面

src/views/LN/newEnergy/highAndLowPressure/index.vue

@@ -111,6 +111,7 @@ defineOptions({
 const EchartMap = ref()
 const dictData = useDictData()
 const reason = dictData.getBasicData('Event_Reason')
+const triggerType = dictData.getBasicData('Event_Statis')
 const echartMapList: any = ref({})
 const header = ref()
 const distributionData: any = ref([])
@@ -294,11 +295,13 @@ const clickMap = (e: any) => {
 }
 // 表格数据处理
 const tabulation = (e: any) => {
+    console.log();
+    
     loading.value = true
     voltageRideThroughEventQueryPage({
         ...tableStore.table.params,
         areaId: e.data.id,
-        frequencyType: e.seriesName == '高压' ? 'Voltage_Rise' : 'Voltage_Dip'
+        frequencyType: e.seriesName == '高压' ? triggerType.filter(item => item.code == 'Voltage_Rise')[0].id : triggerType.filter(item => item.code == 'Voltage_Dip')[0].id
     })
         .then(res => {
             distributionData.value = res.data

src/views/LN/newEnergy/newEnergyAnalysis/components/detail.vue

@@ -1,6 +1,6 @@
 <template>
     <el-dialog v-model="dialogVisible" :title="title" width="1200" draggable>
-        <vxe-table v-bind="defaultAttribute" ref="vxeRef" height="500px" :data="tableData">
+        <vxe-table v-bind="defaultAttribute" ref="vxeRef" height="500px" :data="tableData" v-loading="loading">
             <vxe-colgroup field="anotherName" title="指标" width="180" />
             <!-- <vxe-colgroup field="unit" title="单位" /> -->
             <vxe-colgroup title="最小值">
@@ -240,11 +240,12 @@ import { getTargetByTime } from '@/api/harmonic-boot/pollution'
 const dialogVisible = ref(false)
 const title = ref('')
 const anotherName = ref('')
+const loading = ref(false)
 const tableData: any = ref([])
 const open = (row: any) => {
     title.value = row.title + ' - ' + row.row.time + ' - 越限详情'
     anotherName.value = row.title
-    console.log('🚀 ~ detailClick ~ row:', row)
+    loading.value = true
     getTargetByTime({
         field: row.field,
         lineId: row.lineId,
@@ -254,6 +255,7 @@ const open = (row: any) => {
         code: row.key == '2' ? '' : row.key == '3' ? '' : row.key == '4' ? '' : row.key //row.key
     }).then((res: any) => {
         tableData.value = res.data
+        loading.value = false
     })
     dialogVisible.value = true
 }

src/views/LN/newEnergy/newEnergyAnalysis/index.vue

@@ -393,7 +393,7 @@ const powerList2: any = ref([
     },
     {
         label: '90%~100%',
-        quantity: '20',
+        quantity: '0',
         percentage: '10%',
         crossTheLine: '越限',
         value: '90%~100%'