修改了对应bug

feige

2024-10-26 46a0fb1d9ab9a48a40a7c8cc9d8917bf271713de

修改了对应bug

 ruoyi-ui/src/views/components/superMindmap.vue

@@ -239,6 +239,7 @@
                    })
                    .on("click",function (event, node) {
                             let data = node.data
                            // alert(23)
                        //     alert(213)
                        //     alert("/familymodel/jiagenwang/personInfo/" + data.id)
                      that.$router.push("/familymodel/jiagenwang/personInfo/" + data.id);
@@ -294,10 +295,10 @@
                            return
                        }
                        // 有外链的节点，打开新窗口后恢复到思维导图页面
                        if (data.id) {
                        if (data.spid) {
                           // window.open(data.url)

                            that.$router.push("/familymodel/jiagenwang/personInfo/" + data.id);
                            that.$router.push("/familymodel/jiagenwang/personInfo/" + data.spid);
                            //that.$emit('activeChange', 'map')
                        
                           // return

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

@@ -95,7 +95,10 @@
                    </el-row>
                    <el-row :span="8">
                      <el-form-item label="配偶" prop="nickName" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="personInfos[0].nickName" placeholder="请输入配偶" clearable :style="{width: '100%'}" :disabled="dsb">
                        <el-input v-if="personInfos[1]!=null" v-model="personInfos[1].nickName" placeholder="请输入配偶" clearable :style="{width: '100%'}" :disabled="dsb">
                         <template slot="suffix">
            <a @click="handleCheck(personInfos[1].userId)" class="aft">查看详情</a>
                            </template>
                        </el-input>
                      </el-form-item>
                    </el-row>
@@ -122,6 +125,7 @@
                  </el-col>
              </div>
            </el-container>
	
            <el-divider />
            <div>
              <el-tabs type="border-card"
@@ -151,9 +155,6 @@
      </div>
<el-divider style="top:120px;"/>

      <div id="building2" v-show="!isshow">
      
      </div>

    </div>
    <div>
@@ -253,6 +254,14 @@
     this.getList(id);
  },
  methods:{
      /** 查看详细信息 */
      handleCheck(id){
        // const id = row.userId;
        //alert(id)
        // alert(id)
       this.$router.push("/familymodel/jiagenwang/personInfo/" + id);
      },
	  
      editAutography(data)
      {
          this.editMode = true;
@@ -267,10 +276,11 @@
     let _this = this;
      getRoot(id).then(response => {
         console.log(response.data)
         console.log("-----")
        //这里是夫妻的信息，已经拿到了
        _this.personInfos = response.data
        if(_this.personInfos[1]==null)
          _this.isshow = false;
      //  if(_this.personInfos[1]==null)
        //  _this.isshow = false;
        _this.personInfo1 = response.data[0]
        //alert(this.personInfos[0].url)

@@ -351,4 +361,9 @@
    .box-card {
      width:100%;
    }
    .aft{
        cursor: pointer;
        color: red; 
        font-weight: bold;
    }
</style>

 ruoyi-ui/src/views/index.vue

@@ -107,6 +107,8 @@
        "url": mpdata['url']!=null?'https://www.bendudu.com:8080/'+mpdata['url']:tp,
        "purl": mpdata['spouse'] != null ? (mpdata['spouse'].url!=null? 'https://www.bendudu.com:8080/'+mpdata['spouse'].url:tp):tp,
        "id": mpdata['userId'],
        "spid": mpdata['spouseId'] != null ? mpdata['spouseId'] : '',
		
        "link": mpdata['oldName'],
        "children": []
      };
@@ -118,6 +120,8 @@
            "prop": mpdata['childList'][i]['oldName'],
            "url": mpdata['childList'][i]['url']!=null?'https://www.bendudu.com:8080/'+mpdata['childList'][i]['url']:tp,
             "id": mpdata['childList'][i]['userId'],
             "spid": mpdata['childList'][i]['spouseId'] != null ? mpdata['childList'][i]['spouseId'] : '',
			 
             "purl": (mpdata['childList'][i]['spouse'] != null ) ?( mpdata['childList'][i]['spouse'].url!= null?'https://www.bendudu.com:8080/'+mpdata['childList'][i]['spouse'].url:tp):tp,
            "link": mpdata['childList'][i]['oldName'],
            "children": []

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

@@ -97,12 +97,14 @@
      let tp = "https://www.bendudu.com:8080/profile/upload/2023/03/19/test7_20230319222030A007.jpg"
      if (mpdata == null)
        return null;
		
      var data = {
        "label": mpdata['spouse'] != null ? eval(mpdata['spouse']).nickName : '',
        "prop": mpdata['nickName'],
        "url": mpdata['url']!=null?'https://www.bendudu.com:8080/'+mpdata['url']:tp,
        "purl": mpdata['spouse'] != null ? (mpdata['spouse'].url!=null? 'https://www.bendudu.com:8080/'+mpdata['spouse'].url:tp):tp,
        "id": mpdata['userId'],
        "spid": mpdata['spouseId'] != null ? mpdata['spouseId'] : '',
        "link": mpdata['nickName'],
        "children": []
      };
@@ -114,6 +116,7 @@
            "prop": mpdata['childList'][i]['nickName'],
            "url": mpdata['childList'][i]['url']!=null?'https://www.bendudu.com:8080/'+mpdata['childList'][i]['url']:tp,
             "id": mpdata['childList'][i]['userId'],
             "spid": mpdata['childList'][i]['spouseId'] != null ? mpdata['childList'][i]['spouseId'] : '',
             "purl": (mpdata['childList'][i]['spouse'] != null ) ?( mpdata['childList'][i]['spouse'].url!= null?'https://www.bendudu.com:8080/'+mpdata['childList'][i]['spouse'].url:tp):tp,
            "link": mpdata['childList'][i]['nickName'],
            "children": []

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

@@ -71,13 +71,13 @@
            @click="handleUpdate(scope.row)"
            v-hasPermi="['system:role:edit']"
          >修改</el-button>
          <el-button
 <!--         <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:role:remove']"
          >删除</el-button>
          >删除</el-button> -->

        </template>
      </el-table-column>
@@ -98,17 +98,6 @@
          <el-input v-model="form.name" placeholder="请输入家庭名称" @blur="chongf()"/>
        </el-form-item>

         <el-form-item label="本家成员"  prop="fid">
           <el-select v-model="form.fid"  :disabled="ts" placeholder="请选择" @change="handleChange">
             <el-option
               v-for="item in fatherInfo"
               :key="item.id"
               :label="item.label"
               :value="item.id"
             ></el-option>
           </el-select>

         </el-form-item>




 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.11:8080/`,
    // target: `https://192.168.1.8:8080/`,
      target: 'https://www.bendudu.com:8080/',
        changeOrigin: true,
        pathRewrite: {