diff --git a/src/components/tree/pqs/Terminal.vue b/src/components/tree/pqs/Terminal.vue index b4f5a96d..768615ba 100644 --- a/src/components/tree/pqs/Terminal.vue +++ b/src/components/tree/pqs/Terminal.vue @@ -1,5 +1,5 @@ + diff --git a/src/views/LN/newEnergy/newEnergyAnalysis/components/detail.vue b/src/views/LN/newEnergy/newEnergyAnalysis/components/detail.vue index ff308d0b..c574597d 100644 --- a/src/views/LN/newEnergy/newEnergyAnalysis/components/detail.vue +++ b/src/views/LN/newEnergy/newEnergyAnalysis/components/detail.vue @@ -1,14 +1,102 @@ @@ -17,8 +105,11 @@ import { ref, reactive } from 'vue' import { defaultAttribute } from '@/components/table/defaultAttribute' const dialogVisible = ref(false) -const tableData = ref([]) -const open = () => { +const title = ref('') +const tableData: any = ref([]) +const open = (row: any) => { + title.value = row.title + ' - ' + row.row.time + ' - 越限详情' + tableData.value = row.row[row.key] dialogVisible.value = true } defineExpose({ open }) diff --git a/src/views/LN/newEnergy/newEnergyAnalysis/components/timePopUpBox.vue b/src/views/LN/newEnergy/newEnergyAnalysis/components/timePopUpBox.vue index f3a46c34..e6bb8de6 100644 --- a/src/views/LN/newEnergy/newEnergyAnalysis/components/timePopUpBox.vue +++ b/src/views/LN/newEnergy/newEnergyAnalysis/components/timePopUpBox.vue @@ -50,6 +50,7 @@ const tableStore = new TableStore({ { title: '指标', field: 'anotherName', + minWidth: '120px', formatter: row => { row.column.title = radio2.value == '1' ? '指标' : (row.column.title = radio2.value == '4' ? '间谐波次数' : '谐波次数') diff --git a/src/views/LN/newEnergy/newEnergyAnalysis/index.vue b/src/views/LN/newEnergy/newEnergyAnalysis/index.vue index 9bab8ac5..59402b86 100644 --- a/src/views/LN/newEnergy/newEnergyAnalysis/index.vue +++ b/src/views/LN/newEnergy/newEnergyAnalysis/index.vue @@ -45,7 +45,7 @@ - +
{{ row.voltageOffset == '1' ? '越限' : '合格' }} @@ -111,7 +111,7 @@ {{ row.vtimes == '1' ? '越限' : '合格' }} @@ -122,7 +122,7 @@ {{ row.itimes == '1' ? '越限' : '合格' }} @@ -133,7 +133,7 @@ {{ row.ubalance == '1' ? '越限' : '合格' }} @@ -144,7 +144,7 @@ {{ row.voltageFluctuation == '1' ? '越限' : '合格' }} @@ -155,7 +155,7 @@ {{ row.flicker == '1' ? '越限' : '合格' }} @@ -166,7 +166,7 @@ {{ row.interHarmonic == '1' ? '越限' : '合格' }} @@ -177,7 +177,7 @@ {{ row.sequenceCurrentUnbalance == '1' ? '越限' : '合格' }} @@ -697,8 +697,13 @@ const timeClick = (row: any) => { timePopUpBox.value = data } // 点击越限 -const detailClick = (row: any) => { - detailRef.value.open() +const detailClick = (row: any, title: string, key: string) => { + console.log('🚀 ~ detailClick ~ row:', row) + detailRef.value.open({ + row: row, + title: title, + key: key + }) } // // 获取有功功率趋势分析数据 // const analyse = (e: any) => { diff --git a/src/views/LN/newEnergy/newEnergyLedger/components/addForm.vue b/src/views/LN/newEnergy/newEnergyLedger/components/addForm.vue index 9a7ab717..ba057b71 100644 --- a/src/views/LN/newEnergy/newEnergyLedger/components/addForm.vue +++ b/src/views/LN/newEnergy/newEnergyLedger/components/addForm.vue @@ -17,7 +17,7 @@ - + diff --git a/src/views/LN/newEnergy/newEnergyLedger/index.vue b/src/views/LN/newEnergy/newEnergyLedger/index.vue index e7b1d79b..313e2004 100644 --- a/src/views/LN/newEnergy/newEnergyLedger/index.vue +++ b/src/views/LN/newEnergy/newEnergyLedger/index.vue @@ -61,7 +61,7 @@ const tableStore = new TableStore({ formatter: (row: any) => scaleList.filter(item => item.id == row.cellValue)[0]?.name }, - { field: 'ratedPower', title: '额定有功功率(kV)' }, + { field: 'ratedPower', title: '额定有功功率(kW)' }, { field: 'longitude', title: '经度' }, { field: 'latitude', title: '纬度' }, { diff --git a/src/views/pqs/business/terminal/deviceter/index.vue b/src/views/pqs/business/terminal/deviceter/index.vue index aab14f8d..749b45d8 100644 --- a/src/views/pqs/business/terminal/deviceter/index.vue +++ b/src/views/pqs/business/terminal/deviceter/index.vue @@ -1,1338 +1,1415 @@ @@ -1436,6 +1519,8 @@ defineOptions({ name: 'device-boot/deviceter' }) +import 'splitpanes/dist/splitpanes.css' +import { Splitpanes, Pane } from 'splitpanes' import { LocationInformation } from '@element-plus/icons-vue' import Terminal from '@/components/tree/pqs/Terminal.vue' import { mainHeight } from '@/utils/layout' @@ -1449,9 +1534,9 @@ import { selectDown } from '@/api/device-boot/Business' import { useDictData } from '@/stores/dictData' -import { ref, reactive } from 'vue' +import { ref, reactive, onMounted } from 'vue' import { ElMessage, ElMessageBox } from 'element-plus' - +const size = ref(0) const TerminalRef = ref() const pageHeight = mainHeight(20) const Height = mainHeight(100) @@ -2717,13 +2802,19 @@ const area = () => { deviceBODetail.value.updateTime = year + '-' + month + '-' + day deviceBODetail.value.nextTimeCheck = year + 1 + '-' + month + '-' + (day - 1 > 10 ? day - 1 : '0' + (day - 1)) } +onMounted(() => { + const dom = document.getElementById('navigation-splitpanes') + if (dom) { + size.value = Math.round((180 / dom.offsetHeight) * 100) + } +}) area() - diff --git a/src/views/pqs/database/algorithm/index.vue b/src/views/pqs/database/algorithm/index.vue index e72d15d1..6b9d3f2e 100644 --- a/src/views/pqs/database/algorithm/index.vue +++ b/src/views/pqs/database/algorithm/index.vue @@ -1,6 +1,6 @@