diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index e6896de3..a60eb79c 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -38,6 +38,7 @@ const tableStore = new TableStore({
echarts.value.Grade(tableStore.table.data.voltageStatistics)
echarts.value.Relation(tableStore.table.data.monthlyStatistics)
table.value.info(tableStore.table.data)
+ console.log(tableStore.table.data)
}
})
provide('tableStore', tableStore)
diff --git a/src/views/pqs/business/terminal/transformerStrategy/components/addLedger.vue b/src/views/pqs/business/terminal/transformerStrategy/components/addLedger.vue
index 9dce607b..206b0ce4 100644
--- a/src/views/pqs/business/terminal/transformerStrategy/components/addLedger.vue
+++ b/src/views/pqs/business/terminal/transformerStrategy/components/addLedger.vue
@@ -604,56 +604,74 @@ const maintenanceData = reactive({
//上节点选择
const checkLeft = (checkedNodes: any, checkedKeys: any) => {
maintenanceData.upNode = checkedNodes.id
- if (maintenanceData.upNode === maintenanceData.downNode) {
- menuTreeRight.value?.setCheckedKeys([])
- maintenanceData.downNode = ''
- }
- if (checkedKeys.checkedKeys.length > 1) {
- menuTreeLeft.value?.setCheckedKeys([checkedNodes.id])
- }
+ if (maintenanceData.upNode === maintenanceData.downNode) {
+ menuTreeRight.value?.setCheckedKeys([])
+ maintenanceData.downNode = ''
+ }
+ if (checkedKeys.checkedKeys.length > 1) {
+ menuTreeLeft.value?.setCheckedKeys([checkedNodes.id])
+ }
}
//下节点选择
const checkRight = (checkedNodes: any, checkedKeys: any) => {
maintenanceData.downNode = checkedNodes.id
- if (maintenanceData.downNode === maintenanceData.upNode) {
- menuTreeLeft.value?.setCheckedKeys([])
- maintenanceData.upNode = ''
- }
- if (checkedKeys.checkedKeys.length > 1) {
- menuTreeRight.value?.setCheckedKeys([checkedNodes.id])
- }
+
+ if (maintenanceData.downNode === maintenanceData.upNode) {
+ menuTreeLeft.value?.setCheckedKeys([])
+ maintenanceData.upNode = ''
+ }
+ if (checkedKeys.checkedKeys.length > 1) {
+ menuTreeRight.value?.setCheckedKeys([checkedNodes.id])
+ }
}
//节点维护提交
const maintenanceOnsubmit = () => {
- for (let i = 0; i < bind.value.length; i++) {
- if (bind.value[i][0] == maintenanceData.upNode) {
- for (let j = 0; j < bind.value.length; j++) {
- if (bind.value[j][1] == maintenanceData.downNode) {
- ElMessage({
- type: 'warning',
- message: '上下节点无法选择相同母线！！！'
- })
- return
- }
- }
- return
- }
+
+ if(maintenanceData.downNode == '' || maintenanceData.upNode == '') {
+ ElMessage({
+ type: 'warning',
+ message: '请确保上下节点各自选择一个母线！'
+ })
+ return
}
- if (bindLevel.value != 5) {
- for (let i = 0; i < bind.value.length; i++) {
- if (maintenanceData.upNode == bind.value[i][1] && maintenanceData.downNode == bind.value[i][0]) {
- ElMessage({
- type: 'warning',
- message: '上下节点无法选择相同母线！！！'
- })
- return
- }
- }
- }
+ if (maintenanceData.upNode == maintenanceData.downNode) {
+ ElMessage({
+ type: 'warning',
+ message: '上下节点无法选择相同母线！'
+ })
+ }
+ // for (let i = 0; i < bind.value.length; i++) {
+ // if (bind.value[i] == maintenanceData.upNode) {
+ // for (let j = 0; j < bind.value.length; j++) {
+
+ // if (bind.value[j] == maintenanceData.downNode) {
+ // ElMessage({
+ // type: 'warning',
+ // message: '上下节点无法选择相同母线！！！'
+ // })
+ // return
+ // }
+ // }
+ // return
+ // }
+ // }
+
+ // if (bindLevel.value != 5) {
+ // for (let i = 0; i < bind.value.length; i++) {
+ // if (maintenanceData.upNode == bind.value[i] && maintenanceData.downNode == bind.value[i]) {
+ // ElMessage({
+ // type: 'warning',
+ // message: '上下节点无法选择相同母线！！！'
+ // })
+ // return
+ // }
+ // }
+ // }
+
nodeMaintenance(maintenanceData).then((res: any) => {
if (res.code == 'A0000') {
ElMessage({
diff --git a/src/views/pqs/business/terminal/transformerStrategy/index.vue b/src/views/pqs/business/terminal/transformerStrategy/index.vue
index 97500683..82877820 100644
--- a/src/views/pqs/business/terminal/transformerStrategy/index.vue
+++ b/src/views/pqs/business/terminal/transformerStrategy/index.vue
@@ -58,7 +58,7 @@
-
+
取消
diff --git a/src/views/pqs/voltageSags/Region/components/Tableabove.vue b/src/views/pqs/voltageSags/Region/components/Tableabove.vue
index 88b881aa..85d84590 100644
--- a/src/views/pqs/voltageSags/Region/components/Tableabove.vue
+++ b/src/views/pqs/voltageSags/Region/components/Tableabove.vue
@@ -69,6 +69,7 @@ const tableHeaderLevel = ref([
const frequency = ref(875)
const info = (list: any, searchBeginTime: any, searchEndTime: any,selectedAreaName: string) => {
+
Time.value = [searchBeginTime, searchEndTime]
frequency.value = list.areaStatistics.frequencySum
areaName.value = selectedAreaName // 更新区域名称
@@ -91,7 +92,7 @@ const info = (list: any, searchBeginTime: any, searchEndTime: any,selectedAreaNa
},
...list.voltageStatistics.voltageLevelCalculation
]
-
+
let all = 0
diff --git a/src/views/pqs/voltageSags/Region/components/echart.vue b/src/views/pqs/voltageSags/Region/components/echart.vue
index 0f1b9fdd..f273af90 100644
--- a/src/views/pqs/voltageSags/Region/components/echart.vue
+++ b/src/views/pqs/voltageSags/Region/components/echart.vue
@@ -91,6 +91,7 @@ const Grade = (list: any) => {
list.voltageLevelCalculation.forEach((item: any) => {
echartsndArr.push(item.voltageLevel)
if (item.frequency == 0) {
+
item.frequency = 1.1
} else if (item.frequency == 1) {
item.frequency = 1.3
diff --git a/src/views/pqs/voltageSags/Region/overview/index.vue b/src/views/pqs/voltageSags/Region/overview/index.vue
index df94d138..855627dc 100644
--- a/src/views/pqs/voltageSags/Region/overview/index.vue
+++ b/src/views/pqs/voltageSags/Region/overview/index.vue
@@ -39,6 +39,7 @@ const tableStore = new TableStore({
tableStore.table.params.searchEndTime,
currentAreaName.value // 传递当前区域名称
)
+ console.log('11111',tableStore.table.data)
echarts.value.Processing(tableStore.table.data.areaStatistics)
echarts.value.Grade(tableStore.table.data.voltageStatistics)
echarts.value.Relation(JSON.parse(JSON.stringify(tableStore.table.data.monthlyStatistics)))