修改了相应的bug

feige

2024-10-18 ed96edec7c6dfd4944d0ee1c6d924c7cb808428c

修改了相应的bug

 ruoyi-ui/src/App.vue

@@ -34,5 +34,6 @@
<style scoped>
#app .theme-picker {
  display: none;
  
}
</style>

 ruoyi-ui/src/views/clanManager/ancestor/index.vue

@@ -76,7 +76,7 @@

          <el-table-column label="用户角色" align="center" key="roleName" prop="roleName" width="120" />
      <el-table-column label="性别" align="center" key="sex" prop="sex"  width="120" >
            <template slot-scope="scope">{{scope.row.sex==0? '女': '男'}}</template>
            <template slot-scope="scope">{{scope.row.sex==1? '女': '男'}}</template>
            
          </el-table-column>
      
@@ -484,14 +484,23 @@
    /** 搜索按钮操作 */
    handleQuery() {
      this.queryParams.pageNum = 1;
	 
      this.getList();
    },
    /** 重置按钮操作 */
    resetQuery() {
      this.dateRange = [];
      this.resetForm("queryForm");
      this.queryParams.deptId = undefined;
      this.$refs.tree.setCurrentKey(null);
      this.queryParams = {
        pageNum: 1,
        pageSize: 10,
        name: undefined,
        role: undefined,
        sex: undefined,
	    
      },
      
     // this.$refs.tree.setCurrentKey(null);
      this.handleQuery();
    },
    // 多选框选中数据
