将家庭模块中各页面的模块名字去掉了

Tcsm

2023-05-23 c1a26beb08607034d45f0a31b5c88314a5909359

将家庭模块中各页面的模块名字去掉了

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

@@ -28,12 +28,12 @@
  })
}

// 获取家根网
// 获取家谱
export function listUserAll(query) {

  return request({
    url: '/self/user/all',
    url: '/self/user/list/genealogy',
    method: 'get',

    params: query
  })
}

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

@@ -72,14 +72,14 @@

    </el-form>

    <div style="width: 72px;
height: 24px;
font-size: 18px;
font-family: Microsoft YaHei-Regular, Microsoft YaHei;
font-weight: 400;
color: #000000;
line-height: 21px;
">家大事记</div>
<!--    <div style="width: 72px;-->
<!--height: 24px;-->
<!--font-size: 18px;-->
<!--font-family: Microsoft YaHei-Regular, Microsoft YaHei;-->
<!--font-weight: 400;-->
<!--color: #000000;-->
<!--line-height: 21px;-->
<!--">家大事记</div>-->
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button

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

@@ -125,14 +125,14 @@

    </el-form>
    <div>
      <div style="width: 100px;
      height: 24px;
      font-size: 18px;
      font-family: Microsoft YaHei-Regular, Microsoft YaHei;
      font-weight: 400;
      color: #000000;
      line-height: 21px;
      ">收藏和荣誉</div>
<!--      <div style="width: 100px;-->
<!--      height: 24px;-->
<!--      font-size: 18px;-->
<!--      font-family: Microsoft YaHei-Regular, Microsoft YaHei;-->
<!--      font-weight: 400;-->
<!--      color: #000000;-->
<!--      line-height: 21px;-->
<!--      ">收藏和荣誉</div>-->

      <el-row :gutter="10" class="mb8">
        <el-col :span="1.5">

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

@@ -70,14 +70,14 @@
     </el-form-item>
    </el-form>
    <div>
      <div style="width: 72px;
      height: 24px;
      font-size: 18px;
      font-family: Microsoft YaHei-Regular, Microsoft YaHei;
      font-weight: 400;
      color: #000000;
      line-height: 21px;
      ">通讯录</div>
<!--      <div style="width: 72px;-->
<!--      height: 24px;-->
<!--      font-size: 18px;-->
<!--      font-family: Microsoft YaHei-Regular, Microsoft YaHei;-->
<!--      font-weight: 400;-->
<!--      color: #000000;-->
<!--      line-height: 21px;-->
<!--      ">通讯录</div>-->

    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">

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

@@ -115,14 +115,14 @@
       </el-form-item>
    </el-form>
    <div>
      <div style="width: 100px;
      height: 24px;
      font-size: 18px;
      font-family: Microsoft YaHei-Regular, Microsoft YaHei;
      font-weight: 400;
      color: #000000;
      line-height: 21px;
      ">家庭小医生</div>
<!--      <div style="width: 100px;-->
<!--      height: 24px;-->
<!--      font-size: 18px;-->
<!--      font-family: Microsoft YaHei-Regular, Microsoft YaHei;-->
<!--      font-weight: 400;-->
<!--      color: #000000;-->
<!--      line-height: 21px;-->
<!--      ">家庭小医生</div>-->

      <el-row :gutter="10" class="mb8">
        <el-col :span="1.5">

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

@@ -18,9 +18,9 @@
        <!--        v-model="queryParams.id"-->
      </el-form-item>

      <el-form-item label="身份" prop="nickName" style="padding-left:180px">
      <el-form-item label="身份" prop="identity" >
        <el-input
          v-model="queryParams.nickName"
          v-model="queryParams.identity"
          placeholder="请输入身份"
          clearable
          style="width: 240px"
@@ -63,11 +63,10 @@
        </el-input>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
                   style=" width: 65px; height: 32px;background: #FFDDE3;
          border-radius: 6px 6px 6px 6px;opacity:1;">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
          border-radius: 6px 6px 6px 6px;opacity:1; " >重置</el-button>
        <el-button size="mini" @click="handleQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
            border-radius: 7px 7px 7px 7px;opacity: 1; " >搜索</el-button>
        <el-button  size="mini" @click="resetQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
            border-radius: 7px 7px 7px 7px;opacity: 1; ">重置</el-button>

      </el-form-item>
    </el-form>
@@ -93,17 +92,17 @@
<!--          >新增</el-button>-->
<!--        </el-col>-->

        <el-col :span="1.5">
          <el-button
            type="danger"
            plain
            icon="el-icon-delete"
            size="mini"
            :disabled="multiple"
            @click="handleDelete"
            v-hasPermi="['system:role:remove']"
          >删除</el-button>
        </el-col>
