merge

src/components/common/table/uploadImg.vue

@@ -23,7 +23,12 @@
         </div>
       </template>
       <div v-else class="upload">
-        <el-upload :show-file-list="false" accept="image/*" :before-upload="beforeUploadFun">
+        <el-upload
+          v-if="!disabled"
+          :show-file-list="false"
+          accept="image/*"
+          :before-upload="beforeUploadFun"
+        >
           <template v-if="!uploading">
             <div v-if="viewMode === 'card'" class="add-card">
               <el-icon :size="20" class="add-icon add"><Plus /></el-icon>

src/components/common/treeCaseTable/treeTable.vue

@@ -460,18 +460,13 @@
         />
       </template>
       <!-- 3d图示 -->
-      <template #imageFileId="{ row, icon }">
-        <TreeEditItem
+      <template #imageFileId="{ row }">
+        <uploadImg
+          v-model="row.imageFileId"
           v-if="[NODE_TYPE.TASK].includes(row.nodeType) || isMixedNodeType(row.nodeType)"
-          :data="row.imageFileId"
-          :editMode="editMode"
-          :icon="icon"
-        >
-          <uploadImg v-model="row.imageFileId" :disabled="!editMode" viewMode="inline" />
-        </TreeEditItem>
-      </template>
-      <template #imageFileId-edit="{ row }">
-        <uploadImg v-model="row.imageFileId" viewMode="inline" />
+          :disabled="!editMode"
+          viewMode="inline"
+        />
       </template>
       <!-- 仿真能力 -->
       <template #bCapacity="{ row, icon }">