From f19c72458f4e23f5876502933221487f62c9b3ef Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Mon, 27 May 2024 16:17:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=88=E7=AB=AF=E5=85=A5=E7=BD=91=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B-=E7=BB=88=E7=AB=AF=E4=BF=A1=E6=81=AF=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=BC=B9=E6=A1=86=E4=BF=AE=E6=94=B9&=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=B1=95=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/terminainal/addForm.vue        | 1066 +++++++++--------
 .../components/terminainal/detail.vue         |   12 +-
 .../components/terminainal/index.vue          |   21 +-
 3 files changed, 550 insertions(+), 549 deletions(-)

diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue
index c2a38670..063d8aaa 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue
@@ -9,6 +9,11 @@
         :lazy="true"
         draggable
     >
+        <!-- <el-anchor :container="containerRef" direction="vertical" type="default" :offset="30" @click="handleClick">
+            <el-anchor-link href="#part1" title="基础信息" />
+            <el-anchor-link href="#part2" title="终端信息" />
+            <el-anchor-link href="#part3" title="附件材料" />
+        </el-anchor> -->
         <!--终端信息录入   基础信息+终端信息+附件材料 -->
         <el-form
             :model="form"
@@ -17,51 +22,48 @@
             :rules="rules"
             ref="ruleFormRef"
             label-width="auto"
+            class="form-two"
         >
-            <el-tabs tab-position="left" class="tabs_form" v-model="activeName">
-                <el-tab-pane name="0" label="基础信息" class="form-two">
-                    <el-form-item label="填报人：" prop="reporter">
-                        <el-input
-                            v-model="form.reporter"
-                            autocomplete="off"
-                            placeholder="请输入填报人"
-                            :disabled="true"
-                        />
-                    </el-form-item>
-                    <el-form-item label="填报日期：" prop="reportDate">
-                        <el-date-picker
-                            :disabled="true"
-                            style="width: 100%"
-                            v-model="form.reportDate"
-                            type="date"
-                            placeholder="请选择填报日期"
-                        />
-                    </el-form-item>
-                    <el-form-item label="填报部门：" prop="orgId">
-                        <el-input v-model="form.orgId" :disabled="true" autocomplete="off" />
-                    </el-form-item>
-                    <el-form-item label="工程投产日期：" prop="expectedProductionDate">
-                        <el-date-picker
-                            style="width: 100%"
-                            v-model="form.expectedProductionDate"
-                            type="date"
-                            format="YYYY-MM-DD"
-                            value-format="YYYY-MM-DD"
-                            :disabled-date="disabledDate"
-                            placeholder="请选择工程投产日期"
-                        />
-                    </el-form-item>
-                    <el-form-item label="所属地市：" prop="city">
-                        <el-select v-model="form.city" clearable style="width: 100%" placeholder="请选择所属地市">
-                            <el-option
-                                v-for="item in areaOptionList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <!-- <el-col  :span="12">
+            <!-- <el-tabs tab-position="left" class="tabs_form" v-model="activeName"> -->
+                <el-divider content-position="left">基础信息</el-divider>
+            <!-- <div id="part1" class="form-two"> -->
+                <el-form-item label="填报人：" prop="reporter">
+                    <el-input v-model="form.reporter" autocomplete="off" placeholder="请输入填报人" :disabled="true" />
+                </el-form-item>
+                <el-form-item label="填报日期：" prop="reportDate">
+                    <el-date-picker
+                        :disabled="true"
+                        style="width: 100%"
+                        v-model="form.reportDate"
+                        type="date"
+                        placeholder="请选择填报日期"
+                    />
+                </el-form-item>
+                <el-form-item label="填报部门：" prop="orgId">
+                    <el-input v-model="form.orgId" :disabled="true" autocomplete="off" />
+                </el-form-item>
+                <el-form-item label="工程投产日期：" prop="expectedProductionDate">
+                    <el-date-picker
+                        style="width: 100%"
+                        v-model="form.expectedProductionDate"
+                        type="date"
+                        format="YYYY-MM-DD"
+                        value-format="YYYY-MM-DD"
+                        :disabled-date="disabledDate"
+                        placeholder="请选择工程投产日期"
+                    />
+                </el-form-item>
+                <el-form-item label="所属地市：" prop="city">
+                    <el-select v-model="form.city" clearable style="width: 100%" placeholder="请选择所属地市">
+                        <el-option
+                            v-for="item in areaOptionList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <!-- <el-col  :span="12">
                                 <el-form-item label="用户状态：" prop="userStatus">
                                     <el-select
                                         v-model="form.userStatus"
