家庭设备的打印功能已经没有问题了 家庭设备详情的时候，不可以上传文件 家谱思维导图可以打击查看信息了

feige

2023-09-10 3549fed09cc87c323ca6c8a3d55c83fc495f4b7e

家庭设备的打印功能已经没有问题了
家庭设备详情的时候，不可以上传文件
家谱思维导图可以打击查看信息了

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

@@ -3,6 +3,7 @@
</template>
<script>
    import * as d3 from 'd3';
import { useRoute,useRouter } from 'vue-router'

    export default {
        props: {
@@ -79,6 +80,7 @@
        methods: {
            drawMap() {
                let that = this
                //alert(that.$router)
                // 源数据
                let data = {}
                // 判断data是否为空对象
@@ -222,6 +224,19 @@
                    .text(function (d) {
                        return d.data.link;
                    })
                    .on("click",function (event, node) {
                             let data = node.data
                      that.$router.push("/familymodel/jiagenwang/personInfo/" + data.id);

                      })
                      .attr("cursor",
                          function (d) {
                              if (d.data.disabled) {
                                  return 'not-allowed'
                              } else {
                                  return 'pointer'
                              }
                          })
                //绘制文字
                groups.append("text")
                    .on("click", function (event, node) {
@@ -231,10 +246,12 @@
                            return
                        }
                        // 有外链的节点，打开新窗口后恢复到思维导图页面
                        if (data.url) {
                            window.open(data.url)
                            that.$emit('activeChange', 'map')
                            return
                        if (data.id) {
                           // window.open(data.url)

                            that.$router.push("/familymodel/jiagenwang/personInfo/" + data.id);
                            //that.$emit('activeChange', 'map')
                           // return
                        }
                        // 标准节点—— 传出 prop
                        if (data.dicType) {

 ruoyi-ui/src/views/device/equipmentInfo.vue

@@ -4,12 +4,12 @@
      <h1 style="font-size:21px;padding-top:30px;display: flex;justify-content: space-between;align-items: center;">
        <span>家庭设备详情</span>
        <div   style="display: flex; align-items: center;">
          <el-button size="mini" type="text"  v-print="'#printable-content'" v-hasPermi="['person:information:memo']">
          <el-button size="mini" type="text"   v-hasPermi="['person:information:memo']">
            <div class="form" ><el-icon  style="padding-right:110px;"></el-icon>
              <span class="text" style="width: 69px;height: 26px;font-size: 16px;
            font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">备忘本</span></div>
          </el-button>
          <el-button size="mini" type="text"  @click="print()" v-hasPermi="['person:information:memo']">
          <el-button size="mini" type="text"  v-print="'#printable-content'" v-hasPermi="['person:information:memo']">
            <div class="form" ><el-icon  style="padding-right:110px;"></el-icon>
              <span class="text" style="width: 69px;height: 26px;font-size: 16px;
            font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">打印</span></div>
@@ -63,6 +63,9 @@
        multiple
        :http-request="requestUpload"
        :file-list="fileList"
        :disabled="!btn"
        :class="{ hide: !btn }"

      >
        <div v-if="uploading" class="upload-status">正在上传...</div>
        <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
@@ -114,6 +117,8 @@
        :on-remove="handleRemoveFile"
        :http-request="requestUpload"
        :show-file-list="true"
        :disabled="!btn"
        :class="{ hide: !btn }"
      >

        <div v-if="uploading" class="upload-status">正在上传...</div>
@@ -266,6 +271,7 @@
    else{
      document.title = "家庭设备详细信息";
      this.$route.meta.title = "家庭设备详细信息";//列表的名称
      this.btn = false;
      this.isShow=false
    }

@@ -396,28 +402,6 @@
      this.dsb = false
      this.btn = true
    },
    //打印
    print()
    {

      setTimeout(() => {
        // 获取待打印的内容
            let printableContent = document.getElementById('printable-content').innerHTML;
            console.log(printableContent)
            // 创建一个新的窗口并加载打印内容
            let printWindow = window.open('', '_blank');
            printWindow.document.write('<html><head><title>打印内容</title></head><body>' + printableContent + '</body></html>');

            // 执行打印操作
            printWindow.document.close();

            // 如果内容中有图片或其他需要一定时间加载的，请使用注释中的延时打印

              printWindow.print()
            }, 1000)
         //   printWindow.print();

    },
    //查看备忘本
    checkNote(row){

@@ -427,6 +411,7 @@
    },
    requestUpload(params)
    {

      var file = params.file;
      var formData = new FormData();
      formData.append('uploadFile', file);
@@ -463,6 +448,9 @@
  display: block;

}
.hide .el-upload--picture-card {
    display: none;
}
.form{
  background:center/11% no-repeat url('../../assets/icons/form.png') ;
}

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

@@ -31,152 +31,152 @@
            @click="getPersonInfo(rootList[0].spouse.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].url"
            @click="getPersonInfo(rootSecList[0].userId)">
            <img :src="'http://47.93.189.255:8080/'+ rootSecList[2].url"
            @click="getPersonInfo(rootSecList[2].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].spouse.url"
            @click="getPersonInfo(rootSecList[0].spouse.userId)">
            <img :src="'http://47.93.189.255:8080/'+ rootSecList[0].url"
            @click="getPersonInfo(rootSecList[0].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].url"
             @click="getPersonInfo(rootSecList[1].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].url"
            @click="getPersonInfo(rootSecList[1].spouse.userId)">
          <img :src="'http://47.93.189.255:8080/'+ rootSecList[3].url"
            @click="getPersonInfo(rootSecList[3].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].url"
                @click="getPersonInfo(rootSecList[2].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].spouse.url"
                 @click="getPersonInfo(rootSecList[2].spouse.userId)">
          </el-avatar>
          <el-avatar shape="circle" class="avater_2_6" v-if="isShow_2">
            <img :src="'http://47.93.189.255:8080/'+ rootSecList[0].spouse.url"
                 @click="getPersonInfo(rootSecList[0].spouse.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].url"
                 @click="getPersonInfo(rootSecList[3].userId)">
            <img :src="'http://47.93.189.255:8080/'+ rootSecList[1].spouse.url"
                 @click="getPersonInfo(rootSecList[1].spouse.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].spouse.url"
                 @click="getPersonInfo(rootSecList[3].spouse.userId)">
          </el-avatar>
          <el-avatar shape="circle" class="avater_3_1" v-if="isShow_3">
            <img :src="'http://47.93.189.255:8080/'+ rootSecList[4].url"
                 @click="getPersonInfo(rootSecList[4].userId)">
          </el-avatar>
<!--          <el-avatar shape="circle" class="avater_3_1" v-if="isShow_3">-->
<!--            <img :src="'http://47.93.189.255:8080/'+ rootThiList[0].url"-->
<!--                 @click="getPersonInfo(rootThiList[0].userId)">-->
<!--          </el-avatar>-->

          <el-avatar shape="circle" class="avater_3_2" v-if="isShow_3">
            <img :src="'http://47.93.189.255:8080/'+ rootSecList[4].spouse.url"
                 @click="getPersonInfo(rootSecList[4].spouse.userId)">
          </el-avatar>
<!--          <el-avatar shape="circle" class="avater_3_2" v-if="isShow_3">-->
<!--            <img :src="'http://47.93.189.255:8080/'+ rootThiList[0].url"-->
<!--                 @click="getPersonInfo(rootThiList[0].userId)">-->
<!--          </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_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_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>
            <img :src="'http://47.93.189.255:8080/'+ rootThiList[0].url"
                 @click="getPersonInfo(rootThiList[0].userId)">
          </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_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_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>
            <img :src="'http://47.93.189.255:8080/'+ rootThiList[0].spouse.url"
                 @click="getPersonInfo(rootThiList[0].spouse.userId)">
          </el-avatar>
          <el-avatar shape="circle" class="avater_3_9" 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_9" v-if="isShow_3">-->
<!--            <img :src="'http://47.93.189.255:8080/'+ rootThiList[0].spouse.url"-->
<!--                 @click="getPersonInfo(rootThiList[0].spouse.userId)">-->
<!--          </el-avatar>-->
          <el-avatar shape="circle" class="avater_3_10" 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/'+ rootThiList[1].url"
                 @click="getPersonInfo(rootThiList[1].userId)">
          </el-avatar>
          <el-avatar shape="circle" class="avater_3_11" 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_12" 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_11" 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_12" 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_13" 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/'+ rootThiList[1].spouse.url"
                 @click="getPersonInfo(rootThiList[1].spouse.userId)">
          </el-avatar>
          <el-avatar shape="circle" class="avater_3_14" 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/'+ rootThiList[2].url"
                 @click="getPersonInfo(rootThiList[2].userId)">
          </el-avatar>
          <el-avatar shape="circle" class="avater_3_15" 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/'+ rootThiList[2].spouse.url"
                 @click="getPersonInfo(rootThiList[2].spouse.userId)">
          </el-avatar>
          <el-avatar shape="circle" class="avater_3_16" 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_16" 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_17" 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/'+ rootThiList[3].url"
                 @click="getPersonInfo(rootThiList[3].userId)">
          </el-avatar>
          <el-avatar shape="circle" class="avater_3_18" 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_19" 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_20" 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_21" 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_4_1" 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_18" 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_19" 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_20" 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_21" 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_4_1" 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_4_2" v-if="isShow_4">
            <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
            ></el-img>
            <img :src="'http://47.93.189.255:8080/'+ rootFouList[0].url"
                 @click="getPersonInfo(rootFouList[0].userId)">
          </el-avatar>
          <el-avatar shape="circle" class="avater_4_3" v-if="isShow_4">
            <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
            ></el-img>
            <img :src="'http://47.93.189.255:8080/'+ rootFouList[1].url"
                 @click="getPersonInfo(rootFouList[1].userId)">
          </el-avatar>
          <el-avatar shape="circle" class="avater_4_4" v-if="isShow_4">
            <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
            ></el-img>
            <img :src="'http://47.93.189.255:8080/'+ rootFouList[2].url"
                 @click="getPersonInfo(rootFouList[2].userId)">
          </el-avatar>
          <el-avatar shape="circle" class="avater_4_5" 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_4_6" 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_4_5" 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_4_6" v-if="isShow_4">-->
<!--            <el-img :src="'http://47.93.189.255:8080'+ rootList.url"-->
<!--            ></el-img>-->
<!--          </el-avatar>-->

        </div>
      </div>
@@ -198,9 +198,9 @@
      greeting: "",
      imageSrc: require('../../assets/images/Group 407.png') ,
      dropdownList: [
        { name: '只显示第一代', src: 'Group 445.png' },
        { name: '显示至第二代', src: 'Group 445.png' },
        { name: '显示至第三代', src: 'Group 445.png' },
        { name: '只显示第一代', src: 'Group 407.png' },
        { name: '显示至第二代', src: 'Group 407.png' },
        { name: '显示至第三代', src: 'Group 407.png' },
        { name: '显示全部', src: 'Group 407.png' }
      ],
      rootList:[],
@@ -385,7 +385,6 @@
      //写第3代的代码逻辑，用两个for循环写第3代
      this.getGenByNum(this.rootThiList, this.rootList[0], 1, 3)
      console.log(this.rootThiList)
      console.log('-=-------')
      this.isShow_2=true
      this.isShow_3=true
      this.isShow_4=false
@@ -501,7 +500,7 @@
}
.avater_2_1{
  position: absolute;
  top: 75%;
  top: 73%;
  left: 43%;
  transform: translate(-50%, -50%);
  width: 44px;
@@ -520,7 +519,7 @@
}
.avater_2_3{
  position: absolute;
  top: 67%;
  top: 66%;
  left: 55%;
  transform: translate(-50%, -50%);
  width: 44px;
@@ -530,7 +529,7 @@
}
.avater_2_4{
  position: absolute;
  top: 76%;
  top: 75%;
  left: 59%;
  transform: translate(-50%, -50%);
  width: 36px;
@@ -540,7 +539,7 @@
}
.avater_2_5{
  position: absolute;
  top: 73%;
  top: 72%;
  left: 38%;
  transform: translate(-50%, -50%);
  width: 37px;
@@ -550,7 +549,7 @@
}
.avater_2_6{
  position: absolute;
  top: 62%;
  top: 60%;
  left: 43%;
  transform: translate(-50%, -50%);
  width: 34px;
@@ -560,7 +559,7 @@
}
.avater_2_7{
  position: absolute;
  top: 62%;
  top: 60%;
  left: 59%;
  transform: translate(-50%, -50%);
  width: 35px;
@@ -619,7 +618,7 @@
}
.avater_3_5{
  position: absolute;
  top: 48%;
  top: 51%;
  left: 29%;
  transform: translate(-50%, -50%);
  width: 42px;
@@ -649,8 +648,8 @@
}
.avater_3_8{
  position: absolute;
  top: 22%;
  left: 34%;
  top: 26%;
  left: 33%;
  transform: translate(-50%, -50%);
  width: 56px;
  height: 58px;
@@ -668,7 +667,7 @@
}
.avater_3_10{
  position: absolute;
  top: 42%;
  top: 44%;
  left: 43%;
  transform: translate(-50%, -50%);
  width: 41px;
@@ -698,7 +697,7 @@
}
.avater_3_13{
  position: absolute;
  top: 37%;
  top: 40%;
  left: 51%;
  transform: translate(-50%, -50%);
  width: 41px;
@@ -708,7 +707,7 @@
}
.avater_3_14{
  position: absolute;
  top: 33%;
  top: 36%;
  left: 57%;
  transform: translate(-50%, -50%);
  width: 35px;
@@ -718,7 +717,7 @@
}
.avater_3_15{
  position: absolute;
  top: 35%;
  top: 38%;
  left: 64%;
  transform: translate(-50%, -50%);
  width: 38px;
@@ -738,7 +737,7 @@
}
.avater_3_17{
  position: absolute;
  top: 56%;
  top: 59%;
  left: 71%;
  transform: translate(-50%, -50%);
  width: 32px;
@@ -797,7 +796,7 @@
}
.avater_4_2{
  position: absolute;
  top: 23%;
  top: 26%;
  left: 40%;
  transform: translate(-50%, -50%);
  width: 35px;
@@ -807,7 +806,7 @@
}
.avater_4_3{
  position: absolute;
  top: 11%;
  top: 14%;
  left: 46%;
  transform: translate(-50%, -50%);
  width: 47px;
@@ -817,7 +816,7 @@
}
.avater_4_4{
  position: absolute;
  top: 17%;
  top: 20%;
  left: 57%;
  transform: translate(-50%, -50%);
  width: 39px;

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

@@ -80,7 +80,7 @@
        this.rootList =response.data;

        const mindMapData = this.rootList[0];

        // console.log(mindMapData)
       // console.log(this.drawData(mindMapData))
        this.mapData = this.drawData(mindMapData)
        this.showMindMap = true
@@ -93,7 +93,8 @@
      var data = {
        "label": mpdata['spouse'] != null ? eval(mpdata['spouse']).nickName : '',
        "prop": mpdata['nickName'],
        "url": '',
        "url": '12',
        "id": mpdata['userId'],
        "link": mpdata['nickName'],
        "children": []
      };
@@ -103,7 +104,8 @@
          var dt = {
            "label": mpdata['childList'][i]['spouse'] != null ? eval(mpdata['childList'][i]['spouse']).nickName : '',
            "prop": mpdata['childList'][i]['nickName'],
            "url": '',
            "url": '12',
             "id": mpdata['childList'][i]['userId'],
            "link": mpdata['childList'][i]['nickName'],
            "children": []
          };