From d156c38c110d9bd5d33c8a3df9df4f67dde41666 Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Fri, 24 May 2024 09:13:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E7=9B=91=E7=9D=A3=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E5=BC=B9=E6=A1=86=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pqs/supervise/plan/components/addForm.vue | 710 ++++++++----------
 .../plan/components/effectProblem/addForm.vue | 126 ++--
 2 files changed, 355 insertions(+), 481 deletions(-)

diff --git a/src/views/pqs/supervise/plan/components/addForm.vue b/src/views/pqs/supervise/plan/components/addForm.vue
index 6a1918e2..4eed455b 100644
--- a/src/views/pqs/supervise/plan/components/addForm.vue
+++ b/src/views/pqs/supervise/plan/components/addForm.vue
@@ -2,7 +2,7 @@
     <el-dialog
         v-model="dialogFormVisible"
         title="技术监督计划"
-        width="60%"
+        width="65%"
         :append-to-body="true"
         :before-close="close"
         :close-on-click-modal="false"
@@ -16,428 +16,317 @@
             :scroll-to-error="true"
             :rules="rules"
             ref="ruleFormRef"
-            label-width="140px"
-            label-position="right"
+            label-width="auto"
+            class="form-two"
         >
-            <el-row>
-                <el-col :span="12">
-                    <el-form-item label="计划名称：" prop="workPlanName">
-                        <el-input v-model="form.workPlanName" autocomplete="off" placeholder="请输入计划名称" />
-                    </el-form-item>
-                </el-col>
+            <el-form-item label="计划名称：" prop="workPlanName">
+                <el-input v-model="form.workPlanName" autocomplete="off" placeholder="请输入计划名称" />
+            </el-form-item>
 
-                <el-col :span="12">
-                    <el-form-item label="监督单位：" prop="supvOrgId">
-                        <Area ref="areaRef" v-model="form.supvOrgId" />
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="12">
-                    <el-form-item label="计划编制单位：" prop="planOrgId">
-                        <Area ref="areaRef" v-model="form.planOrgId" />
-                    </el-form-item>
-                </el-col>
+            <el-form-item label="监督单位：" prop="supvOrgId">
+                <Area ref="areaRef" v-model="form.supvOrgId" />
+            </el-form-item>
 
-                <el-col :span="12">
-                    <el-form-item label="监督类型：" prop="supvType">
-                        <el-select v-model="form.supvType" clearable style="width: 100%" placeholder="请选择监督类型">
-                            <el-option
-                                v-for="item in supvTypeList"
-                                :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="supvStage">
-                        <el-select v-model="form.supvStage" clearable style="width: 100%" placeholder="请选择监督阶段">
-                            <el-option
-                                v-for="item in supvStageList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
+            <el-form-item label="计划编制单位：" prop="planOrgId">
+                <Area ref="areaRef" v-model="form.planOrgId" />
+            </el-form-item>
 
-                <el-col :span="12">
-                    <el-form-item label="计划监督时间：" prop="planSupvDate">
-                        <el-date-picker
-                            style="width: 100%"
-                            v-model="form.planSupvDate"
-                            type="datetime"
-                            format="YYYY-MM-DD hh:mm:ss"
-                            value-format="YYYY-MM-DD hh:mm:ss"
-                            placeholder="请选择计划监督时间"
-                        />
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="12">
-                    <el-form-item label="监督对象类型：" prop="supvObjType">
-                        <el-select
-                            v-model="form.supvObjType"
-                            clearable
-                            style="width: 100%"
-                            placeholder="请选择监督对象类型"
-                        >
-                            <el-option
-                                v-for="item in supvObjTypeList"
-                                :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="supvObjName">
-                        <el-input v-model="form.supvObjName" autocomplete="off" placeholder="请输入监督对象名称" />
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="12">
-                    <el-form-item label="监督对象电压等级：" prop="supvObjName" class="label_over_warp">
-                        <el-select
-                            v-model="form.objVoltageLevel"
-                            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-form-item label="监督类型：" prop="supvType">
+                <el-select v-model="form.supvType" clearable style="width: 100%" placeholder="请选择监督类型">
+                    <el-option
+                        v-for="item in supvTypeList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
 
