diff --git a/src/api/device-boot/device.ts b/src/api/device-boot/device.ts index cc43509c..ee3a50ef 100644 --- a/src/api/device-boot/device.ts +++ b/src/api/device-boot/device.ts @@ -1,7 +1,7 @@ import request from '@/utils/request' // 获取区域中断终端 -export function getAreaOffDev(data) { +export function getAreaOffDev(data:any) { return request({ url: '/device-boot/device/getAreaOffDev', method: 'post', @@ -9,10 +9,19 @@ export function getAreaOffDev(data) { }) } // 获取区域中断终端 -export function getYwZtSubstation(data) { +export function getYwZtSubstation(data:any) { return request({ url: '/device-boot/ywZt/getYwZtSubstation', method: 'GET', params: data }) } + +//终端周期检测 +export function terminalCheckPage(data:any) { + return request({ + url: '/device-boot/alarm/terminalCheckPage', + method: 'post', + data + }) +} diff --git a/src/components/form/datePicker/index.vue b/src/components/form/datePicker/index.vue index cb0a7d19..c2dfaf86 100644 --- a/src/components/form/datePicker/index.vue +++ b/src/components/form/datePicker/index.vue @@ -37,10 +37,10 @@ interface Props { const props = withDefaults(defineProps(), { nextFlag: false, theCurrentTime: false, - isStatisticData: 1 + isStatisticData: 0 }) -const isMinuteData = computed(() => Number(props.isStatisticData) === 0) +const isMinuteData = computed(() => Number(props.isStatisticData) === 1) const pickerType = computed(() => (isMinuteData.value ? 'datetimerange' : 'daterange')) const pickerValueFormat = computed(() => (isMinuteData.value ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD')) diff --git a/src/components/table/header/index.vue b/src/components/table/header/index.vue index 6ba388d1..4ce43a4b 100644 --- a/src/components/table/header/index.vue +++ b/src/components/table/header/index.vue @@ -4,7 +4,7 @@ + :style="{ maxWidth: isStatisticData == 1 ? '750px' : '610px' }"> - + + - + - - - - + + + + - + + + + @@ -201,16 +214,14 @@ diff --git a/src/views/pqs/harmonicMonitoring/runManage/monitoringPoints/monitorLimit.vue b/src/views/pqs/harmonicMonitoring/runManage/monitoringPoints/monitorLimit.vue new file mode 100644 index 00000000..a8a0314b --- /dev/null +++ b/src/views/pqs/harmonicMonitoring/runManage/monitoringPoints/monitorLimit.vue @@ -0,0 +1,163 @@ + + + + + \ No newline at end of file diff --git a/src/views/pqs/harmonicMonitoring/runManage/terminalLedger/index.vue b/src/views/pqs/harmonicMonitoring/runManage/terminalLedger/index.vue index 7760ea2d..33583275 100644 --- a/src/views/pqs/harmonicMonitoring/runManage/terminalLedger/index.vue +++ b/src/views/pqs/harmonicMonitoring/runManage/terminalLedger/index.vue @@ -128,6 +128,7 @@ const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Ty const voltageleveloption = dictData.getBasicData('Dev_Voltage_Stand') const terminaloption = dictData.getBasicData('Dev_Manufacturers') const interfereoption = dictData.getBasicData('Interference_Source') +const IS_LN = import.meta.env.VITE_NAME == 'LN' || import.meta.env.VITE_NAME == 'LNqr' const communicationstatus = [ { value: 0, label: '中断' }, @@ -150,8 +151,21 @@ const tableStore = new TableStore({ return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1 } }, - { field: 'areaName', title: '区域', minWidth: 90 }, - { field: 'gdName', title: '市公司', minWidth: 110 }, + { + visible: !IS_LN, + field: 'areaName', + title: '省公司', + minWidth: 100 + }, + { visible: IS_LN, + field: 'gdName', title: '市公司', minWidth: 120, formatter: (row: any) => { + if (IS_LN) { + return row.cellValue.replace('国网', '').replace('供电公司', '') + } else { + return row.cellValue + } + } + }, { field: 'bdName', title: '变电站', diff --git a/src/views/pqs/panorama/components/details/steadyState.vue b/src/views/pqs/panorama/components/details/steadyState.vue index 7b56c2d6..cc9d1340 100644 --- a/src/views/pqs/panorama/components/details/steadyState.vue +++ b/src/views/pqs/panorama/components/details/steadyState.vue @@ -85,11 +85,7 @@ const active: any = ref(1) const evaluationData: any = ref([]) const dictData = useDictData() -const Voltage: any = dictData.getBasicData('Dev_Voltage_Stand').filter(item => { - if (item.code == '35kV' || item.code == '500kV' || item.code == '220kV' || item.code == '110kV') { - return item - } -}) +const Voltage: any = dictData.getBasicData('Panoramic_voltage') const chartRef = ref() const url: any = [ diff --git a/src/views/pqs/panorama/components/mapR.vue b/src/views/pqs/panorama/components/mapR.vue index 0877da41..02c9418c 100644 --- a/src/views/pqs/panorama/components/mapR.vue +++ b/src/views/pqs/panorama/components/mapR.vue @@ -12,15 +12,15 @@
- 无污染:0 + 优秀:(4.5,5]
- 轻微污染:(0 , 100] + 良好:(4,4.5]
- 轻度污染:(100 , 1000] + 合格:(3,4]
- 中度污染:(1000 , 10000] + 较差:(2,3]
- 重度污染:(10000 + 极差:[1,2]