修改bug

feige

2024-09-10 598fe738b22d39172b068db5309476e08481e868

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

@@ -87,54 +87,28 @@
          v-hasPermi="['system:role:remove']"
        >删除</el-button>
      </el-col>

      <el-col :span="1.5">
        <el-button
          type="primary"
          plain
          icon="el-icon-top"
          size="mini"
          :disabled="multiple"
          @click="handleShare"

        >分享</el-button>
      </el-col>

      <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 :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     <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-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>
     
             
     
            <right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         
    </el-row>

    <el-table v-loading="loading" :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"/>
@@ -200,9 +174,8 @@
    />

    <!-- 添加或修改资产信息配置对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
      <h2 style="width: 100px;height: 16px;font-size: 15px;font-family: Microsoft YaHei-Regular, Microsoft YaHei;font-weight: 400;color: #000000;line-height: 15px;">魅宠信息</h2>

    <el-dialog :title="title"  @click.native="handleDialogClick"  :visible.sync="open" width="800px" append-to-body>
   
      <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">

        <el-form-item label="证件号码" prop="idNum">
@@ -222,6 +195,8 @@
        </el-form-item>
        <el-form-item label="出生日期" prop="birth">
          <el-date-picker v-model="formDat.birth" type="date" placeholder="请选择日期"
        @click.native.stop
                          ref="datePicker"
                          :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
          ></el-date-picker>
        </el-form-item>
@@ -504,8 +479,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";
//在system/note/index.js中导入接口函数
import {listPet,enload, getPetInfo, delPet,addPet, uploadPic1,
        share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
@@ -518,6 +493,9 @@
  data() {
    return {
      // 分享给谁的list
     total1:0,
	 
     PetNoteList:[],
      listRoot: [],
      open1:false,
      open2:false,
@@ -575,7 +553,7 @@
      menuNodeAll: false,
      deptExpand: true,
      deptNodeAll: false,

     valueFromParent: '家庭宠物',
      dialogImageUrl: '',
      dialogVisible: false,
      // 日期范围
@@ -761,6 +739,11 @@
    this.getInfo()
  },
  methods: {
     handleDialogClick()
     {
        // 关闭日期选择器
              this.$refs.datePicker.handleClose();
     },
    // 分页
    fenYe(){
      // @pagination='ifNum === 1 ? selectValue : (ifNum === 2 ? whoShare : showData)'
@@ -892,26 +875,19 @@
      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, 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})
                    })
        })
		
      },
    // 确认分享
    subShare(row) {
      const shareList = {}
@@ -980,16 +956,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) {