From b76ed70f00e438c7391116bf5e27312abce3f148 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 07 十月 2024 23:14:55 +0800
Subject: [PATCH] 修改了相关bug
---
ruoyi-ui/src/views/collection/index.vue | 62 +++++++++++++++++++-----------
1 files changed, 39 insertions(+), 23 deletions(-)
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 4d7d583..a7498fd 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,25 +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]
- 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) {
@@ -1167,6 +1182,7 @@
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
const id = row.id;
+ this.open2 = false;
this.$router.push("/familymodel/collection/collectionInfo/" + id);
},
@@ -1352,8 +1368,8 @@
_this.getList();
Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
- })..catch(() => {
-
+ }).catch(() => {
+
Message({ message: "瀵煎叆澶辫触", type: 'error' })
})
--
Gitblit v1.9.1