From c8c4c502745b1415766bb97c30f1fdf05583c988 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Mon, 15 Jul 2024 20:34:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=80=E5=8C=97=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../normalizationManager/detail.vue           | 388 +++++++-----------
 .../components/undocumented/addForm.vue       |  30 +-
 .../components/undocumented/detail.vue        |   1 +
 .../supervise/technology/components/alarm.vue |   4 +-
 .../technology/components/earlyWarn.vue       |   4 +-
 .../components/jointDebugList/debug.vue       |   6 +-
 .../components/jointDebugList/index.vue       |   1 -
 .../bpm/processInstance/detail/index.vue      |  20 +-
 8 files changed, 197 insertions(+), 257 deletions(-)

diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/detail.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/detail.vue
index 3d433063..41b09bf0 100644
--- a/src/views/pqs/supervise/interfere/components/normalizationManager/detail.vue
+++ b/src/views/pqs/supervise/interfere/components/normalizationManager/detail.vue
@@ -1,104 +1,67 @@
 <template>
     <div class="details">
         <el-divider content-position="left">干扰源用户信息</el-divider>
-        <details_item>
-            <template #label>工程预期投产日期</template>
-            <template #content>{{ formatDate(detailData.expectedProductionDate, 'YYYY-MM-DD') }}</template>
-        </details_item>
-        <details_item>
-            <template #label>用户性质</template>
-            <template #content>
+        <el-descriptions :column="2" border>
+            <el-descriptions-item label="工程预期投产日期">
+                {{ formatDate(detailData.expectedProductionDate, 'YYYY-MM-DD') }}
+            </el-descriptions-item>
+            <el-descriptions-item label="用户性质">
                 {{
                     userTypeList.find(item => {
                         return item.value == detailData.userType
                     })?.label
                 }}
-            </template>
-        </details_item>
-        <details_item>
-            <template #label>所在地市</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item label="所在地市">
                 {{ detailData.city }}
-            </template>
-        </details_item>
-        <details_item>
-            <template #label>归口管理部门</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item label="归口管理部门">
                 {{ detailData.responsibleDepartment }}
-            </template>
-        </details_item>
-        <details_item>
-            <template #label>用户状态</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item label="用户状态">
                 {{
                     userStateList.find(item => {
                         return item.value == detailData.userStatus
                     })?.label
                 }}
-            </template>
-        </details_item>
-        <details_item>
-            <template #label>变电站</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item label="变电站">
                 {{ detailData.substation }}
-            </template>
-        </details_item>
-        <details_item>
-            <template #label>工程名</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item label="工程名">
                 {{ detailData.projectName }}
-            </template>
-        </details_item>
-        <details_item v-if="detailData.userType == 0 || detailData.userType == 1">
-            <template #label>用户协议容量</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item label="用户协议容量" v-if="detailData.userType == 0 || detailData.userType == 1">
                 {{ proviteData.agreementCapacity }}
-            </template>
-        </details_item>
-        <details_item>
-            <template #label>电压等级</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item label="电压等级">
                 {{
                     voltageLevelList.find(item => {
                         return item.id == detailData.voltageLevel
                     })?.name
                 }}
-            </template>
-        </details_item>
-        <details_item v-if="detailData.userType == 0 || detailData.userType == 1">
-            <template #label>非线性终端类型</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item label="非线性终端类型" v-if="detailData.userType == 0 || detailData.userType == 1">
                 {{ proviteData.nonlinearDeviceType ? proviteData.nonlinearDeviceType : '-' }}
-            </template>
-        </details_item>
-        <details_item>
-            <template #label>预测评估单位</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item label="预测评估单位">
                 {{ detailData.evaluationDept }}
-            </template>
-        </details_item>
-        <details_item>
-            <template #label>预测评估结论</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item label="预测评估结论">
                 {{ detailData.evaluationConclusion }}
-            </template>
-        </details_item>
-        <details_item
-            v-if="
-                detailData.userType == '2' ||
-                detailData.userType == '3' ||
-                detailData.userType == '4' ||
-                detailData.userType == '5'
-            "
-        >
-            <template #label>非线性负荷类型</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item
+                label="非线性负荷类型"
+                v-if="
+                    detailData.userType == '2' ||
+                    detailData.userType == '3' ||
+                    detailData.userType == '4' ||
+                    detailData.userType == '5'
+                "
+            >
                 {{ proviteData.nonlinearLoadType }}
