diff --git a/.gitignore b/.gitignore index f60e1385..66714c0f 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,5 @@ coverage *.sw? *.tsbuildinfo +package-lock.json +yarn.lock diff --git a/src/components/common/addFile/index.vue b/src/components/common/addFile/index.vue index 5007605c..a7c64970 100644 --- a/src/components/common/addFile/index.vue +++ b/src/components/common/addFile/index.vue @@ -46,17 +46,19 @@ interface Props { tableName: string; callbackFlag?: string; discipline?: string; + tagReq?: any; } const props = withDefaults(defineProps(), { api: null, - data: {}, fileType: '', + data: {}, accept: '', multiple: true, tableName: '', callbackFlag: '', discipline: '', + tagReq: {}, }); const formData = ref({ @@ -109,6 +111,7 @@ const submitFun = async () => { 'disciplineTypeDictClass', 'disciplineDictValue', ], + tagReq: props.tagReq, }; closeFun(); await uploadBigFile(params, props.api); diff --git a/src/components/taskDetail/resultImage.vue b/src/components/taskDetail/resultImage.vue index 8d913497..008ade9b 100644 --- a/src/components/taskDetail/resultImage.vue +++ b/src/components/taskDetail/resultImage.vue @@ -8,7 +8,7 @@ v-model:viewType="viewType" :api="getSimulationTaskFilesApi" :params="apiParam" - :show-checkbox="true" + :show-checkbox="showCheckbox" :actionList="actionList" :full-height="true" > @@ -103,6 +103,10 @@ const props = defineProps({ type: Boolean, default: true, }, + showCheckbox: { + type: Boolean, + default: true, + }, }); const baseTableRef = ref(); diff --git a/src/components/taskDetail/reviewData.vue b/src/components/taskDetail/reviewData.vue index 1a9d2c42..c2ebecdf 100644 --- a/src/components/taskDetail/reviewData.vue +++ b/src/components/taskDetail/reviewData.vue @@ -6,7 +6,7 @@ :api="getSimulationTaskFilesApi" :params="apiParam" ref="baseTableRef" - :showCheckbox="true" + :showCheckbox="showCheckbox" :actionList="actionList" >