修改bug

feige

2025-04-20 7eb199649939226c3f11fd6f4cda830a389253b8

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

@@ -2,56 +2,75 @@
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
      <el-form-item label="类型" prop="type">

        <el-select v-model="queryParams.type" placeholder="请选择类别" clearable
          style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;" allow-create
        filterable clearable :style="{width: '100%'}"  >
          <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
          ></el-option>
        </el-select>
      </el-form-item>

      <el-form-item label="标题" prop="title">
        <el-input
          v-model="queryParams.type"
          placeholder="请输入类型"
          v-model="queryParams.title"
          placeholder="请输入标题"
          clearable
          style="width: 240px"
          style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
        <el-form-item label="标题" prop="title">
          <el-input
            v-model="queryParams.title"
            placeholder="请输入标题"
            clearable
            style="width: 240px"
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="存储地址" prop="location">
          <el-input
            v-model="queryParams.location"
            placeholder="请输入存储地址"
            clearable
            style="width: 240px"
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="持有人" prop="holder">
          <el-input
            v-model="queryParams.holder"
            placeholder="请输入持有人"
            clearable
            style="width: 240px"
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="具体位置" prop="address">
          <el-input
            v-model="queryParams.address"
            placeholder="请输入具体位置"
            clearable
            style="width: 240px"
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>

      <el-form-item label="发生时间">
      <el-form-item label="存储地址" prop="location">
        <el-input
          v-model="queryParams.location"
          placeholder="请输入存储地址"
          clearable
          style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="持有人" prop="holder">
        <el-input
          v-model="queryParams.holder"
          placeholder="请输入持有人"
          clearable
          style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="具体位置" prop="address">
        <el-input
          v-model="queryParams.address"
          placeholder="请输入具体位置"
          clearable
          style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <!-- </el-form-item> -->
      <el-form-item label="发生时间"  prop="happenTime">
        <el-date-picker
          v-model="dateRange"
          style="width: 240px"
          value-format="yyyy-MM-dd HH-MM-SS"
          style="width: 240px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          value-format="yyyy-MM-dd"
          type="daterange"
          range-separator="-"
          start-placeholder="开始日期"
@@ -66,7 +85,7 @@
      </el-form-item>
    </el-form>

    <el-row :gutter="10" class="mb8">
    <el-row :gutter="10" class="mb8" v-if="userId != 2">
      <el-col :span="1.5">
        <el-button
          type="primary"