@@ -78,7 +80,7 @@
                                     </el-select>
                                 </el-form-item>
                              -->
-                    <!-- 
+                <!-- 
                                 <el-form-item label="工程名称：" prop="userName">
                                     <el-select
                                         v-model="form.userName"
@@ -95,469 +97,453 @@
                                     </el-select>
                                 </el-form-item>
                            -->
-                </el-tab-pane>
-                <el-tab-pane name="1" label="终端信息" class="form-two">
-                    <div class="fixed_upload">
-                        <el-upload
-                            v-model:file-list="form.deviceFilePath"
-                            ref="uploadRef"
-                            action=""
-                            accept=".xls,.xlsx"
-                            :limit="1"
-                            :on-exceed="handleExceed"
-                            :on-change="choose"
-                            :auto-upload="false"
-                            :on-progress="uploadFileName('deviceFilePath')"
-                        >
-                            <template #trigger>
-                                <el-button type="primary">终端台账信息</el-button>
-                            </template>
-                        </el-upload>
-                    </div>
-                    <el-form-item label="所属供电公司：" prop="powerCompany">
-                        <el-select
-                            v-model="form.powerCompany"
-                            clearable
-                            style="width: 100%"
-                            placeholder="请选择所属供电公司"
-                            @change="findSubstationVoltageLevel"
-                        >
-                            <el-option
-                                v-for="item in powerCompanyList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="所属变电站：" prop="substation">
-                        <el-select
-                            v-model="form.substation"
-                            clearable
-                            style="width: 100%"
-                            placeholder="请选择所属变电站"
-                            filterable
-                            @change="changeSubstation"
-                        >
-                            <el-option
-                                v-for="item in substationList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="变电站电压等级：" prop="substationVoltageLevel">
-                        <el-select
-                            v-model="form.substationVoltageLevel"
-                            clearable
-                            style="width: 100%"
-                            placeholder="请选择变压站电压等级"
-                        >
-                            <el-option
-                                v-for="item in voltageLevelList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="终端型号：" prop="terminalType">
-                        <el-select
-                            v-model="form.terminalType"
-                            clearable
-                            style="width: 100%"
-                            placeholder="请选择终端型号"
-                        >
-                            <el-option
-                                v-for="item in terminalTypeList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></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"
-                            clearable
-                            style="width: 100%"
-                            placeholder="请选择所属前置机"
-                        >
-                            <el-option
-                                v-for="item in frontEndMachineList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item
-                        label="监测装置安装位置："
-                        prop="monitoringDeviceInstallationPosition"
-                        class="label_over_warp"
+            <!-- </div> -->
+            <el-divider content-position="left">终端信息</el-divider>
+            <!-- <div id="part2" class="form-two"> -->
+                <div class="fixed_upload">
+                    <el-upload
+                        v-model:file-list="form.deviceFilePath"
+                        ref="uploadRef"
+                        action=""
+                        accept=".xls,.xlsx"
+                        :limit="1"
+                        :on-exceed="handleExceed"
+                        :on-change="choose"
+                        :auto-upload="false"
+                        :on-progress="uploadFileName('deviceFilePath')"
                     >
