diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue
index 2cf61d66..c2a38670 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue
@@ -162,85 +162,6 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="监测终端编码：" prop="monitoringTerminalCode">
-                        <el-input
-                            v-model="form.monitoringTerminalCode"
-                            autocomplete="off"
-                            placeholder="请输入监测终端编码"
-                        />
-                    </el-form-item>
-                    <el-form-item label="监测终端名称：" prop="monitoringTerminalName">
-                        <el-input
-                            v-model="form.monitoringTerminalName"
-                            autocomplete="off"
-                            placeholder="请输入终端名称"
-                        />
-                    </el-form-item>
-                    <el-form-item label="电压互感器类型：" prop="voltageTransformerType">
-                        <el-select
-                            v-model="form.voltageTransformerType"
-                            clearable
-                            style="width: 100%"
-                            placeholder="请选择电压互感器类型"
-                        >
-                            <el-option
-                                v-for="item in voltageTransformerTypeList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="终端接线方式类型：" prop="terminalWiringMethodType" class="label_over_warp">
-                        <el-select
-                            v-model="form.terminalWiringMethodType"
-                            clearable
-                            style="width: 100%"
-                            placeholder="请选择终端接线方式类型"
-                        >
-                            <el-option
-                                v-for="item in terminalWiringMethodTypeList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="中性点接线方式：" prop="neutralPointWiringMethod">
-                        <el-select
-                            v-model="form.neutralPointWiringMethod"
-                            clearable
-                            style="width: 100%"
-                            placeholder="请选择中性点接线方式"
-                        >
-                            <el-option
-                                v-for="item in neutralPointWiringMethodList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="厂家：" prop="manufacturer">
-                        <el-select v-model="form.manufacturer" clearable style="width: 100%" placeholder="请选择厂家">
-                            <el-option
-                                v-for="item in manufacturerList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="厂家设备编号：" prop="manufacturerDeviceNumber">
-                        <el-input
-                            v-model="form.manufacturerDeviceNumber"
-                            autocomplete="off"
-                            placeholder="请输入厂家设备编号"
-                        />
-                    </el-form-item>
-                    <el-form-item label="终端IP：" prop="terminalIp">
-                        <el-input v-model="form.terminalIp" autocomplete="off" placeholder="请输入终端IP" />
-                    </el-form-item>
                     <el-form-item label="终端型号：" prop="terminalType">
                         <el-select
                             v-model="form.terminalType"
@@ -256,9 +177,56 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
+
+                    <el-form-item label="监测终端名称：" prop="monitoringTerminalName">
+                        <el-input
+                            v-model="form.monitoringTerminalName"
+                            autocomplete="off"
+                            placeholder="请输入终端名称"
+                        />
+                    </el-form-item>
+                    <el-form-item label="通讯状态：" prop="communicationStatus">
+                        <el-select
+                            v-model="form.communicationStatus"
+                            clearable
+                            style="width: 100%"
+                            placeholder="请选择通讯状态"
+                        >
+                            <el-option
+                                v-for="item in communicationStatusList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                                :disabled="item.id == '1'"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="终端IP：" prop="terminalIp">
+                        <el-input v-model="form.terminalIp" autocomplete="off" placeholder="请输入终端IP" />
+                    </el-form-item>
                     <el-form-item label="端口：" prop="terminalPort">
                         <el-input v-model="form.terminalPort" autocomplete="off" placeholder="请输入端口" />
                     </el-form-item>
+                    <el-form-item label="投运时间：" prop="commissioningTime">
+                        <el-date-picker
+                            style="width: 100%"
+                            v-model="form.commissioningTime"
+                            type="datetime"
+                            format="YYYY/MM/DD hh:mm:ss"
+                            value-format="YYYY-MM-DD hh:mm:ss"
+                            placeholder="请选择投运时间"
+                        />
+                    </el-form-item>
+                    <el-form-item label="数据更新时间：" prop="dataUpdateTime">
+                        <el-date-picker
+                            style="width: 100%"
+                            v-model="form.dataUpdateTime"
+                            type="datetime"
+                            format="YYYY/MM/DD hh:mm:ss"
+                            value-format="YYYY-MM-DD hh:mm:ss"
+                            placeholder="请选择数据更新时间"
+                        />
+                    </el-form-item>
                     <el-form-item label="所属前置机：" prop="frontEndMachine">
                         <el-select
                             v-model="form.frontEndMachine"
@@ -275,28 +243,24 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item
-                        label="本次终端检测时间："
-                        prop="currentTerminalDetectionTime"
+                        label="监测装置安装位置："
+                        prop="monitoringDeviceInstallationPosition"
                         class="label_over_warp"
                     >
-                        <el-date-picker
+                        <!-- 电网侧、用户侧 -->
+                        <el-select
+                            v-model="form.monitoringDeviceInstallationPosition"
+                            clearable
                             style="width: 100%"
