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/bignote/index.vue | 60 ++++++++++++++++++++++++++++++++++++------------------------
1 files changed, 36 insertions(+), 24 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue
index 6ad7398..10d2246 100644
--- a/ruoyi-ui/src/views/bignote/index.vue
+++ b/ruoyi-ui/src/views/bignote/index.vue
@@ -516,7 +516,8 @@
<script>
-import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
+import { listRole, getRole, delRole, addRole,
+updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
@@ -524,7 +525,7 @@
import {getAllInfo} from "@/api/system/user"
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
import {listFamilyevent,enload, delFamilyevent , addFamilyevent , uploadPic,
- share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
+ share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData,showShareUser
} from "@/api/bignote/index";
import {listUserAll} from "@/api/root/index";
import {getInfo} from "@/api/login";
@@ -820,28 +821,39 @@
},
getList1() {
this.loading1 = true;
- this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
- this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
- // alert(this.$store.state.user.clanId)
- this.listRoot = []
- 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;
- }
- );
+ let userId = this.$store.state.user.userId
+ // alert(userId)
+
+ showShareUser(userId, 2013).then(response=>{
+ console.log("===========ddddddddddddd")
+ console.log(response.data)
+ console.log("--------------------")
+ response.data.forEach(element =>{
+ this.userOptions.push({label: element.oldName,value: element.userId})
+ })
+ })
+ // this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
+ // this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+ // // alert(this.$store.state.user.clanId)
+ // this.listRoot = []
+ // 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