解决了报错

yz3456

2024-08-11 93d5248746860e9c19bedaab8761d480d0ce18b9

解决了报错

 ruoyi-ui/src/api/meeting/index.js

@@ -163,3 +163,11 @@
  })
}
// ------------------------------------------------
//上传文件
export function uploadPic1(data) {
  return request({
    url: '/common/upload',
    method: 'post',
    data: data
  })
}

 ruoyi-ui/src/api/pet/index.js

@@ -122,3 +122,54 @@
    data: data
  })
}

// -------------------------------
// 分享
export function share(data) {
  return request({
    url: '/family/zfPetShare/share',
    method: 'post',
    data: data
  })
}
// 查看分享给谁了什么数据
export function shareToWho(data,query) {
  return request({
    url: '/family/zfPetShare/getInfoByUserId',
    method: 'post',
    data: data,
    params: query
  })
}
// 查看谁分享了数据
export function getWhoShare(query) {
  return request({
    url: '/family/zfPetShare/getInfoByShareId',
    method: 'get',
    params: query
  })
}
// 下载分享的数据
export function downShareData(data) {
  return request({
    url: '/family/zfPetShare/downloadDate',
    method: 'post',
    data: data
  })
}
// 收回分享数据
export function deleteShareData(data) {
  return request({
    url: '/family/zfPetShare/deleteInfoByUserId',
    method: 'post',
    data: data
  })
}
// 展示下载的数据
export function showShareData(query) {
  return request({
    url: '/family/zfPetShare/all',
    method: 'get',
    params: query
  })
}

 ruoyi-ui/src/api/travel/index.js

@@ -116,3 +116,84 @@
    method: 'delete'
  })
}

// -------------------------------
// 分享
export function share(data) {
  return request({
    url: '/travelCountShare/share',
    method: 'post',
    data: data
  })
}
// 查看分享给谁了什么数据
export function shareToWho(data,query) {
  return request({
    url: '/travelCountShare/getInfoByUserId',
    method: 'post',
    data: data,
    params: query
  })
}
// 查看谁分享了数据
export function getWhoShare(query) {
  return request({
    url: '/travelCountShare/getInfoByShareId',
    method: 'get',
    params: query
  })
}
// 下载分享的数据
export function downShareData(data) {
  return request({
    url: '/travelCountShare/downloadDate',
    method: 'post',
    data: data
  })
}
// 收回分享数据
export function deleteShareData(data) {
  return request({
    url: '/travelCountShare/deleteInfoByUserId',
    method: 'post',
    data: data
  })
}
// 展示下载的数据
export function showShareData(query) {
  return request({
    url: '/travelCountShare/all',
    method: 'get',
    params: query
  })
}
// --------------------------------------------
// 分享子数据获取

// 查看分享给谁了什么数据
export function shareToWho2(data,query) {
  return request({
    url: '/travelDetailShare/getInfoByUserId',
    method: 'post',
    data: data,
    params: query
  })
}

// 查看谁分享了数据
export function getWhoShare2(query) {
  return request({
    url: '/travelDetailShare/getInfoByShareId',
    method: 'get',
    params: query
  })
}

// 展示下载的数据
export function showShareData2(query) {
  return request({
    url: '/travelDetailShare/all',
    method: 'get',
    params: query
  })
}

 ruoyi-ui/src/router/index.js

@@ -405,7 +405,7 @@
        path: 'petInfo/:id(\\d+)',
        component: () => import('@/views/pet/petInfo'),
        name: 'petInfo',
        meta: { title: '魅宠详细信息',activeMenu: '/familymodel/zfPetNote'}
        meta: { title: '家庭宠物详细信息',activeMenu: '/familymodel/zfPetNote'}
      }
    ]
  },
@@ -422,7 +422,7 @@
        path: 'petnote/:id(\\d+)',
        component: () => import('@/views/pet/petnote'),
        name: 'petnote',
        meta: { title: '魅宠备忘本',activeMenu: '/familymodel/zfPetNote'}
        meta: { title: '宠物备忘本',activeMenu: '/familymodel/zfPetNote'}
      }
    ]
  },

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

@@ -579,6 +579,7 @@
        share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
} from "@/api/device/index";
import {listUserAll} from "@/api/root/index";
import { Notification, MessageBox, Message, Loading } from 'element-ui'


