修改bug

feige

2025-01-02 43e1199ca0c75787fb6b52bef7d595abd115ceab

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

@@ -261,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
@@ -627,9 +627,10 @@
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 {
@@ -698,7 +699,7 @@
      dateRange: [],
      // 数据范围选项
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a','.M4A'],
      fileList:[],
 fileList1:[],
      uploadFileList: [],
@@ -840,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
@@ -937,7 +939,7 @@
    getList1() {
        let userId = this.$store.state.user.userId
               
         
         this.userOptions = []
         showShareUser(userId, 2018).then(response=>{
                    console.log("===========ddddddddddddd")
                    console.log(response.data)
@@ -946,18 +948,46 @@
                        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) {
      const shareList = {}
      shareList.shareContents = this.id1 || this.ids;
      shareList.shareIds = this.ids1
     if(shareList.shareIds.length==0)
     {
             this.$modal.msgSuccess("请选择分享对象");
             return;
     }
      console.log(shareList,'sharelistsharelist')
      this.$modal.confirm('是否确认分享？').then(function() {
        return share(shareList);
      }).then(() => {

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

    },