From afc0e875d81ae1f3e469778f415b8f71fba22047 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Mon, 15 Jul 2024 14:49:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=89=BF=E8=BD=BD?=
=?UTF-8?q?=E8=83=BD=E5=8A=9B=E8=AF=84=E4=BC=B0=20=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E8=B0=90=E6=B3=A2=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/styles/vxeTable.scss | 5 ++-
.../components/photovoltaic.vue | 35 +++++++++++++++----
.../monitoringPoint/online/index.vue | 6 ++--
.../components1/form/detail.vue | 16 ++++++---
.../electricalEnergy/components1/online.vue | 5 ++-
.../interferenceUserTable.vue | 2 +-
.../components/jointDebugList/index.vue | 32 ++++++++---------
.../components/monitorpoint/addForm.vue | 2 +-
8 files changed, 69 insertions(+), 34 deletions(-)
diff --git a/src/styles/vxeTable.scss b/src/styles/vxeTable.scss
index add936a0..6a44cc17 100644
--- a/src/styles/vxeTable.scss
+++ b/src/styles/vxeTable.scss
@@ -63,4 +63,7 @@
// .vxe-table--render-default .is--disabled.vxe-cell--checkbox .vxe-checkbox--icon{
// color: #fff0;
-// }
\ No newline at end of file
+// }
+.vxe-table--tooltip-wrapper {
+ z-index: 10000 !important;
+ }
\ No newline at end of file
diff --git a/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue b/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue
index 9919a5e5..1ee9aad3 100644
--- a/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue
+++ b/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue
@@ -62,13 +62,27 @@
+
+
+
+
+
-
+
@@ -155,7 +169,7 @@ import { mainHeight } from '@/utils/layout'
import MyEChart from '@/components/echarts/MyEchart.vue'
import { useMonitoringPoint } from '@/stores/monitoringPoint'
import { defaultAttribute } from '@/components/table/defaultAttribute'
-
+import { harmonicOptions } from '@/utils/dictionary'
import { Select } from '@element-plus/icons-vue'
import { ElMessage } from 'element-plus'
import {
@@ -171,6 +185,7 @@ import {
} from '@/api/advance-boot/bearingCapacity'
import { useDictData } from '@/stores/dictData'
const props = defineProps(['rowList'])
+const harmonic = harmonicOptions.filter(item => item.value < 26)
const monitoringPoint = useMonitoringPoint()
const size = ref(20)
@@ -209,6 +224,7 @@ const tableData = ref([
level4: '/'
}
])
+const harmonicValue = ref(2)
const TreeRef = ref()
const voltageList: any = ref([])
const showAssess = ref(false)
@@ -269,7 +285,8 @@ const onSubmit = async () => {
endTime: props.rowList.endTime || datePickerRef.value.timeValue[1],
lineId: props.rowList.lineId || dotList.value.id,
startTime: props.rowList.startTime || datePickerRef.value.timeValue[0],
- userId: dictData.state.area[0].id
+ userId: dictData.state.area[0].id,
+ time: harmonicValue.value
}
options1.value = {}
options2.value = {}
@@ -357,21 +374,27 @@ const setEChart = (val: any, data: any, text: string, name: string) => {
type: 'line',
// smooth: true,
symbol: 'none',
- data: data.filter(item => item.phaseType == 'A').map(item => item.value.toFixed(3))
+ data: data
+ .filter(item => item.phaseType == 'A')
+ .map(item => (item.value == 3.1415926 ? '' : item.value.toFixed(3)))
},
{
name: 'B',
type: 'line',
// smooth: true,
symbol: 'none',
- data: data.filter(item => item.phaseType == 'B').map(item => item.value.toFixed(3))
+ data: data
+ .filter(item => item.phaseType == 'B')
+ .map(item => (item.value == 3.1415926 ? '' : item.value.toFixed(3)))
},
{
name: 'C',
type: 'line',
// smooth: true,
symbol: 'none',
- data: data.filter(item => item.phaseType == 'C').map(item => item.value.toFixed(3))
+ data: data
+ .filter(item => item.phaseType == 'C')
+ .map(item => (item.value == 3.1415926 ? '' : item.value.toFixed(3)))
}
]
}
diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue
index 7158bc97..9489438d 100644
--- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue
+++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue
@@ -17,9 +17,9 @@
-
+
@@ -75,7 +75,7 @@ const pointTree = ref()
const size = ref(0)
const isReload = ref(false)
const height = mainHeight(40)
-const activeName = ref('1')
+const activeName = ref('2')
onMounted(() => {
const dom = document.getElementById('navigation-splitpanes')
if (dom) {
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/form/detail.vue b/src/views/pqs/supervise/electricalEnergy/components1/form/detail.vue
index dbe224cc..ab7cd7fa 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/form/detail.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/form/detail.vue
@@ -1,8 +1,8 @@
-
+
-
-
+
+
@@ -19,10 +19,12 @@ const dictData = useDictData()
const dialogVisible = ref(false)
const title: any = ref('')
const List: any = ref([])
-
+const loading = ref(false)
const open = (row: any) => {
dialogVisible.value = true
title.value = row.text
+ loading.value = true
+ List.value = []
overLimitDetail({
lineId: row.row.lineId,
targetId: row.row.targetType,
@@ -30,6 +32,7 @@ const open = (row: any) => {
searchEndTime: row.list.searchEndTime
}).then(res => {
List.value = res.data
+ loading.value = false
})
}
@@ -39,4 +42,7 @@ const handleClose = () => {
defineExpose({ open })
-
+
+
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/online.vue b/src/views/pqs/supervise/electricalEnergy/components1/online.vue
index d5d6a57d..a3b1dc5d 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/online.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/online.vue
@@ -316,7 +316,9 @@ const tableStore = new TableStore({
})
tableStore.table.params.alertThreshold = 5
tableStore.table.params.alarmThreshold = 5
-tableStore.table.params.targetList = []
+tableStore.table.params.targetList = exceeded.filter(item => item.code == 'Total_Indicator')[0].id
+ ? [exceeded.filter(item => item.code == 'Total_Indicator')[0].id]
+ : []
tableStore.table.params.lineType = ''
tableStore.table.params.dataType = '1'
tableStore.table.params.deptId = dictData.state.area[0].id
@@ -325,6 +327,7 @@ provide('tableStore', tableStore)
onMounted(() => {
tableStore.index()
})
+
const changeAlert = e => {
if (e == null) {
tableStore.table.params.alertThreshold = 5
diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue
index 29bc2909..0d32d105 100644
--- a/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue
+++ b/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue
@@ -182,7 +182,7 @@ const tableStore = new TableStore({
// visible:!jb_pl.value && !jb_dky.value?true:false,
{
title: '操作',
- minWidth: 180,
+ minWidth: 300,
fixed: 'right',
render: 'buttons',
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
index 137ca1d8..6f9f1e82 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
@@ -129,22 +129,22 @@ const tableStore = new TableStore({
return !row.processInstanceId
}
},
- {
- name: 'edit',
- title: '编辑',
- type: 'primary',
- icon: 'el-icon-Open',
- render: 'basicButton',
- showDisabled: row => {
- return row.createBy != adminInfo.$state.id || !(row.status == 0)
- },
- disabled: row => {
- return !(row.status == 0)
- },
- click: row => {
- debugForms.value.open('编辑', row)
- }
- },
+ // {
+ // name: 'edit',
+ // title: '编辑',
+ // type: 'primary',
+ // icon: 'el-icon-Open',
+ // render: 'basicButton',
+ // showDisabled: row => {
+ // return row.createBy != adminInfo.$state.id || !(row.status == 0)
+ // },
+ // disabled: row => {
+ // return !(row.status == 0)
+ // },
+ // click: row => {
+ // debugForms.value.open('编辑', row)
+ // }
+ // },
{
name: 'productSetting',
title: '申请联调',
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue
index dbeaf878..16b37500 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue
@@ -299,7 +299,7 @@
/>
-
+