修改了多个bug

feige

2024-09-22 80e0b09695493b7f811f746dfb7158244088afe3

修改了多个bug

 ruoyi-ui/src/layout/components/TagsView/index.vue

@@ -1,6 +1,8 @@
<template>
  <div id="tags-view-container" class="tags-view-container">
	  	
    <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
	
      <router-link
        v-for="tag in visitedViews"
        ref="tag"
@@ -16,7 +18,9 @@
        {{ tag.title }}
        <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
      </router-link>
	
    </scroll-pane>
	  
    <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
      <li @click="refreshSelectedTag(selectedTag)"><i class="el-icon-refresh-right"></i> 刷新页面</li>
      <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)"><i class="el-icon-close"></i> 关闭当前</li>

 ruoyi-ui/src/router/index.js

@@ -338,9 +338,12 @@
  {
    path: '/familymodel/Device',
    component: Layout,
    name: 'ZfDevice',
    // permissions: [],
    hidden: true,
    // hidden: true,
    permissions: ['familymodel:device:info'],
  component: () => import('@/views/device/index'), 


    children: [
      {

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

@@ -530,7 +530,7 @@
import {listUserAll} from "@/api/root/index";
import {getInfo} from "@/api/login";
export default {
  name: "Role",
  name: "ZfEvent",
  dicts: ['sys_normal_disable'],
  data() {
    return {
@@ -844,13 +844,13 @@
              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')
              // 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;
            }
          );

 ruoyi-ui/src/views/clanManager/ancestor/index.vue

@@ -8,48 +8,14 @@
        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
          <el-form-item label="用户名称" prop="userName">
            <el-input
              v-model="queryParams.userName"
              v-model="queryParams.name"
              placeholder="请输入用户名称"
              clearable
              style="width: 240px"
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="手机号码" prop="phonenumber">
            <el-input
              v-model="queryParams.phonenumber"
              placeholder="请输入手机号码"
              clearable
              style="width: 240px"
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="状态" prop="status">
            <el-select
              v-model="queryParams.status"
              placeholder="用户状态"
              clearable
              style="width: 240px"
            >
              <el-option
                v-for="dict in dict.type.sys_normal_disable"
                :key="dict.value"
                :label="dict.label"
                :value="dict.value"
              />
            </el-select>
          </el-form-item>
          <el-form-item label="创建时间">
            <el-date-picker
              v-model="dateRange"
              style="width: 240px"
              value-format="yyyy-MM-dd"
              type="daterange"
              range-separator="-"
              start-placeholder="开始日期"
              end-placeholder="结束日期"
            ></el-date-picker>
          </el-form-item>
         
          <el-form-item>
            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -79,7 +45,7 @@
            >修改</el-button>
          </el-col>
        
          <el-col :span="1.5">
     <!--     <el-col :span="1.5">
            <el-button
              type="info"
              plain
@@ -88,7 +54,7 @@
              @click="handleImport"
              v-hasPermi="['system:user:import']"
            >导入</el-button>
          </el-col>
          </el-col> -->
          <el-col :span="1.5">
            <el-button
              type="warning"
@@ -157,7 +123,7 @@
        <el-row>
            
            <el-col :span="12" >
              <el-form-item label="家族名称" prop="clanId">
              <el-form-item label="选家族号" prop="clanId">
                <el-select v-model="form.clanId"   placeholder="请输入家族名称">
            
            <el-option
@@ -459,6 +425,7 @@
    /** 查询用户列表 */
    getList() {
      this.loading = true;
      alert(this.queryParams.name)
      //alert(this.queryParams.pageNum)
      listAncestor(this.queryParams).then(response => {
          this.userList = response.data.data;
@@ -529,7 +496,8 @@
    },
    // 多选框选中数据
    handleSelectionChange(selection) {
      this.ids = selection.map(item => item.userId);
      this.ids = selection.map(item => item.id);
      console.log(this.ids+"----------")
      this.single = selection.length != 1;
      this.multiple = !selection.length;
    },
@@ -715,9 +683,17 @@
    },
    /** 导出按钮操作 */
    handleExport() {
      this.download('system/user/export', {
  const Ids = this.ids;
alert(Ids)
      if(Ids.length==0)
      {
        this.download('/ZfAncestor/export', {
        ...this.queryParams
      }, `user_${new Date().getTime()}.xlsx`)
        }, `zIdea_${new Date().getTime()}.xlsx`)
      }else{
        this.download('/ZfAncestor/export1/'+Ids, {
        }, `zIdea_${new Date().getTime()}.xlsx`)
      }
    },
    /** 导入按钮操作 */
    handleImport() {

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

@@ -561,7 +561,7 @@
import { Notification, MessageBox, Message, Loading } from 'element-ui'

  export default {
    name: "Role",
    name: "ZfClean",
    dicts: ['sys_normal_disable'],
    data() {
      return {
@@ -891,13 +891,13 @@
         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')
         // 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;
       }
     );

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

@@ -630,7 +630,7 @@
import {getAllInfo} from "@/api/system/user"

export default {
  name: "index",
  name: "ZfCollection",
  dicts: ['sys_normal_disable'],
  data() {
    return {
@@ -959,13 +959,13 @@
             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')
             // 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;
           }
         );

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

@@ -615,7 +615,7 @@
      } from "@/api/contacts/index";
import {listUserAll} from "@/api/root/index";
export default {
  name: "index",
  name: "ZfContact",
  dicts: ['sys_normal_disable'],
  data() {
    return {
@@ -973,13 +973,13 @@
            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')
            // 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;
          }
        );

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

@@ -560,7 +560,7 @@
import {showShareUser} from "@/api/bignote/index";

export default {
  name: "Role",
  name: "ZfDevice",
  dicts: ['sys_normal_disable'],
  data() {
    return {
@@ -662,7 +662,8 @@
        buyer:undefined,
        location:undefined,
        createDate:undefined,
        happenTime:undefined
        happenTime:undefined,
        name:undefined,
      },
      // 表单参数
      form: {},
@@ -880,13 +881,13 @@
               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')
               // 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;
             }
           );
@@ -949,7 +950,8 @@
      this.loading = true;
      this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
      this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
      // console.log(this.queryParams)
      console.log(this.queryParams)
      //alert(this.queryParams.name)
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      let _this = this
      listEquipment(this.queryParams).then(response => {

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

@@ -574,7 +574,7 @@
import {listUserAll} from "@/api/root/index";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
export default {
  name: "index",
  name: "ZfDoctor",
  dicts: ['sys_normal_disable'],
  data() {
    return {
@@ -903,13 +903,13 @@
              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')
              // 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;
            }
          );

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

@@ -522,7 +522,7 @@
import {listUserAll} from "@/api/root/index";
import {showShareUser} from "@/api/bignote/index";
export default {
  name: "Role",
  name: "ZfEconomy",
  dicts: ['sys_normal_disable'],
  data() {
    return {
@@ -859,13 +859,13 @@
            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')
            // 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;
          }
        );

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

@@ -374,7 +374,7 @@
import {Message} from "element-ui";

export default {
  name: "Role",
  name: "ZYearInfo",
  dicts: ['sys_normal_disable'],
  data() {
    return {

 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,
      // 分享给谁的list
      listRoot: [],
      open1:false,
@@ -855,22 +856,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]
                this.queryParams.clanId = this.$store.state.user.clanId
          listUserAll(this.queryParams1).then(response => {
              this.listRoot = response.data.data;
                  let userId = this.$store.state.user.userId
                //  alert(userId)
        		  
                  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,'userListuserListuserList')
                    // 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;
            }
          );

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

@@ -540,7 +540,7 @@
import {getInfo} from "@/api/login";

export default {
  name: "show",
  name: "ZMarry",
  dicts: ['sys_normal_disable'],
  data() {
    return {

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

@@ -543,7 +543,7 @@
import {getInfo} from "@/api/login";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
export default {
  name: "Role",
  name: "ZfProperty",
  dicts: ['sys_normal_disable'],
  data() {
    return {
@@ -856,13 +856,13 @@
         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')
         // 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;
       }
     );

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

@@ -490,7 +490,7 @@
import {listUserAll} from "@/api/root/index";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
export default {
  name: "Role",
  name: "ZfPet",
  dicts: ['sys_normal_disable'],
  data() {
    return {
@@ -899,13 +899,13 @@
             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')
             // 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;
           }
         );

 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,
@@ -889,22 +891,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]
                  this.queryParams.clanId = this.$store.state.user.clanId
            listUserAll(this.queryParams1).then(response => {
                this.listRoot = response.data.data;
                    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,'userListuserListuserList')
                      // 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;
              }
            );

 ruoyi-ui/src/views/self/memo.vue

@@ -740,6 +740,8 @@
  getAutobiographyList, getAutobiographyTermList, addAutobiography, updateAutobiography,delAutobiography,
  getCategory,
} from "@/api/self/index";
import {getAllInfo} from "@/api/system/user"
import {showShareUser} from "@/api/bignote/index";
import {listNote,enload,getNote, addNote,updateNote, delNote,uploadPic} from "@/api/memo/index";

import { Notification, MessageBox, Message, Loading } from 'element-ui'
@@ -1005,22 +1007,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]
                this.queryParams.clanId = this.$store.state.user.clanId
          listUserAll(this.queryParams1).then(response => {
              this.listRoot = response.data.data;
              let userId = this.$store.state.user.userId
            //  alert(userId)
    		  
              showShareUser(userId, 2062).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,'userListuserListuserList')
                // 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;
            }
          );

 ruoyi-ui/src/views/self/show.vue

@@ -587,7 +587,7 @@


export default {
  name: "show",
  name: "Self",
  dicts: ['sys_normal_disable'],

  data() {

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

@@ -582,7 +582,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 {getAllInfo} from "@/api/system/user"
import {showShareUser} from "@/api/bignote/index";

  //导入接口函数
  import {listSelfEconomy, getSelfEconomyInfo,enload, addSelfEconomy,delSelfEconomy, updateSelfEconomy,uploadPic,downloadModel,
@@ -593,7 +594,7 @@


  export default {
    name: "index",
    name: "ZProperty",
    dicts: ['sys_normal_disable'],
    data() {
      return {
@@ -936,22 +937,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]
                  this.queryParams.clanId = this.$store.state.user.clanId
            listUserAll(this.queryParams1).then(response => {
                this.listRoot = response.data.data;
                   let userId = this.$store.state.user.userId
                 //  alert(userId)
         		  
                   showShareUser(userId, 2026).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,'userListuserListuserList')
                     // 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;
              }
            );

 ruoyi-ui/src/views/system/user/index.vue

@@ -89,7 +89,7 @@
              v-hasPermi="['system:user:remove']"
            >停用</el-button>
          </el-col>
          <el-col :span="1.5">
    <!--      <el-col :span="1.5">
            <el-button
              type="info"
              plain
@@ -98,7 +98,7 @@
              @click="handleImport"
              v-hasPermi="['system:user:import']"
            >导入</el-button>
          </el-col>
          </el-col> -->
          <el-col :span="1.5">
            <el-button
              type="warning"

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

@@ -743,7 +743,7 @@
import {delFamilyevent, listFamilyevent} from "@/api/bignote";

export default {
  name: "Role",
  name: "Ztravel",
  dicts: ['sys_normal_disable'],
  data() {
    return {
@@ -1181,13 +1181,13 @@
                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')
                // 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;
              }
            );

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

@@ -575,8 +575,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 {getAllInfo} from "@/api/system/user"
import {showShareUser} from "@/api/bignote/index";
//导入接口函数
import {listWish, getWish, addWish,updateWish, delWish,uploadPic,downloadModel,enload,
        share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
@@ -587,10 +587,11 @@


export default {
  name: "index",
  name: "Bainianxinyuan",
  dicts: ['sys_normal_disable'],
  data() {
    return {
      total1: 0,
      // 分享给谁的list
      listRoot: [],
      open1:false,
@@ -895,22 +896,37 @@
    },
    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;
        this.loading1 = true;
                  let userId = this.$store.state.user.userId
                //  alert(userId)
        		  
                  showShareUser(userId, 2027).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,'userListuserListuserList')
                    // 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;
            }
          );

 ruoyi-ui/vue.config.js