From 2b6e5a5e3d967fae15d9fdaccaeb154ae486ac1d Mon Sep 17 00:00:00 2001
From: flyhuang <flyhuang@webank.com>
Date: Tue, 10 Dec 2024 18:14:48 +0800
Subject: [PATCH] =?UTF-8?q?wepdr-web=20=E6=A8=A1=E5=9E=8B=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=88=9B=E5=BB=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wedpr-web/src/components/modelCard.vue        |   3 +
 wedpr-web/src/views/jobDetail/index.vue       | 475 +++++++++---------
 .../src/views/jobDetail/result/xgbResult.vue  |  33 +-
 .../src/views/leadMode/dataSelect/index.vue   |  15 +-
 .../src/views/leadMode/modelSelect/index.vue  |  15 +-
 .../src/views/modelServerCreate/index.vue     |  46 +-
 wedpr-web/src/views/pirServerCreate/index.vue |  82 ++-
 7 files changed, 393 insertions(+), 276 deletions(-)

diff --git a/wedpr-web/src/components/modelCard.vue b/wedpr-web/src/components/modelCard.vue
index 90bfbdbd..352106e9 100644
--- a/wedpr-web/src/components/modelCard.vue
+++ b/wedpr-web/src/components/modelCard.vue
@@ -15,6 +15,9 @@
         <li class="ell">
           标签字段： <span>{{ modelInfo.label_column }}</span>
         </li>
+        <li class="ell">
+          模型ID： <span>{{ modelInfo.id }}</span>
+        </li>
         <li class="ell">
           发起人： <span>{{ modelInfo.owner }}</span>
         </li>
diff --git a/wedpr-web/src/views/jobDetail/index.vue b/wedpr-web/src/views/jobDetail/index.vue
index e57940ca..b5e43031 100644
--- a/wedpr-web/src/views/jobDetail/index.vue
+++ b/wedpr-web/src/views/jobDetail/index.vue
@@ -1,8 +1,212 @@
 <template>
   <div class="group-manage">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane label="任务信息" name="jobInfo"> </el-tab-pane>
