修改了很多

feige

2024-01-23 d0136913a2c74a44f5bb30327ebbb3fd85e24fce

修改了很多

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

@@ -55,9 +55,9 @@
export function getCategory()
{
  return request({
    url: '/zDict/byId',
    url: '/family/property/type',
    method: 'get',
    params: {'id':22}
 //   params: {'id':22}
  })
}
//增加资产信息

 ruoyi-ui/src/api/system/user.js

@@ -162,6 +162,51 @@
  return request({
    url: '/family/all' ,
    method: 'get',
  

  })
}
}

export function getInfoByFid(fid)
{
  return request({
    url:'/self/user/list/getInfoByfid/'+fid,
    method: 'get'
  })
}
export function getIndividual(id){
  return request({
    url:'/self/user/'+id,
    method: 'get'
  })
}
export function getAllInfo(){
  return request({
    url:'/self/user/allFamInfo',
    method: 'get'
  })
}
export function setAuority(data)
{
  return request({
    url:'/authority/empower',
    method:'post',
    data:data
  })
}
export function getUserByFidAid(data)
{
  return request({
    url:'/authority/getInfoByAidFid',
    method: 'post',
    data: data
  })
}
export function deleteUserByFidAid(data)
{
  return request({
    url:'/authority/deleteInfoByAidFid',
    method: 'post',
    data: data
  })
}
// export function get

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

@@ -66,8 +66,12 @@
           </el-cow>
           <el-cow>
            <el-form-item label="是否常联系" prop="isAlways" label-width="90px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
              <el-input v-model="formData.isAlways === 1 ? '是':'否' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
             <el-input v-if="dte" v-model="formData.isAlways === 1 ? '是':'否' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
              </el-input>
              <el-select v-if="!dte" v-model="formData.isAlways" placeholder="请选择是否常联系" clearable :style="{width: '100%'}"  >
                <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
                ></el-option>
              </el-select>
            </el-form-item>
           </el-cow>
           <el-cow>
@@ -216,7 +220,7 @@
    // 数据范围选项
    fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
      '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
    

      fileList:[
      ],
      fileListOther:[
@@ -284,7 +288,15 @@
        }],

      },
      typeOptions: [],
      typeOptions: [{
        value: '是',
        label: '是',
      },
        {
          value: '否',
          label: '否',
        }],
      dte:false,
    }
  },
  computed: {},
@@ -297,6 +309,7 @@
      jd =  this.$route.query.detail
      this.btn= jd
      this.dsb = !jd
      this.dte = false
      this.isShow=true
     // document.title = "修改通讯录详细信息";
      this.$route.meta.title = "修改通讯录详细信息";//列表的名称
@@ -305,6 +318,7 @@
    //  document.title = "通讯录详细信息";
      this.$route.meta.title = "通讯录详细信息";//列表的名称
      this.isShow=false
      this.dte=true
      this.btn = false;
    }