<!--        <el-col :span="1.5">-->
<!--          <el-button-->
<!--            type="danger"-->
<!--            plain-->
<!--            icon="el-icon-delete"-->
<!--            size="mini"-->
<!--            :disabled="multiple"-->
<!--            @click="handleDelete"-->
<!--            v-hasPermi="['system:role:remove']"-->
<!--          >删除</el-button>-->
<!--        </el-col>-->
        <el-col :span="1.5">
          <el-button
            type="warning"
@@ -146,13 +145,10 @@
      <el-table-column type="selection" width="25"  align="center" />
      <el-table-column  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>

      <el-table-column label="身份" prop="myName" sortable width="100" >
<!--        <template slot-scope="scope">-->
<!--          <div>-->
<!--            <a href="javascript:;" @click="handleCheck(scope.row)">{{scope.row.myName}}</a>-->
<!--          </div>-->
<!--        </template>-->

      <el-table-column label="身份" prop="identity" sortable width="100" >
        <template slot-scope="scope">
          <span>第{{scope.row.identity}}代</span>
        </template>
      </el-table-column>
      <el-table-column label="姓名" prop="nickName" sortable :show-overflow-tooltip="true" width="100" align="center"/>
      <el-table-column label="性别" prop="sex" sortable width="100" align="center" >
@@ -174,9 +170,13 @@
      <el-table-column label="所在单位" prop="unit" sortable width="150" align="center" >
        <template slot-scope="scope">{{scope.row.unit? scope.row.unit: '————'}}</template>
      </el-table-column>
      <el-table-column label="配偶" prop="spouseId" sortable width="110" align="center" >
        <template slot-scope="scope"><span>{{getPerson(scope.row.spouseId)}}</span></template>
<!--      <el-table-column label="配偶" prop="spouseId" sortable width="110" align="center" >-->
<!--        <template slot-scope="scope"><span>{{getPerson(scope.row.spouseId)}}</span></template>-->
<!--      </el-table-column>-->
      <el-table-column label="配偶" prop="spouseName" sortable width="110" align="center" >
        <template slot-scope="scope">{{scope.row.spouseName? scope.row.spouseName: '————'}}</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">

@@ -393,6 +393,7 @@
        politicalOutlook:undefined,
        deadDay:undefined,
        spouseId:undefined,
        spouseName:undefined,
        img:undefined,
        fatherId:undefined,
        momId:undefined,
@@ -400,6 +401,7 @@
        familyId:undefined,
        secondFamilyId:undefined,
        childList:undefined,
        identity:undefined,
        url: undefined,

      },
@@ -411,6 +413,7 @@
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        identity:undefined,
        nickName:undefined,
        sex:undefined,
        birth:undefined,