-                        <!-- 电网侧、用户侧 -->
-                        <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="identificationCode">
-                        <el-input v-model="form.identificationCode" autocomplete="off" placeholder="请输入识别码" />
-                    </el-form-item>
-                    <el-form-item label="终端秘钥：" prop="terminalSecretKey">
-                        <el-input v-model="form.terminalSecretKey" autocomplete="off" placeholder="请输入终端秘钥" />
-                    </el-form-item>
-                    <el-form-item label="终端模型：" prop="terminalModel">
-                        <el-select
-                            v-model="form.terminalModel"
-                            clearable
-                            style="width: 100%"
-                            placeholder="请选择终端模型"
-                        >
-                            <el-option
-                                v-for="item in terminalModelList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="数据类型：" prop="dataType">
-                        <el-select v-model="form.dataType" clearable style="width: 100%" placeholder="请选择数据类型">
-                            <el-option
-                                v-for="item in dataTypeList"
-                                :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="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"
+                        <template #trigger>
+                            <el-button type="primary">终端台账信息</el-button>
+                        </template>
+                    </el-upload>
+                </div>
+                <el-form-item label="所属供电公司：" prop="powerCompany">
+                    <el-select
+                        v-model="form.powerCompany"
+                        clearable
+                        style="width: 100%"
+                        placeholder="请选择所属供电公司"
+                        @change="findSubstationVoltageLevel"
                     >
