diff --git a/src/api/supervision-boot/jointDebugList/index.ts b/src/api/supervision-boot/jointDebugList/index.ts new file mode 100644 index 00000000..7444c4b2 --- /dev/null +++ b/src/api/supervision-boot/jointDebugList/index.ts @@ -0,0 +1,32 @@ +import createAxios from '@/utils/request' + +import { SUPERVISION_BOOT } from '@/utils/constantRequest' + +const MAPPING_PATH = SUPERVISION_BOOT + '/tempLine' + +/** + * 提交监测点联调表单数据 + */ +export const addMointorPointTempLinedebug = (data: any) => { + return createAxios({ + url: '/supervision-boot/tempLinedebug/add', + method: 'POST', + data: data + }) +} + +/** + * 根据id获取监测点联调的详细数据 + */ +export const getMointorPointTempLinedebugDetail = (obj: any) => { + let form = new FormData() + form.append('id', obj.id) + return createAxios({ + url:'/supervision-boot/tempLinedebug/getDetail', + method: 'POST', + data:form + }) +} + + + diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/debug.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/debug.vue new file mode 100644 index 00000000..08847b37 --- /dev/null +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/debug.vue @@ -0,0 +1,184 @@ + + + diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/detail.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/detail.vue new file mode 100644 index 00000000..b527d408 --- /dev/null +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/detail.vue @@ -0,0 +1,57 @@ + + + diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue new file mode 100644 index 00000000..c8dbc8f5 --- /dev/null +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue @@ -0,0 +1,171 @@ + + + + + diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue index 75873c55..1af8e0ec 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue @@ -48,9 +48,9 @@ - + - + + * - + + * - + + * { ...form.value, city: obj.city, reporter: obj.reporter, + reporterName:obj.reporterName, reportDate: obj.reportDate, orgId: obj.orgId, orgName:obj.orgName, @@ -567,9 +571,7 @@ const monitoringTerminalList = ref([]) //获取关联设备 const findAllMonitoringTerminalList = () => { getDeviceList().then(res => { - console.log(res, '-------------') - monitoringTerminalList.value = res.data - console.log(monitoringTerminalList.value[0].monitoringTerminalCode, '++++++++++') + monitoringTerminalList.value = res.data; }) } //查询关联设备下拉框 @@ -589,6 +591,7 @@ selectFormType.value = '0' const resetForm = () => { form.value = { reporter: '', //填报人 + reporterName:'',//填报人名称 reportDate: '', //填报日期 orgId: '', //填报部门id orgName:'', //填报部门名称 @@ -624,13 +627,7 @@ const resetForm = () => { voltageDeviationUpperLimit: '0', // 电压偏差上限 voltageLevel: voltageLevelList[0].id //监测点电压等级 } - - // form.value.reporter = adminInfo.$state.name - // form.value.orgId = adminInfo.$state.deptName } -//初始化数据 -resetForm() -getSelectableList() findAllMonitoringTerminalList() //获取树形图数据 @@ -665,66 +662,27 @@ const changeLoadType = async () => { //选择关联干扰源回显数据 const changeUserName = () => { let obj = projectList.value.find(item => { - return form.value.userName == item.projectName + return form.value.reporter == item.reporter }) form.value = { ...form.value, - city: obj.city, - reporter: obj.reporter, - reportDate: obj.reportDate, - orgId: obj.orgId, - orgName: obj.orgName, - userName: obj.projectName, - userId: obj.id, - expectedProductionDate: obj.expectedProductionDate + city: obj?.city, + reporter: obj?.reporter, + reporterName:obj?.reporterName, + reportDate: obj?.reportDate, + orgId: obj?.orgId, + orgName: obj?.orgName, + userName: obj?.projectName, + userId: obj?.id, + expectedProductionDate: obj?.expectedProductionDate } console.log(obj, '选择关联干扰源回显数据') } -//监测点信息表单格式 -const monitorPointForm = ref({ - reporter: '', //填报人 - reportDate: '', //填报日期 - orgId: '', //填报部门 - orgName:'', - expectedProductionDate: '', //工程投产日期 - city: areaOptionList[0].name, //所属地市 - userStatus: userStateList[1].id, //用户状态 - userName: '', //工程名称 - userId: '', - monitoringTerminalCode: '', //关联设备 - monitoringTerminalName: '', - - //监测点信息实体 - // supervisionTempLineReportParam: { - businessType: '', // 干扰源类别 - connectedBus: '', // 接入母线 - ctRatio: '0', //CT变比 - dealCapacity: '0', //协议容量 - devCapacity: '0', //设备容量 - isGridConnectionPoint: '0', //是否并网点 - isStatistical: '0', // 是否参与统计 - lineId: '', // 监测点编码 - lineName: '', // 监测点名称 - loadType: '', //干扰源类型 - mainWiringDiagram: '', // 主接线图 - objName: '', //监测点对象名称 - operationStatus: '', //监测点运行状态 - pointNature: '', //监测点性质 - powerSubstationName: '', //电网侧变电站 - ptRatio: '0', // PT变比 - shortCapacity: '0', // 短路容量 - standardCapacity: '0', //基准容量 - timeInterval: '0', //测量间隔 - voltageDeviationLowerLimit: '0', //电压偏差下限 - voltageDeviationUpperLimit: '0', // 电压偏差上限 - voltageLevel: '' //监测点电压等级 - // } -}) //定义校验规则 const rules = ref({ //基础信息 - reporter: [ + reporterName: [ { required: true, message: '请输入填报人', @@ -946,6 +904,9 @@ watch( ) const open = () => { dialogFormVisible.value = true + //初始化数据 + resetForm() + getSelectableList() } const close = () => { //重置表单内容 @@ -1007,14 +968,7 @@ const confirmForm = () => { //处理填报日期时间格式 form.value.reportDate = window.XEUtils.toDateString(form.value.reportDate, 'yyyy-MM-dd') let confirmFormData = JSON.parse(JSON.stringify(form.value)) - - //1.判断是否上传 - // if (!lineFilePath.value) { - // return ElMessage({ - // message: '请上传监测点台账信息', - // type: 'warning' - // }) - // } + if (!mainWiringDiagram.value) { return ElMessage({ message: '请上传主接线图', @@ -1088,18 +1042,21 @@ defineExpose({ open }) left: -10px; margin-top: 8px; color: #f56c6c; + margin-left: 20px; margin-left: 10px; + + } + .required_icon_white { + color: #fff; + position: absolute; + left: -10px; + padding-left: 30px; + margin: 8px 10px 0 30px; } .required_text { - padding-left: 20px; + // padding-left: 20px; } } -.no_required::v-deep .el-form-item__label { - padding-left: 10px !important; - width: 70px !important; - margin-left: 0px !important; -} - // ::v-deep .tabs_form{ // height:300px !important; // } diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue index 7835066c..b8ffffe9 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue @@ -1,6 +1,14 @@