From b8670cd94a61846ac63573f724fcf91d8dd7be88 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 29 八月 2023 21:42:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/views/mindMap/index.vue | 112 +++------------
ruoyi-ui/src/views/index.vue | 15 --
ruoyi-ui/src/views/homeRoot/index.vue | 242 +++++++++++++++++-----------------
ruoyi-ui/src/assets/images/shouye.png | 0
4 files changed, 147 insertions(+), 222 deletions(-)
diff --git a/ruoyi-ui/src/assets/images/shouye.png b/ruoyi-ui/src/assets/images/shouye.png
index 9d6baad..af94d17 100644
--- a/ruoyi-ui/src/assets/images/shouye.png
+++ b/ruoyi-ui/src/assets/images/shouye.png
Binary files differ
diff --git a/ruoyi-ui/src/views/homeRoot/index.vue b/ruoyi-ui/src/views/homeRoot/index.vue
index 389666a..d99369f 100644
--- a/ruoyi-ui/src/views/homeRoot/index.vue
+++ b/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)">
+ <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[2].spouse.url"
- @click="getPersonInfo(rootSecList[2].spouse.userId)">
+ <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,7 @@
//鍐欑3浠ｇ殑浠ｇ爜閫昏緫锛岀敤涓や釜for寰幆鍐欑3浠�
this.getGenByNum(this.rootThiList, this.rootList[0], 1, 3)
console.log(this.rootThiList)
- // console.log('-=-------')
+ // console.log('-=-------')
this.isShow_2=true
this.isShow_3=true
this.isShow_4=false
@@ -499,7 +499,7 @@
}
.avater_2_1{
position: absolute;
- top: 75%;
+ top: 73%;
left: 43%;
transform: translate(-50%, -50%);
width: 44px;
@@ -518,7 +518,7 @@
}
.avater_2_3{
position: absolute;
- top: 67%;
+ top: 66%;
left: 55%;
transform: translate(-50%, -50%);
width: 44px;
@@ -528,7 +528,7 @@
}
.avater_2_4{
position: absolute;
- top: 76%;
+ top: 75%;
left: 59%;
transform: translate(-50%, -50%);
width: 36px;
@@ -538,7 +538,7 @@
}
.avater_2_5{
position: absolute;
- top: 73%;
+ top: 72%;
left: 38%;
transform: translate(-50%, -50%);
width: 37px;
@@ -548,7 +548,7 @@
}
.avater_2_6{
position: absolute;
- top: 62%;
+ top: 60%;
left: 43%;
transform: translate(-50%, -50%);
width: 34px;
@@ -558,7 +558,7 @@
}
.avater_2_7{
position: absolute;
- top: 62%;
+ top: 60%;
left: 59%;
transform: translate(-50%, -50%);
width: 35px;
@@ -617,7 +617,7 @@
}
.avater_3_5{
position: absolute;
- top: 48%;
+ top: 51%;
left: 29%;
transform: translate(-50%, -50%);
width: 42px;
@@ -647,8 +647,8 @@
}
.avater_3_8{
position: absolute;
- top: 22%;
- left: 34%;
+ top: 26%;
+ left: 33%;
transform: translate(-50%, -50%);
width: 56px;
height: 58px;
@@ -666,7 +666,7 @@
}
.avater_3_10{
position: absolute;
- top: 42%;
+ top: 44%;
left: 43%;
transform: translate(-50%, -50%);
width: 41px;
@@ -696,7 +696,7 @@
}
.avater_3_13{
position: absolute;
- top: 37%;
+ top: 40%;
left: 51%;
transform: translate(-50%, -50%);
width: 41px;
@@ -706,7 +706,7 @@
}
.avater_3_14{
position: absolute;
- top: 33%;
+ top: 36%;
left: 57%;
transform: translate(-50%, -50%);
width: 35px;
@@ -716,7 +716,7 @@
}
.avater_3_15{
position: absolute;
- top: 35%;
+ top: 38%;
left: 64%;
transform: translate(-50%, -50%);
width: 38px;
@@ -736,7 +736,7 @@
}
.avater_3_17{
position: absolute;
- top: 56%;
+ top: 59%;
left: 71%;
transform: translate(-50%, -50%);
width: 32px;
@@ -795,7 +795,7 @@
}
.avater_4_2{
position: absolute;
- top: 23%;
+ top: 26%;
left: 40%;
transform: translate(-50%, -50%);
width: 35px;
@@ -805,7 +805,7 @@
}
.avater_4_3{
position: absolute;
- top: 11%;
+ top: 14%;
left: 46%;
transform: translate(-50%, -50%);
width: 47px;
@@ -815,7 +815,7 @@
}
.avater_4_4{
position: absolute;
- top: 17%;
+ top: 20%;
left: 57%;
transform: translate(-50%, -50%);
width: 39px;
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 5328088..965fe11 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -2,21 +2,6 @@
<div class="app-container">
<div class="image-container">
<img class="bottom-image" src="../assets/images/shouye.png" alt="Bottom Image">
- <el-input
- class="text-box1"
- type="textarea" :rows="6" resize="none"
- placeholder=" 鍙傚ぉ澶ф爲蹇呮湁鍏舵牴锛屼竾閲屾睙娌充害鏈夊叾婧愩��
- 鏅ぉ涔嬩笅鐐庨粍瀛愬瓩锛岃剦鑴夌浉浼狅紝涓嶄箯鏈夎瘑涔嬪＋锛屾爧姊佷箣鎵嶃�傚惥绛変笉鍙繕鍏跺厛浜猴紝浜︿笉鍙笉鐭ユ垜涔嬫湰婧愩��
- 寤鸿氨涔嬪ぇ浜嬶紝涓婂彲鍛婃叞绁栧厛鍦ㄥぉ涔嬬伒锛屼笅鍙娇瀛愬瓩鍚庝唬鏈夊鏍逛箣鏈�傚彾鑴変箣浜庤崏鏈ㄣ�佸瓙瀛欎箣浜庡墠鏍癸紝琛�绠′箣浜庝汉浣擄紝渚濇墭鎶�鏈緭閫佷簨浠讹紝渚涚粰缁忛獙锛岃氨鍐欐牴鏍圭浉浼犱竴璺蛋鏉ョ殑闈炲嚒銆�"
- ></el-input>
- <el-input
- class="text-box2"
- type="textarea" :rows="18" resize="none"
- placeholder=" 瀹讹紝鏄垜浠敓鍛界殑椹跨珯銆佹紓娉婄殑褰掓墍銆�
- 浼楁墍鍛ㄧ煡锛岃嚜浠庢湁浜嗚禆浠ョ敓瀛樼殑灏忓搴紝瀹跺涵鎴愬憳灏辨湁浜嗘垚闀跨殑杞ㄨ抗銆佸涔犵殑杞ㄨ抗銆佸伐浣滅殑杞ㄨ抗銆佺敓娲荤殑杞ㄨ抗銆傚搴腑姣忎竴浜烘瘡涓�鐗╅兘璋卞啓鐫�瀹跺涵鐨勮緣鐓岃建杩广�傝鎴戜滑鐢� 鈥滄湰閮介兘鈥� 鏉ユ敹钘忔瘡涓鏃忋�佹瘡涓搴�佹瘡涓汉鐢滆湝鏄ㄥぉ锛岃褰曞垢绂忎粖澶╋紝鎷ユ姳缇庡ソ鏄庡ぉ銆傝鎴戜滑鐪熸鎰熷彈鐢熷懡璇炵敓鐨勬澹扮瑧璇紝浜虹敓濂嬫枟鐨勯吀鐢滆嫤杈ｏ紝鑶濅笅寮勫効鐨勫垢绂忔俯棣ㄣ��
- 娲诲湪褰撲笅锛屾灞ュ寙鍖嗐�傚綋鎮ㄥ湪澶栧湴婕傛硦鑰屾�ラ渶鏌愪簺蹇呴』鐨勮瘉鏄庢潗鏂欐椂锛涘綋鎮ㄥ湪浣跨敤鏌愪欢鐗╁搧闇�瑕佸府鍔╂椂锛涘綋鎮ㄨ韩蹇冪柌鍊︽椂锛涘綋鎮ㄦ�ヤ簬涓鸿嚜宸辨暣鐞嗗仴搴锋棩璁版椂锛涘綋鎮ㄥ湪鏌愪釜鐬棿鍙堝洖蹇嗚捣浜蹭汉鐨勭瑧璨屾椂.......鎮ㄤ笉濡ㄦ墦寮�韬竟鐨� 鈥滄湰閮介兘鈥� 锛岀粏缁嗗湴鍝佸懗鈥滄湰閮介兘鈥濊褰曠殑姣忎竴杞ㄨ抗绛旀锛氬師鏉ュ彲浠ュ湪 鈥滄湰閮介兘鈥� 鏀惰幏鏉愭枡璇佹槑锛涙挱鏀剧殑閭ｅ凡缁忔硾榛勭殑鐓х墖銆佽瘉涔︼紝鍞よ捣浜嗗線鏃ユ棫鏃剁浉鐭ャ�佸浠婂凡婕傛硦澶╂动鐨勬寶鍙嬶紱涓�鏈偖绁ㄣ�佷竴娌撴爣鏈紝璁板綍鐨勬槸鎮ㄩ偅鍒牱鐨勭瓒ｏ紱鎵嬫嬁鐫�瀛╁瓙鐨勫嚭鐢熻瘉鏄庯紝鏇存槸绂佷笉浣忔唱姘存墦婀跨溂鐪讹紝濡備粖浜嬩笟鏈夋垚鐨勫瓙濂充滑浼间箮鍙堝彉鍥為偅涓ぉ鐪熺儌婕殑瀛╁瓙锛涙偍鐨勬埧浜ц瘉銆佸湡鍦拌瘉銆佺粨濠氳瘉銆佸仴搴锋姤鍛娿�佺櫨骞村績鎰�...锛屾垨璁稿湪灏嗘潵鏌愪釜鏃堕棿鈥滄湰閮介兘鈥濊兘鎴愪负鎮ㄧ淮鎶ゆ潈鐩婄殑淇濋殰锛屾姂鎴栨槸鐣欑粰瀛愬コ鐨勪竴浠借储瀵屻��
- 甯屾湜 鈥滄湰閮介兘鈥� 鑳芥垚涓哄姪鎺ㄦ偍浜嬩笟鎴愬姛銆佸搴垢绂忋�佷汉鐢熺編婊＄殑濂藉府鎵嬶紒"
- ></el-input>
</div>
</div>
diff --git a/ruoyi-ui/src/views/mindMap/index.vue b/ruoyi-ui/src/views/mindMap/index.vue
index 970362a..5579db5 100644
--- a/ruoyi-ui/src/views/mindMap/index.vue
+++ b/ruoyi-ui/src/views/mindMap/index.vue
@@ -4,9 +4,7 @@
<div class="image-container">
<img class="top-image" src="../../assets/images/zhang.png" alt="Top Image">
</div>
-
-
- <superMindmap v-if="showMindMap" :active='active' :data="mapData" @activeChange="activeChange"/>
+ <superMindmap v-if="showMindMap" :active='active' :data="mapData" @activeChange="activeChange" class="mind-map-container"/>
</div>
</template>
@@ -15,10 +13,10 @@
import { getUserProfile } from "@/api/system/user";
import { listRootAll ,listRoot} from "@/api/root/index";
import * as d3 from 'd3';
- // 瀵煎叆鎬濈淮瀵煎浘鏁版嵁
- import MapData from '../components/MapData.js'
- // 瀵煎叆鎬濈淮瀵煎浘缁勪欢
- import superMindmap from '../components/superMindmap.vue'
+// 瀵煎叆鎬濈淮瀵煎浘鏁版嵁
+import MapData from '../components/MapData.js'
+// 瀵煎叆鎬濈淮瀵煎浘缁勪欢
+import superMindmap from '../components/superMindmap.vue'
export default {
components:{superMindmap},
@@ -47,20 +45,19 @@
methods: {
// 鐐瑰嚮鎬濈淮瀵煎浘鑺傜偣鍚庯紝瑙﹀彂鍙橀噺鏇存柊
- activeChange(newLabel) {
- this.active = newLabel
- this.reloadMindMap()
- },
- // 閲嶈浇鎬濈淮瀵煎浘
- reloadMindMap() {
- this.showMindMap = false
- this.$nextTick(
- () => {
- this.showMindMap = true
- }
- )
- },
-
+ activeChange(newLabel) {
+ this.active = newLabel
+ this.reloadMindMap()
+ },
+ // 閲嶈浇鎬濈淮瀵煎浘
+ reloadMindMap() {
+ this.showMindMap = false
+ this.$nextTick(
+ () => {
+ this.showMindMap = true
+ }
+ )
+ },
setGreeting() {
const currentTime = new Date();
@@ -129,64 +126,6 @@
return data;
},
- drawMindMap() {
- const mindMapData = this.rootList[0]; // 浠巖ootList涓幏鍙栨暟鎹�
- console.log(mindMapData)
- // 娓呴櫎鐜版湁鐨凷VG鍏冪礌
- // d3.select("#mind-map svg").remove();
-
- // // 鍒涘缓涓�涓柊鐨� div 鍏冪礌浣滀负鍖呰９鎬濈淮瀵煎浘鐨勫鍣�
- // const mindMapContainer = document.createElement("div");
- // mindMapContainer.setAttribute("id", "mind-map-container");
- // mindMapContainer.style.position = "absolute";
- // mindMapContainer.style.top = "0";
- // mindMapContainer.style.left = "0";
- // mindMapContainer.style.width = "100%";
- // mindMapContainer.style.height = "100%";
- // mindMapContainer.style.zIndex = "1";
-
- // // 灏嗘�濈淮瀵煎浘瀹瑰櫒鎻掑叆鍒� image-container 涓�
- // document.querySelector(".image-container").appendChild(mindMapContainer);
-
- // // 鍒涘缓SVG鍏冪礌锛岃缃搴﹀拰楂樺害
- // const svg = d3.select("#mind-map-container")
- // .append("svg")
- // .attr("class", "svg-container") // 娣诲姞 className
- // .attr("width", "100%")
- // .attr("height", "100%");
-
- // // 鍒涘缓鏍硅妭鐐�
- // const root = d3.hierarchy(mindMapData);
- // const treeLayout = d3.tree().size([500, 400]); // 璁剧疆鏍戠姸甯冨眬鐨勫昂瀵�
- // treeLayout(root);
-
- // // 鍒涘缓閾炬帴绾�
- // svg.selectAll(".link")
- // .data(root.descendants().slice(1))
- // .enter()
- // .append("path")
- // .attr("class", "link")
- // .attr("d", d => {
- // return "M" + d.x + "," + d.y + "C" + (d.x + d.parent.x) / 2 + "," + d.y + " " +
- // (d.x + d.parent.x) / 2 + "," + d.parent.y + " " + d.parent.x + "," + d.parent.y;
- // });
-
- // // 鍒涘缓鑺傜偣
- // const nodes = svg.selectAll(".node")
- // .data(root.descendants())
- // .enter()
- // .append("g")
- // .attr("class", "node")
- // .attr("transform", d => "translate(" + d.x + "," + d.y + ")");
-
- // nodes.append("circle")
- // .attr("r", 10);
-
- // nodes.append("text")
- // .attr("dx", 12)
- // .attr("dy", 5)
- // .text(d => d.data.nickName);
- }
}
};
</script>
@@ -198,15 +137,19 @@
}
.image-container {
- position: absolute;
- width: 100%;
- height: 100%;
+ /*position: absolute;*/
+ position: fixed;
+ margin-left: -10px;
+ width: 90%;
+ height: 90%;
z-index: -1;
}
.mind-map-container{
z-index: 2;
- opacity: 0.5;
+ opacity: 0.8;
+ /*margin-top: 200px;*/
+ background-color: transparent;
}
.top-image {
width: 100%;
@@ -215,7 +158,4 @@
position: static;
opacity: 0.8;
}
-
-
-
</style>
--
Gitblit v1.9.1