修改bug

feige

2025-01-02 43e1199ca0c75787fb6b52bef7d595abd115ceab

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

@@ -1,33 +1,64 @@
<template>
    <div class="app-container" style="opacity: 1;">
      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
  
        <el-form-item label="时间" >

        <el-form-item label="时间" prop="happenTime">
          <el-date-picker
            v-model="queryParams.happenTime"
            style="width: 240px;"
            value-format="yyyy-MM-dd HH-MM"
            v-model="dateRange"
            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="开始日期"
            end-placeholder="结束日期"
          ></el-date-picker>
        </el-form-item>

        <el-form-item label="类别" prop="type">
          <el-input
       <!--   <el-input
            v-model="queryParams.type"
            placeholder="请输入类别"
            clearable
            style="width: 240px"
            style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
            @keyup.enter.native="handleQuery"
          />
        -->

        <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 typeOpt" :key="index" :label="item.label" :value="item.value"
          ></el-option>
        </el-select>
        </el-form-item>

        <el-form-item label="账号" prop="accNo">
          <el-input
            v-model="queryParams.accNo"
            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="useFor">
          <el-input
            v-model="queryParams.useFor"
            placeholder="请输入账号"
        <el-form-item label="期限" prop="validityDate">
    <el-date-picker
            v-model="queryParams.validityDate"
            placeholder="请输入期限"
            clearable
             value-format="yyyy-MM-dd"
            style="width: 240px"
            @keyup.enter.native="handleQuery"
          />
@@ -37,8 +68,8 @@
          <el-button  size="mini" @click="resetQuery" style=" width: 65px;height: 32px; background: #FFDDE3; border-radius:6px 6px 6px 6px;opacity: 1;">重置</el-button>
        </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"
@@ -49,7 +80,7 @@
            v-hasPermi="['system:role:add']"
          >新增</el-button>
        </el-col>
  

        <el-col :span="1.5">
          <el-button
            type="danger"
@@ -81,7 +112,7 @@
            v-hasPermi="['family:note:export']"
          >导入模板下载</el-button>
        </el-col>
        <el-col :span="1.2">
        <el-col :span="1.5">
          <el-upload
            action=""
            class="upload-demo"
@@ -90,36 +121,54 @@
          >
            <el-button size="mini"   type="primary"
                       plain
                       icon="el-icon-plus" >导入</el-button>
  
                       icon="el-icon-top" >导入</el-button>

          </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="secretList"  :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">

      <el-table v-loading="loading" border :data="secretList"  :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :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  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
        <el-table-column label="发生时间" prop="happenTime" sortable width="100" align="center">
          <template slot-scope="scope">{{scope.row.happenTime? scope.row.createTime: '————'}}</template>
        <el-table-column fixed label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
        <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="type" sortable width="100" />
        <el-table-column label="类别" prop="type" sortable width="100" />
        <el-table-column label="账号" prop="accNo" sortable width="100" />
        <el-table-column label="有效期" prop="validityDate" sortable width="100" align="center">
          <template slot-scope="scope">{{scope.row.createTime? scope.row.createTime: '————'}}</template>
        <el-table-column label="有效期" prop="validityDate" sortable width="150" align="center">
          <template slot-scope="scope">{{scope.row.validityDate? scope.row.validityDate: '————'}}</template>
        </el-table-column>
        <el-table-column label="密码" prop="password" sortable width="100" />
        <el-table-column label="是否开启指纹" prop="isFinger" sortable width="120" >
        <el-table-column label="是否开启指纹" prop="isFinger" sortable width="130" >
            <template slot-scope="scope">{{scope.row.isFinger===1 ?'是': '否'}}</template>
        </el-table-column>>
        <el-table-column label="是否开启人脸" prop="isFace" sortable width="120" >
        <el-table-column label="是否开启人脸" prop="isFace" sortable width="130" >
            <template slot-scope="scope">{{scope.row.isFace===1 ?'是': '否'}}</template>
        </el-table-column>
        <el-table-column label="私有/公有" prop="isPrivate" sortable width="100" >
          <template slot-scope="scope">{{scope.row.isFace===1 ?'私有': '公有'}}</template>
          <template slot-scope="scope">{{scope.row.isPrivate===1 ?'私有': '公有'}}</template>
        </el-table-column>
        <el-table-column label="存放位置" prop="location" sortable width="100" > 
        <el-table-column label="存放位置" prop="location" sortable width="100" >
          <template slot-scope="scope">{{scope.row.location? scope.row.location: '————'}}</template>
        </el-table-column>
        <el-table-column label="备注" prop="remark" sortable width="100" >