-                            v-model="form.currentTerminalDetectionTime"
-                            type="datetime"
-                            format="YYYY/MM/DD hh:mm:ss"
-                            value-format="YYYY-MM-DD hh:mm:ss"
-                            placeholder="请选择本次终端检测时间"
-                        />
-                    </el-form-item>
-                    <el-form-item label="下次终端定检时间：" prop="nextTerminalInspectionTime" class="label_over_warp">
-                        <el-date-picker
-                            style="width: 100%"
-                            v-model="form.nextTerminalInspectionTime"
-                            type="datetime"
-                            format="YYYY/MM/DD hh:mm:ss"
-                            value-format="YYYY-MM-DD hh:mm:ss"
-                            placeholder="请选择下次终端定检时间"
-                        />
+                            placeholder="请选择监测装置安装位置"
+                        >
+                            <el-option
+                                v-for="item in monitoringDeviceInstallationPositionList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
                     </el-form-item>
                     <el-form-item label="识别码：" prop="identificationCode">
                         <el-input v-model="form.identificationCode" autocomplete="off" placeholder="请输入识别码" />
@@ -304,12 +268,6 @@
                     <el-form-item label="终端秘钥：" prop="terminalSecretKey">
                         <el-input v-model="form.terminalSecretKey" autocomplete="off" placeholder="请输入终端秘钥" />
                     </el-form-item>
-                    <el-form-item label="经度：" prop="longitude">
-                        <el-input v-model="form.longitude" autocomplete="off" placeholder="请输入经度" />
-                    </el-form-item>
-                    <el-form-item label="纬度：" prop="latitude">
-                        <el-input v-model="form.latitude" autocomplete="off" placeholder="请输入纬度" />
-                    </el-form-item>
                     <el-form-item label="终端模型：" prop="terminalModel">
                         <el-select
                             v-model="form.terminalModel"
@@ -335,44 +293,106 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="通讯状态：" prop="communicationStatus">
+                    <el-form-item label="终端接线方式类型：" prop="terminalWiringMethodType" class="label_over_warp">
                         <el-select
-                            v-model="form.communicationStatus"
+                            v-model="form.terminalWiringMethodType"
                             clearable
                             style="width: 100%"
-                            placeholder="请选择通讯状态"
+                            placeholder="请选择终端接线方式类型"
                         >
                             <el-option
-                                v-for="item in communicationStatusList"
+                                v-for="item in terminalWiringMethodTypeList"
                                 :key="item.id"
                                 :label="item.name"
                                 :value="item.id"
                             ></el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="厂家：" prop="manufacturer">
+                        <el-select v-model="form.manufacturer" clearable style="width: 100%" placeholder="请选择厂家">
+                            <el-option
+                                v-for="item in manufacturerList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item
+                        label="本次终端检测时间："
+                        prop="currentTerminalDetectionTime"
+                        class="label_over_warp"
+                    >
+                        <el-date-picker
+                            style="width: 100%"
+                            v-model="form.currentTerminalDetectionTime"
+                            type="datetime"
+                            placeholder="请选择本次终端检测时间"
+                        />
+                    </el-form-item>
+                    <el-form-item label="下次终端定检时间：" prop="nextTerminalInspectionTime" class="label_over_warp">
+                        <el-date-picker
+                            style="width: 100%"
+                            v-model="form.nextTerminalInspectionTime"
+                            type="datetime"
+                            placeholder="请选择下次终端定检时间"
+                        />
+                    </el-form-item>
+                    <el-form-item label="监测终端编码：" prop="monitoringTerminalCode">
+                        <el-input
+                            v-model="form.monitoringTerminalCode"
+                            autocomplete="off"
+                            placeholder="请输入监测终端编码"
+                        />
+                    </el-form-item>
+                    <el-form-item label="电压互感器类型：" prop="voltageTransformerType">
+                        <el-select
+                            v-model="form.voltageTransformerType"
+                            clearable
+                            style="width: 100%"
+                            placeholder="请选择电压互感器类型"
+                        >
+                            <el-option
+                                v-for="item in voltageTransformerTypeList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="中性点接线方式：" prop="neutralPointWiringMethod">
+                        <el-select
+                            v-model="form.neutralPointWiringMethod"
+                            clearable
+                            style="width: 100%"
+                            placeholder="请选择中性点接线方式"
+                        >
+                            <el-option
+                                v-for="item in neutralPointWiringMethodList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="厂家设备编号：" prop="manufacturerDeviceNumber">
+                        <el-input
+                            v-model="form.manufacturerDeviceNumber"
+                            autocomplete="off"
+                            placeholder="请输入厂家设备编号"
+                        />
+                    </el-form-item>
+
+                    <el-form-item label="经度：" prop="longitude">
+                        <el-input v-model="form.longitude" autocomplete="off" placeholder="请输入经度" />
+                    </el-form-item>
+                    <el-form-item label="纬度：" prop="latitude">
+                        <el-input v-model="form.latitude" autocomplete="off" placeholder="请输入纬度" />
+                    </el-form-item>
+
                     <el-form-item label="SIM卡号：" prop="simCardNumber">
                         <el-input v-model="form.simCardNumber" autocomplete="off" placeholder="请输入SIM卡号" />
                     </el-form-item>