-                <el-col :span="12">
-                    <el-form-item label="监督对象属性：" prop="objType">
-                        <el-select
-                            v-model="form.objType"
-                            clearable
-                            style="width: 100%"
-                            placeholder="请选择监督对象属性"
-                        >
-                            <el-option
-                                v-for="item in objTypeList"
-                                :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="objTypeName">
-                        <el-input v-model="form.objTypeName" autocomplete="off" placeholder="请输入监督对象属性名称" />
-                    </el-form-item>
-                </el-col>
+            <el-form-item label="监督阶段：" prop="supvStage">
+                <el-select v-model="form.supvStage" clearable style="width: 100%" placeholder="请选择监督阶段">
+                    <el-option
+                        v-for="item in supvStageList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
 
-                <el-col :span="12">
-                    <el-form-item label="监督对象协议容量(MVA)：" prop="objCapacity" class="label_over_warp">
-                        <el-input
-                            v-model="form.objCapacity"
-                            autocomplete="off"
-                            placeholder="请输入监督对象监督对象协议容量"
-                        />
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="12">
-                    <el-form-item label="监督对象关联电站：" prop="substationName" class="label_over_warp">
-                        <el-input
-                            v-model="form.substationName"
-                            autocomplete="off"
-                            placeholder="请输入监督对象关联电站"
-                        />
-                    </el-form-item>
-                </el-col>
+            <el-form-item label="计划监督时间：" prop="planSupvDate">
+                <el-date-picker
+                    style="width: 100%"
+                    v-model="form.planSupvDate"
+                    type="datetime"
+                    format="YYYY-MM-DD hh:mm:ss"
+                    value-format="YYYY-MM-DD hh:mm:ss"
+                    placeholder="请选择计划监督时间"
+                />
+            </el-form-item>
 
-                <el-col :span="12">
-                    <el-form-item
-                        label="监督对象关联电站电压等级："
-                        prop="substationVoltageLevel"
-                        class="label_over_warp"
-                    >
-                        <el-select
-                            v-model="form.substationVoltageLevel"
-                            clearable
-                            style="width: 100%"
-                            placeholder="请选择监督对象关联电站电压等级"
-                        >
-                            <el-option
-                                v-for="item in voltageLevelList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="12">
-                    <el-form-item label="实施状态：" prop="effectStatus">
-                        <el-select
-                            v-model="form.effectStatus"
-                            clearable
-                            style="width: 100%"
-                            placeholder="请选择实施状态"
-                        >
-                            <el-option
-                                v-for="item in effectStatusList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
+            <el-form-item label="监督对象类型：" prop="supvObjType">
+                <el-select v-model="form.supvObjType" clearable style="width: 100%" placeholder="请选择监督对象类型">
+                    <el-option
+                        v-for="item in supvObjTypeList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
 
-                <el-col :span="12" class="required_position">
-                    <span class="required_icon_white">*</span>
-                    <el-form-item label="开始实施时间：">
-                        <el-date-picker
-                            style="width: 100%"
-                            v-model="form.effectStartTime"
-                            type="datetime"
-                            format="YYYY-MM-DD hh:mm:ss"
-                            value-format="YYYY-MM-DD hh:mm:ss"
-                            placeholder="请选择开始实施时间"
-                        />
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="12" class="required_position">
-                    <span class="required_icon_white">*</span>
-                    <el-form-item label="结束实施时间：">
-                        <el-date-picker
-                            style="width: 100%"
-                            v-model="form.effectEndTime"
-                            type="datetime"
-                            format="YYYY-MM-DD hh:mm:ss"
-                            value-format="YYYY-MM-DD hh:mm:ss"
-                            placeholder="请选择结束实施时间"
-                        />
-                    </el-form-item>
-                </el-col>
+            <el-form-item label="监督对象名称：" prop="supvObjName">
+                <el-input v-model="form.supvObjName" autocomplete="off" placeholder="请输入监督对象名称" />
+            </el-form-item>
 
