修改了多个bug

feige

2024-09-22 80e0b09695493b7f811f746dfb7158244088afe3

 ruoyi-ui/src/views/secret/index.vue

@@ -555,7 +555,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"

  //在system/note/index.js中导入接口函数  --接好了
  import {listSecret,enload,delSecret, addSecret, uploadPic,getCategory,
@@ -566,10 +567,11 @@
  import { Notification, MessageBox, Message, Loading } from 'element-ui'

  export default {
    name: "Role",
    name: "ZSecret",
    dicts: ['sys_normal_disable'],
    data() {
      return {
      total1: 0,
        // 分享给谁的list
        listRoot: [],
        open1:false,
@@ -888,26 +890,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)
          		  
                  showShareUser(userId, 2031).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) {