diff --git a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
index ba488e83..176c99b9 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
@@ -190,7 +190,7 @@
@@ -207,7 +207,7 @@
@@ -251,7 +251,7 @@
v-for="(item, index) in evaluationTypeList"
:key="indedx"
:label="item.name"
- :value="item.value"
+ :value="item.id"
/>
@@ -340,7 +340,7 @@
@@ -384,7 +384,7 @@
@@ -739,9 +739,7 @@ const getTreeList = () => {
}
const treeRef = ref()
const handleCheckChange = data => {
- console.log(22222, data)
const checkedNodes = treeRef.value.getCheckedKeys()
- console.log('选中的节点数据:', checkedNodes)
if (checkedNodes.length > 1) {
checkedNodes.map((item, index) => {
// if (index == checkedNodes.length - 1) {
@@ -756,6 +754,9 @@ const handleCheckChange = data => {
}
}
getTreeList()
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
+console.log(adminInfo.$state, '打印登陆用户新信息')
const resetForm = () => {
form.value = {
reporter: '', //填报人
@@ -808,112 +809,84 @@ const resetForm = () => {
antiInterferenceReport: '' //抗扰度测试报告
// }
}
- //获取登陆用户姓名和部门
- const adminInfo = useAdminInfo()
- console.log(adminInfo.$state, '打印登陆用户新信息')
+
form.value.reporter = adminInfo.$state.name
form.value.orgId = adminInfo.$state.deptName
}
//初始化数据
resetForm()
const subForm = ref({
+ city: '', //所属地市
+ evaluationConclusion: '', //预测评估结论
+ evaluationDept: '', //预测评估单位
+ expectedProductionDate: '', //工程预期投产日期
+ orgId: '', //填报部门
+ projectName: '',
reporter: '', //填报人
reportDate: new Date(), //填报日期
- orgId: '', //填报部门
- expectedProductionDate: '', //工程预期投产日期
- userType: '0', //用户性质
- city: '', //所属地市
responsibleDepartment: '', //归口管理部门
- userStatus: '', //用户状态
- projectName: '', //工程名称
- substation: '', //变电站
- voltageLevel: '', //电压等级
- evaluationDept: '', //预测评估单位
- evaluationConclusion: '', //预测评估结论
- backgroundTestPerformed: '', //是否开展背景测试
- feasibilityReport: '', // 可研报告告地址
- preliminaryDesignDescription: '', //项目初步设计说明书告地址
- predictionEvaluationReport: '', //预测评估报告告地址
- predictionEvaluationReviewOpinions: '', //预测评估评审意见报告地址
- additionalAttachments: '', //其他附件告地址
- state: '', //数据状态
- pccPoint: '', //PCC点
- industry: '', //行业
- evaluationType: '', //评估类型
- evaluationChekDept: '', //预测评估审单位
- substationMainWiringDiagram: '', //用户接入变电站主接线示意图地址
- powerQualityReport: '', //背景电能质量测试报告
- minShortCircuitCapacity: '', //系统最小短路容量（MVA）
- userAgreementCapacity: '', //用户用电协议容量（MVA）
- needGovernance: '', //是否需要治理
+ substation: '', ////变电站
+ userStatus: '0', //用户状态
+ userType: '0',//用户性质
+ voltageLevel: "",
//userType=='0' '1'
userReportProjectPO: {
- agreementCapacity: '', //用户协议容量
- nonlinearDeviceType: '', //非线性设备类型
- additionalAttachments: '',
+ additionalAttachments: '', //其他附件告地址
+ agreementCapacity: 0,
backgroundTestPerformed: 0,
- feasibilityReport: '',
+ feasibilityReport: '', //可研报告
id: '',
needGovernance: 0,
- predictionEvaluationReport: '',
- predictionEvaluationReviewOpinions: '',
- preliminaryDesignDescription: '',
+ nonlinearDeviceType: '',
+ predictionEvaluationReport: '', //预测评估报告告地址
+ predictionEvaluationReviewOpinions: '', //预测评估评审意见报告地址
+ preliminaryDesignDescription: '', //项目初步设计说明书告地址
state: 0
},
- //userType=='2' '3' '4' '5'
- userReportSensitivePO: {
- nonlinearLoadType: '', //非线性负荷类型
- pccEquipmentCapacity: '', // PCC供电设备容量（MVA）
- baseShortCircuitCapacity: '', //基准短路容量（MVA）
- additionalAttachments: '',
- antiInterferenceReport: '',
- antiInterferenceTest: '',
- backgroundTestPerformed: 0,
- deviceName: '',
- energyQualityIndex: '',
- evaluationChekDept: '',
- evaluationType: '',
- feasibilityReport: '',
- id: '',
- industry: '',
- needGovernance: 0,
- pccPoint: '',
- powerQualityReport: '',
- powerSupplyCount: 0,
- predictionEvaluationReport: '',
- predictionEvaluationReviewOpinions: '',
- preliminaryDesignDescription: '',
- sensitiveDevices: '',
- state: 0,
- substationMainWiringDiagram: ''
- },
- //userType=='6'
+ //userType=='2,3,4,5'
userReportSubstationPO: {
- industry: '', //行业
- deviceName: '', //敏感装置名称
- powerSupplyCount: 0, //供电电源数量
- energyQualityIndex: '', //敏感电能质量指标
- antiInterferenceTest: '', //是否开展抗扰度测试
- sensitiveDevices: '', //主要敏感设备清单
- antiInterferenceReport: '', //抗扰度测试报告
- additionalAttachments: '',
+ additionalAttachments: '', //其他附件告地址
backgroundTestPerformed: 0,
baseShortCircuitCapacity: 0,
evaluationChekDept: '',
evaluationType: '',
- feasibilityReport: '',
+ feasibilityReport: '', //可研报告
id: '',
minShortCircuitCapacity: 0,
needGovernance: 0,
nonlinearLoadType: '',
pccEquipmentCapacity: 0,
pccPoint: '',
- predictionEvaluationReport: '',
- predictionEvaluationReviewOpinions: '',
- preliminaryDesignDescription: '',
+ predictionEvaluationReport: '', //预测评估报告告地址
+ predictionEvaluationReviewOpinions: '', //预测评估评审意见报告地址
+ preliminaryDesignDescription: '', //项目初步设计说明书告地址
state: 0,
- substationMainWiringDiagram: '',
+ substationMainWiringDiagram: '', //用户接入变电站主接线示意图地址
userAgreementCapacity: 0
+ },
+ //userType=='6'
+ userReportSensitivePO: {
+ additionalAttachments: '', //其他附件告地址
+ antiInterferenceReport: '', //抗扰度测试报告
+ antiInterferenceTest: '',
+ backgroundTestPerformed: 0,
+ deviceName: '',
+ energyQualityIndex: '',
+ evaluationChekDept: '',
+ evaluationType: '',
+ feasibilityReport: '', //可研报告告地址
+ id: '',
+ industry: '',
+ needGovernance: 0,
+ pccPoint: '',
+ powerQualityReport: '', //背景电能质量测试报告
+ powerSupplyCount: 0,
+ predictionEvaluationReport: '', //预测评估报告告地址
+ predictionEvaluationReviewOpinions: '', //预测评估评审意见报告地址
+ preliminaryDesignDescription: '', //项目初步设计说明书告地址
+ sensitiveDevices: '', //主要敏感设备清单
+ state: 0,
+ substationMainWiringDiagram: '' //用户接入变电站主接线示意图地址
}
})
watch(
@@ -929,16 +902,16 @@ watch(
//userType==0,1
if (val.userType == '0' || val.userType == '1') {
subForm.value.userReportProjectPO = {
- agreementCapacity: '', //用户协议容量
- nonlinearDeviceType: '', //非线性设备类型
- additionalAttachments: '',
+ additionalAttachments: '', //其他附件告地址
+ agreementCapacity: 0,
backgroundTestPerformed: 0,
- feasibilityReport: '',
+ feasibilityReport: '', //可研报告
id: '',
needGovernance: 0,
- predictionEvaluationReport: '',
- predictionEvaluationReviewOpinions: '',
- preliminaryDesignDescription: '',
+ nonlinearDeviceType: '',
+ predictionEvaluationReport: '', //预测评估报告告地址
+ predictionEvaluationReviewOpinions: '', //预测评估评审意见报告地址
+ preliminaryDesignDescription: '', //项目初步设计说明书告地址
state: 0
}
for (let key in val) {
@@ -947,36 +920,30 @@ watch(
subForm.value.userReportProjectPO[key] = val[key]
}
}
- delete subForm.value.userReportSensitivePO
delete subForm.value.userReportSubstationPO
+ delete subForm.value.userReportSensitivePO
}
//userType==2,3,4,5
if (val.userType == '2' || val.userType == '3' || val.userType == '4' || val.userType == '5') {
- subForm.value.userReportSensitivePO = {
- nonlinearLoadType: '', //非线性负荷类型
- pccEquipmentCapacity: '', // PCC供电设备容量（MVA）
- baseShortCircuitCapacity: '', //基准短路容量（MVA）
- additionalAttachments: '',
- antiInterferenceReport: '',
- antiInterferenceTest: '',
+ subForm.value.userReportSubstationPO = {
+ additionalAttachments: '', //其他附件告地址
backgroundTestPerformed: 0,
- deviceName: '',
- energyQualityIndex: '',
+ baseShortCircuitCapacity: 0,
evaluationChekDept: '',
evaluationType: '',
- feasibilityReport: '',
+ feasibilityReport: '', //可研报告
id: '',
- industry: '',
+ minShortCircuitCapacity: 0,
needGovernance: 0,
+ nonlinearLoadType: '',
+ pccEquipmentCapacity: 0,
pccPoint: '',
- powerQualityReport: '',
- powerSupplyCount: 0,
- predictionEvaluationReport: '',
- predictionEvaluationReviewOpinions: '',
- preliminaryDesignDescription: '',
- sensitiveDevices: '',
+ predictionEvaluationReport: '', //预测评估报告告地址
+ predictionEvaluationReviewOpinions: '', //预测评估评审意见报告地址
+ preliminaryDesignDescription: '', //项目初步设计说明书告地址
state: 0,
- substationMainWiringDiagram: ''
+ substationMainWiringDiagram: '', //用户接入变电站主接线示意图地址
+ userAgreementCapacity: 0
}
for (let key in val) {
if (subForm.value.userReportSensitivePO.hasOwnProperty(key)) {
@@ -985,36 +952,32 @@ watch(
}
}
delete subForm.value.userReportProjectPO
- delete subForm.value.userReportSubstationPO
+ delete subForm.value.userReportSensitivePO
}
//userType==6
if (val.userType == '6') {
- subForm.value.userReportSubstationPO = {
- industry: '', //行业
- deviceName: '', //敏感装置名称
- powerSupplyCount: 0, //供电电源数量
- energyQualityIndex: '', //敏感电能质量指标
- antiInterferenceTest: '', //是否开展抗扰度测试
- sensitiveDevices: '', //主要敏感设备清单
+ subForm.value.userReportSensitivePO = {
+ additionalAttachments: '', //其他附件告地址
antiInterferenceReport: '', //抗扰度测试报告
- additionalAttachments: '',
+ antiInterferenceTest: '',
backgroundTestPerformed: 0,
- baseShortCircuitCapacity: 0,
+ deviceName: '',
+ energyQualityIndex: '',
evaluationChekDept: '',
evaluationType: '',
- feasibilityReport: '',
+ feasibilityReport: '', //可研报告告地址
id: '',
- minShortCircuitCapacity: 0,
+ industry: '',
needGovernance: 0,
- nonlinearLoadType: '',
- pccEquipmentCapacity: 0,
pccPoint: '',
- predictionEvaluationReport: '',
- predictionEvaluationReviewOpinions: '',
- preliminaryDesignDescription: '',
+ powerQualityReport: '', //背景电能质量测试报告
+ powerSupplyCount: 0,
+ predictionEvaluationReport: '', //预测评估报告告地址
+ predictionEvaluationReviewOpinions: '', //预测评估评审意见报告地址
+ preliminaryDesignDescription: '', //项目初步设计说明书告地址
+ sensitiveDevices: '', //主要敏感设备清单
state: 0,
- substationMainWiringDiagram: '',
- userAgreementCapacity: 0
+ substationMainWiringDiagram: '' //用户接入变电站主接线示意图地址
}
for (let key in val) {
if (subForm.value.userReportSubstationPO.hasOwnProperty(key)) {
@@ -1023,9 +986,8 @@ watch(
}
}
delete subForm.value.userReportProjectPO
- delete subForm.value.userReportSensitivePO
+ delete subForm.value.userReportSubstationPO
}
- console.log(subForm.value, '打印处理好的subForm数据')
},
{
deep: true
@@ -1388,7 +1350,6 @@ const handleExceed: UploadProps['onExceed'] = files => {
let uploadName = ref('')
//上传报告改变
const uploadFileName = val => {
- console.log(val, '打印上传报告的名字')
uploadName.value = val
}
// 可研报告数组
@@ -1411,7 +1372,6 @@ const antiInterferenceReport = ref('')
const powerQualityReport = ref('')
const choose = (e: any) => {
uploadFile(e.raw, '/supervision/').then(res => {
- console.log(res, '000000000')
//可研报告
if (uploadName.value == 'feasibilityReport') {
feasibilityReport.value = res.data.name
@@ -1457,22 +1417,61 @@ const disabledDate = time => {
}
//提交
const confirmForm = () => {
- console.log(form.value, '打印提交表单')
- console.log('提交的数据:', subForm.value)
ruleFormRef.value.validate(valid => {
- console.log(moment(form.value.reportDate).format('YYYY-MM-DD'))
if (valid) {
- subForm.value.userReportSubstationPO.sensitiveDevices = sensitiveDevices.value
- subForm.value.userReportSubstationPO.antiInterferenceReport = antiInterferenceReport.value
- subForm.value.feasibilityReport = feasibilityReport.value
- subForm.value.preliminaryDesignDescription = preliminaryDesignDescription.value
- subForm.value.userReportSensitivePO.predictionEvaluationReport = predictionEvaluationReport.value
+ //整理上传文件的数据
+ // userType==0,1
+ form.value.reporter = adminInfo.$state.id
+ form.value.orgId = adminInfo.$state.deptName
+ subForm.value.reporter = adminInfo.$state.id
+ let confirmFormData = JSON.parse(JSON.stringify(subForm.value))
+ if(subForm.value.userType=='0'||subForm.value.userType=='1'){
+ confirmFormData.userReportProjectPO = {
+ ...confirmFormData.userReportProjectPO,
+ feasibilityReport: feasibilityReport.value, //可研报告
+ preliminaryDesignDescription: preliminaryDesignDescription.value, //项目初步设计说明书告地址
+ predictionEvaluationReport: predictionEvaluationReport.value, //预测评估报告告地址
+ predictionEvaluationReviewOpinions: predictionEvaluationReviewOpinions.value, //预测评估评审意见报告地址
+ additionalAttachments: additionalAttachments.value //其他附件告地址
+ }
+ }else{
+ delete subForm.value.userReportProjectPO;
+ }
+
+ console.log(
+ feasibilityReport.value,
+ 'feasibilityReport.value++++++++',
+ confirmFormData,
+ )
+ //userType==2,3,4,5
+ if(subForm.value.userType=='0'||subForm.value.userType=='1'){
+ confirmFormData.userReportProjectPO = {
+ ...confirmFormData.userReportProjectPO,
+ feasibilityReport: feasibilityReport.value, //可研报告
+ preliminaryDesignDescription: preliminaryDesignDescription.value, //项目初步设计说明书告地址
+ predictionEvaluationReport: predictionEvaluationReport.value, //预测评估报告告地址
+ predictionEvaluationReviewOpinions: predictionEvaluationReviewOpinions.value, //预测评估评审意见报告地址
+ additionalAttachments: additionalAttachments.value //其他附件告地址
+ }
+ }else{
+ delete subForm.value.userReportProjectPO;
+ }
- subForm.value.userReportSubstationPO.predictionEvaluationReviewOpinions = predictionEvaluationReviewOpinions.value
- subForm.value.userReportSubstationPO.additionalAttachments = additionalAttachments.value
- subForm.value.userReportSensitivePO.substationMainWiringDiagram = substationMainWiringDiagram.value
- subForm.value.userReportSensitivePO.powerQualityReport = powerQualityReport.value
- console.log('提交的数据:', subForm.value)
+ //userType==6
+ confirmFormData.userReportSensitivePO = {
+ ... confirmFormData.userReportSensitivePO,
+ feasibilityReport: feasibilityReport.value, //可研报告
+ preliminaryDesignDescription: preliminaryDesignDescription.value, //项目初步设计说明书告地址
+ predictionEvaluationReport: predictionEvaluationReport.value, //预测评估报告告地址
+ predictionEvaluationReviewOpinions: predictionEvaluationReviewOpinions.value, //预测评估评审意见报告地址
+ additionalAttachments: additionalAttachments.value, //其他附件告地址
+ substationMainWiringDiagram: substationMainWiringDiagram.value, //用户接入变电站主接线示意图地址
+ sensitiveDevices: sensitiveDevices.value, //主要敏感设备清单
+ antiInterferenceReport: antiInterferenceReport.value, //抗扰度测试报告
+ powerQualityReport: powerQualityReport.value //背景电能质量测试报告
+ }
+ console.log('提交的数据:', confirmFormData)
+ return
submitFormData(subForm.value).then(res => {
console.log(res, '打印提交结果2333=======>>>>>')
})