@@ -127,27 +176,30 @@
        </el-table-column>
        <el-table-column label="电子文件" prop="url" align="center" sortable  width="110" >
          <template slot-scope="scope" >
            <img
              class="el-upload-list__item-thumbnail"
              src="../../assets/images/deviceLis.png"
              alt=""
              style="width: 35px; height: 35px;"
              fit="cover"
              v-if="scope.row.url !== ','"
            >
            <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 === ','"
            >
            <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 label="操作" align="center" class-name="small-padding fixed-width">

        <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"
@@ -164,12 +216,19 @@
            >删除</el-button>
            <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['familymodel:economy:info']">
              <el-button size="mini" type="text" icon="el-icon-d-arrow-right"  @click="handleCheck(scope.row)">查看详情</el-button>
  

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

      <pagination
        v-show="total>0"
        :total="total"
@@ -178,32 +237,36 @@
        @pagination="getList"
        style="background: #FEF7FC;"
      />
  

      <!-- 添加或修改资产信息配置对话框 -->
      <!-- 设备名称、时间、购买人、事项内容、存放地点、备注、电子文件 -->
      <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-item label="时间" prop="happenTime">
            <el-date-picker
              v-model='formDat.happenTime'
              type='date'
              placeholder='选择日期'

          <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="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 typeOpt" :key="index" :label="item.label" :value="item.value"
           ></el-option>
         </el-select>
          </el-form-item>
          <el-form-item label="账号" prop="accNo">
            <el-input v-model="formDat.accNo" placeholder="请输入账号" clearable :style="{width: '100%'}" ></el-input>
          </el-form-item>
            

          <el-form-item label="有效期" prop="validityDate">
            <el-date-picker
            <el-input
              v-model='formDat.validityDate'
              type='date'
              placeholder='选择日期'
            ></el-date-picker>
              placeholder='选择有效期'
            ></el-input>
          </el-form-item>
          <el-form-item label="密码" prop="password">
            <el-input v-model="formDat.password" placeholder="请输入密码" clearable :style="{width: '100%'}" ></el-input>
@@ -226,7 +289,7 @@
              ></el-option>
            </el-select>
          </el-form-item>
  


          <el-form-item label="存放位置" prop="location">
            <el-input v-model="formDat.location" placeholder="请输入存放位置" clearable :style="{width: '100%'}" >
@@ -236,16 +299,19 @@
          <el-form-item label="备注" prop="remark">
            <el-input v-model="formDat.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" ></el-input>
          </el-form-item>
  
          <h4 class="form-header">相关图片 </h4>

          <h4 class="form-header">相关图片</h4>
          <el-upload
            action="#"
            list-type="picture-card"
            multiple
            :http-request="requestUpload"
            :file-list="fileList"
          :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"
@@ -262,7 +328,7 @@
            >
              <i class="el-icon-zoom-in"></i>
            </span>
  

            <span
              v-if="!disabled"
              class="el-upload-list__item-delete"
@@ -271,59 +337,274 @@
              <i class="el-icon-delete"></i>
            </span>
          </span>
  
  


            </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=""
            :file-list="fileListOther"
            class="upload-demo"
            multiple
  
            :on-remove="handleRemove"
            :http-request="requestUpload"
            :show-file-list="true"

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


          <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-preview"
                                @click="handleFileCardPreview(file)"
                              >
                                <i class="el-icon-zoom-in"></i>
                              </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>
  

        <div slot="footer" class="dialog-footer">
          <el-button type="primary" @click="submitDataScope">确 定</el-button>
          <el-button @click="cancelData">取 消</el-button>
        </div>
      </el-dialog>
  

      <!-- 分配角色数据权限对话框 -->
      <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
  

      </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 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="type" sortable width="100" />
              <el-table-column label="账号" prop="accNo" sortable width="100" />
              <el-table-column label="有效期" prop="validityDate" sortable width="150" align="center">
                <template slot-scope="scope">{{scope.row.validityDate? scope.row.validityDate: '————'}}</template>
              </el-table-column>
              <el-table-column label="密码" prop="password" sortable width="100" />
              <el-table-column label="是否开启指纹" prop="isFinger" sortable width="130" >
                  <template slot-scope="scope">{{scope.row.isFinger===1 ?'是': '否'}}</template>
              </el-table-column>>
              <el-table-column label="是否开启人脸" prop="isFace" sortable width="130" >
                  <template slot-scope="scope">{{scope.row.isFace===1 ?'是': '否'}}</template>
              </el-table-column>
              <el-table-column label="私有/公有" prop="isPrivate" sortable width="100" >
                <template slot-scope="scope">{{scope.row.isPrivate===1 ?'私有': '公有'}}</template>
              </el-table-column>
              <el-table-column label="存放位置" prop="location" sortable width="100" >
                <template slot-scope="scope">{{scope.row.location? scope.row.location: '————'}}</template>
              </el-table-column>
              <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="url" align="center" sortable  width="110" >
                <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 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 {getInfo} from "@/api/login";