-            </template>
-        </details_item>
-        <details_item>
-            <template #label>是否需要治理</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item label="是否需要治理">
                 <span v-if="detailData.userType == 0 || detailData.userType == 1">
                     {{ proviteData.needGovernance == 0 ? '否' : '是' }}
                 </span>
@@ -113,11 +76,8 @@
                     {{ proviteData.needGovernance == 0 ? '否' : '是' }}
                 </span>
                 <span v-if="detailData.userType == 6">{{ proviteData.needGovernance == 0 ? '否' : '是' }}</span>
-            </template>
-        </details_item>
-        <details_item>
-            <template #label>是否开展背景测试</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item label="是否开展背景测试">
                 <span v-if="detailData.userType == 0 || detailData.userType == 1">
                     {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
                 </span>
@@ -134,127 +94,91 @@
                 <span v-if="detailData.userType == 6">
                     {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
                 </span>
-            </template>
-        </details_item>
-        <details_item v-if="detailData.userType == 6">
-            <template #label>是否开展抗扰度测试</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item label="是否开展抗扰度测试" v-if="detailData.userType == 6">
                 {{ proviteData.antiInterferenceTest == 0 ? '否' : '是' }}
-            </template>
-        </details_item>
-        <details_item v-if="detailData.userType != 0 && detailData.userType != 1">
-            <template #label>PCC点</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item label="PCC点" v-if="detailData.userType != 0 && detailData.userType != 1">
                 {{ proviteData?.pccPoint }}
-            </template>
-        </details_item>
-        <details_item
-            v-if="
-                detailData.userType == '2' ||
-                detailData.userType == '3' ||
-                detailData.userType == '4' ||
-                detailData.userType == '5'
-            "
-        >
-            <template #label>PCC供电终端容量</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item
+                label="PCC供电终端容量"
+                v-if="
+                    detailData.userType == '2' ||
+                    detailData.userType == '3' ||
+                    detailData.userType == '4' ||
+                    detailData.userType == '5'
+                "
+            >
                 {{ proviteData.pccEquipmentCapacity }}
-            </template>
-        </details_item>
-        <details_item
-            v-if="
-                detailData.userType == '2' ||
-                detailData.userType == '3' ||
-                detailData.userType == '4' ||
-                detailData.userType == '5'
-            "
-        >
-            <template #label>基准短路容量</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item
+                label="基准短路容量"
+                v-if="
+                    detailData.userType == '2' ||
+                    detailData.userType == '3' ||
+                    detailData.userType == '4' ||
+                    detailData.userType == '5'
+                "
+            >
                 {{ proviteData.baseShortCircuitCapacity }}
-            </template>
-        </details_item>
-        <details_item v-if="detailData.userType != 0 && detailData.userType != 1">
-            <template #label>评估类型</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item label="评估类型" v-if="detailData.userType != 0 && detailData.userType != 1">
                 {{
                     evaluationTypeList.find(item => {
                         return item.id == proviteData?.evaluationType
                     })?.name
                 }}
-            </template>
-        </details_item>
-        <details_item v-if="detailData.userType != 0 && detailData.userType != 1">
-            <template #label>预测评估评审单位</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item label="预测评估评审单位" v-if="detailData.userType != 0 && detailData.userType != 1">
                 {{ proviteData?.evaluationChekDept }}
-            </template>
-        </details_item>
-        <details_item
-            v-if="
-                detailData.userType == '2' ||
-                detailData.userType == '3' ||
-                detailData.userType == '4' ||
-                detailData.userType == '5'
-            "
-        >
-            <template #label>系统最小短路容量</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item
+                label="系统最小短路容量"
+                v-if="
+                    detailData.userType == '2' ||
+                    detailData.userType == '3' ||
+                    detailData.userType == '4' ||
+                    detailData.userType == '5'
+                "
+            >
                 {{ proviteData?.minShortCircuitCapacity }}
-            </template>
-        </details_item>
-        <details_item
-            v-if="
-                detailData.userType == '2' ||
-                detailData.userType == '3' ||
-                detailData.userType == '4' ||
-                detailData.userType == '5'
-            "
-        >
-            <template #label>用户用电协议容量</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item
+                label="用户用电协议容量"
+                v-if="
+                    detailData.userType == '2' ||
+                    detailData.userType == '3' ||
+                    detailData.userType == '4' ||
+                    detailData.userType == '5'
+                "
+            >
                 {{ proviteData?.userAgreementCapacity }}
-            </template>
-        </details_item>
-        <details_item v-if="detailData.userType == 6">
-            <template #label>行业</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item label="行业" v-if="detailData.userType == 6">
                 {{
                     industryList.find(item => {
                         return item.id == proviteData.industry
                     })?.name
                 }}
-            </template>
-        </details_item>
-        <details_item v-if="detailData.userType == 6">
-            <template #label>敏感终端名称</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item label="敏感终端名称" v-if="detailData.userType == 6">
                 {{ proviteData.deviceName }}
-            </template>
-        </details_item>
-        <details_item v-if="detailData.userType == 6">
-            <template #label>供电电源数量</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item label="供电电源数量" v-if="detailData.userType == 6">
                 {{ proviteData.powerSupplyCount }}
-            </template>
-        </details_item>
-        <details_item v-if="detailData.userType == 6">
-            <template #label>敏感电能质量指标</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item label="敏感电能质量指标" v-if="detailData.userType == 6">
                 {{
                     energyQualityIndexList.find(item => {
                         return item.id == proviteData.energyQualityIndex
                     })?.name
                 }}
-            </template>
-        </details_item>
-        <details_item>
-            <template #label>可研报告</template>
-            <template #content>
-         
+            </el-descriptions-item>
+            <el-descriptions-item label="可研报告">
                 <span v-if="detailData.userType == 0 || detailData.userType == 1">
-                    <el-icon class="elView" v-if="proviteData?.feasibilityReport.name ">
-                        <View @click="openFile(proviteData.feasibilityReport.name )" />
+                    <el-icon class="elView" v-if="proviteData?.feasibilityReport.name">
+                        <View @click="openFile(proviteData.feasibilityReport.name)" />
                     </el-icon>
                     <a :href="proviteData.feasibilityReport.url">{{ proviteData.feasibilityReport.name }}</a>
                 </span>
@@ -272,121 +196,95 @@
                     <a :href="proviteData.feasibilityReport.url">{{ proviteData.feasibilityReport.name }}</a>
                 </span>
                 <span v-if="detailData.userType == 6">
-                    <el-icon class="elView" v-if="proviteData?.feasibilityReport.name ">
-                        <View @click="openFile(proviteData.feasibilityReport.name )" />
+                    <el-icon class="elView" v-if="proviteData?.feasibilityReport.name">
+                        <View @click="openFile(proviteData.feasibilityReport.name)" />
                     </el-icon>
                     <a :href="proviteData.feasibilityReport.url">{{ proviteData.feasibilityReport.name }}</a>
                 </span>
-            </template>
-        </details_item>
-        <details_item>
-            <template #label>项目初步设计说明书</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item label="项目初步设计说明书">
                 <el-icon class="elView" v-if="proviteData?.preliminaryDesignDescription.name">
                     <View @click="openFile(proviteData?.preliminaryDesignDescription.name)" />
                 </el-icon>
                 <a :href="proviteData?.preliminaryDesignDescription.url">
                     {{ proviteData?.preliminaryDesignDescription.name }}
                 </a>
-            </template>
-        </details_item>
-        <details_item>
-            <template #label>预测评估报告</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item label="预测评估报告">
                 <el-icon class="elView" v-if="proviteData?.predictionEvaluationReport.name">
                     <View @click="openFile(proviteData?.predictionEvaluationReport.name)" />
                 </el-icon>
                 <a :href="proviteData?.predictionEvaluationReport.url">
                     {{ proviteData?.predictionEvaluationReport.name }}
                 </a>
-            </template>
-        </details_item>
-        <details_item>
-            <template #label>预测评估评审意见报告</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item label="预测评估评审意见报告">
                 <el-icon class="elView" v-if="proviteData?.predictionEvaluationReviewOpinions.name">
                     <View @click="openFile(proviteData?.predictionEvaluationReviewOpinions.name)" />
                 </el-icon>
                 <a :href="proviteData?.predictionEvaluationReviewOpinions.url">
                     {{ proviteData?.predictionEvaluationReviewOpinions.name }}
                 </a>
-            </template>
-        </details_item>
-        <details_item v-if="detailData.userType != 0 && detailData.userType != 1">
-            <template #label>用户接入变电站主接线示意图</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item
+                label="用户接入变电站主接线示意图"
+                v-if="detailData.userType != 0 && detailData.userType != 1"
+            >
                 <el-icon class="elView" v-if="proviteData?.substationMainWiringDiagram.name">
                     <View @click="openFile(proviteData?.substationMainWiringDiagram.name)" />
                 </el-icon>
                 <a :href="proviteData?.substationMainWiringDiagram.url" target="_blank">
                     {{ proviteData?.substationMainWiringDiagram.name }}
                 </a>
-            </template>
-        </details_item>
-        <details_item v-if="detailData.userType == 6">
-            <template #label>主要敏感终端清单</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item label="主要敏感终端清单" v-if="detailData.userType == 6">
                 <el-icon class="elView" v-if="proviteData?.sensitiveDevices.name">
                     <View @click="openFile(proviteData?.sensitiveDevices.name)" />
                 </el-icon>
                 <a :href="proviteData?.sensitiveDevices.url">{{ proviteData?.sensitiveDevices.name }}</a>
-            </template>
-        </details_item>
-        <details_item v-if="detailData.userType == 6">
-            <template #label>抗扰度测试报告</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item label="抗扰度测试报告" v-if="detailData.userType == 6">
                 <el-icon class="elView" v-if="proviteData?.antiInterferenceReport.name">
                     <View @click="openFile(proviteData?.antiInterferenceReport.name)" />
                 </el-icon>
-                <a :href="proviteData?.antiInterferenceReport.url">{{ proviteData?.antiInterferenceReport.name }}</a>
-            </template>
-        </details_item>
-        <details_item v-if="detailData.userType == 6">
-            <template #label>背景电能质量测试报告</template>
-            <template #content>
+                <a :href="proviteData?.antiInterferenceReport.url">
+                    {{ proviteData?.antiInterferenceReport.name }}
+                </a>
+            </el-descriptions-item>
+            <el-descriptions-item label="背景电能质量测试报告" v-if="detailData.userType == 6">
                 <el-icon class="elView" v-if="proviteData?.powerQualityReport.name">
                     <View @click="openFile(proviteData?.powerQualityReport.name)" />
                 </el-icon>
                 <a :href="proviteData?.powerQualityReport.url">{{ proviteData?.powerQualityReport.name }}</a>
-            </template>
-        </details_item>
-        <details_item v-if="proviteData?.additionalAttachments.url">
-            <template #label>其他附件</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item label="其他附件" v-if="proviteData?.additionalAttachments.url">
                 <el-icon class="elView" v-if="proviteData?.additionalAttachments.name">
                     <View @click="openFile(proviteData?.additionalAttachments.name)" />
                 </el-icon>
                 <a :href="proviteData?.additionalAttachments.url">{{ proviteData?.additionalAttachments.name }}</a>
-            </template>
-        </details_item>
+            </el-descriptions-item>
+        </el-descriptions>
         <el-divider content-position="left">{{ applyTitle + '填报信息' }}</el-divider>
-        <details_item>
-            <template #label>填报人</template>
-            <template #content>
+        <el-descriptions :column="2" border>
+            <el-descriptions-item label="填报人">
                 {{ detailData.reporter }}
-            </template>
-        </details_item>
-        <details_item>
-            <template #label>填报日期</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item label="填报日期">
                 {{ formatDate(detailData.reportDate, 'YYYY-MM-DD') }}
-            </template>
-        </details_item>
-        <details_item>
-            <template #label>填报部门</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item label="填报部门">
                 {{ detailData.orgName }}
-            </template>
-        </details_item>
-        <details_item v-if="proviteData?.otherReport && proviteData?.otherReport.url">
-            <template #label>{{ applyTitle + '报告' }}</template>
-            <template #content>
+            </el-descriptions-item>
+            <el-descriptions-item
+                :label="applyTitle + '报告'"
+                v-if="proviteData?.otherReport && proviteData?.otherReport.url"
+            >
                 <el-icon class="elView" v-if="proviteData?.otherReport.name">
                     <View @click="openFile(proviteData?.otherReport.nam)" />
                 </el-icon>
                 <a :href="proviteData?.otherReport.url">{{ proviteData?.otherReport.name }}</a>
-            </template>
-        </details_item>
+            </el-descriptions-item>
+        </el-descriptions>
     </div>
 </template>
 <script lang="ts" setup>
@@ -400,7 +298,7 @@ import { useDictData } from '@/stores/dictData'
 import { getFileNameAndFilePath } from '@/api/system-boot/file'
 import { Link, View } from '@element-plus/icons-vue'
 import { userReportGoNetById } from '@/api/supervision-boot/interfere'
-import details_item from './components/detailsItem.vue'
+// import el-descriptions-item from './components/detailsItem.vue'
 defineOptions({ name: 'BpmUserReportDetail' })
 const openFile = (name: any) => {
     window.open(window.location.origin + '/#/previewFile?' + name)
@@ -650,7 +548,7 @@ onMounted(() => {
     getInfo()
 })
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 ::v-deep.el-icon svg {
     // margin: 5px !important;
     // position: absolute !important;
@@ -665,4 +563,10 @@ onMounted(() => {
     cursor: pointer;
     margin-right: 10px;
 }
+:deep(.el-descriptions__label) {
+        width: 20%;
+    }
+:deep(.el-descriptions__content) {
+        width: 30%;
+    }
 </style>
diff --git a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
index 0005f3c0..83d672e7 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
@@ -259,7 +259,13 @@
                 />
             </el-form-item>
             <el-form-item for="-" v-if="form.userType == '6'" label="敏感电能质量指标：" prop="energyQualityIndex">
-                <el-select v-model="form.energyQualityIndex" placeholder="请选择敏感电能质量指标">
+                <el-select
+                    v-model="form.energyQualityIndex"
+                    multiple
+                    collapse-tags
+                    collapse-tags-tooltip
+                    placeholder="请选择敏感电能质量指标"
+                >
                     <el-option
                         v-for="(item, index) in energyQualityIndexList"
                         :label="item.name"
@@ -553,7 +559,9 @@ const areaOptionList = dictData
     .filter(item => !(item.name == '超高压' || item.name == '风光储'))
 
 //字典获取敏感电能质量指标
-const energyQualityIndexList = dictData.getBasicData('Indicator_Type')
+// const energyQualityIndexList = dictData.getBasicData('Indicator_Type')
+const energyQualityIndexList = dictData.getBasicData('Problem_Indicators')
+
 //字典获取行业类型
 const industryList = dictData.getBasicData('industry_type_jb')
 //字典电压等级
@@ -666,7 +674,7 @@ const resetForm = () => {
         industry: industryList[0].id, //行业 1
         deviceName: '', //敏感终端名称  1
         powerSupplyCount: 0, //供电电源数量 1
-        energyQualityIndex: energyQualityIndexList[0].id, //敏感电能质量指标 1
+        energyQualityIndex: [energyQualityIndexList[0]?.id], //敏感电能质量指标 1
         antiInterferenceTest: 0, //是否开展抗扰度测试 1
         sensitiveDevices: [], //主要敏感终端清单 1
         antiInterferenceReport: [] //抗扰度测试报告 1
@@ -769,7 +777,7 @@ const subForm: any = ref({
         antiInterferenceTest: '',
         backgroundTestPerformed: 0,
         deviceName: '',
-        energyQualityIndex: '',
+        energyQualityIndex: [],
         evaluationChekDept: '',
         evaluationType: '',
         feasibilityReport: [], //可研报告告地址
@@ -906,7 +914,7 @@ watch(
                 antiInterferenceTest: '',
                 backgroundTestPerformed: 0,
                 deviceName: '',
-                energyQualityIndex: '',
+                energyQualityIndex: [],
                 evaluationChekDept: '',
                 evaluationType: '',
                 feasibilityReport: [], //可研报告告地址
@@ -970,7 +978,11 @@ async function handleResponse(data) {
         form.value = { ...data, ...data.userReportSubstationPO }
         fileRaw(data, 'userReportSubstationPO')
     } else if (data.userReportSensitivePO) {
-        form.value = { ...data, ...data.userReportSensitivePO }
+        form.value = {
+            ...data,
+            ...data.userReportSensitivePO,
+            energyQualityIndex: data.userReportSensitivePO.energyQualityIndex.split(', ')
+        }
         fileRaw(data, 'userReportSensitivePO')
     }
     form.value.orgId = adminInfo.$state.deptName
@@ -1162,7 +1174,8 @@ const confirmForm = (flag: boolean) => {
                     substationMainWiringDiagram: substationMainWiringDiagram.value, //用户接入变电站主接线示意图地址
                     sensitiveDevices: sensitiveDevices.value, //主要敏感终端清单
                     antiInterferenceReport: antiInterferenceReport.value, //抗扰度测试报告
-                    powerQualityReport: powerQualityReport.value //背景电能质量测试报告
+                    powerQualityReport: powerQualityReport.value, //背景电能质量测试报告
+                    energyQualityIndex: confirmFormData.userReportSensitivePO.energyQualityIndex.join(', ')
                 }
             }
         }
@@ -1347,7 +1360,8 @@ const confirmForm = (flag: boolean) => {
                             substationMainWiringDiagram: substationMainWiringDiagram.value, //用户接入变电站主接线示意图地址
                             sensitiveDevices: sensitiveDevices.value, //主要敏感终端清单
                             antiInterferenceReport: antiInterferenceReport.value, //抗扰度测试报告
-                            powerQualityReport: powerQualityReport.value //背景电能质量测试报告
+                            powerQualityReport: powerQualityReport.value, //背景电能质量测试报告
+                            energyQualityIndex: confirmFormData.userReportSensitivePO.energyQualityIndex.join(', ')
                         }
                     }
                 }
diff --git a/src/views/pqs/supervise/interfere/components/undocumented/detail.vue b/src/views/pqs/supervise/interfere/components/undocumented/detail.vue
index 9a85a2b3..890829d2 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented/detail.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/detail.vue
@@ -658,4 +658,5 @@ onMounted(() => {
     cursor: pointer;
     margin-right: 10px;
 }
+
 </style>
diff --git a/src/views/pqs/supervise/technology/components/alarm.vue b/src/views/pqs/supervise/technology/components/alarm.vue
index 79d37848..af525684 100644
--- a/src/views/pqs/supervise/technology/components/alarm.vue
+++ b/src/views/pqs/supervise/technology/components/alarm.vue
@@ -138,7 +138,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
                     disabled: row => {
-                        return row.status !== 5
+                        return row.dutyOrgId != adminInfo.$state.deptId || row.status !== 5
                     },
                     click: row => {
                         feedbackPopup.value.open(
@@ -173,7 +173,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     showDisabled: row => {
-                        return row.createBy != adminInfo.$state.id || !(row.status == 0)
+                        return row.dutyOrgId != adminInfo.$state.deptId || !(row.status == 0)
                     },
                     disabled: row => {
                         return !(row.status == 0)
diff --git a/src/views/pqs/supervise/technology/components/earlyWarn.vue b/src/views/pqs/supervise/technology/components/earlyWarn.vue
index 87a71516..ab579d70 100644
--- a/src/views/pqs/supervise/technology/components/earlyWarn.vue
+++ b/src/views/pqs/supervise/technology/components/earlyWarn.vue
@@ -121,7 +121,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
                     disabled: row => {
-                        return row.status !== 5
+                        return row.dutyOrgId != adminInfo.$state.deptId || row.status !== 5
                     },
                     click: row => {
                         feedbackPopup.value.open(
@@ -155,7 +155,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     showDisabled: row => {
-                        return row.createBy != adminInfo.$state.id || !(row.status == 0)
+                        return row.dutyOrgId != adminInfo.$state.deptId || !(row.status == 0)
                     },
                     disabled: row => {
                         return !(row.status == 0)
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/debug.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/debug.vue
index ba85f3f9..b9d37ba0 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/debug.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/debug.vue
@@ -32,7 +32,7 @@
         <template #footer>
             <div class="dialog-footer">
                 <el-button @click="close()">取消</el-button>
-                <el-button type="primary" @click="confirmForm(true)">保存</el-button>
+                <!-- <el-button type="primary" @click="confirmForm(true)">保存</el-button> -->
                 <el-button type="primary" @click="confirmForm(false)">提交审批</el-button>
             </div>
         </template>
@@ -42,6 +42,7 @@
 import { ref, onMounted, reactive, defineExpose, defineProps, defineEmits, watch, onUnmounted } from 'vue'
 import { useDictData } from '@/stores/dictData'
 import { useAdminInfo } from '@/stores/adminInfo'
+import { ElMessage } from 'element-plus'
 import {
     addMointorPointTempLinedebug,
     updateMointorPointTempLinedebug
@@ -119,6 +120,7 @@ const confirmForm = (flag: boolean) => {
         form.value.saveOrCheckflag = '1'
         addMointorPointTempLinedebug(form.value).then(res => {
             ruleFormRef.value.resetFields()
+            ElMessage.success('保存成功！')
             resetForm()
             close()
         })
@@ -131,12 +133,14 @@ const confirmForm = (flag: boolean) => {
                 if (!(title.value == '重新发起' || title.value == '编辑')) {
                     addMointorPointTempLinedebug(form.value).then(res => {
                         ruleFormRef.value.resetFields()
+                        ElMessage.success('申请联调成功！')
                         resetForm()
                         close()
                     })
                 } else {
                     updateMointorPointTempLinedebug(form.value).then(res => {
                         ruleFormRef.value.resetFields()
+                        ElMessage.success('重新发起成功！')
                         resetForm()
                         close()
                     })
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
index 6f9f1e82..7b8fa744 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
@@ -40,7 +40,6 @@ import { useDictData } from '@/stores/dictData'
 import { getLoadTypeUserList } from '@/api/process-boot/interference'
 import { setTempLinedebugLedgerSync } from '@/api/supervision-boot/jointDebugList/index'
 import debug from './debug.vue'
-import { any } from 'vue-types'
 import { cancelMointorPointTempLinedebug } from '@/api/supervision-boot/jointDebugList/index'
 import { useAdminInfo } from '@/stores/adminInfo'
 //获取登陆用户姓名和部门
diff --git a/src/views/system/bpm/processInstance/detail/index.vue b/src/views/system/bpm/processInstance/detail/index.vue
index c27da13f..a3be0aad 100644
--- a/src/views/system/bpm/processInstance/detail/index.vue
+++ b/src/views/system/bpm/processInstance/detail/index.vue
@@ -82,8 +82,26 @@
                         </div>
                     </el-col>
                 </el-card>
+                <el-card v-loading="processInstanceLoading" class="box-card">
+                    <template #header>
+                        <span class="el-icon-document">申请信息【{{ processInstance.name }}】</span>
+                    </template>
+                    <!-- 情况一：流程表单 -->
+                    <el-col v-if="processInstance?.processDefinition?.formType === 10" :offset="6" :span="16">
+                        <form-create
+                            v-model="detailForm.value"
+                            v-model:api="fApi"
+                            :option="detailForm.option"
+                            :rule="detailForm.rule"
+                        />
+                    </el-col>
+                    <!-- 情况二：业务表单 -->
+                    <div v-if="processInstance?.processDefinition?.formType === 20">
+                        <BusinessFormComponent :id="processInstance.businessKey" :applyTitle="processInstance.name" />
+                    </div>
+                </el-card>
             </el-tab-pane>
-            <el-tab-pane label="申请信息" name="申请信息">
+            <el-tab-pane label="申请信息" name="申请信息" v-if="runningTasks.length == 0">
                 <!-- 申请信息 -->
                 <el-card v-loading="processInstanceLoading" class="box-card">
                     <template #header>