@@ -441,7 +444,7 @@
          message: '请输入性别',
          trigger: 'blur'
        }],
        bitrh: [{
        birth: [{
          // required: true,
          message: '请输入出生时间',
          trigger: 'blur'
@@ -470,30 +473,30 @@
      this.reset();
    },
     //拿到配偶的姓名
     getPerson(id)
     {
     //  alert(id)
   //    alert(typeof(id))
       // this.listRoot.forEach(function(item, index) {
       //             //item 就是当日按循环到的对象
       //             //index是循环的索引，从0开始
       //              //alert(typeof(item.userId))
       //             if(item.userId==id){
       //            //   alert(89)
       //            alert(item.nickName)
       //               return item.nickName
   //   getPerson(id)
   //   {
   //   //  alert(id)
   // //    alert(typeof(id))
   //     // this.listRoot.forEach(function(item, index) {
   //     //             //item 就是当日按循环到的对象
   //     //             //index是循环的索引，从0开始
   //     //              //alert(typeof(item.userId))
   //     //             if(item.userId==id){
   //     //            //   alert(89)
   //     //            alert(item.nickName)
   //     //               return item.nickName
   //     //             }
   //
   //     // })
   //     let username = ""
   //     for(let i = 0; i < this.listRoot.length;i++)
   //     {
   //       if(this.listRoot[i].userId==id)
   //        username = this.listRoot[i].nickName
       //             }

       // })
       let username = ""
       for(let i = 0; i < this.listRoot.length;i++)
       {
         if(this.listRoot[i].userId==id)
          username = this.listRoot[i].nickName
       }
       return username;
      // return "12ddd"
     },
   //     return username;
   //    // return "12ddd"
   //   },
    //隔行变色
    tableRowClassName({ row, rowIndex }) {
      if (rowIndex % 2 == 0) {
@@ -514,7 +517,7 @@
          //  alert(123)
          //   console.log(response.data)
       //   alert(76)
          this.listRoot = response.data;
          this.listRoot = response.data.data;
        //  alert(this.listRoot)
          this.total = response.data.length;
       //   alert(this.total)
@@ -611,26 +614,26 @@
      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
    //   this.$refs["elForm"].validate(valid => {
    //     if (valid) {
    //
    //       addContact(this.formDat).then(response => {
    //         this.$modal.msgSuccess("新增成功");
    //         this.open = false;
    //         this.getList();
    //       });
    //     }
    //   });
    // },
    submitDataScope: function() {

      let ul = this.fileList.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")
      let uls = this.fileListOther.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")
      this.formDat.url = ul+","+uls
      this.$refs["elForm"].validate(valid => {
        if (valid) {

          addContact(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.open = false;
            this.getList();
          });
        }
      });
    },
    requestUpload(params)
    {
      var file = params.file;
@@ -666,9 +669,9 @@
    },
    /** 导出按钮操作 */
    handleExport() {
      this.download('zfContact/export', {
      this.download('/self/user/export/genealogy', {
        ...this.queryParams
      }, `zfContact_${new Date().getTime()}.xlsx`)
      }, `zGenealogy_${new Date().getTime()}.xlsx`)
    },
    /** 导入操作*/
    // handleEnport(params){

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

@@ -43,7 +43,7 @@
             @click="getPersonInfo(rootSecList[1][0].userId)"></img>
          </el-avatar>
          <el-avatar shape="circle" class="avater_2_4" v-if="isShow_2">
          <img :src="'http://47.93.189.255:8080/'+ rootSecList[2][1].url"
          <img :src="'http://47.93.189.255:8080/'+ rootSecList[1][1].url"
            @click="getPersonInfo(rootSecList[1][1].userId)"></img>
          </el-avatar>
          <el-avatar shape="circle" class="avater_2_5" v-if="isShow_2">
@@ -63,8 +63,8 @@
                 @click="getPersonInfo(rootSecList[3][1].userId)"></img>
          </el-avatar>
          <el-avatar shape="circle" class="avater_3_1" v-if="isShow_3">
            <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
            ></el-img>
            <img :src="'http://47.93.189.255:8080/'+ rootSecList[0][0].url"
                 @click="getPersonInfo(rootSecList[0][0].userId)"></img>
          </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"
@@ -255,6 +255,7 @@
          url:undefined,
          familyId:undefined,
          secondFamilyId: undefined,
          identity:undefined,
          childList:[{
            userId: undefined,
            nickName: undefined,
@@ -282,6 +283,7 @@
            url:undefined,
            familyId:undefined,
            secondFamilyId: undefined,
            identity:undefined,
            childList:undefined
          }]
        }]
@@ -439,8 +441,8 @@
}
.avater_1_1 {
  position: absolute;
  top: 94%;
  left: 49%;
  top: 95%;
  left: 51%;
  transform: translate(-50%, -50%);
  width: 54px;
  height: 54px;
@@ -449,7 +451,7 @@
}
.avater_1_2{
  position: absolute;
  top: 84%;
  top: 85%;
  left: 48%;
  transform: translate(-50%, -50%);
  width: 45px;

 ruoyi-ui/src/views/homeRoot/personInfo.vue

@@ -1,6 +1,10 @@
<template>
  <div>
    adsafasdfasdfasdfsdf
  <div class="app-container">
    <div class="wrapper">
      <div id="building">

      </div>
    </div>
  </div>
</template>

@@ -33,4 +37,16 @@
</script>

<style>
.wrapper {
  /*背景图*/
  background: url("../../assets/images/Group 407.png");
  width: 100%;
  height: 100%;
  position: fixed;
  background-size: 100% 100%;
}
#building {
  /*设置透明度*/
  opacity: 0.75;
}
</style>

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

@@ -91,14 +91,14 @@
      </el-form-item>
    </el-form>
    <div>
      <div style="width: 171px;
                  height: 28px;
                  font-size: 21px;
                  font-family: Microsoft YaHei-Regular, Microsoft YaHei;
                  font-weight: 400;
                  color: #000000;
                  line-height: 25px;
      ">证件、荣誉、资质</div>
<!--      <div style="width: 171px;-->
<!--                  height: 28px;-->
<!--                  font-size: 21px;-->
<!--                  font-family: Microsoft YaHei-Regular, Microsoft YaHei;-->
<!--                  font-weight: 400;-->
<!--                  color: #000000;-->
<!--                  line-height: 25px;-->
<!--      ">证件、荣誉、资质</div>-->

      <el-row :gutter="10" class="mb8">
        <el-col :span="1.5">