@@ -533,18 +542,21 @@
    /** 修改按钮操作 */
    handleUpdate(row) {
      this.a = 2
      this.pOID = row.userId
      console.log(row)
      console.log("000000000--")
      this.pOID = row.id
      this.sex = row.sex
    //  this.getSex();
      this.reset();
      const userId = row.userId || this.ids;
      this.cuid= row.userId || this.ids;
      const userId = row.id || this.ids;
      this.cuid= row.id || this.ids;
      //  this.fid = response.data.familyId
    //  alert(userId)
        //alert(this.fid)
      getUser(userId).then(response => {
        this.form = response.data;
        console.log(response.data,'formformformformform')
        console.log(this.form.spouseId,'伴侣id')
     //   console.log(this.form.spouseId,'伴侣id')
        this.postOptions = response.posts;
        this.roleOptions= []
        this.roleOptions.push(response.roles[1])

 ruoyi-ui/src/views/clanManager/clan/index.vue

@@ -203,6 +203,7 @@
      },
      personInfos:[],
      personInfos1:[],
      res: false, 
      // 表单参数
      form: {
          clanId: undefined,
@@ -221,6 +222,17 @@
      }
    };
  },
  watch: {
            'form.clanName': function(newVal, oldVal){
                // alert(newVal)
                // alert(oldVal)
	
                if(newVal==oldVal||oldVal==undefined)
                    this.res = false; 
                else
                    this.res = true; 
            },
            },
  created() {
    this.getList();
    //this.getAllUser();
@@ -475,6 +487,13 @@
    /** 提交按钮 */
    submitForm: function() {
      let _this = this
      //alert(this.res)
      if(this.res == false)
      {
          this.$modal.msgSuccess("家族名称没有修改，不能提交")
		  
        return;
        }
      this.$refs["form"].validate(valid => {
        if (valid) {
         //alert(this.form.id)
@@ -483,6 +502,7 @@
           // this.form.menuIds = this.getMenuAllCheckedKeys();
            updateClan(this.form).then(response => {
                console.log(response)
              this.res = false; 
              if(response.msg=="家族名称不能重复！")
                this.$modal.msgSuccess("家族名称不能重复")
                else{

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

@@ -461,12 +461,12 @@
    <el-table v-loading="loading1" :data="listRoot" :row-key="getRowId1" ref="table1"  @selection-change="handleSelectionChange1"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
          <el-table-column type="selection" width="55"  align="center" />
          <el-table-column fixed label="序号" sortable type="index" :index="(queryParams1.pageNum-1)*queryParams1.pageSize+1" width="130"/>
          <el-table-column label="身份" prop="identity" sortable width="130" >
         <!-- <el-table-column label="身份" prop="identity" sortable width="130" >
            <template slot-scope="scope" >
              <span v-if="scope.row.isMyFamily==1">第{{scope.row.identity}}代</span>
              <span v-else>——</span>
            </template>
          </el-table-column>
          </el-table-column> -->
          <el-table-column label="姓名" prop="nickName" sortable :show-overflow-tooltip="true" width="145" align="center"/>
        </el-table>

@@ -606,9 +606,8 @@
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
import {getInfo} from "@/api/login";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
import {s} from "@/api/bignote/index";
import {getAllInfo} from "@/api/system/user"

import {showShareUser} from "@/api/bignote/index";
//导入接口函数
import {getContactList,enload,  addContact, delContact,uploadPic,
        share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
@@ -973,6 +972,7 @@
            this.listRoot.forEach(element => {
              kon[element['nickName']] = element['userId']
            })
            console.log(this.listRoot)
            // for(let i in kon){
            //   this.userOptions.push({label: i,value: kon[i]})
            // }
@@ -993,7 +993,7 @@
      this.$modal.confirm('是否确认分享？').then(function() {
        return share(shareList);
      }).then(() => {

        this.userOptions = []
        this.getList();
        this.getList1();
        this.$modal.msgSuccess("分享成功");

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

@@ -129,16 +129,18 @@
        
                             
               
			   
                <el-button size='mini' type="text" class="btn_edit" @click="editAutography" style='top: 0px;right: 20px;'>
               <div style="margin-bottom: 20px;">
                <el-button size='mini' type="text" class="btn_edit" @click="editAutography" style='top: 0px; bottom:20px;right: 20px;'>
                  <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>
                  <span >{{ editMode ? this.bstn='保存' : this.bstn='修改' }}</span>
                </el-button>
                </div>
                <el-tab-pane
                             label="个人简介">
                  <template v-if="editMode">
                <div style="padding-top: 10px">
                    <el-input  v-model="autoGrahpy"  type="textarea"  ></el-input></div>
                <div style="padding-top: 20px;margin-top: 10px;width: 90%;">
                    <el-input  v-model="autoGrahpy"  autosize type="textarea"     maxlength="1024"
></el-input></div>
                </template>
                <template v-else>
                {{autoGrahpy}}
@@ -317,8 +319,7 @@
}
.btn_edit{
  background:center no-repeat url('../../assets/icons/edit.png') ;
  position: absolute;
  top: 0;
    float: right;
  padding-right: 90px;
}
.bordered-col {

 ruoyi-ui/src/views/login.vue

@@ -217,7 +217,7 @@
  </div>
  
  <div class="gpr">
       <img :key="url" :src="url" style="width:100%;height:100%"></img>
<!--        <img :key="url" :src="url" style="width:100%;height:30%"></img> -->
  </div>
</div>
</template>
@@ -388,7 +388,8 @@
<style rel="stylesheet/scss" lang="scss">
.gpr{
    width:100%;
    height:1200px;
    // height:1000px;
	
    //background: no-repeat center/100% url("../assets/images/index.png");
}
     .customWidth{
@@ -396,14 +397,22 @@
      }
.topHeight{
    height: 40px;
	 
    margin-right: 20px;
    top:5px; 
    position: absolute;
}
.Group_132{
    //background: no-repeat center/100% url("../assets/images/index.png");
    // background-image: url("../assets/images/index.png");


     
  // background: no-repeat center/40% url("../assets/images/Group 132.png");
  height: 1200px;
  width:  100%;
  // height: 1200px;
    min-width: 1300px;
    width: 100vw;
    height: 100vh;
  
  background-color: #FEF7FC;
  //background-position: 49.5% 16.2% ;
  // background-position: 81.7px 71.3px;
@@ -415,9 +424,9 @@
  display: flex;
  justify-content: flex-end;
  align-items: center;
  height: 100%;
  // height: 60px;
  width:  100%;
  background: no-repeat center/40% url("../assets/images/login_logo.png");
  background: no-repeat center/100% url("../assets/images/index.png");
  background-color: #FEF7FC;

  

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

@@ -529,14 +529,15 @@
                  <el-tab-pane v-for="(item, index) in AutobiographyList"
                               :key='item.id' :label="item.ageBegin+'~'+item.ageEnd+'岁'+'('+item.term+')'">
                    <div>{{ item.content }}</div>
                    <el-button size='mini' type="text" class="btn_edit" @click="editAutobiography(item)" style='position: absolute;right:40px;top:5px;'>
                           <div style="margin-bottom: 20px;">
                    <el-button size='mini' type="text" class="btn_edit" @click="editAutobiography(item)" style='right:40px;top:5px;'>
                      <span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span>
                    </el-button>
    
                    <el-button size="mini" type="text" class="btn_del" @click="handleAutobiography(item)" style='position: absolute;right:10px;top:5px;'>
                    <el-button size="mini" type="text" class="btn_del" @click="handleAutobiography(item)" style='right:10px;top:5px;'>
                      <span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span>
                    </el-button>
	
    </div>
                  </el-tab-pane>
                </el-tabs></div>
            </el-container>
@@ -1632,7 +1633,7 @@
    //个人自传
    handleClick(tab, event) {
      // console.log(tab, event);
      alert(987)
     // alert(987)
      this.getAutobiographyInfor();
      // this.getSrc1(typeOptions)
    },
@@ -1734,9 +1735,10 @@

.btn_edit{
  background:center no-repeat url('../../assets/icons/edit.png') ;
  float:right;
}
.btn_del{
  background:center no-repeat url('../../assets/images/删除2.png') ;
  background:center no-repeat url('../../assets/images/删除2.png') ;float:right;
}
.button-container {
  text-align: right;

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

@@ -238,7 +238,7 @@
                label: '保洁收纳',
                },
              {
                id: 2021,
                id: 2020,
                label: '通讯录',
              },
              { id:2033,
@@ -297,6 +297,7 @@
             }
           //  alert(data.authority)
            // let _this = this
            this.menuOptionsp[0]['children'] = []
             getUserByFidAid(data).then(response=>{
               console.log(response)
               let fams = response.data;
@@ -318,8 +319,10 @@
    upAuthority(){
      let checkedKeys = this.$refs.authr.getCheckedKeys();
      let peoKeys = this.$refs.peoInfo.getCheckedKeys();
     // console.log(peoKeys)
     console.log(peoKeys)
     //alert(this.fid)
     // alert(checkedKeys.length)
	
     // this.getDeptAllCheckedKeys()
     if(checkedKeys.length!=0&&peoKeys.length!=0)
     {
@@ -346,7 +349,8 @@
        "fid": this.fid,
        "authority": value
      }
      alert(data.authority)
        this.menuOptionsp[0]['children'] = []
     // alert(data.authority)
      let _this = this
      getUserByFidAid(data).then(response=>{
        console.log(response)
@@ -439,6 +443,8 @@
            return
    getAllInfo(clanId).then(response=>{
      let fams = response.data
     // console.log(fams)
    //  console.log("++++++++++++++++++++++++==")
      for(let i = 0; i < fams.length; i++)
        _this.menuOptions1[0]['children'].push({id:fams[i].userId,label:fams[i].nickName })
    })

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

@@ -940,7 +940,7 @@
      this.$modal.confirm('是否确认分享？').then(function() {
        return share(shareList);
      }).then(() => {

 this.userOptions = []
        this.getList();
        this.getList1();
        this.$modal.msgSuccess("分享成功");

 ruoyi-ui/vue.config.js

@@ -37,7 +37,7 @@
      // 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://192.168.1.6:8080/`,
    // target: `https://192.168.1.3:8080/`,
      target: 'https://www.bendudu.com:8080/',
        changeOrigin: true,
        pathRewrite: {