1.各模块点击电子文件可进入详情页面
2.家根网和家谱的详情页接上数据
16个文件已修改
194 ■■■■ 已修改文件
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 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/economy/index.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/genealogy/index.vue 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/homeRoot/index.vue 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/homeRoot/personInfo.vue 1 ●●●● 补丁 | 查看 | 原始文档 | 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 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/selfeconomy/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | 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">
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() {
      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,
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
@@ -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,7 +143,7 @@
              style="width: 35px; height: 35px;"
              fit="cover"
              v-if="scope.row.url === ','"
            >
            ></div>
          </template>
        </el-table-column>
  
@@ -724,4 +725,3 @@
  
  }
  </style>
ruoyi-ui/src/views/selfeconomy/index.vue
@@ -176,6 +176,7 @@
        <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">
@@ -774,4 +775,3 @@
  
  
  </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">