From 195beac1c7d16783f67caf8d922fb2c373639cad Mon Sep 17 00:00:00 2001 From: feige <feige@qq.com> Date: 星期一, 23 九月 2024 14:51:00 +0800 Subject: [PATCH] 修改了打不开详细页面 --- ruoyi-ui/src/views/collection/index.vue | 58 ++++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 36 insertions(+), 22 deletions(-) diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue index 760c740..4560e30 100644 --- a/ruoyi-ui/src/views/collection/index.vue +++ b/ruoyi-ui/src/views/collection/index.vue @@ -626,10 +626,11 @@ } from "@/api/collection/index"; import {listUserAll} from "@/api/root/index"; import {Message} from "element-ui"; - +import {showShareUser} from "@/api/bignote/index"; +import {getAllInfo} from "@/api/system/user" export default { - name: "index", + name: "ZfCollection", dicts: ['sys_normal_disable'], data() { return { @@ -935,26 +936,39 @@ return row.id }, getList1() { - this.loading1 = true; - this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0] - this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1] - this.queryParams.clanId = this.$store.state.user.clanId - listUserAll(this.queryParams1).then(response => { - this.listRoot = response.data.data; - const kon = {} - this.listRoot.forEach(element => { - kon[element['nickName']] = element['userId'] - }) - for(let i in kon){ - this.userOptions.push({label: i,value: kon[i]}) - } - for(let i in this.userOptions){ - this.userList.push(this.userOptions[i].value) - } - console.log(this.userList,'userListuserListuserList') - this.loading1 = false; - } - ); + let userId = this.$store.state.user.userId + + + showShareUser(userId, 2018).then(response=>{ + console.log("===========ddddddddddddd") + console.log(response.data) + console.log("--------------------") + response.data.forEach(element =>{ + this.userOptions.push({label: element.oldName,value: element.userId}) + }) + }) + + + + let clanId = this.$store.state.user.clanId + + getAllInfo(clanId).then(response => { + this.listRoot = response.data; + const kon = {} + console.log(response.data,'userListuserListuserList99999999999999') + this.listRoot.forEach(element => { + kon[element['nickName']] = element['userId'] + }) + // for(let i in kon){ + // this.userOptions.push({label: i,value: kon[i]}) + // } + // for(let i in this.userOptions){ + // this.userList.push(this.userOptions[i].value) + // } + // console.log(this.userList,'userListuserListuserList99999999999999') + this.loading1 = false; + } + ); }, // 纭鍒嗕韩 subShare(row) { -- Gitblit v1.9.1