From fcb4318465ed175fa06dd5dd8c702fb18ff761e1 Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Thu, 16 May 2024 14:59:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E6=B1=82=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=BD=8D=E7=BD=AE=E3=80=81=E5=B9=B2=E6=89=B0=E6=BA=90?=
 =?UTF-8?q?=E6=8E=A5=E5=85=A5=E5=B1=8F=E8=94=BD=E7=BB=88=E7=AB=AF=E5=85=A5?=
 =?UTF-8?q?=E7=BD=91=E6=A3=80=E6=B5=8Btab?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../interfere/index.ts                        |   0
 src/api/supervision-boot/terminal/index.ts    |  16 +
 .../terminalNetworkDetection/addForm.vue      | 439 +++++++++---------
 .../terminalNetworkDetection/index.vue        |  91 ++--
 .../components/undocumented/addForm.vue       |   2 +-
 src/views/pqs/supervise/interfere/index.vue   |   4 +-
 6 files changed, 297 insertions(+), 255 deletions(-)
 rename src/api/{supervise => supervision-boot}/interfere/index.ts (100%)
 create mode 100644 src/api/supervision-boot/terminal/index.ts

diff --git a/src/api/supervise/interfere/index.ts b/src/api/supervision-boot/interfere/index.ts
similarity index 100%
rename from src/api/supervise/interfere/index.ts
rename to src/api/supervision-boot/interfere/index.ts
diff --git a/src/api/supervision-boot/terminal/index.ts b/src/api/supervision-boot/terminal/index.ts
new file mode 100644
index 00000000..23a911d2
--- /dev/null
+++ b/src/api/supervision-boot/terminal/index.ts
@@ -0,0 +1,16 @@
+import createAxios from '@/utils/request'
+
+import { SUPERVISION_BOOT } from '@/utils/constantRequest'
+
+const MAPPING_PATH = SUPERVISION_BOOT + '/workflow/wfForm'
+
+/**
+ * 提交终端信息表单数据
+ */
+export const addTerminalFormData = (data: any) => {
+    return createAxios({
+        url: '/supervision-boot/deVReport/add',
+        method: 'POST',
+        data: data
+    })
+}
diff --git a/src/views/pqs/supervise/interfere/components/terminalNetworkDetection/addForm.vue b/src/views/pqs/supervise/interfere/components/terminalNetworkDetection/addForm.vue
index da337d43..b17acecb 100644
--- a/src/views/pqs/supervise/interfere/components/terminalNetworkDetection/addForm.vue
+++ b/src/views/pqs/supervise/interfere/components/terminalNetworkDetection/addForm.vue
@@ -24,7 +24,7 @@
             label-width="140px"
             label-position="right"
         >
-            <el-tabs tab-position="left" class="demo-tabs" v-model="activeName">
+            <el-tabs tab-position="left" class="tabs_form" v-model="activeName">
                 <el-tab-pane name="0" label="基础信息" v-if="selectFormType == '0'">
                     <div class="form_tab_item">
                         <el-row>
@@ -134,8 +134,9 @@
                     <div class="form_tab_item">
                         <el-row>
                             <el-col :span="12"></el-col>
-                            <el-col :span="12">
-                                <el-form-item label="终端台账信息：" :show-message="false">
+                            <el-col :span="12" class="required_position">
+                                <span class="required_icon" style="color:#fff">*</span>
+                                <el-form-item label="终端台账信息：">
                                     <el-upload
                                         v-model:file-list="form.deviceFilePath"
                                         ref="uploadRef"
@@ -387,7 +388,9 @@
                                     <el-date-picker
                                         style="width: 100%"
                                         v-model="form.currentTerminalDetectionTime"
-                                        type="date"
+                                        type="datetime"
+                                        format="YYYY/MM/DD hh:mm:ss"
+                                        value-format="YYYY-MM-DD hh:mm:ss"
                                         placeholder="请选择本次终端检测时间"
                                     />
                                 </el-form-item>