-                    <el-form-item label="投运时间：" prop="commissioningTime">
-                        <el-date-picker
-                            style="width: 100%"
-                            v-model="form.commissioningTime"
-                            type="datetime"
-                            format="YYYY/MM/DD hh:mm:ss"
-                            value-format="YYYY-MM-DD hh:mm:ss"
-                            placeholder="请选择投运时间"
-                        />
-                    </el-form-item>
-                    <el-form-item label="数据更新时间：" prop="dataUpdateTime">
-                        <el-date-picker
-                            style="width: 100%"
-                            v-model="form.dataUpdateTime"
-                            type="datetime"
-                            format="YYYY/MM/DD hh:mm:ss"
-                            value-format="YYYY-MM-DD hh:mm:ss"
-                            placeholder="请选择数据更新时间"
-                        />
-                    </el-form-item>
                     <el-form-item label="对时功能：" prop="timeSyncFunction">
                         <!-- 默认值 开启 -->
                         <el-radio-group v-model="form.timeSyncFunction">
@@ -396,26 +416,6 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item
-                        label="监测装置安装位置："
-                        prop="monitoringDeviceInstallationPosition"
-                        class="label_over_warp"
-                    >
-                        <!-- 电网侧、用户侧 -->
-                        <el-select
-                            v-model="form.monitoringDeviceInstallationPosition"
-                            clearable
-                            style="width: 100%"
-                            placeholder="请选择监测装置安装位置"
-                        >
-                            <el-option
-                                v-for="item in monitoringDeviceInstallationPositionList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
                     <el-form-item label="召唤标志：" prop="summonFlag">
                         <el-select v-model="form.summonFlag" clearable style="width: 100%" placeholder="请选择召唤标志">
                             <el-option
@@ -579,6 +579,7 @@ import { useAdminInfo } from '@/stores/adminInfo'
 import { uploadFile } from '@/api/system-boot/file'
 import { addTerminalFormData, getSubstationVoltageLevel } from '@/api/supervision-boot/terminal/index'
 import { getAllDeptList } from '@/api/common'
+import { nodeAllList } from '@/api/device-boot/Business'
 const emits = defineEmits(['onSubmit'])
 const dictData = useDictData()
 const dialogFormVisible = ref(false)
@@ -596,8 +597,6 @@ const neutralPointWiringMethodList = dictData.getBasicData('Neutral_Point')
 const manufacturerList = dictData.getBasicData('Dev_Manufacturers')
 //字典获取终端型号
 const terminalTypeList = dictData.getBasicData('Dev_Type')
-//字典获取所属前置机
-const frontEndMachineList = dictData.getBasicData('Front_Type')
 //字典获取数据类型
 const dataTypeList = dictData.getBasicData('System_Type')
 //字典获取电压等级
@@ -682,6 +681,14 @@ const electroplatingFunctionList = [
 ]
 //获取登陆用户姓名和部门
 const adminInfo = useAdminInfo()
+//获取所属前置机数据
+const frontEndMachineList = ref([])
+const getFrontEndMachineList = () => {
+    nodeAllList().then(res => {
+        frontEndMachineList.value = res.data
+    })
+}
+getFrontEndMachineList()
 //定义所属供电公司数据
 const powerCompanyList = ref([])
 //获取所属供电公司，区域列表第三层数据
@@ -731,11 +738,10 @@ const resetForm = () => {
         commissioningTime: '', //投运时间
         communicationStatus: communicationStatusList[0].id, //	通讯状态
         contractNumber: '', //合同号
-        currentTerminalDetectionTime: '', //本次终端检测时间
         dataType: dataTypeList[0].id, //数据类型
         dataUpdateTime: '', //	数据更新时间
         electroplatingFunction: electroplatingFunctionList[0].id, //电镀功能
-        frontEndMachine: frontEndMachineList[0].id, //所属前置机
+        frontEndMachine: frontEndMachineList.value[0]?.id, //所属前置机
         identificationCode: '', //	识别码
         latitude: '0', //纬度
         longitude: '0', //经度
@@ -745,7 +751,8 @@ const resetForm = () => {
         monitoringTerminalCode: '', //监测终端编码
         monitoringTerminalName: '', //监测终端名称
         neutralPointWiringMethod: neutralPointWiringMethodList[0].id, //	中性点接线方式
-        nextTerminalInspectionTime: '', //	下次终端定检时间
+        currentTerminalDetectionTime: new Date(), //本次终端检测时间
+        nextTerminalInspectionTime:new Date().getTime() + 365 * 5 * 24 * 3600 * 1000, //	下次终端定检时间
         powerCompany: powerCompanyList[0]?.value.id, //所属供电公司
         simCardNumber: '', //SIM卡号
         substation: '', //	所属变电站
@@ -796,7 +803,7 @@ const devReportForm = ref({
         dataType: dataTypeList[0].id, //数据类型
         dataUpdateTime: '', //	数据更新时间
         electroplatingFunction: electroplatingFunctionList[0].id, //电镀功能
-        frontEndMachine: frontEndMachineList[0].id, //所属前置机
+        frontEndMachine: frontEndMachineList.value[0]?.id, //所属前置机
         identificationCode: '', //	识别码
         latitude: '0', //纬度
         longitude: '0', //经度