-                <el-col :span="12" class="required_position">
-                    <span class="required_icon_white">*</span>
-                    <el-form-item label="报告出具时间：">
-                        <el-date-picker
-                            style="width: 100%"
-                            v-model="form.reportIssueTime"
-                            type="datetime"
-                            format="YYYY-MM-DD hh:mm:ss"
-                            value-format="YYYY-MM-DD hh:mm:ss"
-                            placeholder="请选择报告出具时间"
-                        />
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="12" class="required_position">
-                    <span class="required_icon_white">*</span>
-                    <el-form-item label="电能质量问题发生时间：" class="label_over_warp">
-                        <el-date-picker
-                            style="width: 100%"
-                            v-model="form.problemOcTime"
-                            type="datetime"
-                            format="YYYY-MM-DD hh:mm:ss"
-                            value-format="YYYY-MM-DD hh:mm:ss"
-                            placeholder="请选择电能质量问题发生时间"
-                        />
-                    </el-form-item>
-                </el-col>
+            <el-form-item label="监督对象电压等级：" prop="supvObjName">
+                <el-select
+                    v-model="form.objVoltageLevel"
+                    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 :span="12" class="required_position">
-                    <span class="required_icon_white">*</span>
-                    <el-form-item label="实施人员：">
-                        <el-select
-                            v-model="form.effectUserId"
-                            clearable
-                            style="width: 100%"
-                            placeholder="请选择实施人员"
-                        >
-                            <el-option
-                                v-for="item in effectUserIdList"
-                                :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" class="required_position">
-                    <span class="required_icon_white">*</span>
-                    <el-form-item label="计划状态：">
-                        <el-select v-model="form.planStatus" clearable style="width: 100%" placeholder="请选择计划状态">
-                            <el-option
-                                v-for="item in planStatusList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
+            <el-form-item label="监督对象属性：" prop="objType">
+                <el-select v-model="form.objType" clearable style="width: 100%" placeholder="请选择监督对象属性">
+                    <el-option
+                        v-for="item in objTypeList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
 
-                <el-col :span="12" class="required_position">
-                    <span class="required_icon_white">*</span>
-                    <el-form-item label="其他要求：">
-                        <el-input v-model="form.otherRemark" autocomplete="off" placeholder="请输入其他要求" />
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row v-if="false">
-                <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"
-                            ref="uploadRef"
-                            action=""
-                            accept=".xls,.xlsx"
-                            :limit="1"
-                            :on-exceed="handleExceed"
-                            :on-change="choose"
-                            :auto-upload="false"
-                            :on-progress="uploadFileName('informationSecurityTestReport')"
-                        >
-                            <template #trigger>
-                                <el-button type="primary">上传文件</el-button>
-                            </template>
-                        </el-upload>
-                    </el-form-item>
-                </el-col>
+            <el-form-item label="监督对象属性名称：" prop="objTypeName">
+                <el-input v-model="form.objTypeName" autocomplete="off" placeholder="请输入监督对象属性名称" />
+            </el-form-item>
 