-                        <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-option
+                            v-for="item in powerCompanyList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="所属变电站：" prop="substation">
+                    <el-select
+                        v-model="form.substation"
+                        clearable
+                        style="width: 100%"
+                        placeholder="请选择所属变电站"
+                        filterable
+                        @change="changeSubstation"
+                    >
+                        <el-option
+                            v-for="item in substationList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="变电站电压等级：" prop="substationVoltageLevel">
+                    <el-select
+                        v-model="form.substationVoltageLevel"
+                        clearable
+                        style="width: 100%"
+                        placeholder="请选择变压站电压等级"
+                    >
+                        <el-option
+                            v-for="item in voltageLevelList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="终端型号：" prop="terminalType">
+                    <el-select v-model="form.terminalType" clearable style="width: 100%" placeholder="请选择终端型号">
+                        <el-option
+                            v-for="item in terminalTypeList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
+                    </el-select>
+                </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="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"
+                        clearable
+                        style="width: 100%"
+                        placeholder="请选择所属前置机"
+                    >
+                        <el-option
+                            v-for="item in frontEndMachineList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        ></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="identificationCode">
+                    <el-input v-model="form.identificationCode" autocomplete="off" placeholder="请输入识别码" />
+                </el-form-item>
+                <el-form-item label="终端秘钥：" prop="terminalSecretKey">
+                    <el-input v-model="form.terminalSecretKey" autocomplete="off" placeholder="请输入终端秘钥" />
+                </el-form-item>
+                <el-form-item label="终端模型：" prop="terminalModel">
+                    <el-select v-model="form.terminalModel" clearable style="width: 100%" placeholder="请选择终端模型">
+                        <el-option
+                            v-for="item in terminalModelList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="数据类型：" prop="dataType">
+                    <el-select v-model="form.dataType" clearable style="width: 100%" placeholder="请选择数据类型">
+                        <el-option
+                            v-for="item in dataTypeList"
+                            :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="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="SIM卡号：" prop="simCardNumber">
-                        <el-input v-model="form.simCardNumber" autocomplete="off" placeholder="请输入SIM卡号" />
-                    </el-form-item>
-                    <el-form-item label="对时功能：" prop="timeSyncFunction">
-                        <!-- 默认值 开启 -->
-                        <el-radio-group v-model="form.timeSyncFunction">
-                            <el-radio value="1">开启</el-radio>
-                            <el-radio value="0">关闭</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item label="电镀功能：" prop="electroplatingFunction">
-                        <!-- 默认 关闭 下拉框 -->
-                        <el-select
-                            v-model="form.electroplatingFunction"
-                            clearable
-                            style="width: 100%"
-                            placeholder="请选择电镀功能"
-                        >
-                            <el-option
-                                v-for="item in electroplatingFunctionList"
-                                :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
-                                v-for="item in summonFlagList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="告警功能：" prop="alarmFunction">
-                        <el-radio-group v-model="form.alarmFunction">
-                            <el-radio value="1">是</el-radio>
-                            <el-radio value="0">否</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item label="合同号：" prop="contractNumber">
-                        <el-input v-model="form.contractNumber" autocomplete="off" placeholder="请输入合同号" />
-                    </el-form-item>
-                </el-tab-pane>
-                <el-tab-pane name="3" label="附件材料" class="form-two">
-                    <el-form-item label="信息安全检测报告：" prop="informationSecurityTestReport">
-                        <el-upload
-                            v-model:file-list="form.informationSecurityTestReport"
-                            ref="uploadRef"
-                            action=""
-                            accept=".xls,.xlsx"
-                            :limit="1"
-                            :on-exceed="handleExceed"
-                            :on-change="choose"
-                            :auto-upload="false"
-                            :on-progress="uploadFileName('informationSecurityTestReport')"
-                        >
-                            <template #trigger>
-                                <el-button type="primary">上传文件</el-button>
-                            </template>
-                        </el-upload>
-                    </el-form-item>
-                    <el-form-item label="验收检验报告单：" prop="acceptanceInspectionReportSingle">
-                        <el-upload
-                            v-model:file-list="form.acceptanceInspectionReportSingle"
-                            ref="uploadRef"
-                            action=""
-                            accept=".xls,.xlsx"
-                            :limit="1"
-                            :on-exceed="handleExceed"
-                            :on-change="choose"
-                            :auto-upload="false"
-                            :on-progress="uploadFileName('acceptanceInspectionReportSingle')"
-                        >
-                            <template #trigger>
-                                <el-button type="primary">上传文件</el-button>
-                            </template>
-                        </el-upload>
-                    </el-form-item>
-                    <el-form-item label="验收检验报告：" prop="acceptanceInspectionReport">
-                        <el-upload
-                            v-model:file-list="form.acceptanceInspectionReport"
-                            ref="uploadRef"
-                            action=""
-                            accept=".xls,.xlsx"
-                            :limit="1"
-                            :on-exceed="handleExceed"
-                            :on-change="choose"
-                            :auto-upload="false"
-                            :on-progress="uploadFileName('acceptanceInspectionReport')"
-                        >
-                            <template #trigger>
-                                <el-button type="primary">上传文件</el-button>
-                            </template>
-                        </el-upload>
-                    </el-form-item>
-                    <el-form-item label="型式实验报告：" prop="typeExperimentReport">
-                        <el-upload
-                            v-model:file-list="form.typeExperimentReport"
-                            ref="uploadRef"
-                            action=""
-                            accept=".xls,.xlsx"
-                            :limit="1"
-                            :on-exceed="handleExceed"
-                            :on-change="choose"
-                            :auto-upload="false"
-                            :on-progress="uploadFileName('typeExperimentReport')"
-                        >
-                            <template #trigger>
-                                <el-button type="primary">上传文件</el-button>
-                            </template>
-                        </el-upload>
-                    </el-form-item>
-                    <el-form-item label="出厂检验报告：" prop="factoryInspectionReport">
-                        <el-upload
-                            v-model:file-list="form.factoryInspectionReport"
-                            ref="uploadRef"
-                            action=""
-                            accept=".xls,.xlsx"
-                            :limit="1"
-                            :on-exceed="handleExceed"
-                            :on-change="choose"
-                            :auto-upload="false"
-                            :on-progress="uploadFileName('factoryInspectionReport')"
-                        >
-                            <template #trigger>
-                                <el-button type="primary">上传文件</el-button>
-                            </template>
-                        </el-upload>
-                    </el-form-item>
-                    <el-form-item label="性能检测报告：" prop="performanceTestReport">
-                        <el-upload
-                            v-model:file-list="form.performanceTestReport"
-                            ref="uploadRef"
-                            action=""
-                            accept=".xls,.xlsx"
-                            :limit="1"
-                            :on-exceed="handleExceed"
-                            :on-change="choose"
-                            :auto-upload="false"
-                            :on-progress="uploadFileName('performanceTestReport')"
-                        >
-                            <template #trigger>
-                                <el-button type="primary">上传文件</el-button>
-                            </template>
-                        </el-upload>
-                    </el-form-item>
-                    <el-form-item label="其他附件：" prop="otherAttachments">
-                        <el-upload
-                            v-model:file-list="form.otherAttachments"
-                            ref="uploadRef"
-                            action=""
-                            accept=".xls,.xlsx"
-                            :limit="1"
-                            :on-exceed="handleExceed"
-                            :on-change="choose"
-                            :auto-upload="false"
-                            :on-progress="uploadFileName('otherAttachments')"
-                        >
-                            <template #trigger>
-                                <el-button type="primary">上传文件</el-button>
-                            </template>
-                        </el-upload>
-                    </el-form-item>
-                </el-tab-pane>
-            </el-tabs>
+                <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="timeSyncFunction">
+                    <!-- 默认值 开启 -->
+                    <el-radio-group v-model="form.timeSyncFunction">
+                        <el-radio value="1">开启</el-radio>
+                        <el-radio value="0">关闭</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="电镀功能：" prop="electroplatingFunction">
+                    <!-- 默认 关闭 下拉框 -->
+                    <el-select
+                        v-model="form.electroplatingFunction"
+                        clearable
+                        style="width: 100%"
+                        placeholder="请选择电镀功能"
+                    >
+                        <el-option
+                            v-for="item in electroplatingFunctionList"
+                            :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
+                            v-for="item in summonFlagList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="告警功能：" prop="alarmFunction">
+                    <el-radio-group v-model="form.alarmFunction">
+                        <el-radio value="1">是</el-radio>
+                        <el-radio value="0">否</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="合同号：" prop="contractNumber">
+                    <el-input v-model="form.contractNumber" autocomplete="off" placeholder="请输入合同号" />
+                </el-form-item>
+            <!-- </div> -->
+            <el-divider content-position="left">附件材料</el-divider>
+            <!-- <div id="part3"  class="form-two"> -->
+                <el-form-item label="信息安全检测报告：" prop="informationSecurityTestReport">
+                    <el-upload
+                        v-model:file-list="form.informationSecurityTestReport"
+                        ref="uploadRef"
+                        action=""
+                        accept=".xls,.xlsx"
+                        :limit="1"
+                        :on-exceed="handleExceed"
+                        :on-change="choose"
+                        :auto-upload="false"
+                        :on-progress="uploadFileName('informationSecurityTestReport')"
+                    >
+                        <template #trigger>
+                            <el-button type="primary">上传文件</el-button>
+                        </template>
+                    </el-upload>
+                </el-form-item>
+                <el-form-item label="验收检验报告单：" prop="acceptanceInspectionReportSingle">
+                    <el-upload
+                        v-model:file-list="form.acceptanceInspectionReportSingle"
+                        ref="uploadRef"
+                        action=""
+                        accept=".xls,.xlsx"
+                        :limit="1"
+                        :on-exceed="handleExceed"
+                        :on-change="choose"
+                        :auto-upload="false"
+                        :on-progress="uploadFileName('acceptanceInspectionReportSingle')"
+                    >
+                        <template #trigger>
+                            <el-button type="primary">上传文件</el-button>
+                        </template>
+                    </el-upload>
+                </el-form-item>
+                <el-form-item label="验收检验报告：" prop="acceptanceInspectionReport">
+                    <el-upload
+                        v-model:file-list="form.acceptanceInspectionReport"
+                        ref="uploadRef"
+                        action=""
+                        accept=".xls,.xlsx"
+                        :limit="1"
+                        :on-exceed="handleExceed"
+                        :on-change="choose"
+                        :auto-upload="false"
+                        :on-progress="uploadFileName('acceptanceInspectionReport')"
+                    >
+                        <template #trigger>
+                            <el-button type="primary">上传文件</el-button>
+                        </template>
+                    </el-upload>
+                </el-form-item>
+                <el-form-item label="型式实验报告：" prop="typeExperimentReport">
+                    <el-upload
+                        v-model:file-list="form.typeExperimentReport"
+                        ref="uploadRef"
+                        action=""
+                        accept=".xls,.xlsx"
+                        :limit="1"
+                        :on-exceed="handleExceed"
+                        :on-change="choose"
+                        :auto-upload="false"
+                        :on-progress="uploadFileName('typeExperimentReport')"
+                    >
+                        <template #trigger>
+                            <el-button type="primary">上传文件</el-button>
+                        </template>
+                    </el-upload>
+                </el-form-item>
+                <el-form-item label="出厂检验报告：" prop="factoryInspectionReport">
+                    <el-upload
+                        v-model:file-list="form.factoryInspectionReport"
+                        ref="uploadRef"
+                        action=""
+                        accept=".xls,.xlsx"
+                        :limit="1"
+                        :on-exceed="handleExceed"
+                        :on-change="choose"
+                        :auto-upload="false"
+                        :on-progress="uploadFileName('factoryInspectionReport')"
+                    >
+                        <template #trigger>
+                            <el-button type="primary">上传文件</el-button>
+                        </template>
+                    </el-upload>
+                </el-form-item>
+                <el-form-item label="性能检测报告：" prop="performanceTestReport">
+                    <el-upload
+                        v-model:file-list="form.performanceTestReport"
+                        ref="uploadRef"
+                        action=""
+                        accept=".xls,.xlsx"
+                        :limit="1"
+                        :on-exceed="handleExceed"
+                        :on-change="choose"
+                        :auto-upload="false"
+                        :on-progress="uploadFileName('performanceTestReport')"
+                    >
+                        <template #trigger>
+                            <el-button type="primary">上传文件</el-button>
+                        </template>
+                    </el-upload>
+                </el-form-item>
+                <el-form-item label="其他附件：" prop="otherAttachments">
+                    <el-upload
+                        v-model:file-list="form.otherAttachments"
+                        ref="uploadRef"
+                        action=""
+                        accept=".xls,.xlsx"
+                        :limit="1"
+                        :on-exceed="handleExceed"
+                        :on-change="choose"
+                        :auto-upload="false"
+                        :on-progress="uploadFileName('otherAttachments')"
+                    >
+                        <template #trigger>
+                            <el-button type="primary">上传文件</el-button>
+                        </template>
+                    </el-upload>
+                </el-form-item>
+            <!-- </div> -->
+            <!-- </el-tabs> -->
         </el-form>
         <template #footer>
             <div class="dialog-footer">