export default {

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

@@ -540,6 +540,7 @@
import {listEconomy,enload,delEconomy, addEconomy, uploadPic,
        share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
} from "@/api/economy/index";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
import {listUserAll} from "@/api/root/index";

export default {

 ruoyi-ui/src/views/meeting/webcast.vue

@@ -10,15 +10,8 @@
      <span>直播</span>
      <div class="button-container"></div>
      <div style="display: flex; align-items: center;">
<!--        <el-button size="mini" type="text" v-hasPermi="['person:information:memo']" style="margin-left: 200px">
          <div class="form" @click="newRequest"><el-icon style="padding-right:100px;"></el-icon>
            <span class="text" style="width: 69px;height: 26px;font-size: 16px;
              font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">直播申请</span>
          </div>
        </el-button> -->
      </div>
    </h1>

    <hr>

    <!-- 搜索 -->
@@ -30,7 +23,6 @@
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;" @keyup.enter.native="handleQuery" />
      </el-form-item>


      <el-form-item>
        <el-button size="mini" @click="handleQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
@@ -65,6 +57,9 @@
          <span class="span1">{{ item.title }}</span>
          <div class="tubiao"><i class="el-icon-view">10000</i></div>
          <p class="author">{{ item.applyPerson }}</p>
          <img :src="item.avatar"
          style="margin-left: 15px;margin-top: 190px; background-color: pink; width: 50px; height: 50px;"/>

        </div>
      </el-col>

@@ -91,22 +86,11 @@
            value-format="yyyy-MM-dd HH:mm:ss">
          </el-date-picker>
        </el-form-item>
<!--        <el-form-item label="结束时间" prop="endTime">
          <el-date-picker v-model="formDat.endTime" type="datetime" placeholder="选择开始时间"
            value-format="yyyy-MM-dd HH:mm:ss">
          </el-date-picker>
        </el-form-item> -->

        <!--        <el-form-item label="开始时间" prop="startTime">
          <el-date-picker v-model="formDat.startTime" type="datetime" placeholder="选择开始时间"
             value-format="yyyy-MM-dd HH:mm:ss">
          </el-date-picker>
        </el-form-item>

        <el-form-item label="持续时间" prop="meetingTitle">
          <el-input v-model="formDat.meetingTitle" placeholder="请输入会议标题" clearable :style="{width: '100%'}">
        <el-form-item label="时长(分钟)" prop="duration">
          <el-input v-model="formDat.duration" type="number" placeholder="请输入会议时长(分钟)" clearable :style="{width: '100%'}">
          </el-input>
        </el-form-item> -->
        </el-form-item>

        <el-form-item label="房间号" prop="roomId">
          <el-input v-model="formDat.roomId" type="number" :min="1" placeholder="请输入房间号" clearable :style="{width: '100%'}">
@@ -114,7 +98,7 @@
        </el-form-item>

        <el-form-item label="最多人数" prop="maxPerson">
          <el-input v-model="formDat.maxPerson" placeholder="请输入最多人数" clearable :style="{width: '100%'}">
          <el-input v-model="formDat.maxPerson" type="number" placeholder="请输入最多人数" clearable :style="{width: '100%'}">
          </el-input>
        </el-form-item>

@@ -137,11 +121,58 @@
          <el-input v-model="formDat.contactPhone" placeholder="请输入联系电话" clearable :style="{width: '100%'}"></el-input>
        </el-form-item>


        <h4 class="form-header">主播头像 </h4>
            <el-upload
              action="#"
              accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif"
              list-type="picture-card"
              :http-request="requestUpload"
              :file-list="fileList"
              :limit="1"
            >
              <i slot="default" class="el-icon-plus"></i>
              <div slot="file" slot-scope="{ file }">
                <template v-if="fileList">
                  <img
                    class="el-upload-list__item-thumbnail"
                    :src="file.url"
                    alt=""
                    style="width: 100%; height: 100%; object-fit: cover;"
                    fit="cover"
                    :preview-src-list="[file.url]"
                  >
                </template>
                <span class="el-upload-list__item-actions">
          <span
            class="el-upload-list__item-preview"
            @click="handlePictureCardPreview(file)"
          >
            <i class="el-icon-zoom-in"></i>
          </span>
          <span
            v-if="!disabled"
            class="el-upload-list__item-delete"
            @click="handleRemove(file)"
          >
            <i class="el-icon-delete"></i>
          </span>
        </span>
              </div>
            </el-upload>


      </el-form>


      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitDataScope">保 存</el-button>
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>

    <el-dialog  :visible.sync="dialogVisible">
      <img w-full :src="dialogImageUrl"    style="width: 100%; height: 100%" alt="Preview Image" />
    </el-dialog>


@@ -173,7 +204,9 @@
  import {
    addWebcast,
    listWebcast,
    getWebcastInfo
    getWebcastInfo,
    uploadPic,
    uploadPic1,
  } from "@/api/meeting/index";

  export default {
@@ -198,6 +231,8 @@
          happenStartTime: undefined,
          happenEndTime: undefined
        },
        // 遮罩层
        disabled: false,
        // 弹出层标题
        title: "",
        // 是否显示弹出层
@@ -211,9 +246,14 @@
          contactPhone: undefined,
          createTime: undefined,
          roomId:undefined,
          maxPerson:undefined
          maxPerson:undefined,
          duration:undefined,
          avatar:undefined,
        },

                    uploadFileList: [],
      fileList:[],
      dialogImageUrl: '',
      dialogVisible: false,
      }
    },
    methods: {
@@ -238,6 +278,9 @@
        // this.reset();
      },
      submitDataScope: function() {
        let ul = this.fileList[0].url
        this.formDat.avatar = ul,
        alert(this.formDat.avatar)
        this.$refs["elForm"].validate(valid => {
          if (valid && this.formDat.roomId > 0) {
            addWebcast(this.formDat).then(response => {
@@ -284,7 +327,40 @@
      },
      toLook(id) {
        this.$router.push('/meeting/webcast/Home/' + id)
      }
      },

    requestUpload(params)
    {
      var file = params.file;
      var formData = new FormData();

      formData.append('uploadFile', file);
      let _this = this
      console.log(formData,'123123')

      uploadPic1(formData).then(response => {
        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
        _this.fileList.push({name:response.data.fileName, url:response.data.url})
        console.log(this.fileList)
        // _this.fileList2.push({name:response.data.fileName, url:response.data.url})
        alert('ok')
      })

    },
      handlePictureCardPreview(file) {
        alert(file.url)
        this.dialogImageUrl = file.url;
        this.dialogVisible = true;
      },
      handleRemove(file) {
        for(let i = 0; i < this.fileList.length; i++)
        {
          if(this.fileList[i].url==file.url)
            this.$delete(this.fileList,i);
        }
      },



    }
  }
@@ -322,6 +398,7 @@
  }

  .module {
    /* display: flex; */
    width: 250px;
    height: 250px;
    background-color: rgb(255, 255, 255);

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

@@ -529,7 +529,7 @@
} from "@/api/note/index";
import {listUserAll} from "@/api/root/index";
import {getInfo} from "@/api/login";
import {Message} from "element-ui";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
export default {
  name: "Role",
  dicts: ['sys_normal_disable'],
@@ -726,8 +726,10 @@

        const list2 = {"shareIds": [this.selectWho]}
        shareToWho(list2,this.queryParams2).then(response => {
          this.loading2 = true
          this.shareList1 = response.data.data
          this.total1 = response.data.total;
          this.loading2 = false
        })
      })
    },

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