-                <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"
-                            ref="uploadRef"
-                            action=""
-                            accept=".xls,.xlsx"
-                            :limit="1"
-                            :on-exceed="handleExceed"
-                            :on-change="choose"
-                            :auto-upload="false"
-                            :on-progress="uploadFileName('acceptanceInspectionReportSingle')"
-                        >
-                            <template #trigger>
-                                <el-button type="primary">上传文件</el-button>
-                            </template>
-                        </el-upload>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row v-if="false">
-                <el-col :span="12" class="required_position">
-                    <span class="required_icon">*</span>
-                    <el-form-item label="计划变更材料：" prop="acceptanceInspectionReport">
-                        <el-upload
-                            v-model:file-list="form.acceptanceInspectionReport"
-                            ref="uploadRef"
-                            action=""
-                            accept=".xls,.xlsx"
-                            :limit="1"
-                            :on-exceed="handleExceed"
-                            :on-change="choose"
-                            :auto-upload="false"
-                            :on-progress="uploadFileName('acceptanceInspectionReport')"
-                        >
-                            <template #trigger>
-                                <el-button type="primary">上传文件</el-button>
-                            </template>
-                        </el-upload>
-                    </el-form-item>
-                </el-col>
+            <el-form-item label="监督对象协议容量(MVA)：" prop="objCapacity">
+                <el-input v-model="form.objCapacity" autocomplete="off" placeholder="请输入监督对象监督对象协议容量" />
+            </el-form-item>
 
-                <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"
-                            ref="uploadRef"
-                            action=""
-                            accept=".xls,.xlsx"
-                            :limit="1"
-                            :on-exceed="handleExceed"
-                            :on-change="choose"
-                            :auto-upload="false"
-                            :on-progress="uploadFileName('typeExperimentReport')"
-                        >
-                            <template #trigger>
-                                <el-button type="primary">上传文件</el-button>
-                            </template>
-                        </el-upload>
-                    </el-form-item>
-                </el-col>
-            </el-row>
+            <el-form-item label="监督对象关联电站：" prop="substationName">
+                <el-input v-model="form.substationName" autocomplete="off" placeholder="请输入监督对象关联电站" />
+            </el-form-item>
 
-            <el-row v-if="false">
-                <el-col :span="12" class="required_position">
-                    <span class="required_icon">*</span>
-                    <el-form-item label="告预警单反馈材料：" prop="factoryInspectionReport" class="label_over_warp">
-                        <el-upload
-                            v-model:file-list="form.factoryInspectionReport"
-                            ref="uploadRef"
-                            action=""
-                            accept=".xls,.xlsx"
-                            :limit="1"
-                            :on-exceed="handleExceed"
-                            :on-change="choose"
-                            :auto-upload="false"
-                            :on-progress="uploadFileName('factoryInspectionReport')"
-                        >
-                            <template #trigger>
-                                <el-button type="primary">上传文件</el-button>
-                            </template>
-                        </el-upload>
-                    </el-form-item>
-                </el-col>
+            <el-form-item label="监督对象关联电站电压等级：" prop="substationVoltageLevel">
+                <el-select
+                    v-model="form.substationVoltageLevel"
+                    clearable
+                    style="width: 100%"
+                    placeholder="请选择监督对象关联电站电压等级"
+                >
+                    <el-option
+                        v-for="item in voltageLevelList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
 
