From cef9c530bac641ed23780a54b1e167d1dde88267 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 12 九月 2024 16:36:28 +0800
Subject: [PATCH] 修改了分享接口
---
ruoyi-ui/src/views/device/index.vue | 52 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/ruoyi-ui/src/views/device/index.vue b/ruoyi-ui/src/views/device/index.vue
index 53974cb..bc6dbda 100644
--- a/ruoyi-ui/src/views/device/index.vue
+++ b/ruoyi-ui/src/views/device/index.vue
@@ -548,6 +548,7 @@
import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
import {getInfo} from "@/api/login";
+import {getAllInfo} from "@/api/system/user"
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
@@ -556,7 +557,7 @@
} from "@/api/device/index";
import {listUserAll} from "@/api/root/index";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
-
+import {showShareUser} from "@/api/bignote/index";
export default {
name: "Role",
@@ -564,6 +565,7 @@
data() {
return {
// 鍒嗕韩缁欒皝鐨刲ist
+ total1: 0,
listRoot: [],
open1:false,
open2:false,
@@ -858,24 +860,36 @@
},
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, 2017).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