Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main

src/views/trials/trials-myinfo/index.vue

@@ -37,7 +37,7 @@
         :IsCanConnectInternet="IsCanConnectInternet"
         v-if="activeIndex === '2'"
       />
-      <login-log v-if="activeIndex === '3'" :id="userId" :isMine="true" />
+      <login-log v-if="activeIndex === '3'" :id="identityUserId" :isMine="true" />
     </div>
   </div>
 </template>
@@ -64,7 +64,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['userId', 'userName']),
+    ...mapGetters(['identityUserId', 'userName']),
   },
   mounted() {
     this.getUserInfo()

src/views/trials/trials-panel/trial-summary/login-log/index.vue

@@ -311,7 +311,7 @@ export default {
       this.loading = true
       this.searchData.TrialId = this.$route.query.trialId
       if (this.isMine) {
-        this.searchData.UserId = this.id
+        this.searchData.IdentityUserId = this.id
       }
       getUserLogList(this.searchData)
         .then((res) => {