@@ -98,75 +117,99 @@
          @click="handleExport"
          v-hasPermi="['family:note:export']"
        >导出</el-button>
   </el-col>
      </el-col>

      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-download"
          size="mini"
          @click="handleExportTemplate"
          v-hasPermi="['family:note:export']"
        >导入模板下载</el-button>
      </el-col>
      <el-col :span="1.2">
        <el-upload
          action=""
          class="upload-demo"
          :show-file-list="false"
          :http-request="handleEnport"
        >
          <el-button size="mini"   type="primary"
          plain
          icon="el-icon-plus" >导入</el-button>
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-download"
          size="mini"
          @click="handleExportTemplate"
          v-hasPermi="['family:note:export']"
        >导入模板下载</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-upload
          action=""
          class="upload-demo"
          :show-file-list="false"
          :http-request="handleEnport"
        >
          <el-button size="mini"   type="primary"
                     plain
                    icon="el-icon-top" >导入</el-button>

        </el-upload>
      </el-col>
        </el-upload>
      </el-col>

      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    <el-dropdown placement="分享相关">
        <el-button size="mini"   type="primary"
                   plain
                   icon="el-icon-top">分享相关</el-button>
         <template #dropdown>
		
           <el-dropdown-menu>
             <el-dropdown-item     :disabled="multiple" icon="el-icon-top" style="height: 32px;width:240px;color: #0099ff;" @click.native="handleShare">分享</el-dropdown-item>
         
                    <el-dropdown-item    icon="el-icon-top" @click.native="whoShare">分享给我的数据</el-dropdown-item>
                <el-dropdown-item    icon="el-icon-top" @click.native="handleWho">分享给谁了什么数据</el-dropdown-item>
             <el-dropdown-item    icon="el-icon-top" @click.native="showData">展示下载的分享数据</el-dropdown-item>
           </el-dropdown-menu>
         </template>
       </el-dropdown>
    
            
    
           <right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
        
    </el-row>

    <el-table v-loading="loading" :data="propertyList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
      <el-table-column type="selection" :reserve-selection="true" width="55"  align="center" />
    <el-table v-loading="loading" border aria-autocomplete="":data="propertyList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
      <el-table-column type="selection" width="55"  align="center" />

      <el-table-column  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
      <el-table-column fixed label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="100"/>

      <el-table-column label="类型" prop="type" sortable :show-overflow-tooltip="true" width="150" />
      <el-table-column label="标题" prop="title" sortable :show-overflow-tooltip="true" width="150" />
      <el-table-column label="存储地址" prop="location" sortable width="100" />
      <el-table-column label="持有人" prop="holder" sortable width="100" />
      <el-table-column label="具体位置" prop="address" sortable width="100" />
      <el-table-column label="备注" prop="remark" sortable width="100" >
      <el-table-column label="存储地址" prop="location" sortable width="150" />
      <el-table-column label="持有人" prop="holder" sortable width="150" />
      <el-table-column label="具体位置" prop="address" sortable width="150" />
      <el-table-column label="备注" prop="remark" sortable width="130" >
        <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '————'}}</template>
      </el-table-column>

      <el-table-column label="发生时间" prop="happenTime" sortable width="100" align="center">
      <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="familyId" sortable width="100" /> -->
      <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="url" width="160" >
           <template slot-scope="scope" >
             <div  @click="handleCheck(scope.row)">
             <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 !== null"
             >
      <img
               class="el-upload-list__item-thumbnail"
               src="../../assets/images/deviceA.png"
               alt=""
               style="width: 35px; height: 35px;"
               fit="cover"
                v-if="scope.row.url === null"
      ></div>
           </template>
        </el-table-column>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
      <el-table-column label="电子文件" prop="url" width="130" >
        <template slot-scope="scope" >
          <div  @click="handleCheck(scope.row)">
            <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 fixed="right" label="操作" align="center" width="250" class-name="small-padding fixed-width" v-if="userId != 2">
        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
          <div class="button-container">
          <el-button
            size="mini"
            type="text"
@@ -185,6 +228,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>
      </el-table-column>
    </el-table>
@@ -200,10 +250,16 @@

    <!-- 添加或修改资产信息配置对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
      <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">

      <el-form ref="elForm" border :model="formDat" :rules="rules" size="medium" label-width="100px">
<!--        <el-form-item label="类别" prop="type">-->
<!--          <el-input v-model="formDat.type" placeholder="请输入类别" clearable :style="{width: '100%'}" ></el-input>-->
<!--        </el-form-item>-->
        <el-form-item label="类别" prop="type">
          <el-input v-model="formDat.type" placeholder="请输入类别" clearable :style="{width: '100%'}" ></el-input>
          <el-select v-model="formDat.type" placeholder="请选择类别" allow-create
          filterable clearable :style="{width: '100%'}"  >
            <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
            ></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="标题" prop="title">
          <el-input v-model="formDat.title" placeholder="请输入标题" clearable :style="{width: '100%'}" ></el-input>
@@ -220,7 +276,11 @@
          <el-input v-model="formDat.address" placeholder="请输入具体位置" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>

        <el-form-item label="发生时间" prop="happenTime">
          <el-date-picker v-model="formDat.happenTime" type="date" placeholder="请选择日期"
                          :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
          ></el-date-picker>
        </el-form-item>
        <el-form-item label="备注" prop="remark">
          <el-input v-model="formDat.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>