+      <el-tab-pane label="任务信息" name="jobInfo">
+        <div v-loading="loading" v-show="activeName === 'jobInfo'">
+          <div class="info-container">
+            <div class="whole">
+              <div class="half">
+                <span class="title">任务ID：</span>
+                <span class="info" :title="jobInfo.id"> {{ jobInfo.id }} </span>
+              </div>
+            </div>
+            <div class="whole" v-if="jobInfo.jobType === jobEnum.PIR">
+              <div class="half">
+                <span class="title">所选服务：</span>
+                <span class="info link" :title="jobInfo.serviceId" @click="goServiceDetail(jobInfo.serviceId, jobInfo.serviceType)"> {{ jobInfo.serviceId }} </span>
+              </div>
+            </div>
+            <div class="whole" v-if="jobInfo.jobType === jobEnum.PIR">
+              <div class="half">
+                <span class="title">数据集：</span>
+                <span class="info link" :title="jobInfo.datasetId" @click="goDatasetDetail(jobInfo.datasetId)"> {{ jobInfo.datasetId }} </span>
+              </div>
+            </div>
+            <div class="whole" v-if="jobInfo.jobType === jobEnum.PIR">
+              <div class="half">
+                <span class="title">查询类型：</span>
+                <span class="info" :title="searchTypeDesEnum[jobInfo.searchType]"> {{ searchTypeDesEnum[jobInfo.searchType] }} </span>
+              </div>
+            </div>
+            <div class="whole" v-if="jobInfo.jobType === jobEnum.PIR && jobInfo.searchType !== searchTypeEnum.SearchExist">
+              <div class="half">
+                <span class="title">查询字段：</span>
+                <span class="info" :title="jobInfo.queriedFields"> {{ jobInfo.queriedFields }} </span>
+              </div>
+            </div>
+            <div class="whole" v-if="jobInfo.jobType === jobEnum.PIR">
+              <div class="half">
+                <span class="title">查询字段值：</span>
+                <span class="info" :title="jobInfo.searchIdList"> {{ jobInfo.searchIdList }} </span>
+              </div>
+            </div>
+            <div class="whole" v-if="![jobEnum.PIR, jobEnum.PSI, jobEnum.MPC, jobEnum.SQL].includes(jobInfo.jobType)">
+              <div class="half">
+                <span class="title">标签提供方：</span>
+                <span class="info" :title="jobInfo.labelProvider"> {{ jobInfo.labelProvider }} </span>
+              </div>
+            </div>
+            <div class="whole" v-if="jobInfo.jobType !== jobEnum.PIR">
+              <div class="half">
+                <span class="title">参与方：</span>
+                <span class="info" :title="jobInfo.particapate"> {{ jobInfo.particapate }} </span>
+              </div>
+            </div>
+            <div class="whole" v-if="jobInfo.jobType !== jobEnum.PIR">
+              <div class="half">
+                <span class="title">结果接收方：</span>
+                <span class="info" :title="jobInfo.receiver"> {{ jobInfo.receiver || jobInfo.ownerAgency }} </span>
+              </div>
+            </div>
+            <div class="whole">
+              <div class="half">
+                <span class="title">创建时间：</span>
+                <span class="info" :title="jobInfo.createTime"> {{ jobInfo.createTime }} </span>
+              </div>
+            </div>
+            <div class="whole">
+              <div class="half">
+                <span class="title">算法模板：</span>
+                <span class="info" :title="jobInfo.jobType"> {{ jobInfo.jobType }} </span>
+              </div>
+            </div>
+            <div class="whole">
+              <div class="half">
+                <span class="title">任务状态：</span>
+                <span class="info" :title="jobInfo.status">
+                  <el-tag size="small" v-if="jobInfo.status === 'RunSuccess'" effect="dark" color="#52B81F">成功</el-tag>
+                  <el-tag size="small" v-else-if="jobInfo.status === 'RunFailed'" effect="dark" color="#FF4D4F">失败</el-tag>
+                  <el-tag size="small" v-else-if="jobInfo.status === 'Running'" effect="dark" color="#3071F2">运行中</el-tag>
+                  <el-tag size="small" v-else effect="dark" color="#3071F2">{{ jobStatusMap[jobInfo.status] }}</el-tag>
+                </span>
+              </div>
+            </div>
+            <div class="whole" v-if="jobInfo.status === 'RunFailed'">
+              <div class="half" style="width: 90%">
+                <span class="title">诊断信息：</span>
+                <span class="error-conatiner">
+                  {{ jobInfo.statusDetail }}
+                </span>
+              </div>
+            </div>
+
+            <div class="whole" v-if="false">
+              <div class="half">
+                <span class="title">运行进度：</span>
+                <span class="info" :title="jobInfo.projectDesc"> {{ jobInfo.projectDesc }} </span>
+              </div>
+            </div>
+            <div class="whole" v-if="false">
+              <div class="half">
+                <span class="title">链上存证：</span>
+                <span class="info" :title="jobInfo.projectDesc"> {{ jobInfo.projectDesc }} </span>
+              </div>
+            </div>
+          </div>
+          <div class="con" v-if="dataList.length">
+            <div class="title-radius">参与数据资源</div>
+            <div class="tableContent autoTableWrap">
+              <el-table size="small" :data="dataList" :border="true" class="table-wrap">
+                <el-table-column label="数据资源ID" prop="datasetId" />
+                <el-table-column label="数据资源名称" prop="datasetTitle" />
+                <el-table-column label="所属机构" prop="ownerAgencyName" />
+                <el-table-column label="所属用户" prop="ownerUserName" />
+                <el-table-column label="数据集字段" prop="datasetFields" show-overflow-tooltip />
+                <el-table-column label="创建时间" prop="createAt" />
+                <el-table-column label="操作">
+                  <template v-slot="scope">
+                    <el-button size="small" type="text" @click="getDetail(scope.row.datasetId)">查看详情</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </div>
+          <div class="con" v-if="jobEnum.MPC === jobInfo.jobType">
+            <div class="title-radius">Python语句</div>
+            <div class="modify-container" style="height: 300px">
+              <editorCom v-model="jobInfo.mpcContent" :readOnly="true" lang="python" />
+            </div>
+          </div>
+          <div class="con" v-if="jobEnum.SQL === jobInfo.jobType">
+            <div class="title-radius">SQL语句</div>
+            <div class="modify-container" style="height: 300px">
+              <editorCom v-model="jobInfo.sql" :readOnly="true" lang="sql" />
+            </div>
+          </div>
+          <div class="con" v-if="[jobEnum.LR_TRAINING, jobEnum.LR_PREDICTING, jobEnum.XGB_TRAINING, jobEnum.XGB_PREDICTING].includes(jobInfo.jobType)">
+            <div class="title-radius">配置信息</div>
+            <div class="tableContent autoTableWrap">
+              <el-table :max-height="300" size="small" :data="settingTableData" :border="true" class="table-wrap">
+                <el-table-column label="参数" prop="label" />
+                <el-table-column label="取值" prop="value" />
+              </el-table>
+            </div>
+          </div>
+          <div class="con" v-if="xgbJobSavedModelData.length || xgbJobOriginModelData.length">
+            <div class="title-radius">模型信息</div>
+            <div class="tableContent autoTableWrap">
+              <el-table v-if="xgbJobSavedModelData.length" size="small" :span-method="objectSpanMethodSaved" :data="xgbJobSavedModelData" :border="true" class="table-wrap">
+                <el-table-column label="模型名称" prop="modelName" />
+                <el-table-column label="所属机构" prop="modelAgency" />
+                <el-table-column label="所属用户" prop="modelOwner" />
+                <el-table-column label="模型任务来源" prop="jobID">
+                  <template v-slot="scope">
+                    <el-button @click="goJobDetail(scope.row.jobID)" size="small" type="text">{{ scope.row.jobID }}</el-button>
+                  </template>
+                </el-table-column>
+                <el-table-column label="标签提供方" prop="label_provider" />
+                <el-table-column label="标签字段" prop="label_column" />
+                <el-table-column label="参与机构" prop="agency" />
+                <el-table-column label="数据集字段" prop="fields" show-overflow-tooltip>
+                  <template v-slot="scope">
+                    {{ scope.row.fields.join(',') }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="操作">
+                  <template v-slot="scope">
+                    <el-button @click="copyModel(scope.row.modelString)" size="small" type="text">复制模型</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <el-table v-if="xgbJobOriginModelData.length" :span-method="objectSpanMethodOrigin" size="small" :data="xgbJobOriginModelData" :border="true" class="table-wrap">
+                <el-table-column label="模型类型" prop="model_type" />
+                <el-table-column label="标签提供方" prop="label_provider" />
+                <el-table-column label="标签字段" prop="label_column" />
+                <el-table-column label="参与机构" prop="agency" />
+                <el-table-column label="数据集字段" prop="fields" show-overflow-tooltip>
+                  <template v-slot="scope">
+                    {{ scope.row.fields.join(',') }}
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+            <div v-if="xgbJobOriginModelData.length">
+              <div style="margin-top: 20px; padding-bottom: 20px">
+                <el-button type="primary" @click="showSettingSaveModal"> 保存配置 </el-button>
+                <el-button type="primary" @click="showSettingSaveModelModal"> 保存模型 </el-button>
+                <el-button @click="reBuild"> 调参重跑 </el-button>
+              </div>
+              <div class="tips">* 保存配置：后续可选择基于该配置进行建模与调参重跑</div>
+              <div class="tips">* 保存模型：后续可选择基于该模型进行预测</div>
+            </div>
+          </div>
+          <div
+            v-if="
+              jobInfo.status === 'RunSuccess' &&
+              [jobEnum.PIR, jobEnum.PSI, jobEnum.MPC, jobEnum.SQL].includes(jobInfo.jobType) &&
+              jobInfo.owner === userId &&
+              jobInfo.ownerAgency === agencyId
+            "
+          >
+            <div class="title-radius">任务结果</div>
+            <div style="padding-left: 10px">
+              <baseResult :jobType="jobInfo.jobType" :jobID="jobID" :resultFileInfo="resultFileInfo" :jobStatusInfo="jobStatusInfo" />
+            </div>
+          </div>
+        </div>
+      </el-tab-pane>
       <el-tab-pane label="运行日志" name="log" v-if="[jobEnum.XGB_TRAINING, jobEnum.XGB_PREDICTING, jobEnum.LR_TRAINING, jobEnum.LR_PREDICTING].includes(jobInfo.jobType)">
+        <logComp :jobID="jobID" :jobType="jobInfo.jobType" />
       </el-tab-pane>
       <el-tab-pane
         label="查看结果"
@@ -13,220 +217,9 @@
           receiverList.includes(agencyId)
         "
       >
+        <xgbResult v-if="jobID" :jobID="jobID" :jobType="jobInfo.jobType" :jobStatusInfo="jobStatusInfo" :modelResultDetail="modelResultDetail" />
       </el-tab-pane>
     </el-tabs>
-    <div v-loading="loading" v-if="activeName === 'jobInfo'">
-      <div class="info-container">
-        <div class="whole">
-          <div class="half">
-            <span class="title">任务ID：</span>
-            <span class="info" :title="jobInfo.id"> {{ jobInfo.id }} </span>
-          </div>
-        </div>
-        <div class="whole" v-if="jobInfo.jobType === jobEnum.PIR">
-          <div class="half">
-            <span class="title">所选服务：</span>
-            <span class="info link" :title="jobInfo.serviceId" @click="goServiceDetail(jobInfo.serviceId, jobInfo.serviceType)"> {{ jobInfo.serviceId }} </span>
-          </div>
-        </div>
-        <div class="whole" v-if="jobInfo.jobType === jobEnum.PIR">
-          <div class="half">
-            <span class="title">数据集：</span>
-            <span class="info link" :title="jobInfo.datasetId" @click="goDatasetDetail(jobInfo.datasetId)"> {{ jobInfo.datasetId }} </span>
-          </div>
-        </div>
-        <div class="whole" v-if="jobInfo.jobType === jobEnum.PIR">
-          <div class="half">
-            <span class="title">查询类型：</span>
-            <span class="info" :title="searchTypeDesEnum[jobInfo.searchType]"> {{ searchTypeDesEnum[jobInfo.searchType] }} </span>
-          </div>
-        </div>
-        <div class="whole" v-if="jobInfo.jobType === jobEnum.PIR && jobInfo.searchType !== searchTypeEnum.SearchExist">
-          <div class="half">
-            <span class="title">查询字段：</span>
-            <span class="info" :title="jobInfo.queriedFields"> {{ jobInfo.queriedFields }} </span>
-          </div>
-        </div>
-        <div class="whole" v-if="jobInfo.jobType === jobEnum.PIR">
-          <div class="half">
-            <span class="title">查询字段值：</span>
-            <span class="info" :title="jobInfo.searchIdList"> {{ jobInfo.searchIdList }} </span>
-          </div>
-        </div>
-        <div class="whole" v-if="![jobEnum.PIR, jobEnum.PSI, jobEnum.MPC, jobEnum.SQL].includes(jobInfo.jobType)">
-          <div class="half">
-            <span class="title">标签提供方：</span>
-            <span class="info" :title="jobInfo.labelProvider"> {{ jobInfo.labelProvider }} </span>
-          </div>
-        </div>
-        <div class="whole" v-if="jobInfo.jobType !== jobEnum.PIR">
-          <div class="half">
-            <span class="title">参与方：</span>
-            <span class="info" :title="jobInfo.particapate"> {{ jobInfo.particapate }} </span>
-          </div>
-        </div>
-        <div class="whole" v-if="jobInfo.jobType !== jobEnum.PIR">
-          <div class="half">
-            <span class="title">结果接收方：</span>
-            <span class="info" :title="jobInfo.receiver"> {{ jobInfo.receiver || jobInfo.ownerAgency }} </span>
-          </div>
-        </div>
-        <div class="whole">
-          <div class="half">
-            <span class="title">创建时间：</span>
-            <span class="info" :title="jobInfo.createTime"> {{ jobInfo.createTime }} </span>
-          </div>
-        </div>
-        <div class="whole">
-          <div class="half">
-            <span class="title">算法模板：</span>
-            <span class="info" :title="jobInfo.jobType"> {{ jobInfo.jobType }} </span>
-          </div>
-        </div>
-        <div class="whole">
-          <div class="half">
-            <span class="title">任务状态：</span>
-            <span class="info" :title="jobInfo.status">
-              <el-tag size="small" v-if="jobInfo.status === 'RunSuccess'" effect="dark" color="#52B81F">成功</el-tag>
-              <el-tag size="small" v-else-if="jobInfo.status === 'RunFailed'" effect="dark" color="#FF4D4F">失败</el-tag>
-              <el-tag size="small" v-else-if="jobInfo.status === 'Running'" effect="dark" color="#3071F2">运行中</el-tag>
-              <el-tag size="small" v-else effect="dark" color="#3071F2">{{ jobStatusMap[jobInfo.status] }}</el-tag>
-            </span>
-          </div>
-        </div>
-        <div class="whole" v-if="jobInfo.status === 'RunFailed'">
-          <div class="half" style="width: 90%">
-            <span class="title">诊断信息：</span>
-            <span class="error-conatiner">
-              {{ jobInfo.statusDetail }}
-            </span>
-          </div>
-        </div>
-
-        <div class="whole" v-if="false">
-          <div class="half">
-            <span class="title">运行进度：</span>
-            <span class="info" :title="jobInfo.projectDesc"> {{ jobInfo.projectDesc }} </span>
-          </div>
-        </div>
-        <div class="whole" v-if="false">
-          <div class="half">
-            <span class="title">链上存证：</span>
-            <span class="info" :title="jobInfo.projectDesc"> {{ jobInfo.projectDesc }} </span>
-          </div>
-        </div>
-      </div>
-      <div class="con" v-if="dataList.length">
-        <div class="title-radius">参与数据资源</div>
-        <div class="tableContent autoTableWrap">
-          <el-table size="small" :data="dataList" :border="true" class="table-wrap">
-            <el-table-column label="数据资源ID" prop="datasetId" />
-            <el-table-column label="数据资源名称" prop="datasetTitle" />
-            <el-table-column label="所属机构" prop="ownerAgencyName" />
-            <el-table-column label="所属用户" prop="ownerUserName" />
-            <el-table-column label="数据集字段" prop="datasetFields" show-overflow-tooltip />
-            <el-table-column label="创建时间" prop="createAt" />
-            <el-table-column label="操作">
-              <template v-slot="scope">
-                <el-button size="small" type="text" @click="getDetail(scope.row.datasetId)">查看详情</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-      </div>
-      <div class="con" v-if="jobEnum.MPC === jobInfo.jobType">
-        <div class="title-radius">Python语句</div>
-        <div class="modify-container" style="height: 300px">
-          <editorCom v-model="jobInfo.mpcContent" :readOnly="true" lang="python" />
-        </div>
-      </div>
-      <div class="con" v-if="jobEnum.SQL === jobInfo.jobType">
-        <div class="title-radius">SQL语句</div>
-        <div class="modify-container" style="height: 300px">
-          <editorCom v-model="jobInfo.sql" :readOnly="true" lang="sql" />
-        </div>
-      </div>
-      <div class="con" v-if="[jobEnum.LR_TRAINING, jobEnum.LR_PREDICTING, jobEnum.XGB_TRAINING, jobEnum.XGB_PREDICTING].includes(jobInfo.jobType)">
-        <div class="title-radius">配置信息</div>
-        <div class="tableContent autoTableWrap">
-          <el-table :max-height="300" size="small" :data="settingTableData" :border="true" class="table-wrap">
-            <el-table-column label="参数" prop="label" />
-            <el-table-column label="取值" prop="value" />
-          </el-table>
-        </div>
-      </div>
-      <div class="con" v-if="xgbJobSavedModelData.length || xgbJobOriginModelData.length">
-        <div class="title-radius">模型信息</div>
-        <div class="tableContent autoTableWrap">
-          <el-table v-if="xgbJobSavedModelData.length" size="small" :span-method="objectSpanMethodSaved" :data="xgbJobSavedModelData" :border="true" class="table-wrap">
-            <el-table-column label="模型名称" prop="modelName" />
-            <el-table-column label="所属机构" prop="modelAgency" />
-            <el-table-column label="所属用户" prop="modelOwner" />
-            <el-table-column label="模型任务来源" prop="jobID">
-              <template v-slot="scope">
-                <el-button @click="goJobDetail(scope.row.jobID)" size="small" type="text">{{ scope.row.jobID }}</el-button>
-              </template>
-            </el-table-column>
-            <el-table-column label="标签提供方" prop="label_provider" />
-            <el-table-column label="标签字段" prop="label_column" />
-            <el-table-column label="参与机构" prop="agency" />
-            <el-table-column label="数据集字段" prop="fields" show-overflow-tooltip>
-              <template v-slot="scope">
-                {{ scope.row.fields.join(',') }}
-              </template>
-            </el-table-column>
-            <el-table-column label="操作">
-              <template v-slot="scope">
-                <el-button @click="copyModel(scope.row.modelString)" size="small" type="text">复制模型</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-          <el-table v-if="xgbJobOriginModelData.length" :span-method="objectSpanMethodOrigin" size="small" :data="xgbJobOriginModelData" :border="true" class="table-wrap">
-            <el-table-column label="模型类型" prop="model_type" />
-            <el-table-column label="标签提供方" prop="label_provider" />
-            <el-table-column label="标签字段" prop="label_column" />
-            <el-table-column label="参与机构" prop="agency" />
-            <el-table-column label="数据集字段" prop="fields" show-overflow-tooltip>
-              <template v-slot="scope">
-                {{ scope.row.fields.join(',') }}
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-        <div v-if="xgbJobOriginModelData.length">
-          <div style="margin-top: 20px; padding-bottom: 20px">
-            <el-button type="primary" @click="showSettingSaveModal"> 保存配置 </el-button>
-            <el-button type="primary" @click="showSettingSaveModelModal"> 保存模型 </el-button>
-            <el-button @click="reBuild"> 调参重跑 </el-button>
-          </div>
-          <div class="tips">* 保存配置：后续可选择基于该配置进行建模与调参重跑</div>
-          <div class="tips">* 保存模型：后续可选择基于该模型进行预测</div>
-        </div>
-      </div>
-      <div
-        v-if="
-          jobInfo.status === 'RunSuccess' &&
-          [jobEnum.PIR, jobEnum.PSI, jobEnum.MPC, jobEnum.SQL].includes(jobInfo.jobType) &&
-          jobInfo.owner === userId &&
-          jobInfo.ownerAgency === agencyId
-        "
-      >
-        <div class="title-radius">任务结果</div>
-        <div style="padding-left: 10px">
-          <baseResult :jobType="jobInfo.jobType" :jobID="jobID" :resultFileInfo="resultFileInfo" :jobStatusInfo="jobStatusInfo" />
-        </div>
-      </div>
-    </div>
-    <div v-if="activeName === 'log'">
-      <logComp :jobID="jobID" :jobType="jobInfo.jobType" />
-    </div>
-    <div v-if="activeName === 'result'">
-      <xgbResult
-        v-if="[jobEnum.LR_TRAINING, jobEnum.LR_PREDICTING, jobEnum.XGB_TRAINING, jobEnum.XGB_PREDICTING].includes(jobInfo.jobType)"
-        :jobID="jobID"
-        :jobType="jobInfo.jobType"
-      />
-    </div>
   </div>
 </template>
 <script>
@@ -316,8 +309,9 @@ export default {
     goDatasetDetail(datasetId) {
       this.$router.push({ path: '/dataDetail', query: { datasetId } })
     },
-    handleXgbJobSavedModelData(modelString) {
-      const { setting, name, agency, owner, ...rest } = JSON.parse(modelString)
+    handleXgbJobSavedModelData(modelString, job) {
+      const { setting, name, ...rest } = JSON.parse(modelString)
+      const { owner, ownerAgency } = job
       const settingData = JSON.parse(setting)
       const { participant_agency_list, ...restSetting } = settingData
       this.xgbJobSavedModelData = participant_agency_list.map((v) => {
@@ -326,7 +320,7 @@ export default {
           ...restSetting,
           ...v,
           modelName: name,
-          modelAgency: agency,
+          modelAgency: ownerAgency,
           modelOwner: owner,
           modelString
         }
@@ -360,25 +354,16 @@ export default {
       console.log(res)
       if (res.code === 0 && res.data) {
         const { job = {}, model, resultFileInfo } = res.data
-        const { parties = '', param } = job
+        const { param } = job
         const { jobStatusInfo = {} } = job
         this.jobInfo = { ...job }
-        console.log(JSON.parse(param), 'JSON.parse(param)')
-        const { dataSetList, modelPredictAlgorithm = '', modelSetting, serviceId, searchType, queriedFields, searchIdList, mpcContent, sql } = JSON.parse(param)
+        const { dataSetList, modelSetting, serviceId, searchType, queriedFields, searchIdList, mpcContent, sql } = JSON.parse(param)
         this.modelSetting = modelSetting
+        this.jobStatusInfo = jobStatusInfo
         // 展示建模和预测任务参数
         if (this.modelSetting) {
           this.handleSettingTableData(this.modelSetting)
         }
-        this.model = model
-        // 展示建模任务模型
-        if (model) {
-          this.handleXgbJobOriginModelData(model)
-        }
-        // 展示建模任务保存后的模型
-        if (modelPredictAlgorithm) {
-          this.handleXgbJobSavedModelData(modelPredictAlgorithm)
-        }
 
         // 获取任务关联数据集列表
         if (dataSetList && dataSetList.length) {
@@ -412,17 +397,41 @@ export default {
         if (sql) {
           this.jobInfo.sql = sql
         }
-        // pir psi sql mpc 直接展示任务结果
-        if (resultFileInfo) {
-          this.resultFileInfo = resultFileInfo
+        // 查询任务模型和结果
+        if (this.jobStatusInfo.status === 'RunSuccess' && this.receiverList.includes(this.agencyId)) {
+          if ([jobEnum.XGB_TRAINING, jobEnum.XGB_PREDICTING, jobEnum.LR_TRAINING, jobEnum.LR_PREDICTING].includes(this.jobInfo.jobType)) {
+            this.getJobResult()
+          } else {
+            // pir psi sql mpc 直接展示任务结果
+            if (resultFileInfo) {
+              this.resultFileInfo = resultFileInfo
+            }
+          }
         }
-        console.log(JSON.parse(parties), 'parties')
-        this.jobStatusInfo = jobStatusInfo
         this.startInterVal()
       } else {
         this.jobInfo = {}
       }
     },
+    async getJobResult() {
+      const { jobID } = this
+      const res = await jobManageServer.queryJobDetail({ jobID, fetchJobResult: true, fetchJobDetail: false })
+      if (res.code === 0 && res.data) {
+        const { modelResultDetail = {}, job = {}, model } = res.data
+        const { param = '{}' } = job
+        const { modelPredictAlgorithm = '' } = JSON.parse(param)
+        this.model = model
+        // 展示建模任务模型
+        if (model) {
+          this.handleXgbJobOriginModelData(model)
+        }
+        // 展示建模任务保存后的模型
+        if (modelPredictAlgorithm) {
+          this.handleXgbJobSavedModelData(modelPredictAlgorithm, job)
+        }
+        this.modelResultDetail = modelResultDetail
+      }
+    },
     startInterVal() {
       this.timer && clearInterval(this.timer)
       this.timer = setInterval(() => {
diff --git a/wedpr-web/src/views/jobDetail/result/xgbResult.vue b/wedpr-web/src/views/jobDetail/result/xgbResult.vue
index f3155eb4..53dc1ed3 100644
--- a/wedpr-web/src/views/jobDetail/result/xgbResult.vue
+++ b/wedpr-web/src/views/jobDetail/result/xgbResult.vue
@@ -229,7 +229,6 @@
 import { toDynamicTableData } from 'Utils/index.js'
 import { downloadLargeFile } from 'Mixin/downloadLargeFile.js'
 import { jobEnum } from 'Utils/constant.js'
-import { jobManageServer } from 'Api'
 export default {
   name: 'AiResultNew',
   mixins: [downloadLargeFile],
@@ -245,6 +244,14 @@ export default {
       default: () => {
         return ''
       }
+    },
+    modelResultDetail: {
+      type: Object,
+      default: () => {}
+    },
+    jobStatusInfo: {
+      type: Object,
+      default: () => {}
     }
   },
   data() {
@@ -270,34 +277,18 @@ export default {
       FEPreviewData: null,
       PRPreviewTableData: null,
       resultLink: {},
-      jobEnum,
-      jobStatusInfo: {},
-      loading: false
+      jobEnum
     }
   },
   watch: {
-    jobID() {
-      this.getJobResult()
+    modelResultDetail() {
+      this.handleResult()
     }
   },
   created() {
-    this.getJobResult()
+    this.handleResult()
   },
   methods: {
-    async getJobResult() {
-      const { jobID } = this
-      this.loading = true
-      const res = await jobManageServer.queryJobDetail({ jobID, fetchJobResult: true, fetchJobDetail: false })
-      if (res.code === 0 && res.data) {
-        const { modelResultDetail = {}, resultFileInfo, job = {} } = res.data
-        const { jobStatusInfo = {} } = job
-        this.modelResultDetail = modelResultDetail
-        this.resultFileInfo = resultFileInfo
-        this.jobStatusInfo = jobStatusInfo
-        this.handleResult()
-      }
-      this.loading = false
-    },
     downloadResult(path, fileName) {
       path && this.downloadLargeFile({ filePath: path }, fileName)
     },
diff --git a/wedpr-web/src/views/leadMode/dataSelect/index.vue b/wedpr-web/src/views/leadMode/dataSelect/index.vue
index 26ab9f30..cdc26c2e 100644
--- a/wedpr-web/src/views/leadMode/dataSelect/index.vue
+++ b/wedpr-web/src/views/leadMode/dataSelect/index.vue
@@ -86,14 +86,16 @@ export default {
       searchForm: {
         datasetTitle: '',
         ownerUserName: '',
-        tag: '',
-        createTime: ''
+        dataSourceType: '',
+        createTime: '',
+        datasetId: ''
       },
       searchQuery: {
         datasetTitle: '',
         ownerUserName: '',
-        tag: '',
-        createTime: ''
+        dataSourceType: '',
+        createTime: '',
+        datasetId: ''
       },
       formLabelWidth: '112px',
       loadingFlag: false,
@@ -220,3 +222,8 @@ export default {
   }
 }
 </style>
+<style lang="less">
+.el-select-dropdown {
+  z-index: 2100 !important;
+}
+</style>
diff --git a/wedpr-web/src/views/leadMode/modelSelect/index.vue b/wedpr-web/src/views/leadMode/modelSelect/index.vue
index a072a14d..9bfe6aca 100644
--- a/wedpr-web/src/views/leadMode/modelSelect/index.vue
+++ b/wedpr-web/src/views/leadMode/modelSelect/index.vue
@@ -2,10 +2,10 @@
   <div class="record">
     <div class="form-search">
       <el-form :inline="true" @submit="queryHandle" :model="searchForm" ref="searchForm" size="small">
-        <el-form-item prop="serviceName" label="模型名称：">
+        <el-form-item prop="name" label="模型名称：">
           <el-input clearable style="width: 180px" v-model="searchForm.name" placeholder="请输入"> </el-input>
         </el-form-item>
-        <el-form-item prop="serviceId" label="模型ID：">
+        <el-form-item prop="id" label="模型ID：">
           <el-input style="width: 180px" v-model="searchForm.id" placeholder="请输入" clearable> </el-input>
         </el-form-item>
         <el-form-item>
@@ -18,7 +18,7 @@
         </el-form-item>
       </el-form>
     </div>
-    <div class="card-container" v-if="modelTableData.length">
+    <div class="card-container" v-if="modelTableData.length" v-loading="queryFlag">
       <modelCard
         v-for="item in modelTableData"
         :selected="selectedId === item.id"
@@ -77,7 +77,7 @@ export default {
   },
   data() {
     return {
-      loadingFlag: false,
+      queryFlag: false,
       pageData: { page_offset: 1, page_size: 8 },
       modelTableData: [],
       searchForm: {
@@ -104,6 +104,9 @@ export default {
     ...mapGetters(['userId', 'agencyId'])
   },
   methods: {
+    reset() {
+      this.$refs.searchForm.resetFields()
+    },
     hanleSelectedModel(selected, item) {
       this.selectedId = selected ? item.id : ''
       if (selected) {
@@ -125,7 +128,7 @@ export default {
       const { id = '', name = '' } = this.searchQuery
       const searchParams = handleParamsValid({ id, name })
       const params = { pageNum: page_offset, pageSize: page_size }
-      this.loadingFlag = true
+      this.queryFlag = true
       const condition = {
         id: '',
         name: '',
@@ -143,7 +146,7 @@ export default {
         ...params,
         condition
       })
-      this.loadingFlag = false
+      this.queryFlag = false
       console.log(res)
       if (res.code === 0 && res.data) {
         const { dataList, total } = res.data
diff --git a/wedpr-web/src/views/modelServerCreate/index.vue b/wedpr-web/src/views/modelServerCreate/index.vue
index 466fd560..71833f53 100644
--- a/wedpr-web/src/views/modelServerCreate/index.vue
+++ b/wedpr-web/src/views/modelServerCreate/index.vue
@@ -14,6 +14,13 @@
           <modelSelect :queriedTypes="['XGB_MODEL_SETTING', 'LR_MODEL_SETTING']" v-model="serverForm.serviceConfig" />
         </el-form-item>
       </formCard>
+      <formCard title="设置访问凭证">
+        <el-form-item label-width="108px" label="访问凭证：" prop="grantedAccessKeyList">
+          <el-select style="width: 480px" multiple v-model="serverForm.grantedAccessKeyList" placeholder="请选择" clearable>
+            <el-option :title="item.value" :label="item.label" :value="item.value" :key="item" v-for="item in accessKeyList"></el-option>
+          </el-select>
+        </el-form-item>
+      </formCard>
     </el-form>
     <div>
       <el-button size="medium" type="primary" @click="checkService" v-if="type === 'edit'"> 编辑服务 </el-button>
@@ -23,7 +30,7 @@
 </template>
 <script>
 import { tableHeightHandle } from 'Mixin/tableHeightHandle.js'
-import { serviceManageServer } from 'Api'
+import { serviceManageServer, accessKeyManageServer } from 'Api'
 import { mapGetters } from 'vuex'
 import modelSelect from '../leadMode/modelSelect/index.vue'
 import { serviceTypeEnum } from 'Utils/constant.js'
@@ -38,7 +45,8 @@ export default {
       serverForm: {
         serviceName: '',
         serviceDesc: '',
-        serviceConfig: ''
+        serviceConfig: '',
+        grantedAccessKeyList: []
       },
       pageData: {
         page_offset: 1,
@@ -51,13 +59,15 @@ export default {
       type: '',
       dataList: [],
       selectedData: {},
-      serviceId: ''
+      serviceId: '',
+      accessKeyList: []
     }
   },
 
   created() {
     const { type, serviceId } = this.$route.query
     this.type = type
+    this.queryAccessKeyList()
     if (this.type === 'edit') {
       this.serviceId = serviceId
       this.queryService()
@@ -81,6 +91,13 @@ export default {
             trigger: 'blur'
           }
         ],
+        grantedAccessKeyList: [
+          {
+            required: true,
+            message: '请选择访问凭证',
+            trigger: 'blur'
+          }
+        ],
         serviceConfig: [
           {
             required: true,
@@ -92,6 +109,21 @@ export default {
     }
   },
   methods: {
+    // 获取ak列表
+    async queryAccessKeyList() {
+      const params = { condition: { status: 'Enable', id: '' }, pageNum: -1, pageSize: 1 }
+      const res = await accessKeyManageServer.queryAccessKeyList(params)
+      console.log(res)
+      if (res.code === 0 && res.data) {
+        const { credentials = [] } = res.data
+        this.accessKeyList = credentials.map((v) => {
+          return {
+            label: v.desc + '-' + v.accessKeyID,
+            value: v.accessKeyID
+          }
+        })
+      }
+    },
     // 获取服务详情回显
     async queryService() {
       this.loadingFlag = true
@@ -127,7 +159,7 @@ export default {
     checkService() {
       this.$refs.serverForm.validate((valid) => {
         if (valid) {
-          const { serviceName, serviceDesc, serviceConfig } = this.serverForm
+          const { serviceName, serviceDesc, serviceConfig, grantedAccessKeyList } = this.serverForm
           let setting = ''
           if (this.type === 'edit') {
             setting = serviceConfig
@@ -135,11 +167,11 @@ export default {
             setting = serviceConfig.setting
           }
           const { model_type } = JSON.parse(setting)
-          const serviceType = model_type === 'xgb_model' ? serviceTypeEnum.XGB : serviceTypeEnum.LR
+          const serviceType = model_type === 'lr_model' ? serviceTypeEnum.LR : serviceTypeEnum.XGB
           if (this.type === 'edit') {
-            this.updateService({ serviceName, serviceDesc, serviceId: this.serviceId, serviceConfig: setting, serviceType })
+            this.updateService({ serviceName, serviceDesc, serviceId: this.serviceId, serviceConfig: setting, serviceType, grantedAccessKeyList })
           } else {
-            this.createService({ serviceName, serviceDesc, serviceType, serviceConfig: setting })
+            this.createService({ serviceName, serviceDesc, serviceType, serviceConfig: setting, grantedAccessKeyList })
           }
         } else {
           return false
diff --git a/wedpr-web/src/views/pirServerCreate/index.vue b/wedpr-web/src/views/pirServerCreate/index.vue
index f3a6426d..ba0c0f77 100644
--- a/wedpr-web/src/views/pirServerCreate/index.vue
+++ b/wedpr-web/src/views/pirServerCreate/index.vue
@@ -10,6 +10,38 @@
         </el-form-item>
       </formCard>
       <formCard title="选择发布数据" v-if="type !== 'edit'">
+        <el-form :inline="true" @submit="queryHandle" :model="searchForm" ref="searchForm" size="small">
+          <el-form-item prop="datasetTitle" label="资源名称：">
+            <el-input style="width: 160px" v-model="searchForm.datasetTitle" placeholder="请输入"> </el-input>
+          </el-form-item>
+          <el-form-item prop="dataSourceType" label="数据类型：">
+            <el-select clearable size="small" style="width: 120px" v-model="searchForm.dataSourceType" placeholder="请选择">
+              <el-option :key="item" v-for="item in typeList" :label="item.label" :value="item.value"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item prop="datasetId" label="数据集ID：">
+            <el-input clearable style="width: 160px" v-model="searchForm.datasetId" placeholder="请输入"> </el-input>
+          </el-form-item>
+          <el-form-item prop="createTime" label="创建时间：">
+            <el-date-picker
+              style="width: 360px"
+              value-format="yyyy-MM-dd"
+              v-model="searchForm.createTime"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" :loading="loadingFlag" @click="queryHandle">
+              {{ queryFlag ? '查询中...' : '查询' }}
+            </el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="default" :loading="loadingFlag" @click="reset"> 重置 </el-button>
+          </el-form-item>
+        </el-form>
         <div class="card-container">
           <dataCard
             @selected="(checked) => selected(checked, item)"
@@ -21,6 +53,9 @@
             :key="item.datasetId"
           />
         </div>
+        <el-empty v-if="!total" :image-size="120" description="暂无数据">
+          <img slot="image" src="~Assets/images/pic_empty_news.png" alt="" />
+        </el-empty>
         <we-pagination
           :pageSizesOption="[8, 12, 16, 24, 32]"
           :total="total"
@@ -73,8 +108,10 @@
 import { tableHeightHandle } from 'Mixin/tableHeightHandle.js'
 import dataCard from '@/components/dataCard.vue'
 import { serviceManageServer, dataManageServer, accessKeyManageServer } from 'Api'
-import { searchTypeEnum, serviceTypeEnum } from 'Utils/constant.js'
+import { searchTypeEnum, serviceTypeEnum, dataStatusEnum } from 'Utils/constant.js'
 import { mapGetters } from 'vuex'
+import { handleParamsValid } from 'Utils/index.js'
+
 export default {
   name: 'pirServerCreate',
   mixins: [tableHeightHandle],
@@ -92,6 +129,18 @@ export default {
         accessibleValueQueryFields: [],
         grantedAccessKeyList: []
       },
+      searchForm: {
+        datasetTitle: '',
+        dataSourceType: '',
+        createTime: '',
+        datasetId: ''
+      },
+      searchQuery: {
+        datasetTitle: '',
+        dataSourceType: '',
+        createTime: '',
+        datasetId: ''
+      },
       pageData: {
         page_offset: 1,
         page_size: 8
@@ -109,7 +158,8 @@ export default {
       accessKeyList: [],
       selectedData: {},
       serviceId: '',
-      searchTypeEnum
+      searchTypeEnum,
+      typeList: []
     }
   },
 
@@ -122,6 +172,7 @@ export default {
       this.serviceId = serviceId
       this.queryService()
     } else {
+      this.getDataUploadType()
       this.getListDataset()
     }
   },
@@ -182,6 +233,22 @@ export default {
     }
   },
   methods: {
+    reset() {
+      this.$refs.searchForm.resetFields()
+    },
+    // 查询
+    queryHandle() {
+      this.searchQuery = { ...this.searchForm }
+      this.pageData.page_offset = 1
+      this.getListDataset()
+    },
+    async getDataUploadType() {
+      const res = await dataManageServer.getDataUploadType()
+      console.log(res)
+      if (res.code === 0 && res.data) {
+        this.typeList = res.data
+      }
+    },
     // 获取服务详情回显
     async queryService() {
       this.loadingFlag = true
@@ -297,10 +364,16 @@ export default {
     },
     async getListDataset() {
       const { page_offset, page_size } = this.pageData
+      const { ownerUserName = '', datasetTitle = '', createTime = '', dataSourceType = '', datasetId = '' } = this.searchQuery
+      const params = handleParamsValid({ ownerUserName, datasetTitle, dataSourceType, datasetId })
+      if (createTime && createTime.length) {
+        params.startTime = createTime[0]
+        params.endTime = createTime[1]
+      }
       // 仅选择自己的数据
-      const params = { pageNum: page_offset, pageSize: page_size, ownerUserName: this.userId, permissionType: 'usable' }
+      const dataParams = { pageNum: page_offset, pageSize: page_size, ...params, ownerUserName: this.userId, permissionType: 'usable', status: dataStatusEnum.Success }
       this.loadingFlag = true
-      const res = await dataManageServer.listDataset(params)
+      const res = await dataManageServer.listDataset(dataParams)
       this.loadingFlag = false
       console.log(res)
       if (res.code === 0 && res.data) {
@@ -312,7 +385,6 @@ export default {
             isOwner: v.ownerAgencyName === this.agencyId && v.ownerUserName === this.userId
           }
         })
-        console.log(content, 'content', totalCount)
         this.total = totalCount
       } else {
         this.dataList = []