@@ -402,7 +405,9 @@
                                     <el-date-picker
                                         style="width: 100%"
                                         v-model="form.nextTerminalInspectionTime"
-                                        type="date"
+                                        type="datetime"
+                                        format="YYYY/MM/DD hh:mm:ss"
+                                        value-format="YYYY-MM-DD hh:mm:ss"
                                         placeholder="请选择下次终端定检时间"
                                     />
                                 </el-form-item>
@@ -514,7 +519,9 @@
                                     <el-date-picker
                                         style="width: 100%"
                                         v-model="form.commissioningTime"
-                                        type="date"
+                                        type="datetime"
+                                        format="YYYY/MM/DD hh:mm:ss"
+                                        value-format="YYYY-MM-DD hh:mm:ss"
                                         placeholder="请选择投运时间"
                                     />
                                 </el-form-item>
@@ -525,7 +532,9 @@
                                     <el-date-picker
                                         style="width: 100%"
                                         v-model="form.dataUpdateTime"
-                                        type="date"
+                                        type="datetime"
+                                        format="YYYY/MM/DD hh:mm:ss"
+                                        value-format="YYYY-MM-DD hh:mm:ss"
                                         placeholder="请选择数据更新时间"
                                     />
                                 </el-form-item>
@@ -647,6 +656,8 @@
                                         style="width: 100%"
                                         v-model="form.reportDate"
                                         type="date"
+                                        format="YYYY-MM-DD"
+                                        value-format="YYYY-MM-DD"
                                         placeholder="请选择填报日期"
                                     />
                                 </el-form-item>
@@ -733,7 +744,8 @@
                         <el-row>
                             <el-col :span="12"></el-col>
 
-                            <el-col :span="12">
+                            <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"
@@ -744,7 +756,7 @@
                                         :on-exceed="handleExceed"
                                         :on-change="choose"
                                         :auto-upload="false"
-                                        :on-progress="uploadFileName('deviceFilePath')"
+                                        :on-progress="uploadFileName('lineFilePath')"
                                     >
                                         <template #trigger>
                                             <el-button type="primary">上传文件</el-button>
@@ -1011,7 +1023,7 @@
                                         :on-exceed="handleExceed"
                                         :on-change="choose"
                                         :auto-upload="false"
-                                        :on-progress="uploadFileName('feasibilityReport')"
+                                        :on-progress="uploadFileName('mainWiringDiagram')"
                                     >
                                         <template #trigger>
                                             <el-button type="primary">上传文件</el-button>
@@ -1025,7 +1037,8 @@
                 <el-tab-pane name="3" label="附件材料" v-if="selectFormType == '0'">
                     <div class="form_tab_item">
                         <el-row>
-                            <el-col :span="12">
+                            <el-col :span="12" class="required_position">
+                                <span class="required_icon">*</span>
                                 <el-form-item label="信息安全检测报告：" prop="informationSecurityTestReport">
                                     <el-upload
                                         v-model:file-list="form.informationSecurityTestReport"
@@ -1036,7 +1049,7 @@
                                         :on-exceed="handleExceed"
                                         :on-change="choose"
                                         :auto-upload="false"
-                                        :on-progress="uploadFileName('deviceFilePath')"
+                                        :on-progress="uploadFileName('informationSecurityTestReport')"
                                     >
                                         <template #trigger>
                                             <el-button type="primary">上传文件</el-button>
@@ -1045,7 +1058,8 @@
                                 </el-form-item>
                             </el-col>
 
-                            <el-col :span="12">
+                            <el-col :span="12" class="required_position">
+                                <span class="required_icon">*</span>
                                 <el-form-item label="验收检验报告单：" prop="acceptanceInspectionReportSingle">
                                     <el-upload
                                         v-model:file-list="form.acceptanceInspectionReportSingle"
@@ -1056,7 +1070,7 @@
                                         :on-exceed="handleExceed"
                                         :on-change="choose"
                                         :auto-upload="false"
