From 4f37469113c2d7efb3334ee7a55f809487ccb40c Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Mon, 20 May 2024 10:33:49 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E7=9B=91=E6=B5=8B=E7=82=B9=E5=8F=B0?=
 =?UTF-8?q?=E8=B4=A6=E5=BD=95=E5=85=A5=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/monitorpoint/detail.vue        | 158 ++++++------------
 1 file changed, 52 insertions(+), 106 deletions(-)

diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue
index 7835066c..3b990970 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue
@@ -1,6 +1,14 @@
 <template>
     <div class="default-main">
         <el-descriptions :column="2" border>
+            <el-descriptions-item label="监测点台账信息" v-if="detailData.lineFilePath">
+                <el-icon>
+                    <Link />
+                </el-icon>
+                <a :href="detailData?.lineFilePath.url">
+                    {{ detailData?.lineFilePath.name }}
+                </a>
+            </el-descriptions-item>
             <el-descriptions-item label="填报人">
                 {{ detailData.reporter }}
             </el-descriptions-item>
@@ -33,7 +41,11 @@
                 {{ detailData.lineName }}
             </el-descriptions-item>
             <el-descriptions-item label="监测点电压等级">
-                {{ detailData.voltageLevel }}
+                {{ 
+                    voltageLevelList.find((item)=>{
+                        return detailData.voltageLevel==item.id
+                    })?.name
+                }}
             </el-descriptions-item>
             <el-descriptions-item label="接入母线">
                 {{ detailData.connectedBus }}
@@ -69,10 +81,10 @@
                 {{ detailData.businessType }}
             </el-descriptions-item>
             <el-descriptions-item label="监测点性质">
-                {{ detailData.pointNature }}
+                {{ detailData.pointNature=='0'?'电网侧':'非电网侧' }}
             </el-descriptions-item>
             <el-descriptions-item label="是否参与统计">
-                {{ detailData.isStatistical=='0'?'是':'否' }}
+                {{ detailData.isStatistical == '0' ? '是' : '否' }}
             </el-descriptions-item>
             <el-descriptions-item label="对象名称(对端)">
                 {{ detailData.objName }}
@@ -81,7 +93,7 @@
                 {{ detailData.powerSubstationName }}
             </el-descriptions-item>
             <el-descriptions-item label="是否并网点">
-                {{ detailData.isGridConnectionPoint=='0'?'是':'否' }}
+                {{ detailData.isGridConnectionPoint == '0' ? '是' : '否' }}
             </el-descriptions-item>
             <el-descriptions-item label="电压偏差上限">
                 {{ detailData.voltageDeviationUpperLimit }}
@@ -90,17 +102,13 @@
                 {{ detailData.voltageDeviationLowerLimit }}
             </el-descriptions-item>
             <el-descriptions-item label="监测点运行状态">
-                {{ detailData.operationStatus }}
+                {{ 
+                  operationStatusList.find((item)=>{
+                    return  detailData.operationStatus==item.id
+                  })?.name
+                }}
             </el-descriptions-item>
             <!--文件地址-->
-            <el-descriptions-item label="监测点台账信息" v-if="detailData.lineFilePath">
-                <el-icon>
-                    <Link />
-                </el-icon>
-                <a :href="detailData?.lineFilePath.url">
-                    {{ detailData?.lineFilePath.name }}
-                </a>
-            </el-descriptions-item>
             <el-descriptions-item label="主接线图" v-if="detailData?.mainWiringDiagram">
                 <el-icon>
                     <Link />
@@ -220,13 +228,35 @@ const frontEndMachineList = dictData.getBasicData('Front_Type')
 const terminalWiringMethodTypeList = dictData.getBasicData('Dev_Connect')
 //字典获取厂家
 const manufacturerList = dictData.getBasicData('Dev_Manufacturers')