-                <el-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"
-                            ref="uploadRef"
-                            action=""
-                            accept=".xls,.xlsx"
-                            :limit="1"
-                            :on-exceed="handleExceed"
-                            :on-change="choose"
-                            :auto-upload="false"
-                            :on-progress="uploadFileName('performanceTestReport')"
-                        >
-                            <template #trigger>
-                                <el-button type="primary">上传文件</el-button>
-                            </template>
-                        </el-upload>
-                    </el-form-item>
-                </el-col>
-            </el-row>
+            <el-form-item label="实施状态：" prop="effectStatus">
+                <el-select v-model="form.effectStatus" clearable style="width: 100%" placeholder="请选择实施状态">
+                    <el-option
+                        v-for="item in effectStatusList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="开始实施时间：">
+                <el-date-picker
+                    style="width: 100%"
+                    v-model="form.effectStartTime"
+                    type="datetime"
+                    format="YYYY-MM-DD hh:mm:ss"
+                    value-format="YYYY-MM-DD hh:mm:ss"
+                    placeholder="请选择开始实施时间"
+                />
+            </el-form-item>
+
+            <el-form-item label="结束实施时间：">
+                <el-date-picker
+                    style="width: 100%"
+                    v-model="form.effectEndTime"
+                    type="datetime"
+                    format="YYYY-MM-DD hh:mm:ss"
+                    value-format="YYYY-MM-DD hh:mm:ss"
+                    placeholder="请选择结束实施时间"
+                />
+            </el-form-item>
+
+            <el-form-item label="报告出具时间：">
+                <el-date-picker
+                    style="width: 100%"
+                    v-model="form.reportIssueTime"
+                    type="datetime"
+                    format="YYYY-MM-DD hh:mm:ss"
+                    value-format="YYYY-MM-DD hh:mm:ss"
+                    placeholder="请选择报告出具时间"
+                />
+            </el-form-item>
+
+            <el-form-item label="电能质量问题发生时间：">
+                <el-date-picker
+                    style="width: 100%"
+                    v-model="form.problemOcTime"
+                    type="datetime"
+                    format="YYYY-MM-DD hh:mm:ss"
+                    value-format="YYYY-MM-DD hh:mm:ss"
+                    placeholder="请选择电能质量问题发生时间"
+                />
+            </el-form-item>
+
+            <el-form-item label="实施人员：">
+                <el-select v-model="form.effectUserId" clearable style="width: 100%" placeholder="请选择实施人员">
+                    <el-option
+                        v-for="item in effectUserIdList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="计划状态：">
+                <el-select v-model="form.planStatus" clearable style="width: 100%" placeholder="请选择计划状态">
+                    <el-option
+                        v-for="item in planStatusList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="其他要求：">
+                <el-input
+                    v-model="form.otherRemark"
+                    autocomplete="off"
+                    placeholder="请输入其他要求"
+                    style="width: 100%"
+                />
+            </el-form-item>
+
+            <el-form-item v-if="false" label="盖章报告：" prop="informationSecurityTestReport">
+                <el-upload
+                    v-model:file-list="form.informationSecurityTestReport"
+                    ref="uploadRef"
+                    action=""
+                    accept=".xls,.xlsx"
+                    :limit="1"
+                    :on-exceed="handleExceed"
+                    :on-change="choose"
+                    :auto-upload="false"
+                    :on-progress="uploadFileName('informationSecurityTestReport')"
+                >
+                    <template #trigger>
+                        <el-button type="primary">上传文件</el-button>
+                    </template>
+                </el-upload>
+            </el-form-item>
+
+            <el-form-item v-if="false" label="佐证材料：" prop="acceptanceInspectionReportSingle">
+                <el-upload
+                    v-model:file-list="form.acceptanceInspectionReportSingle"
+                    ref="uploadRef"
+                    action=""
+                    accept=".xls,.xlsx"
+                    :limit="1"
+                    :on-exceed="handleExceed"
+                    :on-change="choose"
+                    :auto-upload="false"
+                    :on-progress="uploadFileName('acceptanceInspectionReportSingle')"
+                >
+                    <template #trigger>
+                        <el-button type="primary">上传文件</el-button>
+                    </template>
+                </el-upload>
+            </el-form-item>
+
+            <el-form-item v-if="false" label="计划变更材料：" prop="acceptanceInspectionReport">
+                <el-upload
+                    v-model:file-list="form.acceptanceInspectionReport"
+                    ref="uploadRef"
+                    action=""
+                    accept=".xls,.xlsx"
+                    :limit="1"
+                    :on-exceed="handleExceed"
+                    :on-change="choose"
+                    :auto-upload="false"
+                    :on-progress="uploadFileName('acceptanceInspectionReport')"
+                >
+                    <template #trigger>
+                        <el-button type="primary">上传文件</el-button>
+                    </template>
+                </el-upload>
+            </el-form-item>
+
+            <el-form-item v-if="false" label="告预警单材料：" prop="typeExperimentReport" :show-message="false">
+                <el-upload
+                    v-model:file-list="form.typeExperimentReport"
+                    ref="uploadRef"
+                    action=""
+                    accept=".xls,.xlsx"
+                    :limit="1"
+                    :on-exceed="handleExceed"
+                    :on-change="choose"
+                    :auto-upload="false"
+                    :on-progress="uploadFileName('typeExperimentReport')"
+                >
+                    <template #trigger>
+                        <el-button type="primary">上传文件</el-button>
+                    </template>
+                </el-upload>
+            </el-form-item>
+
+            <el-form-item v-if="false" label="告预警单反馈材料：" prop="factoryInspectionReport">
+                <el-upload
+                    v-model:file-list="form.factoryInspectionReport"
+                    ref="uploadRef"
+                    action=""
+                    accept=".xls,.xlsx"
+                    :limit="1"
+                    :on-exceed="handleExceed"
+                    :on-change="choose"
+                    :auto-upload="false"
+                    :on-progress="uploadFileName('factoryInspectionReport')"
+                >
+                    <template #trigger>
+                        <el-button type="primary">上传文件</el-button>
+                    </template>
+                </el-upload>
+            </el-form-item>
+
+            <el-form-item v-if="false" label="评估报告：" prop="performanceTestReport" :show-message="false">
+                <el-upload
+                    v-model:file-list="form.performanceTestReport"
+                    ref="uploadRef"
+                    action=""
+                    accept=".xls,.xlsx"
+                    :limit="1"
+                    :on-exceed="handleExceed"
+                    :on-change="choose"
+                    :auto-upload="false"
+                    :on-progress="uploadFileName('performanceTestReport')"
+                >
+                    <template #trigger>
+                        <el-button type="primary">上传文件</el-button>
+                    </template>
+                </el-upload>
+            </el-form-item>
         </el-form>
         <template #footer>
             <div class="dialog-footer">
