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')"
>
+
上传文件
@@ -67,7 +67,6 @@
:on-exceed="handleExceed1"
:on-change="event => choose(event, 'testReport')"
:auto-upload="false"
- :on-progress="uploadFileName('testReport')"
>
上传文件
@@ -76,14 +75,13 @@
上传文件
@@ -127,6 +125,7 @@ let uploadName = ref('')
// 上传报告
const uploadRef = ref()
const upload1Ref = ref()
+const upload2Ref = ref()
const fileList = ref([])
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 => {