完成了分享模块

yz3456

2024-08-04 0d915fa05f1521db346e05180aecc5bab7d2cc22

完成了分享模块

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

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

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

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

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

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

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

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

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

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

@@ -82,4 +82,55 @@
//   })
// }

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



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

@@ -74,3 +74,53 @@
  })
}

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

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

@@ -123,6 +123,48 @@
            </el-upload>
          </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>

@@ -193,6 +235,12 @@
                <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: 14px;">分享</span></el-button>
            </div>
        </template>
      </el-table-column>
@@ -376,6 +424,126 @@

      </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="kind" sortable width="80px" >
                 <template slot-scope="scope">
                 {{ getSrc1(scope.row.kind) }}
                  </template>
                 </el-table-column>
              <el-table-column label="适用人" prop="suitable" sortable :show-overflow-tooltip="true" width="110px" />
               <el-table-column label="类别" prop="type" sortable width="100" />
               <el-table-column label="保洁方法" prop="method" sortable width="120" />
               <el-table-column label="材料存放地" prop="location" sortable width="140" />
               <el-table-column label="放置地点" prop="place" sortable width="120" />
               <el-table-column label="发生时间" prop="happenTime" sortable width="150" align="center">
                 <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template>
               </el-table-column>
               <el-table-column label="备注" prop="remark" sortable width="70px" />
               <el-table-column label="本家庭记录" prop="ownData" sortable width="110px" >
                 <template slot-scope="scope">{{scope.row.ownData === 0 ? '否': '是'}}</template>
               </el-table-column>
                <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>

@@ -386,13 +554,50 @@


  //在system/note/index.js中导入接口函数
  import {listClean,enload,delClean, addClean, uploadPic} from "@/api/clean/index";
  import {Message} from "element-ui";
import {listClean,enload,delClean, addClean, uploadPic,
        share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
        } from "@/api/clean/index";
import {listUserAll} from "@/api/root/index";
// import {Message} from "element-ui";
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: [],
        total1:0,


        userId: undefined,
        // 遮罩层
        disabled: false,
@@ -515,11 +720,183 @@
      };
    },
    created() {
            this.getList1();
      this.getList();
      this.getCateInfor()
      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=>{

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

@@ -183,6 +183,49 @@
                      icon="el-icon-top" >导入</el-button>
          </el-upload>
        </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>
    </div>
@@ -269,6 +312,12 @@
              icon="el-icon-d-arrow-right"
              @click="handleCheck(scope.row)">
              <span style="font-size: 14px;">查看详情</span></el-button>
              <el-button
                 size="mini"
                  type="text"
                 icon="el-icon-d-arrow-right"
                  @click="handleShare(scope.row)">
                <span style="font-size: 14px;">分享</span></el-button>
          </div>
        </template>
      </el-table-column>
@@ -453,6 +502,139 @@

    </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="happenTime" sortable width="120" align="center">
                    <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template>
                  </el-table-column>
                  <el-table-column label="类别" prop="type" sortable :show-overflow-tooltip="true" width="120" align="center">
            <!--        <template slot-scope="scope">{{ getSrc(scope.row.type) }}</template>-->
                    <template slot-scope="scope">{{scope.row.type? scope.row.type: '————'}}</template>
                  </el-table-column>
                  <el-table-column label="名称" prop="name" sortable :show-overflow-tooltip="true" width="120" align="center" >
                    <template slot-scope="scope">{{scope.row.name? scope.row.name: '————'}}</template>
                  </el-table-column>
                  <el-table-column label="来源" prop="source" sortable :show-overflow-tooltip="true" width="120" align="center" >
                    <template slot-scope="scope">{{scope.row.source? scope.row.source: '————'}}</template>
                  </el-table-column>

                  <el-table-column label="持有者" prop="owner" sortable :show-overflow-tooltip="true" width="110" align="center">

                    <template slot-scope="scope">{{scope.row.owner? scope.row.owner: '————'}}</template>
                  </el-table-column>
                  <el-table-column label="价值" prop="price" sortable :show-overflow-tooltip="true" width="120" align="center">
                    <template slot-scope="scope">{{scope.row.price? scope.row.price: '————'}}</template>
                  </el-table-column>
                  <el-table-column label="存放位置" prop="location" :show-overflow-tooltip="true" sortable width="160" align="center">
                    <template slot-scope="scope">{{scope.row.location? scope.row.location: '————'}}</template>
                  </el-table-column>
                  <el-table-column label="备注" prop="remark" sortable :show-overflow-tooltip="true" width="120" align="center">
                    <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '————'}}</template>
                  </el-table-column>
                  <el-table-column label="是否是本家庭记录" prop="ownData" :show-overflow-tooltip="true" sortable width="150px" align="center">
                    <template slot-scope="scope">{{scope.row.ownData === 0 ? '否': '是'}}</template>
                  </el-table-column>
              <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>

