diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue
index e6bf939f..7e05e599 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue
@@ -39,10 +39,10 @@
                 </el-upload>
             </div>
             <!-- 基础信息 -->
-            <el-form-item  v-if="false" for="-" label="填报人：" prop="reporterName">
+            <el-form-item v-if="false" for="-" label="填报人：" prop="reporterName">
                 <el-input v-model="form.reporterName" autocomplete="off" placeholder="请输入填报人" :disabled="true" />
             </el-form-item>
-            <el-form-item  v-if="false" for="-" label="填报日期：" prop="reportDate">
+            <el-form-item v-if="false" for="-" label="填报日期：" prop="reportDate">
                 <el-date-picker
                     style="width: 100%"
                     v-model="form.reportDate"
@@ -53,10 +53,10 @@
                     placeholder="请选择填报日期"
                 />
             </el-form-item>
-            <el-form-item  v-if="false" for="-" label="填报部门：" prop="orgId">
+            <el-form-item v-if="false" for="-" label="填报部门：" prop="orgId">
                 <el-input v-model="form.orgName" :disabled="true" autocomplete="off" />
             </el-form-item>
-            <el-form-item  v-if="false" for="-" label="工程投产日期：" prop="expectedProductionDate">
+            <el-form-item v-if="false" for="-" label="工程投产日期：" prop="expectedProductionDate">
                 <el-date-picker
                     style="width: 100%"
                     v-model="form.expectedProductionDate"
@@ -68,7 +68,7 @@
                     placeholder="请选择工程投产日期"
                 />
             </el-form-item>
-            <el-form-item  v-if="false" for="-" label="所属地市：" prop="city">
+            <el-form-item v-if="false" for="-" label="所属地市：" prop="city">
                 <el-select
                     v-model="form.city"
                     clearable
@@ -84,7 +84,7 @@
                     ></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item  v-if="false" for="-" label="用户状态：" prop="userStatus">
+            <el-form-item v-if="false" for="-" label="用户状态：" prop="userStatus">
                 <el-select v-model="form.userStatus" placeholder="请选择用户状态" :disabled="true" style="width: 100%">
                     <el-option
                         v-for="(item, index) in userStateList"
@@ -151,6 +151,7 @@
                     clearable
                     style="width: 100%"
                     placeholder="请选择监测点电压等级"
+                    filterable
                     @change="changevoltageDeviationLimit"
                 >
                     <el-option
@@ -276,10 +277,10 @@
                 </el-select>
             </el-form-item>
             <el-form-item for="-" label="电压偏差上限：" prop="voltageDeviationUpperLimit">
-                <el-input-number style="width: 100%" v-model="form.voltageDeviationUpperLimit" :min="-10" :max="10" />
+                <el-input-number style="width: 100%" v-model="form.voltageDeviationUpperLimit" />
             </el-form-item>
             <el-form-item for="-" label="电压偏差下限：" prop="voltageDeviationLowerLimit">
-                <el-input-number style="width: 100%" v-model="form.voltageDeviationLowerLimit" :min="-10" :max="10" />
+                <el-input-number style="width: 100%" v-model="form.voltageDeviationLowerLimit" />
             </el-form-item>
             <el-form-item for="-" label="测量间隔：" prop="timeInterval">
                 <el-input
@@ -358,6 +359,7 @@ import { getTempLineDetailsById } from '@/api/supervision-boot/monitorpoint/inde
 import { getDeviceList } from '@/api/supervision-boot/terminal/index'
 import { addMointorPointFormData, getList, updateMointorPointFormData } from '@/api/supervision-boot/monitorpoint/index'
 import { queryByAllCode } from '@/api/system-boot/dictTree'
+import { getUserReportById } from '@/api/supervision-boot/userReport/form'
 import { object } from 'vue-types'
 const emits = defineEmits(['onSubmit'])
 const dictData = useDictData()
@@ -507,6 +509,19 @@ const changeDevice = () => {
         monitoringTerminalName: obj.monitoringTerminalName
     }
 }