-                                        :on-progress="uploadFileName('deviceFilePath')"
+                                        :on-progress="uploadFileName('acceptanceInspectionReportSingle')"
                                     >
                                         <template #trigger>
                                             <el-button type="primary">上传文件</el-button>
@@ -1067,7 +1081,8 @@
                         </el-row>
 
                         <el-row>
-                            <el-col :span="12">
+                            <el-col :span="12" class="required_position">
+                                <span class="required_icon" style="color:#fff">*</span>
                                 <el-form-item label="验收检验报告：" prop="acceptanceInspectionReport">
                                     <el-upload
                                         v-model:file-list="form.acceptanceInspectionReport"
@@ -1078,7 +1093,7 @@
                                         :on-exceed="handleExceed"
                                         :on-change="choose"
                                         :auto-upload="false"
-                                        :on-progress="uploadFileName('deviceFilePath')"
+                                        :on-progress="uploadFileName('acceptanceInspectionReport')"
                                     >
                                         <template #trigger>
                                             <el-button type="primary">上传文件</el-button>
@@ -1087,7 +1102,8 @@
                                 </el-form-item>
                             </el-col>
 
-                            <el-col :span="12">
+                            <el-col :span="12"  class="required_position">
+                                <span class="required_icon">*</span>
                                 <el-form-item label="型式实验报告：" prop="typeExperimentReport" :show-message="false">
                                     <el-upload
                                         v-model:file-list="form.typeExperimentReport"
@@ -1098,7 +1114,7 @@
                                         :on-exceed="handleExceed"
                                         :on-change="choose"
                                         :auto-upload="false"
-                                        :on-progress="uploadFileName('deviceFilePath')"
+                                        :on-progress="uploadFileName('typeExperimentReport')"
                                     >
                                         <template #trigger>
                                             <el-button type="primary">上传文件</el-button>
@@ -1109,7 +1125,8 @@
                         </el-row>
 
                         <el-row>
-                            <el-col :span="12">
+                            <el-col :span="12" class="required_position">
+                                <span class="required_icon">*</span>
                                 <el-form-item label="出厂检验报告：" prop="factoryInspectionReport">
                                     <el-upload
                                         v-model:file-list="form.factoryInspectionReport"
@@ -1120,7 +1137,7 @@
                                         :on-exceed="handleExceed"
                                         :on-change="choose"
                                         :auto-upload="false"
-                                        :on-progress="uploadFileName('deviceFilePath')"
+                                        :on-progress="uploadFileName('factoryInspectionReport')"
                                     >
                                         <template #trigger>
                                             <el-button type="primary">上传文件</el-button>
@@ -1129,7 +1146,8 @@
                                 </el-form-item>
                             </el-col>
 
-                            <el-col :span="12">
+                            <el-col :span="12" class="required_position">
+                                <span class="required_icon">*</span>
                                 <el-form-item label="性能检测报告：" prop="performanceTestReport" :show-message="false">
                                     <el-upload
                                         v-model:file-list="form.performanceTestReport"
@@ -1140,7 +1158,7 @@
                                         :on-exceed="handleExceed"
                                         :on-change="choose"
                                         :auto-upload="false"
-                                        :on-progress="uploadFileName('deviceFilePath')"
+                                        :on-progress="uploadFileName('performanceTestReport')"
                                     >
                                         <template #trigger>
                                             <el-button type="primary">上传文件</el-button>
@@ -1162,7 +1180,7 @@
                                         :on-exceed="handleExceed"
                                         :on-change="choose"
                                         :auto-upload="false"
-                                        :on-progress="uploadFileName('deviceFilePath')"
+                                        :on-progress="uploadFileName('otherAttachments')"
                                     >
                                         <template #trigger>
                                             <el-button type="primary">上传文件</el-button>
