update bug修复

src/components/common/table/choseFile.vue

@@ -12,11 +12,7 @@
       <el-button type="primary" :disabled="disabled">选择文件</el-button>
       <template #file="{ file, index }">
         <div class="file-item">
-          <div class="file-icon">
+          <img :src="fileUploadAllocationIconFun(file.name)" class="img" />
-            <el-icon :size="16">
-              <Document />
-            </el-icon>
-          </div>
           <div class="file-name">
             {{ file.name }}
           </div>
@@ -40,9 +36,9 @@
 
 <script setup lang="ts">
 import { ref, watch } from 'vue';
-import { Document, View, Delete, Download } from '@element-plus/icons-vue';
+import { View, Delete, Download } from '@element-plus/icons-vue';
 import FilePreview from '@/components/common/filePreview/index.vue';
-import { downloadFileById } from '@/utils/file';
+import { downloadFileById, fileUploadAllocationIconFun } from '@/utils/file';
 import { isArray } from 'lodash-es';
 
 interface Props {
@@ -109,12 +105,6 @@ const removeFun = (index: number) => {
     display: flex;
     line-height: 18px;
     padding: 0 4px;
-    .file-icon {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      color: var(--el-text-color-secondary);
-    }
     .file-name {
       flex: 1;
       font-size: 14px;
@@ -123,6 +113,11 @@ const removeFun = (index: number) => {
       word-break: break-word;
       padding: 2px 4px;
     }
+    .img {
+      width: 20px;
+      height: 20px;
+      margin-right: 8px;
+    }
     .file-options {
       display: flex;
       align-items: center;

src/components/taskDetail/task3DModel.vue

@@ -19,7 +19,12 @@
             ></el-option>
           </el-select>
         </div> -->
-        <el-upload :show-file-list="false" :accept="accept" multiple :before-upload="beforeUploadFun">
+        <el-upload
+          :show-file-list="false"
+          :accept="accept"
+          multiple
+          :before-upload="beforeUploadFun"
+        >
           <el-button>上传文件</el-button>
         </el-upload>
         <el-button class="ml12" type="primary" @click="downLoadFun">下载文件</el-button>
@@ -37,7 +42,7 @@
       </template>
 
       <template #fileType="{ row }">
-        <fileTypeChange :id="row.id" v-model="row.fileType"></fileTypeChange>
+        <fileTypeChange :id="row.id" v-model="row.fileType" :disabled="disabled"></fileTypeChange>
       </template>
     </BaseTable>
 
@@ -77,6 +82,10 @@ const props = defineProps({
     type: Boolean,
     default: true,
   },
+  disabled: {
+    type: Boolean,
+    default: false,
+  },
 });
 
 // const env = import.meta.env;

src/components/taskDetail/taskInfo.vue

@@ -5,7 +5,8 @@
       :tableName="tableName"
       :colNum="2"
       :rule-data="ruleData"
-      showDisabled
+      :showDisabled="disabled"
+      :formAttrs="formAttrs"
     >
       <template #form-flowTemplate>
         <flowTemplateSelect v-model="selectedFlowTemplate" />
@@ -41,6 +42,14 @@ const props = defineProps({
   },
 });
 const tableFormRef = ref();
+const formAttrs = ref({
+  confidence: {
+    min: 0,
+    max: 1,
+    precision: 2,
+    step: 0.01,
+  },
+});
 
 const localDetail = ref<any>({});
 

src/views/index/approvalPreview/components/deliverableFile.vue

@@ -118,7 +118,7 @@ watch(
     difficult.value = approveContents?.difficult.toString();
     if (taskId.value) {
       nextTick(() => {
-        baseTableRef.value.resetFun();
+        baseTableRef.value?.resetFun();
       });
     }
   },

src/views/task/execution/components/runDetailPage/runPagecomponent/resultData.vue

@@ -904,7 +904,7 @@ const initProjectTaskAchievementStatistics = async ({
   titleList,
   key,
 }: any) => {
-  console.log('XData', XData);
+  // console.log('XData', XData);
   dom.commonChartRef.disposeEchartsByKey('chart-' + key);
   dom.commonChartRef.option = {
     title: {

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

@@ -57,6 +57,7 @@
         <task3DModel
           :task-id="currentTaskInfo?.uuid"
           :show-left-options="showLeftOptions"
+          :disabled="!showLeftOptions"
         ></task3DModel>
       </div>
       <div class="tabs-component" v-if="activeName === 'report'">
@@ -263,7 +264,7 @@ watch(
     if (newVal) {
       currentTaskInfo.value = newVal;
 
-      currentTaskInfo.value.achieveStatus = currentTaskInfo.value.achieveStatus.toString();
+      currentTaskInfo.value.achieveStatus = currentTaskInfo.value.achieveStatus?.toString();
       currentTaskInfo.value.expStatus = currentTaskInfo.value.expStatus ? '1' : '0';
     }
   },

src/views/task/projectDetail/components/statisticAnalysis.vue

@@ -324,7 +324,7 @@ const queryTaskCompletionByWorkspace = async () => {
     series: seriesData,
   };
   taskCompletionAtWorkstations.value = { ...option };
-  console.log('taskCompletionAtWorkstations.value', taskCompletionAtWorkstations.value);
+  // console.log('taskCompletionAtWorkstations.value', taskCompletionAtWorkstations.value);
 };
 // #endregion
 

src/views/task/projectDetail/components/taskDetail.vue

@@ -19,6 +19,7 @@
                 :task-id="currentTaskInfo?.uuid"
                 :task-info="currentTaskInfo"
                 :formAttrs="formAttrs"
+                :disabled="true"
               >
               </taskInfo>
             </div>
@@ -30,6 +31,7 @@
                 v-if="activeTab === 'model-3d'"
                 :task-id="currentTaskInfo?.uuid"
                 :show-left-options="showLeftOptions"
+                :disabled="true"
               ></task3DModel>
             </div>
           </el-tab-pane>