@@ -463,8 +645,10 @@


//导入接口函数
import {listCollection,listType, getCollection, addCollection,updateCollection, delCollection,uploadPic,downloadModel,enload} from "@/api/collection/index";

import {listCollection,listType, getCollection, addCollection,updateCollection, delCollection,uploadPic,downloadModel,enload,
        share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
} from "@/api/collection/index";
import {listUserAll} from "@/api/root/index";
import {Message} from "element-ui";


@@ -473,6 +657,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,
@@ -609,8 +824,178 @@
    this.getList();
    this.getTypeOptions();
    this.getInfo()

        this.getList1();
  },
  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=>{

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

@@ -140,6 +140,49 @@

         </el-upload>
        </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>

@@ -239,6 +282,12 @@
              icon="el-icon-d-arrow-right"
              @click="handleCheck(scope.row)">
              <span style="font-size: 14px;">查看详情</span></el-button>
            <el-button
               size="mini"
                type="text"
               icon="el-icon-d-arrow-right"
                @click="handleShare(scope.row)">
              <span style="font-size: 14px;">分享</span></el-button>
          </div>
        </template>
      </el-table-column>
@@ -431,6 +480,149 @@

    </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="myName" sortable width="130" >
              <template slot-scope="scope">
                <div>
                  <a href="javascript:;" @click="handleCheck(scope.row)">{{scope.row.myName}}</a>
                </div>
              </template>

            </el-table-column>
            <el-table-column label="通讯录中称呼" prop="nickName" sortable :show-overflow-tooltip="true" width="160" align="center" />
            <el-table-column label="姓名" prop="name" sortable :show-overflow-tooltip="true" width="120" align="center"/>
            <el-table-column label="工作单位" prop="work" sortable :show-overflow-tooltip="true" width="160" align="center" >
              <template slot-scope="scope">{{scope.row.work? scope.row.work: '————'}}</template>
            </el-table-column>
            <el-table-column label="手机" prop="phone" sortable :show-overflow-tooltip="true" width="120" align="center" >
              <template slot-scope="scope">{{scope.row.phone? scope.row.phone: '————'}}</template>
            </el-table-column>
            <el-table-column label="其它联系方式" prop="wx qq twitter" sortable :show-overflow-tooltip="true" width="150" align="center" >
              <template slot-scope="scope">
                <span v-if="scope.row.wx || scope.row.qq || scope.row.twitter == true" >
                  {{scope.row.wx}}/{{scope.row.qq}}/{{scope.row.twitter}}
                </span>
                <span v-else>————</span>
              </template>
            </el-table-column>
            <el-table-column label="是否常联系" prop="isAlways" :show-overflow-tooltip="true" sortable width="170" align="center" >
              <template slot-scope="scope">
                <span v-if="scope.row.isAlways===1">是</span>
                <span v-if="scope.row.isAlways===0">否</span>
                <span v-if="scope.row.isAlways== null">——</span>
              </template>
            </el-table-column>
            <el-table-column label="是否是本家庭记录" prop="ownData" sortable width="150px" align="center" >
              <template slot-scope="scope">{{scope.row.ownData === 0 ? '否': '是'}}</template>
            </el-table-column>


            <el-table-column label="备注（是否存在金钱关系）" prop="remark" :show-overflow-tooltip="true" sortable width="120" align="center">
              <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '————'}}</template>
            </el-table-column>
              <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>

@@ -441,12 +633,46 @@
import { Notification, MessageBox, Message, Loading } from 'element-ui'

