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/note/index.vue |   33 ++++++++++++++-------------------
 1 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index 10e0795..f9401cf 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -148,6 +148,9 @@
                    plain
                    icon="el-icon-top">鍒嗕韩鐩稿叧</el-button>
          <template #dropdown>
+			 <el-button size="mini"   type="primary"
+			            plain
+			            icon="el-icon-top">鍒嗕韩鐩稿叧</el-button>
            <el-dropdown-menu>
              <el-dropdown-item     :disabled="multiple" icon="el-icon-top" style="height: 32px;width:240px;color: #0099ff;" @click.native="handleShare">鍒嗕韩</el-dropdown-item>
          
@@ -531,6 +534,7 @@
 import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
 import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
 
+import {showShareUser} from "@/api/bignote/index";
 
 
 //鍦╯ystem/note/index.js涓鍏ユ帴鍙e嚱鏁�
@@ -546,6 +550,7 @@
   data() {
     return {
       // 鍒嗕韩缁欒皝鐨刲ist
+	  total1:0,
       listRoot: [],
       open1:false,
       open2:false,
@@ -832,25 +837,15 @@
     },
     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, 2002).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) {

--
Gitblit v1.9.1