@@ -313,6 +327,10 @@
      this.loading = true;
      getContactIdList(id).then((response) => {
        this.formData = response.data;
        if(this.formData.isAlways==0)
          this.formData.isAlways='否'
        else
          this.formData.isAlways = '是'
        let paths = response.data.url.split(",");
        for(let i = 0; i < paths.length; i++)
        {
@@ -347,17 +365,29 @@
      }).join(",")
      this.formData.url = ul+","+uls

      this.$refs['elForm'].validate(valid => {

      this.$refs['elForm'].validate(valid => {
      if(this.formData.isAlways=='否')
        this.formData.isAlways = 0
      else
        this.formData.isAlways = 1

        if (valid) {
          if (this.formData.id != undefined) {
            updateContact(this.formData).then(response => {
              this.$modal.msgSuccess("修改成功");
              // this.open = false;
              if(this.formData.isAlways==0)
                this.formData.isAlways='否'
              else
                this.formData.isAlways = '是'
              this.btn=false
            });
          } else {
            if(this.formData.isAlways==0)
              this.formData.isAlways='否'
            else
              this.formData.isAlways = '是'
            this.$modal.msgSuccess("修改失败");

          }

 ruoyi-ui/src/views/economy/economyInfo.vue

@@ -43,12 +43,12 @@
      <el-form-item label="备注" prop="remark">
        <el-input v-model="formData.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
      </el-form-item>
      <el-form-item label="是否是本家庭记录" prop="ownData">
        <el-input  v-model="formData.ownData=== 1 ? '是':'否'" placeholder=" " clearable :style="{width: '100%'}" :disabled=true></el-input>
      </el-form-item>
   <!--   <el-form-item label="是否是本家庭记录" prop="ownData">
        <el-input  v-model="formData.ownData === 1 ? '是':'否'" placeholder=" " clearable :style="{width: '100%'}" :disabled="true"></el-input>
      </el-form-item> -->


      <h4 class="form-header">相关图片 </h4>
      <h4 class="form-header">相关图片</h4>
      <el-upload
        action="#"
        list-type="picture-card"
@@ -186,7 +186,7 @@
      // 数据范围选项
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
      

      fileList:[
      ],
      fileListOther:[
@@ -280,6 +280,8 @@
      this.loading = true;
      getEconomyInfo(id).then((response) => {
        this.formData = response.data;
       // console.log(this.formData)
        //alert(this.formData.ownData)
        let paths = response.data.url.split(",");
        for(let i = 0; i < paths.length; i++)
        {
@@ -438,7 +440,7 @@
          updateEconomy(_this.formData).then(response => {
            this.$modal.msgSuccess("图片上传成功");
            // this.open = false;
        

          });
      })


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

@@ -108,7 +108,7 @@
    </el-row>
    <!-- 序号、基金/台账、时间、收入/支出、用途、使用人、现金/自动扣划、余额、电子文件、备注 操作-->
    <!-- 这里有个familyList数组 是在data()中定义的 -->
    <el-table v-loading="loading" :data="economyList"  @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
    <el-table v-loading="loading" :data="economyList"  @selection-change="handleSelectionChange"  :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="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>

@@ -127,11 +127,11 @@
        <template slot-scope="scope">{{scope.row.kind? scope.row.kind: '————'}}</template>
      </el-table-column>
      <el-table-column label="是否是本家庭记录" prop="ownData" sortable width="150px" >
        <template slot-scope="scope">{{scope.row.ownData === 0 ? '否': '是'}}</template>
        <template slot-scope="scope">{{scope.row.ownData === 1 ? '是': '否'}}</template>
      </el-table-column>
      <el-table-column label="电子文件" prop="url" align="center" sortable  width="110" >
        <template slot-scope="scope" >
          <div  @click="handleCheck(scope.row)">
          <div >
            <img
              class="el-upload-list__item-thumbnail"
              src="../../assets/images/deviceLis.png"
@@ -165,18 +165,19 @@
            @click="handleUpdate(scope.row)"
            v-hasPermi="['familymodel:economy:info']"
          >修改</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
                :disabled="!scope.row.ownData"
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:role:remove']"
          >删除</el-button>
  <el-button
    size="mini"
    type="text"
    icon="el-icon-delete"
        :disabled="!scope.row.ownData"
    @click="handleDelete(scope.row)"
    v-hasPermi="['system:role:remove']"
  >删除</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>

          </div>
        </template>
      </el-table-column>
@@ -352,7 +353,7 @@
  // 数据范围选项
  fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
    '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
  

      fileList:[
      ],
      fileListOther:[
@@ -504,7 +505,7 @@

      listEconomy(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data)
        //    console.log(response.data.data)
          this.economyList = response.data.data;

          this.total = response.data.total;
@@ -598,6 +599,7 @@

    /** 查看详细信息 */
    handleCheck(row){
     // alert(123)
      const id = row.id;
      this.$router.push("/familymodel/economy/economyInfo/" + id);
    },

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

@@ -225,7 +225,7 @@
     // 数据范围选项
     fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
       '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
     

      fileList:[],
      fileListOther:[],
      dsb:true,
@@ -331,6 +331,7 @@
      this.isShow=true
      this.showInput=true
      this.isEditing=true

   //   document.title = "修改荣誉证书详细信息";
      this.$route.meta.title = "修改荣誉证书详细信息";//列表的名称
    }
@@ -346,6 +347,7 @@
      this.loading = true;
      getHonor({id}).then((response) => {
        this.formData = response.data;
      //    alert(this.formData.type)
        let paths = response.data.url.split(",");
        for(let i = 0; i < paths.length; i++)
        {

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

@@ -78,11 +78,11 @@
      getUserProfile().then(response => {
        this.user = response.data;
      });
      listRoot(4).then(response =>{
      listRoot(5).then(response =>{
        this.rootList =response.data;

        const mindMapData = this.rootList[0];
        // console.log(mindMapData)
         console.log(mindMapData)
        // console.log(this.drawData(mindMapData))
        this.mapData = this.drawData(mindMapData)
        this.showMindMap = true
@@ -96,6 +96,7 @@
        "label": mpdata['spouse'] != null ? eval(mpdata['spouse']).nickName : '',
        "prop": mpdata['nickName'],
        "url": 'https://www.bendudu.com:8080/'+mpdata['url'],
           //     "purl": 'https://www.bendudu.com:8080/'+mpdata['spouse'],
        "id": mpdata['userId'],
        "link": mpdata['nickName'],
        "children": []
@@ -104,7 +105,7 @@
      if (mpdata['childList'] != null) {
        for (var i = 0; i < mpdata['childList'].length; i++) {
          var dt = {
            "label": mpdata['childList'][i]['spouse'] != null ? eval(mpdata['childList'][i]['spouse']).nickName : '',
            "label": mpdata['childList'][i]['spouse'] != null ? eval(mpdata['childList'][i]['spouse']).nickName : "",
            "prop": mpdata['childList'][i]['nickName'],
            "url": 'https://www.bendudu.com:8080/'+mpdata['childList'][i]['url'],
             "id": mpdata['childList'][i]['userId'],

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

@@ -2,16 +2,16 @@
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
      <el-form-item label="类型" prop="type">
        <el-input
          v-model="queryParams.type"
          placeholder="请输入类型"
          clearable
    
        <el-select v-model="queryParams.type" placeholder="请选择类别" clearable
          style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          @keyup.enter.native="handleQuery"
        />
                   opacity: 0.5;" allow-create
        filterable clearable :style="{width: '100%'}"  >
          <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
          ></el-option>
        </el-select>
      </el-form-item>

      <el-form-item label="标题" prop="title">
@@ -230,7 +230,8 @@
<!--          <el-input v-model="formDat.type" placeholder="请输入类别" clearable :style="{width: '100%'}" ></el-input>-->
<!--        </el-form-item>-->
        <el-form-item label="类别" prop="type">
          <el-select v-model="formDat.type" placeholder="请选择类别" clearable :style="{width: '100%'}"  >
          <el-select v-model="formDat.type" placeholder="请选择类别" allow-create
          filterable clearable :style="{width: '100%'}"  >
            <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
            ></el-option>
          </el-select>
@@ -340,7 +341,8 @@


//在system/note/index.js中导入接口函数
import {listProperty,enload, getPropertyInfo, delProperty, getCategory, addProperty, uploadPic} from "@/api/note/index";
import {listProperty,enload, getPropertyInfo, delProperty, getCategory,
addProperty, uploadPic} from "@/api/note/index";
import {Message} from "element-ui";
export default {
  name: "Role",
@@ -380,7 +382,7 @@
     // 数据范围选项
     fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
       '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
     

      fileList:[
      ],
      fileListOther:[
@@ -512,11 +514,15 @@
    getCateInfor()
    {
      let _this = this
      _this.typeOptions = []
      getCategory().then(response=>{

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


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

@@ -274,21 +274,21 @@
        },
        typeOptions2: [
          {
            value: '0',
            value: '否',
            label: '否',
          },
          {
            value: '1',
            value: '是',
            label: '是',
          }
        ],
        typeOptions3: [
          {
            value: '0',
            value: '私有',
            label: '私有',
          },
          {
            value: '1',
            value: '公有',
            label: '公有',
          }
        ],
@@ -337,7 +337,7 @@
          else
          this.formData.isFace = '否'
          if(this.formData.isPrivate==1)
                 this.formData.isPrivate = '共有'
                 this.formData.isPrivate = '公有'
               else
               this.formData.isPrivate = '私有'
          let paths = response.data.url.split(",");
@@ -390,7 +390,18 @@
          return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
         }).join(",")
          this.formData.url = ul+","+uls

if(this.formData.isFinger=='是')
            this.formData.isFinger = 1
          else
          this.formData.isFinger = 0
     if(this.formData.isFace=='是')
            this.formData.isFace = 1
          else
          this.formData.isFace = 0
          if(this.formData.isPrivate== '公有')
                 this.formData.isPrivate =1
               else
               this.formData.isPrivate = 0
        this.$refs['elForm'].validate(valid => {


@@ -398,10 +409,34 @@
            if (this.formData.id != undefined) {
              updateSecret(this.formData).then(response => {
                this.$modal.msgSuccess("修改成功");
                if(this.formData.isFinger==1)
                       this.formData.isFinger = '是'
                     else
                     this.formData.isFinger = '否'
                if(this.formData.isFace==1)
                       this.formData.isFace = '是'
                     else
                     this.formData.isFace = '否'
                     if(this.formData.isPrivate==1)
                            this.formData.isPrivate = '公有'
                          else
                          this.formData.isPrivate = '私有'
                // this.open = false;
                this.btn=false
              });
            } else {
              if(this.formData.isFinger==1)
                     this.formData.isFinger = '是'
                   else
                   this.formData.isFinger = '否'
              if(this.formData.isFace==1)
                     this.formData.isFace = '是'
                   else
                   this.formData.isFace = '否'
                   if(this.formData.isPrivate==1)
                          this.formData.isPrivate = '公有'
                        else
                        this.formData.isPrivate = '私有'
              this.$modal.msgSuccess("修改失败");

            }

 ruoyi-ui/src/views/self/show.vue

@@ -682,10 +682,10 @@
<!--              </el-select>-->
<!--            </el-form-item>-->
            <el-form-item label="年龄段：" prop="ageBegin ageEnd" label-width="70px">
              <el-input v-model="formDat.ageBegin" placeholder="" clearable :style="{width: '20%'}" >
              <el-input type="number" v-model="formDat.ageBegin" placeholder="" clearable :style="{width: '20%'}" >
              </el-input>
              <span> 岁 ——</span>
              <el-input v-model="formDat.ageEnd" placeholder="" clearable :style="{width: '20%'}" >
              <el-input type="number" v-model="formDat.ageEnd" placeholder="" clearable :style="{width: '20%'}" >
              </el-input>
              <span> 岁 </span>
          </el-form-item>

 ruoyi-ui/src/views/system/user/index.vue

@@ -190,7 +190,7 @@
          <el-col :span="12">
            <el-form-item label="角色" prop="roleIds">
              <el-select v-model="rt" placeholder="请选择角色" @change="getRole">
                <el-option :key="-1" :label="无" :value="-1">无</el-option>

                <el-option
                  v-for="item in roleOptions"
                  :key="item.roleId"
@@ -203,44 +203,7 @@
          </el-col>

        </el-row>
        <el-row>

       <el-col :span="12">
         <el-form-item label="家庭号">
           <el-select v-model="fid"   placeholder="请选择家庭号">
               <el-option  :key="-1" :label="无"
               value="无">无</el-option>

             <el-option
               v-for="item in famiInfo"
               :key="item.id"
               :label="item.name"
               :value="item.id"

             ></el-option>
           </el-select>

         </el-form-item>
       </el-col>

          <el-col :span="12">
            <el-form-item label="邮箱" prop="email">
              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="用户性别">
@@ -268,10 +231,78 @@
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="手机号码" prop="phonenumber">
              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>

        <el-col :span="12">
          <el-form-item label="家庭号">
            <el-select v-model="fid"   placeholder="请选择家庭号" @change="handleChange">

  <el-option
      key="-1"
      label="无"
      value="-1"
              ></el-option>
              <el-option
                v-for="item in famiInfo"
                :key="item.id"
                :label="item.name"
                :value="item.id"

              ></el-option>
            </el-select>

          </el-form-item>
        </el-col>

         </el-row>

        <el-row v-if="isshowMar">

          <el-col :span="12">
            <el-form-item label="是否本家" prop="isMyFamily">
              <el-select v-model="form.isMyFamily"   placeholder="请输入是否本家"  @change="handleFamily">


                <el-option
                  key=1
                  label="是"
                  value=1
                ></el-option>
                <el-option
                  key=0
                  label="否"
                  value=0
                ></el-option>
              </el-select>

            </el-form-item>
          </el-col>

        </el-row>
        <el-row v-if="isshowMri">
          <el-col :span="12">
             <el-form-item label="配偶信息" prop="spouseId">
              <el-select v-model="form.spouseId"   placeholder="请选择配偶信息">
                <el-option
                  v-for="item in allInfo"
                  :key="item.userId"
                  :label="item.nickName"
                  :value="item.userId"
                ></el-option>
              </el-select>

             </el-form-item>
           </el-col>
        </el-row>
        <el-row>
          <el-col :span="24">
@@ -320,7 +351,10 @@
</template>

<script>
import { listUser, getUser, delUser, updateUserInfo,addUser, updateUser, getAllFamilys,resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
import { getIndividual,getInfoByFid,
getAllInfo,listUser, getUser, delUser,
 updateUserInfo,addUser, updateUser, getAllFamilys,resetUserPwd,
 changeUserStatus, deptTreeSelect } from "@/api/system/user";
import { getToken } from "@/utils/auth";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -345,6 +379,8 @@
      showSearch: true,
      // 总条数
      total: 0,
      isshowMri: false,
      isshowMar: false,
      // 用户表格数据
      userList: null,
      // 弹出层标题
@@ -367,7 +403,11 @@
      // 角色选项
      roleOptions: [],
      // 表单参数

      motherInfo:[],
      fathorInfo:[],
      allInfo:[],
      faid: 0,
      maid: 0,
      form: {},
      defaultProps: {
        children: "children",
@@ -419,10 +459,15 @@
        roleIds: [
          { required: true, message: "用户角色不能为空", trigger: "blur" }
        ],
        isMyFamily: [
          { required: true, message: "是否外嫁不能为空", trigger: "blur" }
        ],
        deptId: [
          { required: true, message: "用户角色不能为空", trigger: "blur" }
        ],

        spouseId: [
          { required: true, message: "配偶信息不能为空", trigger: "blur" }
        ],
        password: [
          { required: true, message: "用户密码不能为空", trigger: "blur" },
          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
@@ -454,11 +499,48 @@
    this.getList();
    this.getFamlilyInfo();
    this.getDeptTree();
    //拿到自己定义的用户信息
   // this.getAllIn();
    this.getConfigKey("sys.user.initPassword").then(response => {
      this.initPassword = response.msg;
    });
  },
  methods: {
    handleChange()
    {
   //   alert(this.fid)
      if(this.fid=="无")
        this.fid = "-1"
      if(this.fid!="-1")
      {
        //查询不是本家的时候，可以选择的配偶信息
       alert(this.fid)

       getInfoByFid(this.fid).then(response=>{
         console.log("--------------------")
         console.log(response.data)
         this.allInfo = response.data
       })
        this.isshowMar = true
      }
      else{
        this.isshowMar = false
      }
    },
    handleFamily()
    {
      alert(this.form.isMyFamily)
      if(this.form.isMyFamily=="0")
        this.isshowMri = true
    },
    getAllIn(){
     // alert(123)
      getAllInfo().then(response => {
       // this.allInfo = response.data;
      //  console.log(response.data)
      //  alert(982)
      })
    },
    getRole(){
      this.form.roleIds = []
      //alert(123)
@@ -467,8 +549,13 @@
    getFamlilyInfo(){
      let _this = this
      getAllFamilys().then(response => {
        //console.log(response.data)
        _this.famiInfo = response.data
       // console.log(response.data)
      //  alert(response.data[0])
         _this.famiInfo= response.data.filter(function(item){
   return item.name !== "一号家庭";
});


      })
    },
    /** 查询用户列表 */
@@ -511,6 +598,9 @@
    // 取消按钮
    cancel() {
      this.open = false;
      this.fid = "无"
      this.isshowMar = false
      this.isshowMri = false
      this.reset();
    },
    // 表单重置
@@ -568,7 +658,10 @@
      this.reset();
      getUser().then(response => {
        this.postOptions = response.posts;
        this.roleOptions = response.roles;
        // this.roleOptions = response.roles;
          this.roleOptions= []
        this.roleOptions.push(response.roles[1])
          this.roleOptions.push(response.roles[3])
        this.open = true;
        this.title = "添加用户";
        this.form.password = this.initPassword;
@@ -578,11 +671,29 @@
    handleUpdate(row) {
      this.reset();
      const userId = row.userId || this.ids;
     // alert(userId)

      //  this.fid = response.data.familyId
        //alert(this.fid)
      getUser(userId).then(response => {
        this.form = response.data;
        console.log(response.data)
        this.postOptions = response.posts;
        this.roleOptions = response.roles;
       // alert(response.roleIds.length)
        if(response.roleIds.length!=0)
        this.rt = response.roleIds[0]
        let _this = this

     getIndividual(userId).then(response => {
           //  alert(123)
              console.log(response.data)
            if(response.data!=undefined)
            {
              _this.fid = response.data.familyId;
              }
          }
        );
        this.$set(this.form, "postIds", response.postIds);
        this.$set(this.form, "roleIds", response.roleIds);
        this.open = true;
@@ -618,45 +729,70 @@

    //    alert(this.form.roleIds)
        let ps = true
      //  alert(this.rt)
      //  alert(this.fid)
       // alert(this.rt)
       // alert(this.fid)
        if(this.fid=="无")
          this.fid = -1
        let _this = this
        if(this.rt===2 && (this.fid!="无"))
        if(this.rt===2 && (this.fid!=-1))
        {
          ps = false

        }
        if(this.rt!=2&&this.fid==-1)
        {
           this.$modal.msgSuccess("家庭成员，必须要拥有家庭号！");
           return
        }
      //  alert(ps)
        if(ps)
        {
          let fm = {}
          fm.userId = _this.form.userId

          if(_this.fid==="无")
            fm.familyId= -1
          else
            fm.familyId = _this.fid
          this.form.familyId = fm.familyId

          if (valid) {
            if (this.form.userId != undefined) {
              updateUser(this.form).then(response => {

                let fm = {}
                fm.userId = _this.form.userId
       
                if(_this.fid==="无")
                  fm.familyId= -1
                else
                  fm.familyId = _this.fid

                updateUserInfo(fm).then(response=>{
                   this.$modal.msgSuccess("修改成功");
                   this.open = false;
                   this.getList();
                   _this.rt = undefined
                   _this.fid = "无"
                   this.isshowMar = false
                   this.isshowMri = false
                })
              });
            } else {
            //  alert(this.form.ismarry)
            //  alert(987)
              addUser(this.form).then(response => {
                this.$modal.msgSuccess("新增成功");
                this.open = false;
                this.getList();
                _this.rt = undefined
                _this.fid = "无"
                this.isshowMar = false
                this.isshowMri = false
              });
            }
            }


        }
        else{
          this.$modal.msgSuccess("普通角色不能拥有家庭号！");
        //  _this.rt = undefined
          _this.fid = "无"
          _this.isshowMar = false
        }
      });
    },

 ruoyi-ui/src/views/system/user/profile/index.vue

@@ -56,252 +56,77 @@
      </el-col>
    </el-row>
    <div style="padding-top: 20px; background-color: #F4FFF8;">
      <div class="container">
        <div>
          <span style="font-family: Microsoft YaHei-Regular, Microsoft YaHei; padding-left: 10px;">权限情况</span>
        </div>
        <div style="padding-left: 10px;">
          <el-dropdown v-model="selectedFamily"  @command="handleDropdownCommand">
        <span class="el-dropdown-link">
          {{ selectedFamily || '下拉菜单' }}<i class="el-icon-arrow-down el-icon--right"></i>
        </span>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item command="一号家庭">一号家庭</el-dropdown-item>
              <el-dropdown-item command="二号家庭">二号家庭</el-dropdown-item>
              <el-dropdown-item command="三号家庭">三号家庭</el-dropdown-item>
              <el-dropdown-item command="四号家庭">四号家庭</el-dropdown-item>
            </el-dropdown-menu>
          </el-dropdown>
        </div>
      </div>

      <el-divider></el-divider>
      <div >
        <el-tabs v-model="activeTab1" style="padding-left: 25px;" @tab-click="handleTabClick">
          <el-tab-pane label="家根网"  prop="家根网">
            <span >查看权限</span>
            <span style="padding-left: 1200px;">{{SelfPermissionList.search === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>新增权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.insert === 0 ? '未持有' : '持有'  }}</span>
            <el-divider></el-divider>
            <span>删除权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.delete  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>修改权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.update  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
          </el-tab-pane>
          <el-tab-pane label="家大事记">
            <span >查看权限</span>
            <span style="padding-left: 1200px;">{{SelfPermissionList.search === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>新增权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.insert === 0 ? '未持有' : '持有'  }}</span>
            <el-divider></el-divider>
            <span>删除权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.delete  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>修改权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.update  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
          <el-form ref="form" :model="form" :rules="rules" label-width="100px">
       <el-row>
       <el-col :span="10" :xs="24">
        <el-form-item label="菜单权限">
       <el-tree
            class="tree-border"
            :data="menuOptions"
            show-checkbox
            ref="authr"
            node-key="id"
:default-expand-all="true"

          </el-tab-pane>
          <el-tab-pane label="家庭资产">
            <span >查看权限</span>
            <span style="padding-left: 1200px;">{{SelfPermissionList.search === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>新增权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.insert === 0 ? '未持有' : '持有'  }}</span>
            <el-divider></el-divider>
            <span>删除权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.delete  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>修改权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.update  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
          </el-tab-pane>
          <el-tab-pane label="家庭设备">
            <span >查看权限</span>
            <span style="padding-left: 1200px;">{{SelfPermissionList.search === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>新增权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.insert === 0 ? '未持有' : '持有'  }}</span>
            <el-divider></el-divider>
            <span>删除权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.delete  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>修改权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.update  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
          </el-tab-pane>
          <el-tab-pane label="收藏荣誉">
            <span >查看权限</span>
            <span style="padding-left: 1200px;">{{SelfPermissionList.search === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>新增权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.insert === 0 ? '未持有' : '持有'  }}</span>
            <el-divider></el-divider>
            <span>删除权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.delete  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>修改权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.update  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
          </el-tab-pane>
          <el-tab-pane label="小医生">
            <span >查看权限</span>
            <span style="padding-left: 1200px;">{{SelfPermissionList.search === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>新增权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.insert === 0 ? '未持有' : '持有'  }}</span>
            <el-divider></el-divider>
            <span>删除权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.delete  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>修改权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.update  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
          </el-tab-pane>
          <el-tab-pane label="保洁收纳">
            <span >查看权限</span>
            <span style="padding-left: 1200px;">{{SelfPermissionList.search === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>新增权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.insert === 0 ? '未持有' : '持有'  }}</span>
            <el-divider></el-divider>
            <span>删除权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.delete  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>修改权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.update  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
          </el-tab-pane>
          <el-tab-pane label="通讯录">
            <span >查看权限</span>
            <span style="padding-left: 1200px;">{{SelfPermissionList.search === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>新增权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.insert === 0 ? '未持有' : '持有'  }}</span>
            <el-divider></el-divider>
            <span>删除权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.delete  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>修改权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.update  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
          </el-tab-pane>
          <el-tab-pane label="魅宠">
            <span >查看权限</span>
            <span style="padding-left: 1200px;">{{SelfPermissionList.search === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>新增权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.insert === 0 ? '未持有' : '持有'  }}</span>
            <el-divider></el-divider>
            <span>删除权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.delete  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>修改权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.update  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
          </el-tab-pane>
          <el-tab-pane label="家庭收支台账">
            <span >查看权限</span>
            <span style="padding-left: 1200px;">{{SelfPermissionList.search === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>新增权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.insert === 0 ? '未持有' : '持有'  }}</span>
            <el-divider></el-divider>
            <span>删除权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.delete  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
            <span>修改权限</span>
            <span style="padding-left: 1200px;">{{ SelfPermissionList.update  === 0 ? '未持有' : '持有' }}</span>
            <el-divider></el-divider>
          </el-tab-pane>
        </el-tabs>
            empty-text="加载中，请稍候"
            :props="defaultProps"
          ></el-tree>     </el-form-item>
          </el-col>
          <el-col :span="4" :xs="24" type="flex" align="middle">可以授权相关人员</el-col>
          <el-col  :span="10" :xs="24">
          <el-tree
               class="tree-border"
               :data="menuOptions1"
               show-checkbox
               ref="peoInfo"
               node-key="id"

               empty-text="加载中，请稍候"
               :props="defaultProps"
             ></el-tree>
             </el-col>
</el-row>
<el-button type="primary" @click="upAuthority">授权</el-button>
        </el-form>
      </div>
    </div>

<div style="padding-top: 25px;">
  <div v-if="user.roleName==='家庭管理员'" style=" padding-top: 25px;background-color: #F4FFF8;" >
    <div class="container">
      <el-divider></el-divider>
      <div>
        <span style="font-family: Microsoft YaHei-Regular, Microsoft YaHei; padding-left: 10px;">其他家庭权限管理</span>
      </div>
      <div style="padding-left: 10px;">
        <el-dropdown v-model="selectedFamily"  @command="handleDropdownCommand1">
        <span class="el-dropdown-link">
          {{ command1 ||'下拉菜单' }}<i class="el-icon-arrow-down el-icon--right"></i>
        </span>
          <el-dropdown-menu slot="dropdown">
            <el-dropdown-item command="一号家庭">一号家庭</el-dropdown-item>
            <el-dropdown-item command="二号家庭">二号家庭</el-dropdown-item>
            <el-dropdown-item command="三号家庭">三号家庭</el-dropdown-item>
            <el-dropdown-item command="四号家庭">四号家庭</el-dropdown-item>
          </el-dropdown-menu>
        </el-dropdown>
        <el-form>
        <el-row>
          <el-col :span="10" :xs="24">
           <el-form-item label="收回权限">
              <el-select v-model="st" placeholder="请选择菜单" @change="handleChange">
                   <el-option v-for="mo in menuOptions2" :label="mo.label" :value="mo.id" :key="mo.id"></el-option>
                 </el-select>


              </el-form-item>
              </el-col>
              <el-col :span="4" :xs="24" class="centered">已经授权相关人员</el-col>
             <el-col :span="10" :xs="24">
                     <el-form-item label="已经授权相关成员">
                    <el-tree
                         class="tree-border"
                         :data="menuOptionsp"
                         show-checkbox
                         ref="spp"
                         node-key="id"
             :default-expand-all="true"

                         empty-text="加载中，请稍候"
                         :props="defaultProps"
                       ></el-tree>     </el-form-item>
                       </el-col>
              </el-row>
              <el-button type="primary" @click="deleteAuthority">收回授权</el-button>
              </el-form>
      </div>
    </div>
    <el-divider></el-divider>
    <div v-if="FaimlyList && FaimlyList.length > 0">
      <el-tabs v-model="activeTab2" style="padding-left: 25px;" @tab-click="handleTabClick1">
        <el-tab-pane label="家根网"  prop="家根网">

          <span v-for="member in FaimlyList" :key="member.id">{{ member.name }}<el-divider></el-divider></span>
        </el-tab-pane>
        <el-tab-pane label="家大事记">
            <span v-for="member in FaimlyList" :key="member.id">{{ member.name }}<el-divider></el-divider></span>

        </el-tab-pane>
        <el-tab-pane label="家庭资产">
          <span>
            <span v-for="member in FaimlyList" :key="member.id">{{ member.name }}<el-divider></el-divider></span>

          </span>
        </el-tab-pane>
        <el-tab-pane label="家庭设备">
          <span v-for="member in FaimlyList" :key="member.id">{{ member.name }}<el-divider></el-divider></span>

        </el-tab-pane>
        <el-tab-pane label="收藏荣誉">
          <span v-for="member in FaimlyList" :key="member.id">{{ member.name }}<el-divider></el-divider></span>

        </el-tab-pane>
        <el-tab-pane label="小医生">
          <span v-for="member in FaimlyList" :key="member.id">{{ member.name }}<el-divider></el-divider></span>

        </el-tab-pane>
        <el-tab-pane label="保洁收纳">
          <span v-for="member in FaimlyList" :key="member.id">{{ member.name }}<el-divider></el-divider></span>

        </el-tab-pane>
        <el-tab-pane label="通讯录">
          <span v-for="member in FaimlyList" :key="member.id">{{ member.name }}<el-divider></el-divider></span>

        </el-tab-pane>
        <el-tab-pane label="魅宠">
          <span v-for="member in FaimlyList" :key="member.id">{{ member.name }}<el-divider></el-divider></span>

        </el-tab-pane>
        <el-tab-pane label="家庭收支台账">
          <span v-for="member in FaimlyList" :key="member.id">{{ member.name }}<el-divider></el-divider></span>

        </el-tab-pane>
      </el-tabs>
    </div>
  </div>
</div>

<div style="padding-top: 20px">
      <div v-if="user.roleName==='家庭管理员'" style=" padding-top: 25px;background-color: #F4FFF8;" >
          <div>
            <span style="font-family: Microsoft YaHei-Regular, Microsoft YaHei; padding-left: 10px;">家庭成员管理</span><el-divider></el-divider>
          </div>
        <div style="padding-left: 20px;padding-top: 10px">
        <span v-for="member in FaimlyList1" :key="member.id">{{ member.name }}<el-divider></el-divider></span>
        </div>
    </div>
</div>
  </div>

</template>
@@ -310,7 +135,8 @@
import userAvatar from "./userAvatar";
import userInfo from "./userInfo";
import resetPwd from "./resetPwd";
import { getUserProfile ,getSelfPermission,getFamilyids} from "@/api/system/user";
import { getAllInfo,getUserProfile ,getSelfPermission,getFamilyids,setAuority
,getUserByFidAid,deleteUserByFidAid} from "@/api/system/user";
import { getIndividualList } from "@/api/self";
import {updateFamilyevent} from "@/api/bignote";

@@ -323,6 +149,100 @@
        familyName: undefined,
        modelName: undefined,
      },
      fid: undefined,
      st: undefined,
      menuOptionsp:[
        {
          id: 1,
          label: '家庭成员',
          children:[]
        }
      ],
      menuOptions2:[
        {
          id: 2000,
          label: '家庭资产管理',

        },
        {
          id: 2012,
          label: '家大事记',
        },
        { id:2016,
          label: '家庭设备',
          },
          {
          id: 2004,
          label: '收藏和荣誉',

        },
        {
          id: 2029,
          label: '家庭小医生',
        },
        { id:2024,
          label: '保洁收纳',
          },
        {
          id: 2021,
          label: '通讯录',
        },
        { id:2033,
          label: '魅宠',
          },
          {id:2008,
            label: '家庭收支台账',
            }
      ],
      menuOptions1:[
        {
          id: 1,
          label: '家庭成员',
          children:[]
        }
      ],
      menuOptions:[
          {
            id: 1,
            label: '家庭模块',
            children: [
              {
                id: 2000,
                label: '家庭资产管理',

              },
              {
                id: 2012,
                label: '家大事记',
              },
              { id:2016,
                label: '家庭设备',
                },
                {
                id: 2004,
                label: '收藏和荣誉',

              },
              {
                id: 2029,
                label: '家庭小医生',
              },
              { id:2024,
                label: '保洁收纳',
                },
              {
                id: 2021,
                label: '通讯录',
              },
              { id:2033,
                label: '魅宠',
                },
                {id:2008,
                  label: '家庭收支台账',
                  }
            ],
          },
      ],
      FaimlyList:undefined,
      FaimlyList1:undefined,
      selectedFamily: "一号家庭",
@@ -350,6 +270,85 @@
    this.getList();
  },
  methods: {
    deleteAuthority(){
    //  alert(this.st)
      let uidKeys = this.$refs.spp.getCheckedKeys();
      let auIds = []
      auIds.push(this.st)
      let data = {
        uids:  uidKeys,
        fid: this.fid,
        authoritys: auIds
      }
      let _this = this
      if(this.st!=undefined&&uidKeys.length!=0){
        deleteUserByFidAid(data).then(response=>{
             this.$modal.msgSuccess(response.msg)
             let data = {
               "fid": _this.fid,
               "authority": _this.st
             }
           //  alert(data.authority)
            // let _this = this
             getUserByFidAid(data).then(response=>{
               console.log(response)
               let fams = response.data;
               for(let i = 0 ; i < fams.length; i++)
                 _this.menuOptionsp[0]['children'].push({id:fams[i].userId,label:fams[i].nickName })

             })
        })
        }
      else{
           this.$modal.msgSuccess("权限或被授权人不能为空！")
      }
    },
    getDeptAllCheckedKeys() {
      // 目前被选中的部门节点
      let checkedKeys = this.$refs.authr.getCheckedKeys();
     // console.log(checkedKeys)
      },
    upAuthority(){
      let checkedKeys = this.$refs.authr.getCheckedKeys();
      let peoKeys = this.$refs.peoInfo.getCheckedKeys();
     // console.log(peoKeys)
     // alert(checkedKeys.length)
     // this.getDeptAllCheckedKeys()
     if(checkedKeys.length!=0&&peoKeys.length!=0)
     {
       let data = {
         uids:  peoKeys,
         fid: this.fid,
         authoritys: checkedKeys
       }
     //  console.log(data)
      //  alert(123)
        setAuority(data).then(response=>{
       //   console.log(response)
           this.$modal.msgSuccess(response.msg)
        //  alert(response.data)
        })
      }
      else{
        this.$modal.msgSuccess("权限或被授权人不能为空！");
  }
    },
    handleChange(value){

      let data = {
        "fid": this.fid,
        "authority": value
      }
      alert(data.authority)
      let _this = this
      getUserByFidAid(data).then(response=>{
        console.log(response)
        let fams = response.data;
        for(let i = 0 ; i < fams.length; i++)
          _this.menuOptionsp[0]['children'].push({id:fams[i].userId,label:fams[i].nickName })

      })
    },
    handleTabClick(tab) {
      this.selectedTab = tab.label;
      if (this.selectedFamily && this.selectedTab) {
@@ -360,29 +359,29 @@
      this.selectedTab1 = tab.label;
    },
    handleDropdownCommand(command) {
      this.selectedFamily = command; // 更新选中的家庭
      console.log(this.selectedFamily)
      // 检查下拉菜单和切片页面是否都被选中
      if (this.selectedFamily && this.selectedTab) {
        this.getList();
      }
      // this.selectedFamily = command; // 更新选中的家庭
      // console.log(this.selectedFamily)
      // // 检查下拉菜单和切片页面是否都被选中
      // if (this.selectedFamily && this.selectedTab) {
      //   this.getList();
      // }
    },
    handleDropdownCommand1(command1) {
      this.command1= command1;
      console.log(command1)
      let id = null;
      if (command1 == '一号家庭') {
        id = 1;
      } else if (command1 == '二号家庭') {
        id = 2;
      } else if (command1 == '三号家庭') {
        id = 3;
      } else if (command1 == '四号家庭') {
        id = 4;
      }
      if (id) {
        this.getUser(parseInt(id)); // 将id转换为数字类型
      }
      // this.command1= command1;
      // console.log(command1)
      // let id = null;
      // if (command1 == '一号家庭') {
      //   id = 1;
      // } else if (command1 == '二号家庭') {
      //   id = 2;
      // } else if (command1 == '三号家庭') {
      //   id = 3;
      // } else if (command1 == '四号家庭') {
      //   id = 4;
      // }
      // if (id) {
      //   this.getUser(parseInt(id)); // 将id转换为数字类型
      // }
    },


@@ -394,45 +393,54 @@
      //   this.postGroup = response.postGroup;
      // });

      getFamilyids(id).then(response => {
        console.log(id)
        this.FaimlyList = response.data;
        console.log("打印家庭成员序列"+id)
        console.log(this.FaimlyList)
      });
     //  getFamilyids(id).then(response => {
     //    console.log(id)
     // //   this.FaimlyList = response.data;
     //    console.log("打印家庭成员序列"+id)
     //    console.log(this.FaimlyList)
     //  });
      getIndividualList().then(response => {
        this.user = response.data;

       // alert(890)
        this.fid = response.data.familyId
    //    alert(this.fid)
        this.roleGroup = response.roleGroup;
        this.postGroup = response.postGroup;
      });
      if (this.user.familyName='一号家庭'){
        id=1;
        getFamilyids(id).then(response => {
          console.log(id)
          this.FaimlyList1 = response.data;
          console.log("打印家庭成员序列"+id)
          console.log(this.FaimlyList)
        });
      }
      // if (this.user.familyName='一号家庭'){
      //   id=1;
      //   getFamilyids(id).then(response => {
      //     console.log(id)
      //     this.FaimlyList1 = response.data;
      //     console.log("打印家庭成员序列"+id)
      //     console.log(this.FaimlyList)
      //   });
      // }



    },
    getList() {

      var formData ={
    "familyName": this.selectedFamily,
    "modelName":this.selectedTab,
}
    let _this = this

      var jsonString = JSON.stringify(formData);
    //  console.log(jsonString);
    getAllInfo().then(response=>{
      let fams = response.data
      for(let i = 0; i < fams.length; i++)
        _this.menuOptions1[0]['children'].push({id:fams[i].userId,label:fams[i].nickName })
    })
//       var formData ={
//     "familyName": this.selectedFamily,
//     "modelName":this.selectedTab,
// }

      getSelfPermission(jsonString).then(response => {
        this.SelfPermissionList = response.data;
        console.log(this.SelfPermissionList)
      });
//       var jsonString = JSON.stringify(formData);
//     //  console.log(jsonString);

//       getSelfPermission(jsonString).then(response => {
//         this.SelfPermissionList = response.data;
//         console.log(this.SelfPermissionList)
//       });

    }
  }
@@ -443,7 +451,13 @@
.container {
  display: flex;
}

.centered {
  display: flex;
  flex-direction: column;
  align-items: center;
  justify-content: center;
  text-align: center;
}
.el-icon-arrow-down {
  font-size: 12px;
}

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

@@ -277,13 +277,13 @@
          </el-input>
        </el-form-item>
        <el-form-item label="起始时间" prop="startTime">
          <el-date-picker v-model="formDat.startTime" type="date" placeholder="请选择日期"
                          :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
          <el-date-picker v-model="formDat4.startTime" type="date" placeholder="请选择日期"
                         value-format="yyyy-MM-dd" :style="{width: '100%'}"
          ></el-date-picker>
        </el-form-item>
        <el-form-item label="结束时间" prop="endTime">
          <el-date-picker v-model="formDat.endTime" type="date" placeholder="请选择日期"
                          :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
        <el-form-item label="结束时间1" prop="endTime">
          <el-date-picker v-model="formDat4.endTime" type="date" placeholder="请选择日期"
                          :style="{width: '100%'}"  value-format="yyyy-MM-dd"
          ></el-date-picker>
        </el-form-item>
        <el-form-item label="去向" prop="destination">
@@ -511,7 +511,7 @@
   // 数据范围选项
   fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
     '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
   

      fileList:[
      ],
      fileListOther:[
@@ -661,7 +661,7 @@
        destination: [{
          required: true,
          message: '请选择去向',
          trigger: 'change'
          trigger: 'blur'
        }],
        property: [{
          required: true,
@@ -670,13 +670,14 @@
        }],
        startTime: [{
          required: true,
          type: "string",
          message: '请选择日期',
          trigger: 'change'
          trigger: 'blur'
        }],
        endTime: [{
          required: true,
          message: '请选择日期',
          trigger: 'change'
          trigger: 'blur'
        }],
        name: [{
          required: true,

 ruoyi-ui/vue.config.js

@@ -35,8 +35,8 @@
    proxy: {
      // detail: https://cli.vuewww.bendudu.comjs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
      //  target: `https://10.39.18.174:8080/`,
        target: 'https://www.bendudu.com:8080/',
        target: `https://10.39.18.174:8080/`,
       // target: 'https://www.bendudu.com:8080/',
        changeOrigin: true,
        pathRewrite: {
          ['^' + process.env.VUE_APP_BASE_API]: ''