//导入接口函数
import {getContactList,enload,  addContact, delContact,uploadPic} from "@/api/contacts/index";
import {getContactList,enload,  addContact, delContact,uploadPic,
        share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
      } from "@/api/contacts/index";
import {listUserAll} from "@/api/root/index";
export default {
  name: "index",
  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,
@@ -609,12 +835,182 @@
  created() {
    this.getList();
    this.getInfo()

        this.getList1();
    // this.getCateInfor()
    // for (let i = 0; i < this.contactList.length; i++) {
    //   this.formDat[i] = this.contactList[i];
    // }
  },
  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=>{

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

@@ -134,6 +134,48 @@
        </el-upload>
      </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>
    <!-- 序号、设备名称、时间、购买人、事项内容、存放地点、电子文件、备注 操作-->
@@ -210,6 +252,12 @@
            <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: 14px;">分享</span></el-button>
          </div>
        </template>
      </el-table-column>
@@ -390,6 +438,133 @@

    </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="name" sortable width="150" />

            <el-table-column label="时间" align="happenTime" sortable prop="happenTime" width="140">
              <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template>
            </el-table-column>
            <el-table-column label="是否注销" align="center" sortable prop="status" width="140">
              <template slot-scope="scope">
                {{ getSrc1(scope.row.status) }}
              </template>
            </el-table-column>
            <el-table-column label="购买人" prop="buyer" sortable width="140" />
            <el-table-column label="事项内容" prop="content" sortable :show-overflow-tooltip="true" width="150" />
            <el-table-column label="存放地点" prop="location" sortable width="120" />

            <el-table-column label="备注" prop="remark" sortable width="100" >
              <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '————'}}</template>
            </el-table-column>



            <el-table-column label="是否是本家庭记录" prop="ownData" sortable width="150px" >
              <template slot-scope="scope">{{scope.row.ownData === 0 ? '否': '是'}}</template>
            </el-table-column>
              <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>

@@ -400,12 +575,48 @@


//在system/note/index.js中导入接口函数  --接好了
import {listEquipment,enload,delEquipment, addEquipment, uploadPic} from "@/api/device/index";
import {listEquipment,enload,delEquipment, addEquipment, uploadPic,
        share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
} from "@/api/device/index";
import {listUserAll} from "@/api/root/index";


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,
@@ -536,8 +747,178 @@
    //   this.getCateInfor()
    this.getInfo()

    this.getList1();
  },
  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=>{

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

@@ -104,6 +104,49 @@

        </el-upload>
      </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>
    <!-- 序号、基金/台账、时间、收入/支出、用途、使用人、现金/自动扣划、余额、电子文件、备注 操作-->
@@ -177,6 +220,13 @@
            <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: 14px;">分享</span></el-button>

          </div>
        </template>
@@ -357,6 +407,126 @@

    </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="createTime" sortable width="150" align="center">
              <template slot-scope="scope">{{scope.row.createTime? scope.row.createTime: '————'}}</template>
            </el-table-column>
            <el-table-column label="台账" prop="type" sortable width="100" />
            <el-table-column label="收入/支出" prop="price" sortable width="100" >

            </el-table-column>
            <el-table-column label="金额" prop="balance" sortable width="100" />
            <el-table-column label="用途" prop="useFor" sortable width="100" />

            <el-table-column label="使用人" prop="usePeople" sortable width="100" />
            <el-table-column label="现金/自动扣划" prop="kind" sortable width="130" >
              <template slot-scope="scope">{{scope.row.kind? scope.row.kind: '————'}}</template>
            </el-table-column>
            <el-table-column label="是否是本家庭记录" prop="ownData" sortable width="150px" >
              <template slot-scope="scope">{{scope.row.ownData === 1 ? '是': '否'}}</template>
            </el-table-column>
              <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>

@@ -367,13 +537,47 @@


//在system/note/index.js中导入接口函数  --接好了
import {listEconomy,enload,delEconomy, addEconomy, uploadPic} from "@/api/economy/index";
import {listEconomy,enload,delEconomy, addEconomy, uploadPic,
        share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
} from "@/api/economy/index";
import {listUserAll} from "@/api/root/index";

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,
@@ -509,12 +713,182 @@
    };
  },
  created() {
        this.getList1();
    this.getList();
    this.getCateInfor()
    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=>{