@@ -797,11 +686,6 @@ defineExpose({ open })
     max-height: calc(100% - 30px);
 }
 .el-form {
-    width: 96%;
-    height: 400px;
-    margin: 0 auto;
-    overflow-y: auto;
-    padding-top: 20px;
 }
 .dialog-footer {
     padding: 10px;
diff --git a/src/views/pqs/supervise/plan/components/effectProblem/addForm.vue b/src/views/pqs/supervise/plan/components/effectProblem/addForm.vue
index 9babb327..93ccecba 100644
--- a/src/views/pqs/supervise/plan/components/effectProblem/addForm.vue
+++ b/src/views/pqs/supervise/plan/components/effectProblem/addForm.vue
@@ -2,7 +2,7 @@
     <el-dialog
         v-model="dialogFormVisible"
         :title="title"
-        width="60%"
+        width="65%"
         :append-to-body="true"
         :before-close="close"
         :close-on-click-modal="false"
@@ -16,18 +16,18 @@
             :scroll-to-error="true"
             :rules="rules"
             ref="ruleFormRef"
-            label-width="140px"
-            label-position="right"
             :disabled="openType!='add'"
+            label-width="auto"
+            class="form-two"
         >
-            <el-row>
-                <el-col :span="12">
+            
+                
                     <el-form-item label="责任单位：" prop="dutyOrgId">
                         <Area ref="areaRef" v-model="form.dutyOrgId" />
                     </el-form-item>
-                </el-col>
+               
 
-                <el-col :span="12">
+                
                     <el-form-item label="监测点类型：" prop="monitorType">
                         <el-select
                             v-model="form.monitorType"
@@ -43,10 +43,10 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="12">
+               
+           
+            
+                
                     <el-form-item label="是否发布预警：" prop="ifReleaseWarning">
                         <el-select
                             v-model="form.ifReleaseWarning"
@@ -58,9 +58,9 @@
                             <el-option label="否" value="0"></el-option>
                         </el-select>
                     </el-form-item>
-                </el-col>
+               
 
-                <el-col :span="12">
+                
                     <el-form-item label="计划整改时间：" prop="planRectificationTime">
                         <el-date-picker
                             style="width: 100%"
@@ -71,10 +71,10 @@
                             placeholder="请选择计划整改时间"
                         />
                     </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="12">
+               
+           
+            
+                
                     <el-form-item label="整改情况：" prop="rectificationStatus">
                         <el-select
                             v-model="form.rectificationStatus"
@@ -90,9 +90,9 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                </el-col>
+               
 
-                <el-col :span="12">
+                
                     <el-form-item label="整改时间：" prop="rectificationTime">
                         <el-date-picker
                             style="width: 100%"
@@ -103,27 +103,27 @@
                             placeholder="请选择整改时间"
                         />
                     </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="12">
+               
+           
+            
+                
                     <el-form-item label="监督标准：" prop="supvStandard">
                         <el-input v-model="form.supvStandard" autocomplete="off" placeholder="请输入监督标准" />
                     </el-form-item>
-                </el-col>
-                <el-col :span="12">
+               
+                
                     <el-form-item label="监督标准序号：" prop="supvStandardSort">
                         <el-input v-model="form.supvStandardSort" autocomplete="off" placeholder="请输入监督标准序号" />
                     </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="12">
+               
+           
+            
+                
                     <el-form-item label="标准出处：" prop="supvResouce">
                         <el-input v-model="form.supvResouce" autocomplete="off" placeholder="请输入标准出处" />
                     </el-form-item>
-                </el-col>
-                <el-col :span="12">
+               
+                
                     <el-form-item label="问题等级：" prop="problemLevel">
                         <el-select
                             v-model="form.problemLevel"
@@ -139,10 +139,10 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="12">
+               
+           
+            
+                
                     <el-form-item label="问题类型：" prop="problemType">
                         <el-select
                             v-model="form.problemType"
@@ -158,9 +158,9 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                </el-col>
+               
 
-                <el-col :span="12">
+                
                     <el-form-item label="问题简要描述：" prop="simpleProblemDesc">
                         <el-input
                             v-model="form.simpleProblemDesc"
@@ -168,16 +168,16 @@
                             placeholder="请输入问题简要描述"
                         />
                     </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="12">
+               
+           
+            
+                
                     <el-form-item label="问题描述：" prop="problemDesc">
                         <el-input v-model="form.problemDesc" autocomplete="off" placeholder="请输入问题描述" />
                     </el-form-item>
-                </el-col>
+               
 
-                <el-col :span="12">
+                
                     <el-form-item label="问题发现时间：" prop="discoveryTime">
                         <el-date-picker
                             style="width: 100%"
@@ -188,16 +188,16 @@
                             placeholder="问题发现时间"
                         />
                     </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="12">
+               
+           
+            
+                
                     <el-form-item label="定级依据：" prop="problemLevelReason">
                         <el-input v-model="form.problemLevelReason" autocomplete="off" placeholder="请输入定级依据" />
                     </el-form-item>
-                </el-col>
+               
 
-                <el-col :span="12">
+                
                     <el-form-item label="整改方案：" prop="rectificationProgramme">
                         <el-input
                             v-model="form.rectificationProgramme"
@@ -205,21 +205,20 @@
                             placeholder="请输入整改方案"
                         />
                     </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="12">
+               
+           
+            
+                
                     <el-form-item label="整改措施：" prop="rectificationMeasure">
                         <el-input v-model="form.rectificationMeasure" autocomplete="off" placeholder="请输入整改措施" />
                     </el-form-item>
-                </el-col>
-                <el-col :span="12" class="required_position">
-                    <span class="required_icon_white">*</span>
+               
+                
                     <el-form-item label="备注：">
                         <el-input v-model="form.remark" autocomplete="off" placeholder="请输入备注" />
                     </el-form-item>
-                </el-col>
-            </el-row>
+               
+           
         </el-form>
         <template #footer v-if="openType!='detail'">
             <div class="dialog-footer">
@@ -502,20 +501,11 @@ defineExpose({ open })
     max-height: calc(100% - 30px);
 }
 .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;