From d0ff508c4f8b76b9507c66a418aeec0af6e96829 Mon Sep 17 00:00:00 2001
From: qiaoyu <815853552@qq.com>
Date: Thu, 19 Dec 2024 18:57:28 +0800
Subject: [PATCH] =?UTF-8?q?20241213:bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/app-select/index.vue           |  2 +-
 .../task-step/common/stepName/index.vue       |  3 ++-
 .../strategy/script-command-of-template.vue   |  8 +++---
 .../script-source-of-template.backup.vue      |  1 -
 src/domain/service/slurm.js                   | 27 +++++++++----------
 src/utils/assist/generator-default-value.js   |  8 ++++++
 .../common/render-task-step/index.vue         |  2 --
 .../task-step/components/exec-script.vue      |  3 ++-
 8 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/src/components/app-select/index.vue b/src/components/app-select/index.vue
index e21fdee..69f59d2 100644
--- a/src/components/app-select/index.vue
+++ b/src/components/app-select/index.vue
@@ -192,7 +192,7 @@ export default {
     fetchWholeAppList() {
       AppManageService.fetchWholeAppList()
         .then((data) => {
-          this.list = data.data.map(item => ({
+          this.list = data.data.filter(item=>item.scopeId!='9991001').map(item => ({
             ...item,
             ...getTransformInfo(item.name),
           }));
diff --git a/src/components/task-step/common/stepName/index.vue b/src/components/task-step/common/stepName/index.vue
index 7250701..5000f32 100644
--- a/src/components/task-step/common/stepName/index.vue
+++ b/src/components/task-step/common/stepName/index.vue
@@ -44,7 +44,8 @@
 </template>
 <script>
 import JbInput from '@components/jb-input';
-
+import { getUserInfor } from '@utils/assist';
+console.log(getUserInfor())
 import Tippy from 'bk-magic-vue/lib/utils/tippy';
 import I18n from '@/i18n';
 
diff --git a/src/components/task-step/script/strategy/script-command-of-template.vue b/src/components/task-step/script/strategy/script-command-of-template.vue
index e7e6e1d..93e312c 100644
--- a/src/components/task-step/script/strategy/script-command-of-template.vue
+++ b/src/components/task-step/script/strategy/script-command-of-template.vue
@@ -223,7 +223,7 @@
 </template>
 <script>
   import _ from 'lodash';
-
+  import { getUserInfor } from '@utils/assist';
   import PublicScriptManageService from '@service/public-script-manage';
   import ScriptManageService from '@service/script-manage';
   import SlurmJobService from '@service/slurm';
@@ -468,10 +468,10 @@
       initScriptSource() {
         // 如果是引用脚本，还需初始化引用类型
         this.referType = this.formData[this.scriptSourceField];
-
-        console.log('4、', this.formData);
+        const {scopeName:SN,username:UN}=getUserInfor();
         const { baseInfo, command } = this.formData;
-        const { scopeName, modelByUser, modelByName, timestamp } = baseInfo || {};
+
+        const { scopeName=SN, modelByUser=UN,} = baseInfo || {};
 
         this.workDirprefix = `${workDirName}${scopeName}/${modelByUser}/`;
         this.workDirShowVal = command.split(`${this.workDirprefix}`)[1];
diff --git a/src/components/task-step/script/strategy/script-source-of-template.backup.vue b/src/components/task-step/script/strategy/script-source-of-template.backup.vue
index 0d63276..e98a00a 100644
--- a/src/components/task-step/script/strategy/script-source-of-template.backup.vue
+++ b/src/components/task-step/script/strategy/script-source-of-template.backup.vue
@@ -239,7 +239,6 @@
 </template>
 <script>
   import _ from 'lodash';
-
   import PublicScriptManageService from '@service/public-script-manage';
   import ScriptManageService from '@service/script-manage';
   import SlurmJobService from '@service/slurm';
diff --git a/src/domain/service/slurm.js b/src/domain/service/slurm.js
index 9ef9dcc..cae8dba 100644
--- a/src/domain/service/slurm.js
+++ b/src/domain/service/slurm.js
@@ -1,32 +1,31 @@
 import Request from '@utils/request';
 
-const path = 'http://192.168.200.105:6688';
-const SLURMPATH = 'http://slurm.jianmucloud.com';
+const SLURMPATH  = 'http://slurm.jianmucloud.com';
 
 // Retrieve the list of partitions in the current Slurm platform
-export const getPartitions = (params = {}) => Request.get(`${path}/api/v1/slurm/partitions`, { params });
+export const getPartitions = (params = {}) => Request.get(`${SLURMPATH}/api/v1/slurm/partitions`, { params });
 // Retrieve the number of compute nodes in the cluster
-export const getNodes = (params = {}) => Request.get(`${path}/api/v1/slurm/${window.PROJECT_CONFIG.SCOPE_ID_NAME}/nodes/count`, { params });
+export const getNodes = (params = {}) => Request.get(`${SLURMPATH}/api/v1/slurm/${window.PROJECT_CONFIG.SCOPE_ID_NAME}/nodes/count`, { params });
 // Retrieve total and free CPUs from Slurm
-export const getCpuNums = (params = {}) => Request.get(`${path}/api/v1/slurm/${window.PROJECT_CONFIG.SCOPE_ID_NAME}/cpus`, { params });
+export const getCpuNums = (params = {}) => Request.get(`${SLURMPATH}/api/v1/slurm/${window.PROJECT_CONFIG.SCOPE_ID_NAME}/cpus`, { params });
 // Get the list of GPU types supported by the current Slurm platform
 export const getGpuNums = (params = {}) => {
-  // return Request.get(`${path}/api/v1/slurm/gpu/types`, { params });
+  // return Request.get(`${SLURMPATH}/api/v1/slurm/gpu/types`, { params });
 };
 // Get the list of GPU types supported by the current Slurm platform
-export const getGpuTypes = (params = {}) => Request.get(`${path}/api/v1/slurm/gpu/types`, { params });
+export const getGpuTypes = (params = {}) => Request.get(`${SLURMPATH}/api/v1/slurm/gpu/types`, { params });
 // 根据作业账户获取作业列表，支持分页功能
 // 全部
 export const getJobAllList = (params = {}) => {
   const { pageSize, current: page, orderBy, userName, orgName } = params;
-  return Request.get(`${path}/api/v1/slurm/db/jobs/all`, {
+  return Request.get(`${SLURMPATH}/api/v1/slurm/db/jobs/all`, {
     params: { pageSize, page, orderBy, userName, orgName },
   });
 };
 // 根据作业 ID 获取作业列表
 export const getJobById = (params = {}) => {
   const { pageSize, current: page, orderBy, id, userName, orgName } = params;
-  return Request.get(`${path}/api/v1/slurm/db/jobs/job_id/${id}`, {
+  return Request.get(`${SLURMPATH}/api/v1/slurm/db/jobs/job_id/${id}`, {
     params: { pageSize, page, orderBy, id, userName, orgName },
   });
 };
@@ -40,7 +39,7 @@ export const getJobByJobName = (params = {}) => {
     userName,
     orgName,
   } = params;
-  return Request.get(`${path}/api/v1/slurm/db/jobs/name/:name`, {
+  return Request.get(`${SLURMPATH}/api/v1/slurm/db/jobs/name/:name`, {
     params: { pageSize, page, orderBy, job_name, userName, orgName },
   });
 };
@@ -53,7 +52,7 @@ export const getAccountJobList = (params = {}) => {
     userName,
     orgName,
   } = params;
-  return Request.get(`${path}/api/v1/slurm/db/jobs/account/${account}`, {
+  return Request.get(`${SLURMPATH}/api/v1/slurm/db/jobs/account/${account}`, {
     params: { pageSize, page, orderBy, userName, orgName },
   });
 };
@@ -68,17 +67,17 @@ export const getAccountJobListBystate = (params = {}) => {
     orgName,
   } = params;
   return Request.get(
-    `${path}/api/v1/slurm/db/jobs/account/${account}/state/${state}`,
+    `${SLURMPATH}/api/v1/slurm/db/jobs/account/${account}/state/${state}`,
     {
       params: { pageSize, page, orderBy, userName, orgName },
     },
   );
 };
 // Cancel a job that is currently running in the Slurm queue
-export const handlerCancelJob = (params = {}) => Request.post(`${path}/api/v1/slurm/job/cancel`, { params });
+export const handlerCancelJob = (params = {}) => Request.post(`${SLURMPATH}/api/v1/slurm/job/cancel`, { params });
 
 //  1 获取 Slurm 服务器对应的 IP 接口
-export const getSlurmHostIp = (params = {}) => Request.get(`${SLURMPATH}/api/v1/slurm/host/ip`, { params });
+export const getSlurmHostIp = (params = {}) => Request.get(`${SLURMPATH  }/api/v1/slurm/host/ip`, { params });
 
 // 2 获取 Slurm 服务器对应的 AgentID 接口
 export const getWhiteIP = ipStr => Request.get(`/job-manage/web/whiteIP/list?ipStr=${ipStr}&pageSize=99&start=0&current=1`);
diff --git a/src/utils/assist/generator-default-value.js b/src/utils/assist/generator-default-value.js
index 6db07e8..9c2b8c9 100644
--- a/src/utils/assist/generator-default-value.js
+++ b/src/utils/assist/generator-default-value.js
@@ -63,9 +63,17 @@ export const genDefaultName = (prefixStr = "auto") => {
   }_${username}_${timestamp}`;
 };
 
+export const getUserInfor = () => {
+  const scopeName = `${window.PROJECT_CONFIG.SCOPE_ID_NAME}`;
+  const { username } = Object.freeze(
+    new UserModel({ username: Cookie.get("job_user") })
+  );
+  return { scopeName, username };
+};
 const replaceLastSegment = (string, newString) => {
   return string.replace(/_([^_]+)$/, `_${newString}`);
 };
+
 export const updateTimeStamp = (step = {}, stepNum = "") => {
   const stepN = stepNum == "" ? "" : `_${parseInt(stepNum) + 1}`;
   // analysisCommand, sTc
diff --git a/src/views/task-manage/common/render-task-step/index.vue b/src/views/task-manage/common/render-task-step/index.vue
index e9ae98b..a5ca024 100644
--- a/src/views/task-manage/common/render-task-step/index.vue
+++ b/src/views/task-manage/common/render-task-step/index.vue
@@ -233,8 +233,6 @@
 
   import TaskStepModel from '@model/task/task-step';
 
-  import { updateTimeStamp } from '@utils/assist';
-
   import JbSideslider from '@components/jb-sideslider';
 
   import I18n from '@/i18n';
diff --git a/src/views/task-manage/common/render-task-step/task-step/components/exec-script.vue b/src/views/task-manage/common/render-task-step/task-step/components/exec-script.vue
index 0e84b29..4abc37b 100644
--- a/src/views/task-manage/common/render-task-step/task-step/components/exec-script.vue
+++ b/src/views/task-manage/common/render-task-step/task-step/components/exec-script.vue
@@ -300,11 +300,12 @@
           scriptVersionId,
           scriptLanguage,
           executeTarget,
+          jobName
         } = this.formData;
 
         const result = {
           id,
-          name,
+          name:jobName,
           delete: this.formData.delete,
           type: 1,
           scriptStepInfo: {
-- 
Gitee