-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -103,7 +72,7 @@ import { cslineList, fittingData } from '@/api/harmonic-boot/cockpit/cockpit'
import { queryByCode, queryCsDictTree } from '@/api/system-boot/dictTree'
import { ElMessage } from 'element-plus'
import { getTime } from '@/utils/formatTime'
-
+import PointTree from '@/components/tree/govern/pointTree.vue'
const prop = defineProps({
w: { type: [String, Number] },
h: { type: [String, Number] },
@@ -111,7 +80,8 @@ const prop = defineProps({
height: { type: [String, Number] },
timeKey: { type: Array as () => string[] },
timeValue: { type: Object },
- interval: { type: Number }
+ interval: { type: Number },
+ flag: { type: Boolean }
})
const TableHeaderRef = ref()
@@ -128,6 +98,8 @@ const lineShow = ref(true)
const fullscreen = computed(() => {
const w = Number(prop.w)
const h = Number(prop.h)
+
+
if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
// 执行相应逻辑
return true
@@ -148,18 +120,29 @@ const exceedingTheLimitList: any = ref([
const indicatorList = ref()
-const initLineList = async () => {
- cslineList({}).then(res => {
- setTime()
- if (res.data.length == 0) {
- lineShow.value = false
- return (tableStore.table.loading = false)
- }
- lineShow.value = true
- lineList.value = res.data
- tableStore.table.params.lineId = lineList.value[0].lineId
+// const initLineList = async () => {
+// cslineList({}).then(res => {
+// setTime()
+// if (res.data.length == 0) {
+// lineShow.value = false
+// return (tableStore.table.loading = false)
+// }
+// lineShow.value = true
+// lineList.value = res.data
+// tableStore.table.params.lineId = lineList.value[0].lineId
+// initCode()
+// })
+// }
+const nodeClick = (e: any) => {
+ if (e == undefined) {
+ }
+ if (e.level == 3) {
+ tableStore.table.params.lineId = e.id
initCode()
- })
+ }
+}
+const pointTypeChange = (val: any, obj: any) => {
+ nodeClick(obj)
}
const echartList = ref()
@@ -222,19 +205,19 @@ const setEchart = () => {
{},
indicatorName
? {
- min: 0,
- max: 1,
- axisLabel: {
- formatter: function (value: number) {
- if (value === 0) {
- return '不越限'
- } else if (value === 1) {
- return '越限'
- }
- return value
- }
- }
- }
+ min: 0,
+ max: 1,
+ axisLabel: {
+ formatter: function (value: number) {
+ if (value === 0) {
+ return '不越限'
+ } else if (value === 1) {
+ return '越限'
+ }
+ return value
+ }
+ }
+ }
: {}
],
grid: {
@@ -451,7 +434,7 @@ watch(
)
onMounted(async () => {
- await initLineList()
+ // await initCode()
})
watch(
@@ -493,4 +476,11 @@ watch(
// :deep(.el-select) {
// min-width: 80px;
// }
+.device-control {
+ display: flex;
+}
+
+:deep(.cn-tree) {
+ padding: 0 10px 0 0 !important;
+}
diff --git a/src/components/cockpit/monitoringPointList/index.vue b/src/components/cockpit/monitoringPointList/index.vue
index 8edfe4e..f1ce70c 100644
--- a/src/components/cockpit/monitoringPointList/index.vue
+++ b/src/components/cockpit/monitoringPointList/index.vue
@@ -187,6 +187,14 @@ const tableStore: any = new TableStore({
null: '/'
}
},
+ {
+ title: '电压等级(kV)',
+ field: 'volGrade',
+ minWidth: '80',
+ formatter: (row: any) => {
+ return row.cellValue == 0 ? '/' : row.cellValue || '/'
+ }
+ },
{
title: '治理对象',
field: 'sensitiveUser',
@@ -196,14 +204,7 @@ const tableStore: any = new TableStore({
}
},
- {
- title: '电压等级',
- field: 'volGrade',
- minWidth: '80',
- formatter: (row: any) => {
- return row.cellValue == 0 ? '/' : row.cellValue + 'kV' || '/'
- }
- },
+
{
title: '是否治理',
field: 'govern',
@@ -242,7 +243,7 @@ const tableStore: any = new TableStore({
{
title: '报告',
field: 'reportFilePath',
- minWidth: '120',
+ minWidth: '150',
formatter: (row: any) => {
return row.cellValue == null ? '/' : row.cellValue.split('/').pop()
}
@@ -373,7 +374,9 @@ const forceDownloadPdf = async (pdfUrl:any, fileName = '文件.pdf') => {
// 4. 清理资源（避免内存泄漏）
document.body.removeChild(a)
URL.revokeObjectURL(blobUrl)
+ setTimeout(() => {
ElMessage.success('下载成功')
+ }, 2000)
} catch (error) {
console.error('下载失败：', error)
// ElMessage.error('文件下载失败，请检查网络或文件地址') // 适配 Element Plus
diff --git a/src/components/cockpit/transientDetails/index.vue b/src/components/cockpit/transientDetails/index.vue
index 457f546..cb272f9 100644
--- a/src/components/cockpit/transientDetails/index.vue
+++ b/src/components/cockpit/transientDetails/index.vue
@@ -131,7 +131,7 @@ const tableStore: any = new TableStore({
},
loadCallback: () => {
- value.value = tableStore.table.params.searchBeginTime
+ value.value = dayjs(tableStore.table.params.searchBeginTime).toDate()
list.value = tableStore.table.data
}
})
diff --git a/src/components/echarts/rmsWorker.js b/src/components/echarts/rmsWorker.js
index a176c1f..35878f5 100644
--- a/src/components/echarts/rmsWorker.js
+++ b/src/components/echarts/rmsWorker.js
@@ -259,7 +259,7 @@ self.onmessage = function (e) {
' 发生时刻:' +
boxoList.startTime +
' 暂降幅值:' +
- (boxoList.featureAmplitude * 100).toFixed(2) +
+ Math.floor(boxoList.featureAmplitude * 10000) / 100 +
'% 持续时间:' +
boxoList.duration +
's'
@@ -283,7 +283,7 @@ self.onmessage = function (e) {
' 发生时刻:' +
boxoList.startTime +
' 暂降幅值:' +
- (boxoList.featureAmplitude * 100).toFixed(2) +
+ Math.floor(boxoList.featureAmplitude * 10000) / 100 +
'% 持续时间:' +
boxoList.persistTime +
's'
@@ -296,7 +296,7 @@ self.onmessage = function (e) {
' 发生时刻:' +
boxoList.startTime +
' 暂降幅值:' +
- (boxoList.featureAmplitude * 100).toFixed(2) +
+ Math.floor(boxoList.featureAmplitude * 10000) / 100 +
'% 持续时间:' +
boxoList.duration +
's'
diff --git a/src/components/echarts/shuWorker.js b/src/components/echarts/shuWorker.js
index c3f5b24..6cfd266 100644
--- a/src/components/echarts/shuWorker.js
+++ b/src/components/echarts/shuWorker.js
@@ -132,7 +132,7 @@ self.addEventListener('message', function (e) {
' 发生时刻:' +
boxoList.startTime +
' 暂降幅值:' +
- (boxoList.featureAmplitude * 100).toFixed(2) +
+ Math.floor(boxoList.featureAmplitude * 10000) / 100 +
'% 持续时间:' +
boxoList.duration +
's'
@@ -149,6 +149,7 @@ self.addEventListener('message', function (e) {
boxoList.evtParamTm +
's'
} else if (boxoList.systemType == 'YPT') {
+ console.log("🚀 ~ boxoList.featureAmplitude:", boxoList.featureAmplitude)
titles =
(boxoList.engineeringName == undefined ? '' : ' 项目名称:' + boxoList.engineeringName) +
' 监测点名称:' +
@@ -156,7 +157,7 @@ self.addEventListener('message', function (e) {
' 发生时刻:' +
boxoList.startTime +
' 暂降幅值:' +
- (boxoList.featureAmplitude * 100).toFixed(2) +
+ Math.floor(boxoList.featureAmplitude * 10000) / 100 +
'% 持续时间:' +
boxoList.persistTime +
's'
@@ -169,7 +170,7 @@ self.addEventListener('message', function (e) {
' 发生时刻:' +
boxoList.startTime +
' 暂降幅值:' +
- (boxoList.featureAmplitude * 100).toFixed(2) +
+ Math.floor(boxoList.featureAmplitude * 10000) / 100 +
'% 持续时间:' +
boxoList.duration +
's'
diff --git a/src/components/form/datePicker/index.vue b/src/components/form/datePicker/index.vue
index af7df8a..2662115 100644
--- a/src/components/form/datePicker/index.vue
+++ b/src/components/form/datePicker/index.vue
@@ -1,25 +1,12 @@
>()
@@ -82,16 +86,21 @@ const tableStore = new TableStore({
{ title: '暂降幅值(%)', minWidth: 120, field: 'evtParamVVaDepth', align: 'center', sortable: true, },
{ title: '持续时间(s)', field: 'evtParamTm', minWidth: 110, align: 'center', sortable: true },
+ {
+ title: '严重度', field: 'severity', minWidth: 80, align: 'center', sortable: true, formatter: (row: any) => {
+ return row.cellValue ? row.cellValue : '/'
+ }
+ },
{ title: '相别', field: 'evtParamPhase', minWidth: 80, align: 'center' },
- { title: '触发类型', field: 'showName', minWidth: 120, align: 'center' },
+ { title: '触发类型', field: 'showName', minWidth: 100, align: 'center' },
{
title: '暂降原因', field: 'advanceReason', minWidth: 100, align: 'center', formatter: (row: any) => {
- return ReasonList.find((item: any) => item.value == row.cellValue)?.label || '未知'
+ return ReasonList.find((item: any) => item.id == row.cellValue)?.name || '未知'
}
},
{
title: '暂降类型', field: 'advanceType', minWidth: 100, align: 'center', formatter: (row: any) => {
- return EventTypeList.find((item: any) => item.value == row.cellValue)?.label || '未知'
+ return EventTypeList.find((item: any) => item.id == row.cellValue)?.name || '未知'
}
},
@@ -104,11 +113,11 @@ const tableStore = new TableStore({
{ title: '工程名称', field: 'engineeringName', minWidth: 130, align: 'center' },
{
title: '发生位置', field: 'sagSource', minWidth: 120, align: 'center', formatter: (row: any) => {
-
return row.cellValue == 1 ? '上游' : row.cellValue == 2 ? '下游' : '未知'
}
},
+
{
title: '操作',
fixed: 'right',
@@ -209,30 +218,53 @@ const tableStore = new TableStore({
},
{
name: 'edit',
- text: '暂无波形',
+ text: '暂不支持补召',
type: 'info',
icon: 'el-icon-DataLine',
render: 'basicButton',
+ disabled: row => {
+ let code = DeviceType.value.filter((item: any) => item.id == row.devType)[0]?.code
+ return !(code == 'Direct_Connected_Device' || code == 'Gateway')
+ },
+
+ },
+ {
+ name: 'edit',
+ text: '波形补召',
+ type: 'primary',
+ icon: 'el-icon-DataLine',
+ render: 'basicButton',
+ loading: 'loading2',
disabled: row => {
return row.wavePath
+ },
+ click: row => {
+ let code = DeviceType.value.filter((item: any) => item.id == row.devType)[0]?.code
+
+ if (code == 'Portable') {
+ // 便携式设备
+ analysisListRef.value &&
+ analysisListRef.value.open({
+ lineId: row.lineId,
+ deviceData: row,
+ deviceId: row.deviceId
+ })
+
+ } else if (code == 'DEV_CLD') {
+ row.loading2 = true
+ // 监测设备
+ getFileByEventId(row.id).then(res => {
+ ElMessage.success(res.message)
+ tableStore.index()
+ row.loading2 = false
+ }).catch(() => {
+ row.loading2 = false
+ })
+ }
+
}
},
- // {
- // name: 'edit',
- // title: '波形补召',
- // type: 'primary',
- // icon: 'el-icon-Check',
- // render: 'basicButton',
- // disabled: row => {
- // return row.wavePath || row.showName === '未知'
- // },
- // click: row => {
- // getFileByEventId(row.id).then(res => {
- // ElMessage.success(res.message)
- // tableStore.index()
- // })
- // }
- // }
+
]
}
],
@@ -257,21 +289,24 @@ provide('tableStore', tableStore)
// "type": "",
// "userId": ""
tableStore.table.params.searchValue = ''
-tableStore.table.params.engineeringid = ''
-tableStore.table.params.projectId = ''
-tableStore.table.params.deviceTypeId = ''
-tableStore.table.params.deviceId = ''
+// tableStore.table.params.engineeringid = ''
+// tableStore.table.params.projectId = ''
+// tableStore.table.params.deviceTypeId = ''
+// tableStore.table.params.deviceId = ''
tableStore.table.params.type = 0
-tableStore.table.params.eventIds = []
-tableStore.table.params.status = ''
-tableStore.table.params.target = []
-tableStore.table.params.userId = ''
-tableStore.table.params.cascader = ''
-tableStore.table.params.deviceTypeName = ''
+// tableStore.table.params.eventIds = []
+// tableStore.table.params.status = ''
+// tableStore.table.params.target = []
+// tableStore.table.params.userId = ''
+// tableStore.table.params.cascader = ''
+// tableStore.table.params.deviceTypeName = ''
Object.assign(tableStore.table.params, {
- featureAmplitude: '',
- evtParamTm: '',
- showName: '',
+ featureAmplitudeMin: undefined,
+ featureAmplitudeMax: undefined,
+ evtParamTmMin: undefined,
+ evtParamTmMax: undefined,
+ severityMin: undefined,
+ severityMax: undefined,
fileFlag: ''
})
// tableStore.table.params.level=''
@@ -345,6 +380,11 @@ const onResetForm = () => {
}
onMounted(() => {
+ queryByCode('Device_Type').then(res => {
+ queryCsDictTree(res.data.id).then((list: any) => {
+ DeviceType.value = list.data
+ })
+ })
tableStore.index()
})
const bxecharts = mainHeight(175).height as any
diff --git a/src/views/govern/alarm/multiCondition.vue b/src/views/govern/alarm/multiCondition.vue
index 29a9e9a..1a361c6 100644
--- a/src/views/govern/alarm/multiCondition.vue
+++ b/src/views/govern/alarm/multiCondition.vue
@@ -1,37 +1,42 @@
-
+
-
+
+
+
-
+
-
+
@@ -46,13 +51,16 @@
+
+
-
-
+ :icon="Back" @click="handleReturn" >
返回
@@ -225,7 +225,7 @@
">
- {{ getHarmonicTypeName() }}谐波次数
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ getHarmonicTypeName() }}谐波次数
+
+
+
+
+
-
+
- 当前
@@ -95,7 +82,12 @@ const shortcuts = [
// 计算过滤后的 timeOptions
const filteredTimeOptions = computed(() => {
- console.log("🚀 ~ props.timeKeyList :", props.timeKeyList )
+
+ // console.log("🚀 ~ props.timeKeyList:", props.timeKeyList)
+ if (props.timeKeyList.length > 0 && !props.timeKeyList.includes(interval.value.toString())) {
+ interval.value = Number(props.timeKeyList[0])
+
+ }
if (!props.timeKeyList || props.timeKeyList.length === 0) {
return timeOptions.value
}
@@ -182,10 +174,10 @@ const timeChange = (e: number) => {
timeFlag.value = 1
}
- nextTick(() => {
+ nextTick(() => {
// 检查按钮状态
- checkInitialButtonStatus()
- })
+ checkInitialButtonStatus()
+ })
// 触发 change 事件
emitChange()
diff --git a/src/components/tree/govern/lineTreeUtils.ts b/src/components/tree/govern/lineTreeUtils.ts
index c6f3558..f82a2bc 100644
--- a/src/components/tree/govern/lineTreeUtils.ts
+++ b/src/components/tree/govern/lineTreeUtils.ts
@@ -12,7 +12,7 @@ export interface LineTreeDecorators {
statusColor: (comFlag: number) => string
applyMeta: (
node: any,
- meta: { icon: string; color?: string; level?: number; disabled?: boolean }
+ meta: { icon: string; color?: string; level?: number; disabled?: boolean; pname?: string }
) => void
}
@@ -88,8 +88,10 @@ export function decorateLineTree(
applyMeta(leaf, {
icon: 'local-监测点',
color: statusColor(leaf.comFlag),
+
...LINE_LEAF_META
})
+ leaf.pname=item.name,
leaves.engineering.push(leaf)
})
})
@@ -113,8 +115,10 @@ export function decorateLineTree(
applyMeta(l4, {
icon: 'local-监测点',
color: statusColor(l4.comFlag),
+
...LINE_LEAF_META
})
+ l4.pname=item.name,
leaves.govern.push(l4)
})
})
@@ -127,8 +131,10 @@ export function decorateLineTree(
applyMeta(l2, {
icon: 'local-监测点',
color: statusColor(l2.comFlag),
+
...LINE_LEAF_META
})
+ l2.pname=item.name,
leaves.portable.push(l2)
})
})
@@ -148,8 +154,10 @@ export function decorateLineTree(
applyMeta(l4, {
icon: 'local-监测点',
color: statusColor(l4.comFlag),
+
...LINE_LEAF_META
})
+ l4.pname=item.name,
leaves.monitor.push(l4)
})
})
diff --git a/src/components/tree/govern/pointTree.vue b/src/components/tree/govern/pointTree.vue
index fd013d9..bc6fcb6 100644
--- a/src/components/tree/govern/pointTree.vue
+++ b/src/components/tree/govern/pointTree.vue
@@ -6,6 +6,7 @@
default-expand-all
@changePointType="changePointType"
@changeTreeType="loadTree"
+ :height="height"
/>
@@ -25,10 +26,12 @@ import {
interface Props {
template?: boolean
+ height?: number
}
const props = withDefaults(defineProps(), {
- template: false
+ template: false,
+ height: 0
})
defineOptions({
diff --git a/src/components/tree/point.vue b/src/components/tree/point.vue
index 0d9126d..cc806a5 100644
--- a/src/components/tree/point.vue
+++ b/src/components/tree/point.vue
@@ -181,13 +181,15 @@ interface Props {
canExpand?: boolean
type?: string
data?: any[]
+ height?: number
}
const props = withDefaults(defineProps(), {
width: '100%',
canExpand: true,
type: '',
- data: () => []
+ data: () => [],
+ height: 0
})
const route = useRoute()
@@ -212,11 +214,11 @@ const zlDevList = ref([])
const bxsDeviceData = ref([])
const yqfDeviceData = ref([])
-const governTreeHeight = computed(() => 'calc(100vh - 380px)')
+const governTreeHeight = computed(() => `calc(100vh - 380px - ${props.height}px)`)
const otherTreeHeight = computed(() =>
- zlDeviceData.value.length ? 'calc(100vh - 340px)' : 'calc(100vh - 238px)'
+ zlDeviceData.value.length ? `calc(100vh - 340px - ${props.height}px)` : `calc(100vh - 238px - ${props.height}px)`
)
-const engineeringTreeHeight = computed(() => 'calc(100vh - 188px)')
+const engineeringTreeHeight = computed(() => `calc(100vh - 188px - ${props.height}px)`)
const treeRef1 = ref>()
const treeRef2 = ref>()
diff --git a/src/styles/element.scss b/src/styles/element.scss
index 2ba726e..541b6d7 100644
--- a/src/styles/element.scss
+++ b/src/styles/element.scss
@@ -1,3 +1,4 @@
+
/* 修复 Chrome 浏览器输入框内选中字符行高异常的bug-s */
.el-input .el-input__inner {
height: 30px;
diff --git a/src/styles/var.scss b/src/styles/var.scss
index 80c9476..b2aee05 100644
--- a/src/styles/var.scss
+++ b/src/styles/var.scss
@@ -1,36 +1,38 @@
-@use 'sass:map';
-@use 'mixins' as *;
-
-// 后台主体窗口左右间距
-$main-space: 10px;
-$primary-light: #3f6ad8;
-
-// --ba-background
-$bg-color: () !default;
-$bg-color: map.merge(
- (
- '': #edf0f3,
- 'overlay': #ffffff,
- ),
- $bg-color
-);
-
-// --ba-border-color
-$border-color: () !default;
-$border-color: map.merge(
- (
- '': #f6f6f6,
- ),
- $border-color
-);
-
-:root {
- @include set-css-var-value('main-space', $main-space);
- @include set-css-var-value('color-primary-light', $primary-light);
- @include set-component-css-var('bg-color', $bg-color);
- @include set-component-css-var('border-color', $border-color);
-// --vxe-table-row-current-background-color: var(--el-color-primary-light-7);
-// --vxe-table-row-hover-background-color: var(--el-color-primary-light-9);
-// --vxe-table-row-hover-current-background-color: var(--el-color-primary-light-7);
-// --vxe-table-row-hover-striped-background-color: var(--el-color-primary-light-9);
-}
+@use 'sass:map';
+@use 'mixins' as *;
+
+// 后台主体窗口左右间距
+$main-space: 10px;
+$primary-light: #3f6ad8;
+
+// --ba-background
+$bg-color: () !default;
+$bg-color: map.merge(
+ (
+ '': #edf0f3,
+ 'overlay': #ffffff
+ ),
+ $bg-color
+);
+
+// --ba-border-color
+$border-color: () !default;
+$border-color: map.merge(
+ (
+ '': #f6f6f6
+ ),
+ $border-color
+);
+
+:root {
+ @include set-css-var-value('main-space', $main-space);
+ @include set-css-var-value('color-primary-light', $primary-light);
+ @include set-component-css-var('bg-color', $bg-color);
+ @include set-component-css-var('border-color', $border-color);
+ --el-color-danger: #e26257;
+ --el-color-success: #2ab914;
+ // --vxe-table-row-current-background-color: var(--el-color-primary-light-7);
+ // --vxe-table-row-hover-background-color: var(--el-color-primary-light-9);
+ // --vxe-table-row-hover-current-background-color: var(--el-color-primary-light-7);
+ // --vxe-table-row-hover-striped-background-color: var(--el-color-primary-light-9);
+}
diff --git a/src/utils/downloadFile.ts b/src/utils/downloadFile.ts
index 7cf25b4..2a757b6 100644
--- a/src/utils/downloadFile.ts
+++ b/src/utils/downloadFile.ts
@@ -10,7 +10,9 @@ export const downLoadFile = (name: string, key: string, res: any) => {
document.body.appendChild(link)
link.click() //执行下载
document.body.removeChild(link)
- ElMessage.success('下载成功')
+ setTimeout(() => {
+ ElMessage.success('下载成功')
+ }, 2000)
}
const getFileType = (url: string) => {
diff --git a/src/views/auth/menu/popupApi.vue b/src/views/auth/menu/popupApi.vue
index 8f06342..787fc7d 100644
--- a/src/views/auth/menu/popupApi.vue
+++ b/src/views/auth/menu/popupApi.vue
@@ -22,7 +22,7 @@
/>
-
diff --git a/src/views/auth/menu/popupMenu.vue b/src/views/auth/menu/popupMenu.vue
index 1f1eb9a..37bca8f 100644
--- a/src/views/auth/menu/popupMenu.vue
+++ b/src/views/auth/menu/popupMenu.vue
@@ -18,10 +18,10 @@
-
- -->
@@ -193,18 +193,18 @@ provide('tableStore', tableStore)
// "type": "",
// "userId": ""
tableStore.table.params.searchValue = ''
-tableStore.table.params.cascader = ''
-tableStore.table.params.level = ''
-tableStore.table.params.engineeringid = ''
-tableStore.table.params.projectId = ''
-tableStore.table.params.deviceId = ''
+// tableStore.table.params.cascader = ''
+// tableStore.table.params.level = ''
+// tableStore.table.params.engineeringid = ''
+// tableStore.table.params.projectId = ''
+// tableStore.table.params.deviceId = ''
tableStore.table.params.type = 3
-tableStore.table.params.eventIds = []
-tableStore.table.params.status = ''
-tableStore.table.params.target = []
-tableStore.table.params.userId = ''
-tableStore.table.params.deviceTypeId = ''
-tableStore.table.params.deviceTypeName = ''
+// tableStore.table.params.eventIds = []
+// tableStore.table.params.status = ''
+// tableStore.table.params.target = []
+// tableStore.table.params.userId = ''
+// tableStore.table.params.deviceTypeId = ''
+// tableStore.table.params.deviceTypeName = ''
const deviceTreeOptions = ref(props.deviceTree)
deviceTreeOptions.value.map((item: any, index: any) => {
if (item?.children.length == 0) {
diff --git a/src/views/govern/alarm/Front.vue b/src/views/govern/alarm/Front.vue
index 745482c..df9d2cd 100644
--- a/src/views/govern/alarm/Front.vue
+++ b/src/views/govern/alarm/Front.vue
@@ -6,7 +6,7 @@
v-model.trim="tableStore.table.params.searchValue"
- placeholder="请输入前置服务器名称，ip"
+ placeholder="请输入前置服务器名称、ip"
/>
diff --git a/src/views/govern/alarm/Steady.vue b/src/views/govern/alarm/Steady.vue
index 43d1a15..993c850 100644
--- a/src/views/govern/alarm/Steady.vue
+++ b/src/views/govern/alarm/Steady.vue
@@ -8,7 +8,7 @@
-->
-
- 多条件筛选
+ v-model.trim="tableStore.table.params.searchValue" clearable placeholder="请输入监测点名称" />
+
+
+
+ 事件筛选
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/govern/cloudDeviceEntry/index.vue b/src/views/govern/cloudDeviceEntry/index.vue
index c2d0c24..e74c8d4 100644
--- a/src/views/govern/cloudDeviceEntry/index.vue
+++ b/src/views/govern/cloudDeviceEntry/index.vue
@@ -144,7 +144,7 @@
+ }" v-if="dataSet.includes('_realtimedata') && sonTab != 2 && !realTimeFlag"> +
数据时间：{{ trendDataTime || '-' }}
- 最新数据时标：{{ tableData[0]?.time || '-' }}
+ 最新数据时标：{{ latestTime || '-' }}
+ v-if="dataSet.indexOf('_realtimedata') != -1" v-loading="tableLoading">
-
{
try {
return JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message))))
@@ -536,7 +535,7 @@ const handleTrend = async () => {
await getHarmRealData(lineId.value, activeTrendName.value)
.then((res: any) => {
if (res.code == 'A0000') {
- trendDataTime.value = ''
+ // trendDataTime.value = ''
// ElMessage.success('设备应答成功')
//每隔30s调用一下接口，通知后台推送mqtt消息
trendTimer.value = window.setInterval(() => {
@@ -625,14 +624,14 @@ const handleReturn = async () => {
const handleSearch = () => {
let queryListName = queryList.value.filter((item: any) => item.id == formInline.targetType)
let list = tableData.value.filter((item: any) => {
- if (item.otherName.includes(searchValue.value)) {
+ if (item.name.includes(searchValue.value)) {
return item
}
})
if (oddAndEvenFlag.value) {
list = list.filter((item: any) => {
- let str = item.otherName.split('次')[0]
- queryListName[0].name == '间谐波电压含有率' ? (str = str - 0.5) : ''
+ let str = item.name.split('次')[0]
+
if (oddAndEven.value == '1') {
// 奇次
@@ -689,9 +688,16 @@ const dataLevel: any = ref('')
const dataSource = ref([])
const engineeringName = ref('')
const nodeClick = async (e: anyObj, node?: any) => {
+ console.log("🚀 ~ nodeClick ~ node:", e)
if (e == undefined) {
return (loading.value = false)
}
+ if(e.pname?.includes('便携')){
+ deviceType.value = '1'
+ }else{
+ deviceType.value = '2'
+ }
+
searchValue.value = ''
deviceId.value = e?.pid
@@ -788,7 +794,7 @@ const nodeClick = async (e: anyObj, node?: any) => {
//治理设备和便携式设备切换判断
const deviceType = ref('0')
const pointTypeChange = (val: any, obj: any) => {
- deviceType.value = val
+
nodeClick(obj)
}
const realTimeRef: any = ref()
@@ -1234,21 +1240,23 @@ const handleClick = async (tab?: any) => {
//查询当前指标
if (!dataSet.value.includes('_')) {
formInline.id = dataSet.value
+ latestTime.value=''
+ tableData.value=[]
// await deviceRtData(formInline)
await realTimeData(formInline)
.then((res: any) => {
- tableData.value = res.data
+ tableData.value = res.data[0].children
+ latestTime.value=res.data[0].dataTime
formInline.total = res.data.total
let queryListName = queryList.value.filter((item: any) => item.id == formInline.targetType)
let list = tableData.value.filter((item: any) => {
- if (item.otherName.includes(searchValue.value)) {
+ if (item.name.includes(searchValue.value)) {
return item
}
})
if (oddAndEvenFlag.value) {
list = list.filter((item: any) => {
- let str = item.otherName.split('次')[0]
- queryListName[0].name == '间谐波电压含有率' ? (str = str - 0.5) : ''
+ let str = item.name.split('次')[0]
if (oddAndEven.value == '1') {
// 奇次
@@ -1276,6 +1284,7 @@ const handleClick = async (tab?: any) => {
}, 1500)
})
.catch(e => {
+ loading.value = false
setTimeout(() => {
tableLoading.value = false
}, 1500)
@@ -1340,10 +1349,12 @@ queryByCode('Device_Type').then(res => {
})
})
const handleTargetTypeChange = () => {
- if (queryList.value.filter((item: any) => item.id == formInline.targetType)[0].name != '基本数据') {
- oddAndEvenFlag.value = true
+ const targetItem = queryList.value.filter((item: any) => item.id == formInline.targetType)[0];
+
+ if (targetItem?.name !== '基本数据' && !targetItem?.name?.includes('间谐波')) {
+ oddAndEvenFlag.value = true;
} else {
- oddAndEvenFlag.value = false
+ oddAndEvenFlag.value = false;
}
}
const queryList: any = ref([])
diff --git a/src/views/govern/device/control/nearRealTimeData.vue b/src/views/govern/device/control/nearRealTimeData.vue
index e514c08..3a1f7e5 100644
--- a/src/views/govern/device/control/nearRealTimeData.vue
+++ b/src/views/govern/device/control/nearRealTimeData.vue
@@ -1,17 +1,18 @@
+
-
slotsPerRow: number
emptySlotCount: number
}
+interface RawMetricItem {
+ targetId?: string
+ name?: string
+ unit?: string | null
+ phase?: string
+ sort?: number
+ data?: unknown
+ otherName?: string
+ valueA?: unknown
+ valueB?: unknown
+ valueC?: unknown
+ valueM?: unknown
+}
+
+const PHASE_GROUPS = [
+ { keys: ['A', 'B', 'C'], labels: ['A相', 'B相', 'C相'] as [string, string, string] },
+ { keys: ['AB', 'BC', 'CA'], labels: ['AB', 'BC', 'CA'] as [string, string, string] },
+]
+
const height = mainHeight(345)
const tableSections = ref([])
@@ -64,10 +94,103 @@ const formatCellValue = (value: unknown): string | number => {
const cellFormatter = ({ cellValue }: { cellValue: unknown }) => formatCellValue(cellValue)
-const hasAbcValues = (item: any) =>
+const buildOtherName = (name: string, unit?: string | null) => (unit ? `${name}(${unit})` : name)
+
+const isNewFormat = (item: RawMetricItem) => item.targetId != null && item.phase != null && 'data' in item
+
+const hasAbcValues = (item: DisplayMetric | RawMetricItem) =>
item.valueA != null || item.valueB != null || item.valueC != null
-const buildRow = (abcItems: any[], scalarItems: any[]) => {
+const normalizeOldItem = (item: RawMetricItem): DisplayMetric => ({
+ otherName: item.otherName || buildOtherName(item.name || ''),
+ valueA: item.valueA,
+ valueB: item.valueB,
+ valueC: item.valueC,
+ valueM: item.valueM,
+ phaseLabels: ['A相', 'B相', 'C相'],
+ sort: item.sort ?? 0,
+})
+
+const getHarmonicOrder = (name: string) => {
+ const match = name.match(/^(\d+(?:\.\d+)?)次/)
+ return match ? parseFloat(match[1]) : null
+}
+
+const getGroupKey = (item: RawMetricItem) => `${item.targetId}_${item.name}`
+
+const groupNewFormatData = (list: RawMetricItem[]): DisplayMetric[] => {
+ const groupMap = new Map }>()
+
+ list.forEach(item => {
+ const key = getGroupKey(item)
+ if (!groupMap.has(key)) {
+ groupMap.set(key, {
+ name: item.name || '',
+ unit: item.unit ?? null,
+ sort: item.sort ?? 0,
+ phases: {},
+ })
+ }
+ if (item.phase != null) {
+ groupMap.get(key)!.phases[item.phase] = item.data
+ }
+ })
+
+ return Array.from(groupMap.values())
+ .sort((a, b) => {
+ if (a.sort !== b.sort) return a.sort - b.sort
+ const orderA = getHarmonicOrder(a.name)
+ const orderB = getHarmonicOrder(b.name)
+ if (orderA != null && orderB != null) return orderA - orderB
+ return a.name.localeCompare(b.name, 'zh-CN')
+ })
+ .map(group => {
+ const otherName = buildOtherName(group.name, group.unit)
+ const phaseKeys = Object.keys(group.phases)
+
+ if (phaseKeys.length === 1 && phaseKeys[0] === 'T') {
+ return {
+ otherName,
+ valueM: group.phases.T,
+ phaseLabels: ['A相', 'B相', 'C相'],
+ sort: group.sort,
+ }
+ }
+
+ for (const { keys, labels } of PHASE_GROUPS) {
+ if (keys.some(key => group.phases[key] != null)) {
+ return {
+ otherName,
+ valueA: group.phases[keys[0]],
+ valueB: group.phases[keys[1]],
+ valueC: group.phases[keys[2]],
+ phaseLabels: labels,
+ sort: group.sort,
+ }
+ }
+ }
+
+ return {
+ otherName,
+ valueM: phaseKeys.length === 1 ? group.phases[phaseKeys[0]] : undefined,
+ valueA: group.phases.A ?? group.phases.AB,
+ valueB: group.phases.B ?? group.phases.BC,
+ valueC: group.phases.C ?? group.phases.CA,
+ phaseLabels: group.phases.AB != null ? ['AB', 'BC', 'CA'] : ['A相', 'B相', 'C相'],
+ sort: group.sort,
+ }
+ })
+}
+
+const normalizeMetrics = (data: RawMetricItem[]): DisplayMetric[] => {
+ if (!data?.length) return []
+ if (isNewFormat(data[0])) {
+ return groupNewFormatData(data)
+ }
+ return data.map(normalizeOldItem).sort((a, b) => a.sort - b.sort)
+}
+
+const buildRow = (abcItems: DisplayMetric[], scalarItems: DisplayMetric[]) => {
const row: Record = {}
abcItems.forEach((item, index) => {
row[`v${index}A`] = item.valueA
@@ -80,10 +203,10 @@ const buildRow = (abcItems: any[], scalarItems: any[]) => {
return row
}
-const buildTableSections = (abcList: any[], scalarList: any[]) => {
+const buildTableSections = (abcList: DisplayMetric[], scalarList: DisplayMetric[]) => {
const unified: MetricItem[] = [
- ...abcList.map((data) => ({ type: 'abc' as const, data })),
- ...scalarList.map((data) => ({ type: 'scalar' as const, data })),
+ ...abcList.map(data => ({ type: 'abc' as const, data })),
+ ...scalarList.map(data => ({ type: 'scalar' as const, data })),
]
const sections: TableSection[] = []
@@ -95,8 +218,8 @@ const buildTableSections = (abcList: any[], scalarList: any[]) => {
const chunk = unified.slice(index, index + maxCount)
index += chunk.length
- const abcItems = chunk.filter((item) => item.type === 'abc').map((item) => item.data)
- const scalarItems = chunk.filter((item) => item.type === 'scalar').map((item) => item.data)
+ const abcItems = chunk.filter(item => item.type === 'abc').map(item => item.data)
+ const scalarItems = chunk.filter(item => item.type === 'scalar').map(item => item.data)
const slotsPerRow = abcItems.length > 0 ? ROW_WITH_ABC : ROW_SCALAR_ONLY
const metricCount = abcItems.length + scalarItems.length
sections.push({
@@ -111,18 +234,11 @@ const buildTableSections = (abcList: any[], scalarList: any[]) => {
return sections
}
-const setData = (data: any, _targetType: any) => {
- const list = JSON.parse(JSON.stringify(data))
- const abcList: any[] = []
- const scalarList: any[] = []
-
- list.forEach((item: any) => {
- if (hasAbcValues(item)) {
- abcList.push(item)
- } else {
- scalarList.push(item)
- }
- })
+const setData = (data: RawMetricItem[], _targetType?: unknown) => {
+ const list = JSON.parse(JSON.stringify(data || [])) as RawMetricItem[]
+ const metrics = normalizeMetrics(list)
+ const abcList = metrics.filter(item => hasAbcValues(item))
+ const scalarList = metrics.filter(item => !hasAbcValues(item))
tableSections.value = buildTableSections(abcList, scalarList)
}
diff --git a/src/views/govern/device/control/supplementaryRecruitment/currentDevice.vue b/src/views/govern/device/control/supplementaryRecruitment/currentDevice.vue
index 0fab0d1..2c6b0fa 100644
--- a/src/views/govern/device/control/supplementaryRecruitment/currentDevice.vue
+++ b/src/views/govern/device/control/supplementaryRecruitment/currentDevice.vue
@@ -99,6 +99,8 @@ const getMakeUpDataList = (row: any) => {
})
dirList.value = res.data
loading.value = false
+ }).catch(() => {
+ loading.value = false
})
}
// 进入文件夹
diff --git a/src/views/govern/device/control/tabs/components/harmonicSpectrum.vue b/src/views/govern/device/control/tabs/components/harmonicSpectrum.vue
index a765dfd..cf87e03 100644
--- a/src/views/govern/device/control/tabs/components/harmonicSpectrum.vue
+++ b/src/views/govern/device/control/tabs/components/harmonicSpectrum.vue
@@ -4,8 +4,8 @@
-
+
@@ -145,6 +145,31 @@ const loading = ref(false)
const allDataList: any = ref([])
const xAixsTimeList: any = ref([])
+const formatChartValueText = (val: unknown, digits = 2) => {
+ if (val == null || val === '') return '-'
+ const num = Number(val)
+ if (Number.isNaN(num)) return '-'
+ return num.toFixed(digits)
+}
+
+const axisPointerLabelFormatter = (params: any) => {
+ if (params.axisDimension === 'x') {
+ return params.value ?? '-'
+ }
+ return formatChartValueText(params.value)
+}
+
+const tooltipFormatter = (params: any) => {
+ const list = Array.isArray(params) ? params : [params]
+ if (!list.length) return ''
+ let html = `${list[0].axisValueLabel ?? list[0].name ?? ''}`
+ list.forEach((item: any) => {
+ const rawValue = Array.isArray(item.value) ? item.value[1] : item.value
+ html += `
${item.marker}${item.seriesName}: ${formatChartValueText(rawValue)}` + }) + return html +} + const resetData = (dataLevel: string) => { loading.value = true indexOptions.value = [ @@ -259,7 +284,7 @@ const resetData = (dataLevel: string) => { resetData('Primary') const mqttMessage: any = ref() const setHarmonicSpectrumData = (val: any) => { - + mqttMessage.value = val init() } @@ -285,7 +310,7 @@ const init = () => { // 清空当前时间点的数据（如果存在），防止重复 const currentTime = mqttMessage.value.dataTime.split(" ")[1]; vv.yMethodList = vv.yMethodList.filter((point: any) => point[0] !== currentTime); - + item.data.push({ // time: mqttMessage.value.dataTime, value: mqttMessage.value[vv.name], @@ -295,7 +320,7 @@ const init = () => { vv.data.push(mqttMessage.value[vv.name]) // 更新yMethodList数据，确保与xAixsTimeList保持同步 vv.yMethodList.push([currentTime, mqttMessage.value[vv.name] + '', vv.phase]) - + // 限制数据点数量，避免过多数据点导致性能问题和显示重复 if (vv.yMethodList.length > 50) { vv.yMethodList.shift() @@ -320,11 +345,14 @@ const init = () => { // right: '4%' // }, tooltip: { + trigger: 'axis', + formatter: tooltipFormatter, axisPointer: { type: 'cross', label: { color: '#fff', - fontSize: 16 + fontSize: 16, + formatter: axisPointerLabelFormatter } }, textStyle: { diff --git a/src/views/govern/device/control/tabs/components/realtrend.vue b/src/views/govern/device/control/tabs/components/realtrend.vue index 521466a..0e4f6b9 100644 --- a/src/views/govern/device/control/tabs/components/realtrend.vue +++ b/src/views/govern/device/control/tabs/components/realtrend.vue @@ -1,8 +1,8 @@
${item.marker}${item.seriesName}: ${formatChartValueText(rawValue)}` + }) + return html +} + const resetData = (dataLevel: string) => { loading.value = true indexOptions.value = [ @@ -259,7 +284,7 @@ const resetData = (dataLevel: string) => { resetData('Primary') const mqttMessage: any = ref() const setHarmonicSpectrumData = (val: any) => { - + mqttMessage.value = val init() } @@ -285,7 +310,7 @@ const init = () => { // 清空当前时间点的数据（如果存在），防止重复 const currentTime = mqttMessage.value.dataTime.split(" ")[1]; vv.yMethodList = vv.yMethodList.filter((point: any) => point[0] !== currentTime); - + item.data.push({ // time: mqttMessage.value.dataTime, value: mqttMessage.value[vv.name], @@ -295,7 +320,7 @@ const init = () => { vv.data.push(mqttMessage.value[vv.name]) // 更新yMethodList数据，确保与xAixsTimeList保持同步 vv.yMethodList.push([currentTime, mqttMessage.value[vv.name] + '', vv.phase]) - + // 限制数据点数量，避免过多数据点导致性能问题和显示重复 if (vv.yMethodList.length > 50) { vv.yMethodList.shift() @@ -320,11 +345,14 @@ const init = () => { // right: '4%' // }, tooltip: { + trigger: 'axis', + formatter: tooltipFormatter, axisPointer: { type: 'cross', label: { color: '#fff', - fontSize: 16 + fontSize: 16, + formatter: axisPointerLabelFormatter } }, textStyle: { diff --git a/src/views/govern/device/control/tabs/components/realtrend.vue b/src/views/govern/device/control/tabs/components/realtrend.vue index 521466a..0e4f6b9 100644 --- a/src/views/govern/device/control/tabs/components/realtrend.vue +++ b/src/views/govern/device/control/tabs/components/realtrend.vue @@ -1,8 +1,8 @@
-
-
-
-
@@ -44,7 +44,8 @@
-
次数
+
+
@@ -29,17 +29,19 @@
-->
谐波次数
-
次数(次)
++ {{ isInterharmonicTab ? '间谐波次数(次)' : '谐波次数(次)' }} +
{{ item.groupName }}{{ item.unit ? '(' + item.unit + ')' : '' }}
-
diff --git a/src/views/setting/dictionary/component/add.vue b/src/views/setting/dictionary/component/add.vue
index 3477c10..dd1fe9f 100644
--- a/src/views/setting/dictionary/component/add.vue
+++ b/src/views/setting/dictionary/component/add.vue
@@ -28,10 +28,10 @@
- {{ Number(String(key).replace('data', ' ')) - 0.5 }} +
+ {{ getHarmonicOrder(key, true) }}
- {{ String(key).replace('data', ' ') }} + {{ getHarmonicOrder(key) }}
+
+
+
+
+
+
diff --git a/src/views/govern/manage/programVersion/comp/upgrade.vue b/src/views/govern/manage/programVersion/comp/upgrade.vue
index 4467831..450897a 100644
--- a/src/views/govern/manage/programVersion/comp/upgrade.vue
+++ b/src/views/govern/manage/programVersion/comp/upgrade.vue
@@ -10,7 +10,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ node.label }}
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/src/views/govern/setting/frontManagement/index.vue b/src/views/govern/setting/frontManagement/index.vue
index 9b8dd41..536e5e1 100644
--- a/src/views/govern/setting/frontManagement/index.vue
+++ b/src/views/govern/setting/frontManagement/index.vue
@@ -163,7 +163,7 @@
+
+
+
+
+
+
+ 组件加载失败...