+//定义监测点运行状态下拉框数据
+const operationStatusList = [
+    {
+        id: '0',
+        name: '运行'
+    },
+    {
+        id: '1',
+        name: '检修'
+    },
+    {
+        id: '2',
+        name: '停运'
+    },
+    {
+        id: '3',
+        name: '调试'
+    },
+    {
+        id: '4',
+        name: '退运'
+    }
+]
 /** 获得数据 */
 const getInfo = async () => {
     detailLoading.value = true
     try {
         await getTempLineDetailsById({ id: props.id || queryId }).then(res => {
             detailData.value = res.data
-            console.log(detailData.value, '++++获取监测点详情数据+++++')
             getFileName()
         })
     } finally {
@@ -234,115 +264,31 @@ const getInfo = async () => {
     }
 }
 const getFileName = async () => {
-    //验收检验报告
-    if (detailData.value.acceptanceInspectionReport) {
-        await getFileNamePath(detailData.value.acceptanceInspectionReport, 'acceptanceInspectionReport')
-    }
-    //验收检验报告单
-    if (detailData.value.acceptanceInspectionReportSingle) {
-        await getFileNamePath(detailData.value.acceptanceInspectionReportSingle, 'acceptanceInspectionReportSingle')
-    }
-    //出厂检验报告
-    if (detailData.value.factoryInspectionReport) {
-        await getFileNamePath(detailData.value.factoryInspectionReport, 'factoryInspectionReport')
-    }
-
-    //信息安全检测报告
-    if (detailData.value.informationSecurityTestReport) {
-        await getFileNamePath(detailData.value.informationSecurityTestReport, 'informationSecurityTestReport')
-    }
     //监测点台账信息
     if (detailData.value.lineFilePath) {
         await getFileNamePath(detailData.value.lineFilePath, 'lineFilePath')
     }
-
-    //其他附件
-    if (detailData.value.otherAttachments) {
-        await getFileNamePath(detailData.value.otherAttachments, 'otherAttachments')
+    //主接线图
+    else  if (detailData.value.mainWiringDiagram) {
+        await getFileNamePath(detailData.value.mainWiringDiagram, 'mainWiringDiagram')
     }
 
-    //性能检测报告
-    if (detailData.value.performanceTestReport) {
-        await getFileNamePath(detailData.value.performanceTestReport, 'performanceTestReport')
-    }
-
-    //型式实验报告
-    if (detailData.value.typeExperimentReport) {
-        await getFileNamePath(detailData.value.typeExperimentReport, 'typeExperimentReport')
-    }
-
-    //其他附件
-    // if (detailData.value.additionalAttachments) {
-    //     getFileNamePath(detailData.value.additionalAttachments, 'additionalAttachments')
-    // }
 }
 //根据文件名请求
 const getFileNamePath = async (val: any, pathName: any) => {
     await getFileNameAndFilePath({ filePath: val }).then(res => {
         console.log(111111111)
         if (res.data) {
-            //可研报告
-            if (pathName == 'acceptanceInspectionReport' && detailData.value.acceptanceInspectionReport) {
-                detailData.value.acceptanceInspectionReport = {
-                    name: res.data.fileName,
-                    url: res.data.url
-                }
-            }
-            //终端台账信息
-            else if (
-                pathName == 'acceptanceInspectionReportSingle' &&
-                detailData.value.acceptanceInspectionReportSingle
-            ) {
-                detailData.value.acceptanceInspectionReportSingle = {
-                    name: res.data.fileName,
-                    url: res.data.url
-                }
-            }
-            //预测评估报告
-            else if (pathName == 'factoryInspectionReport' && detailData.value.factoryInspectionReport) {
-                detailData.value.factoryInspectionReport = {
-                    name: res.data.fileName,
-                    url: res.data.url
-                }
-            }
-            //预测评估评审意见报告
-            else if (pathName == 'informationSecurityTestReport' && detailData.value.informationSecurityTestReport) {
-                detailData.value.informationSecurityTestReport = {
-                    name: res.data.fileName,
-                    url: res.data.url
-                }
-            }
-            //用户接入变电站主接线示意图
-            else if (pathName == 'lineFilePath' && detailData.value.lineFilePath) {
+            //监测点台账信息
+            if (pathName == 'lineFilePath' && detailData.value.lineFilePath) {
                 detailData.value.lineFilePath = {
                     name: res.data.fileName,
                     url: res.data.url
                 }
             }
-            //主要敏感设备清单
-            else if (pathName == 'otherAttachments' && detailData.value.otherAttachments) {
-                detailData.value.otherAttachments = {
-                    name: res.data.fileName,
-                    url: res.data.url
-                }
-            }
-            //抗扰度测试报告
-            else if (pathName == 'performanceTestReport' && detailData.value.performanceTestReport) {
-                detailData.value.performanceTestReport = {
-                    name: res.data.fileName,
-                    url: res.data.url
-                }
-            }
-            //背景电能质量测试报告
-            else if (pathName == 'typeExperimentReport' && detailData.value.typeExperimentReport) {
-                detailData.value.typeExperimentReport = {
-                    name: res.data.fileName,
-                    url: res.data.url
-                }
-            }
-            //其他附件
-            else if (pathName == 'additionalAttachments' && detailData.value.additionalAttachments) {
-                detailData.value.additionalAttachments = {
+            //主接线图
+            else if (pathName == 'mainWiringDiagram' && detailData.value.mainWiringDiagram) {
+                detailData.value.mainWiringDiagram = {
                     name: res.data.fileName,
                     url: res.data.url
                 }

From 2f45334069c2312cb27cf13443522c4151bf380d Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Mon, 20 May 2024 10:50:24 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E7=9B=91=E6=B5=8B=E7=82=B9=E8=81=94?=
 =?UTF-8?q?=E8=B0=83=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/jointDebugList/addForm.vue     | 1106 +++++++++++++++++
 .../components/jointDebugList/debug.vue       |  264 ++++
 .../components/jointDebugList/detail.vue      |  383 ++++++
 .../components/jointDebugList/index.vue       |  212 ++++
 .../terminalNetworkDetection/index.vue        |    3 +-
 5 files changed, 1967 insertions(+), 1 deletion(-)
 create mode 100644 src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/addForm.vue
 create mode 100644 src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/debug.vue
 create mode 100644 src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/detail.vue
 create mode 100644 src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue

diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/addForm.vue
new file mode 100644
index 00000000..75873c55
--- /dev/null
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/addForm.vue
@@ -0,0 +1,1106 @@
+<template>
+    <el-dialog
+        v-model="dialogFormVisible"
+        title="监测点信息"
+        width="60%"
+        :append-to-body="true"
+        :before-close="close"
+        :close-on-click-modal="false"
+        :lazy="true"
+        draggable
+    >
+        <!--监测点信息录入 基础信息+监测点信息  监测点信息要有工程名称、用户状态 -->
+        <el-form
+            :model="form"
+            :validate-on-rule-change="false"
+            :scroll-to-error="true"
+            :rules="rules"
+            ref="ruleFormRef"
+            label-width="140px"
+            label-position="right"
+        >
+            <el-tabs tab-position="left" class="tabs_form" v-model="activeName">
+                <el-tab-pane name="0" label="监测点信息">
+                    <div class="form_tab_item">
+                        <el-row>
+                            <el-col :span="12"></el-col>
+                            <el-col :span="12" class="required_position">
+                                <span class="required_icon" style="color: #fff">*</span>
+                                <el-form-item label="监测点台账信息：" prop="lineFilePath">
+                                    <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>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <!-- 基础信息 -->
+                        <el-row>
+                            <el-col :span="12">
+                                <el-form-item label="填报人：" prop="reporter">
+                                    <el-input
+                                        v-model="form.reporter"
+                                        autocomplete="off"
+                                        place-holder="请输入填报人"
+                                        :disabled="true"
+                                    />
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <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-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :span="12">
+                                <el-form-item label="填报部门：" prop="orgId">
+                                    <el-input v-model="form.orgName" :disabled="true" autocomplete="off" />
+                                </el-form-item>
+                            </el-col>
+
+                            <el-col :span="12">
+                                <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-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :span="12">
+                                <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-col>
+
+                            <el-col :span="12">
+                                <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-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :span="12">
+                                <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.name"
+                                            :value="item.id"
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <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-col>
+                        </el-row>
+                        <!-- 监测点信息 -->
+                        <el-row>
+                            <el-col :span="12">
+                                <el-form-item label="监测点名称：" prop="lineName">
+                                    <el-input
+                                        v-model="form.lineName"
+                                        autocomplete="off"
+                                        place-holder="请输入监测点名称"
+                                    />
+                                </el-form-item>
+                            </el-col>
+
+                            <el-col :span="12">
+                                <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-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :span="12">
+                                <el-form-item label="接入母线：" prop="connectedBus">
+                                    <el-input
+                                        v-model="form.connectedBus"
+                                        autocomplete="off"
+                                        place-holder="请输入接入母线"
+                                    />
+                                    <!-- <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-col>
+
+                            <el-col :span="12">
+                                <el-form-item label="短路容量：" prop="shortCapacity">
+                                    <el-input
+                                        v-model="form.shortCapacity"
+                                        autocomplete="off"
+                                        placeholder="请输入短路容量"
+                                    />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :span="12">
+                                <el-form-item label="协议容量：" prop="dealCapacity">
+                                    <el-input
+                                        v-model="form.dealCapacity"
+                                        autocomplete="off"
+                                        placeholder="请输入协议容量"
+                                    />
+                                </el-form-item>
+                            </el-col>
+
+                            <el-col :span="12">
+                                <el-form-item label="设备容量：" prop="devCapacity">
+                                    <el-input
+                                        v-model="form.devCapacity"
+                                        autocomplete="off"
+                                        placeholder="请输入设备容量"
+                                    />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :span="12">
+                                <el-form-item label="基准容量：" prop="standardCapacity">
+                                    <el-input
+                                        v-model="form.standardCapacity"
+                                        autocomplete="off"
+                                        placeholder="请输入基准容量"
+                                    />
+                                </el-form-item>
+                            </el-col>
+
+                            <el-col :span="12">
+                                <el-form-item label="CT变比：" prop="ctRatio">
+                                    <el-input v-model="form.ctRatio" autocomplete="off" placeholder="请输入CT变比" />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :span="12">
+                                <el-form-item label="PT变比：" prop="ptRatio">
+                                    <el-input v-model="form.ptRatio" autocomplete="off" placeholder="请输入PT变比" />
+                                </el-form-item>
+                            </el-col>
+
+                            <el-col :span="12">
+                                <el-form-item label="监测点编码：" prop="lineId">
+                                    <el-input v-model="form.lineId" autocomplete="off" placeholder="请输入监测点编码" />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :span="12">
+                                <el-form-item label="测量间隔：" prop="timeInterval">
+                                    <el-input
+                                        v-model="form.timeInterval"
+                                        autocomplete="off"
+                                        placeholder="请输入测量间隔"
+                                    />
+                                </el-form-item>
+                            </el-col>
+
+                            <el-col :span="12">
+                                <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-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :span="12">
+                                <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-col>
+
+                            <el-col :span="12">
+                                <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-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :span="12">
+                                <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-col>
+
+                            <el-col :span="12">
+                                <el-form-item label="对象名称(对端)：" prop="objName">
+                                    <el-input
+                                        v-model="form.objName"
+                                        autocomplete="off"
+                                        placeholder="请输入监测点对象名称"
+                                    />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :span="12">
+                                <el-form-item label="电网侧变电站：" prop="powerSubstationName">
+                                    <el-input
+                                        v-model="form.powerSubstationName"
+                                        autocomplete="off"
+                                        placeholder="请输入电网侧变电站"
+                                    />
+                                </el-form-item>
+                            </el-col>
+
+                            <el-col :span="12">
+                                <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-col>
+                        </el-row>
+
+                        <el-row>
+                            <el-col :span="12">
+                                <el-form-item label="电压偏差上限：" prop="voltageDeviationUpperLimit">
+                                    <el-input
+                                        v-model="form.voltageDeviationUpperLimit"
+                                        autocomplete="off"
+                                        placeholder="请输入电压偏差上限"
+                                    />
+                                </el-form-item>
+                            </el-col>
+
+                            <el-col :span="12">
+                                <el-form-item label="电压偏差下限：" prop="voltageDeviationLowerLimit">
+                                    <el-input
+                                        v-model="form.voltageDeviationLowerLimit"
+                                        autocomplete="off"
+                                        placeholder="请输入电压偏差下限"
+                                    />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :span="12">
+                                <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-col>
+
+                            <el-col :span="12" class="required_position">
+                                <span class="required_icon">*</span>
+                                <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-col>
+                        </el-row>
+                    </div>
+                </el-tab-pane>
+            </el-tabs>
+        </el-form>
+        <template #footer>
+            <div class="dialog-footer">
+                <el-button @click="close()">取消</el-button>
+                <el-button type="primary" @click="confirmForm()">确定</el-button>
+            </div>
+        </template>
+    </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref, onMounted, reactive, defineExpose, defineProps, defineEmits, watch, onUnmounted } from 'vue'
+import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+import { genFileId, ElMessage } from 'element-plus'
+import { useDictData } from '@/stores/dictData'
+import { useAdminInfo } from '@/stores/adminInfo'
+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'
+const emits = defineEmits(['onSubmit'])
+const dictData = useDictData()
+const dialogFormVisible = ref(false)
+const form: any = ref({})
+const ruleFormRef = ref(null)
+//字典获取所属地市
+const areaOptionList = dictData.getBasicData('jibei_area')
+//字典获取监测点电压等级
+const voltageLevelList = dictData.getBasicData('Dev_Voltage_Stand')
+//用户状态数组
+const userStateList = reactive([
+    {
+        name: '可研',
+        id: '0'
+    },
+    {
+        name: '建设',
+        id: '1'
+    },
+    {
+        name: '运行',
+        id: '2'
+    },
+    {
+        name: '退运',
+        id: '3'
+    }
+])
+//定义监测点性质下拉框数据
+const pointNatureList = [
+    {
+        id: '0',
+        name: '电网侧'
+    },
+    {
+        id: '1',
+        name: '非电网侧'
+    }
+]
+//定义监测点运行状态下拉框数据
+const operationStatusList = [
+    {
+        id: '0',
+        name: '运行'
+    },
+    {
+        id: '1',
+        name: '检修'
+    },
+    {
+        id: '2',
+        name: '停运'
+    },
+    {
+        id: '3',
+        name: '调试'
+    },
+    {
+        id: '4',
+        name: '退运'
+    }
+]
+
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
+
+//工程下拉选择数据
+const userNameList = ref([])
+//查询干扰源列表获取可选数据
+const projectList = ref([])
+const getSelectableList = () => {
+    let obj = {}
+    getList(obj).then(res => {
+        projectList.value = res.data
+        res.data.map(item => {
+            userNameList.value.push({
+                name:item?.projectName,
+                id:item?.id
+            })
+        })
+        //初始化
+        let obj = res.data[0]
+        form.value = {
+            ...form.value,
+            city: obj.city,
+            reporter: obj.reporter,
+            reportDate: obj.reportDate,
+            orgId: obj.orgId,
+            orgName:obj.orgName,
+            expectedProductionDate: obj.expectedProductionDate,
+            userName:userNameList.value[0]?.name,
+            userId:userNameList.value[0]?.id
+        }
+    })
+}
+
+const monitoringTerminalList = ref([])
+//获取关联设备
+const findAllMonitoringTerminalList = () => {
+    getDeviceList().then(res => {
+        console.log(res, '-------------')
+        monitoringTerminalList.value = res.data
+        console.log(monitoringTerminalList.value[0].monitoringTerminalCode, '++++++++++')
+    })
+}
+//查询关联设备下拉框
+const changeDevice = () => {
+    const obj = monitoringTerminalList.value.find(item => {
+        return form.value.monitoringTerminalCode == item.monitoringTerminalCode
+    })
+    form.value = {
+        ...form.value,
+        monitoringTerminalCode: obj.monitoringTerminalCode,
+        monitoringTerminalName: obj.monitoringTerminalName
+    }
+}
+//定义切换form类型
+const selectFormType = ref('')
+selectFormType.value = '0'
+const resetForm = () => {
+    form.value = {
+        reporter: '', //填报人
+        reportDate: '', //填报日期
+        orgId: '', //填报部门id
+        orgName:'', //填报部门名称
+        expectedProductionDate: '', //工程投产日期
+        city: areaOptionList[0].name, //所属地市
+        userStatus: userStateList[1].id, //用户状态
+        monitoringTerminalCode: monitoringTerminalList.value[0]?.monitoringTerminalCode, //关联设备
+        monitoringTerminalName: monitoringTerminalList.value[0]?.monitoringTerminalName,
+        userName: '', //工程名称
+        userId: '', //工程id
+
+        //监测点信息实体
+        businessType: '', //	干扰源类别
+        connectedBus: '', //	接入母线
+        ctRatio: '0', //CT变比
+        dealCapacity: '0', //协议容量
+        devCapacity: '0', //设备容量
+        isGridConnectionPoint: '0', //是否并网点
+        isStatistical: '0', //	是否参与统计
+        lineId: '', //	监测点编码
+        lineName: '', //	监测点名称
+        loadType: '', //干扰源类型
+        mainWiringDiagram: [], //	主接线图
+        objName: '', //监测点对象名称
+        operationStatus: operationStatusList[0].id, //监测点运行状态
+        pointNature: pointNatureList[0].id, //监测点性质
+        powerSubstationName: '', //电网侧变电站
+        ptRatio: '0', //	PT变比
+        shortCapacity: '0', //	短路容量
+        standardCapacity: '0', //基准容量
+        timeInterval: '0', //测量间隔
+        voltageDeviationLowerLimit: '0', //电压偏差下限
+        voltageDeviationUpperLimit: '0', //	电压偏差上限
+        voltageLevel: voltageLevelList[0].id //监测点电压等级
+    }
+
+    // form.value.reporter = adminInfo.$state.name
+    // form.value.orgId = adminInfo.$state.deptName
+}
+//初始化数据
+resetForm()
+getSelectableList()
+findAllMonitoringTerminalList()
+
+//获取树形图数据
+const treeData: any = ref('')
+//干扰源类型 取树形图第一层children数据
+const loadTypeList = ref([])
+//干扰源类别 取树形图第二层children数据
+const businessTypeList = ref([])
+const getTreeList = () => {
+    queryByAllCode().then(res => {
+        treeData.value = [res.data.find(item => item.code == 'Major_Nonlinear_Device')]
+        treeData.value[0].children.map(item => {
+            //干扰源类型数据
+            loadTypeList.value.push({
+                id: item?.id,
+                name: item?.name,
+                children: item?.children
+            })
+        })
+        form.value.loadType = loadTypeList.value[0]?.id
+        changeLoadType()
+    })
+}
+getTreeList()
+//选择干扰源类型的时候，干扰源类别数据跟随改变
+const changeLoadType = async () => {
+    businessTypeList.value = loadTypeList.value.find(item => {
+        return item.id == form.value.loadType
+    }).children
+    form.value.businessType = businessTypeList.value[0]?.id
+}
+//选择关联干扰源回显数据
+const changeUserName = () => {
+    let obj = projectList.value.find(item => {
+        return form.value.userName == item.projectName
+    })
+    form.value = {
+        ...form.value,
+        city: obj.city,
+        reporter: obj.reporter,
+        reportDate: obj.reportDate,
+        orgId: obj.orgId,
+        orgName: obj.orgName,
+        userName: obj.projectName,
+        userId: obj.id,
+        expectedProductionDate: obj.expectedProductionDate
+    }
+    console.log(obj, '选择关联干扰源回显数据')
+}
+//监测点信息表单格式
+const monitorPointForm = ref({
+    reporter: '', //填报人
+    reportDate: '', //填报日期
+    orgId: '', //填报部门
+    orgName:'',
+    expectedProductionDate: '', //工程投产日期
+    city: areaOptionList[0].name, //所属地市
+    userStatus: userStateList[1].id, //用户状态
+    userName: '', //工程名称
+    userId: '',
+    monitoringTerminalCode: '', //关联设备
+    monitoringTerminalName: '',
+
+    //监测点信息实体
+    // supervisionTempLineReportParam: {
+    businessType: '', //	干扰源类别
+    connectedBus: '', //	接入母线
+    ctRatio: '0', //CT变比
+    dealCapacity: '0', //协议容量
+    devCapacity: '0', //设备容量
+    isGridConnectionPoint: '0', //是否并网点
+    isStatistical: '0', //	是否参与统计
+    lineId: '', //	监测点编码
+    lineName: '', //	监测点名称
+    loadType: '', //干扰源类型
+    mainWiringDiagram: '', //	主接线图
+    objName: '', //监测点对象名称
+    operationStatus: '', //监测点运行状态
+    pointNature: '', //监测点性质
+    powerSubstationName: '', //电网侧变电站
+    ptRatio: '0', //	PT变比
+    shortCapacity: '0', //	短路容量
+    standardCapacity: '0', //基准容量
+    timeInterval: '0', //测量间隔
+    voltageDeviationLowerLimit: '0', //电压偏差下限
+    voltageDeviationUpperLimit: '0', //	电压偏差上限
+    voltageLevel: '' //监测点电压等级
+    // }
+})
+
+//定义校验规则
+const rules = ref({
+    //基础信息
+    reporter: [
+        {
+            required: true,
+            message: '请输入填报人',
+            trigger: 'blur'
+        }
+    ],
+    reportDate: [
+        {
+            required: true,
+            message: '请选择填报日期',
+            trigger: 'change'
+        }
+    ],
+    orgId: [
+        {
+            required: true,
+            message: '请选择填报部门',
+            trigger: 'change'
+        }
+    ],
+    expectedProductionDate: [
+        {
+            required: true,
+            message: '请选择工程投产日期',
+            trigger: 'change'
+        }
+    ],
+    city: [
+        {
+            required: true,
+            message: '请选择所属地市',
+            trigger: 'change'
+        }
+    ],
+    userStatus: [
+        {
+            required: true,
+            message: '请选择用户状态',
+            trigger: 'change'
+        }
+    ],
+    userName: [
+        {
+            required: true,
+            message: '请选择工程名称',
+            trigger: 'change'
+        }
+    ],
+    monitoringTerminalCode: [
+        {
+            required: true,
+            message: '请选择关联设备',
+            trigger: 'change'
+        }
+    ],
+    //监测点信息
+    lineName: [
+        {
+            required: true,
+            message: '请输入监测点名称',
+            trigger: 'blur'
+        }
+    ],
+    voltageLevel: [
+        {
+            required: true,
+            message: '请选择监测点电压等级',
+            trigger: 'change'
+        }
+    ],
+    connectedBus: [
+        {
+            required: true,
+            message: '请选择接入母线',
+            trigger: 'blur'
+        }
+    ],
+    shortCapacity: [
+        {
+            required: true,
+            message: '请输入短路容量',
+            trigger: 'blur'
+        }
+    ],
+    dealCapacity: [
+        {
+            required: true,
+            message: '请输入协议容量',
+            trigger: 'blur'
+        }
+    ],
+    devCapacity: [
+        {
+            required: true,
+            message: '请输入设备容量',
+            trigger: 'blur'
+        }
+    ],
+    standardCapacity: [
+        {
+            required: true,
+            message: '请输入基准容量',
+            trigger: 'blur'
+        }
+    ],
+    ctRatio: [
+        {
+            required: true,
+            message: '请输入CT变化',
+            trigger: 'blur'
+        }
+    ],
+    ptRatio: [
+        {
+            required: true,
+            message: '请输入PT变化',
+            trigger: 'blur'
+        }
+    ],
+    lineId: [
+        {
+            required: true,
+            message: '请输入监测点编码',
+            trigger: 'blur'
+        }
+    ],
+    timeInterval: [
+        {
+            required: true,
+            message: '请输入测量间隔',
+            trigger: 'blur'
+        }
+    ],
+    loadType: [
+        {
+            required: true,
+            message: '请选择干扰源类型',
+            trigger: 'change'
+        }
+    ],
+    businessType: [
+        {
+            required: true,
+            message: '请选择干扰源类别',
+            trigger: 'change'
+        }
+    ],
+    pointNature: [
+        {
+            required: true,
+            message: '请选择监测点性质',
+            trigger: 'change'
+        }
+    ],
+    isStatistical: [
+        {
+            required: true,
+            message: '请选择是否参与统计',
+            trigger: 'change'
+        }
+    ],
+    objName: [
+        {
+            required: true,
+            message: '请输入监测点对象名称',
+            trigger: 'blur'
+        }
+    ],
+    powerSubstationName: [
+        {
+            required: false,
+            message: '请选择电网侧变电站',
+            trigger: 'change'
+        }
+    ],
+    isGridConnectionPoint: [
+        {
+            required: true,
+            message: '请选择是否并网点',
+            trigger: 'change'
+        }
+    ],
+    operationStatus: [
+        {
+            required: true,
+            message: '请选择监测点运行状态',
+            trigger: 'change'
+        }
+    ],
+    mainWiringDiagram: [
+        {
+            required: false,
+            message: '请上传主接线图',
+            trigger: 'change'
+        }
+    ],
+    voltageDeviationUpperLimit: [
+        {
+            required: false,
+            message: '请输入电压偏差上限',
+            trigger: 'blur'
+        }
+    ],
+    voltageDeviationLowerLimit: [
+        {
+            required: false,
+            message: '请输入电压偏差下限',
+            trigger: 'blur'
+        }
+    ]
+})
+watch(
+    () => form.value,
+    (val, oldVal) => {},
+    {
+        deep: true,
+        immediate: true
+    }
+)
+const open = () => {
+    dialogFormVisible.value = true
+}
+const close = () => {
+    //重置表单内容
+    //取消表单校验状态
+    ruleFormRef.value && ruleFormRef.value.resetFields()
+    dialogFormVisible.value = false
+    emits('onSubmit')
+    resetForm()
+}
+onMounted(() => {
+    console.log()
+})
+
+// 上传报告
+const uploadRef = ref()
+const handleExceed: UploadProps['onExceed'] = files => {
+    uploadRef.value!.clearFiles()
+    const file = files[0] as UploadRawFile
+    file.uid = genFileId()
+    uploadRef.value!.handleStart(file)
+}
+let uploadName = ref('')
+//上传报告改变
+const uploadFileName = val => {
+    uploadName.value = val
+}
+//监测点台账信息
+const lineFilePath = ref('')
+//主接线图
+const mainWiringDiagram = ref('')
+const choose = (e: any) => {
+    uploadFile(e.raw, '/supervision/').then(res => {
+        //监测点台账信息
+        if (uploadName.value == 'lineFilePath') {
+            lineFilePath.value = res.data.name
+        }
+        //主接线图
+        else if (uploadName.value == 'mainWiringDiagram') {
+            mainWiringDiagram.value = res.data.name
+            console.log(mainWiringDiagram.value, '++++++++')
+        }
+    })
+}
+
+//设置工程投产日期时间选择范围不能<今天
+const disabledDate = time => {
+    return time.getTime() < Date.now() - 8.64e7 // 8.64e7 毫秒数代表一天
+}
+const activeName = ref('0')
+//提交
+const confirmForm = () => {
+    console.log(form.value, '打印form对象')
+    // 先判断提交终端信息与监测点信息
+
+    // 提交监测点信息
+        ruleFormRef.value.validate(valid => {
+            if (valid) {
+                //整理上传文件的数据
+                //处理填报日期时间格式
+                form.value.reportDate = window.XEUtils.toDateString(form.value.reportDate, 'yyyy-MM-dd')
+                let confirmFormData = JSON.parse(JSON.stringify(form.value))
+
+                //1.判断是否上传
+                // if (!lineFilePath.value) {
+                //     return ElMessage({
+                //         message: '请上传监测点台账信息',
+                //         type: 'warning'
+                //     })
+                // }
+                if (!mainWiringDiagram.value) {
+                    return ElMessage({
+                        message: '请上传主接线图',
+                        type: 'warning'
+                    })
+                }
+                //提交终端信息
+                confirmFormData = {
+                    ...confirmFormData,
+                    lineFilePath: lineFilePath?.value, //监测点信息
+                    mainWiringDiagram: mainWiringDiagram.value //主接线图
+                }
+                addMointorPointFormData(confirmFormData).then(res => {
+                    ruleFormRef.value.resetFields()
+                    resetForm()
+                    close()
+                })
+            } else {
+                console.log('表单验证失败')
+                return false
+            }
+        })
+}
+defineExpose({ open })
+</script>
+<style lang="scss" scoped>
+.el-form {
+    // width: 96%;
+    height: 400px;
+    margin: 0 auto;
+    // overflow-y: auto;
+    padding-top: 20px;
+}
+.dialog-footer {
+    padding: 10px;
+}
+/* 调整标签的换行行为 */
+.label_over_warp::v-deep .el-form-item__label {
+    // white-space: pre-line !important;
+    line-height: 16px !important;
+}
+::v-deep .el-form-item {
+    padding: 0 10px;
+    height: auto !important;
+}
+::v-deep .el-form-item__label {
+    justify-content: flex-start !important;
+}
+.form-label-left-align {
+    text-align: left;
+}
+::v-deep .el-input-number .el-input__inner {
+    text-align: left;
+}
+
+//表单tab容器
+.form_tab_item {
+    height: 400px;
+    overflow-y: auto;
+}
+::v-deep .el-input {
+    width: 200px !important;
+}
+::v-deep .el-select {
+    width: 200px !important;
+}
+::v-deep .required_position {
+    position: relative;
+    .required_icon {
+        position: absolute;
+        left: -10px;
+        margin-top: 8px;
+        color: #f56c6c;
+        margin-left: 10px;
+    }
+    .required_text {
+        padding-left: 20px;
+    }
+}
+.no_required::v-deep .el-form-item__label {
+    padding-left: 10px !important;
+    width: 70px !important;
+    margin-left: 0px !important;
+}
+
+// ::v-deep .tabs_form{
+//     height:300px !important;
+// }
+</style>
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/debug.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/debug.vue
new file mode 100644
index 00000000..bf16bfc5
--- /dev/null
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/debug.vue
@@ -0,0 +1,264 @@
+<template>
+    <el-dialog
+        v-model="dialogFormVisible"
+        title="联调申请"
+        width="60%"
+        :append-to-body="true"
+        :before-close="close"
+        :close-on-click-modal="false"
+        :lazy="true"
+        draggable
+    >
+        <!--监测点信息录入 基础信息+监测点信息  监测点信息要有工程名称、用户状态 -->
+        <el-form
+            :model="form"
+            :validate-on-rule-change="false"
+            :scroll-to-error="true"
+            :rules="rules"
+            ref="ruleFormRef"
+            label-width="140px"
+            label-position="right"
+        >
+            <!-- 基础信息 -->
+            <el-row>
+                <el-col :span="12">
+                    <el-form-item label="填报人：" prop="reporter">
+                        <el-input
+                            v-model="form.reporter"
+                            autocomplete="off"
+                            place-holder="请输入填报人"
+                            :disabled="true"
+                        />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                    <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-col>
+            </el-row>
+            <el-row>
+                <el-col :span="12">
+                    <el-form-item label="填报部门：" prop="orgId">
+                        <el-input v-model="form.orgName" :disabled="true" autocomplete="off" />
+                    </el-form-item>
+                </el-col>
+
+                <el-col :span="12">
+                    <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-col>
+            </el-row>
+        </el-form>
+        <template #footer>
+            <div class="dialog-footer">
+                <el-button @click="close()">取消</el-button>
+                <el-button type="primary" @click="confirmForm()">确定</el-button>
+            </div>
+        </template>
+    </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref, onMounted, reactive, defineExpose, defineProps, defineEmits, watch, onUnmounted } from 'vue'
+import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+import { genFileId, ElMessage } from 'element-plus'
+import { useDictData } from '@/stores/dictData'
+import { useAdminInfo } from '@/stores/adminInfo'
+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'
+const emits = defineEmits(['onSubmit'])
+const dictData = useDictData()
+const dialogFormVisible = ref(false)
+const form: any = ref({})
+const ruleFormRef = ref(null)
+//定义切换form类型
+const selectFormType = ref('')
+selectFormType.value = '0'
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
+const resetForm = () => {
+    form.value = {
+        reporter: '', //填报人
+        reportDate: new Date(), //填报日期
+        orgId: '', //填报部门id
+        orgName: '', //填报部门名称
+
+    }
+
+    form.value.reporter = adminInfo.$state.name
+    form.value.orgName = adminInfo.$state.deptName
+}
+//初始化数据
+resetForm()
+//定义校验规则
+const rules = ref({
+    //基础信息
+    reporter: [
+        {
+            required: true,
+            message: '请输入填报人',
+            trigger: 'blur'
+        }
+    ],
+    reportDate: [
+        {
+            required: true,
+            message: '请选择填报日期',
+            trigger: 'change'
+        }
+    ],
+    orgId: [
+        {
+            required: true,
+            message: '请选择填报部门',
+            trigger: 'change'
+        }
+    ],
+    expectedProductionDate: [
+        {
+            required: true,
+            message: '请选择工程投产日期',
+            trigger: 'change'
+        }
+    ],
+})
+watch(
+    () => form.value,
+    (val, oldVal) => {},
+    {
+        deep: true,
+        immediate: true
+    }
+)
+const open = () => {
+    dialogFormVisible.value = true
+}
+const close = () => {
+    //重置表单内容
+    //取消表单校验状态
+    ruleFormRef.value && ruleFormRef.value.resetFields()
+    dialogFormVisible.value = false
+    emits('onSubmit')
+    resetForm()
+}
+onMounted(() => {
+    console.log()
+})
+
+
+//设置工程投产日期时间选择范围不能<今天
+const disabledDate = time => {
+    return time.getTime() < Date.now() - 8.64e7 // 8.64e7 毫秒数代表一天
+}
+//提交
+const confirmForm = () => {
+    // 提交监测点信息
+    ruleFormRef.value.validate(valid => {
+        if (valid) {
+            //整理上传文件的数据
+            //处理填报日期时间格式
+            form.value.reportDate = window.XEUtils.toDateString(form.value.reportDate, 'yyyy-MM-dd')
+            let confirmFormData = JSON.parse(JSON.stringify(form.value))
+
+        
+            //提交终端信息
+            confirmFormData = {
+                ...confirmFormData,
+            }
+            addMointorPointFormData(confirmFormData).then(res => {
+                ruleFormRef.value.resetFields()
+                resetForm()
+                close()
+            })
+        } else {
+            console.log('表单验证失败')
+            return false
+        }
+    })
+}
+defineExpose({ open })
+</script>
+<style lang="scss" scoped>
+.el-form {
+    // width: 96%;
+    height: 400px;
+    margin: 0 auto;
+    // overflow-y: auto;
+    padding-top: 20px;
+}
+.dialog-footer {
+    padding: 10px;
+}
+/* 调整标签的换行行为 */
+.label_over_warp::v-deep .el-form-item__label {
+    // white-space: pre-line !important;
+    line-height: 16px !important;
+}
+::v-deep .el-form-item {
+    padding: 0 10px;
+    height: auto !important;
+}
+::v-deep .el-form-item__label {
+    justify-content: flex-start !important;
+}
+.form-label-left-align {
+    text-align: left;
+}
+::v-deep .el-input-number .el-input__inner {
+    text-align: left;
+}
+
+//表单tab容器
+.form_tab_item {
+    height: 400px;
+    overflow-y: auto;
+}
+::v-deep .el-input {
+    width: 200px !important;
+}
+::v-deep .el-select {
+    width: 200px !important;
+}
+::v-deep .required_position {
+    position: relative;
+    .required_icon {
+        position: absolute;
+        left: -10px;
+        margin-top: 8px;
+        color: #f56c6c;
+        margin-left: 10px;
+    }
+    .required_text {
+        padding-left: 20px;
+    }
+}
+.no_required::v-deep .el-form-item__label {
+    padding-left: 10px !important;
+    width: 70px !important;
+    margin-left: 0px !important;
+}
+
+// ::v-deep .tabs_form{
+//     height:300px !important;
+// }
+</style>
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/detail.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/detail.vue
new file mode 100644
index 00000000..474ed99d
--- /dev/null
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/detail.vue
@@ -0,0 +1,383 @@
+<template>
+    <div class="default-main">
+        <el-descriptions :column="2" border>
+            <el-descriptions-item label="填报人">
+                {{ detailData.reporter }}
+            </el-descriptions-item>
+            <el-descriptions-item label="填报日期">
+                {{ formatDate(detailData.reportDate, 'YYYY-MM-DD') }}
+            </el-descriptions-item>
+            <el-descriptions-item label="填报部门">
+                {{ detailData.orgName }}
+            </el-descriptions-item>
+            <el-descriptions-item label="工程投产日期">
+                {{ formatDate(detailData.expectedProductionDate, 'YYYY-MM-DD') }}
+            </el-descriptions-item>
+            <el-descriptions-item label="所属地市">
+                {{ detailData.city }}
+            </el-descriptions-item>
+            <el-descriptions-item label="用户状态">
+                {{
+                    userStateList.find(item => {
+                        return item.value == detailData.userStatus
+                    })?.label
+                }}
+            </el-descriptions-item>
+            <el-descriptions-item label="关联干扰源">
+                {{ detailData.userName }}
+            </el-descriptions-item>
+            <el-descriptions-item label="关联设备">
+                {{ detailData.monitoringTerminalName }}
+            </el-descriptions-item>
+            <el-descriptions-item label="监测点名称">
+                {{ detailData.lineName }}
+            </el-descriptions-item>
+            <el-descriptions-item label="监测点电压等级">
+                {{ detailData.voltageLevel }}
+            </el-descriptions-item>
+            <el-descriptions-item label="接入母线">
+                {{ detailData.connectedBus }}
+            </el-descriptions-item>
+            <el-descriptions-item label="短路容量">
+                {{ detailData.shortCapacity }}
+            </el-descriptions-item>
+            <el-descriptions-item label="协议容量">
+                {{ detailData.dealCapacity }}
+            </el-descriptions-item>
+            <el-descriptions-item label="设备容量">
+                {{ detailData.devCapacity }}
+            </el-descriptions-item>
+            <el-descriptions-item label="基准容量">
+                {{ detailData.standardCapacity }}
+            </el-descriptions-item>
+            <el-descriptions-item label="CT变比">
+                {{ detailData.ctRatio }}
+            </el-descriptions-item>
+            <el-descriptions-item label="PT变比">
+                {{ detailData.ptRatio }}
+            </el-descriptions-item>
+            <el-descriptions-item label="监测点编码">
+                {{ detailData.lineId }}
+            </el-descriptions-item>
+            <el-descriptions-item label="测量间隔">
+                {{ detailData.timeInterval }}
+            </el-descriptions-item>
+            <el-descriptions-item label="干扰源类型">
+                {{ detailData.loadType }}
+            </el-descriptions-item>
+            <el-descriptions-item label="干扰源类别">
+                {{ detailData.businessType }}
+            </el-descriptions-item>
+            <el-descriptions-item label="监测点性质">
+                {{ detailData.pointNature }}
+            </el-descriptions-item>
+            <el-descriptions-item label="是否参与统计">
+                {{ detailData.isStatistical == '0' ? '是' : '否' }}
+            </el-descriptions-item>
+            <el-descriptions-item label="对象名称(对端)">
+                {{ detailData.objName }}
+            </el-descriptions-item>
+            <el-descriptions-item label="电网侧变电站">
+                {{ detailData.powerSubstationName }}
+            </el-descriptions-item>
+            <el-descriptions-item label="是否并网点">
+                {{ detailData.isGridConnectionPoint == '0' ? '是' : '否' }}
+            </el-descriptions-item>
+            <el-descriptions-item label="电压偏差上限">
+                {{ detailData.voltageDeviationUpperLimit }}
+            </el-descriptions-item>
+            <el-descriptions-item label="电压偏差下限">
+                {{ detailData.voltageDeviationLowerLimit }}
+            </el-descriptions-item>
+            <el-descriptions-item label="监测点运行状态">
+                {{ detailData.operationStatus }}
+            </el-descriptions-item>
+            <!--文件地址-->
+            <el-descriptions-item label="监测点台账信息" v-if="detailData.lineFilePath">
+                <el-icon>
+                    <Link />
+                </el-icon>
+                <a :href="detailData?.lineFilePath.url">
+                    {{ detailData?.lineFilePath.name }}
+                </a>
+            </el-descriptions-item>
+            <el-descriptions-item label="主接线图" v-if="detailData?.mainWiringDiagram">
+                <el-icon>
+                    <Link />
+                </el-icon>
+                <a :href="detailData?.mainWiringDiagram.url">
+                    {{ detailData?.mainWiringDiagram.name }}
+                </a>
+            </el-descriptions-item>
+        </el-descriptions>
+    </div>
+</template>
+<script lang="ts" setup>
+import { onMounted, ref, reactive } from 'vue'
+import { useRoute } from 'vue-router'
+import { formatDate } from '@/utils/formatTime'
+import { propTypes } from '@/utils/propTypes'
+import { getTempLineDetailsById } from '@/api/supervision-boot/monitorpoint/index'
+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'
+
+defineOptions({ name: 'BpmUserReportDetail' })
+
+const { query } = useRoute() // 查询参数
+
+const props = defineProps({
+    id: propTypes.string.def(undefined)
+})
+const detailLoading = ref(false) // 表单的加载中
+const detailData = ref<any>({}) // 详情数据
+const queryId = query.id as unknown as string // 从 URL 传递过来的 id 编号
+
+//用户状态数组
+const userStateList = reactive([
+    {
+        label: '可研',
+        value: '0'
+    },
+    {
+        label: '建设',
+        value: '1'
+    },
+    {
+        label: '运行',
+        value: '2'
+    },
+    {
+        label: '退运',
+        value: '3'
+    }
+])
+const dictData = useDictData()
+//字典获取所属地市
+const areaOptionList = dictData.getBasicData('jibei_area')
+//定义监测装置安装位置下拉框数据
+const monitoringDeviceInstallationPositionList = [
+    {
+        id: '0',
+        name: '电网侧'
+    },
+    {
+        id: '1',
+        name: '用户侧'
+    }
+]
+//定义召唤标志下拉框数据
+const summonFlagList = [
+    {
+        id: '0',
+        name: '周期触发'
+    },
+    {
+        id: '1',
+        name: '变为触发'
+    }
+]
+//定义终端模型下拉框数据
+const terminalModelList = [
+    {
+        id: '0',
+        name: '虚拟设备'
+    },
+    {
+        id: '1',
+        name: '虚拟设备'
+    },
+    {
+        id: '2',
+        name: '虚拟设备'
+    }
+]
+//定义通讯状态下拉框数据
+const communicationStatusList = [
+    {
+        id: '0',
+        name: '中断'
+    },
+    {
+        id: '1',
+        name: '正常'
+    }
+]
+//字典获取监测点电压等级
+const voltageLevelList = dictData.getBasicData('Dev_Voltage_Stand')
+//字典获取数据类型
+const dataTypeList = dictData.getBasicData('System_Type')
+//字典获取终端型号
+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')
+//字典获取厂家
+const manufacturerList = dictData.getBasicData('Dev_Manufacturers')
+/** 获得数据 */
+const getInfo = async () => {
+    detailLoading.value = true
+    try {
+        await getTempLineDetailsById({ id: props.id || queryId }).then(res => {
+            detailData.value = res.data
+            console.log(detailData.value, '++++获取监测点详情数据+++++')
+            getFileName()
+        })
+    } finally {
+        detailLoading.value = false
+    }
+}
+const getFileName = async () => {
+    //验收检验报告
+    if (detailData.value.acceptanceInspectionReport) {
+        await getFileNamePath(detailData.value.acceptanceInspectionReport, 'acceptanceInspectionReport')
+    }
+    //验收检验报告单
+    if (detailData.value.acceptanceInspectionReportSingle) {
+        await getFileNamePath(detailData.value.acceptanceInspectionReportSingle, 'acceptanceInspectionReportSingle')
+    }
+    //出厂检验报告
+    if (detailData.value.factoryInspectionReport) {
+        await getFileNamePath(detailData.value.factoryInspectionReport, 'factoryInspectionReport')
+    }
+
+    //信息安全检测报告
+    if (detailData.value.informationSecurityTestReport) {
+        await getFileNamePath(detailData.value.informationSecurityTestReport, 'informationSecurityTestReport')
+    }
+    //监测点台账信息
+    if (detailData.value.lineFilePath) {
+        await getFileNamePath(detailData.value.lineFilePath, 'lineFilePath')
+    }
+
+    //其他附件
+    if (detailData.value.otherAttachments) {
+        await getFileNamePath(detailData.value.otherAttachments, 'otherAttachments')
+    }
+
+    //性能检测报告
+    if (detailData.value.performanceTestReport) {
+        await getFileNamePath(detailData.value.performanceTestReport, 'performanceTestReport')
+    }
+
+    //型式实验报告
+    if (detailData.value.typeExperimentReport) {
+        await getFileNamePath(detailData.value.typeExperimentReport, 'typeExperimentReport')
+    }
+
+    //主接线图
+    if (detailData.value.mainWiringDiagram) {
+        await getFileNamePath(detailData.value.mainWiringDiagram, 'mainWiringDiagram')
+    }
+
+    //其他附件
+    // if (detailData.value.additionalAttachments) {
+    //     getFileNamePath(detailData.value.additionalAttachments, 'additionalAttachments')
+    // }
+}
+//根据文件名请求
+const getFileNamePath = async (val: any, pathName: any) => {
+    await getFileNameAndFilePath({ filePath: val }).then(res => {
+        console.log(111111111)
+        if (res.data) {
+            //可研报告
+            if (pathName == 'acceptanceInspectionReport' && detailData.value.acceptanceInspectionReport) {
+                detailData.value.acceptanceInspectionReport = {
+                    name: res.data.fileName,
+                    url: res.data.url
+                }
+            }
+            //终端台账信息
+            else if (
+                pathName == 'acceptanceInspectionReportSingle' &&
+                detailData.value.acceptanceInspectionReportSingle
+            ) {
+                detailData.value.acceptanceInspectionReportSingle = {
+                    name: res.data.fileName,
+                    url: res.data.url
+                }
+            }
+            //预测评估报告
+            else if (pathName == 'factoryInspectionReport' && detailData.value.factoryInspectionReport) {
+                detailData.value.factoryInspectionReport = {
+                    name: res.data.fileName,
+                    url: res.data.url
+                }
+            }
+            //预测评估评审意见报告
+            else if (pathName == 'informationSecurityTestReport' && detailData.value.informationSecurityTestReport) {
+                detailData.value.informationSecurityTestReport = {
+                    name: res.data.fileName,
+                    url: res.data.url
+                }
+            }
+            //用户接入变电站主接线示意图
+            else if (pathName == 'lineFilePath' && detailData.value.lineFilePath) {
+                detailData.value.lineFilePath = {
+                    name: res.data.fileName,
+                    url: res.data.url
+                }
+            }
+            //主要敏感设备清单
+            else if (pathName == 'otherAttachments' && detailData.value.otherAttachments) {
+                detailData.value.otherAttachments = {
+                    name: res.data.fileName,
+                    url: res.data.url
+                }
+            }
+            //抗扰度测试报告
+            else if (pathName == 'performanceTestReport' && detailData.value.performanceTestReport) {
+                detailData.value.performanceTestReport = {
+                    name: res.data.fileName,
+                    url: res.data.url
+                }
+            }
+            //背景电能质量测试报告
+            else if (pathName == 'typeExperimentReport' && detailData.value.typeExperimentReport) {
+                detailData.value.typeExperimentReport = {
+                    name: res.data.fileName,
+                    url: res.data.url
+                }
+            }
+            //其他附件
+            else if (pathName == 'additionalAttachments' && detailData.value.additionalAttachments) {
+                detailData.value.additionalAttachments = {
+                    name: res.data.fileName,
+                    url: res.data.url
+                }
+            }
+            //主接线图
+            else if (pathName == 'mainWiringDiagram' && detailData.value.mainWiringDiagram) {
+                detailData.value.mainWiringDiagram = {
+                    name: res.data.fileName,
+                    url: res.data.url
+                }
+            }
+        }
+    })
+}
+defineExpose({ open: getInfo }) // 提供 open 方法，用于打开弹窗
+
+/** 初始化 **/
+onMounted(() => {
+    getInfo()
+})
+</script>
+<style lang="scss">
+.default-main {
+    height: calc(100vh - 100px);
+    overflow: auto;
+}
+
+::v-deep.el-icon svg {
+    margin: 5px !important;
+    position: absolute !important;
+    top: 20px !important;
+}
+</style>
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
new file mode 100644
index 00000000..9174510d
--- /dev/null
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
@@ -0,0 +1,212 @@
+<!---终端入网检测-->
+<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> -->
+        </template>
+    </TableHeader>
+    <Table ref="tableRef" />
+
+    <!-- 新增弹框 -->
+    <addForm ref="addForms" @onSubmit="tableStore.index()"></addForm>
+    <!-- 申请联调弹框 -->
+    <debug ref="debugForms" @onSubmit="tableStore.index()"></debug>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, nextTick } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useRouter } from 'vue-router'
+import { useDictData } from '@/stores/dictData'
+import { getLoadTypeUserList } from '@/api/process-boot/interference'
+import addForm from './addForm.vue'
+import debug from './debug.vue'
+import { any } from 'vue-types'
+const dictData = useDictData()
+const { push } = useRouter()
+
+const TableHeaderRef = ref()
+const tableRef = ref()
+const areaOptionList = dictData.getBasicData('jibei_area')
+const ruleFormRef = ref()
+const show: any = ref(false)
+const fileList = ref([])
+const tableStore = new TableStore({
+    url: '/supervision-boot/tempLine/list',
+    publicHeight: 65,
+    method: 'POST',
+    column: [
+        { title: '序号', type: 'seq', width: 80 },
+        { field: 'orgName', title: '填报部门名称' , minWidth: 170 },
+        { field: 'reportDate', title: '填报日期', minWidth: 170},
+        { field: 'reporter', title: '填报人', minWidth: 80 },
+        {
+            field: 'status',
+            title: '审核状态',
+            minWidth: 100,
+            render: 'tag',
+            custom: {
+                1: 'primary',
+                2: 'success',
+                3: 'danger',
+                4: 'warning'
+            },
+            replaceValue: {
+                1: '审批中',
+                2: '审批通过',
+                3: '审批不通过',
+                4: '已取消'
+            }
+        },
+        { field: 'monitoringTerminalName', title: '设备名称', minWidth: 170 },
+        { field: 'substation', title: '所属变电站', minWidth: 170 },
+        // {
+        //     field: 'userType',
+        //     title: '用户性质',
+        //     minWidth: 150,
+        //     formatter: (obj: any) => {
+        //         const userType = obj.row.userType
+        //         return getUserTypeName(userType)
+        //     }
+        // },
+
+        // { field: 'informationSecurityTestReport', title: '信息安全检测报告', minWidth: 170 },
+        // { field: 'otherAttachments', title: '其他附件', minWidth: 170 },
+        // { field: 'orgName', title: '填报部门名称'},
+        // { field: 'performanceTestReport', title: '性能检测报告', minWidth: 170 },
+        
+        // {
+        //     field: 'userStatus',
+        //     title: '用户状态',
+        //     minWidth: 100,
+        //     render: 'tag',
+        //     custom: {
+        //         0: 'primary',
+        //         1: 'primary',
+        //         2: 'success',
+        //         3: 'warning'
+        //     },
+        //     replaceValue: {
+        //         0: '可研',
+        //         1: '建设',
+        //         2: '运行',
+        //         3: '退运'
+        //     }
+        // },
+        // { field: 'substation', title: '变电站', minWidth: 100 },
+        // { field: 'createTime', title: '开始时间', minWidth: 170 },
+        {
+            title: '操作',
+            minWidth: 150,
+            fixed: 'right',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '流程详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        handleAudit(row.processInstanceId)
+                    }
+                },
+                {
+                    name: 'productSetting',
+                    title: '申请联调',
+                    type: 'success',
+                    icon: 'el-icon-add',
+                    render: 'basicButton',
+                    click: row => {
+                        handleDebug(row)
+                    }
+                }
+            ]
+        }
+    ],
+
+    beforeSearchFun: () => {
+           tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+           tableStore.table.params.statveList=[2]
+        // tableStore.table.params.relationUserName = tableStore.table.params.userName
+    }
+})
+
+// tableStore.table.params.loadType = ''
+// tableStore.table.params.userName = ''
+// tableStore.table.params.fileUploadflag = ''
+
+provide('tableStore', tableStore)
+
+const addForms = ref()
+const addFormModel = () => {
+    setTimeout(() => {
+        addForms.value.open()
+    }, 0);
+  
+}
+
+const exportEvent = () => {
+    let form = JSON.parse(JSON.stringify(tableStore.table.params))
+    form.pageNum = 1
+    form.pageSize = tableStore.table.total
+    getLoadTypeUserList(form).then(res => {
+        tableRef.value.getRef().exportData({
+            filename: '未建档非线性用户', // 文件名字
+            sheetName: 'Sheet1',
+            type: 'xlsx', //导出文件类型 xlsx 和 csv
+            useStyle: true,
+            data: res.data.records, // 数据源 // 过滤那个字段导出
+            columnFilterMethod: function (column: any) {
+                return !(column.$columnIndex === 0)
+            }
+        })
+    })
+}
+onMounted(() => {
+    tableStore.index()
+})
+
+/** 处理审批按钮 */
+const handleAudit = (instanceId: any) => {
+    push({
+        name: 'BpmProcessInstanceDetail',
+        query: {
+            id: instanceId
+        }
+    })
+}
+//申请联调
+const debugForms=ref()
+const handleDebug=(row:any)=>{
+    console.log(row,"=============")
+    debugForms.value.open()
+}
+</script>
+
+<style scoped lang="scss">
+:deep(.el-upload-list__item) {
+    width: 400px;
+}
+
+::v-deep .el-input__wrapper {
+    // width: 200px !important;
+}
+</style>
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/index.vue
index 24ce34df..acde6166 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/index.vue
@@ -8,7 +8,7 @@
                 <monitorpoint v-if="activeName == '2'" />
             </el-tab-pane>
             <el-tab-pane label="监测点联调列表" name="3">
-               <!-- <terminalNetworkDetection v-if="activeName == '3'"></terminalNetworkDetection> -->
+                <jointDebugList v-if="activeName == '3'" />
             </el-tab-pane>
         </el-tabs>
     </div>
@@ -20,6 +20,7 @@ import undocumented from './components/undocumented/index.vue'
 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: 'Processsupervision/interferencemanagement'
 })

From 2f1e3c97be65eed2177aebbe380e6e77398a1b67 Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Mon, 20 May 2024 15:00:18 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E7=BB=88=E7=AB=AF=E7=9B=91=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/jointDebugList/addForm.vue     |   2 -
 .../components/jointDebugList/detail.vue      | 158 +++++-------------
 .../components/monitorpoint/addForm.vue       | 103 ++++--------
 .../components/monitorpoint/detail.vue        |   1 -
 .../components/terminainal/addForm.vue        |   4 +-
 .../components/terminainal/detail.vue         |   1 -
 .../terminalNetworkDetection/index.vue        |   1 -
 7 files changed, 83 insertions(+), 187 deletions(-)

diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/addForm.vue
index 75873c55..80152617 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/addForm.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/addForm.vue
@@ -567,9 +567,7 @@ const monitoringTerminalList = ref([])
 //获取关联设备
 const findAllMonitoringTerminalList = () => {
     getDeviceList().then(res => {
-        console.log(res, '-------------')
         monitoringTerminalList.value = res.data
-        console.log(monitoringTerminalList.value[0].monitoringTerminalCode, '++++++++++')
     })
 }
 //查询关联设备下拉框
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/detail.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/detail.vue
index 474ed99d..186d27c7 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/detail.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/detail.vue
@@ -1,6 +1,15 @@
 <template>
     <div class="default-main">
+        666666
         <el-descriptions :column="2" border>
+            <el-descriptions-item label="监测点台账信息" v-if="detailData.lineFilePath">
+                <el-icon>
+                    <Link />
+                </el-icon>
+                <a :href="detailData?.lineFilePath.url">
+                    {{ detailData?.lineFilePath.name }}
+                </a>
+            </el-descriptions-item>
             <el-descriptions-item label="填报人">
                 {{ detailData.reporter }}
             </el-descriptions-item>
@@ -33,7 +42,11 @@
                 {{ detailData.lineName }}
             </el-descriptions-item>
             <el-descriptions-item label="监测点电压等级">
-                {{ detailData.voltageLevel }}
+                {{ 
+                    voltageLevelList.find((item)=>{
+                        return detailData.voltageLevel==item.id
+                    })?.name
+                }}
             </el-descriptions-item>
             <el-descriptions-item label="接入母线">
                 {{ detailData.connectedBus }}
@@ -69,7 +82,7 @@
                 {{ detailData.businessType }}
             </el-descriptions-item>
             <el-descriptions-item label="监测点性质">
-                {{ detailData.pointNature }}
+                {{ detailData.pointNature=='0'?'电网侧':'非电网侧' }}
             </el-descriptions-item>
             <el-descriptions-item label="是否参与统计">
                 {{ detailData.isStatistical == '0' ? '是' : '否' }}
@@ -90,17 +103,13 @@
                 {{ detailData.voltageDeviationLowerLimit }}
             </el-descriptions-item>
             <el-descriptions-item label="监测点运行状态">
-                {{ detailData.operationStatus }}
+                {{ 
+                  operationStatusList.find((item)=>{
+                    return  detailData.operationStatus==item.id
+                  })?.name
+                }}
             </el-descriptions-item>
             <!--文件地址-->
-            <el-descriptions-item label="监测点台账信息" v-if="detailData.lineFilePath">
-                <el-icon>
-                    <Link />
-                </el-icon>
-                <a :href="detailData?.lineFilePath.url">
-                    {{ detailData?.lineFilePath.name }}
-                </a>
-            </el-descriptions-item>
             <el-descriptions-item label="主接线图" v-if="detailData?.mainWiringDiagram">
                 <el-icon>
                     <Link />
@@ -220,13 +229,35 @@ const frontEndMachineList = dictData.getBasicData('Front_Type')
 const terminalWiringMethodTypeList = dictData.getBasicData('Dev_Connect')
 //字典获取厂家
 const manufacturerList = dictData.getBasicData('Dev_Manufacturers')
+//定义监测点运行状态下拉框数据
+const operationStatusList = [
+    {
+        id: '0',
+        name: '运行'
+    },
+    {
+        id: '1',
+        name: '检修'
+    },
+    {
+        id: '2',
+        name: '停运'
+    },
+    {
+        id: '3',
+        name: '调试'
+    },
+    {
+        id: '4',
+        name: '退运'
+    }
+]
 /** 获得数据 */
 const getInfo = async () => {
     detailLoading.value = true
     try {
         await getTempLineDetailsById({ id: props.id || queryId }).then(res => {
             detailData.value = res.data
-            console.log(detailData.value, '++++获取监测点详情数据+++++')
             getFileName()
         })
     } finally {
@@ -234,124 +265,27 @@ const getInfo = async () => {
     }
 }
 const getFileName = async () => {
-    //验收检验报告
-    if (detailData.value.acceptanceInspectionReport) {
-        await getFileNamePath(detailData.value.acceptanceInspectionReport, 'acceptanceInspectionReport')
-    }
-    //验收检验报告单
-    if (detailData.value.acceptanceInspectionReportSingle) {
-        await getFileNamePath(detailData.value.acceptanceInspectionReportSingle, 'acceptanceInspectionReportSingle')
-    }
-    //出厂检验报告
-    if (detailData.value.factoryInspectionReport) {
-        await getFileNamePath(detailData.value.factoryInspectionReport, 'factoryInspectionReport')
-    }
-
-    //信息安全检测报告
-    if (detailData.value.informationSecurityTestReport) {
-        await getFileNamePath(detailData.value.informationSecurityTestReport, 'informationSecurityTestReport')
-    }
     //监测点台账信息
     if (detailData.value.lineFilePath) {
         await getFileNamePath(detailData.value.lineFilePath, 'lineFilePath')
     }
-
-    //其他附件
-    if (detailData.value.otherAttachments) {
-        await getFileNamePath(detailData.value.otherAttachments, 'otherAttachments')
-    }
-
-    //性能检测报告
-    if (detailData.value.performanceTestReport) {
-        await getFileNamePath(detailData.value.performanceTestReport, 'performanceTestReport')
-    }
-
-    //型式实验报告
-    if (detailData.value.typeExperimentReport) {
-        await getFileNamePath(detailData.value.typeExperimentReport, 'typeExperimentReport')
-    }
-
     //主接线图
-    if (detailData.value.mainWiringDiagram) {
+    else  if (detailData.value.mainWiringDiagram) {
         await getFileNamePath(detailData.value.mainWiringDiagram, 'mainWiringDiagram')
     }
 
-    //其他附件
-    // if (detailData.value.additionalAttachments) {
-    //     getFileNamePath(detailData.value.additionalAttachments, 'additionalAttachments')
-    // }
 }
 //根据文件名请求
 const getFileNamePath = async (val: any, pathName: any) => {
     await getFileNameAndFilePath({ filePath: val }).then(res => {
-        console.log(111111111)
         if (res.data) {
-            //可研报告
-            if (pathName == 'acceptanceInspectionReport' && detailData.value.acceptanceInspectionReport) {
-                detailData.value.acceptanceInspectionReport = {
-                    name: res.data.fileName,
-                    url: res.data.url
-                }
-            }
-            //终端台账信息
-            else if (
-                pathName == 'acceptanceInspectionReportSingle' &&
-                detailData.value.acceptanceInspectionReportSingle
-            ) {
-                detailData.value.acceptanceInspectionReportSingle = {
-                    name: res.data.fileName,
-                    url: res.data.url
-                }
-            }
-            //预测评估报告
-            else if (pathName == 'factoryInspectionReport' && detailData.value.factoryInspectionReport) {
-                detailData.value.factoryInspectionReport = {
-                    name: res.data.fileName,
-                    url: res.data.url
-                }
-            }
-            //预测评估评审意见报告
-            else if (pathName == 'informationSecurityTestReport' && detailData.value.informationSecurityTestReport) {
-                detailData.value.informationSecurityTestReport = {
-                    name: res.data.fileName,
-                    url: res.data.url
-                }
-            }
-            //用户接入变电站主接线示意图
-            else if (pathName == 'lineFilePath' && detailData.value.lineFilePath) {
+            //监测点台账信息
+            if (pathName == 'lineFilePath' && detailData.value.lineFilePath) {
                 detailData.value.lineFilePath = {
                     name: res.data.fileName,
                     url: res.data.url
                 }
             }
-            //主要敏感设备清单
-            else if (pathName == 'otherAttachments' && detailData.value.otherAttachments) {
-                detailData.value.otherAttachments = {
-                    name: res.data.fileName,
-                    url: res.data.url
-                }
-            }
-            //抗扰度测试报告
-            else if (pathName == 'performanceTestReport' && detailData.value.performanceTestReport) {
-                detailData.value.performanceTestReport = {
-                    name: res.data.fileName,
-                    url: res.data.url
-                }
-            }
-            //背景电能质量测试报告
-            else if (pathName == 'typeExperimentReport' && detailData.value.typeExperimentReport) {
-                detailData.value.typeExperimentReport = {
-                    name: res.data.fileName,
-                    url: res.data.url
-                }
-            }
-            //其他附件
-            else if (pathName == 'additionalAttachments' && detailData.value.additionalAttachments) {
-                detailData.value.additionalAttachments = {
-                    name: res.data.fileName,
-                    url: res.data.url
-                }
-            }
             //主接线图
             else if (pathName == 'mainWiringDiagram' && detailData.value.mainWiringDiagram) {
                 detailData.value.mainWiringDiagram = {
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue
index 75873c55..0848783c 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue
@@ -48,9 +48,9 @@
                         <!-- 基础信息 -->
                         <el-row>
                             <el-col :span="12">
-                                <el-form-item label="填报人：" prop="reporter">
+                                <el-form-item label="填报人：" prop="reporterName">
                                     <el-input
-                                        v-model="form.reporter"
+                                        v-model="form.reporterName"
                                         autocomplete="off"
                                         place-holder="请输入填报人"
                                         :disabled="true"
@@ -369,7 +369,8 @@
                             </el-col>
                         </el-row>
                         <el-row>
-                            <el-col :span="12">
+                            <el-col :span="12"  class="required_position">
+                                <span class="required_icon_white">*</span>
                                 <el-form-item label="电网侧变电站：" prop="powerSubstationName">
                                     <el-input
                                         v-model="form.powerSubstationName"
@@ -390,7 +391,8 @@
                         </el-row>
 
                         <el-row>
-                            <el-col :span="12">
+                            <el-col :span="12"  class="required_position">
+                                <span class="required_icon_white">*</span>
                                 <el-form-item label="电压偏差上限：" prop="voltageDeviationUpperLimit">
                                     <el-input
                                         v-model="form.voltageDeviationUpperLimit"
@@ -400,7 +402,8 @@
                                 </el-form-item>
                             </el-col>
 
-                            <el-col :span="12">
+                            <el-col :span="12"  class="required_position">
+                                <span class="required_icon_white">*</span>
                                 <el-form-item label="电压偏差下限：" prop="voltageDeviationLowerLimit">
                                     <el-input
                                         v-model="form.voltageDeviationLowerLimit"
@@ -553,6 +556,7 @@ const getSelectableList = () => {
             ...form.value,
             city: obj.city,
             reporter: obj.reporter,
+            reporterName:obj.reporterName,
             reportDate: obj.reportDate,
             orgId: obj.orgId,
             orgName:obj.orgName,
@@ -567,9 +571,7 @@ const monitoringTerminalList = ref([])
 //获取关联设备
 const findAllMonitoringTerminalList = () => {
     getDeviceList().then(res => {
-        console.log(res, '-------------')
-        monitoringTerminalList.value = res.data
-        console.log(monitoringTerminalList.value[0].monitoringTerminalCode, '++++++++++')
+        monitoringTerminalList.value = res.data;
     })
 }
 //查询关联设备下拉框
@@ -589,6 +591,7 @@ selectFormType.value = '0'
 const resetForm = () => {
     form.value = {
         reporter: '', //填报人
+        reporterName:'',//填报人名称
         reportDate: '', //填报日期
         orgId: '', //填报部门id
         orgName:'', //填报部门名称
@@ -628,9 +631,6 @@ const resetForm = () => {
     // form.value.reporter = adminInfo.$state.name
     // form.value.orgId = adminInfo.$state.deptName
 }
-//初始化数据
-resetForm()
-getSelectableList()
 findAllMonitoringTerminalList()
 
 //获取树形图数据
@@ -665,66 +665,27 @@ const changeLoadType = async () => {
 //选择关联干扰源回显数据
 const changeUserName = () => {
     let obj = projectList.value.find(item => {
-        return form.value.userName == item.projectName
+        return form.value.reporter == item.reporter
     })
     form.value = {
         ...form.value,
-        city: obj.city,
-        reporter: obj.reporter,
-        reportDate: obj.reportDate,
-        orgId: obj.orgId,
-        orgName: obj.orgName,
-        userName: obj.projectName,
-        userId: obj.id,
-        expectedProductionDate: obj.expectedProductionDate
+        city: obj?.city,
+        reporter: obj?.reporter,
+        reporterName:obj?.reporterName,
+        reportDate: obj?.reportDate,
+        orgId: obj?.orgId,
+        orgName: obj?.orgName,
+        userName: obj?.projectName,
+        userId: obj?.id,
+        expectedProductionDate: obj?.expectedProductionDate
     }
     console.log(obj, '选择关联干扰源回显数据')
 }
-//监测点信息表单格式
-const monitorPointForm = ref({
-    reporter: '', //填报人
-    reportDate: '', //填报日期
-    orgId: '', //填报部门
-    orgName:'',
-    expectedProductionDate: '', //工程投产日期
-    city: areaOptionList[0].name, //所属地市
-    userStatus: userStateList[1].id, //用户状态
-    userName: '', //工程名称
-    userId: '',
-    monitoringTerminalCode: '', //关联设备
-    monitoringTerminalName: '',
-
-    //监测点信息实体
-    // supervisionTempLineReportParam: {
-    businessType: '', //	干扰源类别
-    connectedBus: '', //	接入母线
-    ctRatio: '0', //CT变比
-    dealCapacity: '0', //协议容量
-    devCapacity: '0', //设备容量
-    isGridConnectionPoint: '0', //是否并网点
-    isStatistical: '0', //	是否参与统计
-    lineId: '', //	监测点编码
-    lineName: '', //	监测点名称
-    loadType: '', //干扰源类型
-    mainWiringDiagram: '', //	主接线图
-    objName: '', //监测点对象名称
-    operationStatus: '', //监测点运行状态
-    pointNature: '', //监测点性质
-    powerSubstationName: '', //电网侧变电站
-    ptRatio: '0', //	PT变比
-    shortCapacity: '0', //	短路容量
-    standardCapacity: '0', //基准容量
-    timeInterval: '0', //测量间隔
-    voltageDeviationLowerLimit: '0', //电压偏差下限
-    voltageDeviationUpperLimit: '0', //	电压偏差上限
-    voltageLevel: '' //监测点电压等级
-    // }
-})
 
 //定义校验规则
 const rules = ref({
     //基础信息
-    reporter: [
+    reporterName: [
         {
             required: true,
             message: '请输入填报人',
@@ -946,6 +907,9 @@ watch(
 )
 const open = () => {
     dialogFormVisible.value = true
+    //初始化数据
+    resetForm()
+    getSelectableList()
 }
 const close = () => {
     //重置表单内容
@@ -1088,18 +1052,21 @@ defineExpose({ open })
         left: -10px;
         margin-top: 8px;
         color: #f56c6c;
+        margin-left: 20px;
         margin-left: 10px;
+        
+    }
+    .required_icon_white {
+        color: #fff;
+        position: absolute;
+        left: -10px;
+        padding-left: 30px;
+        margin: 8px 10px 0 30px;
     }
     .required_text {
-        padding-left: 20px;
+        // padding-left: 20px;
     }
 }
-.no_required::v-deep .el-form-item__label {
-    padding-left: 10px !important;
-    width: 70px !important;
-    margin-left: 0px !important;
-}
-
 // ::v-deep .tabs_form{
 //     height:300px !important;
 // }
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue
index 3b990970..b0b0994b 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue
@@ -277,7 +277,6 @@ const getFileName = async () => {
 //根据文件名请求
 const getFileNamePath = async (val: any, pathName: any) => {
     await getFileNameAndFilePath({ filePath: val }).then(res => {
-        console.log(111111111)
         if (res.data) {
             //监测点台账信息
             if (pathName == 'lineFilePath' && detailData.value.lineFilePath) {
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue
index ebf27092..d03f9ea5 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue
@@ -210,7 +210,7 @@
                             </el-col>
 
                             <el-col :span="12">
-                                <el-form-item label="检测终端编码：" prop="monitoringTerminalCode">
+                                <el-form-item label="监测终端编码：" prop="monitoringTerminalCode">
                                     <el-input
                                         v-model="form.monitoringTerminalCode"
                                         autocomplete="off"
@@ -221,7 +221,7 @@
                         </el-row>
                         <el-row>
                             <el-col :span="12">
-                                <el-form-item label="检测终端名称：" prop="monitoringTerminalName">
+                                <el-form-item label="监测终端名称：" prop="monitoringTerminalName">
                                     <el-input
                                         v-model="form.monitoringTerminalName"
                                         autocomplete="off"
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue
index 8aab93c8..84f29b77 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue
@@ -402,7 +402,6 @@ const getFileName = async () => {
 //根据文件名请求
 const getFileNamePath = async (val: any, pathName: any) => {
     await getFileNameAndFilePath({ filePath: val }).then(res => {
-        console.log(111111111)
         if (res.data) {
             //可研报告
             if (pathName == 'acceptanceInspectionReport' && detailData.value.acceptanceInspectionReport) {
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/index.vue
index acde6166..3127059f 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/index.vue
@@ -16,7 +16,6 @@
 
 <script setup lang="ts">
 import { onMounted, reactive, ref, provide } from 'vue'
-import undocumented from './components/undocumented/index.vue'
 import { mainHeight } from '@/utils/layout'
 import terminal from './components/terminainal/index.vue'
 import monitorpoint from './components/monitorpoint/index.vue'

From d192fe4ff9c583ca45a0a3171d4829d5fcfaa7a0 Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Mon, 20 May 2024 15:55:11 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E7=9B=91=E6=B5=8B=E7=82=B9=E8=81=94?=
 =?UTF-8?q?=E8=B0=83=E5=88=97=E8=A1=A8=E3=80=81=E7=94=B3=E8=AF=B7=E8=81=94?=
 =?UTF-8?q?=E8=B0=83=E3=80=81=E8=AF=A6=E6=83=85=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/jointDebugList/addForm.vue     | 1104 -----------------
 .../components/jointDebugList/debug.vue       |  126 +-
 .../components/jointDebugList/detail.vue      |  270 +---
 .../components/jointDebugList/index.vue       |   81 +-
 .../components/monitorpoint/addForm.vue       |   12 +-
 .../components/monitorpoint/detail.vue        |   65 -
 .../components/terminainal/addForm.vue        |    9 +-
 .../components/terminainal/detail.vue         |    1 -
 .../components/terminainal/index.vue          |    1 -
 9 files changed, 50 insertions(+), 1619 deletions(-)
 delete mode 100644 src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/addForm.vue

diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/addForm.vue
deleted file mode 100644
index 80152617..00000000
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/addForm.vue
+++ /dev/null
@@ -1,1104 +0,0 @@
-<template>
-    <el-dialog
-        v-model="dialogFormVisible"
-        title="监测点信息"
-        width="60%"
-        :append-to-body="true"
-        :before-close="close"
-        :close-on-click-modal="false"
-        :lazy="true"
-        draggable
-    >
-        <!--监测点信息录入 基础信息+监测点信息  监测点信息要有工程名称、用户状态 -->
-        <el-form
-            :model="form"
-            :validate-on-rule-change="false"
-            :scroll-to-error="true"
-            :rules="rules"
-            ref="ruleFormRef"
-            label-width="140px"
-            label-position="right"
-        >
-            <el-tabs tab-position="left" class="tabs_form" v-model="activeName">
-                <el-tab-pane name="0" label="监测点信息">
-                    <div class="form_tab_item">
-                        <el-row>
-                            <el-col :span="12"></el-col>
-                            <el-col :span="12" class="required_position">
-                                <span class="required_icon" style="color: #fff">*</span>
-                                <el-form-item label="监测点台账信息：" prop="lineFilePath">
-                                    <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>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <!-- 基础信息 -->
-                        <el-row>
-                            <el-col :span="12">
-                                <el-form-item label="填报人：" prop="reporter">
-                                    <el-input
-                                        v-model="form.reporter"
-                                        autocomplete="off"
-                                        place-holder="请输入填报人"
-                                        :disabled="true"
-                                    />
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <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-col>
-                        </el-row>
-                        <el-row>
-                            <el-col :span="12">
-                                <el-form-item label="填报部门：" prop="orgId">
-                                    <el-input v-model="form.orgName" :disabled="true" autocomplete="off" />
-                                </el-form-item>
-                            </el-col>
-
-                            <el-col :span="12">
-                                <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-col>
-                        </el-row>
-                        <el-row>
-                            <el-col :span="12">
-                                <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-col>
-
-                            <el-col :span="12">
-                                <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-col>
-                        </el-row>
-                        <el-row>
-                            <el-col :span="12">
-                                <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.name"
-                                            :value="item.id"
-                                        ></el-option>
-                                    </el-select>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <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-col>
-                        </el-row>
-                        <!-- 监测点信息 -->
-                        <el-row>
-                            <el-col :span="12">
-                                <el-form-item label="监测点名称：" prop="lineName">
-                                    <el-input
-                                        v-model="form.lineName"
-                                        autocomplete="off"
-                                        place-holder="请输入监测点名称"
-                                    />
-                                </el-form-item>
-                            </el-col>
-
-                            <el-col :span="12">
-                                <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-col>
-                        </el-row>
-                        <el-row>
-                            <el-col :span="12">
-                                <el-form-item label="接入母线：" prop="connectedBus">
-                                    <el-input
-                                        v-model="form.connectedBus"
-                                        autocomplete="off"
-                                        place-holder="请输入接入母线"
-                                    />
-                                    <!-- <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-col>
-
-                            <el-col :span="12">
-                                <el-form-item label="短路容量：" prop="shortCapacity">
-                                    <el-input
-                                        v-model="form.shortCapacity"
-                                        autocomplete="off"
-                                        placeholder="请输入短路容量"
-                                    />
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row>
-                            <el-col :span="12">
-                                <el-form-item label="协议容量：" prop="dealCapacity">
-                                    <el-input
-                                        v-model="form.dealCapacity"
-                                        autocomplete="off"
-                                        placeholder="请输入协议容量"
-                                    />
-                                </el-form-item>
-                            </el-col>
-
-                            <el-col :span="12">
-                                <el-form-item label="设备容量：" prop="devCapacity">
-                                    <el-input
-                                        v-model="form.devCapacity"
-                                        autocomplete="off"
-                                        placeholder="请输入设备容量"
-                                    />
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row>
-                            <el-col :span="12">
-                                <el-form-item label="基准容量：" prop="standardCapacity">
-                                    <el-input
-                                        v-model="form.standardCapacity"
-                                        autocomplete="off"
-                                        placeholder="请输入基准容量"
-                                    />
-                                </el-form-item>
-                            </el-col>
-
-                            <el-col :span="12">
-                                <el-form-item label="CT变比：" prop="ctRatio">
-                                    <el-input v-model="form.ctRatio" autocomplete="off" placeholder="请输入CT变比" />
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row>
-                            <el-col :span="12">
-                                <el-form-item label="PT变比：" prop="ptRatio">
-                                    <el-input v-model="form.ptRatio" autocomplete="off" placeholder="请输入PT变比" />
-                                </el-form-item>
-                            </el-col>
-
-                            <el-col :span="12">
-                                <el-form-item label="监测点编码：" prop="lineId">
-                                    <el-input v-model="form.lineId" autocomplete="off" placeholder="请输入监测点编码" />
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row>
-                            <el-col :span="12">
-                                <el-form-item label="测量间隔：" prop="timeInterval">
-                                    <el-input
-                                        v-model="form.timeInterval"
-                                        autocomplete="off"
-                                        placeholder="请输入测量间隔"
-                                    />
-                                </el-form-item>
-                            </el-col>
-
-                            <el-col :span="12">
-                                <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-col>
-                        </el-row>
-                        <el-row>
-                            <el-col :span="12">
-                                <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-col>
-
-                            <el-col :span="12">
-                                <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-col>
-                        </el-row>
-                        <el-row>
-                            <el-col :span="12">
-                                <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-col>
-
-                            <el-col :span="12">
-                                <el-form-item label="对象名称(对端)：" prop="objName">
-                                    <el-input
-                                        v-model="form.objName"
-                                        autocomplete="off"
-                                        placeholder="请输入监测点对象名称"
-                                    />
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row>
-                            <el-col :span="12">
-                                <el-form-item label="电网侧变电站：" prop="powerSubstationName">
-                                    <el-input
-                                        v-model="form.powerSubstationName"
-                                        autocomplete="off"
-                                        placeholder="请输入电网侧变电站"
-                                    />
-                                </el-form-item>
-                            </el-col>
-
-                            <el-col :span="12">
-                                <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-col>
-                        </el-row>
-
-                        <el-row>
-                            <el-col :span="12">
-                                <el-form-item label="电压偏差上限：" prop="voltageDeviationUpperLimit">
-                                    <el-input
-                                        v-model="form.voltageDeviationUpperLimit"
-                                        autocomplete="off"
-                                        placeholder="请输入电压偏差上限"
-                                    />
-                                </el-form-item>
-                            </el-col>
-
-                            <el-col :span="12">
-                                <el-form-item label="电压偏差下限：" prop="voltageDeviationLowerLimit">
-                                    <el-input
-                                        v-model="form.voltageDeviationLowerLimit"
-                                        autocomplete="off"
-                                        placeholder="请输入电压偏差下限"
-                                    />
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row>
-                            <el-col :span="12">
-                                <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-col>
-
-                            <el-col :span="12" class="required_position">
-                                <span class="required_icon">*</span>
-                                <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-col>
-                        </el-row>
-                    </div>
-                </el-tab-pane>
-            </el-tabs>
-        </el-form>
-        <template #footer>
-            <div class="dialog-footer">
-                <el-button @click="close()">取消</el-button>
-                <el-button type="primary" @click="confirmForm()">确定</el-button>
-            </div>
-        </template>
-    </el-dialog>
-</template>
-<script lang="ts" setup>
-import { ref, onMounted, reactive, defineExpose, defineProps, defineEmits, watch, onUnmounted } from 'vue'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
-import { genFileId, ElMessage } from 'element-plus'
-import { useDictData } from '@/stores/dictData'
-import { useAdminInfo } from '@/stores/adminInfo'
-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'
-const emits = defineEmits(['onSubmit'])
-const dictData = useDictData()
-const dialogFormVisible = ref(false)
-const form: any = ref({})
-const ruleFormRef = ref(null)
-//字典获取所属地市
-const areaOptionList = dictData.getBasicData('jibei_area')
-//字典获取监测点电压等级
-const voltageLevelList = dictData.getBasicData('Dev_Voltage_Stand')
-//用户状态数组
-const userStateList = reactive([
-    {
-        name: '可研',
-        id: '0'
-    },
-    {
-        name: '建设',
-        id: '1'
-    },
-    {
-        name: '运行',
-        id: '2'
-    },
-    {
-        name: '退运',
-        id: '3'
-    }
-])
-//定义监测点性质下拉框数据
-const pointNatureList = [
-    {
-        id: '0',
-        name: '电网侧'
-    },
-    {
-        id: '1',
-        name: '非电网侧'
-    }
-]
-//定义监测点运行状态下拉框数据
-const operationStatusList = [
-    {
-        id: '0',
-        name: '运行'
-    },
-    {
-        id: '1',
-        name: '检修'
-    },
-    {
-        id: '2',
-        name: '停运'
-    },
-    {
-        id: '3',
-        name: '调试'
-    },
-    {
-        id: '4',
-        name: '退运'
-    }
-]
-
-//获取登陆用户姓名和部门
-const adminInfo = useAdminInfo()
-
-//工程下拉选择数据
-const userNameList = ref([])
-//查询干扰源列表获取可选数据
-const projectList = ref([])
-const getSelectableList = () => {
-    let obj = {}
-    getList(obj).then(res => {
-        projectList.value = res.data
-        res.data.map(item => {
-            userNameList.value.push({
-                name:item?.projectName,
-                id:item?.id
-            })
-        })
-        //初始化
-        let obj = res.data[0]
-        form.value = {
-            ...form.value,
-            city: obj.city,
-            reporter: obj.reporter,
-            reportDate: obj.reportDate,
-            orgId: obj.orgId,
-            orgName:obj.orgName,
-            expectedProductionDate: obj.expectedProductionDate,
-            userName:userNameList.value[0]?.name,
-            userId:userNameList.value[0]?.id
-        }
-    })
-}
-
-const monitoringTerminalList = ref([])
-//获取关联设备
-const findAllMonitoringTerminalList = () => {
-    getDeviceList().then(res => {
-        monitoringTerminalList.value = res.data
-    })
-}
-//查询关联设备下拉框
-const changeDevice = () => {
-    const obj = monitoringTerminalList.value.find(item => {
-        return form.value.monitoringTerminalCode == item.monitoringTerminalCode
-    })
-    form.value = {
-        ...form.value,
-        monitoringTerminalCode: obj.monitoringTerminalCode,
-        monitoringTerminalName: obj.monitoringTerminalName
-    }
-}
-//定义切换form类型
-const selectFormType = ref('')
-selectFormType.value = '0'
-const resetForm = () => {
-    form.value = {
-        reporter: '', //填报人
-        reportDate: '', //填报日期
-        orgId: '', //填报部门id
-        orgName:'', //填报部门名称
-        expectedProductionDate: '', //工程投产日期
-        city: areaOptionList[0].name, //所属地市
-        userStatus: userStateList[1].id, //用户状态
-        monitoringTerminalCode: monitoringTerminalList.value[0]?.monitoringTerminalCode, //关联设备
-        monitoringTerminalName: monitoringTerminalList.value[0]?.monitoringTerminalName,
-        userName: '', //工程名称
-        userId: '', //工程id
-
-        //监测点信息实体
-        businessType: '', //	干扰源类别
-        connectedBus: '', //	接入母线
-        ctRatio: '0', //CT变比
-        dealCapacity: '0', //协议容量
-        devCapacity: '0', //设备容量
-        isGridConnectionPoint: '0', //是否并网点
-        isStatistical: '0', //	是否参与统计
-        lineId: '', //	监测点编码
-        lineName: '', //	监测点名称
-        loadType: '', //干扰源类型
-        mainWiringDiagram: [], //	主接线图
-        objName: '', //监测点对象名称
-        operationStatus: operationStatusList[0].id, //监测点运行状态
-        pointNature: pointNatureList[0].id, //监测点性质
-        powerSubstationName: '', //电网侧变电站
-        ptRatio: '0', //	PT变比
-        shortCapacity: '0', //	短路容量
-        standardCapacity: '0', //基准容量
-        timeInterval: '0', //测量间隔
-        voltageDeviationLowerLimit: '0', //电压偏差下限
-        voltageDeviationUpperLimit: '0', //	电压偏差上限
-        voltageLevel: voltageLevelList[0].id //监测点电压等级
-    }
-
-    // form.value.reporter = adminInfo.$state.name
-    // form.value.orgId = adminInfo.$state.deptName
-}
-//初始化数据
-resetForm()
-getSelectableList()
-findAllMonitoringTerminalList()
-
-//获取树形图数据
-const treeData: any = ref('')
-//干扰源类型 取树形图第一层children数据
-const loadTypeList = ref([])
-//干扰源类别 取树形图第二层children数据
-const businessTypeList = ref([])
-const getTreeList = () => {
-    queryByAllCode().then(res => {
-        treeData.value = [res.data.find(item => item.code == 'Major_Nonlinear_Device')]
-        treeData.value[0].children.map(item => {
-            //干扰源类型数据
-            loadTypeList.value.push({
-                id: item?.id,
-                name: item?.name,
-                children: item?.children
-            })
-        })
-        form.value.loadType = loadTypeList.value[0]?.id
-        changeLoadType()
-    })
-}
-getTreeList()
-//选择干扰源类型的时候，干扰源类别数据跟随改变
-const changeLoadType = async () => {
-    businessTypeList.value = loadTypeList.value.find(item => {
-        return item.id == form.value.loadType
-    }).children
-    form.value.businessType = businessTypeList.value[0]?.id
-}
-//选择关联干扰源回显数据
-const changeUserName = () => {
-    let obj = projectList.value.find(item => {
-        return form.value.userName == item.projectName
-    })
-    form.value = {
-        ...form.value,
-        city: obj.city,
-        reporter: obj.reporter,
-        reportDate: obj.reportDate,
-        orgId: obj.orgId,
-        orgName: obj.orgName,
-        userName: obj.projectName,
-        userId: obj.id,
-        expectedProductionDate: obj.expectedProductionDate
-    }
-    console.log(obj, '选择关联干扰源回显数据')
-}
-//监测点信息表单格式
-const monitorPointForm = ref({
-    reporter: '', //填报人
-    reportDate: '', //填报日期
-    orgId: '', //填报部门
-    orgName:'',
-    expectedProductionDate: '', //工程投产日期
-    city: areaOptionList[0].name, //所属地市
-    userStatus: userStateList[1].id, //用户状态
-    userName: '', //工程名称
-    userId: '',
-    monitoringTerminalCode: '', //关联设备
-    monitoringTerminalName: '',
-
-    //监测点信息实体
-    // supervisionTempLineReportParam: {
-    businessType: '', //	干扰源类别
-    connectedBus: '', //	接入母线
-    ctRatio: '0', //CT变比
-    dealCapacity: '0', //协议容量
-    devCapacity: '0', //设备容量
-    isGridConnectionPoint: '0', //是否并网点
-    isStatistical: '0', //	是否参与统计
-    lineId: '', //	监测点编码
-    lineName: '', //	监测点名称
-    loadType: '', //干扰源类型
-    mainWiringDiagram: '', //	主接线图
-    objName: '', //监测点对象名称
-    operationStatus: '', //监测点运行状态
-    pointNature: '', //监测点性质
-    powerSubstationName: '', //电网侧变电站
-    ptRatio: '0', //	PT变比
-    shortCapacity: '0', //	短路容量
-    standardCapacity: '0', //基准容量
-    timeInterval: '0', //测量间隔
-    voltageDeviationLowerLimit: '0', //电压偏差下限
-    voltageDeviationUpperLimit: '0', //	电压偏差上限
-    voltageLevel: '' //监测点电压等级
-    // }
-})
-
-//定义校验规则
-const rules = ref({
-    //基础信息
-    reporter: [
-        {
-            required: true,
-            message: '请输入填报人',
-            trigger: 'blur'
-        }
-    ],
-    reportDate: [
-        {
-            required: true,
-            message: '请选择填报日期',
-            trigger: 'change'
-        }
-    ],
-    orgId: [
-        {
-            required: true,
-            message: '请选择填报部门',
-            trigger: 'change'
-        }
-    ],
-    expectedProductionDate: [
-        {
-            required: true,
-            message: '请选择工程投产日期',
-            trigger: 'change'
-        }
-    ],
-    city: [
-        {
-            required: true,
-            message: '请选择所属地市',
-            trigger: 'change'
-        }
-    ],
-    userStatus: [
-        {
-            required: true,
-            message: '请选择用户状态',
-            trigger: 'change'
-        }
-    ],
-    userName: [
-        {
-            required: true,
-            message: '请选择工程名称',
-            trigger: 'change'
-        }
-    ],
-    monitoringTerminalCode: [
-        {
-            required: true,
-            message: '请选择关联设备',
-            trigger: 'change'
-        }
-    ],
-    //监测点信息
-    lineName: [
-        {
-            required: true,
-            message: '请输入监测点名称',
-            trigger: 'blur'
-        }
-    ],
-    voltageLevel: [
-        {
-            required: true,
-            message: '请选择监测点电压等级',
-            trigger: 'change'
-        }
-    ],
-    connectedBus: [
-        {
-            required: true,
-            message: '请选择接入母线',
-            trigger: 'blur'
-        }
-    ],
-    shortCapacity: [
-        {
-            required: true,
-            message: '请输入短路容量',
-            trigger: 'blur'
-        }
-    ],
-    dealCapacity: [
-        {
-            required: true,
-            message: '请输入协议容量',
-            trigger: 'blur'
-        }
-    ],
-    devCapacity: [
-        {
-            required: true,
-            message: '请输入设备容量',
-            trigger: 'blur'
-        }
-    ],
-    standardCapacity: [
-        {
-            required: true,
-            message: '请输入基准容量',
-            trigger: 'blur'
-        }
-    ],
-    ctRatio: [
-        {
-            required: true,
-            message: '请输入CT变化',
-            trigger: 'blur'
-        }
-    ],
-    ptRatio: [
-        {
-            required: true,
-            message: '请输入PT变化',
-            trigger: 'blur'
-        }
-    ],
-    lineId: [
-        {
-            required: true,
-            message: '请输入监测点编码',
-            trigger: 'blur'
-        }
-    ],
-    timeInterval: [
-        {
-            required: true,
-            message: '请输入测量间隔',
-            trigger: 'blur'
-        }
-    ],
-    loadType: [
-        {
-            required: true,
-            message: '请选择干扰源类型',
-            trigger: 'change'
-        }
-    ],
-    businessType: [
-        {
-            required: true,
-            message: '请选择干扰源类别',
-            trigger: 'change'
-        }
-    ],
-    pointNature: [
-        {
-            required: true,
-            message: '请选择监测点性质',
-            trigger: 'change'
-        }
-    ],
-    isStatistical: [
-        {
-            required: true,
-            message: '请选择是否参与统计',
-            trigger: 'change'
-        }
-    ],
-    objName: [
-        {
-            required: true,
-            message: '请输入监测点对象名称',
-            trigger: 'blur'
-        }
-    ],
-    powerSubstationName: [
-        {
-            required: false,
-            message: '请选择电网侧变电站',
-            trigger: 'change'
-        }
-    ],
-    isGridConnectionPoint: [
-        {
-            required: true,
-            message: '请选择是否并网点',
-            trigger: 'change'
-        }
-    ],
-    operationStatus: [
-        {
-            required: true,
-            message: '请选择监测点运行状态',
-            trigger: 'change'
-        }
-    ],
-    mainWiringDiagram: [
-        {
-            required: false,
-            message: '请上传主接线图',
-            trigger: 'change'
-        }
-    ],
-    voltageDeviationUpperLimit: [
-        {
-            required: false,
-            message: '请输入电压偏差上限',
-            trigger: 'blur'
-        }
-    ],
-    voltageDeviationLowerLimit: [
-        {
-            required: false,
-            message: '请输入电压偏差下限',
-            trigger: 'blur'
-        }
-    ]
-})
-watch(
-    () => form.value,
-    (val, oldVal) => {},
-    {
-        deep: true,
-        immediate: true
-    }
-)
-const open = () => {
-    dialogFormVisible.value = true
-}
-const close = () => {
-    //重置表单内容
-    //取消表单校验状态
-    ruleFormRef.value && ruleFormRef.value.resetFields()
-    dialogFormVisible.value = false
-    emits('onSubmit')
-    resetForm()
-}
-onMounted(() => {
-    console.log()
-})
-
-// 上传报告
-const uploadRef = ref()
-const handleExceed: UploadProps['onExceed'] = files => {
-    uploadRef.value!.clearFiles()
-    const file = files[0] as UploadRawFile
-    file.uid = genFileId()
-    uploadRef.value!.handleStart(file)
-}
-let uploadName = ref('')
-//上传报告改变
-const uploadFileName = val => {
-    uploadName.value = val
-}
-//监测点台账信息
-const lineFilePath = ref('')
-//主接线图
-const mainWiringDiagram = ref('')
-const choose = (e: any) => {
-    uploadFile(e.raw, '/supervision/').then(res => {
-        //监测点台账信息
-        if (uploadName.value == 'lineFilePath') {
-            lineFilePath.value = res.data.name
-        }
-        //主接线图
-        else if (uploadName.value == 'mainWiringDiagram') {
-            mainWiringDiagram.value = res.data.name
-            console.log(mainWiringDiagram.value, '++++++++')
-        }
-    })
-}
-
-//设置工程投产日期时间选择范围不能<今天
-const disabledDate = time => {
-    return time.getTime() < Date.now() - 8.64e7 // 8.64e7 毫秒数代表一天
-}
-const activeName = ref('0')
-//提交
-const confirmForm = () => {
-    console.log(form.value, '打印form对象')
-    // 先判断提交终端信息与监测点信息
-
-    // 提交监测点信息
-        ruleFormRef.value.validate(valid => {
-            if (valid) {
-                //整理上传文件的数据
-                //处理填报日期时间格式
-                form.value.reportDate = window.XEUtils.toDateString(form.value.reportDate, 'yyyy-MM-dd')
-                let confirmFormData = JSON.parse(JSON.stringify(form.value))
-
-                //1.判断是否上传
-                // if (!lineFilePath.value) {
-                //     return ElMessage({
-                //         message: '请上传监测点台账信息',
-                //         type: 'warning'
-                //     })
-                // }
-                if (!mainWiringDiagram.value) {
-                    return ElMessage({
-                        message: '请上传主接线图',
-                        type: 'warning'
-                    })
-                }
-                //提交终端信息
-                confirmFormData = {
-                    ...confirmFormData,
-                    lineFilePath: lineFilePath?.value, //监测点信息
-                    mainWiringDiagram: mainWiringDiagram.value //主接线图
-                }
-                addMointorPointFormData(confirmFormData).then(res => {
-                    ruleFormRef.value.resetFields()
-                    resetForm()
-                    close()
-                })
-            } else {
-                console.log('表单验证失败')
-                return false
-            }
-        })
-}
-defineExpose({ open })
-</script>
-<style lang="scss" scoped>
-.el-form {
-    // width: 96%;
-    height: 400px;
-    margin: 0 auto;
-    // overflow-y: auto;
-    padding-top: 20px;
-}
-.dialog-footer {
-    padding: 10px;
-}
-/* 调整标签的换行行为 */
-.label_over_warp::v-deep .el-form-item__label {
-    // white-space: pre-line !important;
-    line-height: 16px !important;
-}
-::v-deep .el-form-item {
-    padding: 0 10px;
-    height: auto !important;
-}
-::v-deep .el-form-item__label {
-    justify-content: flex-start !important;
-}
-.form-label-left-align {
-    text-align: left;
-}
-::v-deep .el-input-number .el-input__inner {
-    text-align: left;
-}
-
-//表单tab容器
-.form_tab_item {
-    height: 400px;
-    overflow-y: auto;
-}
-::v-deep .el-input {
-    width: 200px !important;
-}
-::v-deep .el-select {
-    width: 200px !important;
-}
-::v-deep .required_position {
-    position: relative;
-    .required_icon {
-        position: absolute;
-        left: -10px;
-        margin-top: 8px;
-        color: #f56c6c;
-        margin-left: 10px;
-    }
-    .required_text {
-        padding-left: 20px;
-    }
-}
-.no_required::v-deep .el-form-item__label {
-    padding-left: 10px !important;
-    width: 70px !important;
-    margin-left: 0px !important;
-}
-
-// ::v-deep .tabs_form{
-//     height:300px !important;
-// }
-</style>
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/debug.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/debug.vue
index bf16bfc5..08847b37 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/debug.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/debug.vue
@@ -1,8 +1,8 @@
 <template>
     <el-dialog
         v-model="dialogFormVisible"
-        title="联调申请"
-        width="60%"
+        title="申请联调"
+        width="30%"
         :append-to-body="true"
         :before-close="close"
         :close-on-click-modal="false"
@@ -16,57 +16,12 @@
             :scroll-to-error="true"
             :rules="rules"
             ref="ruleFormRef"
-            label-width="140px"
+            label-width="80px"
             label-position="right"
         >
-            <!-- 基础信息 -->
-            <el-row>
-                <el-col :span="12">
-                    <el-form-item label="填报人：" prop="reporter">
-                        <el-input
-                            v-model="form.reporter"
-                            autocomplete="off"
-                            place-holder="请输入填报人"
-                            :disabled="true"
-                        />
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <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-col>
-            </el-row>
-            <el-row>
-                <el-col :span="12">
-                    <el-form-item label="填报部门：" prop="orgId">
-                        <el-input v-model="form.orgName" :disabled="true" autocomplete="off" />
-                    </el-form-item>
-                </el-col>
-
-                <el-col :span="12">
-                    <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-col>
-            </el-row>
+            <el-form-item label="原因：" prop="reason">
+                <el-input v-model="form.reason" autocomplete="off" place-holder="请输入填报人" />
+            </el-form-item>
         </el-form>
         <template #footer>
             <div class="dialog-footer">
@@ -78,15 +33,16 @@
 </template>
 <script lang="ts" setup>
 import { ref, onMounted, reactive, defineExpose, defineProps, defineEmits, watch, onUnmounted } from 'vue'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
-import { genFileId, ElMessage } from 'element-plus'
 import { useDictData } from '@/stores/dictData'
 import { useAdminInfo } from '@/stores/adminInfo'
-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 { addMointorPointTempLinedebug } from '@/api/supervision-boot/jointDebugList/index'
 const emits = defineEmits(['onSubmit'])
+const props=defineProps({
+    debugId:{
+        type:String,
+        default:''
+    }
+})
 const dictData = useDictData()
 const dialogFormVisible = ref(false)
 const form: any = ref({})
@@ -94,53 +50,23 @@ const ruleFormRef = ref(null)
 //定义切换form类型
 const selectFormType = ref('')
 selectFormType.value = '0'
-//获取登陆用户姓名和部门
-const adminInfo = useAdminInfo()
 const resetForm = () => {
     form.value = {
-        reporter: '', //填报人
-        reportDate: new Date(), //填报日期
-        orgId: '', //填报部门id
-        orgName: '', //填报部门名称
-
+        reason: '', //填报人
     }
-
-    form.value.reporter = adminInfo.$state.name
-    form.value.orgName = adminInfo.$state.deptName
 }
 //初始化数据
 resetForm()
 //定义校验规则
 const rules = ref({
     //基础信息
-    reporter: [
+    reason: [
         {
             required: true,
-            message: '请输入填报人',
+            message: '请输入原因',
             trigger: 'blur'
         }
-    ],
-    reportDate: [
-        {
-            required: true,
-            message: '请选择填报日期',
-            trigger: 'change'
-        }
-    ],
-    orgId: [
-        {
-            required: true,
-            message: '请选择填报部门',
-            trigger: 'change'
-        }
-    ],
-    expectedProductionDate: [
-        {
-            required: true,
-            message: '请选择工程投产日期',
-            trigger: 'change'
-        }
-    ],
+    ]
 })
 watch(
     () => form.value,
@@ -165,7 +91,6 @@ onMounted(() => {
     console.log()
 })
 
-
 //设置工程投产日期时间选择范围不能<今天
 const disabledDate = time => {
     return time.getTime() < Date.now() - 8.64e7 // 8.64e7 毫秒数代表一天
@@ -175,17 +100,12 @@ const confirmForm = () => {
     // 提交监测点信息
     ruleFormRef.value.validate(valid => {
         if (valid) {
-            //整理上传文件的数据
-            //处理填报日期时间格式
-            form.value.reportDate = window.XEUtils.toDateString(form.value.reportDate, 'yyyy-MM-dd')
-            let confirmFormData = JSON.parse(JSON.stringify(form.value))
-
-        
-            //提交终端信息
-            confirmFormData = {
-                ...confirmFormData,
+            //提交监测点联调信息
+            form.value={
+                ...form.value,
+                id:props.debugId
             }
-            addMointorPointFormData(confirmFormData).then(res => {
+            addMointorPointTempLinedebug(form.value).then(res => {
                 ruleFormRef.value.resetFields()
                 resetForm()
                 close()
@@ -201,7 +121,7 @@ defineExpose({ open })
 <style lang="scss" scoped>
 .el-form {
     // width: 96%;
-    height: 400px;
+    height: 100px;
     margin: 0 auto;
     // overflow-y: auto;
     padding-top: 20px;
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/detail.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/detail.vue
index 186d27c7..b527d408 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/detail.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/detail.vue
@@ -1,122 +1,11 @@
 <template>
     <div class="default-main">
-        666666
         <el-descriptions :column="2" border>
-            <el-descriptions-item label="监测点台账信息" v-if="detailData.lineFilePath">
-                <el-icon>
-                    <Link />
-                </el-icon>
-                <a :href="detailData?.lineFilePath.url">
-                    {{ detailData?.lineFilePath.name }}
-                </a>
-            </el-descriptions-item>
-            <el-descriptions-item label="填报人">
-                {{ detailData.reporter }}
-            </el-descriptions-item>
-            <el-descriptions-item label="填报日期">
-                {{ formatDate(detailData.reportDate, 'YYYY-MM-DD') }}
-            </el-descriptions-item>
-            <el-descriptions-item label="填报部门">
-                {{ detailData.orgName }}
-            </el-descriptions-item>
-            <el-descriptions-item label="工程投产日期">
-                {{ formatDate(detailData.expectedProductionDate, 'YYYY-MM-DD') }}
-            </el-descriptions-item>
-            <el-descriptions-item label="所属地市">
-                {{ detailData.city }}
-            </el-descriptions-item>
-            <el-descriptions-item label="用户状态">
-                {{
-                    userStateList.find(item => {
-                        return item.value == detailData.userStatus
-                    })?.label
-                }}
-            </el-descriptions-item>
-            <el-descriptions-item label="关联干扰源">
-                {{ detailData.userName }}
-            </el-descriptions-item>
-            <el-descriptions-item label="关联设备">
-                {{ detailData.monitoringTerminalName }}
-            </el-descriptions-item>
             <el-descriptions-item label="监测点名称">
                 {{ detailData.lineName }}
             </el-descriptions-item>
-            <el-descriptions-item label="监测点电压等级">
-                {{ 
-                    voltageLevelList.find((item)=>{
-                        return detailData.voltageLevel==item.id
-                    })?.name
-                }}
-            </el-descriptions-item>
-            <el-descriptions-item label="接入母线">
-                {{ detailData.connectedBus }}
-            </el-descriptions-item>
-            <el-descriptions-item label="短路容量">
-                {{ detailData.shortCapacity }}
-            </el-descriptions-item>
-            <el-descriptions-item label="协议容量">
-                {{ detailData.dealCapacity }}
-            </el-descriptions-item>
-            <el-descriptions-item label="设备容量">
-                {{ detailData.devCapacity }}
-            </el-descriptions-item>
-            <el-descriptions-item label="基准容量">
-                {{ detailData.standardCapacity }}
-            </el-descriptions-item>
-            <el-descriptions-item label="CT变比">
-                {{ detailData.ctRatio }}
-            </el-descriptions-item>
-            <el-descriptions-item label="PT变比">
-                {{ detailData.ptRatio }}
-            </el-descriptions-item>
-            <el-descriptions-item label="监测点编码">
-                {{ detailData.lineId }}
-            </el-descriptions-item>
-            <el-descriptions-item label="测量间隔">
-                {{ detailData.timeInterval }}
-            </el-descriptions-item>
-            <el-descriptions-item label="干扰源类型">
-                {{ detailData.loadType }}
-            </el-descriptions-item>
-            <el-descriptions-item label="干扰源类别">
-                {{ detailData.businessType }}
-            </el-descriptions-item>
-            <el-descriptions-item label="监测点性质">
-                {{ detailData.pointNature=='0'?'电网侧':'非电网侧' }}
-            </el-descriptions-item>
-            <el-descriptions-item label="是否参与统计">
-                {{ detailData.isStatistical == '0' ? '是' : '否' }}
-            </el-descriptions-item>
-            <el-descriptions-item label="对象名称(对端)">
-                {{ detailData.objName }}
-            </el-descriptions-item>
-            <el-descriptions-item label="电网侧变电站">
-                {{ detailData.powerSubstationName }}
-            </el-descriptions-item>
-            <el-descriptions-item label="是否并网点">
-                {{ detailData.isGridConnectionPoint == '0' ? '是' : '否' }}
-            </el-descriptions-item>
-            <el-descriptions-item label="电压偏差上限">
-                {{ detailData.voltageDeviationUpperLimit }}
-            </el-descriptions-item>
-            <el-descriptions-item label="电压偏差下限">
-                {{ detailData.voltageDeviationLowerLimit }}
-            </el-descriptions-item>
-            <el-descriptions-item label="监测点运行状态">
-                {{ 
-                  operationStatusList.find((item)=>{
-                    return  detailData.operationStatus==item.id
-                  })?.name
-                }}
-            </el-descriptions-item>
-            <!--文件地址-->
-            <el-descriptions-item label="主接线图" v-if="detailData?.mainWiringDiagram">
-                <el-icon>
-                    <Link />
-                </el-icon>
-                <a :href="detailData?.mainWiringDiagram.url">
-                    {{ detailData?.mainWiringDiagram.name }}
-                </a>
+            <el-descriptions-item label="调试原因">
+                {{ detailData.reason}}
             </el-descriptions-item>
         </el-descriptions>
     </div>
@@ -124,18 +13,10 @@
 <script lang="ts" setup>
 import { onMounted, ref, reactive } from 'vue'
 import { useRoute } from 'vue-router'
-import { formatDate } from '@/utils/formatTime'
 import { propTypes } from '@/utils/propTypes'
-import { getTempLineDetailsById } from '@/api/supervision-boot/monitorpoint/index'
-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 { getMointorPointTempLinedebugDetail } from '@/api/supervision-boot/jointDebugList/index'
 defineOptions({ name: 'BpmUserReportDetail' })
-
 const { query } = useRoute() // 查询参数
-
 const props = defineProps({
     id: propTypes.string.def(undefined)
 })
@@ -143,159 +24,18 @@ const detailLoading = ref(false) // 表单的加载中
 const detailData = ref<any>({}) // 详情数据
 const queryId = query.id as unknown as string // 从 URL 传递过来的 id 编号
 
-//用户状态数组
-const userStateList = reactive([
-    {
-        label: '可研',
-        value: '0'
-    },
-    {
-        label: '建设',
-        value: '1'
-    },
-    {
-        label: '运行',
-        value: '2'
-    },
-    {
-        label: '退运',
-        value: '3'
-    }
-])
-const dictData = useDictData()
-//字典获取所属地市
-const areaOptionList = dictData.getBasicData('jibei_area')
-//定义监测装置安装位置下拉框数据
-const monitoringDeviceInstallationPositionList = [
-    {
-        id: '0',
-        name: '电网侧'
-    },
-    {
-        id: '1',
-        name: '用户侧'
-    }
-]
-//定义召唤标志下拉框数据
-const summonFlagList = [
-    {
-        id: '0',
-        name: '周期触发'
-    },
-    {
-        id: '1',
-        name: '变为触发'
-    }
-]
-//定义终端模型下拉框数据
-const terminalModelList = [
-    {
-        id: '0',
-        name: '虚拟设备'
-    },
-    {
-        id: '1',
-        name: '虚拟设备'
-    },
-    {
-        id: '2',
-        name: '虚拟设备'
-    }
-]
-//定义通讯状态下拉框数据
-const communicationStatusList = [
-    {
-        id: '0',
-        name: '中断'
-    },
-    {
-        id: '1',
-        name: '正常'
-    }
-]
-//字典获取监测点电压等级
-const voltageLevelList = dictData.getBasicData('Dev_Voltage_Stand')
-//字典获取数据类型
-const dataTypeList = dictData.getBasicData('System_Type')
-//字典获取终端型号
-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')
-//字典获取厂家
-const manufacturerList = dictData.getBasicData('Dev_Manufacturers')
-//定义监测点运行状态下拉框数据
-const operationStatusList = [
-    {
-        id: '0',
-        name: '运行'
-    },
-    {
-        id: '1',
-        name: '检修'
-    },
-    {
-        id: '2',
-        name: '停运'
-    },
-    {
-        id: '3',
-        name: '调试'
-    },
-    {
-        id: '4',
-        name: '退运'
-    }
-]
+
 /** 获得数据 */
 const getInfo = async () => {
     detailLoading.value = true
     try {
-        await getTempLineDetailsById({ id: props.id || queryId }).then(res => {
+        await getMointorPointTempLinedebugDetail({ id: props.id || queryId }).then(res => {
             detailData.value = res.data
-            getFileName()
         })
     } finally {
         detailLoading.value = false
     }
 }
-const getFileName = async () => {
-    //监测点台账信息
-    if (detailData.value.lineFilePath) {
-        await getFileNamePath(detailData.value.lineFilePath, 'lineFilePath')
-    }
-    //主接线图
-    else  if (detailData.value.mainWiringDiagram) {
-        await getFileNamePath(detailData.value.mainWiringDiagram, 'mainWiringDiagram')
-    }
-
-}
-//根据文件名请求
-const getFileNamePath = async (val: any, pathName: any) => {
-    await getFileNameAndFilePath({ filePath: val }).then(res => {
-        if (res.data) {
-            //监测点台账信息
-            if (pathName == 'lineFilePath' && detailData.value.lineFilePath) {
-                detailData.value.lineFilePath = {
-                    name: res.data.fileName,
-                    url: res.data.url
-                }
-            }
-            //主接线图
-            else if (pathName == 'mainWiringDiagram' && detailData.value.mainWiringDiagram) {
-                detailData.value.mainWiringDiagram = {
-                    name: res.data.fileName,
-                    url: res.data.url
-                }
-            }
-        }
-    })
-}
 defineExpose({ open: getInfo }) // 提供 open 方法，用于打开弹窗
 
 /** 初始化 **/
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
index 9174510d..c8dbc8f5 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/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>
@@ -22,11 +22,8 @@
         </template>
     </TableHeader>
     <Table ref="tableRef" />
-
-    <!-- 新增弹框 -->
-    <addForm ref="addForms" @onSubmit="tableStore.index()"></addForm>
     <!-- 申请联调弹框 -->
-    <debug ref="debugForms" @onSubmit="tableStore.index()"></debug>
+    <debug ref="debugForms" @onSubmit="tableStore.index()" :debugId="debugId"></debug>
 </template>
 <script setup lang="ts">
 import { ref, onMounted, provide, nextTick } from 'vue'
@@ -36,7 +33,6 @@ import TableHeader from '@/components/table/header/index.vue'
 import { useRouter } from 'vue-router'
 import { useDictData } from '@/stores/dictData'
 import { getLoadTypeUserList } from '@/api/process-boot/interference'
-import addForm from './addForm.vue'
 import debug from './debug.vue'
 import { any } from 'vue-types'
 const dictData = useDictData()
@@ -49,14 +45,12 @@ const ruleFormRef = ref()
 const show: any = ref(false)
 const fileList = ref([])
 const tableStore = new TableStore({
-    url: '/supervision-boot/tempLine/list',
+    url: '/supervision-boot/tempLinedebug/list',
     publicHeight: 65,
     method: 'POST',
     column: [
         { title: '序号', type: 'seq', width: 80 },
-        { field: 'orgName', title: '填报部门名称' , minWidth: 170 },
-        { field: 'reportDate', title: '填报日期', minWidth: 170},
-        { field: 'reporter', title: '填报人', minWidth: 80 },
+        { field: 'lineName', title: '监测点名称', minWidth: 170 },
         {
             field: 'status',
             title: '审核状态',
@@ -72,46 +66,11 @@ const tableStore = new TableStore({
                 1: '审批中',
                 2: '审批通过',
                 3: '审批不通过',
-                4: '已取消'
+                4: '已取消',
+                null:'/'
             }
         },
-        { field: 'monitoringTerminalName', title: '设备名称', minWidth: 170 },
-        { field: 'substation', title: '所属变电站', minWidth: 170 },
-        // {
-        //     field: 'userType',
-        //     title: '用户性质',
-        //     minWidth: 150,
-        //     formatter: (obj: any) => {
-        //         const userType = obj.row.userType
-        //         return getUserTypeName(userType)
-        //     }
-        // },
-
-        // { field: 'informationSecurityTestReport', title: '信息安全检测报告', minWidth: 170 },
-        // { field: 'otherAttachments', title: '其他附件', minWidth: 170 },
-        // { field: 'orgName', title: '填报部门名称'},
-        // { field: 'performanceTestReport', title: '性能检测报告', minWidth: 170 },
-        
-        // {
-        //     field: 'userStatus',
-        //     title: '用户状态',
-        //     minWidth: 100,
-        //     render: 'tag',
-        //     custom: {
-        //         0: 'primary',
-        //         1: 'primary',
-        //         2: 'success',
-        //         3: 'warning'
-        //     },
-        //     replaceValue: {
-        //         0: '可研',
-        //         1: '建设',
-        //         2: '运行',
-        //         3: '退运'
-        //     }
-        // },
-        // { field: 'substation', title: '变电站', minWidth: 100 },
-        // { field: 'createTime', title: '开始时间', minWidth: 170 },
+        { field: 'reason', title: '调试原因', minWidth: 170 },
         {
             title: '操作',
             minWidth: 150,
@@ -126,6 +85,9 @@ const tableStore = new TableStore({
                     render: 'basicButton',
                     click: row => {
                         handleAudit(row.processInstanceId)
+                    },
+                    disabled: row => {
+                        return !row.processInstanceId;
                     }
                 },
                 {
@@ -136,6 +98,9 @@ const tableStore = new TableStore({
                     render: 'basicButton',
                     click: row => {
                         handleDebug(row)
+                    },
+                    disabled: row => {
+                        return row.reason;
                     }
                 }
             ]
@@ -143,8 +108,8 @@ const tableStore = new TableStore({
     ],
 
     beforeSearchFun: () => {
-           tableStore.table.params.orgNo = tableStore.table.params.deptIndex
-           tableStore.table.params.statveList=[2]
+        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+        tableStore.table.params.statveList = [2]
         // tableStore.table.params.relationUserName = tableStore.table.params.userName
     }
 })
@@ -155,14 +120,6 @@ const tableStore = new TableStore({
 
 provide('tableStore', tableStore)
 
-const addForms = ref()
-const addFormModel = () => {
-    setTimeout(() => {
-        addForms.value.open()
-    }, 0);
-  
-}
-
 const exportEvent = () => {
     let form = JSON.parse(JSON.stringify(tableStore.table.params))
     form.pageNum = 1
@@ -194,9 +151,11 @@ const handleAudit = (instanceId: any) => {
     })
 }
 //申请联调
-const debugForms=ref()
-const handleDebug=(row:any)=>{
-    console.log(row,"=============")
+const debugForms = ref()
+const debugId = ref('')
+const handleDebug = (row: any) => {
+    debugId.value = row.id
+    console.log(debugId.value)
     debugForms.value.open()
 }
 </script>
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue
index 0848783c..1af8e0ec 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue
@@ -627,9 +627,6 @@ const resetForm = () => {
         voltageDeviationUpperLimit: '0', //	电压偏差上限
         voltageLevel: voltageLevelList[0].id //监测点电压等级
     }
-
-    // form.value.reporter = adminInfo.$state.name
-    // form.value.orgId = adminInfo.$state.deptName
 }
 findAllMonitoringTerminalList()
 
@@ -971,14 +968,7 @@ const confirmForm = () => {
                 //处理填报日期时间格式
                 form.value.reportDate = window.XEUtils.toDateString(form.value.reportDate, 'yyyy-MM-dd')
                 let confirmFormData = JSON.parse(JSON.stringify(form.value))
-
-                //1.判断是否上传
-                // if (!lineFilePath.value) {
-                //     return ElMessage({
-                //         message: '请上传监测点台账信息',
-                //         type: 'warning'
-                //     })
-                // }
+                
                 if (!mainWiringDiagram.value) {
                     return ElMessage({
                         message: '请上传主接线图',
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue
index b0b0994b..b8ffffe9 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue
@@ -126,7 +126,6 @@ import { useRoute } from 'vue-router'
 import { formatDate } from '@/utils/formatTime'
 import { propTypes } from '@/utils/propTypes'
 import { getTempLineDetailsById } from '@/api/supervision-boot/monitorpoint/index'
-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'
@@ -162,72 +161,8 @@ const userStateList = reactive([
     }
 ])
 const dictData = useDictData()
-//字典获取所属地市
-const areaOptionList = dictData.getBasicData('jibei_area')
-//定义监测装置安装位置下拉框数据
-const monitoringDeviceInstallationPositionList = [
-    {
-        id: '0',
-        name: '电网侧'
-    },
-    {
-        id: '1',
-        name: '用户侧'
-    }
-]
-//定义召唤标志下拉框数据
-const summonFlagList = [
-    {
-        id: '0',
-        name: '周期触发'
-    },
-    {
-        id: '1',
-        name: '变为触发'
-    }
-]
-//定义终端模型下拉框数据
-const terminalModelList = [
-    {
-        id: '0',
-        name: '虚拟设备'
-    },
-    {
-        id: '1',
-        name: '虚拟设备'
-    },
-    {
-        id: '2',
-        name: '虚拟设备'
-    }
-]
-//定义通讯状态下拉框数据
-const communicationStatusList = [
-    {
-        id: '0',
-        name: '中断'
-    },
-    {
-        id: '1',
-        name: '正常'
-    }
-]
 //字典获取监测点电压等级
 const voltageLevelList = dictData.getBasicData('Dev_Voltage_Stand')
-//字典获取数据类型
-const dataTypeList = dictData.getBasicData('System_Type')
-//字典获取终端型号
-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')
-//字典获取厂家
-const manufacturerList = dictData.getBasicData('Dev_Manufacturers')
 //定义监测点运行状态下拉框数据
 const operationStatusList = [
     {
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue
index d03f9ea5..bca7d346 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue
@@ -1470,14 +1470,7 @@ const confirmForm = () => {
             devReportForm.value.orgId = adminInfo.$state.deptId
             let confirmFormData = JSON.parse(JSON.stringify(devReportForm.value))
 
-            //1.判断是否上传
-            // if (!deviceFilePath.value) {
-            //     activeName.value = '1'
-            //     return ElMessage({
-            //         message: '请上传终端台账信息',
-            //         type: 'warning'
-            //     })
-            // }
+         
             if (!acceptanceInspectionReportSingle.value) {
                 return ElMessage({
                     message: '请上传验收检验报告单',
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue
index 84f29b77..1318566c 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue
@@ -349,7 +349,6 @@ const getInfo = async () => {
     try {
         await getTerminalDetailsById({ id: props.id || queryId }).then(res => {
             detailData.value = res.data
-            console.log(detailData.value, '+++++++++')
             getFileName()
         })
     } finally {
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
index 56e1d558..f9e620f0 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
@@ -137,7 +137,6 @@ const tableStore = new TableStore({
 // tableStore.table.params.loadType = ''
 // tableStore.table.params.userName = ''
 // tableStore.table.params.fileUploadflag = ''
-console.log(tableStore.table.params,"=========查询列表");
 
 provide('tableStore', tableStore)
 

From cafdae77cdbe6a14650952a8efa6bf90804d5828 Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Mon, 20 May 2024 16:05:23 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/monitorpoint/index.vue                         | 2 +-
 .../components/terminainal/detail.vue                         | 4 +---
 .../terminalNetworkDetection/components/terminainal/index.vue | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
index 2b8dfc00..130dee94 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
@@ -72,7 +72,7 @@ const tableStore = new TableStore({
             }
         },
         { field: 'monitoringTerminalName', title: '设备名称', minWidth: 170 },
-        { field: 'substation', title: '所属变电站', minWidth: 170 },
+        // { field: 'substation', title: '所属变电站', minWidth: 170 },
         // {
         //     field: 'userType',
         //     title: '用户性质',
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue
index 1318566c..bca4a268 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue
@@ -34,9 +34,7 @@
             </el-descriptions-item>
             <el-descriptions-item label="所属供电公司">
                 {{ 
-                   areaOptionList.find(item => {
-                        return item.id == detailData.supervisionTempDeviceReport?.powerCompany
-                    })?.name
+                   detailData.supervisionTempDeviceReport?.powerCompany
                 }}
             </el-descriptions-item>
             <el-descriptions-item label="所属变电站">
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
index f9e620f0..07a1a32f 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
@@ -71,8 +71,8 @@ const tableStore = new TableStore({
                 4: '已取消'
             }
         },
-        { field: 'monitoringTerminalName', title: '设备名称', minWidth: 170 },
-        { field: 'substation', title: '所属变电站', minWidth: 170 },
+        // { field: 'monitoringTerminalName', title: '设备名称', minWidth: 170 },
+        // { field: 'substation', title: '所属变电站', minWidth: 170 },
         // {
         //     field: 'userType',
         //     title: '用户性质',

From 0743445656791c4a07517ce3935d35f9508d4137 Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Mon, 20 May 2024 16:06:58 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E7=9B=91=E6=B5=8B=E7=82=B9=E8=81=94?=
 =?UTF-8?q?=E8=B0=83=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervision-boot/jointDebugList/index.ts  | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 src/api/supervision-boot/jointDebugList/index.ts

diff --git a/src/api/supervision-boot/jointDebugList/index.ts b/src/api/supervision-boot/jointDebugList/index.ts
new file mode 100644
index 00000000..7444c4b2
--- /dev/null
+++ b/src/api/supervision-boot/jointDebugList/index.ts
@@ -0,0 +1,32 @@
+import createAxios from '@/utils/request'
+
+import { SUPERVISION_BOOT } from '@/utils/constantRequest'
+
+const MAPPING_PATH = SUPERVISION_BOOT + '/tempLine'
+
+/**
+ * 提交监测点联调表单数据
+ */
+export const addMointorPointTempLinedebug = (data: any) => {
+    return createAxios({
+        url: '/supervision-boot/tempLinedebug/add',
+        method: 'POST',
+        data: data
+    })
+}
+
+/**
+ * 根据id获取监测点联调的详细数据
+ */
+export const getMointorPointTempLinedebugDetail = (obj: any) => {
+    let form = new FormData()
+    form.append('id', obj.id)
+    return createAxios({
+        url:'/supervision-boot/tempLinedebug/getDetail',
+        method: 'POST',
+        data:form
+    })
+}
+
+
+