import {showShareUser} from "@/api/bignote/index";
import {getAllInfo} from "@/api/system/user"

  //在system/note/index.js中导入接口函数  --接好了
  import {listSecret,enload,getEconomyInfo,delSecret, addSecret, uploadPic} from "@/api/secret/index";
  
  import {listSecret,enload,delSecret, addSecret, uploadPic,getCategory,
          share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
  } from "@/api/secret/index";

  import {listUserAll} from "@/api/root/index";
  import { Notification, MessageBox, Message, Loading } from 'element-ui'

  export default {
    name: "Role",
    name: "ZSecret",
    dicts: ['sys_normal_disable'],
    data() {
      return {
      total1: 0,
        // 分享给谁的list
        listRoot: [],
        open1:false,
        open2:false,
        id1: undefined,
        shareList1: [],
        // shareList2: [],
        userOptions:[],
        user:undefined,
        userList:[],
        ifNum:undefined,
        selectWho:undefined,
        title1: "",
        title2: "",
        loading1: false,
        loading2: false,
      valueFromParent: '隐私',
        // 查询参数1
        queryParams1: {
          pageNum: 1,
          pageSize: 10,
        },
        queryParams2: {
          pageNo: 1,
          pageSize: 10,
        },
        ids1: [],
        single1: true,
        multiple1: true,
        dateRange1: [],

        userId: undefined,
        // 遮罩层
        disabled: false,
        loading: true,
@@ -339,7 +620,7 @@
        // 总条数
        total: 0,
        // 家大事记表格数据
        economyList: [],
        secretList: [],
        // 弹出层标题
        title: "",
        // 是否显示弹出层
@@ -353,27 +634,31 @@
        // 日期范围
        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'],

        fileList:[
        ],
        fileListOther:[
  
        ],
        fileList1:[],
        uploadFileList: [],
        uploadFileList1: [],
        fileListOther:[],
        dsb:true,
        btn:false,
        uploading: false,
        formDat: {
          type: undefined,
          happenTime: undefined,
          accNo:undefined,
          validityDate:undefined,
          password:undefined,
          validityDate:undefined,
          isFinger:undefined,
          validityDate:undefined,
          isFace:undefined,
          isPrivate:undefined,
          location:undefined,
          remark: undefined,
          url: undefined,
          url: "",
        },
        // 菜单列表
        menuOptions: [],
@@ -385,8 +670,9 @@
          pageSize: 10,
          type:undefined,
          accNo:undefined,
          createTime:undefined,
  
          happenTime:undefined,
          validityDate:undefined,

        },
        // 表单参数
        form: {},
@@ -401,7 +687,7 @@
            message: '请输入密码',
            trigger: 'blur'
          }],
  

          accNo: [{
            required: true,
            message: '请输入账号',
@@ -429,13 +715,14 @@
          }],

          validityDate: [{
            // required: true,
            required: true,
            message: '请选择有效期',
            trigger: 'change'
          }],

          happenTime: [{
            required: true,
            message: '请选择有效期',
            message: '请选择发生时间',
            trigger: 'change'
          }],

