Merge branch 'main' of http://carsafe.uicp.cn/Front_Team/SPDM

src/components/common/table/tableFormDia.vue

@@ -211,7 +211,7 @@
                 />
               </template>
             </vxe-column>
-            <!-- <vxe-column
+            <vxe-column
               field="disabled"
               title="不可编辑"
               align="center"
@@ -221,7 +221,7 @@
               <template #default="{ row }">
                 <el-switch v-model="row.disabled" :disabled="disabled" />
               </template>
-            </vxe-column> -->
+            </vxe-column>
             <vxe-column
               field="width"
               title="表格列宽"

src/views/task/execution/components/taskDetailPage/components/experimentResult.vue

@@ -7,9 +7,7 @@
       :action-list="showLeftOptions ? actionList : []"
       :api="listExperimentResultApi"
       :show-overflow="false"
-      :params="{
-        taskId: taskInfo.uuid,
-      }"
+      :params="tableParams"
     >
       <template v-if="showLeftOptions" #leftOptions>
         <el-button type="primary" @click="uploadResultFun">上传结果</el-button>
@@ -131,7 +129,7 @@
 </template>
 
 <script setup lang="ts">
-import { nextTick, onMounted, ref } from 'vue';
+import { nextTick, onMounted, ref, watch } from 'vue';
 import BaseTable from '@/components/common/table/baseTable.vue';
 import TableForm from '@/components/common/table/tableForm.vue';
 import { cloneDeep } from 'lodash-es';
@@ -171,11 +169,24 @@ const fileList = ref<any>([]);
 const imageFileList = ref<any>([]);
 const diaVisible = ref(false);
 const baseFileTableRef = ref();
+const tableParams = ref({
+  taskId: props.taskInfo.uuid,
+});
 const uploadImgRef = ref();
 const { t } = useI18n();
 
 const accept = ref('.jpg,.jpeg,.png,.gif');
 
+watch(
+  () => props.taskInfo,
+  (val: any) => {
+    tableParams.value.taskId = val.uuid;
+  },
+  {
+    deep: true,
+  }
+);
+
 const uploadResultFun = () => {
   resultInfo.value = {};
   visible.value = true;