@@ -88,11 +88,53 @@
        >删除</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-row>

    <el-table v-loading="loading" :data="petList,PetNoteList" @selection-change="handleSelectionChange"  :row-class-name="tableRowClassName">
    <el-table v-loading="loading" :data="petList,PetNoteList" 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"/>
@@ -137,6 +179,12 @@
          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['familymodel:property:info']">
            <el-button size="mini" type="text" icon="el-icon-d-arrow-right"  @click="handleCheck(scope.row)">查看详情</el-button>
          </el-dropdown>
          <el-button
             size="mini"
              type="text"
             icon="el-icon-d-arrow-right"
              @click="handleShare(scope.row)">
            <span style="font-size: 1em;">分享</span></el-button>
          </div>
        </template>
      </el-table-column>
@@ -326,6 +374,129 @@
      <img w-full :src="dialogImageUrl"    style="width: 100%; height: 100%" alt="Preview Image" />
    </el-dialog>


    <!-- 分享对话框1 -->
    <el-dialog :title="title1" :visible.sync="open1" width="500px" append-to-body @close="handleClose2">

    <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" >
            <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 label="姓名" prop="nickName" sortable :show-overflow-tooltip="true" width="145" align="center"/>
        </el-table>

                <div slot="footer" class="dialog-footer">
                  <el-button type="primary" @click="subShare">分 享</el-button>
                </div>

    </el-dialog>

    <!-- 分享对话框2 -->
    <el-dialog :title="title2" :visible.sync="open2" width="85%" append-to-body @close="handleClose">
      <div>
      <el-select v-if="ifNum == 1"
                v-model="user" id="userSelect"
                placeholder="请选择分享的对象" clearable
                 style="width: 240px;
                 height: 35px;
                 border-radius: 16px 16px 16px 16px;
                 margin-bottom: 5px;
                 opacity: 0.5;" filterable allow-create
                 @change="selectValue">
        <el-option v-for="item in userOptions"
          :key="item.value" :label="item.label" :value="item.value"/>
      </el-select>
            </div>

      <el-table v-loading="loading2" :data="shareList1" :row-key="getRowId2" ref="multipleTable"  @selection-change="handleSelectionChange2"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
            <!-- <el-table-column type="selection" :reserve-selection="true" width="55"  align="center" /> -->
            <!-- <el-table-column fixed label="序号" sortable type="index" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/> -->
            <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" />
            <el-table-column label="名字" prop="name" sortable :show-overflow-tooltip="true" width="150" />
            <el-table-column label="性别" prop="sex" sortable width="120" >
              <template slot-scope="scope">
                {{ getSrc1(scope.row.sex) }}
              </template>
            </el-table-column>
            <el-table-column label="颜色" prop="color" sortable width="100" />

            <el-table-column label="证件号码" prop="idNum" sortable width="100" />

            <el-table-column label="出生日期" align="center" sortable prop="birth" width="180">
              <template slot-scope="scope">{{scope.row.birth? scope.row.birth: '————'}}</template>

            </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="电子文件" prop="url" width="160" align="center">
                   <template slot-scope="scope" >
                     <div>
                       <img
                         class="el-upload-list__item-thumbnail"
                         src="../../assets/images/deviceLis.png"
                         alt=""
                         style="width: 35px; height: 35px;"
                         fit="cover"
                         v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
                       >
                       <img
                         v-else
                         class="el-upload-list__item-thumbnail"
                         src="../../assets/images/deviceA.png"
                         alt=""
                         style="width: 35px; height: 35px;"
                         fit="cover"

                       ></div>
                   </template>
                </el-table-column>

            <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">
                <el-button
                  v-if="ifNum == 2"
                  size="mini"
                  type="text"
                  icon="el-icon-d-arrow-right"
                  @click="handleDown(scope.row)">
                  <span style="font-size: 14px;">下载</span></el-button>
                  <el-button
                    v-if="ifNum == 1"
                    size="mini"
                    type="text"
                    icon="el-icon-d-arrow-right"
                    @click="handleBack(scope.row)">
                    <span style="font-size: 14px;">收回</span></el-button>
                <el-button
                  size="mini"
                  type="text"
                  icon="el-icon-d-arrow-right"
                  @click="handleCheck(scope.row)">
                  <span style="font-size: 14px;">查看详情</span></el-button>
                </div>
              </template>
            </el-table-column>
          </el-table>

          <pagination
            v-show="total1>0"
            :total="total1"
            :page.sync="queryParams2.pageNo"
            :limit.sync="queryParams2.pageSize"
            @pagination='fenYe'
            style="background: #FEF7FC;"
          />

    </el-dialog>

  </div>
