修改小bug

feige

2024-08-24 22f6c02cdae18e9501a2ce8911208218d271fd92

修改小bug

 ruoyi-ui/src/layout/components/Navbar.vue

@@ -16,7 +16,11 @@
        <el-tooltip content="文档地址" effect="dark" placement="bottom">
          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
        </el-tooltip>
 -->
 -->     
    <el-tooltip  effect="dark" placement="bottom">
      <h1 class="right-menu-item hover-effect" style="text-align: center;display: 
      block;line-height: 50px;">{{greeting}}</h1>
    </el-tooltip>
        <screenfull id="screenfull" class="right-menu-item hover-effect" />

        <el-tooltip content="布局大小" effect="dark" placement="bottom">
@@ -24,7 +28,7 @@
        </el-tooltip>

      </template>

    
      <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
        <div class="avatar-wrapper">
          <img :src="avatar" class="user-avatar">
@@ -68,12 +72,36 @@
    RuoYiGit,
    RuoYiDoc
  },
  data() {
    return {

      greeting: "",
   
    };
  },
  mounted() {
    this.setGreeting();
  },
  computed: {
    ...mapGetters([
      'sidebar',
      'avatar',
      'device'
    ]),
    setGreeting() {
      const currentTime = new Date();
      const currentHour = currentTime.getHours();
      let name = this.$store.state.user.name
      if (currentHour < 12) {
        this.greeting = "早上好,"+name;
      } else if (currentHour < 14) {
        this.greeting = "中午好,"+name;
      } else if (currentHour < 18) {
        this.greeting = "下午好,"+name;
      } else {
        this.greeting = "晚上好,"+name;
      }
    },
    setting: {
      get() {
        return this.$store.state.settings.showSettings

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

@@ -244,7 +244,7 @@
    />

    <!-- 添加或修改资产信息配置对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
    <el-dialog :title="title" @click="handleVisibleChange" :visible.sync="open" width="800px" append-to-body :before-close="close" >
      <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">


@@ -262,8 +262,10 @@
        </el-form-item>

        <el-form-item label="发生时间" prop="happenTime">
          <el-date-picker v-model="formDat.happenTime" type="date" placeholder="请选择日期"
                          :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
          <el-date-picker ref="datePicker" v-model="formDat.happenTime" type="date" placeholder="请选择日期"
                     :visible="isVisible"
                            @blur="handleVisibleChange"
    :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
          ></el-date-picker>
        </el-form-item>
        <el-form-item label="备注" prop="remark">
@@ -529,6 +531,7 @@
  dicts: ['sys_normal_disable'],
  data() {
    return {
        isVisible:false,
      // 分享给谁的list
      listRoot: [],
      open1:false,
@@ -860,8 +863,20 @@
    isInFot(fileName) {
      return this.fot.includes(fileName);
    },
    handleVisibleChange(){
        alert(12)
        this.isVisible = false
        this.$refs.datePicker.hidePicker();
    },
    close(){
        //alert(234)
        this.$refs.datePicker.hidePicker()

        this.open = false
    },
    // 取消按钮
    cancelData() {
        this.$refs.datePicker.hidePicker()
      this.open = false;
      this.reset();
    },

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

@@ -250,28 +250,39 @@
                                  return 'pointer'
                              }
                          })
              // 添加头像
                groups.append("image")
                  .attr("xlink:href", function (d) {
                    return d.data.url; // 头像图片的路径
                  })
                  .attr("x", 12) // 头像相对于节点的水平位置
                  .attr("y", 3) // 头像相对于节点的垂直位置
                  .attr("width", 24) // 头像的宽度
                  .attr("height", 24); // 头像的高度
                //绘制标注(节点前的矩形)
                groups.append("rect")
                  .attr("x", 37)
                  .attr("y", 3)
                  .attr("width",
                    function (d) {
                      return d.data.link ? (getPXwidth(d.data.link) + 30) : 0
                    }
                  )
                  .attr("height", 26)
                  .attr("fill", "#FFFFFF")
                  // 添加圆角
                  .attr("rx", 4)
           // 添加头像
             let pu = null
             let gp = groups.append("image")
               .attr("xlink:href", function (d) {
                // console.log(d.data.purl)
                    pu = d.data.purl
                // console.log(d.data.prop)
                // console.log(d.data.label==="")
                 if(d.data.label==="")
                    return ""
                else 
                 return d.data.purl; // 头像图片的路径
               })
            if (pu!=null){
               gp.attr("x", 12) // 头像相对于节点的水平位置
               .attr("y", 3) // 头像相对于节点的垂直位置
               .attr("width", 24) // 头像的宽度
               .attr("height", 24); // 头像的高度
			   
             //绘制标注(节点前的矩形)
             gp.append("rect")
               .attr("x", 37)
               .attr("y", 3)
               .attr("width",
                 function (d) {
                   return d.data.link ? (getPXwidth(d.data.link) + 30) : 0
                 }
               )
               .attr("height", 26)
               .attr("fill", "#FFFFFF")
               // 添加圆角
               .attr("rx", 4)
               }
                  //绘制文字
                groups.append("text")
                    .on("click", function (event, node) {
@@ -286,6 +297,7 @@

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

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

@@ -92,7 +92,13 @@
          <span v-else>——</span>
        </template>
      </el-table-column>
      <el-table-column label="姓名" prop="nickName" sortable :show-overflow-tooltip="true" width="100" align="center"/>
      <el-table-column label="姓名" prop="nickName" sortable :show-overflow-tooltip="true" width="100" align="center">
            <template slot-scope="scope" >
				
            <el-button @click="handleCheck(scope.row)">{{scope.row.nickName}}</el-button>
                 </template>
              </el-table-column> 
		  
      <el-table-column label="性别" prop="sex" sortable width="100" align="center" >
        <template slot-scope="scope">
          <span v-if="scope.row.sex===1">男</span>
@@ -368,7 +374,7 @@
      this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
      this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
      this.queryParams.clanId = this.$store.state.user.clanId

      this.listRoot = []
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      listUserAll(this.queryParams).then(response => {
          //   console.log(response.data)

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

@@ -1,7 +1,7 @@
<template>
  <div class="app-container">
    <div class="text" style="background-color: #FEF7FC;" >
      <h1 style="font-size: 21px;">{{ greeting +'，' + user.userName }}</h1></div>
<!--    <div class="text" style="background-color: #FEF7FC;" >
      <h1 style="font-size: 21px;">{{ greeting +'，' + user.userName }}</h1></div> -->
    <div class="image-container" style="background-color: #FEF7FC;">
      <img class="top-image" src="../../assets/images/zhang.png" alt="Top Image">
    </div>
@@ -35,7 +35,7 @@
    };
  },
  mounted() {
    this.setGreeting();
  //  this.setGreeting();
    this.getUser();
  //  this.mapData = MapData.webMap

@@ -85,6 +85,7 @@

        const mindMapData = this.rootList[0];
         console.log(mindMapData)
    //    for(let i = 0; i < )
         console.log('9999')
        // console.log(this.drawData(mindMapData))
        this.mapData = this.drawData(mindMapData)
@@ -93,13 +94,14 @@

    },
    drawData(mpdata) {
      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": 'https://www.bendudu.com:8080/'+mpdata['url'],
           //     "purl": 'https://www.bendudu.com:8080/'+mpdata['spouse'],
        "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'],
        "link": mpdata['nickName'],
        "children": []
@@ -110,8 +112,9 @@
          var dt = {
            "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'],
            "url": mpdata['childList'][i]['url']!=null?'https://www.bendudu.com:8080/'+mpdata['childList'][i]['url']:tp,
             "id": mpdata['childList'][i]['userId'],
             "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/vue.config.js

@@ -37,8 +37,8 @@
      // 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.3:8080/`,
       target: 'https://www.bendudu.com:8080/',
       target: `https://192.168.1.3:8080/`,
     //  target: 'https://www.bendudu.com:8080/',
        changeOrigin: true,
        pathRewrite: {
          ['^' + process.env.VUE_APP_BASE_API]: ''