XCKJ
/
irc_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main
continuous-integration/drone/push Build is passing Details

uat_us
caiyiling 2025-01-09 16:21:59 +08:00
parent 0a671fb330 febdfd7b4f
commit c309410c04
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/trials/trials-myinfo/index.vue
View File

@ -37,7 +37,7 @@
:IsCanConnectInternet="IsCanConnectInternet" :IsCanConnectInternet="IsCanConnectInternet"
v-if="activeIndex === '2'" 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>
</div> </div>
</template> </template>
@ -64,7 +64,7 @@ export default {
} }
}, },
computed: { computed: {
...mapGetters(['userId', 'userName']), ...mapGetters(['identityUserId', 'userName']),
}, },
mounted() { mounted() {
this.getUserInfo() this.getUserInfo()

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

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