@@ -460,16 +747,232 @@
            value: '1',
            label: '私有',
          }
        ],
      typeOpt: [

        ]
      };
    },
    created() {
          this.getList1();
      this.getList();
      this.getCateInfor()
  
      this.getCateInfo();
    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;
                  let userId = this.$store.state.user.userId
                //  alert(userId)
          		  
                  showShareUser(userId, 2031).then(response=>{
                     console.log("===========ddddddddddddd")
                     console.log(response.data)
                     console.log("--------------------")
                     response.data.forEach(element =>{
                         this.userOptions.push({label: element.oldName,value: element.userId})
                     })
                  })
          //         this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
          //         this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
                // //  alert(this.$store.state.user.clanId)
                //       this.listRoot = []
                 let clanId = this.$store.state.user.clanId
             if(clanId!=null){
                  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
        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
            })
          },
      getCateInfo()
      {
         let _this = this
           _this.typeOpt = []

           getCategory().then(response=>{
             console.log(response.data)
         //   alert(9801)

             response.data.map(elem=>{
               _this.typeOpt.push({"label":elem, "value":elem})
             })
             // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
             //   _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
             // })
           })
      },
      //基金/台账的选择
      getSrc1(type) {
        if (type === 0) {
@@ -478,7 +981,7 @@
          return '台账'
        }
      },
  

      getSrc2(kind) {
        if (kind == 0) {
          return '现金'
@@ -486,13 +989,13 @@
          return '自动扣划'
        }
      },
  

      // 取消按钮
      cancelData() {
        this.open = false;
        this.reset();
      },
  

      //隔行变色
      tableRowClassName({ row, rowIndex }) {
        if (rowIndex % 2 == 0) {
@@ -501,18 +1004,18 @@
          return "statistics-warning-row";
        }
      },
  

      /** 查询角色列表 */
      //列表显示家大事记
  
  


      getList() {
        this.loading = true;
        this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
        this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
        // console.log(this.queryParams)
        //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
  

            listSecret(this.queryParams).then(response => {
            //  alert(123)
            //   console.log(response.data)
@@ -523,10 +1026,23 @@
        );
      },
      handleRemove(file) {
        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);
                }
        }
      },

@@ -565,13 +1081,14 @@
            deptCheckStrictly: true,
            remark: undefined
          };
        this.resetForm("form");
        this.resetForm("elForm");
      },
      /** 搜索按钮操作 */
      handleQuery() {
        this.queryParams.pageNum = 1;
        this.getList();
      },

      /** 重置按钮操作 */
      resetQuery() {
        this.dateRange = [];
@@ -585,25 +1102,26 @@
        this.single = selection.length!=1
        this.multiple = !selection.length
      },
  

      /** 新增按钮操作 */
      handleAdd() {
        this.reset();
        this.open = true;
        this.title = "添加藏心密语";
      },
  
  


      /** 查看详细信息 */
      handleCheck(row){
        const id = row.id;
      this.open2 = false; 
        this.$router.push("/self/secret/secretInfo/" + id);
      },
      /** 修改按钮操作 */
      handleUpdate(row) {
        const id = row.id;
        let jd = true
  

        this.$router.push({
          path:"/self/secret/secretInfo/" + id,
          query:{
@@ -611,25 +1129,25 @@
          }
        });
      },
  
  


      handlePictureCardPreview(file) {
        this.dialogImageUrl = file.url;
        this.dialogVisible = true;
      },
      /** 提交按钮（数据权限） */
      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

        // 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) {
  

            addSecret(this.formDat).then(response => {
              this.$modal.msgSuccess("新增成功");
              this.open = false;
@@ -637,30 +1155,101 @@
            });
          }
        });
        // 清空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
  
        uploadPic(formData).then(response => {
          let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
  
          if(_this.fot.includes(pth) === true)

         handleChange(file, fileList1) {
            //定义一个全局数组uploadFileList来做存储

          // 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;

            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) {
        const Ids = row.id || this.ids;
@@ -674,7 +1263,7 @@
      /** 导出按钮操作 */
      handleExport() {
        const Ids = this.ids;
  

        if(Ids.length==0)
        {
        this.download('/zSecret/export', {
@@ -689,7 +1278,7 @@
    ,
    handleExportTemplate(){
        this.download('/zSecret/model', {
  

        }, `zSecret_${new Date().getTime()}.xlsx`)
    },
    /** 导入操作*/
@@ -698,30 +1287,37 @@
      var formData = new FormData();
      formData.append('excelImport', file);
      let _this = this
      alert(file)
      console.log(formData,'2132132123123123121')
      // alert(file)
      enload(formData).then(response => {

        _this.getList();
        Message({ message: "导入成功", type: 'warning' })
  

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

    }
    }
  

  };
  </script>
  

  <style>
  .el-table__row.statistics-warning-row {
    background: #E0EEFE;
  

  }
  .el-table__row.statistics-warning-row1 {
    background: #FFEFF2;
  

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