1.各模块点击电子文件可进入详情页面
2.家根网和家谱的详情页接上数据
16个文件已修改
468 ■■■■■ 已修改文件
ruoyi-ui/src/api/honor/index.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/api/root/index.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/router/index.js 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/bignote/index.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/clean/index.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/device/index.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/economy/index.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/genealogy/index.vue 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/homeRoot/index.vue 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/homeRoot/personInfo.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/honor/honorInfo.vue 96 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/honor/index.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/note/index.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/secret/index.vue 130 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/selfeconomy/index.vue 142 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/wish/index.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/api/honor/index.js
@@ -11,7 +11,7 @@
// 根据id查询记录
export function getHonor(id) {
  return request({
    url: '/zHonor/' + id,
    url: '/zHonor/id=${id}',
    method: 'get',
  })
ruoyi-ui/src/api/root/index.js
@@ -37,3 +37,5 @@
    params: query
  })
}
ruoyi-ui/src/router/index.js
@@ -313,7 +313,22 @@
      }
    ]
  },
//证书、资质
  {
    path: '/self/honor',
    component: Layout,
    hidden: true,
    permissions: ['self:honor:info'],
    children: [
      {
        path: 'honorInfo/:id(\\d+)',
        component: () => import('@/views/honor/honorInfo'),
        name: 'honorInfo',
        meta: { title: '荣誉证书详情',activeMenu: '/self/zHonor'}
      }
    ]
  },
  //百年心愿
  {
    path: '/self/wish',
ruoyi-ui/src/views/bignote/index.vue
@@ -162,6 +162,7 @@
      <!-- <el-table-column label="家庭号" prop="familyId" sortable width="100" /> -->
      <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"
@@ -177,7 +178,7 @@
            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">
ruoyi-ui/src/views/clean/index.vue
@@ -134,6 +134,7 @@
        <el-table-column label="备注" prop="remark" sortable width="100" />
        <el-table-column label="电子文件" prop="url" width="100" >
             <template slot-scope="scope" >
               <div  @click="handleCheck(scope.row)">
               <img
                 class="el-upload-list__item-thumbnail"
                 src="../../assets/images/deviceLis.png"
@@ -149,7 +150,7 @@
                 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">
ruoyi-ui/src/views/device/index.vue
@@ -147,6 +147,7 @@
      <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"
@@ -162,7 +163,7 @@
            style="width: 35px; height: 35px;"
            fit="cover"
            v-if="scope.row.url === ','"
          >
          ></div>
        </template>
      </el-table-column>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -635,7 +636,7 @@
    /** 导出按钮操作 */
    handleExport() {
      const Ids = this.ids;
      if(Ids.length==0)
      {
      this.download('/zfEquipment/export', {
ruoyi-ui/src/views/economy/index.vue
@@ -127,6 +127,7 @@
      <el-table-column label="余额" prop="balance" sortable width="100" />
      <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"
@@ -142,7 +143,7 @@
            style="width: 35px; height: 35px;"
            fit="cover"
            v-if="scope.row.url === ','"
          >
          ></div>
        </template>
      </el-table-column>
      <el-table-column label="备注" prop="remark" sortable width="100" >
ruoyi-ui/src/views/genealogy/index.vue
@@ -480,7 +480,7 @@
  },
  created() {
    this.getList();
    this.getCateInfor()
    // this.getCateInfor()
    // for (let i = 0; i < this.contactList.length; i++) {
    //   this.formDat[i] = this.contactList[i];
    // }
@@ -637,7 +637,7 @@
    /** 查看详细信息 */
    handleCheck(row){
      const id = row.userId;
      alert(id)
      // alert(id)
     this.$router.push("/familymodel/jiagenwang/personInfo/" + id);
    },
@@ -701,11 +701,27 @@
      }).catch(() => {});
    },
    /** 导出按钮操作 */
    // handleExport() {
    //   this.download('/self/user/export/genealogy', {
    //     ...this.queryParams
    //   }, `zGenealogy_${new Date().getTime()}.xlsx`)
    // },
    handleExport() {
      this.download('/self/user/export/genealogy', {
        ...this.queryParams
      }, `zGenealogy_${new Date().getTime()}.xlsx`)
      const Ids = this.ids;
      if(Ids.length==0)
      {
        this.download('/self/user/export/genealogy', {
          ...this.queryParams
        }, `zGenealogy_${new Date().getTime()}.xlsx`)
      }else{
        this.download('/self/user/export/genealogy/'+Ids, {
        }, `zGenealogy_${new Date().getTime()}.xlsx`)
      }
    },
    /** 导入操作*/
    // handleEnport(params){
    //   var file = params.file;
ruoyi-ui/src/views/homeRoot/index.vue
@@ -24,72 +24,79 @@
        <div  v-model="rootList.url">
          <el-avatar shape="circle" class="avater_1_1" v-if="isShow_1">
            <img :src="'http://47.93.189.255:8080/'+ rootList[0].url"
            @click="getPersonInfo(rootList[0].userId)"></img>
            @click="getPersonInfo(rootList[0].userId)">
          </el-avatar>
          <el-avatar shape="circle" class="avater_1_2" v-if="isShow_1">
            <img :src="'http://47.93.189.255:8080/'+ rootList[1].url"
            @click="getPersonInfo(rootList[1].userId)"></img>
            @click="getPersonInfo(rootList[1].userId)">
          </el-avatar>
          <el-avatar shape="circle" class="avater_2_1" v-if="isShow_2">
            <img :src="'http://47.93.189.255:8080/'+ rootSecList[0][0].url"
            @click="getPersonInfo(rootSecList[0][0].userId)"></img>
            @click="getPersonInfo(rootSecList[0][0].userId)">
          </el-avatar>
          <el-avatar shape="circle" class="avater_2_2" v-if="isShow_2">
            <img :src="'http://47.93.189.255:8080/'+ rootSecList[0][1].url"
            @click="getPersonInfo(rootSecList[0][1].userId)"></img>
            @click="getPersonInfo(rootSecList[0][1].userId)">
          </el-avatar>
          <el-avatar shape="circle" class="avater_2_3" v-if="isShow_2">
            <img :src="'http://47.93.189.255:8080/'+ rootSecList[1][0].url"
             @click="getPersonInfo(rootSecList[1][0].userId)"></img>
             @click="getPersonInfo(rootSecList[1][0].userId)">
          </el-avatar>
          <el-avatar shape="circle" class="avater_2_4" v-if="isShow_2">
          <img :src="'http://47.93.189.255:8080/'+ rootSecList[1][1].url"
            @click="getPersonInfo(rootSecList[1][1].userId)"></img>
            @click="getPersonInfo(rootSecList[1][1].userId)">
          </el-avatar>
          <el-avatar shape="circle" class="avater_2_5" v-if="isShow_2">
            <img :src="'http://47.93.189.255:8080/'+ rootSecList[2][0].url"
                @click="getPersonInfo(rootSecList[2][0].userId)"></img>
                @click="getPersonInfo(rootSecList[2][0].userId)">
          </el-avatar>
          <el-avatar shape="circle" class="avater_2_6" v-if="isShow_2">
            <img :src="'http://47.93.189.255:8080/'+ rootSecList[2][1].url"
                 @click="getPersonInfo(rootSecList[2][1].userId)"></img>
                 @click="getPersonInfo(rootSecList[2][1].userId)">
          </el-avatar>
          <el-avatar shape="circle" class="avater_2_7" v-if="isShow_2">
            <img :src="'http://47.93.189.255:8080/'+ rootSecList[3][0].url"
                 @click="getPersonInfo(rootSecList[3][0].userId)"></img>
                 @click="getPersonInfo(rootSecList[3][0].userId)">
          </el-avatar>
          <el-avatar shape="circle" class="avater_2_8" v-if="isShow_2">
            <img :src="'http://47.93.189.255:8080/'+ rootSecList[3][1].url"
                 @click="getPersonInfo(rootSecList[3][1].userId)"></img>
                 @click="getPersonInfo(rootSecList[3][1].userId)">
          </el-avatar>
          <el-avatar shape="circle" class="avater_3_1" v-if="isShow_3">
            <img :src="'http://47.93.189.255:8080/'+ rootSecList[0][0].url"
                 @click="getPersonInfo(rootSecList[0][0].userId)"></img>
                 @click="getPersonInfo(rootSecList[0][0].userId)">
          </el-avatar>
          <el-avatar shape="circle" class="avater_3_2" v-if="isShow_3">
            <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
            ></el-img>
          </el-avatar>
          <el-avatar shape="circle" class="avater_3_3" v-if="isShow_3">
            <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
            ></el-img>
          </el-avatar>
          <el-avatar shape="circle" class="avater_3_4" v-if="isShow_3">
            <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
            ></el-img>
          </el-avatar>
          <el-avatar shape="circle" class="avater_3_5" v-if="isShow_3">
            <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
            ></el-img>
          </el-avatar>
          <el-avatar shape="circle" class="avater_3_6" v-if="isShow_3">
            <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
            ></el-img>
          </el-avatar>
          <el-avatar shape="circle" class="avater_3_7" v-if="isShow_4">
            <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
            ></el-img>
          </el-avatar>
          <el-avatar shape="circle" class="avater_3_8" v-if="isShow_3">
            <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
            ></el-img>
ruoyi-ui/src/views/homeRoot/personInfo.vue
@@ -272,6 +272,7 @@
        disabled: false,
        personInfos:[],
        loading: true,
        dsb:true,
        formData:{
          userId: undefined,
          nickName: undefined,
@@ -367,7 +368,7 @@
    }
  ,
  mounted() {
        const id = this.$route.params && this.$route.params.id;
     const id = this.$route.params && this.$route.params.id;
     this.getList(id);
  },
  methods:{
ruoyi-ui/src/views/honor/honorInfo.vue
@@ -197,6 +197,7 @@
import {Message} from "element-ui";
import { download,uploadPic} from "@/api/doctor/index";
import {listHonor,updateHonor,getHonor} from "@/api/honor/index";
import {listRoot} from "@/api/root";
export default {
  components: {},
@@ -307,33 +308,88 @@
    let _this = this
    if (id) {
      this.loading = true;
      getHonor(id).then((response) => {
        this.formData = response.data;
        let paths = response.data.url.split(",");
        for(let i = 0; i < paths.length; i++)
        {
          if(paths[i]!="") {
      // getHonor(id).then((response) => {
      //   this.formData = response.data;
      //   let paths = response.data.url.split(",");
      //   for(let i = 0; i < paths.length; i++)
      //   {
      //     if(paths[i]!="") {
      //
      //       let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
      //
      //       if (_this.fot.includes(pth) === true)
      //         _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
      //       else {
      //       // alert(paths[i])
      //       let nms = paths[i].split("\/")
      //       let nm = nms[nms.length - 1]
      //       _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
      //       }
      //     }
      //   }
      //   this.loading = false;
      // });
            let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
            if (_this.fot.includes(pth) === true)
              _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
            else {
              // alert(paths[i])
              let nms = paths[i].split("\/")
              let nm = nms[nms.length - 1]
              _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
            }
          }
        }
        this.loading = false;
      });
      this.fetchData()
      this.getCateInfor()
    }
      //以下为test
    // if (id){
    //   this.loading =true;
    //   getHonor(id).then((response)=> {
    //   this.formData =response.data;
    //   let paths=response.data.url.split(" ");
    //   for(let i = 0; i < paths.length; i++){
    //     if(paths[i]!=""){
    //       let pth = paths[i].substr(paths[i].length - 4, paths[i].length);
    //       if (_this.fot.includes(pth)) {
    //         _this.fileList.push({
    //           name: paths[i],
    //           url: process.env.VUE_APP_BASE_TRUE_API + paths[i],
    //         });
    //       } else {
    //             // alert(paths[i])
    //             let nms = paths[i].split("\/")
    //             let nm = nms[nms.length - 1]
    //             _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
    //             }
    //         }
    //       }
    //       this.loading = false;
    //     });
    //
    //   // getHonor(id).then(response => {
    //   //     //  alert(123)
    //   //     //  alert(123)
    //   //     //   console.log(response.data)
    //   //     //  alert(90)
    //   //     this.formData = response.data;
    //   //     this.isShow_1=true
    //   //     //  alert(this.rootList[0].url)
    //   //     //   this.total = response.data.total;
    //   //     this.loading = false;
    //   //   }
    //   // );
    //   this.getCateInfor()
    //
    // }
  },
  mounted() {},
  methods: {
    // 获取数据方法
    fetchData(id) {
      const url = 'http://47.93.189.255:8080/zHonor/id=${id}'; // 接口 URL'/zHonor/id='+query
      fetch(url)
        .then(response => response.json())
        .then(data => {
          this.formData = data; // 通过将返回数据赋给组件属性来更新视图
        })
        .catch(error => {
          console.error('Error:', error); // 处理错误
        });
    },
    /** 查询类别信息 */
    getCateInfor()
    {
ruoyi-ui/src/views/honor/index.vue
@@ -207,6 +207,7 @@
      </el-table-column>
      <el-table-column label="电子文件" prop="url" width="160" align="center">
        <template slot-scope="scope" >
          <div  @click="handleCheck(scope.row)">
          <img
            class="el-upload-list__item-thumbnail"
            src="../../assets/images/deviceLis.png"
@@ -222,7 +223,7 @@
            style="width: 35px; height: 35px;"
            fit="cover"
            v-if="scope.row.url ===',' "
          >
          ></div>
        </template>
      </el-table-column>
      <el-table-column label="备注" prop="remark" sortable width="120" align="center">
ruoyi-ui/src/views/note/index.vue
@@ -146,6 +146,7 @@
      </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"
@@ -161,7 +162,7 @@
               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">
ruoyi-ui/src/views/secret/index.vue
@@ -1,7 +1,7 @@
<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-date-picker
            v-model="queryParams.happenTime"
@@ -22,7 +22,7 @@
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="账号" prop="useFor">
          <el-input
            v-model="queryParams.useFor"
@@ -37,7 +37,7 @@
          <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-col :span="1.5">
          <el-button
@@ -49,7 +49,7 @@
            v-hasPermi="['system:role:add']"
          >新增</el-button>
        </el-col>
        <el-col :span="1.5">
          <el-button
            type="danger"
@@ -91,12 +91,12 @@
            <el-button size="mini"   type="primary"
                       plain
                       icon="el-icon-plus" >导入</el-button>
          </el-upload>
        </el-col>
        <right-toolbar :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-column type="selection"  :reserve-selection="true" width="55"  align="center" />
@@ -119,7 +119,7 @@
        <el-table-column label="私有/公有" prop="isPrivate" sortable width="100" >
          <template slot-scope="scope">{{scope.row.isFace===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,6 +127,7 @@
        </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"
@@ -142,10 +143,10 @@
              style="width: 35px; height: 35px;"
              fit="cover"
              v-if="scope.row.url === ','"
            >
            ></div>
          </template>
        </el-table-column>
        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
          <template slot-scope="scope" v-if="scope.row.roleId !== 1">
            <el-button
@@ -164,12 +165,12 @@
            >删除</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>
          </template>
        </el-table-column>
      </el-table>
      <pagination
        v-show="total>0"
        :total="total"
@@ -178,12 +179,12 @@
        @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'
@@ -197,7 +198,7 @@
          <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
              v-model='formDat.validityDate'
@@ -226,7 +227,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,7 +237,7 @@
          <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>
          <el-upload
            action="#"
@@ -262,7 +263,7 @@
            >
              <i class="el-icon-zoom-in"></i>
            </span>
            <span
              v-if="!disabled"
              class="el-upload-list__item-delete"
@@ -271,8 +272,8 @@
              <i class="el-icon-delete"></i>
            </span>
          </span>
            </div>
          </el-upload>
          <h4 class="form-header">其他附件 </h4>
@@ -281,7 +282,7 @@
            :file-list="fileListOther"
            class="upload-demo"
            multiple
            :on-remove="handleRemove"
            :http-request="requestUpload"
            :show-file-list="true"
@@ -292,33 +293,33 @@
              </div>
            </template>
          </el-upload>
        </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>
    </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";
  //在system/note/index.js中导入接口函数  --接好了
  import {listSecret,enload,getEconomyInfo,delSecret, addSecret, uploadPic} from "@/api/secret/index";
  export default {
    name: "Role",
    dicts: ['sys_normal_disable'],
@@ -357,7 +358,7 @@
        fileList:[
        ],
        fileListOther:[
        ],
        dsb:true,
        btn:false,
@@ -386,7 +387,7 @@
          type:undefined,
          accNo:undefined,
          createTime:undefined,
        },
        // 表单参数
        form: {},
@@ -401,7 +402,7 @@
            message: '请输入密码',
            trigger: 'blur'
          }],
          accNo: [{
            required: true,
            message: '请输入账号',
@@ -466,10 +467,10 @@
    created() {
      this.getList();
      this.getCateInfor()
    },
    methods: {
      //基金/台账的选择
      getSrc1(type) {
        if (type === 0) {
@@ -478,7 +479,7 @@
          return '台账'
        }
      },
      getSrc2(kind) {
        if (kind == 0) {
          return '现金'
@@ -486,13 +487,13 @@
          return '自动扣划'
        }
      },
      // 取消按钮
      cancelData() {
        this.open = false;
        this.reset();
      },
      //隔行变色
      tableRowClassName({ row, rowIndex }) {
        if (rowIndex % 2 == 0) {
@@ -501,18 +502,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)
@@ -585,15 +586,15 @@
        this.single = selection.length!=1
        this.multiple = !selection.length
      },
      /** 新增按钮操作 */
      handleAdd() {
        this.reset();
        this.open = true;
        this.title = "添加藏心密语";
      },
      /** 查看详细信息 */
      handleCheck(row){
        const id = row.id;
@@ -603,7 +604,7 @@
      handleUpdate(row) {
        const id = row.id;
        let jd = true
        this.$router.push({
          path:"/self/secret/secretInfo/" + id,
          query:{
@@ -611,15 +612,15 @@
          }
        });
      },
      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(",")
@@ -629,7 +630,7 @@
        this.formDat.url = ul+","+uls
        this.$refs["elForm"].validate(valid => {
          if (valid) {
            addSecret(this.formDat).then(response => {
              this.$modal.msgSuccess("新增成功");
              this.open = false;
@@ -644,22 +645,22 @@
        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)
          {
            _this.fileList.push({name:response.data.fileName, "url":response.data.url})
          }
          else{
            _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
          }
        })
      },
      /** 删除按钮操作 */
      handleDelete(row) {
@@ -674,7 +675,7 @@
      /** 导出按钮操作 */
      handleExport() {
        const Ids = this.ids;
        if(Ids.length==0)
        {
        this.download('/zSecret/export', {
@@ -689,7 +690,7 @@
    ,
    handleExportTemplate(){
        this.download('/zSecret/model', {
        }, `zSecret_${new Date().getTime()}.xlsx`)
    },
    /** 导入操作*/
@@ -702,26 +703,25 @@
      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;
  }
  </style>
ruoyi-ui/src/views/selfeconomy/index.vue
@@ -15,11 +15,11 @@
            @keyup.enter.native="handleQuery">
            <i slot="prefix" class="el-input__icon el-icon-search"></i>
          </el-input>
        </el-form-item>
        <el-form-item label="日期">
          <el-date-picker
            v-model="dateRange"
@@ -36,7 +36,7 @@
            end-placeholder="结束日期"
          ></el-date-picker>
        </el-form-item>
        <el-form-item label="财产类别" prop="type">
          <el-input
            v-model="queryParams.type"
@@ -47,7 +47,7 @@
            <i slot="prefix" class="el-input__icon el-icon-search"></i>
          </el-input>
        </el-form-item>
        <el-form-item label="收支名称" prop="incomeName" >
          <el-input
            v-model="queryParams.incomeName"
@@ -58,7 +58,7 @@
            <i slot="prefix" class="el-input__icon el-icon-search"></i>
          </el-input>
        </el-form-item>
        <el-form-item label="期限" prop="timeLimit">
          <el-input
            v-model="queryParams.timeLimit"
@@ -93,7 +93,7 @@
              v-hasPermi="['system:role:add']"
            >新增</el-button>
          </el-col>
          <el-col :span="1.5">
            <el-button
              type="danger"
@@ -126,10 +126,10 @@
            >导入模板下载</el-button>
          </el-col>
          <el-col :span="1.2">
            <el-upload
              action=""
              class="upload-demo"
              :show-file-list="false"
              :http-request="handleEnport"
@@ -172,10 +172,11 @@
        <el-table-column label="是否注销" prop="status" sortable width="100" align="center">
            <template slot-scope="scope">{{scope.row.status===1? '是': '否'}}</template>
        </el-table-column>
        <el-table-column label="电子文件" prop="url" width="80" align="center">
          <template slot-scope="scope" >
            <div  @click="handleCheck(scope.row)">
            <img
              class="el-upload-list__item-thumbnail"
              src="../../assets/images/deviceLis.png"
@@ -191,7 +192,7 @@
              style="width: 35px; height: 35px;"
              fit="cover"
              v-if="scope.row.url === ','"
            >
            ></div>
          </template>
        </el-table-column>
        <el-table-column label="备注" prop="remark" sortable width="90" align="center">
@@ -222,14 +223,14 @@
                type="text"
                icon="el-icon-d-arrow-right"
                @click="handleCheck(scope.row)"
              >查看详情</el-button>
            </el-dropdown>
          </template>
        </el-table-column>
      </el-table>
      <pagination
        v-show="total>0"
        :total="total"
@@ -238,7 +239,7 @@
        style="background: #FEF7FC;"
        @pagination="getList"
      />
      <!-- 添加收藏与荣誉信息配置对话框 -->
      <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">
@@ -282,11 +283,11 @@
              ></el-option>
            </el-select>
          </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>
          <h4 class="form-header">电子文件 </h4>
          <el-upload
            action="#"
@@ -312,7 +313,7 @@
          >
            <i class="el-icon-zoom-in"></i>
          </span>
          <span
            v-if="!disabled"
            class="el-upload-list__item-delete"
@@ -321,8 +322,8 @@
            <i class="el-icon-delete"></i>
          </span>
        </span>
            </div>
          </el-upload>
          <h4 class="form-header">其他附件 </h4>
@@ -331,7 +332,7 @@
            :file-list="fileListOther"
            class="upload-demo"
            multiple
            :on-remove="handleRemove"
            :http-request="requestUpload"
            :show-file-list="true"
@@ -342,36 +343,36 @@
              </div>
            </template>
          </el-upload>
        </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>
    </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 {listSelfEconomy, getSelfEconomyInfo, addSelfEconomy,delSelfEconomy, updateSelfEconomy,uploadPic,downloadModel} from "@/api/selfeconomy/index";
//   import {enload} from "@/api/doctor";
  import {Message} from "element-ui";
  export default {
    name: "index",
    dicts: ['sys_normal_disable'],
@@ -379,7 +380,7 @@
      return {
        // 遮罩层
        disabled: false,
        loading: true,
        formData:[],
        // 选中数组
@@ -411,12 +412,12 @@
        fileList:[
        ],
        fileListOther:[
        ],
        dsb:true,
        btn:false,
        fit:['fill'],
        formDat: {
          //百年心愿记录
          id:undefined,
@@ -431,7 +432,7 @@
          location:undefined,
          remark:undefined,
          url: undefined,
        },
        // 菜单列表
        menuOptions: [],
@@ -447,7 +448,7 @@
          // happenTime:undefined,
        },
        // searchVal:"",
        // 表单参数
        form: {},
        defaultProps: {
@@ -456,7 +457,7 @@
        },
        // 表单校验
        rules: {
          type: [{
            required: true,
            message: '请输入财产类别',
@@ -502,7 +503,7 @@
            message: '请输入实现难度',
            trigger: 'blur'
          }],
          remark: [{
            // required: true,
            message: '请输入备注',
@@ -527,7 +528,7 @@
      // }
    },
    methods: {
    //   getSrc1(status) {
    //     if (status === 1) {
    //       return '是'
@@ -535,7 +536,7 @@
    //       return '否'
    //     }
    //   },
      // 取消按钮
      cancelData() {
        this.open = false;
@@ -559,13 +560,13 @@
        console.log(this.queryParams)
        this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
        this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
        //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
        listSelfEconomy(this.queryParams).then(response => {
            //  alert(123)
            //   console.log(response.data)
            this.selfeconomyList = response.data.data;
            this.total = response.data.total;
            this.loading = false;
          }
@@ -633,8 +634,8 @@
      //   );
      //   this.contactList = newlist;
      // },
      /** 新增按钮操作 */
      handleAdd() {
        this.reset();
@@ -645,13 +646,13 @@
      handleCheck(row){
        const id = row.id;
        this.$router.push("/self/selfeconomy/selfeconomyInfo/" + id);
      },
      /** 修改按钮操作 */
      handleUpdate(row) {
        const id = row.id;
        let jd = true
        this.$router.push({
          path:"/self/selfeconomy/selfeconomyInfo/" + id,
          query:{
@@ -659,15 +660,15 @@
          }
        });
      },
      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(",")
@@ -677,7 +678,7 @@
        this.formDat.url = ul+","+uls
        this.$refs["elForm"].validate(valid => {
          if (valid) {
            addSelfEconomy(this.formDat).then(response => {
              this.$modal.msgSuccess("新增成功");
              this.open = false;
@@ -692,22 +693,22 @@
        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)
          {
            _this.fileList.push({name:response.data.fileName, "url":response.data.url})
          }
          else{
            _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
          }
        })
      },
      /** 删除按钮操作 */
      handleDelete(row) {
@@ -722,7 +723,7 @@
      /** 导出按钮操作 */
      handleExport() {
        const Ids = this.ids;
        if(Ids.length==0)
        {
          this.download('zIdea/export', {
@@ -733,27 +734,27 @@
          }, `zIdea_${new Date().getTime()}.xlsx`)
        }
      },
      /** 导入模板下载按钮操作 */
      handleExportModel() {
        this.download('/zIdea/model', {
        }, `zIdea_model_${new Date().getTime()}.xlsx`)
      },
      /** 导入操作*/
      handleEnport(params){
        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' })
        }).catch(() => { Message({ message: "导入失败", type: 'error' })});
      }
    }
  };
@@ -762,16 +763,15 @@
  .app-container{
    background-color: #FEF7FC;
  }
  .el-table__row.statistics-warning-row {
    background: #E0EEFE;
  }
  .el-table__row.statistics-warning-row1 {
    background: #FFEFF2;
  }
  </style>
ruoyi-ui/src/views/wish/index.vue
@@ -211,6 +211,7 @@
      <el-table-column label="电子文件" prop="url" width="180" align="center">
        <template slot-scope="scope" >
          <div  @click="handleCheck(scope.row)">
          <img
            class="el-upload-list__item-thumbnail"
            src="../../assets/images/deviceLis.png"
@@ -226,7 +227,7 @@
            style="width: 35px; height: 35px;"
            fit="cover"
            v-if="scope.row.url === ','"
          >
          ></div>
        </template>
      </el-table-column>
      <el-table-column label="备注" prop="remark" sortable width="90" align="center">