</template>

@@ -336,12 +507,48 @@


//在system/note/index.js中导入接口函数
import {listPet,enload, getPetInfo, delPet,addPet, uploadPic1} from "@/api/pet/index";
import {listPet,enload, getPetInfo, delPet,addPet, uploadPic1,
        share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
} from "@/api/pet/index";
import {listUserAll} from "@/api/root/index";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
export default {
  name: "Role",
  dicts: ['sys_normal_disable'],
  data() {
    return {
      // 分享给谁的list
      listRoot: [],
      open1:false,
      open2:false,
      id1: undefined,
      shareList1: [],
      // shareList2: [],
      userOptions:[],
      user:undefined,
      userList:[],
      ifNum:undefined,
      selectWho:undefined,
      title1: "",
      title2: "",
      loading1: false,
      loading2: false,
      // 查询参数1
      queryParams1: {
        pageNum: 1,
        pageSize: 10,
      },
      queryParams2: {
        pageNo: 1,
        pageSize: 10,
      },
      ids1: [],
      single1: true,
      multiple1: true,
      dateRange1: [],



      userId: undefined,
      // 遮罩层
      disabled: false,
@@ -549,10 +756,181 @@
    };
  },
  created() {
        this.getList1();
    this.getList();
    this.getInfo()
  },
  methods: {
    // 分页
    fenYe(){
      // @pagination='ifNum === 1 ? selectValue : (ifNum === 2 ? whoShare : showData)'
      if(this.ifNum === 1){
        this.selectValue(this.selectWho)
      }else if(this.ifNum === 2){
        this.whoShare()
      }else{
        this.showData()
      }
    },
    // 关闭弹窗后
    handleClose(){
      this.user = ''
      this.queryParams2.pageNo = 1
            this.total1 = 0
    },
    handleClose2(){
      this.$refs.table1.clearSelection()
      this.$refs.table2.clearSelection()
    },

    // 下载他人给我分享的数据
    handleDown(row){
      const a = {"downloadContent" : row.id}
      downShareData(a).then(() => {
        Message({ message: "下载成功", type: 'success' })
      })
    },

    // 收回分享给别人的数据
    handleBack(row){
      // 分享给谁的：this.selectWho
      const list = {"shareIds": [this.selectWho],"shareContents": [row.id]}
      deleteShareData(list).then(()=>{
        Message({ message: "收回成功", type: 'success' })

        const list2 = {"shareIds": [this.selectWho]}
        shareToWho(list2,this.queryParams2).then(response => {
          this.shareList1 = response.data.data
          this.total1 = response.data.total;
        })
      })
    },
    // 展示下载的分享数据
    showData(){
      this.shareList1 = []
      this.ifNum = 3
      this.open2 = true
      this.title2 = "下载的分享数据";
      showShareData(this.queryParams2).then(response => {
        this.shareList1 = response.data.data
        this.total1 = response.data.total;
        // console.log(response,'展示下载的分享数据展示下载的分享数据')
      })
    },
    // 展示分享给我的数据
    whoShare(){
      this.shareList1 = []
      this.ifNum = 2
      this.open2 = true
      this.title2 = "分享给我的数据";
      // const list = {"shareId": this.userList}
      // const list = {"shareId": 111}
      getWhoShare(this.queryParams2).then(response => {
        const data = response.data.data
        this.total1 = response.data.total
        console.log(response,'展示分享给我的数据展示分享给我的数据s')
        for(let i in data){
          console.log(i,'展示分享给我的数据展示分享给我的数据')
          this.shareList1.push(data[i])
        }
      })
    },

    // 分享给谁了什么数据
    selectValue(value){
      this.selectWho = value
      this.shareList1 = []
      const list = {"shareIds": [this.selectWho]}
      shareToWho(list,this.queryParams2).then(response => {
        // this.loading2 = true;
        response.data.data.forEach(res=>{
          if(res){
            this.shareList1.push(res)
          }
        })
        // this.shareList1 = response.data.data
        this.total1 = response.data.total;
        // this.loading2 = false;
        console.log(response.data,'分享给谁了什么数据分享给谁了什么数据')
      })
    },
    handleWho(){
      this.ifNum = 1
      this.open2 = true
      this.title2 = "分享给谁了什么数据";
      this.shareList1 = []
    },

    /** 分享操作 */
    handleShare(row) {
      if(row.id){
        this.id1 = [row.id]
      }
      this.open1 = true;
      this.title1 = "分享";
    },
    // 多选框选中数据
    handleSelectionChange1(selection) {
      this.ids1 = selection.map(item => item.userId)
      this.single1 = selection.length!=1
      this.multiple1 = !selection.length
    },
    // 多选框选中数据
    handleSelectionChange2(selection) {
      // this.ids1 = selection.map(item => item.userId)
      // // console.log(selection)
      // console.log(this.ids1,'ids1ids1ids1ids1')
      // this.single1 = selection.length!=1
      // this.multiple1 = !selection.length
    },
    getRowId1(row)
    {
      return row.id
    },
    getRowId2(row)
    {
      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;
            }
          );
        },
    // 确认分享
    subShare(row) {
      const shareList = {}
      shareList.shareContents = this.id1 || this.ids;
      shareList.shareIds = this.ids1
      console.log(shareList,'sharelistsharelist')
      this.$modal.confirm('是否确认分享？').then(function() {
        return share(shareList);
      }).then(() => {
        // this.getList();
        Message({ message: "分享成功", type: 'success' });
        this.open1 = false;
        this.id1 = undefined;
        // this.ids = []

      });
    },
    // ------------------------------------------------------------------

    getInfo(){
          console.log('-----------------')
          getInfo().then(response=>{

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

@@ -566,11 +566,11 @@
      this.isShow = true

     // document.title = "修改魅宠详细信息";
      this.$route.meta.title = "修改魅宠详细信息";//列表的名称
      this.$route.meta.title = "修改宠物详细信息";//列表的名称
    }
    else{
     // document.title = "查看魅宠详细信息";
      this.$route.meta.title = "查看魅宠详细信息";//列表的名称
      this.$route.meta.title = "查看宠物详细信息";//列表的名称
      this.btn = false;
      this.isShow = false;
    }

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

@@ -83,8 +83,53 @@
        >删除</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-row>


    <!-- 序号、基金/台账、时间、收入/支出、用途、使用人、现金/自动扣划、余额、电子文件、备注 操作-->
    <!-- 这里有个familyList数组 是在data()中定义的 -->
    <el-table v-loading="loading" :data="travelpriceList" @row-click="getRowId" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
@@ -184,7 +229,7 @@



      <el-table-column  label="操作" align="center" sortable width="180" v-if="userId != 2">
      <el-table-column  label="操作" align="center" sortable width="250" v-if="userId != 2">
        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
          <el-button
            size="mini"
@@ -209,6 +254,12 @@
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:role:remove']"
          > 删除</el-button>
         <el-button
             size="mini"
              type="text"
             icon="el-icon-d-arrow-right"
              @click="handleShare(scope.row)">
            <span style="font-size: 1em;">分享</span></el-button>
          <!-- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['familymodel:economy:info']">
            <el-button size="mini" type="text" icon="el-icon-d-arrow-right"  @click="handleCheck(scope.row)">查看详情</el-button>
          </el-dropdown> -->
@@ -219,6 +270,8 @@

      </el-table-column>
    </el-table>


    <div style="background-color: #FEF7FC;">
      <el-dialog :title="title" :visible.sync="openDataScope" width="1300px" append-to-body >
        <div style="background-color: #FEF7FC;">
@@ -512,6 +565,178 @@
      </div>
    </el-dialog>

    <!-- 分享对话框1 -->
    <el-dialog :title="title1" :visible.sync="open1" width="500px" append-to-body @close="handleClose2">

    <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" >
            <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 label="姓名" prop="nickName" sortable :show-overflow-tooltip="true" width="145" align="center"/>
        </el-table>

                <div slot="footer" class="dialog-footer">
                  <el-button type="primary" @click="subShare">分 享</el-button>
                </div>

    </el-dialog>

    <!-- 分享对话框2 -->
    <el-dialog :title="title2" :visible.sync="open2" width="85%" append-to-body @close="handleClose">
      <div>
      <el-select v-if="ifNum == 1"
                v-model="user" id="userSelect"
                placeholder="请选择分享的对象" clearable
                 style="width: 240px;
                 height: 35px;
                 border-radius: 16px 16px 16px 16px;
                 margin-bottom: 5px;
                 opacity: 0.5;" filterable allow-create
                 @change="selectValue">
        <el-option v-for="item in userOptions"
          :key="item.value" :label="item.label" :value="item.value"/>
      </el-select>
            </div>

      <el-table v-loading="loading2" :data="shareList1" :row-key="getRowId2" ref="multipleTable"  @selection-change="handleSelectionChange2"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">

            <el-table-column type="expand" :cell-class-name="expandRowClassName">
                    <template slot-scope="props">
                      <div  >
                        <el-table  :header-row-class-name="tableHeaderRowClassName"  v-loading="loading" :data="travelBase[props.row.id]"  style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;" :row-class-name="tableRowClassName1" >
                          <el-table-column  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="50px"/>

                          <el-table-column label="时间" prop="happenDate" sortable width="100" align="center" >
                            <template slot-scope="scope">{{scope.row.happenDate? scope.row.happenDate: '————'}}</template>
                          </el-table-column>

                          <el-table-column label="地点" prop="address" sortable width="100" />

                          <el-table-column label="建筑" prop="scenic" sortable width="100" />
                          <!-- <el-table-column label="旅期" prop="travelPeriod" sortable width="100" /> -->
                          <el-table-column label="使用证件" prop="document" sortable width="100" />
                          <el-table-column label="车次/航班" prop="flight" sortable width="120px" />
                          <el-table-column label="餐费" prop="eat" sortable width="70px" />
                          <el-table-column label="住宿费" prop="stay" sortable width="100px" />
                          <el-table-column label="交通" prop="travel" sortable width="70px" />
                          <el-table-column label="门票" prop="entrance" sortable width="70px" />
                         <el-table-column label="其它费用" prop="otherCost" sortable width="120px" />
                         <el-table-column label="备注" prop="backInfo" sortable width="120px" />

                          <el-table-column label="电子文件" prop="url" width="160" >
                            <template slot-scope="scope" >
                              <img
                                class="el-upload-list__item-thumbnail"
                                src="../../assets/images/deviceLis.png"
                                alt=""
                                style="width: 35px; height: 35px;"
                                fit="cover"
                                v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
                              >
                              <img
                                v-else
                                class="el-upload-list__item-thumbnail"
                                src="../../assets/images/deviceA.png"
                                alt=""
                                style="width: 35px; height: 35px;"
                                fit="cover"
                              >
                            </template>
                          </el-table-column>
            <!--              <el-table-column label="备注" prop="remark" sortable width="100" />-->


                          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="userId != 2">
                            <template slot-scope="scope" v-if="scope.row.roleId !== 1">
<!--                              <el-button
                                size="mini"
                                type="text"
                                icon="el-icon-edit"
                                @click="handleUpdate1(scope.row)"
                                v-hasPermi="['familymodel:economy:info']"
                              >修改</el-button>
                              <el-button
                                size="mini"
                                type="text"
                                icon="el-icon-delete"
                                @click="handleDelete1(scope.row)"
                                v-hasPermi="['system:role:remove']"
                              >删除</el-button> -->
                              <el-button size="mini" type="text" icon="el-icon-d-arrow-right"  @click="handleCheck1(scope.row)">查看详情</el-button>

                            </template>
                          </el-table-column>
                        </el-table>
                      </div>


                    </template>
                  </el-table-column>
                  <!-- <el-table-column type="selection" width="55"  align="center" /> -->
                  <el-table-column fixed label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60px"/>
                  <el-table-column label="起" prop="startTime" sortable width="100" align="center">
                    <template slot-scope="scope">{{scope.row.startTime? scope.row.startTime: '————'}}</template>
                  </el-table-column>
                  <el-table-column label="止" prop="endTime" sortable width="100" align="center">
                    <template slot-scope="scope">{{scope.row.endTime? scope.row.endTime: '————'}}</template>
                  </el-table-column>
            <!--      <el-table-column label="总天数" prop="totalDay" sortable width="85px" />-->
                  <el-table-column label="旅游名称" prop="name" sortable width="200px" />
                  <el-table-column label="去向" prop="destination" sortable width="150px" />
                  <el-table-column label="旅游性质" prop="property" sortable width="100" />
                       <el-table-column label="感言" prop="spee" sortable width="120px" />
                  <el-table-column label="旅游方式" prop="manner" sortable width="100" />
                  <el-table-column label="总金额" prop="totalPrice" sortable width="100" />
                  <el-table-column label="餐费" prop="eatTotal" sortable width="70px" />
                  <el-table-column label="住宿" prop="stayTotal" sortable width="70px" />
                  <el-table-column label="交通" prop="travelTotal" sortable width="70px" />
                  <el-table-column label="门票" prop="entranceTotal" sortable width="70px" />
                  <el-table-column label="团费" prop="groupTotal" sortable width="70px" />

            <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">
                <el-button
                  v-if="ifNum == 2"
                  size="mini"
                  type="text"
                  icon="el-icon-d-arrow-right"
                  @click="handleDown(scope.row)">
                  <span style="font-size: 14px;">下载</span></el-button>
                  <el-button
                    v-if="ifNum == 1"
                    size="mini"
                    type="text"
                    icon="el-icon-d-arrow-right"
                    @click="handleBack(scope.row)">
                    <span style="font-size: 14px;">收回</span></el-button>
                <el-button
                  size="mini"
                  type="text"
                  icon="el-icon-d-arrow-right"
                  @click="handleCheck(scope.row)">
                  <span style="font-size: 14px;">查看详情</span></el-button>
                </div>
              </template>
            </el-table-column>
          </el-table>

          <pagination
            v-show="total1>0"
            :total="total1"
            :page.sync="queryParams2.pageNo"
            :limit.sync="queryParams2.pageSize"
            @pagination='fenYe'
            style="background: #FEF7FC;"
          />

    </el-dialog>

  </div>
</template>

@@ -531,8 +756,12 @@
  uploadPic,
  // updateTravelPrice,
  addTravelBase,
  share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData,
  shareToWho2,getWhoShare2,showShareData2

} from "@/api/travel/index";
import {listUserAll} from "@/api/root/index";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
import {getSelfEconomyInfo} from "@/api/selfeconomy";
import {delFamilyevent, listFamilyevent} from "@/api/bignote";

@@ -541,6 +770,37 @@
  dicts: ['sys_normal_disable'],
  data() {
    return {
      // 分享给谁的list
      listRoot: [],
      open1:false,
      open2:false,
      id1: undefined,
      shareList1: [],
      // shareList2: [],
      userOptions:[],
      user:undefined,
      userList:[],
      ifNum:undefined,
      selectWho:undefined,
      title1: "",
      title2: "",
      loading1: false,
      loading2: false,
      // 查询参数1
      queryParams1: {
        pageNum: 1,
        pageSize: 10,
      },
      queryParams2: {
        pageNo: 1,
        pageSize: 10,
      },
      ids1: [],
      single1: true,
      multiple1: true,
      dateRange1: [],


      userId: undefined,
      // 遮罩层
      disabled: false,
@@ -783,10 +1043,181 @@
    };
  },
  created() {
        this.getList1();
    this.getList();
    this.getInfo()
    this.getInfo();

  },
  methods: {
    // 分页
    fenYe(){
      // @pagination='ifNum === 1 ? selectValue : (ifNum === 2 ? whoShare : showData)'
      if(this.ifNum === 1){
        this.selectValue(this.selectWho)
      }else if(this.ifNum === 2){
        this.whoShare()
      }else{
        this.showData()
      }
    },
    // 关闭弹窗后
    handleClose(){
      this.user = ''
      this.queryParams2.pageNo = 1
            this.total1 = 0
    },
    handleClose2(){
      this.$refs.table1.clearSelection()
    },

    // 下载他人给我分享的数据
    handleDown(row){
      const a = {"downloadContent" : row.id}
      downShareData(a).then(() => {
        Message({ message: "下载成功", type: 'success' })
      })
    },

    // 收回分享给别人的数据
    handleBack(row){
      // 分享给谁的：this.selectWho
      const list = {"shareIds": [this.selectWho],"shareContents": [row.id]}
      deleteShareData(list).then(()=>{
        Message({ message: "收回成功", type: 'success' })

        const list2 = {"shareIds": [this.selectWho]}
        shareToWho(list2,this.queryParams2).then(response => {
          this.shareList1 = response.data.data
          this.total1 = response.data.total;
        })
      })
    },
    // 展示下载的分享数据
    showData(){
      this.shareList1 = []
      this.ifNum = 3
      this.open2 = true
      this.title2 = "下载的分享数据";
      showShareData(this.queryParams2).then(response => {
        this.shareList1 = response.data.data
        this.total1 = response.data.total;
        // console.log(response,'展示下载的分享数据展示下载的分享数据')
      })
    },
    // 展示分享给我的数据
    whoShare(){
      this.shareList1 = []
      this.ifNum = 2
      this.open2 = true
      this.title2 = "分享给我的数据";
      // const list = {"shareId": this.userList}
      // const list = {"shareId": 111}
      getWhoShare(this.queryParams2).then(response => {
        const data = response.data.data
        this.total1 = response.data.total
        console.log(response,'展示分享给我的数据展示分享给我的数据s')
        for(let i in data){
          console.log(i,'展示分享给我的数据展示分享给我的数据')
          this.shareList1.push(data[i])
        }
      })
    },

    // 分享给谁了什么数据
    selectValue(value){
      this.selectWho = value
      this.shareList1 = []
      const list = {"shareIds": [this.selectWho]}
      shareToWho(list,this.queryParams2).then(response => {
        // this.loading2 = true;
        response.data.data.forEach(res=>{
          if(res){
            this.shareList1.push(res)
          }
        })
        // this.shareList1 = response.data.data
        this.total1 = response.data.total;
        // this.loading2 = false;
        console.log(response.data,'分享给谁了什么数据分享给谁了什么数据')
      })
    },
    handleWho(){
      this.ifNum = 1
      this.open2 = true
      this.title2 = "分享给谁了什么数据";
      this.shareList1 = []
    },

    /** 分享操作 */
    handleShare(row) {
      if(row.id){
        this.id1 = [row.id]
      }
      this.open1 = true;
      this.title1 = "分享";
    },
    // 多选框选中数据
    handleSelectionChange1(selection) {
      this.ids1 = selection.map(item => item.userId)
      this.single1 = selection.length!=1
      this.multiple1 = !selection.length
    },
    // 多选框选中数据
    handleSelectionChange2(selection) {
      // this.ids1 = selection.map(item => item.userId)
      // // console.log(selection)
      // console.log(this.ids1,'ids1ids1ids1ids1')
      // this.single1 = selection.length!=1
      // this.multiple1 = !selection.length
    },
    getRowId1(row)
    {
      return row.id
    },
    getRowId2(row)
    {
      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;
            }
          );
        },
    // 确认分享
    subShare(row) {
      const shareList = {}
      shareList.shareContents = this.id1 || this.ids;
      shareList.shareIds = this.ids1
      console.log(shareList,'sharelistsharelist')
      this.$modal.confirm('是否确认分享？').then(function() {
        return share(shareList);
      }).then(() => {

        this.getList();
        this.$modal.msgSuccess("分享成功");
        this.id1 = undefined
        this.open1 = false;
      }).catch(() => {});
    },
    // ------------------------------------------------------------------


    getInfo(){
          console.log('-----------------')
          getInfo().then(response=>{