@@ -232,8 +292,11 @@
          multiple
          :http-request="requestUpload"
          :file-list="fileList"
        :on-change="handleChange"
        :auto-upload="false"
           ref="upload"
        >
          <i slot="default" class="el-icon-plus"></i>
          <i  slot="default" class="el-icon-plus"></i>
          <div slot="file" slot-scope="{file}">
            <img
              class="el-upload-list__item-thumbnail"
@@ -263,6 +326,13 @@

          </div>
        </el-upload>
      <el-button
               style="margin-left: 10px"
               size="small"
               type="success"

               @click="picUpload"
             >上传到服务器</el-button>
        <h4 class="form-header">其他附件 </h4>
        <el-upload
          action=""
@@ -270,17 +340,59 @@
          class="upload-demo"
          multiple

          :on-remove="handleRemove"
          :http-request="requestUpload"
          :on-remove="handleRemoveFile"
          :show-file-list="true"
        ref="upload1"
        :on-change="handleChange1"
        :auto-upload="false"
        list-type="picture-card"
          :http-request="requestUpload1"
        >
          <el-button type="primary">点击上传</el-button>
          <template #tip>
          <!-- <template #tip>
            <div class="el-upload__tip">
            </div>
          </template>
        </el-upload>
          </template> -->

          <i slot="default" class="el-icon-plus"></i>
            <div slot="file" slot-scope="{file}">
              <!-- 添加video元素用于显示视频 -->
              <video
                v-if="file.url.includes('.mp4')"
                class="el-upload-list__item-thumbnail"
                :src="file.url"
                style="width: 147px; height: 147px"
                fit="cover"
              ></video>
              <img v-else
                   class="el-upload-list__item-thumbnail"
                   src="../../assets/images/deviceLis.png"
                   alt=""
                   style="width: 100%; height: 100%"
                   fit="cover"></img>

              <span class="el-upload-list__item-actions">
                   <span class="el-upload-list__item-name">{{ file.name }}</span>


                        <span

                          class="el-upload-list__item-delete"
                          @click="handleRemoveFile(file)"
                        >
                          <i class="el-icon-delete"></i>
                        </span>
                  </span>

            </div>


        </el-upload>
    <el-button
                style="margin-left: 10px"
                size="small"
                type="success"
                @click="fileUpload"
              >上传到服务器</el-button>
      </el-form>
      <h4 class="form-header"> </h4>

@@ -295,22 +407,179 @@

    </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="type" sortable :show-overflow-tooltip="true" width="150" />
            <el-table-column label="标题" prop="title" sortable :show-overflow-tooltip="true" width="150" />
            <el-table-column label="存储地址" prop="location" sortable width="150" />
            <el-table-column label="持有人" prop="holder" sortable width="150" />
            <el-table-column label="具体位置" prop="address" sortable width="150" />
            <el-table-column label="备注" prop="remark" sortable width="130" >
              <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="familyId" sortable width="100" /> -->
            <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="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>

<script>
import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";

import {getAllInfo} from "@/api/system/user"
import {showShareUser} from "@/api/bignote/index";


