From 4e06a231ff5324fae506a002358fbf9955ec1dcb Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Tue, 14 May 2024 11:31:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=96=B0=E5=A2=9E=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/undocumented/addForm.vue       |  39 ++---
 .../components/undocumented/detail.vue        | 138 +++++++++---------
 .../components/undocumented/index.vue         |   5 +-
 3 files changed, 84 insertions(+), 98 deletions(-)

diff --git a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
index c3aa0ba7..1b1201ae 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
@@ -1,16 +1,16 @@
 <template>
     <el-dialog
-        v-model="dialogFormVisible"
+       v-model="dialogFormVisible"
+        :close-on-click-modal="true"
         title="用户档案录入"
         width="55%"
         height="400"
         :append-to-body="true"
-        :validate-on-rule-change="false"
         :scroll-to-error="true"
-        @closed="close"
+        :before-close="close"
     >
         <!-- 用户档案录入 新建1 -->
-        <el-form :model="form" :rules="rules" ref="ruleFormRef">
+        <el-form :model="form"  :validate-on-rule-change="false" :rules="rules" ref="ruleFormRef">
             <el-row>
                 <el-col :span="12">
                     <el-form-item label="填报人：" :label-width="formLabelWidth" prop="reporter">
@@ -162,20 +162,6 @@
                         class="label_over_warp"
                         prop="nonlinearDeviceType"
                     >
-                        <!-- <el-tree
-                            accordion
-                            ref="treeRef"
-                            :default-expand-all="false"
-                            show-checkbox
-                            check-strictly
-                            :highlight-current="true"
-                            readonly
-                            node-key="id"
-                            :props="defaultProps"
-                            :data="nonlinearDeviceTypeList"
-                            :expand-on-click-node="false"
-                            @check-change="handleCheckChange"
-                        ></el-tree> -->
                         <el-tree-select
                             accordion
                             ref="treeRef"
@@ -224,7 +210,7 @@
                             <el-option
                                 v-for="(item, index) in evaluationDeptList"
                                 :label="item.name"
-                                :value="item.id"
+                                :value="item.name"
                                 :key="index"
                             />
                         </el-select>
@@ -590,7 +576,7 @@
                 </el-col>
             </el-row>
             <el-row>
-                <el-col :span="12" class="required_position" v-show="form.userType != '0' && form.userType != '1'">
+                <el-col :span="12" class="required_position" v-if="form.userType != '0' && form.userType != '1'">
                     <span class="required_icon">*</span>
                     <el-form-item
                         label="用户接入变电站主接线示意图："
@@ -615,7 +601,7 @@
                         </el-upload>
                     </el-form-item>
                 </el-col>
-                <el-col :span="12" class="required_position" v-show="form.userType == '6'">
+                <el-col :span="12" class="required_position" v-if="form.userType == '6'">
                     <span class="required_icon">*</span>
                     <el-form-item
                         label="主要敏感设备清单："
@@ -641,7 +627,7 @@
                     </el-form-item>
                 </el-col>
             </el-row>
-            <el-row v-show="form.userType == '6'" class="required_position">
+            <el-row v-if="form.userType == '6'" class="required_position">
                 <span class="required_icon">*</span>
                 <el-col :span="12">
                     <el-form-item
@@ -697,13 +683,13 @@
         <template #footer>
             <div class="dialog-footer">
                 <el-button @click="close()">取消</el-button>
-                <el-button type="primary" v-if="openType != 'detail'" @click="confirmForm()">确定</el-button>
+                <el-button type="primary"  @click="confirmForm()">确定</el-button>
             </div>
         </template>
     </el-dialog>
 </template>
 <script lang="ts" setup>
-import { ref, onMounted, reactive, defineExpose, defineProps, defineEmits, watch } from 'vue'
+import { ref, onMounted, reactive, defineExpose, defineProps, defineEmits, watch,onUnmounted } from 'vue'
 // import { upload, insertTerminal, updateTerminal } from '@/api/process-boot/terminal'
 import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
 import { genFileId, ElMessage } from 'element-plus'
