Skip to content

石磊 / cihai

Go to a project
Commit 5d7434b4 by 侯昆
Options

相关词添加，图片替换

1 parent 35d09b2d
Inline Side-by-side
Showing 15 changed files with 180 additions and 15 deletions
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/word/relate.jsp
...@@ -126,7 +126,51 @@ ...@@ -126,7 +126,51 @@
<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>
</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>
<a class="list-group-item">陈锡联</a>
<a class="list-group-item">陈毅</a>
<a class="list-group-item">陈永贵</a>
<a class="list-group-item">陈云</a>
<a class="list-group-item">邓小平</a>
<a class="list-group-item">邓子恢</a>
<a class="list-group-item">董必武</a>
<a class="list-group-item">方毅</a>
<a class="list-group-item">耿飈</a>
<a class="list-group-item">贺龙</a>
<a class="list-group-item">黄菊</a>
<a class="list-group-item">黄炎培</a>
<a class="list-group-item">姬鹏飞</a>
<a class="list-group-item">纪登奎</a>
<a class="list-group-item">康世恩</a>
<a class="list-group-item">柯庆施</a>
<a class="list-group-item">李富春</a>
<a class="list-group-item">李先念</a>
<a class="list-group-item">林彪</a>
<a class="list-group-item">罗瑞卿</a>
<a class="list-group-item">聂荣臻</a>
<a class="list-group-item">彭德怀</a>
<a class="list-group-item">谭震林</a>
<a class="list-group-item">陶铸</a>
<a class="list-group-item">王任重</a>
<a class="list-group-item">王震</a>
<a class="list-group-item">乌兰夫</a>
<a class="list-group-item">吴学谦</a>
<a class="list-group-item">习仲勋</a>
<a class="list-group-item">谢富治</a>
<a class="list-group-item">徐向前</a>
<a class="list-group-item">杨静仁</a>
<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>
</c:when> </c:when>
</c:choose> </c:choose>
<c:forEach items="${vo.relationByGroup}" var="item"> <c:forEach items="${vo.relationByGroup}" var="item">
......
serverside/cihai-core/src/main/java/com/dookay/cihai/core/word/dto/WordDTO.java
...@@ -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;
......
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/home/index.jsp
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
}); });
}); });
var ciyun = ['ciyun', 'ciyun2', 'ciyun3'] var ciyun = ['ciyun1', 'ciyun2', 'ciyun3']
function getRandomInt(min, max) { function getRandomInt(min, max) {
min = Math.ceil(min); min = Math.ceil(min);
......
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/include/header_search.jsp
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
<input class="form-control" type="text" placeholder="辞海云" name="keyword"> <input class="form-control" type="text" placeholder="辞海云" name="keyword">
<button class="btn navbar-search-camera" type="button"> <button class="btn navbar-search-camera" type="button">
<div class="icon icon-camera"> <div class="icon icon-camera">
<input name="image" type="file" class="j_search_image" style="opacity: 0" accept=".png, .jpg, .jpeg"> <input name="image" type="file" class="j_search_image" style="opacity: 0;width: 100%;" accept=".png, .jpg, .jpeg">
</div> </div>
</button> </button>
<%--<button class="btn navbar-search-microphone" type="button">--%> <%--<button class="btn navbar-search-microphone" type="button">--%>
......
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/word/statement_baike.jsp
...@@ -816,6 +816,77 @@ ...@@ -816,6 +816,77 @@
</div> </div>
</div> </div>
</c:when> </c:when>
<c:when test="${vo.word eq '中华人民共和国'}">
<div class="recommend">
<div class="recommend-title title-base">相关词</div>
<div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">中华人民共和国</div>
<div class="recommend-cells">
<span class="recommend-cell">中华人民共和国主席</span>
<span class="recommend-cell">中华人民共和国首都</span>
<span class="recommend-cell">中华人民共和国宪法</span>
<span class="recommend-cell">中华人民共和国国旗</span>
<span class="recommend-cell">中华人民共和国国徽</span>
<span class="recommend-cell">中华人民共和国国务院</span>
<span class="recommend-cell">中华人民共和国合同法</span>
<span class="recommend-cell">中华人民共和国审计法</span>
<span class="recommend-cell">中华人民共和国财政部</span>
<span class="recommend-cell">中华人民共和国可再生能源法</span>
</div>
</div>
</div>
</c:when>
<c:when test="${vo.word eq '中华人民共和国国务院'}">
<div class="recommend">
<div class="recommend-title title-base">相关词</div>
<div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">相关人物</div>
<div class="recommend-cells">
<span class="recommend-cell">周恩来</span>
<span class="recommend-cell">华国锋</span>
<span class="recommend-cell">赵紫阳</span>
<span class="recommend-cell">薄一波</span>
<span class="recommend-cell">陈锡联</span>
<span class="recommend-cell">陈毅</span>
<span class="recommend-cell">陈永贵</span>
<span class="recommend-cell">陈云</span>
<span class="recommend-cell">邓小平</span>
<span class="recommend-cell">邓子恢</span>
<span class="recommend-cell">董必武</span>
<span class="recommend-cell">方毅</span>
<span class="recommend-cell">耿飈</span>
<span class="recommend-cell">贺龙</span>
<span class="recommend-cell">黄菊</span>
<span class="recommend-cell">黄炎培</span>
<span class="recommend-cell">姬鹏飞</span>
<span class="recommend-cell">纪登奎</span>
<span class="recommend-cell">康世恩</span>
<span class="recommend-cell">柯庆施</span>
<span class="recommend-cell">李富春</span>
<span class="recommend-cell">李先念</span>
<span class="recommend-cell">林彪</span>
<span class="recommend-cell">罗瑞卿</span>
<span class="recommend-cell">聂荣臻</span>
<span class="recommend-cell">彭德怀</span>
<span class="recommend-cell">谭震林</span>
<span class="recommend-cell">陶铸</span>
<span class="recommend-cell">王任重</span>
<span class="recommend-cell">王震</span>
<span class="recommend-cell">乌兰夫</span>
<span class="recommend-cell">吴学谦</span>
<span class="recommend-cell">习仲勋</span>
<span class="recommend-cell">谢富治</span>
<span class="recommend-cell">徐向前</span>
<span class="recommend-cell">杨静仁</span>
<span class="recommend-cell">姚依林</span>
<span class="recommend-cell">余秋里</span>
<span class="recommend-cell">张爱萍</span>
<span class="recommend-cell">张春桥</span>
</div>
</div>
</div>
</c:when>
<c:when test="${oneway != null}"> <c:when test="${oneway != null}">
<div class="recommend"> <div class="recommend">
<div class="recommend-title title-base">相关词</div> <div class="recommend-title title-base">相关词</div>
......
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/word/statement_paraph.jsp
...@@ -33,17 +33,17 @@ ...@@ -33,17 +33,17 @@
<div class="head-intro clearfix"> <div class="head-intro clearfix">
<div class="word pull-left">${vo.word}</div> <div class="word pull-left">${vo.word}</div>
<%--<div class="voice-box pull-left">--%> <%--<div class="voice-box pull-left">--%>
<%--<div class="voice clearfix">--%> <%--<div class="voice clearfix">--%>
<%--<div class="pull-left py">--%> <%--<div class="pull-left py">--%>
<%--【--%> <%--【--%>
<%--<c:forEach items="${vo.spell}" var="item">--%> <%--<c:forEach items="${vo.spell}" var="item">--%>
<%--${item}--%> <%--${item}--%>
<%--</c:forEach>--%> <%--</c:forEach>--%>
<%--】--%> <%--】--%>
<%--</div>--%> <%--</div>--%>
<%--<div class="icon" style="background-image:url(/static/icons/voice.png)"></div>--%> <%--<div class="icon" style="background-image:url(/static/icons/voice.png)"></div>--%>
<%--</div>--%> <%--</div>--%>
<%--&lt;%&ndash;<div class="sub-name">长鼻目象科哺乳动物</div>&ndash;%&gt;--%> <%--&lt;%&ndash;<div class="sub-name">长鼻目象科哺乳动物</div>&ndash;%&gt;--%>
<%--</div>--%> <%--</div>--%>
</div> </div>
<div class="intro-box clearfix"> <div class="intro-box clearfix">
...@@ -249,6 +249,56 @@ ...@@ -249,6 +249,56 @@
</div> </div>
</div> </div>
</c:when> </c:when>
<c:when test="${vo.word eq '中华人民共和国国务院'}">
<div class="recommend">
<div class="recommend-title title-base">相关词</div>
<div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">相关人物</div>
<div class="recommend-cells">
<span class="recommend-cell">周恩来</span>
<span class="recommend-cell">华国锋</span>
<span class="recommend-cell">赵紫阳</span>
<span class="recommend-cell">薄一波</span>
<span class="recommend-cell">陈锡联</span>
<span class="recommend-cell">陈毅</span>
<span class="recommend-cell">陈永贵</span>
<span class="recommend-cell">陈云</span>
<span class="recommend-cell">邓小平</span>
<span class="recommend-cell">邓子恢</span>
<span class="recommend-cell">董必武</span>
<span class="recommend-cell">方毅</span>
<span class="recommend-cell">耿飈</span>
<span class="recommend-cell">贺龙</span>
<span class="recommend-cell">黄菊</span>
<span class="recommend-cell">黄炎培</span>
<span class="recommend-cell">姬鹏飞</span>
<span class="recommend-cell">纪登奎</span>
<span class="recommend-cell">康世恩</span>
<span class="recommend-cell">柯庆施</span>
<span class="recommend-cell">李富春</span>
<span class="recommend-cell">李先念</span>
<span class="recommend-cell">林彪</span>
<span class="recommend-cell">罗瑞卿</span>
<span class="recommend-cell">聂荣臻</span>
<span class="recommend-cell">彭德怀</span>
<span class="recommend-cell">谭震林</span>
<span class="recommend-cell">陶铸</span>
<span class="recommend-cell">王任重</span>
<span class="recommend-cell">王震</span>
<span class="recommend-cell">乌兰夫</span>
<span class="recommend-cell">吴学谦</span>
<span class="recommend-cell">习仲勋</span>
<span class="recommend-cell">谢富治</span>
<span class="recommend-cell">徐向前</span>
<span class="recommend-cell">杨静仁</span>
<span class="recommend-cell">姚依林</span>
<span class="recommend-cell">余秋里</span>
<span class="recommend-cell">张爱萍</span>
<span class="recommend-cell">张春桥</span>
</div>
</div>
</div>
</c:when>
<c:when test="${oneway != null}"> <c:when test="${oneway != null}">
<div class="recommend"> <div class="recommend">
<div class="recommend-title title-base">相关词</div> <div class="recommend-title title-base">相关词</div>
......
serverside/cihai-pc/src/main/webapp/static/images/ciyun2.png
serverside/cihai-pc/src/main/webapp/static/images/ciyun2.png

11 KB | W: | H:

serverside/cihai-pc/src/main/webapp/static/images/ciyun2.png

30.8 KB | W: | H:

serverside/cihai-pc/src/main/webapp/static/images/ciyun2.png
serverside/cihai-pc/src/main/webapp/static/images/ciyun2.png
serverside/cihai-pc/src/main/webapp/static/images/ciyun2.png
serverside/cihai-pc/src/main/webapp/static/images/ciyun2.png
  • 2-up
  • Swipe
  • Onion skin
serverside/cihai-pc/src/main/webapp/static/images/ciyun3.png
serverside/cihai-pc/src/main/webapp/static/images/ciyun3.png

11 KB | W: | H:

serverside/cihai-pc/src/main/webapp/static/images/ciyun3.png

33.6 KB | W: | H:

serverside/cihai-pc/src/main/webapp/static/images/ciyun3.png
serverside/cihai-pc/src/main/webapp/static/images/ciyun3.png
serverside/cihai-pc/src/main/webapp/static/images/ciyun3.png
serverside/cihai-pc/src/main/webapp/static/images/ciyun3.png
  • 2-up
  • Swipe
  • Onion skin
serverside/cihai-pc/src/main/webapp/static/temp/history.png
serverside/cihai-pc/src/main/webapp/static/temp/history.png

28.1 KB | W: | H:

serverside/cihai-pc/src/main/webapp/static/temp/history.png

10.4 KB | W: | H:

serverside/cihai-pc/src/main/webapp/static/temp/history.png
serverside/cihai-pc/src/main/webapp/static/temp/history.png
serverside/cihai-pc/src/main/webapp/static/temp/history.png
serverside/cihai-pc/src/main/webapp/static/temp/history.png
  • 2-up
  • Swipe
  • Onion skin
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!