//在system/note/index.js中导入接口函数
import {listProperty,enload, getPropertyInfo, delProperty, getCategory, addProperty, uploadPic} from "@/api/note/index";
import {listProperty,enload, getPropertyInfo, delProperty, getCategory,addProperty, uploadPic,
        share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
} from "@/api/note/index";
import {listUserAll} from "@/api/root/index";
import {getInfo} from "@/api/login";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
export default {
  name: "Role",
  name: "ZfProperty",
  dicts: ['sys_normal_disable'],
  data() {
    return {
      // 分享给谁的list
     total1:0,
      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,

@@ -338,17 +607,22 @@
      menuNodeAll: false,
      deptExpand: true,
      deptNodeAll: false,
     valueFromParent: '家庭资产',
      // 日期范围
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
     // 数据范围选项
     fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
       '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a','.M4A'],

      fileList:[
      ],
      fileListOther:[

      ],
      fileList1:[],
      uploadFileList: [],
      uploadFileList1: [],
      fileListOther:[],
      dsb:true,
      btn:false,
      uploading: false,
      formDat: {
        type: undefined,
        title: undefined,
@@ -356,7 +630,8 @@
        holder: undefined,
        address: undefined,
        remark: undefined,
        url: undefined,
        happenTime:undefined,
        url: "",

      },
      // 菜单列表
@@ -373,7 +648,8 @@
        holder:undefined,
        address:undefined,
        happenStartTime:undefined,
        happenEndTime:undefined
        happenEndTime:undefined,
        happenTime:undefined
      },
      // 表单参数
      form: {},
@@ -385,8 +661,8 @@
      rules: {
        type: [{
          required: true,
          message: '请选择类别',
          trigger: 'change'
          message: '请输入类型',
          trigger: 'blur'
        }],
        title: [{
          required: true,
@@ -408,15 +684,11 @@
          message: '请输入具体位置',
          trigger: 'blur'
        }],
        familyId: [{
          required: true,
          message: '请输入familyId',
          trigger: 'blur'
        }],
        createTime: [{

        happenTime: [{
          required: true,
          message: '请选择日期选择',
          trigger: 'change'
          trigger: 'blur'
        }],
      },
      typeOptions: [],
@@ -425,18 +697,217 @@
  created() {
    this.getList();
    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.loading2 = true
          this.shareList1 = response.data.data
          this.total1 = response.data.total;
          this.loading2 = false
        })
      })
    },
    // 展示下载的分享数据
    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;
     console.log(this.listRoot)
      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;
    let userId = this.$store.state.user.userId
	
   this.userOptions = []
     showShareUser(userId, 2002).then(response=>{
                console.log("===========ddddddddddddd")
                console.log(response.data)
                console.log("--------------------")
                response.data.forEach(element =>{
                    this.userOptions.push({label: element.oldName,value: element.userId})
                })
    })
	
	
   let clanId = this.$store.state.user.clanId
	
    getAllInfo(clanId).then(response => {
        this.listRoot = response.data;
        const kon = {}
                     console.log(response.data,'userListuserListuserList99999999999999')
        this.listRoot.forEach(element => {
          kon[element['nickName']] = element['userId']
        })
        // for(let i in kon){
        //   this.userOptions.push({label: i,value: kon[i]})
        // }
        // for(let i in this.userOptions){
        //   this.userList.push(this.userOptions[i].value)
        // }
        // console.log(this.userList,'userListuserListuserList99999999999999')
        this.loading1 = false;
      }
    );
        },
    // 确认分享
    subShare(row) {
      const shareList = {}
      shareList.shareContents = this.id1 || this.ids;
      shareList.shareIds = this.ids1
     if(shareList.shareIds.length==0)
     {
             this.$modal.msgSuccess("请选择分享对象");
             return;
     }
      console.log(shareList,'sharelistsharelist')
      this.$modal.confirm('是否确认分享？').then(function() {
        return share(shareList);
      }).then(() => {

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



    getInfo(){
      console.log('-----------------')
      getInfo().then(response=>{
        console.log(response.user.roles[0].roleId,'roleID')
        this.userId = response.user.roles[0].roleId
      })
    },
    // 取消按钮
    cancelData() {
      this.open = false;
      this.reset();
    },
    getRowId(row)
    {
      return row.id
    },

    //隔行变色
    tableRowClassName({ row, rowIndex }) {
      if (rowIndex % 2 == 0) {
@@ -445,7 +916,10 @@
        return "statistics-warning-row";
      }
    },

    getRowId(row)
    {
      return row.id
    },
    /** 查询角色列表 */
    getList() {
      this.loading = true;
@@ -453,14 +927,21 @@
      this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]

      // console.log(this.queryParams)
      let _this = this
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      listProperty(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data)
          this.propertyList = response.data.data;
        if(response.msg=="您没加入到对应的家庭，请联系管理员")
        {
            _this.$modal.msgSuccess("您没加入到对应的家庭，请联系管理员");
            _this.loading = false;
        }else{
          _this.propertyList = response.data.data;

          this.total = response.data.total;
          this.loading = false;
          _this.total = response.data.total;
          _this.loading = false;
        }
        }
      );
    },
