From ed96edec7c6dfd4944d0ee1c6d924c7cb808428c Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期五, 18 十月 2024 10:43:47 +0800
Subject: [PATCH] 修改了相应的bug

---
 ruoyi-ui/src/views/honor/index.vue |   65 ++++++++++++++++++++------------
 1 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/ruoyi-ui/src/views/honor/index.vue b/ruoyi-ui/src/views/honor/index.vue
index 5c5ba9c..c69999b 100644
--- a/ruoyi-ui/src/views/honor/index.vue
+++ b/ruoyi-ui/src/views/honor/index.vue
@@ -536,8 +536,8 @@
 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 {showShareUser} from "@/api/bignote/index";
+import {getAllInfo} from "@/api/system/user"
 //瀵煎叆鎺ュ彛鍑芥暟
 import {listHonor,listType,enload, addHonor,updateHonor, delHonor,uploadPic,getCategory,
         share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
@@ -545,10 +545,11 @@
 import {listUserAll} from "@/api/root/index";
 import { Notification, MessageBox, Message, Loading } from 'element-ui'
 export default {
-  name: "index",
+  name: "ZHonor",
   dicts: ['sys_normal_disable'],
   data() {
     return {
+	  total1: 0,
       // 鍒嗕韩缁欒皝鐨刲ist
       listRoot: [],
       open1:false,
@@ -854,26 +855,40 @@
       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]
-		  	  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;
-            }
-          );
+        this.loading1 = true;
+        		  let userId = this.$store.state.user.userId
+        		//  alert(userId)
+        		 // alert(124)
+        		  showShareUser(userId, 2030).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) {
@@ -884,8 +899,9 @@
       this.$modal.confirm('鏄惁纭鍒嗕韩锛�').then(function() {
         return share(shareList);
       }).then(() => {
-
+  this.userOptions = []
         this.getList();
+		this.getList1();
         this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
         this.id1 = undefined
         this.open1 = false;
@@ -1093,6 +1109,7 @@
     /** 鏌ョ湅璇︾粏淇℃伅 */
     handleCheck(row){
       const id = row.id;
+	  this.open2 = false; 
       this.$router.push("/self/Honor/honorInfo/" + id);
     },
     /** 淇敼鎸夐挳鎿嶄綔 */

--
Gitblit v1.9.1