@@ -1193,13 +1211,8 @@ import type { ComponentSize, FormInstance, FormRules } from 'element-plus'
 import { queryByAllCode } from '@/api/system-boot/dictTree'
 import { useAdminInfo } from '@/stores/adminInfo'
 import { uploadFile } from '@/api/system-boot/file'
-import { submitFormData } from '@/api/supervise/interfere/index'
-defineProps({
-    openType: {
-        type: String,
-        default: 'create'
-    }
-})
+import { submitFormData } from '@/api/supervision-boot/interfere/index'
+import { addTerminalFormData } from '@/api/supervision-boot/terminal/index.ts'
 const emits = defineEmits(['onSubmit'])
 const dictData = useDictData()
 const dialogFormVisible = ref(false)
@@ -1430,7 +1443,66 @@ const resetForm = () => {
 }
 //初始化数据
 resetForm()
-const subForm = ref({
+//终端信息表单格式
+const devReportForm = ref({
+    reporter: '', //填报人
+    reportDate: new Date(), //填报日期
+    orgId: '', //填报部门
+    expectedProductionDate: '', //工程投产日期
+    city: areaOptionList[0].name, //所属地市
+    userStatus: userStateList[1].id, //用户状态
+    userName: '', //工程名称
+    userId: '',
+
+    acceptanceInspectionReport: [], //验收检验报告
+    acceptanceInspectionReportSingle: [], //验收检验报告单
+    deviceFilePath: [], //终端台账信息
+    factoryInspectionReport: [], //出厂检验报告
+    informationSecurityTestReport: [], //信息安全检测报告
+    lineFilePath: [], //监测点台账信息
+    otherAttachments: [], //其他附件
+    performanceTestReport: [], //性能检测报告
+    typeExperimentReport: [], //型式实验报告
+    // processInstanceId: '', //流程实例的编号
+    // startUserSelectAssignees: {}, //发起人自选审批人 Map
+    //终端信息实体
+    supervisionTempDeviceReportParam: {
+        alarmFunction: '0', //告警功能
+        commissioningTime: '', //投运时间
+        communicationStatus: '', //	通讯状态
+        contractNumber: '', //合同号
+        currentTerminalDetectionTime: '', //本次终端检测时间
+        dataType: '', //数据类型
+        dataUpdateTime: '', //	数据更新时间
+        electroplatingFunction: '', //电镀功能
+        frontEndMachine: '', //所属前置机
+        identificationCode: '', //	识别码
+        latitude: '0', //纬度
+        longitude: '0', //经度
+        manufacturer: '', //厂家
+        manufacturerDeviceNumber: '', //	厂家设备编号
+        monitoringDeviceInstallationPosition: monitoringDeviceInstallationPositionList[0].id, //监测装置安装位置
+        monitoringTerminalCode: '', //监测终端编码
+        monitoringTerminalName: '', //监测终端名称
+        neutralPointWiringMethod: '', //	中性点接线方式
+        nextTerminalInspectionTime: '', //	下次终端定检时间
+        powerCompany: '', //所属供电公司
+        simCardNumber: '', //SIM卡号
+        substation: '', //	所属变电站
+        substationVoltageLevel: '', //	变电站电压等级
+        // summonFlag: '', //	召唤标志
+        terminalIp: '', //终端IP
+        terminalModel: terminalModelList[0].id, //终端模型
+        terminalPort: '', //端口
+        terminalSecretKey: '', //终端秘钥
+        terminalType: '', //	终端型号
+        terminalWiringMethodType: '', //	终端接线方式类型
+        timeSyncFunction: '0', //	对时功能
+        voltageTransformerType: '' //	电压互感器类型
+    }
+})
+//监测点信息表单格式
+const monitorPointForm = ref({
     reporter: '', //填报人
     reportDate: new Date(), //填报日期
     orgId: '', //填报部门
@@ -1940,118 +2012,33 @@ const rules = ref({
         }
     ]
 })
-// watch(
-//     () => form.value,
-//     (val, oldVal) => {
-//         //form数据变化时处理格式
-//         for (let key in val) {
-//             if (subForm.value.hasOwnProperty(key)) {
-//                 subForm.value[key] = val[key] // 对相同的key进行赋值
-//             }
-//         }
+watch(
+    () => form.value,
+    (val, oldVal) => {
+        //form数据变化时处理格式，根据tab切换判断处理的对象实体
+        //终端信息
+        if (selectFormType.value == '0' && val) {
+            for (let key in val) {
+                if (devReportForm.value.hasOwnProperty(key)) {
+                    devReportForm.value[key] = val[key] // 对相同的key进行赋值
+                }else if(devReportForm.value.supervisionTempDeviceReportParam.hasOwnProperty(key)){
+                    devReportForm.value.supervisionTempDeviceReportParam[key] = val[key]
+                }
+            }
+            //处理填报日期时间格式
+            devReportForm.value.reportDate = window.XEUtils.toDateString(form.value.reportDate, 'yyyy-MM-dd');
+            // console.log('处理好的表单++++++++++>',devReportForm.value)
+        }
+        //监测点信息
+        else {
 
-//         //处理填报日期时间格式
-//         subForm.value.reportDate = window.XEUtils.toDateString(form.value.reportDate, 'yyyy-MM-dd')
-//         //userType==0,1
-//         if (val.userType == '0' || val.userType == '1') {
-//             subForm.value.userReportProjectPO = {
-//                 additionalAttachments: [], //其他附件告地址
-//                 agreementCapacity: 0,
-//                 backgroundTestPerformed: 0,
-//                 feasibilityReport: [], //可研报告
-//                 id: '',
-//                 needGovernance: 0,
-//                 nonlinearDeviceType: '',
-//                 predictionEvaluationReport: [], //预测评估报告告地址
-//                 predictionEvaluationReviewOpinions: [], //预测评估评审意见报告地址
-//                 preliminaryDesignDescription: [], //项目初步设计说明书告地址
-//                 state: 0
-//             }
-//             for (let key in val) {
-//                 if (subForm.value.userReportProjectPO && subForm.value.userReportProjectPO.hasOwnProperty(key)) {
-//                     // 对相同的key进行赋值
-//                     subForm.value.userReportProjectPO[key] = val[key]
-//                 }
-//             }
-
-//             delete subForm.value.userReportSubstationPO
-//             delete subForm.value.userReportSensitivePO
-
-//             return
-//         }
-//         //userType==2,3,4,5
-//         if (val.userType == '2' || val.userType == '3' || val.userType == '4' || val.userType == '5') {
-//             subForm.value.userReportSubstationPO = {
-//                 additionalAttachments: [], //其他附件告地址
-//                 backgroundTestPerformed: 0,
-//                 baseShortCircuitCapacity: 0,
-//                 evaluationChekDept: '',
-//                 evaluationType: '',
-//                 feasibilityReport: [], //可研报告
-//                 id: '',
-//                 minShortCircuitCapacity: 0,
-//                 needGovernance: 0,
-//                 nonlinearLoadType: '',
-//                 pccEquipmentCapacity: 0,
-//                 pccPoint: '',
-//                 predictionEvaluationReport: [], //预测评估报告告地址
-//                 predictionEvaluationReviewOpinions: [], //预测评估评审意见报告地址
-//                 preliminaryDesignDescription: [], //项目初步设计说明书告地址
-//                 state: 0,
-//                 substationMainWiringDiagram: [], //用户接入变电站主接线示意图地址
-//                 userAgreementCapacity: 0
-//             }
-//             for (let key in val) {
-//                 if (subForm.value.userReportSubstationPO && subForm.value.userReportSubstationPO.hasOwnProperty(key)) {
-//                     // 对相同的key进行赋值
-//                     subForm.value.userReportSubstationPO[key] = val[key]
-//                 }
-//             }
-//             delete subForm.value.userReportProjectPO
-//             delete subForm.value.userReportSensitivePO
-//             return
-//         }
-//         //userType==6
-//         if (val.userType == '6') {
-//             subForm.value.userReportSensitivePO = {
-//                 additionalAttachments: [], //其他附件告地址
-//                 antiInterferenceReport: [], //抗扰度测试报告
-//                 antiInterferenceTest: '',
-//                 backgroundTestPerformed: 0,
-//                 deviceName: '',
-//                 energyQualityIndex: '',
-//                 evaluationChekDept: '',
-//                 evaluationType: '',
-//                 feasibilityReport: [], //可研报告告地址
-//                 id: '',
-//                 industry: '',
-//                 needGovernance: 0,
-//                 pccPoint: '',
-//                 powerQualityReport: [], //背景电能质量测试报告
-//                 powerSupplyCount: 0,
-//                 predictionEvaluationReport: [], //预测评估报告告地址
-//                 predictionEvaluationReviewOpinions: [], //预测评估评审意见报告地址
-//                 preliminaryDesignDescription: [], //项目初步设计说明书告地址
-//                 sensitiveDevices: [], //主要敏感设备清单
-//                 state: 0,
-//                 substationMainWiringDiagram: [] //用户接入变电站主接线示意图地址
-//             }
-//             for (let key in val) {
-//                 if (subForm.value.userReportSensitivePO && subForm.value.userReportSensitivePO.hasOwnProperty(key)) {
-//                     // 对相同的key进行赋值
-//                     subForm.value.userReportSensitivePO[key] = val[key]
-//                 }
-//             }
-//             delete subForm.value.userReportProjectPO
-//             delete subForm.value.userReportSubstationPO
-//             return
-//         }
-//     },
-//     {
-//         deep: true,
-//         immediate:true,
-//     }
-// )
+        }
+    },
+    {
+        deep: true,
+        immediate: true
+    }
+)
 const open = () => {
     dialogFormVisible.value = true
 }
@@ -2063,11 +2050,15 @@ const close = () => {
     emits('onSubmit')
     resetForm()
 }
+// 切换终端信息/监测点信息
 const handleClick = (tab: any, event: any) => {
+    //终端信息
     if (tab.index == '0') {
-        activeName.value = '0';
-    } else {
-        activeName.value = '2';
+        activeName.value = '0'
+    }
+    //监测点信息
+    else {
+        activeName.value = '2'
     }
 }
 onMounted(() => {
@@ -2154,75 +2145,98 @@ const activeName = ref('0')
 //提交
 const confirmForm = () => {
     console.log(form.value, '打印form对象')
-    ruleFormRef.value.validate(valid => {
-        if (valid) {
-            //整理上传文件的数据
-            // userType==0,1
-            subForm.value.reporter = adminInfo.$state.id
-            subForm.value.orgId = adminInfo.$state.deptId
-            let confirmFormData = JSON.parse(JSON.stringify(subForm.value))
+    // 先判断提交终端信息与监测点信息
 
-            //1.判断是否上传
-            if (!deviceFilePath.value) {
-                activeName.value = '1'
-                return ElMessage({
-                    message: '请上传终端台账信息',
-                    type: 'warning'
+    // 提交终端信息
+    if (selectFormType.value == '0') {
+        ruleFormRef.value.validate(valid => {
+            if (valid) {
+                //整理上传文件的数据
+                // userType==0,1
+                devReportForm.value.reporter = adminInfo.$state.id
+                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 (!lineFilePath.value) {
+                //     activeName.value = '2'
+                //     return ElMessage({
+                //         message: '请上传监测点台账信息',
+                //         type: 'warning'
+                //     })
+                // }
+                if (!acceptanceInspectionReportSingle.value) {
+                    return ElMessage({
+                        message: '请上传验收检验报告单',
+                        type: 'warning'
+                    })
+                }
+                if (!acceptanceInspectionReport.value) {
+                    return ElMessage({
+                        message: '请上传验收检验报告',
+                        type: 'warning'
+                    })
+                }
+                if (!typeExperimentReport.value) {
+                    return ElMessage({
+                        message: '请上传型式实验报告',
+                        type: 'warning'
+                    })
+                }
+                if (!factoryInspectionReport.value) {
+                    return ElMessage({
+                        message: '请上传出厂检验报告',
+                        type: 'warning'
+                    })
+                }
+                if (!performanceTestReport.value) {
+                    return ElMessage({
+                        message: '请上传性能检测报告',
+                        type: 'warning'
+                    })
+                }
+                if (!informationSecurityTestReport.value) {
+                    return ElMessage({
+                        message: '请上传信息安全检测报告',
+                        type: 'warning'
+                    })
+                }
+                //提交终端信息
+                confirmFormData={
+                    ...confirmFormData,
+                    acceptanceInspectionReport: acceptanceInspectionReport.value, //验收检验报告
+                    acceptanceInspectionReportSingle: acceptanceInspectionReportSingle.value, //验收检验报告单
+                    deviceFilePath: deviceFilePath?.value, //终端台账信息
+                    factoryInspectionReport: factoryInspectionReport.value, //出厂检验报告
+                    informationSecurityTestReport:informationSecurityTestReport.value , //信息安全检测报告
+                    lineFilePath: lineFilePath?.value, //监测点台账信息
+                    performanceTestReport:performanceTestReport.value , //性能检测报告
+                    typeExperimentReport: typeExperimentReport.value, //型式实验报告
+                    otherAttachments: otherAttachments?.value, //其他附件
+                }
+                console.log(confirmFormData,"打印提交表单111111111111")
+                addTerminalFormData(confirmFormData).then(res => {
+                    console.log(res,"打印提交结果222222222222+++++++++")
+                    ruleFormRef.value.resetFields()
+                    resetForm()
+                    close()
                 })
+            } else {
+                console.log('表单验证失败')
+                return false
             }
-            if (!lineFilePath.value) {
-                activeName.value = '2'
-                return ElMessage({
-                    message: '请上传监测点台账信息',
-                    type: 'warning'
-                })
-            }
-            if (!acceptanceInspectionReportSingle.value) {
-                return ElMessage({
-                    message: '请上传验收检验报告单',
-                    type: 'warning'
-                })
-            }
-            if (!acceptanceInspectionReport.value) {
-                return ElMessage({
-                    message: '请上传验收检验报告',
-                    type: 'warning'
-                })
-            }
-            if (!typeExperimentReport.value) {
-                return ElMessage({
-                    message: '请上传型式实验报告',
-                    type: 'warning'
-                })
-            }
-            if (!factoryInspectionReport.value) {
-                return ElMessage({
-                    message: '请上传出厂检验报告',
-                    type: 'warning'
-                })
-            }
-            if (!performanceTestReport.value) {
-                return ElMessage({
-                    message: '请上传性能检测报告',
-                    type: 'warning'
-                })
-            }
-            if (!informationSecurityTestReport.value) {
-                return ElMessage({
-                    message: '请上传信息安全检测报告',
-                    type: 'warning'
-                })
-            }
-            submitFormData(confirmFormData).then(res => {
-                ruleFormRef.value.resetFields()
-                resetForm()
-                close()
-            })
-        } else {
-            console.log('表单验证失败')
-            return false
-        }
-    })
+        })
+    }
+    //提交监测点信息
+    else {
+    }
 }
 defineExpose({ open })
 </script>
@@ -2284,4 +2298,7 @@ defineExpose({ open })
         margin-left: 10px;
     }
 }
+// ::v-deep .tabs_form{
+//     height:300px !important;
+// }
 </style>
diff --git a/src/views/pqs/supervise/interfere/components/terminalNetworkDetection/index.vue b/src/views/pqs/supervise/interfere/components/terminalNetworkDetection/index.vue
index cf6dadbc..cc765f37 100644
--- a/src/views/pqs/supervise/interfere/components/terminalNetworkDetection/index.vue
+++ b/src/views/pqs/supervise/interfere/components/terminalNetworkDetection/index.vue
@@ -1,7 +1,7 @@
 <!---终端入网检测-->
 <template>
-    <TableHeader ref="TableHeaderRef">
-        <template #select>
+    <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>
@@ -15,7 +15,7 @@
                     ></el-option>
                 </el-select>
             </el-form-item>
-        </template>
+        </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> -->
@@ -45,42 +45,14 @@ const ruleFormRef = ref()
 const show: any = ref(false)
 const fileList = ref([])
 const tableStore = new TableStore({
-    url: '/supervision-boot/userReport/getUserReport',
+    url: '/supervision-boot/deVReport/list',
     publicHeight: 65,
     method: 'POST',
     column: [
         { title: '序号', type: 'seq', width: 80 },
-        { field: 'projectName', title: '工程名称', minWidth: 170 },
-        {
-            field: 'userType',
-            title: '用户性质',
-            minWidth: 150,
-            formatter: (obj: any) => {
-                const userType = obj.row.userType
-                return getUserTypeName(userType)
-            }
-        },
-        { field: 'city', title: '所属地市', minWidth: 80 },
-        { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
-        {
-            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: 'orgName', title: '填报部门名称' },
+        { field: 'reportDate', title: '填报日期'},
+        { field: 'reporter', title: '填报人', minWidth: 80 },
         {
             field: 'status',
             title: '审核状态',
@@ -99,7 +71,43 @@ const tableStore = new TableStore({
                 4: '已取消'
             }
         },
-        { field: 'createTime', title: '开始时间', minWidth: 170 },
+        { 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,
@@ -121,14 +129,15 @@ const tableStore = new TableStore({
     ],
 
     beforeSearchFun: () => {
-        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
-        tableStore.table.params.relationUserName = tableStore.table.params.userName
+           tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+        // tableStore.table.params.relationUserName = tableStore.table.params.userName
     }
 })
 
-tableStore.table.params.loadType = ''
-tableStore.table.params.userName = ''
-tableStore.table.params.fileUploadflag = ''
+// tableStore.table.params.loadType = ''
+// tableStore.table.params.userName = ''
+// tableStore.table.params.fileUploadflag = ''
+console.log(tableStore.table.params,"=========查询列表");
 
 provide('tableStore', tableStore)
 
diff --git a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
index 65a0f64e..50c5fbf1 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
@@ -707,7 +707,7 @@ import type { ComponentSize, FormInstance, FormRules } from 'element-plus'
 import { useAdminInfo } from '@/stores/adminInfo'
 import { queryByAllCode } from '@/api/system-boot/dictTree'
 import { uploadFile } from '@/api/system-boot/file'
-import { submitFormData } from '@/api/supervise/interfere/index'
+import { submitFormData } from '@/api/supervision-boot/interfere/index'
 defineProps({
     openType: {
         type: String,
diff --git a/src/views/pqs/supervise/interfere/index.vue b/src/views/pqs/supervise/interfere/index.vue
index 3e2ec5b4..4d7e113d 100644
--- a/src/views/pqs/supervise/interfere/index.vue
+++ b/src/views/pqs/supervise/interfere/index.vue
@@ -9,9 +9,9 @@
                 <interferenceUserTable v-if="activeName == '3'" />
             </el-tab-pane>
             <!--            <el-tab-pane label="实测报告审核" name="4"><report v-if="activeName == '4'" /></el-tab-pane>-->
-            <el-tab-pane label="终端入网检测" name="5">
+            <!-- <el-tab-pane label="终端入网检测" name="5">
               <terminalNetworkDetection v-if="activeName == '5'"></terminalNetworkDetection>
-            </el-tab-pane>
+            </el-tab-pane> -->
         </el-tabs>
     </div>
 </template>