@@ -468,16 +949,40 @@
    getCateInfor()
    {
      let _this = this
      _this.typeOptions = []
      getCategory().then(response=>{

        response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
          _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
        console.log(response.data)
   //   alert(9801)
        response.data.map(elem=>{
          _this.typeOptions.push({"label":elem, "value":elem})
        })
        // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
        //   _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
        // })
      })
    },

    handleRemove(file) {
      alert(323)
      for(let i = 0; i < this.fileList.length; i++)
      {
        if(this.fileList[i].url==file.url)
        {
          this.$delete(this.fileList,i);
               this.$delete(this.uploadFileList,i);
               }
      }
    },
    handleRemoveFile(file) {
      for(let i = 0; i < this.fileListOther.length; i++)
      {
        if(this.fileListOther[i].url==file.url)
        {

          this.$delete(this.fileListOther,i);
          this.$delete(this.uploadFileList1,i);

          }
      }
    },
    // 取消按钮
    cancel() {
@@ -510,7 +1015,7 @@
          deptCheckStrictly: true,
          remark: undefined
        };
      this.resetForm("form");
      this.resetForm("elForm");
    },
    /** 搜索按钮操作 */
    handleQuery() {
@@ -540,6 +1045,7 @@
    /** 查看详细信息 */
    handleCheck(row){
      const id = row.id;
     this.open2 = false; 
      this.$router.push("/familymodel/property/propertyInfo/" + id);
    },
    /** 修改按钮操作 */
@@ -563,13 +1069,7 @@
    /** 提交按钮（数据权限） */
    submitDataScope: function() {

      let ul = this.fileList.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")
      let uls = this.fileListOther.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")
      this.formDat.url = ul+","+uls

      this.$refs["elForm"].validate(valid => {
        if (valid) {

@@ -580,39 +1080,116 @@
          });
        }
      });
      // 清空formDat对象的数据
      Object.keys(this.formDat).forEach(key => {
        this.formDat[key] = '';
      });
      for(let i = 0; i <= this.fileList.length; i++)
      {
        this.handleRemove(this.fileList[0]);
      }
      for(let i = 0; i < this.fileListOther.length; i++){
        this.handleRemoveFile(this.fileListOther[0]);
      }
    },
    requestUpload(params)
    {
      var file = params.file;
      var formData = new FormData();
      formData.append('uploadFile', file);
      let _this = this
    handleChange(file, fileList1) {
          //定义一个全局数组uploadFileList来做存储

      uploadPic(formData).then(response => {
        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
        // this.uploadFileList.push(file.raw);
         console.log("=========5555=========")
         console.log(file)
       //  console.log(this.uploadFileList)
       //  this.fileList = fileList
       //alert(file)
           this.uploadFileList.push(file.raw);
            this.fileList.push({name:file.name,url:file.url})
       //alert(fileList1.length)
       },
       handleChange1(file, fileOtherList1) {
          //定义一个全局数组uploadFileList来做存储
       this.uploadFileList1.push(file.raw);
        this.fileListOther.push({name:file.name,url:file.url})
        // this.uploadFileList.push(file.raw);
         console.log("=========5555=========")
         //console.log(file)
       //  console.log(this.uploadFileList)
       //  this.fileList = fileList
       },
       fileUpload(){
       //   var file = params.file;

        if(_this.fot.includes(pth) === true)
          var formData = new FormData();
          this.$refs.upload1.submit();
          // formData.append('uploadFile', file);
          if(this.uploadFileList1.length==0){
               this.$modal.msgSuccess("文档上传列表不能为空!");
               return
          }
          this.uploadFileList1.forEach((elem)=>{
             formData.append("files", elem)

          })

          let _this = this

          this.uploading = true;
          uploadPic(formData).then(response => {
          _this.uploadFileList1 = []
          _this.formDat.url = _this.formDat.url+","+response.fileNames
          _this.$modal.msgSuccess("文件上传成功!");
            })

       },
       picUpload()
       {
          var formData = new FormData();
          //alert(976)
          //this.$refs.upload.submit();
          //alert(8)
          //alert(this.uploadFileList.length)
       if(this.uploadFileList.length==0){
            this.$modal.msgSuccess("图片上传列表不能为空！");
            return}
       //console.log(this.uploadFileList)
          this.uploadFileList.forEach((elem)=>{
             formData.append("files", elem)

          })
          //alert(90)
          let _this = this
          //alert(9)
           uploadPic(formData).then(response => {
          //   alert("dds")
             _this.formDat.url = _this.formDat.url+","+response.fileNames
            _this.uploadFileList = []
            _this.$modal.msgSuccess("图片上传成功");

         });
       },
        requestUpload(params) {
    //alert(98)
     //    this.uploadFileList.push(params.file);
        },
        requestUpload1(params)
        {
          _this.fileList.push({name:response.data.fileName, "url":response.data.url})

        }

        else{
          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})

        }
      })

    },
          //     this.uploadFileList1.push(params.file);
        },
    /** 删除按钮操作 */
    handleDelete(row) {
      //alert(23)
      const Ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除资产编号为"' + Ids + '"的数据项？').then(function() {
      this.$modal.confirm('是否确认删除所选数据项？').then(function() {
        return delProperty(Ids);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
    //导入模板
    handleExportTemplate(){
      this.download('/family/property/model', {

      }, `property${new Date().getTime()}.xlsx`)
    },
    /** 导出按钮操作 */
    handleExport() {
@@ -620,41 +1197,35 @@

      if(Ids.length==0)
      {
      this.download('family/property/export', {
        ...this.queryParams
      }, `property_${new Date().getTime()}.xlsx`)
      }else{
        this.download('family/property/export1/'+Ids, {
        this.download('family/property/export', {
          ...this.queryParams
        }, `property_${new Date().getTime()}.xlsx`)
      }
      else{
        this.download('family/property/export1/'+Ids, {
        }, `property_${new Date().getTime()}.xlsx`)
      }
    },
    handleExportTemplate(){
      this.download('family/property/model', {

      }, `property_${new Date().getTime()}.xlsx`)
    },
    /** 导入操作*/
    handleEnport(params){
    var file = params.file;
    var formData = new FormData();
    formData.append('excelImport', file);
    let _this = this
      var file = params.file;
      var formData = new FormData();
      formData.append('excelImport', file);
      let _this = this

    enload(formData).then(response => {
       _this.getList();
      Message({ message: "导入成功", type: 'warning' })
      enload(formData).then(response => {
        _this.getList();
        Message({ message: "导入成功", type: 'warning' })

    }).catch(err)
    {
      Message({ message: "导入失败", type: 'error' })
    }
      }).catch(() => { Message({ message: "导入失败", type: 'error' })});

    }
  }

};
</script>
<style>
<style scoped="">
.el-table__row.statistics-warning-row {
  background: #E0EEFE;

@@ -663,4 +1234,10 @@
  background: #FFEFF2;

}
.el-table__cell {
  font-size: 14px; /* 设置字体大小 */
}
.button-container {
  display: inline-flex; /* 设置按钮容器为行内元素 */
}
</style>