修改了bug

feige

2024-10-26 2f83b115973e12107266c920e42cfba31652e62d

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

@@ -184,52 +184,28 @@
          </el-upload>
        </el-col>

        <el-col :span="1.5">
          <el-button
            type="primary"
            plain
            icon="el-icon-top"
            size="mini"
            :disabled="multiple"
            @click="handleShare"
     <el-dropdown placement="分享相关">
         <el-button size="mini"   type="primary"
                    plain
                    icon="el-icon-top">分享相关</el-button>
          <template #dropdown>
            <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>

          >分享</el-button>
        </el-col>
                     <el-dropdown-item    icon="el-icon-top" @click.native="whoShare">分享给我的数据</el-dropdown-item>
                 <el-dropdown-item    icon="el-icon-top" @click.native="handleWho">分享给谁了什么数据</el-dropdown-item>
              <el-dropdown-item    icon="el-icon-top" @click.native="showData">展示下载的分享数据</el-dropdown-item>
            </el-dropdown-menu>
          </template>
        </el-dropdown>

        <el-col :span="1.5">
          <el-button
            type="primary"
            plain
            icon="el-icon-top"
            size="mini"
            @click="handleWho"
          >分享给谁了什么数据</el-button>
        </el-col>

        <el-col :span="1.5">
          <el-button
            type="primary"
            plain
            icon="el-icon-top"
            size="mini"
            @click="whoShare"
          >分享给我的数据</el-button>
        </el-col>

        <el-col :span="1.5">
          <el-button
            type="primary"
            plain
            icon="el-icon-top"
            size="mini"
            @click="showData"
          >展示下载的分享数据</el-button>
        </el-col>
            <right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>

        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
      </el-row>
    </div>
    <el-table v-loading="loading" :data="collectionList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" >
    <el-table v-loading="loading" border :data="collectionList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" >
      <el-table-column type="selection" :reserve-selection="true" width="55"  align="center" />
      <el-table-column fixed label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80px"/>
      <el-table-column label="获得时间" prop="happenTime" sortable width="120" align="center">
@@ -285,7 +261,7 @@
            ></div>
        </template>
      </el-table-column>
      <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" v-if="userId != 2">
      <el-table-column fixed="right" label="操作" align="center" width="250" class-name="small-padding fixed-width" v-if="userId != 2">
        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
          <div class="button-container">
            <el-button
@@ -650,10 +626,11 @@
} from "@/api/collection/index";
import {listUserAll} from "@/api/root/index";
import {Message} from "element-ui";

import {showShareUser} from "@/api/bignote/index";
import {getAllInfo} from "@/api/system/user"

export default {
  name: "index",
  name: "ZfCollection",
  dicts: ['sys_normal_disable'],
  data() {
    return {
@@ -718,10 +695,11 @@
      deptExpand: true,
      deptNodeAll: false,
      // 日期范围
     valueFromParent: '收藏和荣誉',
      dateRange: [],
      // 数据范围选项
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
      fileList:[],
 fileList1:[],
      uploadFileList: [],
@@ -863,7 +841,8 @@
      const list = {"shareIds": [this.selectWho],"shareContents": [row.id]}
      deleteShareData(list).then(()=>{
        Message({ message: "收回成功", type: 'success' })

      this.getList1();
      //alert(234)
        const list2 = {"shareIds": [this.selectWho]}
        shareToWho(list2,this.queryParams2).then(response => {
          this.shareList1 = response.data.data
@@ -958,25 +937,39 @@
      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]
          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, 2018).then(response=>{
                    console.log("===========ddddddddddddd")
                    console.log(response.data)
                    console.log("--------------------")
                    response.data.forEach(element =>{
                        this.userOptions.push({label: element.oldName,value: element.userId})
                    })
        })
		
		
		
      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) {
@@ -989,6 +982,7 @@
      }).then(() => {

        this.getList();
      this.getList1();
        this.$modal.msgSuccess("分享成功");
        this.id1 = undefined
        this.open1 = false;
@@ -1190,6 +1184,7 @@
    /** 查看详细信息 */
    handleCheck(row){
      const id = row.id;
     this.open2 = false; 
      this.$router.push("/familymodel/collection/collectionInfo/" + id);

    },
@@ -1375,7 +1370,10 @@
        _this.getList();
        Message({ message: "导入成功", type: 'warning' })

      }).catch(() => { Message({ message: "导入失败", type: 'error' })});
      }).catch(() => {

        Message({ message: "导入失败", type: 'error' })
        })

    }
  }