+//用户类型为2.新建/扩建非线性负荷用户 新建/扩建新能源发电站回显容量
+const getDataByUserType=(id:any)=>{
+    getUserReportById(id).then(res => {
+            const obj = res.data
+            form.value = {
+                ...form.value,
+                shortCapacity: obj.userReportSubstationPO?.minShortCircuitCapacity, //	短路容量
+                dealCapacity: obj.userReportSubstationPO?.userAgreementCapacity, //协议容量
+                devCapacity: obj.userReportSubstationPO.pccEquipmentCapacity, //设备容量
+                standardCapacity: obj.userReportSubstationPO?.baseShortCircuitCapacity //基准容量
+            }
+        })
+}
 //定义切换form类型
 const selectFormType = ref('')
 selectFormType.value = '0'
@@ -558,8 +573,6 @@ const resetForm = () => {
         userNameList.value = res.data
         //初始化
         let obj = res.data[0]
-
-        console.log(obj,"99999999");
         if (title.value != '重新发起') {
             form.value = {
                 ...form.value,
@@ -575,6 +588,7 @@ const resetForm = () => {
                 objName: userNameList.value[0]?.projectName
             }
         }
+        getDataByUserType(obj.id)
     })
     changevoltageDeviationLimit()
 }
@@ -641,8 +655,7 @@ const changeUserName = () => {
     let obj: any = projectList.value.find((item: any) => {
         return form.value.userName == item.id
     })
-    // console.log(userNameList.value,11111,projectList.value);
-    console.log(obj,"88888888");
+    console.log(obj, '88888888')
     form.value = {
         ...form.value,
         city: obj?.city,
@@ -657,6 +670,11 @@ const changeUserName = () => {
         objName: obj?.projectName,
         userStatus: obj?.userStatus + ''
     }
+
+    //回显数据 2.新建/扩建非线性负荷用户 新建/扩建新能源发电站
+    if (obj.userType == '2' || obj.userType == '3' || obj.userType == '4' || obj.userType == '5') {
+        getDataByUserType(obj.id)
+    }
 }
 //定义校验规则
 const rules = ref({
@@ -874,34 +892,34 @@ const rules = ref({
     ]
 })
 const resendId = ref('')
-const rowValue:any=ref({})
+const rowValue: any = ref({})
 const open = (row: any) => {
     dialogFormVisible.value = true
     title.value = row.title
     //初始化数据
     resetForm()
     nextTick(() => {
-    if (row.row) {
-        resendId.value = row.row.id
-        rowValue.value=row.row
-        getTempLineDetailsById({ id: row.row.id }).then(res => {
-            form.value = res.data
-            form.value.loadType = loadTypeList.value.filter((item: any) => item.name == res.data.loadType)[0]?.id
-            form.value.businessType = businessTypeList.value.filter(
-                (item: any) => item.name == res.data.businessType
-            )[0]?.id
-            mainWiringDiagram.value = JSON.parse(JSON.stringify(res.data.mainWiringDiagram))
-            form.value.mainWiringDiagram = JSON.parse(
-                JSON.stringify([
-                    {
-                        name: res.data.mainWiringDiagram.split('/')[2]
-                    }
-                ])
-            )
-        })
-    } else {
-        resendId.value = ''
-    }
+        if (row.row) {
+            resendId.value = row.row.id
+            rowValue.value = row.row
+            getTempLineDetailsById({ id: row.row.id }).then(res => {
+                form.value = res.data
+                form.value.loadType = loadTypeList.value.filter((item: any) => item.name == res.data.loadType)[0]?.id
+                form.value.businessType = businessTypeList.value.filter(
+                    (item: any) => item.name == res.data.businessType
+                )[0]?.id
+                mainWiringDiagram.value = JSON.parse(JSON.stringify(res.data.mainWiringDiagram))
+                form.value.mainWiringDiagram = JSON.parse(
+                    JSON.stringify([
+                        {
+                            name: res.data.mainWiringDiagram.split('/')[2]
+                        }
+                    ])
+                )
+            })
+        } else {
+            resendId.value = ''
+        }
     })
 }
 const close = () => {
@@ -919,7 +937,7 @@ onMounted(() => {
 watch(
     () => projectList.value,
     (val, oldVal) => {
-        if(val&&val.length!=0&&resendId.value){
+        if (val && val.length != 0 && resendId.value) {
             let obj: any = projectList.value.find((item: any) => {
                 return rowValue.value.createBy == item.createBy
             })