ASW-160 fix: pcap列表页面upload by列显示错误

3 files changed, 20 insertions, 12 deletions

diff --git a/src/axios/api/pcap.js b/src/axios/api/pcap.js
index e170a11..cd4def7 100644
--- a/src/axios/api/pcap.js
+++ b/src/axios/api/pcap.js
@@ -1,10 +1,10 @@
 import axiosInstance from '@/axios/index.js';
 
 // pcap列表
-export const pcapListApi = async (data) => {
+export const pcapListApi = async (workspaceId, data) => {
   try {
     const res = await axiosInstance({
-      url: '/api/v1/pcap',
+      url: `/api/v1/workspace/${workspaceId}/pcap`,
       method: 'GET',
       params: data,
     });
diff --git a/src/views/applications/mergeDetail.vue b/src/views/applications/mergeDetail.vue
index a3c56f4..0dc27f5 100644
--- a/src/views/applications/mergeDetail.vue
+++ b/src/views/applications/mergeDetail.vue
@@ -174,6 +174,9 @@ const merge = async (action) => {
     backMergeRequest();
     ElMessage.success(t('message.save_success'));
   } else {
+    getData();
+    getCommits();
+    getDiff();
     ElMessage.error(res.msg || res.error);
   }
   merging.value = false;
diff --git a/src/views/pcaps/index.vue b/src/views/pcaps/index.vue
index 84850c3..67e5bfb 100644
--- a/src/views/pcaps/index.vue
+++ b/src/views/pcaps/index.vue
@@ -70,10 +70,13 @@
               </div>
               <div v-has="'pacp_analyze'">
                 <el-dropdown-item
-                        :disabled="sessionStatisticsDisabled"
-                        @click="sessionStatistics(tableSelect)"
+                  :disabled="sessionStatisticsDisabled"
+                  @click="sessionStatistics(tableSelect)"
                 >
-                  <i class="asw-icon icon-a-SessionStatistics" style="width: 18px"></i>
+                  <i
+                    class="asw-icon icon-a-SessionStatistics"
+                    style="width: 18px"
+                  ></i>
                   <span>{{ t('pcap.session_statistics') }}</span>
                 </el-dropdown-item>
               </div>
@@ -163,6 +166,9 @@
                 <span>{{ t('overall.parsed_error') }}</span>
               </template>
             </template>
+            <template v-else-if="item.prop === 'createUser'">
+              {{ get(scope.row, 'createUser.name', '-') || '-' }}
+            </template>
             <template v-else-if="item.prop === 'createTimestamp'">
               {{
                 moment(scope.row.createTimestamp).format('YYYY-MM-DD HH:mm:ss')
@@ -234,12 +240,12 @@
                   </div>
                   <div v-has="'pacp_analyze'">
                     <el-dropdown-item
-                            :disabled="scope.row.status != 'Indexed'"
-                            @click="sessionStatistics([scope.row])"
+                      :disabled="scope.row.status != 'Indexed'"
+                      @click="sessionStatistics([scope.row])"
                     >
                       <i
-                              class="asw-icon icon-a-SessionStatistics"
-                              style="width: 18px"
+                        class="asw-icon icon-a-SessionStatistics"
+                        style="width: 18px"
                       ></i>
                       <span>{{ t('pcap.session_statistics') }}</span>
                     </el-dropdown-item>
@@ -535,7 +541,7 @@ const tableTitle = ref([
   },
   {
     minWidth: 150,
-    prop: 'createUserId',
+    prop: 'createUser',
     label: t('overall.upload_by'),
     sortable: 'custom',
   },
@@ -580,9 +586,8 @@ const fetchList = async (reset = true) => {
     current: paginat.current,
     size: paginat.size,
     orderBy: orderBy.value,
-    workspaceId: workspace.value.id,
   };
-  const res = await pcapListApi(params);
+  const res = await pcapListApi(workspace.value.id, params);
   if (res.code == 200) {
     const records = get(res, 'data.records', []);
     if (reset) {