Merge branch 'hotfix' of http://192.168.65.198:3000/Front_Team/SPDM into hotfix

src/components/taskDetail/taskReport.vue

@@ -10,7 +10,7 @@
         :actionList="actionList"
       >
         <template v-if="showLeftOptions" #leftOptions>
-          <el-button v-if="canUpdate" @click="reportInpDiaShow = true">编辑报告</el-button>
+          <!-- <el-button v-if="canUpdate" @click="reportInpDiaShow = true">编辑报告</el-button> -->
           <AddFile
             :accept="accept"
             ref="AddFileRef"

src/tenants/lyric/views/project/workspaceTime.vue

@@ -241,7 +241,7 @@ const updateSingleWorkspaceTimeFun = async (row: any, propertyName: string) => {
 
     if (res && res.code === 200) {
       ElMessage.success(t('通用.操作成功'));
-      baseTableRef.value?.resetFun();
+      // baseTableRef.value?.resetFun();
     }
   } catch (error) {
     console.error('更新失败', error);

src/views/data/storage/components/storageSettings/index.vue

@@ -63,6 +63,7 @@
             v-model="editform.quotaValue"
             type="number"
             :min="0"
+            :max="999999"
             @keydown="handleKeydown"
           ></el-input>
           <el-select class="w80" v-model="editform.quotaUnit">
@@ -106,6 +107,15 @@ const handleKeydown = (e: KeyboardEvent) => {
   if (e.key === '.' || e.key === '-' || e.key === 'e' || e.key === 'E') {
     e.preventDefault();
   }
+  // 获取当前输入值
+  const currentValue = editform.value.quotaValue;
+  const nextValue = currentValue + e.key;
+
+  // 如果输入会导致数值超过999999，则阻止输入
+  if (nextValue && Number(nextValue) > 999999) {
+    e.preventDefault();
+    ElMessage.warning('输入值不能超过999999');
+  }
 };
 
 const baseTableRef = ref();

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

@@ -399,7 +399,7 @@ const changeCurrentFlowNodeFun = (info: any) => {
 
   flowNode.value = node;
   flowNodeData.value = data;
-  flowNodeData.value.copyNodeStatus = data.nodeStatus;
+  flowNodeData.value.copyNodeStatus = data?.nodeStatus;
   // nodeParamDataList.value = flowNode.value?.store?.data?.data?.pageConfigList || [];
   nodeParamDataList.value = cloneDeep(pageParamInfo.value[data.nodeName]) || [];
   flowNodeParamData.value = flowNode.value?.store?.data?.data || {};

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

@@ -171,6 +171,8 @@ import {
 import { useI18n } from 'vue-i18n';
 import { updateTaskStatusApi } from '@/api/project/task';
 import { FILE_TYPE } from '@/utils/enum/file';
+import { TASK_PROCESS_STATUS } from '@/utils/enum/task';
+import { enableConfigByTenant, TENANT_ENUM } from '@/tenants/tenant';
 
 const env = import.meta.env;
 
@@ -473,7 +475,9 @@ const submitFun = async () => {
       }
 
       if (props.taskInfo.exeStatus != 8) {
-        await updateTaskExeStatusFun();
+        if (enableConfigByTenant([TENANT_ENUM.LYRIC])) {
+          await updateTaskExeStatusFun();
+        }
       }
       closeFun();
     }
@@ -495,7 +499,7 @@ const updateTaskExeStatusFun = async () => {
     taskIds: [props.taskInfo.uuid],
     req: {
       // ...task,
-      exeStatus: '8',
+      exeStatus: TASK_PROCESS_STATUS.CLOSED_LOOP,
     },
   };