diff --git a/src/components/table/index.vue b/src/components/table/index.vue index 3e360527..87ae2de9 100644 --- a/src/components/table/index.vue +++ b/src/components/table/index.vue @@ -8,6 +8,7 @@ v-bind="Object.assign({}, defaultAttribute, $attrs)" @checkbox-all="selectChangeEvent" @checkbox-change="selectChangeEvent" + :showOverflow='showOverflow' > + diff --git a/src/views/pqs/supervise/terminal/index.vue b/src/views/pqs/supervise/terminal/index.vue index 9145d9e9..87ec2561 100644 --- a/src/views/pqs/supervise/terminal/index.vue +++ b/src/views/pqs/supervise/terminal/index.vue @@ -7,11 +7,14 @@ - - + + - - + + + + + @@ -21,6 +24,7 @@ import { onMounted, reactive, ref, provide } from 'vue' import interferenceUserTable from './components/interferenceUserTable.vue' import sensitiveUserTable from './components/sensitiveUserTable.vue' +import substationLedger from './components/substationLedger.vue' import deviceLedgerTable from './components/deviceLedgerTable.vue' import monitorLedgerTable from './components/monitorLedgerTable.vue' import { mainHeight } from '@/utils/layout' diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/detail.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/detail.vue index 63f8e485..ed81c4cb 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/detail.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/detail.vue @@ -9,10 +9,10 @@ {{ detailData.lineId }} - + {{ detailData.monitoringTerminalCode }} - + {{ detailData.monitoringTerminalName }} diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue index 7b8fa744..0012f6c7 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue @@ -75,8 +75,8 @@ const tableStore = new TableStore({ } }, { field: 'lineId', title: '监测点编号', minWidth: 170 }, - // { field: 'monitoringTerminalCode', title: '监测终端编码', minWidth: 170 }, - { field: 'monitoringTerminalName', title: '监测终端名称', minWidth: 170 }, + // { field: 'monitoringTerminalCode', title: '终端编码', minWidth: 170 }, + { field: 'monitoringTerminalName', title: '终端名称', minWidth: 170 }, { field: 'createBy', title: '填报人', diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue index 0199f0e8..80056d7a 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue @@ -123,13 +123,13 @@ - + @@ -299,8 +299,8 @@ /> - - + + @@ -520,7 +520,7 @@ const userNameList = ref([]) //查询干扰源列表获取可选数据 const projectList = ref([]) -const monitoringTerminalList = ref([]) +const monitoringTerminalList:any = ref([]) //获取关联终端 const findAllMonitoringTerminalList = () => { getDeviceList().then(res => { @@ -889,7 +889,7 @@ const rules = ref({ lineId: [ { required: true, - message: '请输入监测点编码', + message: '请输入上送国网编码', trigger: 'blur' } ], diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue index f03d10e2..a1d43451 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue @@ -67,7 +67,7 @@ {{ detailData.pt1 }}{{ detailData.pt2 ? '/' + detailData.pt2 : '' }} - + {{ detailData.lineId }} diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue index 2dbe2155..561c7fd1 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue @@ -175,6 +175,22 @@ > + + + + + + - + @@ -205,6 +221,14 @@ > + + + - - - + - - @@ -686,7 +701,7 @@ const terminalModelList = [ ] const substationList: any = ref([]) //字典获取通讯类型 -const frontTypeList = dictData.getBasicData('Front_Type') +const frontTypeList = dictData.getBasicData('Front_Type', ['CLD', '61850']) //定义通讯状态下拉框数据 const communicationStatusList = [ { @@ -754,6 +769,7 @@ const frontEndMachineList: any = ref([]) const getFrontEndMachineList = () => { nodeAllList().then(res => { frontEndMachineList.value = res.data + form.value.frontEndMachine = res.data[0].id }) } const changeSubstationFlag = () => { @@ -790,11 +806,6 @@ const getPowerCompanyList = async (flag: any) => { getAllDeptList().then(res => { powerCompanyList.value = res.data[0].children[0].children if (flag) { - console.log( - `123`, - powerCompanyList.value.find(item => item.name == form.value.supervisionTempDeviceReport.powerCompany) - ) - getSubstationVoltageLevel({ orgIds: [ powerCompanyList.value.find( @@ -807,7 +818,9 @@ const getPowerCompanyList = async (flag: any) => { } else { form.value.powerCompany = powerCompanyList.value[0]?.id findSubstationVoltageLevel() - changeSubstation() + setTimeout(() => { + changeSubstation() + }, 100) } }) } @@ -824,6 +837,9 @@ const findSubstationVoltageLevel = async () => { //变电站选择的时候切换变电站电压等级 const changeSubstation = async () => { let obj = substationList.value.find((item: any) => item.id == form.value.substation) + + form.value.latitude = obj?.lat + form.value.longitude = obj?.lng form.value.substationVoltageLevel = obj?.voltageLevel } const resetForm: any = async () => { @@ -848,20 +864,20 @@ const resetForm: any = async () => { alarmFunction: '0', //告警功能 commissioningTime: '', //投运时间 communicationStatus: communicationStatusList[0].id, // 通讯状态 - frontType: frontTypeList[0].id, ///通讯类型 + frontType: frontTypeList[1].id, ///通讯类型 contractNumber: '', //合同号 - dataType: dataTypeList[0].id, //数据类型 + dataType: dataTypeList[2].id, //数据类型 dataUpdateTime: new Date(), // 数据更新时间 electroplatingFunction: electroplatingFunctionList[0].id, //电镀功能 frontEndMachine: frontEndMachineList.value[0]?.id, //所属前置机 identificationCode: '', // 识别码 - // latitude: '0', //纬度 - // longitude: '0', //经度 + latitude: '', //纬度 + longitude: '', //经度 manufacturer: manufacturerList[0].id, //厂家 manufacturerDeviceNumber: '', // 厂家终端编号 monitoringDeviceInstallationPosition: monitoringDeviceInstallationPositionList[0].id, //监测终端安装位置 - monitoringTerminalCode: '', //监测终端编码 - monitoringTerminalName: '', //监测终端名称 + monitoringTerminalCode: '', //终端编码 + monitoringTerminalName: '', //终端名称 neutralPointWiringMethod: neutralPointWiringMethodList[0].id, // 中性点接线方式 currentTerminalDetectionTime: new Date(), //本次终端检测时间 nextTerminalInspectionTime: new Date().getTime() + 365 * 5 * 24 * 3600 * 1000, // 下次终端定检时间 @@ -871,7 +887,7 @@ const resetForm: any = async () => { substationVoltageLevel: voltageLevelList[0].id, // 变电站电压等级 summonFlag: summonFlagList[0].id, // 召唤标志 terminalIp: '', //终端IP - terminalModel: terminalModelList[0].id, //终端模型 + terminalModel: terminalModelList[1].id, //终端模型 terminalPort: '102', //端口 terminalSecretKey: '', //终端秘钥 terminalType: terminalTypeList[0].id, // 终端型号 @@ -910,21 +926,21 @@ const devReportForm: any = ref({ alarmFunction: '0', //告警功能 commissioningTime: '', //投运时间 communicationStatus: communicationStatusList[0].id, // 通讯状态 - frontType: frontTypeList[0].id, ///通讯类型 + frontType: frontTypeList[1].id, ///通讯类型 contractNumber: '', //合同号 currentTerminalDetectionTime: '', //本次终端检测时间 - dataType: dataTypeList[0].id, //数据类型 + dataType: dataTypeList[2].id, //数据类型 dataUpdateTime: new Date(), // 数据更新时间 electroplatingFunction: electroplatingFunctionList[0].id, //电镀功能 frontEndMachine: frontEndMachineList.value[0]?.id, //所属前置机 identificationCode: '', // 识别码 - // latitude: '0', //纬度 - // longitude: '0', //经度 + latitude: '', //纬度 + longitude: '', //经度 manufacturer: manufacturerList[0].id, //厂家 manufacturerDeviceNumber: '', // 厂家终端编号 monitoringDeviceInstallationPosition: monitoringDeviceInstallationPositionList[0].id, //监测终端安装位置 - monitoringTerminalCode: '', //监测终端编码 - monitoringTerminalName: '', //监测终端名称 + monitoringTerminalCode: '', //终端编码 + monitoringTerminalName: '', //终端名称 neutralPointWiringMethod: neutralPointWiringMethodList[0].id, // 中性点接线方式 nextTerminalInspectionTime: '', // 下次终端定检时间 powerCompany: powerCompanyList.value[0]?.id, //所属供电公司 @@ -933,7 +949,7 @@ const devReportForm: any = ref({ substationVoltageLevel: voltageLevelList[0].id, // 变电站电压等级 summonFlag: summonFlagList[0].id, // 召唤标志 terminalIp: '', //终端IP - terminalModel: terminalModelList[0].id, //终端模型 + terminalModel: terminalModelList[1].id, //终端模型 terminalPort: '', //端口 terminalSecretKey: '', //终端秘钥 terminalType: terminalTypeList[0].id, // 终端型号 @@ -942,6 +958,11 @@ const devReportForm: any = ref({ voltageTransformerType: voltageTransformerTypeList[0].id //电压互感器类型 } }) +// 经度正则表达式 +const longitudeReg = /^[-+]?((180(\.0{1,10})?)|(1[0-7][0-9](\.\d{1,10})?)|([1-9]?\d(\.\d{1,10})?)|(0(\.\d{1,10})?))$/ + +// 纬度正则表达式 +const latitudeReg = /^[-+]?((90(\.0{1,10})?)|([1-8]?\d(\.\d{1,10})?)|(0(\.\d{1,10})?))$/ //定义校验规则 const rules = ref({ //基础信息 @@ -1033,7 +1054,7 @@ const rules = ref({ monitoringTerminalCode: [ { required: true, - message: '请输入监测终端编码', + message: '请输入终端编码', trigger: 'blur' } ], @@ -1140,6 +1161,16 @@ const rules = ref({ required: true, message: '请输入经度', trigger: 'blur' + }, + { + validator: (rule, value, callback) => { + if (!longitudeReg.test(value)) { + callback(new Error('请输入有效的经度')) + } else { + callback() + } + }, + trigger: 'change' } ], latitude: [ @@ -1147,6 +1178,16 @@ const rules = ref({ required: true, message: '请输入纬度', trigger: 'blur' + }, + { + validator: (rule, value, callback) => { + if (!latitudeReg.test(value)) { + callback(new Error('请输入有效的纬度')) + } else { + callback() + } + }, + trigger: 'change' } ], terminalModel: [ @@ -1552,6 +1593,10 @@ const confirmForm = async (flag: boolean) => { }) } } +// 编码改动 +const encode = (e: string) => { + form.value.monitoringTerminalName = e.replace(/:/g, '') +} defineExpose({ open })