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/clean/index.vue |   43 ++++++++++++++++++-------------------------
 1 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/ruoyi-ui/src/views/clean/index.vue b/ruoyi-ui/src/views/clean/index.vue
index c7d3ee6..ca4dd06 100644
--- a/ruoyi-ui/src/views/clean/index.vue
+++ b/ruoyi-ui/src/views/clean/index.vue
@@ -554,6 +554,8 @@
         share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
         } from "@/api/clean/index";
 import {listUserAll} from "@/api/root/index";
+import {showShareUser} from "@/api/bignote/index";
+
 // import {Message} from "element-ui";
 import { Notification, MessageBox, Message, Loading } from 'element-ui'
 
@@ -562,7 +564,8 @@
     dicts: ['sys_normal_disable'],
     data() {
       return {
-        // 鍒嗕韩缁欒皝鐨刲ist
+        // 鍒嗕韩缁欒皝鐨刲is
+		total1:0,
 		searchQuery: undefined,
         listRoot: [],
         open1:false,
@@ -867,25 +870,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, 2020).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) {
@@ -967,12 +960,12 @@
       getCateInfor()
       {
         let _this = this
-        getCategory().then(response=>{
+        // getCategory().then(response=>{
 
-          response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
-            _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
-          })
-        })
+        //   response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
+        //     _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+        //   })
+        // })
       },
 
       handleRemove(file) {

--
Gitblit v1.9.1