From 63b70dbc269b7b9d20a7a88f3dd7c8bb0934d3f4 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 03 九月 2024 21:49:18 +0800
Subject: [PATCH] 修改了一些bug
---
ruoyi-ui/src/views/collection/index.vue | 36 ++++++++++++++----------------------
1 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 4d7d583..1858d8e 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -626,7 +626,7 @@
} from "@/api/collection/index";
import {listUserAll} from "@/api/root/index";
import {Message} from "element-ui";
-
+import {showShareUser} from "@/api/bignote/index";
export default {
name: "index",
@@ -935,25 +935,17 @@
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]
- 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})
+ })
+ })
},
// 纭鍒嗕韩
subShare(row) {
@@ -1352,8 +1344,8 @@
_this.getList();
Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
- })..catch(() => {
-
+ }).catch(() => {
+
Message({ message: "瀵煎叆澶辫触", type: 'error' })
})
--
Gitblit v1.9.1