From 42be7bf2cf8af749a39d28b1b7b4017179d3f9ef Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Tue, 27 Aug 2024 10:42:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LN/newEnergy/highAndLowPressure/index.vue |  2 +-
 .../harmonicSurvey/components/planTest.vue    | 21 ++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/views/LN/newEnergy/highAndLowPressure/index.vue b/src/views/LN/newEnergy/highAndLowPressure/index.vue
index 052ea0ec..742e93ee 100644
--- a/src/views/LN/newEnergy/highAndLowPressure/index.vue
+++ b/src/views/LN/newEnergy/highAndLowPressure/index.vue
@@ -130,7 +130,7 @@ const tableStore = new TableStore({
         }
     }
 })
-const height = mainHeight(200, 4).height
+const height = mainHeight(200, 2).height
 provide('tableStore', tableStore)
 tableStore.table.params.type = '1'
 
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planTest.vue b/src/views/pqs/supervise/harmonicSurvey/components/planTest.vue
index 98c28ddb..7a874722 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/planTest.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/planTest.vue
@@ -50,8 +50,8 @@
                     :on-exceed="handleExceed"
                     :on-change="event => choose(event, 'supervisionReport')"
                     :auto-upload="false"
-                    :on-progress="uploadFileName('supervisionReport')"
                 >
+                    <!-- :on-progress="uploadFileName('supervisionReport')" -->
                     <template #trigger>
                         <el-button type="primary">上传文件</el-button>
                     </template>
@@ -67,7 +67,6 @@
                     :on-exceed="handleExceed1"
                     :on-change="event => choose(event, 'testReport')"
                     :auto-upload="false"
-                    :on-progress="uploadFileName('testReport')"
                 >
                     <template #trigger>
                         <el-button type="primary">上传文件</el-button>
@@ -76,14 +75,13 @@
             </el-form-item>
             <el-form-item for="-" class="uploadFile" label="其他报告:">
                 <el-upload
-                    ref="upload1Ref"
+                    ref="upload2Ref"
                     v-model:file-list="form.otherReport"
                     action=""
                     :accept="acceptType"
-                    :on-exceed="handleExceed1"
+                    :on-exceed="handleExceed2"
                     :on-change="event => choose(event, 'otherReport')"
                     :auto-upload="false"
-                    :on-progress="uploadFileName('otherReport')"
                 >
                     <template #trigger>
                         <el-button type="primary">上传文件</el-button>
@@ -127,6 +125,7 @@ let uploadName = ref('')
 // 上传报告
 const uploadRef = ref()
 const upload1Ref = ref()
+const upload2Ref = ref()
 const fileList = ref<UploadUserFile[]>([])
 const emit = defineEmits(['onsubmit'])
 const dictData = useDictData()
@@ -254,7 +253,6 @@ const cancelFn = () => {
     formRef.value.resetFields()
     planAddition.value = false
 }
-
 // 提交
 const submitFn = (flag: boolean) => {
     const subForm = JSON.parse(JSON.stringify(form.value))
@@ -266,10 +264,8 @@ const submitFn = (flag: boolean) => {
             subForm.otherReport = subForm.otherReport + item.name + ','
         })
     }
-
     if (flag) {
         subForm.testReport = testReport.value
-        // subForm.otherReport = otherReport.value
         subForm.supervisionReport = supervisionReport.value
         subForm.saveOrCheckflag = '1'
 
@@ -343,8 +339,7 @@ const choose = (e: any, text: string) => {
         uploadFile(e.raw, '/supervision/').then(res => {
             testReport.value = res.data.name
         })
-    }
-    if (text == 'otherReport') {
+    } else if (text == 'otherReport') {
         uploadFile(e.raw, '/supervision/').then(res => {
             otherReport.value = res.data.name
         })
@@ -367,6 +362,12 @@ const handleExceed1: UploadProps['onExceed'] = files => {
     file.uid = genFileId()
     upload1Ref.value!.handleStart(file)
 }
+const handleExceed2: UploadProps['onExceed'] = files => {
+    upload2Ref.value!.clearFiles()
+    const file = files[0] as UploadRawFile
+    file.uid = genFileId()
+    upload2Ref.value!.handleStart(file)
+}
 
 //上传报告改变
 const uploadFileName = val => {