diff --git a/src/views/pqs/harmonicMonitoring/area/getIntegrityData/components/charts.vue b/src/views/pqs/harmonicMonitoring/area/getIntegrityData/components/charts.vue new file mode 100644 index 00000000..99a5a141 --- /dev/null +++ b/src/views/pqs/harmonicMonitoring/area/getIntegrityData/components/charts.vue @@ -0,0 +1,351 @@ + + + diff --git a/src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue b/src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue new file mode 100644 index 00000000..d88f6c69 --- /dev/null +++ b/src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue @@ -0,0 +1,363 @@ + + + diff --git a/src/views/pqs/harmonicMonitoring/area/harmonicDistortionRate/index.vue b/src/views/pqs/harmonicMonitoring/area/harmonicDistortionRate/index.vue index f0e98f3b..381f7ba5 100644 --- a/src/views/pqs/harmonicMonitoring/area/harmonicDistortionRate/index.vue +++ b/src/views/pqs/harmonicMonitoring/area/harmonicDistortionRate/index.vue @@ -141,7 +141,7 @@ const terminaloption = dictData.getBasicData('Dev_Manufacturers') //字典获取干扰源类型 const interfereoption = dictData.getBasicData('Interference_Source') //字典获取统计类型 -const classificationData = dictData.getBasicData('Statistical_Type') +const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type']) //调用区域接口获取区域 const treeData = ref([]) const idArr = ref([]) @@ -174,12 +174,11 @@ const defaultProps = ref({ emitPath: false, expandTrigger: 'click' as const }) -const chartsRef=ref() +const chartsRef = ref() const handleClick = (tab: any, e: any) => { // console.log(tab,e,"??????????"); // if(activeName.value===1){ tableStore.index() - chartsRef.value.getTableStoreParams(tableStore.table.params) // } } @@ -228,7 +227,7 @@ const tableStore = new TableStore({ formatter: function (row) { return row.cellValue == 3.14159 ? '暂无数据' : row.cellValue } - }, + } ], beforeSearchFun: () => { tableStore.table.params.deptIndex = formData.value.deptIndex @@ -250,6 +249,7 @@ const tableStore = new TableStore({ treeData = tree2List(tableStore.table.data) tableStore.table.column[0].title = formData.value.statisticalType.name tableStore.table.data = JSON.parse(JSON.stringify(treeData)) + chartsRef.value.getTableStoreParams(tableStore.table.params) setTimeout(() => { activeName.value == 0 && tableRef.value && tableRef.value.getRef().setAllTreeExpand(true) }, 0) diff --git a/src/views/pqs/harmonicMonitoring/area/harmonicdistortionrate.vue b/src/views/pqs/harmonicMonitoring/area/harmonicdistortionrate.vue deleted file mode 100644 index 963832af..00000000 --- a/src/views/pqs/harmonicMonitoring/area/harmonicdistortionrate.vue +++ /dev/null @@ -1,672 +0,0 @@ - - - diff --git a/src/views/pqs/harmonicMonitoring/area/integralitytable.vue b/src/views/pqs/harmonicMonitoring/area/integralitytable.vue deleted file mode 100644 index 8887530d..00000000 --- a/src/views/pqs/harmonicMonitoring/area/integralitytable.vue +++ /dev/null @@ -1,718 +0,0 @@ - - - diff --git a/src/views/pqs/harmonicMonitoring/area/onlinerate/index.vue b/src/views/pqs/harmonicMonitoring/area/onlinerate/index.vue index 672d460a..7657b340 100644 --- a/src/views/pqs/harmonicMonitoring/area/onlinerate/index.vue +++ b/src/views/pqs/harmonicMonitoring/area/onlinerate/index.vue @@ -177,7 +177,6 @@ const defaultProps = ref({ const handleClick = (tab: any, e: any) => { // if(activeName.value===1){ tableStore.index() - chartsRef.value.getTableStoreParams(tableStore.table.params) // } } @@ -289,9 +288,9 @@ const tableStore = new TableStore({ }, loadCallback: () => { let treeData = [] - treeData = tree2List(tableStore.table.data) tableStore.table.data = JSON.parse(JSON.stringify(treeData)) + chartsRef.value.getTableStoreParams(tableStore.table.params) setTimeout(() => { activeName.value == 0 && tableRef.value && tableRef.value.getRef().setAllTreeExpand(true) }, 0) diff --git a/src/views/pqs/harmonicMonitoring/area/powerassessment.vue b/src/views/pqs/harmonicMonitoring/area/powerassessment.vue deleted file mode 100644 index bec96e5c..00000000 --- a/src/views/pqs/harmonicMonitoring/area/powerassessment.vue +++ /dev/null @@ -1,414 +0,0 @@ - - - diff --git a/src/views/pqs/harmonicMonitoring/area/qualifiedRate.vue b/src/views/pqs/harmonicMonitoring/area/qualifiedRate.vue deleted file mode 100644 index 68b1fab5..00000000 --- a/src/views/pqs/harmonicMonitoring/area/qualifiedRate.vue +++ /dev/null @@ -1,620 +0,0 @@ - - - diff --git a/src/views/pqs/harmonicMonitoring/area/qypowerment.vue b/src/views/pqs/harmonicMonitoring/area/qypowerment.vue deleted file mode 100644 index 6fa34b76..00000000 --- a/src/views/pqs/harmonicMonitoring/area/qypowerment.vue +++ /dev/null @@ -1,884 +0,0 @@ - - - - - diff --git a/src/views/pqs/harmonicMonitoring/area/steadystate.vue b/src/views/pqs/harmonicMonitoring/area/steadystate.vue deleted file mode 100644 index 566e7b25..00000000 --- a/src/views/pqs/harmonicMonitoring/area/steadystate.vue +++ /dev/null @@ -1,671 +0,0 @@ - - - diff --git a/src/views/pqs/harmonicMonitoring/area/terminalonlinerate.vue b/src/views/pqs/harmonicMonitoring/area/terminalonlinerate.vue deleted file mode 100644 index cb84685a..00000000 --- a/src/views/pqs/harmonicMonitoring/area/terminalonlinerate.vue +++ /dev/null @@ -1,618 +0,0 @@ - - - diff --git a/src/views/pqs/harmonicMonitoring/area/terminalonlinerate/index.vue b/src/views/pqs/harmonicMonitoring/area/terminalonlinerate/index.vue index 8cb306f2..1e380144 100644 --- a/src/views/pqs/harmonicMonitoring/area/terminalonlinerate/index.vue +++ b/src/views/pqs/harmonicMonitoring/area/terminalonlinerate/index.vue @@ -244,7 +244,6 @@ const defaultProps = ref({ const handleClick = (tab: any, e: any) => { // if(activeName.value===1){ tableStore.index() - chartsRef.value.getTableStoreParams(tableStore.table.params) // } } @@ -337,7 +336,6 @@ const tableStore = new TableStore({ delete tableStore.table.params.endTime delete tableStore.table.params.pageNum delete tableStore.table.params.pageSize - // chartsRef.value.getTableStoreParams(tableStore.table.params) // tableStore.table.params.searchBeginTime = tableHeaderRef.value.datePickerRef.timeValue[0] // tableStore.table.params.searchEndTime = tableHeaderRef.value.datePickerRef.timeValue[1] }, @@ -346,6 +344,7 @@ const tableStore = new TableStore({ treeData = tree2List(tableStore.table.data) tableStore.table.column[0].title = formData.value.statisticalType.name tableStore.table.data = JSON.parse(JSON.stringify(treeData)) + chartsRef.value.getTableStoreParams(tableStore.table.params) setTimeout(() => { activeName.value == 0 && tableRef.value && tableRef.value.getRef().setAllTreeExpand(true) }, 0) diff --git a/src/views/pqs/harmonicMonitoring/area/transienteventlist.vue b/src/views/pqs/harmonicMonitoring/area/transienteventlist.vue deleted file mode 100644 index 052ec010..00000000 --- a/src/views/pqs/harmonicMonitoring/area/transienteventlist.vue +++ /dev/null @@ -1,1073 +0,0 @@ - - - -