Commit 9bc50313 by 侯昆

同步,添加 说 字

1 parent a6fada53
Showing 38 changed files with 308 additions and 61 deletions
...@@ -61,6 +61,27 @@ ...@@ -61,6 +61,27 @@
<a class="list-group-item" >盲人摸象</a> <a class="list-group-item" >盲人摸象</a>
</div> </div>
</c:when> </c:when>
<c:when test="${vo.word eq '说'}">
<div class="list-group">
<span class="list-group-item list-group-item-header">开头</span>
<a class="list-group-item" >说教</a>
<a class="list-group-item" >说客</a>
<a class="list-group-item" >说词</a>
<a class="list-group-item" >说服</a>
</div>
<div class="list-group">
<span class="list-group-item list-group-item-header">中间</span>
<a class="list-group-item" >痴人说梦</a>
<a class="list-group-item" >现身说法</a>
<a class="list-group-item" >谈天说地</a>
</div>
<div class="list-group">
<span class="list-group-item list-group-item-header">结尾</span>
<a class="list-group-item" >小说</a>
<a class="list-group-item" >演说</a>
<a class="list-group-item" >自圆其说</a>
</div>
</c:when>
<c:when test="${vo.word eq '象鼻山'}"> <c:when test="${vo.word eq '象鼻山'}">
<div class="list-group"> <div class="list-group">
<span class="list-group-item list-group-item-header">${vo.word}</span> <span class="list-group-item list-group-item-header">${vo.word}</span>
......
...@@ -106,7 +106,8 @@ ...@@ -106,7 +106,8 @@
<div class="tab-content pt-3"> <div class="tab-content pt-3">
<div class="tab-pane show active" id="content-detail-tab-0" role="tabpanel"> <div class="tab-pane show active" id="content-detail-tab-0" role="tabpanel">
<p>哺乳纲,长鼻目,象科。陆上现存最大的哺乳动物。肩高2.5~3.0米。皮厚毛少,肢粗如柱。鼻与上唇愈合成圆筒状长鼻,鼻端有指状突起一或两个。上颌门齿大而长,称“象牙”。有两种:亚洲象(Elephas maximus),体较小,额部下凹,鼻端具一指状凸起,耳小,后足四蹄。仅雄象有象牙,分布于南亚、东南亚等地;亦见于中国云南等地,国家一级保护动物。非洲象(Loxodonta africana),体较大,额部凸出,鼻端有两个指状凸起,耳大披肩,后足三蹄。雌雄均有象牙,不易驯服,分布于非洲。</p> <p>哺乳纲,长鼻目,象科。陆上现存最大的哺乳动物。肩高2.5~3.0米。皮厚毛少,肢粗如柱。鼻与上唇愈合成圆筒状长鼻,鼻端有指状突起一或两个。上颌门齿大而长,称“象牙”。有两种:亚洲象(Elephas maximus),体较小,额部下凹,鼻端具一指状凸起,耳小,后足四蹄。仅雄象有象牙,分布于南亚、东南亚等地;亦见于中国云南等地,国家一级保护动物。非洲象(Loxodonta africana),体较大,额部凸出,鼻端有两个指状凸起,耳大披肩,后足三蹄。雌雄均有象牙,不易驯服,分布于非洲。</p>
<div class="st-wrap"> <div
class="st-wrap">
<img src="./images/24.jpg" alt=""> <img src="./images/24.jpg" alt="">
<div class="st-links"> <div class="st-links">
<div class="st-row"> <div class="st-row">
......
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
...@@ -79,7 +79,7 @@ public class WordDTO { ...@@ -79,7 +79,7 @@ public class WordDTO {
relationOneWayQuery.setWordId(word.getId()); relationOneWayQuery.setWordId(word.getId());
List<RelationOneWayDomain> relateList = relationOneWayService.getList(relationOneWayQuery); List<RelationOneWayDomain> relateList = relationOneWayService.getList(relationOneWayQuery);
wordDTO.setHasRelated(CollectionUtils.isNotEmpty(relateList)); wordDTO.setHasRelated(CollectionUtils.isNotEmpty(relateList));
if (ArrayUtils.contains(new String[]{"象","象鼻山","中国", "中华人民共和国", "太阳系"}, word.getWord())) { if (ArrayUtils.contains(new String[]{"象","象鼻山","中国", "中华人民共和国", "太阳系", "说"}, word.getWord())) {
wordDTO.setHasRelated(true); wordDTO.setHasRelated(true);
} }
return wordDTO; return wordDTO;
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<b></b>的书法</div> <b></b>的书法</div>
</div> </div>
<div class="calligraphy-main"> <div class="calligraphy-main">
<img src="" /> <img src="images/xiang.jpg" alt="">
</div> </div>
</div> </div>
<div class="content"> <div class="content">
...@@ -80,7 +80,9 @@ ...@@ -80,7 +80,9 @@
<div class="character"> <div class="character">
<div class="clearfix"> <div class="clearfix">
<div class="character__hd"> <div class="character__hd">
<div class="character-huge"></div> <div class="character-gif">
<img src="images/xianggif.gif">
</div>
<div class="character-cells"> <div class="character-cells">
<div class="character-cell js-origin">字源</div> <div class="character-cell js-origin">字源</div>
<div class="character-cell js-calligraphy">书法</div> <div class="character-cell js-calligraphy">书法</div>
......
This diff could not be displayed because it is too large.
var obj = {
name: '心(结构及病变图)',
children: [{
name: "心率"
}, {
name: "胸心血管外科学"
}, {
name: "心内膜",
children: [{
name: "感染性心内膜炎"
}, {
name: "心肌",
children: [{
name: "心肌炎"
}, {
name: "心肌病"
}, {
name: "心肌梗死"
}, {
name: "心力储备"
}, {
name: "心输出量"
}, {
name: "心脏传导系统"
children: [{
name: "心脏传导阻滞",
children: [{
name: "心脏起搏器"
}]
}, {
name: "心房",
children: [{
name: "心房扑动"
}, {
name: "心房颤动"
}, {
name: "中心静脉压"
}]
}, {
name: "心室",
children: [{
name: "心室颤动"
}]
}, {
name: "心外膜",
children: [{
name: "心外膜",
children: [{
name: "心包",
children: [{
name: "心脏压塞"
}, {
name: "心包摩擦音"
}, {
name: "心包炎"
}, {
name: "心包络",
children: [{
name: "围心腔"
children: [{
name: "肺",
children: [{
name: '肺气肿',
children: [{
name: "肺心病"
}]
}]
}]
}]
}]
}]
}]
}]
}, {
}]
}]
}]
}
var obj2 = {
name:'心脏',
children:[{
name:'心瓣膜病',
children:[{
name:'风湿性心脏病'
},{
name:'心导管球囊扩张术'
}]
},{
name:"先天性心脏病",
children:[
{
name:"微创心脏外科手术",
}
]
},{
name:"冠心病"
},{
name:"心力衰竭",
children:[{
name:"强心苷"
}]
},{
name:"心脏导管检查术",
},{
name:"心脏内直视手术",
children:[{
name:"体外循环",
children:[{
name:"人工心肺机"
}]
},{
name:"低温麻醉"
}]
},{
name:"心脏闭合性损"
},{
name:"高血压心脏病"
},{
name:"心音,
children:[{
name:'心脏杂音',
children:[{
name:"心音图"
}]
},{
name:"胎心音"
}]
},{
name:"心源性猝死",
children:[{
name:"人工呼吸"
},{
name:"心脏按压"
}]
}]
}
var obj3 = {
name:"冠心病",
children:[{
name:"心绞痛"
},{
name:"心律失常"
},{
name:"急性冠状动脉综合症"
},{
name:"心肌梗死"
},{
name:"心力衰竭"
},{
name:"心源性猝死"
},{
name:"微创心脏外科手术"
},{
name:"冠状动脉搭桥术"
}]
}
var obj4 = {
name:"心痛",
children:[{
name:"抗心绞痛药",
chidren:[{
name:"心痛定",
children:[{
name:"硝苯地平"
}]
},{
name:"消心痛",
children:[{
name:'硝酸异山梨酯'
}]
}]
},{
name:"麝香保心丸"
},{
name:"天王补心丹"
},{
name:"胃痛"
},{
name:"虫痛"
},{
name:"心绞痛"
},{
name:"心肌梗死"
}]
}
var obj5 = {
name:'心律',
children:[{
name:"心律不齐",
children:[{
name:"心动过速"
},{
name:"心动过缓"
},{
name:"早搏"
},{
name:"郁积综合征"
},{
name:"心脏传导阻滞"
}]
},{
name:"心动周期",
children:[{
name:"超声心动图"
}]
},{
name:"心电图",
children:[{
name:"心电图"
}]
},{
name:"窦性心律"
}]
}
var obj6 = {
name:"心病 \n (中医学)",
children:[{
name:"热入心包"
},{
name:"水气凌心"
},{
name:"心血虚"
},{
name:"心血淤"
},{
name:"怔忡"
},{
name:"心悸"
},{
name:"心阳虚"
},{
name:"心阴虚"
},{
name:"盗汗"
}]
}
\ No newline at end of file \ No newline at end of file
...@@ -54,49 +54,10 @@ ...@@ -54,49 +54,10 @@
<div class="calligraphy" id="calligraphy"> <div class="calligraphy" id="calligraphy">
<div class="calligraphy-title"> <div class="calligraphy-title">
<div class="text"> <div class="text">
<b></b>的书法</div> <b></b>的书法</div>
</div> </div>
<div class="calligraphy-main"> <div class="calligraphy-main">
<section class="calligraphy-section"> <img src="images/shuo.jpg" alt="">
<div class="calligraphy-section__hd">
<div class="title-base title-primary">【六体书法】</div>
</div>
<div class="calligraphy-section__bd">
<img src="temp/calligraphy1.png">
</div>
</section>
<section class="calligraphy-section">
<div class="calligraphy-section__hd">
<div class="title-base title-primary">【楷书书法】</div>
</div>
<div class="calligraphy-section__bd">
<img src="temp/calligraphy2.png">
</div>
</section>
<section class="calligraphy-section">
<div class="calligraphy-section__hd">
<div class="title-base title-primary">【行书书法】</div>
</div>
<div class="calligraphy-section__bd">
<img src="temp/calligraphy3.png">
</div>
</section>
<section class="calligraphy-section">
<div class="calligraphy-section__hd">
<div class="title-base title-primary">【篆书书法】</div>
</div>
<div class="calligraphy-section__bd">
<img src="temp/calligraphy4.png">
</div>
</section>
<section class="calligraphy-section">
<div class="calligraphy-section__hd">
<div class="title-base title-primary">【隶书书法】</div>
</div>
<div class="calligraphy-section__bd">
<img src="temp/calligraphy5.png">
</div>
</section>
</div> </div>
</div> </div>
<div class="content"> <div class="content">
...@@ -119,14 +80,31 @@ ...@@ -119,14 +80,31 @@
<div class="character"> <div class="character">
<div class="clearfix"> <div class="clearfix">
<div class="character__hd"> <div class="character__hd">
<div class="character-huge"></div> <div class="character-gif">
<img src="images/shuogif.gif">
</div>
<div class="character-cells"> <div class="character-cells">
<div class="character-cell js-origin">字源</div> <div class="character-cell js-origin">字源</div>
<div class="character-cell js-calligraphy">书法</div> <div class="character-cell js-calligraphy">书法</div>
</div> </div>
</div> </div>
<div class="character__bd"> <div class="character__bd">
<div class="character-spell">【xiàng】 <div class="character-spell">【shuō】
<div class="character-voice">
<div class="icon icon-voice"></div>
</div>
</div>
<div class="character-spell">【yuè】
<div class="character-voice">
<div class="icon icon-voice"></div>
</div>
</div>
<div class="character-spell">【shuì】
<div class="character-voice">
<div class="icon icon-voice"></div>
</div>
</div>
<div class="character-spell">【tuō】
<div class="character-voice"> <div class="character-voice">
<div class="icon icon-voice"></div> <div class="icon icon-voice"></div>
</div> </div>
...@@ -134,11 +112,11 @@ ...@@ -134,11 +112,11 @@
<div class="character-info clearfix"> <div class="character-info clearfix">
<div class="character-info-cell"> <div class="character-info-cell">
<span class="character-info-label">笔画: </span> <span class="character-info-label">笔画: </span>
<span class="character-info-num">11</span> <span class="character-info-num">9</span>
</div> </div>
<div class="character-info-cell"> <div class="character-info-cell">
<span class="character-info-label">部首:</span> <span class="character-info-label">部首:</span>
<span class="character-info-value"></span> <span class="character-info-value"></span>
</div> </div>
<div class="character-info-cell"> <div class="character-info-cell">
<span class="character-info-label">四角号码:</span> <span class="character-info-label">四角号码:</span>
...@@ -146,11 +124,15 @@ ...@@ -146,11 +124,15 @@
</div> </div>
<div class="character-info-cell"> <div class="character-info-cell">
<span class="character-info-label">部外:</span> <span class="character-info-label">部外:</span>
<span class="character-info-num">4</span> <span class="character-info-num">7</span>
</div> </div>
<div class="character-info-cell"> <div class="character-info-cell">
<span class="character-info-label">结构:</span> <span class="character-info-label">结构:</span>
<span class="character-info-value">上下</span> <span class="character-info-value">左右</span>
</div>
<div class="character-info-cell">
<span class="character-info-label">繁体:</span>
<span class="character-info-value"></span>
</div> </div>
</div> </div>
</div> </div>
...@@ -159,33 +141,33 @@ ...@@ -159,33 +141,33 @@
<div class="character-origin clearfix"> <div class="character-origin clearfix">
<div class="character-origin-item"> <div class="character-origin-item">
<div class="character-origin-image"> <div class="character-origin-image">
<img src="temp/origin1.png"> <img src="images/shuo1.png">
</div> </div>
<div class="character-origin-desc">甲骨文</div> <div class="character-origin-desc">战国文字</div>
</div> </div>
<div class="character-origin-item"> <div class="character-origin-item">
<div class="character-origin-image"> <div class="character-origin-image">
<img src="temp/origin2.png"> <img src="images/shuo2.png">
</div> </div>
<div class="character-origin-desc">金文</div> <div class="character-origin-desc">篆书</div>
</div> </div>
<div class="character-origin-item"> <div class="character-origin-item">
<div class="character-origin-image"> <div class="character-origin-image">
<img src="temp/origin3.png"> <img src="images/shuo3.png">
</div> </div>
<div class="character-origin-desc">小篆</div> <div class="character-origin-desc">隶书</div>
</div> </div>
<div class="character-origin-item"> <div class="character-origin-item">
<div class="character-origin-image"> <div class="character-origin-image">
<img src="temp/origin4.png"> <img src="images/shuo4.png">
</div> </div>
<div class="character-origin-desc">康熙字</div> <div class="character-origin-desc">楷书</div>
</div> </div>
<div class="character-origin-item"> <div class="character-origin-item">
<div class="character-origin-image"> <div class="character-origin-image">
<img src="temp/origin5.png"> <img src="images/shuo5.png">
</div> </div>
<div class="character-origin-desc"></div> <div class="character-origin-desc"></div>
</div> </div>
</div> </div>
</div> </div>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!