Merge branch 'develop' of https://github.com/hamster-shared/hamster-f…

…rontend into develop
hamster-shared · Nov 7, 2023 · f30240f · f30240f
2 parents 8771113 + 8d2ef95
commit f30240f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/src/apis/contractOrchestrationDeploy.ts b/src/apis/contractOrchestrationDeploy.ts
@@ -28,6 +28,11 @@ interface SingleContractInfo {
   originalArrange: any
 }
 
+interface getSingleContractArrange extends projectParmams{
+  contractId: string,
+  contractName: string
+}
+
 // interface pageList {
 //     page:number;
 //     size:number;
@@ -129,10 +134,11 @@ export function apiSaveSingleContractInfo(id: string, params: SingleContractInfo
 }
 
 // 获取单个合约的最新编排信息
-export function apiGetSingleContractInfo(id: string, projectId: string, contractId: number, contractName: string, version: string) {
+export function apiGetSingleContractInfo(id: string, params: getSingleContractArrange) {
   return httpRequest({
-    url: `/api/projects/${id}/arrange/contract/name?projectId=${projectId}&contractId=${contractId}&contractName=${contractName}&version=${version}`,
-    method: "get",
+    url: `/api/projects/${id}/arrange/contract/name`,
+    data: params,
+    method: "post",
   })
 }
 

diff --git a/src/views/projects/projectsDeploymentOrchestration/components/DeploymentOrder.vue b/src/views/projects/projectsDeploymentOrchestration/components/DeploymentOrder.vue
@@ -127,6 +127,7 @@ const deployBtn = async(item: any) => {
   dataList.value.splice(index, 1);
   duplicateDataList.value.push(item);
   await getUseAndNotContractArr()
+  emit('getProjectsContractName')
 }
 
 // copy 一份

diff --git a/src/views/projects/projectsDeploymentOrchestration/index.vue b/src/views/projects/projectsDeploymentOrchestration/index.vue
@@ -532,13 +532,13 @@ const getSingleContractInfo = async () => {
   contractSingileInfo.value = {}; //清空合同信息
   try {
     let param = {
-      id: route.query.id,
+      // id: route.query.id,
       projectId: route.query.id,
       contractId: Number(selectedId.value),
       contractName: selectedName.value,
       version: baseInfo.value.selectedVersion
     }
-    const { data } = await apiGetSingleContractInfo(param.id, param.projectId, param.contractId, param.contractName, param.version);
+    const { data } = await apiGetSingleContractInfo(route.query.id, param);
     if (data != null && data != "") {
       contractSingileInfo.value = JSON.parse(data);
       //拆分保存的合约信息