diff --git a/src/components/tree/pqs/pointTree.vue b/src/components/tree/pqs/pointTree.vue index 20b53d11..fd132082 100644 --- a/src/components/tree/pqs/pointTree.vue +++ b/src/components/tree/pqs/pointTree.vue @@ -88,8 +88,8 @@ const loadData = () => { item4.color = config.getColorVal('elementUiPrimary') item4.children.forEach((item5: anyObj) => { if (item5.level == 7) { - item5.icon = 'el-icon-DataAnalysis' - item5.color = config.getColorVal('elementUiPrimary') + item5.icon = 'el-icon-DataAnalysis' + item5.color = config.getColorVal('elementUiPrimary') item5.children.forEach((item6: anyObj) => { item6.alias = `${item.name}>${item2.name}>${item3.name}>${item4.name}>${item5.name}>${item6.name}` item6.pid = item4.id @@ -122,8 +122,14 @@ const loadData = () => { }) }) - nodeKey = res.data[0].children[0].children[0].children[0].children[0].id - emit('init', res.data[0].children[0].children[0].children[0].children[0]) + nodeKey = + res.data[0].children[0].children[0].children[0].children[0].children[0]?.id || + res.data[0].children[0].children[0].children[0].children[0]?.id + emit( + 'init', + res.data[0].children[0].children[0].children[0].children[0]?.children[0] || + res.data[0].children[0].children[0].children[0].children[0] + ) tree.value = res.data if (nodeKey) { diff --git a/src/views/LN/newEnergy/highAndLowPressure/index.vue b/src/views/LN/newEnergy/highAndLowPressure/index.vue index 2f64472e..bf7b0cb0 100644 --- a/src/views/LN/newEnergy/highAndLowPressure/index.vue +++ b/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 diff --git a/src/views/LN/newEnergy/newEnergyAnalysis/components/detail.vue b/src/views/LN/newEnergy/newEnergyAnalysis/components/detail.vue index a64c77f5..2a1977cb 100644 --- a/src/views/LN/newEnergy/newEnergyAnalysis/components/detail.vue +++ b/src/views/LN/newEnergy/newEnergyAnalysis/components/detail.vue @@ -1,6 +1,6 @@