@@ -579,6 +565,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 { formatDate } from '@/utils/formatTime'
 import { nodeAllList } from '@/api/device-boot/Business'
 const emits = defineEmits(['onSubmit'])
 const dictData = useDictData()
@@ -692,16 +679,17 @@ getFrontEndMachineList()
 //定义所属供电公司数据
 const powerCompanyList = ref([])
 //获取所属供电公司，区域列表第三层数据
-const getPowerCompanyList = async () => {
+const getPowerCompanyList =async () => {
     getAllDeptList().then(res => {
         powerCompanyList.value = res.data[0].children[0].children
         form.value.powerCompany = powerCompanyList.value[0]?.id
+        findSubstationVoltageLevel()
+        changeSubstation()
     })
 }
-getPowerCompanyList()
 //根据所选供电公司查询所选获取变电站与变电站电压等级
 const substationList = ref([])
-const findSubstationVoltageLevel = () => {
+const findSubstationVoltageLevel = async () => {
     getSubstationVoltageLevel({ orgIds: [form.value.powerCompany] }).then(res => {
         substationList.value = res.data
         form.value.substation = substationList.value[0]?.id
@@ -709,13 +697,16 @@ const findSubstationVoltageLevel = () => {
     })
 }
 //变电站选择的时候切换变电站电压等级
-const changeSubstation = () => {
+const changeSubstation = async () => {
     let obj = substationList.value.find(item => item.id == form.value.substation)
     form.value.substationVoltageLevel = obj?.voltageLevel
 }
-findSubstationVoltageLevel()
-changeSubstation()
-const resetForm = () => {
+const containerRef = ref<HTMLElement | null>(null)
+
+const handleClick = (e: MouseEvent) => {
+  e.preventDefault()
+}
+const resetForm =async () => {
     form.value = {
         reporter: '', //填报人
         reportDate: new Date(), //填报日期
@@ -752,7 +743,7 @@ const resetForm = () => {
         monitoringTerminalName: '', //监测终端名称
         neutralPointWiringMethod: neutralPointWiringMethodList[0].id, //	中性点接线方式
         currentTerminalDetectionTime: new Date(), //本次终端检测时间
-        nextTerminalInspectionTime:new Date().getTime() + 365 * 5 * 24 * 3600 * 1000, //	下次终端定检时间
+        nextTerminalInspectionTime: new Date().getTime() + 365 * 5 * 24 * 3600 * 1000, //	下次终端定检时间
         powerCompany: powerCompanyList[0]?.value.id, //所属供电公司
         simCardNumber: '', //SIM卡号
         substation: '', //	所属变电站
@@ -760,7 +751,7 @@ const resetForm = () => {
         summonFlag: summonFlagList[0].id, //	召唤标志
         terminalIp: '', //终端IP
         terminalModel: terminalModelList[0].id, //终端模型
-        terminalPort: '', //端口
+        terminalPort: '102', //端口
         terminalSecretKey: '', //终端秘钥
         terminalType: terminalTypeList[0].id, //	终端型号
         terminalWiringMethodType: terminalWiringMethodTypeList[0].id, //	终端接线方式类型
@@ -791,8 +782,6 @@ const devReportForm = ref({
     otherAttachments: [], //其他附件
     performanceTestReport: [], //性能检测报告
     typeExperimentReport: [], //型式实验报告
-    // processInstanceId: '', //流程实例的编号
-    // startUserSelectAssignees: {}, //发起人自选审批人 Map
     //终端信息实体
     supervisionTempDeviceReportParam: {
         alarmFunction: '0', //告警功能
@@ -1162,8 +1151,21 @@ watch(
                     devReportForm.value.supervisionTempDeviceReportParam[key] = val[key]
                 }
             }
-            //处理填报日期时间格式
-            devReportForm.value.reportDate = window.XEUtils.toDateString(form.value.reportDate, 'yyyy-MM-dd')
+            //处理填报日期
+            devReportForm.value.reportDate = window.XEUtils.toDateString(val.reportDate, 'yyyy-MM-dd')
+            //处理本次终端检测时间时间格式
+            //处理下次终端检测时间时间格式
+            devReportForm.value.supervisionTempDeviceReportParam = {
+                ...devReportForm.value.supervisionTempDeviceReportParam,
+                currentTerminalDetectionTime: window.XEUtils.toDateString(
+                    val.currentTerminalDetectionTime,
+                    'yyyy-MM-dd HH:mm:ss'
+                ),
+                nextTerminalInspectionTime: window.XEUtils.toDateString(
+                    val.nextTerminalInspectionTime,
+                    'yyyy-MM-dd HH:mm:ss'
+                )
+            }
         }
         //监测点信息
         else {
@@ -1174,17 +1176,6 @@ watch(
         immediate: true
     }
 )
-const open = () => {
-    dialogFormVisible.value = true
-}
-const close = () => {
-    //重置表单内容
-    //取消表单校验状态
-    ruleFormRef.value && ruleFormRef.value.resetFields()
-    dialogFormVisible.value = false
-    emits('onSubmit')
-    resetForm()
-}
 onMounted(() => {
     console.log()
 })
@@ -1264,6 +1255,19 @@ const disabledDate = time => {
     return time.getTime() < Date.now() - 8.64e7 // 8.64e7 毫秒数代表一天
 }
 const activeName = ref('0')
+
+const open = async () => {
+    getPowerCompanyList()
+    dialogFormVisible.value = true
+}
+const close = async () => {
+    //重置表单内容
+    //取消表单校验状态
+    ruleFormRef.value && ruleFormRef.value.resetFields()
+    dialogFormVisible.value = false
+    emits('onSubmit')
+    resetForm()
+}
 //提交
 const confirmForm = () => {
     // 提交终端信息
@@ -1345,4 +1349,10 @@ defineExpose({ open })
     display: flex;
     justify-content: flex-end;
 }
+.el-divider{
+    margin: 20px 0;
+}
+::v-deep .el-divider__text{
+    font-size: 16px !important;
+}
 </style>
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue
index 042484b3..0cbb291a 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue
@@ -241,7 +241,7 @@ import { getDictTreeById } from '@/api/system-boot/dictTree'
 import { useDictData } from '@/stores/dictData'
 import { getFileNameAndFilePath } from '@/api/system-boot/file'
 import { Link } from '@element-plus/icons-vue'
-
+import { nodeAllList } from '@/api/device-boot/Business'
 defineOptions({ name: 'BpmUserReportDetail' })
 
 const { query } = useRoute() // 查询参数
@@ -333,8 +333,6 @@ const terminalTypeList = dictData.getBasicData('Dev_Type')
 const voltageTransformerTypeList = dictData.getBasicData('Voltage_Transformer')
 //字典获取中性点接线方式
 const neutralPointWiringMethodList = dictData.getBasicData('Neutral_Point')
-//字典获取所属前置机
-const frontEndMachineList = dictData.getBasicData('Front_Type')
 //字典获取终端接线方式类型
 const terminalWiringMethodTypeList = dictData.getBasicData('Dev_Connect')
 //字典获取厂家
@@ -351,6 +349,14 @@ const getInfo = async () => {
         detailLoading.value = false
     }
 }
+//获取所属前置机数据
+const frontEndMachineList = ref([])
+const getFrontEndMachineList = () => {
+    nodeAllList().then(res => {
+        frontEndMachineList.value = res.data
+    })
+}
+getFrontEndMachineList()
 const getFileName = async () => {
     //验收检验报告
     if (detailData.value.acceptanceInspectionReport) {
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
index a8aeee56..bbc44c8d 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
@@ -1,21 +1,6 @@
 <!---终端入网检测-->
 <template>
     <TableHeader area datePicker ref="TableHeaderRef">
-        <!-- <template #select>
-            <el-form-item label="工程名称">
-                <el-input v-model="tableStore.table.params.searchValue" clearable></el-input>
-            </el-form-item>
-            <el-form-item label="所属地市">
-                <el-select v-model="tableStore.table.params.loadType" clearable placeholder="请选择所属地市">
-                    <el-option
-                        v-for="item in areaOptionList"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-        </template> -->
         <template #operation>
             <el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button>
             <!-- <el-button icon="el-icon-Download" @click="exportEvent" type="primary">导出</el-button> -->
@@ -49,10 +34,10 @@ const tableStore = new TableStore({
     method: 'POST',
     column: [
         { title: '序号', type: 'seq', width: 80 },
-        { field: 'substation', title: '所属变电站', minWidth: 170 },
-        { field: 'monitoringTerminalCode', title: '设备编号', minWidth: 170 },
-        { field: 'monitoringTerminalName', title: '设备名称', minWidth: 170 },
         { field: 'orgName', title: '填报部门名称' , minWidth: 170 },
+        { field: 'substation', title: '所属变电站', minWidth: 170 },
+        { field: 'monitoringTerminalName', title: '设备名称', minWidth: 170 },
+        { field: 'monitoringTerminalCode', title: '设备编号', minWidth: 170 },
         { field: 'reportDate', title: '填报日期', minWidth: 170},
         { field: 'reporter', title: '填报人', minWidth: 80 },
         {