feige
2025-04-20 7eb199649939226c3f11fd6f4cda830a389253b8
ruoyi-ui/src/views/self/show.vue
@@ -155,7 +155,7 @@
          >导入模板下载</el-button>
        </el-col>
        <el-col :span="1.5">
        <el-col :span="1.5" v-if="userId != 2">
          <el-upload
            action=""
@@ -232,7 +232,7 @@
      </el-table-column>
      <!--      </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
@@ -442,12 +442,12 @@
    <el-table v-loading="loading1" :data="listRoot" :row-key="getRowId2" ref="table1"  @selection-change="handleSelectionChange1"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
          <el-table-column type="selection" width="55"  align="center" />
          <el-table-column fixed label="序号" sortable type="index" :index="(queryParams1.pageNum-1)*queryParams1.pageSize+1" width="130"/>
          <el-table-column label="身份" prop="identity" sortable width="130" >
      <!--    <el-table-column label="身份" prop="identity" sortable width="130" >
            <template slot-scope="scope" >
              <span v-if="scope.row.isMyFamily==1">第{{scope.row.identity}}代</span>
              <span v-else>——</span>
            </template>
          </el-table-column>
          </el-table-column> -->
          <el-table-column label="姓名" prop="nickName" sortable :show-overflow-tooltip="true" width="145" align="center"/>
        </el-table>
@@ -534,7 +534,7 @@
                  size="mini"
                  type="text"
                  icon="el-icon-d-arrow-right"
                  @click="handleCheck(scope.row)">
                  @click="handleCheck1(scope.row)">
                  <span style="font-size: 14px;">查看详情</span></el-button>
                </div>
              </template>
@@ -579,6 +579,8 @@
import {listNote,enload,getNote, addNote,updateNote, delNote,uploadPic,
        share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
} from "@/api/memo/index";
import {showShareUser} from "@/api/bignote/index";
import {getAllInfo} from "@/api/system/user"
import {getInfo} from "@/api/login";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
//import { delFamilyevent, uploadPic } from '../../api/bignote'
@@ -587,7 +589,7 @@
export default {
  name: "show",
  name: "Self",
  dicts: ['sys_normal_disable'],
  data() {
@@ -687,7 +689,7 @@
      // 数据范围选项
     // 数据范围选项
     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'],
      fileList1:[],
      fileList:[],
@@ -972,9 +974,9 @@
    };
  },
  created() {
   this.getInfo()
    this.getList();
   this.getList1();
  },
  methods: {
    // 分页
@@ -994,10 +996,56 @@
      this.queryParams2.pageNo = 1
            this.total1 = 0
    },
   getInfo(){
         console.log('-----------------')
         getInfo().then(response=>{
           console.log(response.user.roles[0].roleId,'roleID')
           this.userId = response.user.roles[0].roleId
         })
       },
    handleClose2(){
      this.$refs.table1.clearSelection()
    },
 getList1() {
          this.loading1 = true;
                  let userId = this.$store.state.user.userId
                 this.userOptions = []
                  showShareUser(userId, 2010).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
              if(clanId!=null){
                  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;
                    }
                  );
              }
          },
    // 下载他人给我分享的数据
    handleDown(row){
      const a = {"downloadContent" : row.id}
@@ -1120,7 +1168,7 @@
      this.$modal.confirm('是否确认分享?').then(function() {
        return share(shareList);
      }).then(() => {
this.getList1();
        this.getList();
        this.$modal.msgSuccess("分享成功");
        this.id1 = undefined
@@ -1357,6 +1405,7 @@
    /** 查看详细信息 */
    handleCheck1(row){
      const id = row.id;
     this.open2 = false;
      this.$router.push("/self/self/memoInfo/" + id);
    },
    /** 修改按钮操作 */
@@ -1493,6 +1542,7 @@
    /** 查看详细信息 */
    handleCheck(row){
      const id = row.id;
      this.$router.push("/self/self/edit/" + id);
    },
    /** 修改按钮操作 */