@@ -812,7 +798,7 @@ const resetForm = () => {
         projectName: '', //工程名称 1
         substation: '', //变电站 1
         voltageLevel: voltageLevelList[0].id, //电压等级 1
-        evaluationDept: evaluationDeptList[0].id, //预测评估单位 1
+        evaluationDept: evaluationDeptList[0].name, //预测评估单位 1
         evaluationConclusion: '', //预测评估结论 1
         backgroundTestPerformed: 0, //是否开展背景测试 1
         feasibilityReport: '', // 可研报告告地址  1
@@ -1389,15 +1375,16 @@ const open = () => {
 }
 const close = () => {
     //重置表单内容
-    resetForm()
     //取消表单校验状态
     ruleFormRef.value.resetFields()
     dialogFormVisible.value = false
     emits('onSubmit')
+    resetForm()
 }
 onMounted(() => {
     console.log()
 })
+
 const changeUserType = value => {
     console.log(form.value.userType, '切换用户性质++++++++++++', value)
     return
diff --git a/src/views/pqs/supervise/interfere/components/undocumented/detail.vue b/src/views/pqs/supervise/interfere/components/undocumented/detail.vue
index 30ce5906..a2ca1704 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented/detail.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/detail.vue
@@ -415,75 +415,77 @@ const getProviteData = () => {
 }
 //根据文件名请求
 const getFileNamePath = async (val: any, pathName: any) => {
-    const data = await getFileNameAndFilePath({ filePath: val })
-    if (data.data && data.data.name && data.data.url) {
-        //可研报告
-        if (pathName == 'feasibilityReport' && proviteData.value.feasibilityReport) {
-            proviteData.value.feasibilityReport = {
-                name: data.data.fileName,
-                url: data.data.url
+    getFileNameAndFilePath({ filePath: val }).then(res => {
+      console.log(111111111)
+        if (res.data && res.data.name && res.data.url) {
+            //可研报告
+            if (pathName == 'feasibilityReport' && proviteData.value.feasibilityReport) {
+                proviteData.value.feasibilityReport = {
+                    name: res.data.fileName,
+                    url: res.data.url
+                }
+            }
+            //项目初步设计说明书
+            else if (pathName == 'preliminaryDesignDescription' && proviteData.value.preliminaryDesignDescription) {
+                proviteData.value.preliminaryDesignDescription = {
+                    name: res.data.fileName,
+                    url: res.data.url
+                }
+            }
+            //预测评估报告
+            else if (pathName == 'predictionEvaluationReport' && proviteData.value.predictionEvaluationReport) {
+                proviteData.value.predictionEvaluationReport = {
+                    name: res.data.fileName,
+                    url: res.data.url
+                }
+            }
+            //预测评估评审意见报告
+            else if (
+                pathName == 'predictionEvaluationReviewOpinions' &&
+                proviteData.value.predictionEvaluationReviewOpinions
+            ) {
+                proviteData.value.predictionEvaluationReviewOpinions = {
+                    name: res.data.fileName,
+                    url: res.data.url
+                }
+            }
+            //用户接入变电站主接线示意图
+            else if (pathName == 'substationMainWiringDiagram' && proviteData.value.substationMainWiringDiagram) {
+                proviteData.value.substationMainWiringDiagram = {
+                    name: res.data.fileName,
+                    url: res.data.url
+                }
+            }
+            //主要敏感设备清单
+            else if (pathName == 'sensitiveDevices' && proviteData.value.sensitiveDevices) {
+                proviteData.value.sensitiveDevices = {
+                    name: res.data.fileName,
+                    url: res.data.url
+                }
+            }
+            //抗扰度测试报告
+            else if (pathName == 'antiInterferenceReport' && proviteData.value.antiInterferenceReport) {
+                proviteData.value.antiInterferenceReport = {
+                    name: res.data.fileName,
+                    url: res.data.url
+                }
+            }
+            //背景电能质量测试报告
+            else if (pathName == 'powerQualityReport' && proviteData.value.powerQualityReport) {
+                proviteData.value.powerQualityReport = {
+                    name: res.data.fileName,
+                    url: res.data.url
+                }
+            }
+            //其他附件
+            else if (pathName == 'additionalAttachments' && proviteData.value.additionalAttachments) {
+                proviteData.value.additionalAttachments = {
+                    name: res.data.fileName,
+                    url: res.data.url
+                }
             }
         }
-        //项目初步设计说明书
-        else if (pathName == 'preliminaryDesignDescription' && proviteData.value.preliminaryDesignDescription) {
-            proviteData.value.preliminaryDesignDescription = {
-                name: data.data.fileName,
-                url: data.data.url
-            }
-        }
-        //预测评估报告
-        else if (pathName == 'predictionEvaluationReport' && proviteData.value.predictionEvaluationReport) {
-            proviteData.value.predictionEvaluationReport = {
-                name: data.data.fileName,
-                url: data.data.url
-            }
-        }
-        //预测评估评审意见报告
-        else if (
-            pathName == 'predictionEvaluationReviewOpinions' &&
-            proviteData.value.predictionEvaluationReviewOpinions
-        ) {
-            proviteData.value.predictionEvaluationReviewOpinions = {
-                name: data.data.fileName,
-                url: data.data.url
-            }
-        }
-        //用户接入变电站主接线示意图
-        else if (pathName == 'substationMainWiringDiagram' && proviteData.value.substationMainWiringDiagram) {
-            proviteData.value.substationMainWiringDiagram = {
-                name: data.data.fileName,
-                url: data.data.url
-            }
-        }
-        //主要敏感设备清单
-        else if (pathName == 'sensitiveDevices' && proviteData.value.sensitiveDevices) {
-            proviteData.value.sensitiveDevices = {
-                name: data.data.fileName,
-                url: data.data.url
-            }
-        }
-        //抗扰度测试报告
-        else if (pathName == 'antiInterferenceReport' && proviteData.value.antiInterferenceReport) {
-            proviteData.value.antiInterferenceReport = {
-                name: data.data.fileName,
-                url: data.data.url
-            }
-        }
-        //背景电能质量测试报告
-        else if (pathName == 'powerQualityReport' && proviteData.value.powerQualityReport) {
-            proviteData.value.powerQualityReport = {
-                name: data.data.fileName,
-                url: data.data.url
-            }
-        }
-        //其他附件
-        else if (pathName == 'additionalAttachments' && proviteData.value.additionalAttachments) {
-            proviteData.value.additionalAttachments = {
-                name: data.data.fileName,
-                url: data.data.url
-            }
-        }
-    }
+    })
 }
 defineExpose({ open: getInfo }) // 提供 open 方法，用于打开弹窗
 
@@ -497,7 +499,7 @@ onMounted(() => {
     height: calc(100vh - 100px);
     overflow: auto;
 }
-::v-deep.el-icon svg{
+::v-deep.el-icon svg {
     margin: 5px !important;
     position: absolute !important;
     top: 20px !important;
diff --git a/src/views/pqs/supervise/interfere/components/undocumented/index.vue b/src/views/pqs/supervise/interfere/components/undocumented/index.vue
index 5258196d..17dbe09b 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented/index.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/index.vue
@@ -27,7 +27,7 @@
   <!-- 上传 -->
   <Audit ref='AuditRef' @onSubmit='tableStore.index()' />
   <!-- 查看详情 detail 新增/修改 create-->
-  <addForm ref='addForms'  @onSubmit='tableStore.index()'  openType='create'></addForm>
+  <addForm ref='addForms'  @onSubmit='tableStore.index()' openType='create'></addForm>
 </template>
 <script setup lang='ts'>
 import { ref, onMounted, provide, nextTick } from 'vue'
@@ -143,11 +143,8 @@ const addList = () => {
 
 //三个表单
 const addForms = ref()
-const formVisibile = ref(false)
 const addFormModel = () => {
-  console.log(addForms.value, '00000')
   addForms.value.open()
-  formVisibile.value = true
 }
 
 // 导出