From 4c672e5127d21b9a040b04203f53cdfc9f9661cf Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Mon, 27 May 2024 16:17:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=88=E7=AB=AF=E5=85=A5=E7=BD=91=E7=9B=91?=
 =?UTF-8?q?=E6=B5=8B&&=E6=8A=80=E6=9C=AF=E7=9B=91=E7=9D=A3=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/undocumented/index.vue         |   4 +-
 .../components/jointDebugList/index.vue       |  24 +-
 .../components/monitorpoint/addForm.vue       | 650 ++++++++++--------
 .../components/monitorpoint/index.vue         |  26 +-
 .../terminalNetworkDetection/index.vue        |   4 +-
 5 files changed, 388 insertions(+), 320 deletions(-)

diff --git a/src/views/pqs/supervise/interfere/components/undocumented/index.vue b/src/views/pqs/supervise/interfere/components/undocumented/index.vue
index 4d14b729..c00e7c4b 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented/index.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/index.vue
@@ -57,6 +57,8 @@ const tableStore = new TableStore({
     method: 'POST',
     column: [
         { title: '序号', type: 'seq', width: 80 },
+        { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
+        { field: 'substation', title: '变电站', minWidth: 100 },
         { field: 'projectName', title: '工程名称', minWidth: 170 },
         {
             field: 'userType',
@@ -68,7 +70,6 @@ const tableStore = new TableStore({
             }
         },
         { field: 'city', title: '所属地市', minWidth: 80 },
-        { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
         {
             field: 'userStatus',
             title: '用户状态',
@@ -87,7 +88,6 @@ const tableStore = new TableStore({
                 3: '退运'
             }
         },
-        { field: 'substation', title: '变电站', minWidth: 100 },
         {
             field: 'status',
             title: '审核状态',
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
index 6abb4680..179550db 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
@@ -49,6 +49,14 @@ const tableStore = new TableStore({
     method: 'POST',
     column: [
         { title: '序号', type: 'seq', width: 80 },
+        {
+            field: 'powerSubstationName',
+            title: '电网侧变电站',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return row.cellValue ? row.cellValue : '/'
+            }
+        },
         { field: 'lineName', title: '监测点名称', minWidth: 170 },
         {
             field: 'status',
@@ -66,14 +74,20 @@ const tableStore = new TableStore({
                 2: '审批通过',
                 3: '审批不通过',
                 4: '已取消',
-                null:'/'
+                null: '/'
+            }
+        },
+        {
+            field: 'reason',
+            title: '调试原因',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return row.cellValue ? row.cellValue : '/'
             }
         },
-        { field: 'reason', title: '调试原因', minWidth: 170 },
         { field: 'lineId', title: '监测点编号', minWidth: 170 },
         { field: 'monitoringTerminalCode', title: '监测终端编码', minWidth: 170 },
         { field: 'monitoringTerminalName', title: '监测终端名称', minWidth: 170 },
-        { field: 'powerSubstationName', title: '电网侧变电站', minWidth: 170 },
         {
             title: '操作',
             minWidth: 150,
@@ -90,7 +104,7 @@ const tableStore = new TableStore({
                         handleAudit(row.processInstanceId)
                     },
                     disabled: row => {
-                        return !row.processInstanceId;
+                        return !row.processInstanceId
                     }
                 },
                 {
@@ -103,7 +117,7 @@ const tableStore = new TableStore({
                         handleDebug(row)
                     },
                     disabled: row => {
-                        return row.reason;
+                        return row.reason
                     }
                 }
             ]
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue
index abc4b6fd..62f7b5d0 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue
@@ -20,290 +20,307 @@
             label-position="right"
             class="form-two"
         >
-            <el-tabs tab-position="left" v-model="activeName">
-                <el-tab-pane name="0" label="监测点信息" class="form-two">
-                    <div class="fixed_upload">
-                        <el-upload
-                            v-model:file-list="form.lineFilePath"
-                            ref="uploadRef"
-                            action=""
-                            accept=".xls,.xlsx"
-                            :limit="1"
-                            :on-exceed="handleExceed"
-                            :on-change="choose"
-                            :auto-upload="false"
-                            :on-progress="uploadFileName('lineFilePath')"
-                        >
-                            <template #trigger>
-                                <el-button type="primary">监测点台账信息</el-button>
-                            </template>
-                        </el-upload>
-                    </div>
-                    <!-- 基础信息 -->
-                    <el-form-item label="填报人：" prop="reporterName">
-                        <el-input
-                            v-model="form.reporterName"
-                            autocomplete="off"
-                            placeholder="请输入填报人"
-                            :disabled="true"
-                        />
-                    </el-form-item>
-                    <el-form-item label="填报日期：" prop="reportDate">
-                        <el-date-picker
-                            style="width: 100%"
-                            v-model="form.reportDate"
-                            :disabled="true"
-                            type="date"
-                            format="YYYY-MM-DD"
-                            value-format="YYYY-MM-DD"
-                            placeholder="请选择填报日期"
-                        />
-                    </el-form-item>
-                    <el-form-item label="填报部门：" prop="orgId">
-                        <el-input v-model="form.orgName" :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="true"
-                            :disabled-date="disabledDate"
-                            placeholder="请选择工程投产日期"
-                        />
-                    </el-form-item>
-                    <el-form-item label="所属地市：" prop="city">
-                        <el-select
-                            v-model="form.city"
-                            clearable
-                            style="width: 100%"
-                            :disabled="true"
-                            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-form-item label="用户状态：" prop="userStatus">
-                        <el-select
-                            v-model="form.userStatus"
-                            placeholder="请选择用户状态"
-                            :disabled="true"
-                            style="width: 100%"
-                        >
-                            <el-option
-                                v-for="(item, index) in userStateList"
-                                :label="item.name"
-                                :value="item.id"
-                                :disabled="item.name != '建设'"
-                                :key="index"
-                            />
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="关联干扰源：" prop="userName">
-                        <el-select
-                            v-model="form.userName"
-                            clearable
-                            style="width: 100%"
-                            placeholder="请选择关联干扰源"
-                            @change="changeUserName"
-                        >
-                            <el-option
-                                v-for="(item, index) in userNameList"
-                                :key="index"
-                                :label="item.projectName"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="关联设备：" prop="monitoringTerminalCode">
-                        <el-select
-                            v-model="form.monitoringTerminalCode"
-                            clearable
-                            style="width: 100%"
-                            filterable
-                            placeholder="请选择关联设备"
-                            @change="changeDevice"
-                        >
-                            <el-option
-                                v-for="(item, index) in monitoringTerminalList"
-                                :key="index"
-                                :label="item.monitoringTerminalName"
-                                :value="item.monitoringTerminalCode"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <!-- 监测点信息 -->
-                    <el-form-item label="监测点名称：" prop="lineName">
-                        <el-input v-model="form.lineName" autocomplete="off" placeholder="请输入监测点名称" />
-                    </el-form-item>
-                    <el-form-item label="监测点电压等级：" prop="voltageLevel">
-                        <el-select
-                            v-model="form.voltageLevel"
-                            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="connectedBus">
-                        <el-input v-model="form.connectedBus" autocomplete="off" placeholder="请输入接入母线" />
-                        <!-- <el-select
-                                        v-model="form.connectedBus"
-                                        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-form-item label="短路容量：" prop="shortCapacity">
-                        <el-input v-model="form.shortCapacity" autocomplete="off" placeholder="请输入短路容量" />
-                    </el-form-item>
-                    <el-form-item label="协议容量：" prop="dealCapacity">
-                        <el-input v-model="form.dealCapacity" autocomplete="off" placeholder="请输入协议容量" />
-                    </el-form-item>
-                    <el-form-item label="设备容量：" prop="devCapacity">
-                        <el-input v-model="form.devCapacity" autocomplete="off" placeholder="请输入设备容量" />
-                    </el-form-item>
-                    <el-form-item label="基准容量：" prop="standardCapacity">
-                        <el-input v-model="form.standardCapacity" autocomplete="off" placeholder="请输入基准容量" />
-                    </el-form-item>
-                    <el-form-item label="CT变比：" prop="ctRatio">
-                        <el-input v-model="form.ctRatio" autocomplete="off" placeholder="请输入CT变比" />
-                    </el-form-item>
-                    <el-form-item label="PT变比：" prop="ptRatio">
-                        <el-input v-model="form.ptRatio" autocomplete="off" placeholder="请输入PT变比" />
-                    </el-form-item>
-                    <el-form-item label="监测点编码：" prop="lineId">
-                        <el-input v-model="form.lineId" autocomplete="off" placeholder="请输入监测点编码" />
-                    </el-form-item>
-                    <el-form-item label="测量间隔：" prop="timeInterval">
-                        <el-input v-model="form.timeInterval" autocomplete="off" placeholder="请输入测量间隔" />
-                    </el-form-item>
-                    <el-form-item label="干扰源类型：" prop="loadType">
-                        <el-select
-                            v-model="form.loadType"
-                            clearable
-                            style="width: 100%"
-                            placeholder="请选择干扰源类型"
-                            @change="changeLoadType"
-                        >
-                            <el-option
-                                v-for="item in loadTypeList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="干扰源类别：" prop="businessType">
-                        <el-select
-                            v-model="form.businessType"
-                            clearable
-                            style="width: 100%"
-                            placeholder="请选择干扰源类别"
-                        >
-                            <el-option
-                                v-for="item in businessTypeList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="监测点性质：" prop="pointNature">
-                        <el-select v-model="form.pointNature" placeholder="请选择监测点性质">
-                            <el-option
-                                v-for="(item, index) in pointNatureList"
-                                :label="item.name"
-                                :value="item.id"
-                                :key="index"
-                            />
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="是否参与统计：" prop="isStatistical">
-                        <el-radio-group v-model="form.isStatistical">
-                            <el-radio value="1">是</el-radio>
-                            <el-radio value="0">否</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item label="对象名称(对端)：" prop="objName">
-                        <el-input v-model="form.objName" autocomplete="off" placeholder="请输入监测点对象名称" />
-                    </el-form-item>
-                    <el-form-item label="电网侧变电站：" prop="powerSubstationName">
-                        <el-input
-                            v-model="form.powerSubstationName"
-                            autocomplete="off"
-                            placeholder="请输入电网侧变电站"
-                        />
-                    </el-form-item>
-                    <el-form-item label="是否并网点：" prop="isGridConnectionPoint">
-                        <el-radio-group v-model="form.isGridConnectionPoint">
-                            <el-radio value="1">是</el-radio>
-                            <el-radio value="0">否</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item label="电压偏差上限：" prop="voltageDeviationUpperLimit">
-                        <el-input
-                            v-model="form.voltageDeviationUpperLimit"
-                            autocomplete="off"
-                            placeholder="请输入电压偏差上限"
-                        />
-                    </el-form-item>
-                    <el-form-item label="电压偏差下限：" prop="voltageDeviationLowerLimit">
-                        <el-input
-                            v-model="form.voltageDeviationLowerLimit"
-                            autocomplete="off"
-                            placeholder="请输入电压偏差下限"
-                        />
-                    </el-form-item>
-                    <el-form-item label="监测点运行状态：" prop="operationStatus">
-                        <el-select v-model="form.operationStatus" placeholder="请选择运行状态">
-                            <el-option
-                                v-for="(item, index) in operationStatusList"
-                                :label="item.name"
-                                :value="item.id"
-                                :key="index"
-                            />
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="主接线图：" prop="mainWiringDiagram">
-                        <el-upload
-                            v-model:file-list="form.mainWiringDiagram"
-                            ref="uploadRef"
-                            action=""
-                            accept=".doc,.docx,.xlsx,.xls,.pdf"
-                            :limit="1"
-                            :on-exceed="handleExceed"
-                            :on-change="choose"
-                            :auto-upload="false"
-                            :on-progress="uploadFileName('mainWiringDiagram')"
-                        >
-                            <template #trigger>
-                                <el-button type="primary">上传文件</el-button>
-                            </template>
-                        </el-upload>
-                    </el-form-item>
-                </el-tab-pane>
-            </el-tabs>
+            <div class="fixed_upload">
+                <el-upload
+                    v-model:file-list="form.lineFilePath"
+                    ref="uploadRef"
+                    action=""
+                    accept=".xls,.xlsx"
+                    :limit="1"
+                    :on-exceed="handleExceed"
+                    :on-change="choose"
+                    :auto-upload="false"
+                    :on-progress="uploadFileName('lineFilePath')"
+                >
+                    <template #trigger>
+                        <el-button type="primary">监测点台账信息</el-button>
+                    </template>
+                </el-upload>
+            </div>
+            <!-- 基础信息 -->
+            <el-form-item label="填报人：" prop="reporterName">
+                <el-input v-model="form.reporterName" autocomplete="off" placeholder="请输入填报人" :disabled="true" />
+            </el-form-item>
+            <el-form-item label="填报日期：" prop="reportDate">
+                <el-date-picker
+                    style="width: 100%"
+                    v-model="form.reportDate"
+                    :disabled="true"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    placeholder="请选择填报日期"
+                />
+            </el-form-item>
+            <el-form-item label="填报部门：" prop="orgId">
+                <el-input v-model="form.orgName" :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="true"
+                    :disabled-date="disabledDate"
+                    placeholder="请选择工程投产日期"
+                />
+            </el-form-item>
+            <el-form-item label="所属地市：" prop="city">
+                <el-select
+                    v-model="form.city"
+                    clearable
+                    style="width: 100%"
+                    :disabled="true"
+                    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-form-item label="用户状态：" prop="userStatus">
+                <el-select v-model="form.userStatus" placeholder="请选择用户状态" :disabled="true" style="width: 100%">
+                    <el-option
+                        v-for="(item, index) in userStateList"
+                        :label="item.name"
+                        :value="item.id"
+                        :disabled="item.name != '建设'"
+                        :key="index"
+                    />
+                </el-select>
+            </el-form-item>
+            <el-form-item label="关联干扰源：" prop="userName">
+                <el-select
+                    v-model="form.userName"
+                    clearable
+                    style="width: 100%"
+                    placeholder="请选择关联干扰源"
+                    @change="changeUserName"
+                >
+                    <el-option
+                        v-for="(item, index) in userNameList"
+                        :key="index"
+                        :label="item.projectName"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="关联设备：" prop="monitoringTerminalCode">
+                <el-select
+                    v-model="form.monitoringTerminalCode"
+                    clearable
+                    style="width: 100%"
+                    filterable
+                    placeholder="请选择关联设备"
+                    @change="changeDevice"
+                >
+                    <el-option
+                        v-for="(item, index) in monitoringTerminalList"
+                        :key="index"
+                        :label="item.monitoringTerminalName"
+                        :value="item.monitoringTerminalCode"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="接入母线：" prop="connectedBus">
+                <el-input v-model="form.connectedBus" autocomplete="off" placeholder="请输入接入母线" />
+            </el-form-item>
+            <el-form-item label="监测点运行状态：" prop="operationStatus">
+                <el-select v-model="form.operationStatus" placeholder="请选择运行状态">
+                    <el-option
+                        v-for="(item, index) in operationStatusList"
+                        :label="item.name"
+                        :value="item.id"
+                        :key="index"
+                    />
+                </el-select>
+            </el-form-item>
+            <el-form-item label="监测点名称：" prop="lineName">
+                <el-input v-model="form.lineName" autocomplete="off" placeholder="请输入监测点名称" />
+            </el-form-item>
+            <!-- {{ voltageLevelList[2].value * 10 }}:{{ 1 }} -->
+            <el-form-item label="监测点电压等级：" prop="voltageLevel">
+                <el-select
+                    v-model="form.voltageLevel"
+                    clearable
+                    style="width: 100%"
+                    placeholder="请选择监测点电压等级"
+                    @change="changevoltageDeviationLimit"
+                >
+                    <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="PT变比：" prop="ptRatio">
+                <el-input
+                    style="width: 48%"
+                    v-model="form.ptRatio"
+                    autocomplete="off"
+                    placeholder="请输入PT变比"
+                    oninput="value=value.replace(/[^0-9.]/g,'')"
+                />
+                <el-input
+                    style="width: 48%"
+                    v-model="form.ptRatio2"
+                    autocomplete="off"
+                    placeholder="请输入PT变比"
+                    oninput="value=value.replace(/[^0-9.]/g,'')"
+                />
+            </el-form-item>
+
+            <el-form-item label="CT变比：" prop="ctRatio">
+                <el-input
+                    v-model="form.ctRatio"
+                    style="width: 48%"
+                    autocomplete="off"
+                    oninput="value=value.replace(/[^0-9.]/g,'')"
+                    placeholder="请输入CT变比"
+                />
+                <el-input
+                    v-model="form.ctRatio2"
+                    style="width: 48%"
+                    autocomplete="off"
+                    oninput="value=value.replace(/[^0-9.]/g,'')"
+                    placeholder="请输入CT变比"
+                />
+            </el-form-item>
+            <el-form-item label="短路容量：" prop="shortCapacity">
+                <el-input
+                    v-model="form.shortCapacity"
+                    autocomplete="off"
+                    oninput="value=value.replace(/[^0-9.]/g,'')"
+                    placeholder="请输入短路容量"
+                >
+                    <template #append>MVA</template>
+                </el-input>
+            </el-form-item>
+            <el-form-item label="协议容量：" prop="dealCapacity">
+                <el-input
+                    v-model="form.dealCapacity"
+                    autocomplete="off"
+                    oninput="value=value.replace(/[^0-9.]/g,'')"
+                    placeholder="请输入协议容量"
+                >
+                    <template #append>MVA</template>
+                </el-input>
+            </el-form-item>
+            <el-form-item label="设备容量：" prop="devCapacity">
+                <el-input
+                    v-model="form.devCapacity"
+                    autocomplete="off"
+                    oninput="value=value.replace(/[^0-9.]/g,'')"
+                    placeholder="请输入设备容量"
+                >
+                    <template #append>MVA</template>
+                </el-input>
+            </el-form-item>
+            <el-form-item label="基准容量：" prop="standardCapacity">
+                <el-input
+                    v-model="form.standardCapacity"
+                    autocomplete="off"
+                    oninput="value=value.replace(/[^0-9.]/g,'')"
+                    placeholder="请输入基准容量"
+                >
+                    <template #append>MVA</template>
+                </el-input>
+            </el-form-item>
+            <el-form-item label="干扰源类型：" prop="loadType">
+                <el-select
+                    v-model="form.loadType"
+                    clearable
+                    style="width: 100%"
+                    placeholder="请选择干扰源类型"
+                    @change="changeLoadType"
+                >
+                    <el-option
+                        v-for="item in loadTypeList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="干扰源类别：" prop="businessType">
+                <el-select v-model="form.businessType" clearable style="width: 100%" placeholder="请选择干扰源类别">
+                    <el-option
+                        v-for="item in businessTypeList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="电压偏差上限：" prop="voltageDeviationUpperLimit">
+                <el-input-number style="width:100%" v-model="form.voltageDeviationUpperLimit" :min="-10" :max="10" />
+            </el-form-item>
+            <el-form-item label="电压偏差下限：" prop="voltageDeviationLowerLimit">
+                <el-input-number style="width:100%" v-model="form.voltageDeviationLowerLimit" :min="-10" :max="10" />
+            </el-form-item>
+            <el-form-item label="测量间隔：" prop="timeInterval">
+                <el-input
+                    v-model="form.timeInterval"
+                    autocomplete="off"
+                    oninput="value=value.replace(/[^0-9.]/g,'')"
+                    placeholder="请输入测量间隔"
+                />
+            </el-form-item>
+            <el-form-item label="监测点编码：" prop="lineId">
+                <el-input v-model="form.lineId" autocomplete="off" placeholder="请输入监测点编码" />
+            </el-form-item>
+            <el-form-item label="监测点性质：" prop="pointNature">
+                <el-select v-model="form.pointNature" placeholder="请选择监测点性质">
+                    <el-option
+                        v-for="(item, index) in pointNatureList"
+                        :label="item.name"
+                        :value="item.id"
+                        :key="index"
+                    />
+                </el-select>
+            </el-form-item>
+            <el-form-item label="是否参与统计：" prop="isStatistical">
+                <el-radio-group v-model="form.isStatistical">
+                    <el-radio value="1">是</el-radio>
+                    <el-radio value="0">否</el-radio>
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item label="对象名称(对端)：" prop="objName">
+                <el-input v-model="form.objName" autocomplete="off" placeholder="请输入监测点对象名称" />
+            </el-form-item>
+            <el-form-item label="电网侧变电站：" prop="powerSubstationName">
+                <el-input v-model="form.powerSubstationName" autocomplete="off" placeholder="请输入电网侧变电站" />
+            </el-form-item>
+            <el-form-item label="是否并网点：" prop="isGridConnectionPoint">
+                <el-radio-group v-model="form.isGridConnectionPoint">
+                    <el-radio value="1">是</el-radio>
+                    <el-radio value="0">否</el-radio>
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item label="主接线图：" prop="mainWiringDiagram">
+                <el-upload
+                    v-model:file-list="form.mainWiringDiagram"
+                    ref="uploadRef"
+                    action=""
+                    accept=".doc,.docx,.xlsx,.xls,.pdf"
+                    :limit="1"
+                    :on-exceed="handleExceed"
+                    :on-change="choose"
+                    :auto-upload="false"
+                    :on-progress="uploadFileName('mainWiringDiagram')"
+                >
+                    <template #trigger>
+                        <el-button type="primary">上传文件</el-button>
+                    </template>
+                </el-upload>
+            </el-form-item>
         </el-form>
         <template #footer>
             <div class="dialog-footer">
@@ -323,6 +340,7 @@ import { uploadFile } from '@/api/system-boot/file'
 import { getDeviceList } from '@/api/supervision-boot/terminal/index'
 import { addMointorPointFormData, getList } from '@/api/supervision-boot/monitorpoint/index'
 import { queryByAllCode } from '@/api/system-boot/dictTree'
+import { object } from 'vue-types'
 const emits = defineEmits(['onSubmit'])
 const dictData = useDictData()
 const dialogFormVisible = ref(false)
@@ -385,10 +403,8 @@ const operationStatusList = [
         name: '退运'
     }
 ]
-
 //获取登陆用户姓名和部门
 const adminInfo = useAdminInfo()
-
 //工程下拉选择数据
 const userNameList = ref([])
 //查询干扰源列表获取可选数据
@@ -414,7 +430,6 @@ const getSelectableList = () => {
         }
     })
 }
-
 const monitoringTerminalList = ref([])
 //获取关联设备
 const findAllMonitoringTerminalList = () => {
@@ -453,9 +468,14 @@ const resetForm = () => {
         //监测点信息实体
         businessType: '', //	干扰源类别
         connectedBus: '', //	接入母线
-        ctRatio: '0', //CT变比
-        dealCapacity: '0', //协议容量
-        devCapacity: '0', //设备容量
+        ctRatio: '300', //CT变比
+        ctRatio2: '5', //CT变比2
+        ptRatio: 1, //	PT变比
+        ptRatio2: 1, //	PT变比2
+        shortCapacity: '10', //	短路容量
+        dealCapacity: '10', //协议容量
+        devCapacity: '10', //设备容量
+        standardCapacity: '10', //基准容量
         isGridConnectionPoint: '0', //是否并网点
         isStatistical: '0', //	是否参与统计
         lineId: '', //	监测点编码
@@ -466,17 +486,42 @@ const resetForm = () => {
         operationStatus: operationStatusList[0].id, //监测点运行状态
         pointNature: pointNatureList[0].id, //监测点性质
         powerSubstationName: '', //电网侧变电站
-        ptRatio: '0', //	PT变比
-        shortCapacity: '0', //	短路容量
-        standardCapacity: '0', //基准容量
-        timeInterval: '0', //测量间隔
+        timeInterval: '1', //测量间隔
         voltageDeviationLowerLimit: '0', //电压偏差下限
         voltageDeviationUpperLimit: '0', //	电压偏差上限
         voltageLevel: voltageLevelList[0].id //监测点电压等级
     }
+    changevoltageDeviationLimit()
+}
+//根据检测点电压等级切换电压偏差上限/下限
+const changevoltageDeviationLimit = async () => {
+    let obj = voltageLevelList.find(item => {
+        return item.id == form.value.voltageLevel
+    })
+    const val = obj?.value
+    if (Number(val) > 35) {
+        form.value.voltageDeviationUpperLimit = 10
+        form.value.voltageDeviationLowerLimit = 10
+    }
+    if (Number(val) < 20) {
+        form.value.voltageDeviationUpperLimit = 7
+        form.value.voltageDeviationLowerLimit = 7
+    }
+    if (Number(val) < 0.22) {
+        form.value.voltageDeviationUpperLimit = 7
+        form.value.voltageDeviationLowerLimit = 10
+    }
+    //PT变比 电压<0.48kv 1:1 电压>0.48 *1000/100
+    if (Number(val) <= 0.48) {
+        form.value.ptRatio = 1
+        form.value.ptRatio2 = 1
+    }
+    if (Number(val) > 0.48) {
+        form.value.ptRatio = val * 10
+        form.value.ptRatio2 = 1
+    }
 }
 findAllMonitoringTerminalList()
-
 //获取树形图数据
 const treeData: any = ref('')
 //干扰源类型 取树形图第一层children数据
@@ -524,7 +569,6 @@ const changeUserName = () => {
         expectedProductionDate: obj?.expectedProductionDate
     }
 }
-
 //定义校验规则
 const rules = ref({
     //基础信息
@@ -765,7 +809,6 @@ const close = () => {
 onMounted(() => {
     console.log()
 })
-
 // 上传报告
 const uploadRef = ref()
 const handleExceed: UploadProps['onExceed'] = files => {
@@ -796,7 +839,6 @@ const choose = (e: any) => {
         }
     })
 }
-
 //设置工程投产日期时间选择范围不能<今天
 const disabledDate = time => {
     return time.getTime() < Date.now() - 8.64e7 // 8.64e7 毫秒数代表一天
@@ -823,7 +865,9 @@ const confirmForm = () => {
             confirmFormData = {
                 ...confirmFormData,
                 lineFilePath: lineFilePath?.value, //监测点信息
-                mainWiringDiagram: mainWiringDiagram.value //主接线图
+                mainWiringDiagram: mainWiringDiagram.value, //主接线图
+                ptRatio: form.value.ptRatio / form.value.ptRatio2, //PT变比
+                ctRatio: form.value.ctRatio / form.value.ctRatio2 //CT变比
             }
             addMointorPointFormData(confirmFormData).then(res => {
                 ruleFormRef.value.resetFields()
@@ -855,7 +899,11 @@ defineExpose({ open })
     display: flex;
     justify-content: flex-end;
 }
-::v-deep .el-tabs__content{
-    height:100% !important;
+::v-deep .el-tabs__content {
+    height: 100% !important;
+}
+::v-deep .el-form-item__content {
+    display: flex !important;
+    justify-content: space-between !important;
 }
 </style>
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
index acd64d1c..3de1d785 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
@@ -1,6 +1,6 @@
 <!---终端入网检测-->
 <template>
-    <TableHeader  area datePicker ref="TableHeaderRef">
+    <TableHeader area datePicker ref="TableHeaderRef">
         <!-- <template #select>
             <el-form-item label="工程名称">
                 <el-input v-model="tableStore.table.params.searchValue" clearable></el-input>
@@ -49,12 +49,19 @@ const tableStore = new TableStore({
     method: 'POST',
     column: [
         { title: '序号', type: 'seq', width: 80 },
-        { field: 'lineName', title: '监测点名称' , minWidth: 150 },
-        { field: 'connectedBus', title: '关联母线' , minWidth: 170 },
-        { field: 'monitoringTerminalName', title: '所属装置' , minWidth: 170 },
-        { field: 'powerSubstationName', title: '电网侧电站' , minWidth: 170 },
-        { field: 'orgName', title: '填报部门名称' , minWidth: 170 },
-        { field: 'reportDate', title: '填报日期', minWidth: 150},
+        { field: 'orgName', title: '填报部门名称', minWidth: 170 },
+        {
+            field: 'powerSubstationName',
+            title: '电网侧电站',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return row.cellValue ? row.cellValue : '/'
+            }
+        },
+        { field: 'connectedBus', title: '关联母线', minWidth: 170 },
+        { field: 'monitoringTerminalName', title: '所属装置', minWidth: 170 },
+        { field: 'lineName', title: '监测点名称', minWidth: 150 },
+        { field: 'reportDate', title: '填报日期', minWidth: 150 },
         { field: 'reporter', title: '填报人', minWidth: 80 },
         {
             field: 'status',
@@ -95,7 +102,7 @@ const tableStore = new TableStore({
     ],
 
     beforeSearchFun: () => {
-           tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
         // tableStore.table.params.relationUserName = tableStore.table.params.userName
     }
 })
@@ -110,8 +117,7 @@ const addForms = ref()
 const addFormModel = () => {
     setTimeout(() => {
         addForms.value.open()
-    }, 0);
-  
+    }, 0)
 }
 
 const exportEvent = () => {
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/index.vue
index b0eb9fe5..bf8c3ac6 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/index.vue
@@ -20,8 +20,8 @@ import { mainHeight } from '@/utils/layout'
 import terminal from './components/terminainal/index.vue'
 import monitorpoint from './components/monitorpoint/index.vue'
 import jointDebugList from './components/jointDebugList/index.vue'
-defineOptions({
-    name: 'amdin/terminalNetwotk'
+defineOptions({ 
+    name: 'terminalNetwotk'
 })
 const activeName = ref('1')
 const Statistics = ref()