feige
2025-01-02 43e1199ca0c75787fb6b52bef7d595abd115ceab
ruoyi-ui/src/views/pet/index.vue
@@ -108,10 +108,10 @@
         
    </el-row>
    <el-table v-loading="loading" border :data="petList,PetNoteList" ref="table2" @selection-change="handleSelectionChange"  :row-class-name="tableRowClassName">
    <el-table v-loading="loading" border :data="petList" ref="table2" @selection-change="handleSelectionChange"  :row-class-name="tableRowClassName">
      <el-table-column type="selection" width="55"  align="center" />
      <el-table-column label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
      <el-table-column  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
      <el-table-column label="种类" prop="animal" sortable :show-overflow-tooltip="true" width="150" />
      <el-table-column label="品种" prop="type" sortable :show-overflow-tooltip="true" width="150" />
@@ -131,6 +131,7 @@
      </el-table-column>
      <el-table-column label="宠物id" prop="id" sortable width="100" />
      <el-table-column label="主人姓名" prop="masterName" sortable width="100" />
      <el-table-column 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">
@@ -355,13 +356,13 @@
    <el-table v-loading="loading1" :data="listRoot" :row-key="getRowId1" 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="序号" sortable type="index" :index="(queryParams1.pageNum-1)*queryParams1.pageSize+1" 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>
@@ -480,6 +481,8 @@
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";
//在system/note/index.js中导入接口函数
import {listPet,enload, getPetInfo, delPet,addPet, uploadPic1,
@@ -488,11 +491,14 @@
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 {
      // 分享给谁的list
     total1:0,
     PetNoteList:[],
      listRoot: [],
      open1:false,
      open2:false,
@@ -558,7 +564,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:[ ],
      fileList2:[ ],
@@ -872,27 +878,41 @@
      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]
           let clanId = this.$store.state.user.clanId
          getAllInfo(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
       this.userOptions = []
         showShareUser(userId, 2022).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) {
      const shareList = {}
@@ -902,7 +922,8 @@
      this.$modal.confirm('是否确认分享?').then(function() {
        return share(shareList);
      }).then(() => {
        // this.getList();
         this.getList();
       this.getList1();
        Message({ message: "分享成功", type: 'success' });
        this.open1 = false;
        this.id1 = undefined;
@@ -961,16 +982,7 @@
          this.loading = false;
        }
      );
      listPetnote(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data)
          console.log(response.data)
          this.PetNoteList = response.data.data;
          this.total = response.data.total;
          this.loading = false;
        }
      );
    },
    handleRemove(file) {
@@ -1056,6 +1068,7 @@
    /** 查看详细信息 */
    handleCheck(row){
      const id = row.id;
     this.open2 = false;
      this.$router.push("/familymodel/pet/petInfo/" + id);
    },
@@ -1177,6 +1190,13 @@
  background: #FFEFF2;
}
/deep/ .w-table__fixed{
       bottom: 12px !important;
       box-shadow:none;
  }
.upload-demo .el-upload-list__item-thumbnail img {
  width: 100%;
  height: 100%;