From fd5cce0ed93b61366b4bfe3307ee656527375431 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 28 Mar 2024 09:41:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=B1=95=E7=A4=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=A0=BC=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue                             | 5 +++--
 src/views/trials/trials-layout/components/trialsNavbar.vue   | 5 +++--
 .../setting/trial-config/components/processConfig.vue        | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 9ce11fc3..d8a1ad17 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -23,8 +23,9 @@
         <div style="margin-left:20px;">
           <el-dropdown class="dropdown-container" trigger="click">
             <span class="el-dropdown-link">
-              {{ name }}
-              <span v-if="userTypeShortName">({{ userTypeShortName }})</span>
+              {{ `${name} (${userTypeShortName})` }}
+              <!-- {{ name }}
+              <span v-if="userTypeShortName"> ({{ userTypeShortName }}) </span> -->
               <i class="el-icon-caret-bottom" />
             </span>
             <el-dropdown-menu slot="dropdown" class="user-dropdown">
diff --git a/src/views/trials/trials-layout/components/trialsNavbar.vue b/src/views/trials/trials-layout/components/trialsNavbar.vue
index f91dc235..f0654cac 100644
--- a/src/views/trials/trials-layout/components/trialsNavbar.vue
+++ b/src/views/trials/trials-layout/components/trialsNavbar.vue
@@ -40,8 +40,9 @@
         <el-submenu index="4" class="my_info">
           <span slot="title">
             <i class="el-icon-s-custom" />
-            <span>{{ userName }}</span>
-            <span v="userTypeShortName">({{ userTypeShortName }})</span>
+            {{ `${name} (${userTypeShortName})` }}
+            <!-- <span>{{ userName }}</span>
+            <span v="userTypeShortName">({{ userTypeShortName }})</span> -->
           </span>
           <!-- 账户信息 -->
           <el-menu-item v-if="!hasPermi(['role:air'])" index="4-2">{{ $t('trials:trials-myinfo:title:accountInfo') }}</el-menu-item>
diff --git a/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
index 34b98fff..270116a3 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
@@ -661,7 +661,7 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              {{ scope.row.TrialCriterionNameList.toString() }}
+              {{ scope.row.TrialCriterionNameList.join(', ') }}
             </template>
           </el-table-column>
           <!-- 模板名称 -->