diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue index 55d77aea..ea15de04 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue @@ -283,12 +283,14 @@ - + + + @@ -484,6 +486,25 @@ const numList = [ name: '10' } ] +//测量间隔数据 +const timeIntervalList=[ + { + id:'1', + name:'一分钟' + }, + { + id:'3', + name:'三分钟' + }, + { + id:'5', + name:'五分钟' + }, + { + id:'10', + name:'十分钟' + } +] //获取登陆用户姓名和部门 const adminInfo = useAdminInfo() //工程下拉选择数据 @@ -547,7 +568,7 @@ const resetForm = () => { operationStatus: operationStatusList[0].id, //监测点运行状态 pointNature: pointNatureList[0].id, //监测点性质 powerSubstationName: '', //电网侧变电站 - timeInterval: '1', //测量间隔 + timeInterval: timeIntervalList[0].id, //测量间隔 voltageDeviationLowerLimit: '0', //电压偏差下限 voltageDeviationUpperLimit: '0', // 电压偏差上限 voltageLevel: voltageLevelList[0].id, //监测点电压等级 diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue index 5f277769..54efc88d 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue @@ -62,16 +62,20 @@ {{ detailData.standardCapacity }} - {{ detailData.ct1 }}{{ detailData.ct2?'/'+detailData.ct2:'' }} + {{ detailData.ct1 }}{{ detailData.ct2 ? '/' + detailData.ct2 : '' }} - {{ detailData.pt1 }}{{ detailData.pt2?'/'+detailData.pt2:'' }} + {{ detailData.pt1 }}{{ detailData.pt2 ? '/' + detailData.pt2 : '' }} {{ detailData.lineId }} - {{ detailData.timeInterval }} + {{ + timeIntervalList.find(item => { + return item.id == detailData.timeInterval + })?.name + }} {{ detailData.loadType }} @@ -112,10 +116,10 @@ - + {{ detailData?.mainWiringDiagram.name }} - 预览 + 预览 @@ -128,8 +132,8 @@ import { getTempLineDetailsById } from '@/api/supervision-boot/monitorpoint/inde import { useDictData } from '@/stores/dictData' import { getFileNameAndFilePath } from '@/api/system-boot/file' import { Link } from '@element-plus/icons-vue' -const openFile = (name:any) => { - window.open(window.location.origin + '/#/previewFile?'+name) +const openFile = (name: any) => { + window.open(window.location.origin + '/#/previewFile?' + name) } defineOptions({ name: 'BpmUserReportDetail' }) @@ -141,7 +145,25 @@ const props = defineProps({ const detailLoading = ref(false) // 表单的加载中 const detailData = ref({}) // 详情数据 const queryId = query.id as unknown as string // 从 URL 传递过来的 id 编号 - +//测量间隔数据 +const timeIntervalList = [ + { + id: '1', + name: '一分钟' + }, + { + id: '3', + name: '三分钟' + }, + { + id: '5', + name: '五分钟' + }, + { + id: '10', + name: '十分钟' + } +] //用户状态数组 const userStateList = reactive([ {