Skip to content

石磊 / cihai

Go to a project
Commit df20b866 by 侯昆
Options

图片视频内容，中国相关词修改

1 parent b9fd3675
Inline Side-by-side
Showing 52 changed files with 212 additions and 155 deletions
serverside/cihai-app/src/main/java/com/dookay/cihai/app/controller/vo/EditionVO.java
...@@ -39,8 +39,12 @@ public class EditionVO { ...@@ -39,8 +39,12 @@ public class EditionVO {
EditionVO vo = new EditionVO(); EditionVO vo = new EditionVO();
if (wordDomain.getWord().equals("中华人民共和国")) { if (wordDomain.getWord().equals("中华人民共和国")) {
vo.setMainEditor("刘君德"); vo.setMainEditor("刘君德");
}else if(ArrayUtils.contains(new String[]{"鲁迅", "中国左翼作家联盟"}, wordDomain.getWord())){ }else if(ArrayUtils.contains(new String[]{"鲁迅", "中国左翼作家联盟"}, wordDomain.getWord())) {
vo.setMainEditor("陈思和"); vo.setMainEditor("陈思和");
} else if (ArrayUtils.contains(new String[]{"太阳系"}, wordDomain.getWord())) {
vo.setMainEditor("方成");
} else if (ArrayUtils.contains(new String[]{"心脏"}, wordDomain.getWord())) {
vo.setMainEditor("董健");
} else { } else {
vo.setMainEditor("王继如"); vo.setMainEditor("王继如");
} }
......
serverside/cihai-app/src/main/java/com/dookay/cihai/app/helper/HtmlHelper.java
...@@ -41,8 +41,9 @@ public class HtmlHelper { ...@@ -41,8 +41,9 @@ public class HtmlHelper {
return null; return null;
} }
if (g.indexOf(b) == 0) { if (g.indexOf(b) == 0) {
// 2018/2/11 houkun 改为统一字体
return String.format( return String.format(
"<td>%s：<strong>%s</strong></td>", "<td>%s： %s</td>",
split[0], split[1]); split[0], split[1]);
} else { } else {
return String.format( return String.format(
......
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/word/character_paraph.jsp
...@@ -45,16 +45,14 @@ ...@@ -45,16 +45,14 @@
<table> <table>
<tbody> <tbody>
<tr> <tr>
<td>笔画： <td>笔画：9 </td>
<strong>9</strong>
</td>
<td>部首：讠</td> <td>部首：讠</td>
<td>四角号码：71220</td> <td>四角号码：71220</td>
</tr> </tr>
<tr> <tr>
<td>部外： <%--<td>部外：--%>
<strong>7</strong> <%--<strong>7</strong>--%>
</td> <%--</td>--%>
<td>结构：左右</td> <td>结构：左右</td>
<td>繁体：說</td> <td>繁体：說</td>
</tr> </tr>
......
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/word/relate.jsp
...@@ -29,102 +29,102 @@ ...@@ -29,102 +29,102 @@
<c:when test="${vo.word eq '象' and type eq 0}"> <c:when test="${vo.word eq '象' and type eq 0}">
<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>
<a class="list-group-item" >象鼻虫</a> <a class="list-group-item">象鼻虫</a>
<a class="list-group-item" href="/word/info/522">象鼻山</a> <a class="list-group-item" href="/word/info/522">象鼻山</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> </div>
</c:when> </c:when>
<c:when test="${vo.word eq '象' and type eq 1}"> <c:when test="${vo.word eq '象' and type eq 1}">
<div class="list-group"> <div class="list-group">
<span class="list-group-item list-group-item-header">开头</span> <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>
</div> </div>
<div class="list-group"> <div class="list-group">
<span class="list-group-item list-group-item-header">中间</span> <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>
</div> </div>
<div class="list-group"> <div class="list-group">
<span class="list-group-item list-group-item-header">结尾</span> <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>
</div> </div>
</c:when> </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">开头</span> <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>
</div> </div>
<div class="list-group"> <div class="list-group">
<span class="list-group-item list-group-item-header">中间</span> <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>
</div> </div>
<div class="list-group"> <div class="list-group">
<span class="list-group-item list-group-item-header">结尾</span> <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>
</div> </div>
</c:when> </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>
<a class="list-group-item" href="/word/info/1">象</a> <a class="list-group-item" href="/word/info/1">象</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> </div>
</c:when> </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>
<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> </div>
</c:when> </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>
<a class="list-group-item" >中华人民共和国首都</a> <a class="list-group-item" href="/word/info/608">中华人民共和国首都</a>
<a class="list-group-item" >中华人民共和国国旗</a> <a class="list-group-item" href="/word/info/609">中华人民共和国国旗</a>
<a class="list-group-item" >中华人民共和国国徽</a> <a class="list-group-item" href="/word/info/610">中华人民共和国国徽</a>
<a class="list-group-item" >中华人民共和国国歌</a> <a class="list-group-item" href="/word/info/611">中华人民共和国国歌</a>
<a class="list-group-item" >中华人民共和国国庆日</a> <a class="list-group-item" href="/word/info/612">中华人民共和国国庆日</a>
<a class="list-group-item" >中华人民共和国国务院</a> <a class="list-group-item" href="/word/info/613">中华人民共和国国务院</a>
</div> </div>
</c:when> </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>
<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> </div>
</c:when> </c:when>
......
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/word/statement_baike.jsp
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
</c:if> </c:if>
<c:if test="${vo.word eq '太阳系'}"> <c:if test="${vo.word eq '太阳系'}">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" id="nav-map" href="#content-detail-tab-4" role="tab" data-toggle="tab">地球</a> <a class="nav-link" id="nav-map" href="#content-detail-tab-4" role="tab" data-toggle="tab">3D模型</a>
</li> </li>
</c:if> </c:if>
</ul> </ul>
......
serverside/cihai-core/src/main/java/com/dookay/cihai/core/word/service/impl/WordServiceImpl.java
...@@ -42,7 +42,7 @@ public class WordServiceImpl extends BaseServiceImpl<WordDomain> implements IWor ...@@ -42,7 +42,7 @@ public class WordServiceImpl extends BaseServiceImpl<WordDomain> implements IWor
@Override @Override
public RecommendStatementDTO recomendStatement() { public RecommendStatementDTO recomendStatement() {
WordQuery query = new WordQuery(); WordQuery query = new WordQuery();
query.setWord("鲁迅"); query.setWord("二十四节气");
WordDomain wordDomain = super.getFirst(query); WordDomain wordDomain = super.getFirst(query);
List<WordDomain> relateWord = wordRelationService.getRelateWords(wordDomain.getId()); List<WordDomain> relateWord = wordRelationService.getRelateWords(wordDomain.getId());
return RecommendStatementDTO.fromDomain(wordDomain, relateWord); return RecommendStatementDTO.fromDomain(wordDomain, relateWord);
......
serverside/cihai-pc/src/main/java/com/dookay/cihai/pc/controller/vo/CharacterBaikeVO.java
...@@ -50,6 +50,8 @@ public class CharacterBaikeVO { ...@@ -50,6 +50,8 @@ public class CharacterBaikeVO {
private List<ImageModel> videos; private List<ImageModel> videos;
private List<ImageModel> audios;
public static CharacterBaikeVO fromDomain(WordDomain word) { public static CharacterBaikeVO fromDomain(WordDomain word) {
CharacterBaikeVO dto = new CharacterBaikeVO(); CharacterBaikeVO dto = new CharacterBaikeVO();
dto.setWordId(word.getId()); dto.setWordId(word.getId());
...@@ -77,6 +79,9 @@ public class CharacterBaikeVO { ...@@ -77,6 +79,9 @@ public class CharacterBaikeVO {
if (StringUtils.isNotEmpty(word.getBaikeVideo())) { if (StringUtils.isNotEmpty(word.getBaikeVideo())) {
dto.setVideos(ImageModel.toList(word.getBaikeVideo())); dto.setVideos(ImageModel.toList(word.getBaikeVideo()));
} }
if (StringUtils.isNotEmpty(word.getBaikeVoice())) {
dto.setAudios(ImageModel.toList(word.getBaikeVoice()));
}
return dto; return dto;
} }
} }
serverside/cihai-pc/src/main/java/com/dookay/cihai/pc/controller/vo/EditionVO.java
...@@ -41,6 +41,10 @@ public class EditionVO { ...@@ -41,6 +41,10 @@ public class EditionVO {
vo.setMainEditor("刘君德"); vo.setMainEditor("刘君德");
}else if(ArrayUtils.contains(new String[]{"鲁迅", "中国左翼作家联盟"}, wordDomain.getWord())){ }else if(ArrayUtils.contains(new String[]{"鲁迅", "中国左翼作家联盟"}, wordDomain.getWord())){
vo.setMainEditor("陈思和"); vo.setMainEditor("陈思和");
} else if (ArrayUtils.contains(new String[]{"太阳系"}, wordDomain.getWord())) {
vo.setMainEditor("方成");
} else if (ArrayUtils.contains(new String[]{"心脏"}, wordDomain.getWord())) {
vo.setMainEditor("董健");
} else { } else {
vo.setMainEditor("王继如"); vo.setMainEditor("王继如");
} }
......
serverside/cihai-pc/src/main/java/com/dookay/cihai/pc/controller/vo/StatementBaikeVO.java
...@@ -47,6 +47,8 @@ public class StatementBaikeVO { ...@@ -47,6 +47,8 @@ public class StatementBaikeVO {
private List<ImageModel> videos; private List<ImageModel> videos;
private List<ImageModel> audios;
private ImageModel thumb; private ImageModel thumb;
public static StatementBaikeVO fromDomain(WordDomain word) { public static StatementBaikeVO fromDomain(WordDomain word) {
...@@ -73,6 +75,9 @@ public class StatementBaikeVO { ...@@ -73,6 +75,9 @@ public class StatementBaikeVO {
if (StringUtils.isNotEmpty(word.getBaikeVideo())) { if (StringUtils.isNotEmpty(word.getBaikeVideo())) {
dto.setVideos(ImageModel.toList(word.getBaikeVideo())); dto.setVideos(ImageModel.toList(word.getBaikeVideo()));
} }
if (StringUtils.isNotEmpty(word.getBaikeVoice())) {
dto.setAudios(ImageModel.toList(word.getBaikeVoice()));
}
return dto; return dto;
} }
} }
serverside/cihai-pc/src/main/java/com/dookay/cihai/pc/helper/HtmlHelper.java
...@@ -44,10 +44,11 @@ public class HtmlHelper { ...@@ -44,10 +44,11 @@ public class HtmlHelper {
return null; return null;
} }
if (brief.indexOf(b) % 3 == 0) { if (brief.indexOf(b) % 3 == 0) {
// 2018/2/11 houkun 改为统一字体
return String.format( return String.format(
"<div class=\"character-info-cell\">\n" + "<div class=\"character-info-cell\">\n" +
" <span class=\"character-info-label\">%s： </span>\n" + " <span class=\"character-info-label\">%s： </span>\n" +
" <span class=\"character-info-num\">%s</span>\n" + " <span class=\"character-info-value\">%s</span>\n" +
"</div>", "</div>",
split[0], split[1]); split[0], split[1]);
} else { } else {
......
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/home/index.jsp
...@@ -47,9 +47,16 @@ ...@@ -47,9 +47,16 @@
<%--</div>--%> <%--</div>--%>
<%--</div>--%> <%--</div>--%>
<%--</nav>--%> <%--</nav>--%>
<div class="brand-index">
<a class="logo" href="/"> <a class="logo" href="/">
<img src="/static/images/logo.png"> <img src="/static/images/logo.png">
</a> </a>
<div class="hot-tags">
<a href="/country">万国志</a>
<a href="/area">地方志</a>
<a href="/people">人物志</a>
</div>
</div>
<a class="calendar" href="/today"> <a class="calendar" href="/today">
<img src="/static/images/calendar2.png" alt="历史上的今天" title="历史上的今天"> <img src="/static/images/calendar2.png" alt="历史上的今天" title="历史上的今天">
</a> </a>
...@@ -77,9 +84,14 @@ ...@@ -77,9 +84,14 @@
</div> </div>
</form> </form>
<div class="navbar-links navbar-form"> <div class="navbar-links navbar-form">
<a href="/country">万国志</a> <label class="radio-inline">
<a href="/area">地方志</a> <input type="radio" name="search-type" checked>词头</label>
<a href="/people">人物志</a> <label class="radio-inline">
<input type="radio" name="search-type">全文</label>
<label class="radio-inline">
<input type="radio" name="search-type">图片</label>
<label class="radio-inline">
<input type="radio" name="search-type">视频</label>
</div> </div>
</div> </div>
<div class="push-main"> <div class="push-main">
...@@ -87,8 +99,8 @@ ...@@ -87,8 +99,8 @@
<div class="row"> <div class="row">
<div class="col-lg-11 col-lg-push-6 col-xs-24"> <div class="col-lg-11 col-lg-push-6 col-xs-24">
<div class="card"> <div class="card">
<%--<div class="card-title">每日一字</div>--%> <div class="card-title">每日一字</div>
<%--<div class="card-title">推荐词条</div>--%> <div class="card-title">百科知识</div>
<div class="card-main"> <div class="card-main">
<div class="card-col card-character"> <div class="card-col card-character">
<div class="card-character-main"> <div class="card-character-main">
...@@ -123,13 +135,14 @@ ...@@ -123,13 +135,14 @@
</div> </div>
<div class="col-lg-6 col-lg-pull-11 col-xs-12"> <div class="col-lg-6 col-lg-pull-11 col-xs-12">
<div class="card"> <div class="card">
<%--<div class="card-title">知识专题</div>--%> <div class="card-title">知识专题</div>
<div class="card-main"> <div class="card-main">
<div class="theme clearfix"> <div class="theme clearfix">
<a class="theme-cell" href="javascript:;">中国特色社会主义</a>
<a class="theme-cell" href="javascript:;">心脏</a> <a class="theme-cell" href="javascript:;">心脏</a>
<a class="theme-cell" href="javascript:;">一般天文数据</a> <br>
<a class="theme-cell" href="javascript:;">中国历史朝代</a> <a class="theme-cell" href="javascript:;">中国历史朝代</a>
<br>
<a class="theme-cell" href="javascript:;">中国特色社会主义</a>
<a class="theme-refresh" href="javascript:;"> <a class="theme-refresh" href="javascript:;">
<div class="icon icon-refresh"></div> <div class="icon icon-refresh"></div>
</a> </a>
...@@ -139,7 +152,7 @@ ...@@ -139,7 +152,7 @@
</div> </div>
<div class="col-lg-7 col-xs-12"> <div class="col-lg-7 col-xs-12">
<div class="card"> <div class="card">
<%--<div class="card-title">词云</div>--%> <div class="card-title">热搜词条</div>
<div class="card-main"> <div class="card-main">
<div class="word"></div> <div class="word"></div>
</div> </div>
...@@ -229,6 +242,7 @@ ...@@ -229,6 +242,7 @@
max = Math.floor(max); max = Math.floor(max);
return Math.floor(Math.random() * (max - min)) + min; //The maximum is exclusive and the minimum is inclusive return Math.floor(Math.random() * (max - min)) + min; //The maximum is exclusive and the minimum is inclusive
} }
var ran = getRandomInt(0, 3) var ran = getRandomInt(0, 3)
$(".word").css({ $(".word").css({
"background-image": "url(/static/images/" + ciyun[ran] + ".png)" "background-image": "url(/static/images/" + ciyun[ran] + ".png)"
......
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/include/header_search.jsp
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
<div class="navbar-collapse"> <div class="navbar-collapse">
<form class="navbar-form clearfix j_search_form" method="GET" action="/home/search"> <form class="navbar-form clearfix j_search_form" method="GET" action="/home/search">
<div class="form-group input-group-lg"> <div class="form-group input-group-lg">
<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" accept=".png, .jpg, .jpeg">
......
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/word/character_baike.jsp
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
<div class="col-xs-7"> <div class="col-xs-7">
<aside class="aside"> <aside class="aside">
<div class="statistics"> <div class="statistics">
<div class="statistics-title title-base">词条统计</div> <div class="statistics-title title-base">词条基本信息</div>
<div class="statistics-content"> <div class="statistics-content">
<div class="statistics-p"> <div class="statistics-p">
<span class="statistics-label">主 编：</span> <span class="statistics-label">主 编：</span>
...@@ -131,7 +131,6 @@ ...@@ -131,7 +131,6 @@
<span class="statistics-label">修订记录：</span> <span class="statistics-label">修订记录：</span>
<span class="statistics-value"> <span class="statistics-value">
<span class="text-lg">${edition.reviseCount}</span>次</span> <span class="text-lg">${edition.reviseCount}</span>次</span>
<a class="statistics-link" href="#">历史版本</a>
</div> </div>
<div class="statistics-p"> <div class="statistics-p">
<span class="statistics-label">浏览次数：</span> <span class="statistics-label">浏览次数：</span>
...@@ -144,7 +143,7 @@ ...@@ -144,7 +143,7 @@
<c:choose> <c:choose>
<c:when test="${vo.word eq '象'}"> <c:when test="${vo.word eq '象'}">
<div class="recommend"> <div class="recommend">
<div class="recommend-title title-base">推荐词</div> <div class="recommend-title title-base">相关词</div>
<div class="recommend-section"> <div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">象</div> <div class="recommend-section-title title-sm title-primary">象</div>
<div class="recommend-cells"> <div class="recommend-cells">
...@@ -164,7 +163,7 @@ ...@@ -164,7 +163,7 @@
</c:when> </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>
<c:forEach items="${oneway.relationByGroup}" var="group"> <c:forEach items="${oneway.relationByGroup}" var="group">
<div class="recommend-section"> <div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">${group.middle}</div> <div class="recommend-section-title title-sm title-primary">${group.middle}</div>
......
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/word/character_paraph.jsp
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
<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">9</span> <span class="character-info-value">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>
...@@ -82,10 +82,10 @@ ...@@ -82,10 +82,10 @@
<span class="character-info-label">四角号码：</span> <span class="character-info-label">四角号码：</span>
<span class="character-info-value">71220</span> <span class="character-info-value">71220</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-num">7</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>
...@@ -313,7 +313,7 @@ ...@@ -313,7 +313,7 @@
<div class="col-xs-7"> <div class="col-xs-7">
<aside class="aside"> <aside class="aside">
<div class="statistics"> <div class="statistics">
<div class="statistics-title title-base">词条统计</div> <div class="statistics-title title-base">词条基本信息</div>
<div class="statistics-content"> <div class="statistics-content">
<div class="statistics-p"> <div class="statistics-p">
<span class="statistics-label">主 编：</span> <span class="statistics-label">主 编：</span>
...@@ -337,7 +337,7 @@ ...@@ -337,7 +337,7 @@
</div> </div>
</div> </div>
<div class="recommend"> <div class="recommend">
<div class="recommend-title title-base">推荐词</div> <div class="recommend-title title-base">相关词</div>
<div class="recommend-section"> <div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">开头</div> <div class="recommend-section-title title-sm title-primary">开头</div>
<div class="recommend-cells"> <div class="recommend-cells">
...@@ -523,7 +523,7 @@ ...@@ -523,7 +523,7 @@
<div class="col-xs-7"> <div class="col-xs-7">
<aside class="aside"> <aside class="aside">
<div class="statistics"> <div class="statistics">
<div class="statistics-title title-base">词条统计</div> <div class="statistics-title title-base">词条基本信息</div>
<div class="statistics-content"> <div class="statistics-content">
<div class="statistics-p"> <div class="statistics-p">
<span class="statistics-label">主 编：</span> <span class="statistics-label">主 编：</span>
...@@ -537,7 +537,6 @@ ...@@ -537,7 +537,6 @@
<span class="statistics-label">修订记录： </span> <span class="statistics-label">修订记录： </span>
<span class="statistics-value"> <span class="statistics-value">
<span class="text-lg">${edition.reviseCount}</span>次</span> <span class="text-lg">${edition.reviseCount}</span>次</span>
<a class="statistics-link" href="#">历史版本</a>
</div> </div>
<div class="statistics-p"> <div class="statistics-p">
<span class="statistics-label">浏览次数： </span> <span class="statistics-label">浏览次数： </span>
...@@ -550,7 +549,7 @@ ...@@ -550,7 +549,7 @@
<c:choose> <c:choose>
<c:when test="${vo.word eq '象'}"> <c:when test="${vo.word eq '象'}">
<div class="recommend"> <div class="recommend">
<div class="recommend-title title-base">推荐词</div> <div class="recommend-title title-base">相关词</div>
<div class="recommend-section"> <div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">开头</div> <div class="recommend-section-title title-sm title-primary">开头</div>
<div class="recommend-cells"> <div class="recommend-cells">
...@@ -579,7 +578,7 @@ ...@@ -579,7 +578,7 @@
</c:when> </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>
<c:forEach items="${oneway.relationByGroup}" var="group"> <c:forEach items="${oneway.relationByGroup}" var="group">
<div class="recommend-section"> <div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">${group.middle}</div> <div class="recommend-section-title title-sm title-primary">${group.middle}</div>
......
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/word/statement_baike.jsp
...@@ -12,9 +12,6 @@ ...@@ -12,9 +12,6 @@
<div class="container"> <div class="container">
<div class="encyclopedia" <div class="encyclopedia"
<c:choose> <c:choose>
<c:when test="${vo.word eq '太阳系'}">
style="background-image:url(/static/images/world.topo.bathy.200401.jpg)"
</c:when>
<c:when test="${vo.images.size() > 0}"> <c:when test="${vo.images.size() > 0}">
style="background-image:url(${vo.thumb.file})" style="background-image:url(${vo.thumb.file})"
</c:when> </c:when>
...@@ -84,22 +81,24 @@ ...@@ -84,22 +81,24 @@
</a> </a>
</li> </li>
</c:if> </c:if>
<c:if test="${vo.audios.size() > 0}">
<li class="main-tab-item">
<a href="#tab3">音频
<span class="badge">${vo.audios.size()}</span>
</a>
</li>
</c:if>
<c:if test="${vo.word eq '太阳系'}"> <c:if test="${vo.word eq '太阳系'}">
<li class="main-tab-item"> <li class="main-tab-item">
<a href="#tab3" id="map-tab">地球</a> <a href="#tab4" id="map-tab">3D模型</a>
</li> </li>
</c:if> </c:if>
<c:if test="${vo.word eq '心脏'}"> <c:if test="${vo.word eq '心脏'}">
<li class="main-tab-item"> <li class="main-tab-item">
<a href="#tab4" id="heart-tab">图谱</a> <a href="#tab5" id="heart-tab">图谱</a>
</li> </li>
</c:if> </c:if>
<%--<li class="main-tab-item">--%>
<%--<a href="#tab3">音频</a>--%>
<%--</li>--%>
<%--<li class="main-tab-item">--%>
<%--<a href="#tab4">图谱</a>--%>
<%--</li>--%>
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
<div class="tab-pane active paraphrase" id="tab1"> <div class="tab-pane active paraphrase" id="tab1">
...@@ -566,10 +565,10 @@ ...@@ -566,10 +565,10 @@
<div class="card-body"> <div class="card-body">
<ul class="list-unstyled mb-0"> <ul class="list-unstyled mb-0">
<li> <li>
<h5 class="media-title">雷恩( Ludwig Renn ) （1889—1979）</h5> <h5 class="media-title">罗竹风（1911—1996）</h5>
<div class="media"> <div class="media">
<div class="media-body"> <div class="media-body">
<p>德国小说家。出身贵族。参加过第一次世界大战。20年代接受马克思主义。1928年参加德国共产党和红色阵线战士同盟。1928—1932年担任无产阶级革命作家联盟书记，出版《左曲线》等刊物。1933年纳粹执政后两次被捕，获释后流亡国外，参加国际纵队，支援西班牙人民。1939年流亡墨西哥，1947年回国。主要作品有小说《战争》、《战后》、《没落的贵族》，青少年读物《特里尼》、《黑人诺比》等。30年代初期曾致电鲁迅，支持中国左翼作家联盟的正义斗争。</p> <p>中国语言学家、宗教学家、出版家、辞书编纂家、杂文家。山东平度人。1931年起参加反帝大同盟和中国左翼作家联盟。1935年毕业于北京大学。1938年加入中国共产党。曾任平度县抗日民主政府县长、山东省教育厅督学主任等。新中国成立后历任山东大学教务长、教授，华东和上海市宗教事务处处长，上海市出版局局长，上海市哲学社会科学学会联合会主席，上海市语言文字工作委员会主任等。是中国语言学会副会长，中国宗教学会副会长。为《汉语大词典》主编、《辞海》常务副主编、《中国大百科全书》总编委兼《宗教卷》主编、《中国新文学大系·杂文卷》（1949—1976）主编等。著述以杂文见长，有文集《行云流水六十秋》等。</p>
<p <p
class="mb-0"> class="mb-0">
<br> <br>
...@@ -578,11 +577,10 @@ ...@@ -578,11 +577,10 @@
</div> </div>
</li> </li>
<li> <li>
<h5 class="media-title">王学文 （1895—1985）</h5> <h5 class="media-title">方光焘（1898—1964）</h5>
<div class="media"> <div class="media">
<div class="media-body"> <div class="media-body">
<p> <p>中国语言学家、文学家。原名曙先，浙江衢州人。早年留学日本。1921年参加创造社，1931年参加中国左翼作家联盟。1929—1931年在法国里昂大学专攻语言学。历任上海大学、安徽大学、复旦大学、暨南大学、中山大学、中央大学教授。新中国成立后任南京大学教授、中文系主任，兼任江苏省文化局局长、文联主席。1956年加入中国共产党。一生从事语言和文学的教研工作。提倡新文学。对普通语言学和语法理论颇有研究，创汉语语法学的“广义形态说”。有《方光焘语言学论文集》、《语法论稿》等。</p>
中国经济学家。原名守椿，号首春，江苏徐州人。1910年留学日本。1925年京都帝国大学经济学部毕业，后为该校大学院研究生。1927年加入中国共产主义青年团。同年回国，加入中国共产党。1928年参加创造社。先后在上海一些大学讲授马克思主义政治经济学和经济思想史。参与组织中国自由大同盟、中国左翼作家联盟、中国社会科学家联盟等团体。1937年到延安。先后任中共中央文化工作委员会书记、延安中央党校教务主任。1938年任中共中央马列学院副院长兼教导主任。1940年任中央军委总政治部敌工部长兼敌军工作干部学校校长，后任华北财经学院院长、中央马列学院政治经济学教研室主任。是第一、四届全国人大代表，第一届全国政协代表，第二、三届全国政协委员，第四、五届全国政协常委，中科院哲学社会科学部委员。著有《中国经济现状概论》、《近世欧洲经济思想史》、《政治经济学教程绪论》、《王学文〈资本论〉研究文集》等。</p>
<p <p
class="mb-0"> class="mb-0">
<br> <br>
...@@ -591,11 +589,10 @@ ...@@ -591,11 +589,10 @@
</div> </div>
</li> </li>
<li> <li>
<h5 class="media-title">方光焘（1898—1964）</h5> <h5 class="media-title">雷恩( Ludwig Renn ) （1889—1979）</h5>
<div class="media"> <div class="media">
<div class="media-body"> <div class="media-body">
<p> <p>德国小说家。出身贵族。参加过第一次世界大战。20年代接受马克思主义。1928年参加德国共产党和红色阵线战士同盟。1928—1932年担任无产阶级革命作家联盟书记，出版《左曲线》等刊物。1933年纳粹执政后两次被捕，获释后流亡国外，参加国际纵队，支援西班牙人民。1939年流亡墨西哥，1947年回国。主要作品有小说《战争》、《战后》、《没落的贵族》，青少年读物《特里尼》、《黑人诺比》等。30年代初期曾致电鲁迅，支持中国左翼作家联盟的正义斗争。</p>
中国语言学家、文学家。原名曙先，浙江衢州人。早年留学日本。1921年参加创造社，1931年参加中国左翼作家联盟。1929—1931年在法国里昂大学专攻语言学。历任上海大学、安徽大学、复旦大学、暨南大学、中山大学、中央大学教授。新中国成立后任南京大学教授、中文系主任，兼任江苏省文化局局长、文联主席。1956年加入中国共产党。一生从事语言和文学的教研工作。提倡新文学。对普通语言学和语法理论颇有研究，创汉语语法学的“广义形态说”。有《方光焘语言学论文集》、《语法论稿》等。</p>
<p <p
class="mb-0"> class="mb-0">
<br> <br>
...@@ -604,11 +601,21 @@ ...@@ -604,11 +601,21 @@
</div> </div>
</li> </li>
<li> <li>
<h5 class="media-title">《莽原》</h5>
<div class="media">
<div class="media-body">
<p>文艺刊物。1925年4月在北京创刊。鲁迅主编。初为周刊，附于《京报》发行，后由北京莽原出版社独立出版，北新书局发行，共出三十二期。1926年1月改为半月刊，由未名社印行。主要发表短篇小说、散文和翻译作品。鲁迅的《朝花夕拾》（发表时题作《旧事重提》）等曾发表于此。1927年12月出至第二卷第二十三、二十四期（合刊）停刊，共出四十八期。</p>
<p class="mb-0">
<br>
</p>
</div>
</div>
</li>
<li>
<h5 class="media-title">李求实 （1903—1931）</h5> <h5 class="media-title">李求实 （1903—1931）</h5>
<div class="media"> <div class="media">
<div class="media-body"> <div class="media-body">
<p> <p>湖北武昌（今武汉市武昌区）人，原名国纬，字北平，笔名伟森。武昌高等商业专科学校毕业。1922年加入中国共产党。1923年参加领导京汉铁路工人大罢工。1924年赴莫斯科东方大学学习。次年回国，先后任共青团湖南省委书记、团中央宣传部长，《中国青年》主编。1929年到中共中央宣传部工作，创办《上海报》。曾参加中国左翼作家联盟工作。1931年在上海龙华被国民党反动派杀害。和同时遇害的柔石、殷夫、胡也频、冯铿，合称“左联五烈士”。著有《革命歌集》、《小品文杂感集》等。</p>
湖北武昌（今武汉市武昌区）人，原名国纬，字北平，笔名伟森。武昌高等商业专科学校毕业。1922年加入中国共产党。1923年参加领导京汉铁路工人大罢工。1924年赴莫斯科东方大学学习。次年回国，先后任共青团湖南省委书记、团中央宣传部长，《中国青年》主编。1929年到中共中央宣传部工作，创办《上海报》。曾参加中国左翼作家联盟工作。1931年在上海龙华被国民党反动派杀害。和同时遇害的柔石、殷夫、胡也频、冯铿，合称“左联五烈士”。著有《革命歌集》、《小品文杂感集》等。</p>
<p <p
class="mb-0"> class="mb-0">
<br> <br>
...@@ -617,11 +624,10 @@ ...@@ -617,11 +624,10 @@
</div> </div>
</li> </li>
<li> <li>
<h5 class="media-title">夏征农 （1904—2008）</h5> <h5 class="media-title">王学文 （1895—1985）</h5>
<div class="media"> <div class="media">
<div class="media-body"> <div class="media-body">
<p> <p>中国经济学家。原名守椿，号首春，江苏徐州人。1910年留学日本。1925年京都帝国大学经济学部毕业，后为该校大学院研究生。1927年加入中国共产主义青年团。同年回国，加入中国共产党。1928年参加创造社。先后在上海一些大学讲授马克思主义政治经济学和经济思想史。参与组织中国自由大同盟、中国左翼作家联盟、中国社会科学家联盟等团体。1937年到延安。先后任中共中央文化工作委员会书记、延安中央党校教务主任。1938年任中共中央马列学院副院长兼教导主任。1940年任中央军委总政治部敌工部长兼敌军工作干部学校校长，后任华北财经学院院长、中央马列学院政治经济学教研室主任。是第一、四届全国人大代表，第一届全国政协代表，第二、三届全国政协委员，第四、五届全国政协常委，中科院哲学社会科学部委员。著有《中国经济现状概论》、《近世欧洲经济思想史》、《政治经济学教程绪论》、《王学文〈资本论〉研究文集》等。</p>
江西丰城人，原名正和，曾用名夏子美、黎夫。1925年考入南京金陵大学，次年加入中国共产党。1927年参加南昌起义。1928年起任复旦大学共青团支部书记，江苏省团委宣传部秘书，《海上青年》杂志主编。1929年被国民党当局逮捕，狱中开始文学创作。次年出狱后，在共青团中央宣传部工作。1933年加入中国左翼作家联盟。抗日战争爆发后，历任新四军军政治部民运部长、中共苏中四地委宣传部长、苏中公学校长、华中建设大学副校长、中共济南市委宣传部长。新中国成立后，历任中共济南市委副书记，中共中央山东分局宣传部长，中共山东省委常委、济南市委书记处书记，中共中央华东局宣传部长，1966年6月被免职。1978年后任复旦大学党委书记，中共上海市委书记，上海市文联、社联主席，中国大百科全书总编辑委员会副主任。是中共八大代表，十二大列席代表，中顾委委员，中共十三大至十七大特邀代表。1978年起任《辞海》第三任主编。2002年任《大辞海》主编。主要著作编入《夏征农文集》。</p>
<p <p
class="mb-0"> class="mb-0">
<br> <br>
...@@ -629,13 +635,11 @@ ...@@ -629,13 +635,11 @@
</div> </div>
</div> </div>
</li> </li>
<li> <li>
<h5 class="media-title">罗竹风（1911—1996）</h5> <h5 class="media-title">夏征农 （1904—2008）</h5>
<div class="media"> <div class="media">
<div class="media-body"> <div class="media-body">
<p> <p>江西丰城人，原名正和，曾用名夏子美、黎夫。1925年考入南京金陵大学，次年加入中国共产党。1927年参加南昌起义。1928年起任复旦大学共青团支部书记，江苏省团委宣传部秘书，《海上青年》杂志主编。1929年被国民党当局逮捕，狱中开始文学创作。次年出狱后，在共青团中央宣传部工作。1933年加入中国左翼作家联盟。抗日战争爆发后，历任新四军军政治部民运部长、中共苏中四地委宣传部长、苏中公学校长、华中建设大学副校长、中共济南市委宣传部长。新中国成立后，历任中共济南市委副书记，中共中央山东分局宣传部长，中共山东省委常委、济南市委书记处书记，中共中央华东局宣传部长，1966年6月被免职。1978年后任复旦大学党委书记，中共上海市委书记，上海市文联、社联主席，中国大百科全书总编辑委员会副主任。是中共八大代表，十二大列席代表，中顾委委员，中共十三大至十七大特邀代表。1978年起任《辞海》第三任主编。2002年任《大辞海》主编。主要著作编入《夏征农文集》。</p>
中国语言学家、宗教学家、出版家、辞书编纂家、杂文家。山东平度人。1931年起参加反帝大同盟和中国左翼作家联盟。1935年毕业于北京大学。1938年加入中国共产党。曾任平度县抗日民主政府县长、山东省教育厅督学主任等。新中国成立后历任山东大学教务长、教授，华东和上海市宗教事务处处长，上海市出版局局长，上海市哲学社会科学学会联合会主席，上海市语言文字工作委员会主任等。是中国语言学会副会长，中国宗教学会副会长。为《汉语大词典》主编、《辞海》常务副主编、《中国大百科全书》总编委兼《宗教卷》主编、《中国新文学大系·杂文卷》（1949—1976）主编等。著述以杂文见长，有文集《行云流水六十秋》等。</p>
<p <p
class="mb-0"> class="mb-0">
<br> <br>
...@@ -693,16 +697,28 @@ ...@@ -693,16 +697,28 @@
<c:forEach items="${vo.videos}" var="item"> <c:forEach items="${vo.videos}" var="item">
<figure class="col-xs-6"> <figure class="col-xs-6">
<a href="${item.file}" target="_blank" data-size="202x146"> <a href="${item.file}" target="_blank" data-size="202x146">
<video class="img-responsive" src="${item.file}"> <%--<video class="img-responsive" src="${item.file}">--%>
<img class="img-responsive" src="/static/temp/word/${item.alt}">
</a> </a>
</figure> </figure>
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
<div class="tab-pane" id="tab3"> <div class="tab-pane" id="tab3">
<div id="chart-earth"></div> <div class="row list-img list-gallery">
<c:forEach items="${vo.audios}" var="item">
<figure class="col-xs-6">
<a href="${item.file}" target="_blank" data-size="202x146">
<img class="img-responsive" src="/static/temp/word/${item.alt}">
</a>
</figure>
</c:forEach>
</div>
</div> </div>
<div class="tab-pane" id="tab4"> <div class="tab-pane" id="tab4">
<div id="chart-earth"></div>
</div>
<div class="tab-pane" id="tab5">
<div class="swiper-container tp-swiper"> <div class="swiper-container tp-swiper">
<div class="swiper-wrapper"> <div class="swiper-wrapper">
<div class="swiper-slide"> <div class="swiper-slide">
...@@ -738,7 +754,7 @@ ...@@ -738,7 +754,7 @@
<div class="col-xs-7"> <div class="col-xs-7">
<aside class="aside"> <aside class="aside">
<div class="statistics"> <div class="statistics">
<div class="statistics-title title-base">词条统计</div> <div class="statistics-title title-base">词条基本信息</div>
<div class="statistics-content"> <div class="statistics-content">
<div class="statistics-p"> <div class="statistics-p">
<span class="statistics-label">主 编：</span> <span class="statistics-label">主 编：</span>
...@@ -752,7 +768,6 @@ ...@@ -752,7 +768,6 @@
<span class="statistics-label">修订记录：</span> <span class="statistics-label">修订记录：</span>
<span class="statistics-value"> <span class="statistics-value">
<span class="text-lg">${edition.reviseCount}</span>次</span> <span class="text-lg">${edition.reviseCount}</span>次</span>
<a class="statistics-link" href="#">历史版本</a>
</div> </div>
<div class="statistics-p"> <div class="statistics-p">
<span class="statistics-label">浏览次数：</span> <span class="statistics-label">浏览次数：</span>
...@@ -765,7 +780,7 @@ ...@@ -765,7 +780,7 @@
<c:choose> <c:choose>
<c:when test="${vo.word eq '象鼻山'}"> <c:when test="${vo.word eq '象鼻山'}">
<div class="recommend"> <div class="recommend">
<div class="recommend-title title-base">推荐词</div> <div class="recommend-title title-base">相关词</div>
<div class="recommend-section"> <div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">象鼻山</div> <div class="recommend-section-title title-sm title-primary">象鼻山</div>
<div class="recommend-cells"> <div class="recommend-cells">
...@@ -785,23 +800,23 @@ ...@@ -785,23 +800,23 @@
</c:when> </c:when>
<c:when test="${vo.word eq '中华人民共和国'}"> <c:when test="${vo.word eq '中华人民共和国'}">
<div class="recommend"> <div class="recommend">
<div class="recommend-title title-base">推荐词</div> <div class="recommend-title title-base">相关词</div>
<div class="recommend-section"> <div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">中华人民共和国</div> <div class="recommend-section-title title-sm title-primary">中华人民共和国</div>
<div class="recommend-cells"> <div class="recommend-cells">
<span class="recommend-cell">中华人民共和国首都</span> <a href="/word/608" style="color: #000;"><span class="recommend-cell">中华人民共和国首都</span></a>
<span class="recommend-cell">中华人民共和国国旗</span> <a href="/word/609" style="color: #000;"><span class="recommend-cell">中华人民共和国国旗</span></a>
<span class="recommend-cell">中华人民共和国国徽</span> <a href="/word/610" style="color: #000;"><span class="recommend-cell">中华人民共和国国徽</span></a>
<span class="recommend-cell">中华人民共和国国歌</span> <a href="/word/611" style="color: #000;"><span class="recommend-cell">中华人民共和国国歌</span></a>
<span class="recommend-cell">中华人民共和国国庆日</span> <a href="/word/612" style="color: #000;"><span class="recommend-cell">中华人民共和国国庆日</span></a>
<span class="recommend-cell">中华人民共和国国务院</span> <a href="/word/613" style="color: #000;"><span class="recommend-cell">中华人民共和国国务院</span></a>
</div> </div>
</div> </div>
</div> </div>
</c:when> </c:when>
<c:when test="${vo.word eq '太阳系'}"> <c:when test="${vo.word eq '太阳系'}">
<div class="recommend"> <div class="recommend">
<div class="recommend-title title-base">推荐词</div> <div class="recommend-title title-base">相关词</div>
<div class="recommend-section"> <div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">太阳系</div> <div class="recommend-section-title title-sm title-primary">太阳系</div>
<div class="recommend-cells"> <div class="recommend-cells">
...@@ -814,7 +829,7 @@ ...@@ -814,7 +829,7 @@
</c:when> </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>
<c:forEach items="${oneway.relationByGroup}" var="group"> <c:forEach items="${oneway.relationByGroup}" var="group">
<div class="recommend-section"> <div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">${group.middle}</div> <div class="recommend-section-title title-sm title-primary">${group.middle}</div>
......
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/word/statement_paraph.jsp
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
<div class="col-xs-7"> <div class="col-xs-7">
<aside class="aside"> <aside class="aside">
<div class="statistics"> <div class="statistics">
<div class="statistics-title title-base">词条统计</div> <div class="statistics-title title-base">词条基本信息</div>
<div class="statistics-content"> <div class="statistics-content">
<div class="statistics-p"> <div class="statistics-p">
<span class="statistics-label">主 编：</span> <span class="statistics-label">主 编：</span>
...@@ -186,7 +186,6 @@ ...@@ -186,7 +186,6 @@
<span class="statistics-label">修订记录： </span> <span class="statistics-label">修订记录： </span>
<span class="statistics-value"> <span class="statistics-value">
<span class="text-lg">${edition.reviseCount}</span>次</span> <span class="text-lg">${edition.reviseCount}</span>次</span>
<a class="statistics-link" href="#">历史版本</a>
</div> </div>
<div class="statistics-p"> <div class="statistics-p">
<span class="statistics-label">浏览次数： </span> <span class="statistics-label">浏览次数： </span>
...@@ -199,7 +198,7 @@ ...@@ -199,7 +198,7 @@
<c:choose> <c:choose>
<c:when test="${vo.word eq '象鼻山'}"> <c:when test="${vo.word eq '象鼻山'}">
<div class="recommend"> <div class="recommend">
<div class="recommend-title title-base">推荐词</div> <div class="recommend-title title-base">相关词</div>
<div class="recommend-section"> <div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">象鼻山</div> <div class="recommend-section-title title-sm title-primary">象鼻山</div>
<div class="recommend-cells"> <div class="recommend-cells">
...@@ -219,7 +218,7 @@ ...@@ -219,7 +218,7 @@
</c:when> </c:when>
<c:when test="${vo.word eq '中华人民共和国'}"> <c:when test="${vo.word eq '中华人民共和国'}">
<div class="recommend"> <div class="recommend">
<div class="recommend-title title-base">推荐词</div> <div class="recommend-title title-base">相关词</div>
<div class="recommend-section"> <div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">中华人民共和国</div> <div class="recommend-section-title title-sm title-primary">中华人民共和国</div>
<div class="recommend-cells"> <div class="recommend-cells">
...@@ -239,7 +238,7 @@ ...@@ -239,7 +238,7 @@
</c:when> </c:when>
<c:when test="${vo.word eq '太阳系'}"> <c:when test="${vo.word eq '太阳系'}">
<div class="recommend"> <div class="recommend">
<div class="recommend-title title-base">推荐词</div> <div class="recommend-title title-base">相关词</div>
<div class="recommend-section"> <div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">太阳系</div> <div class="recommend-section-title title-sm title-primary">太阳系</div>
<div class="recommend-cells"> <div class="recommend-cells">
...@@ -252,7 +251,7 @@ ...@@ -252,7 +251,7 @@
</c:when> </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>
<c:forEach items="${oneway.relationByGroup}" var="group"> <c:forEach items="${oneway.relationByGroup}" var="group">
<div class="recommend-section"> <div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">${group.middle}</div> <div class="recommend-section-title title-sm title-primary">${group.middle}</div>
......
serverside/cihai-pc/src/main/webapp/static/1-3检索列表.html
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<div class="navbar-collapse"> <div class="navbar-collapse">
<form class="navbar-form clearfix"> <form class="navbar-form clearfix">
<div class="form-group input-group-lg"> <div class="form-group input-group-lg">
<input class="form-control" type="text" placeholder="之云"> <input class="form-control" type="text" placeholder="辞海云">
<button class="btn navbar-search-camera" type="button"> <button class="btn navbar-search-camera" type="button">
<div class="icon icon-camera"></div> <div class="icon icon-camera"></div>
</button> </button>
......
serverside/cihai-pc/src/main/webapp/static/2-1字-语词义.html
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<div class="navbar-collapse"> <div class="navbar-collapse">
<form class="navbar-form clearfix"> <form class="navbar-form clearfix">
<div class="form-group input-group-lg"> <div class="form-group input-group-lg">
<input class="form-control" type="text" placeholder="之云"> <input class="form-control" type="text" placeholder="辞海云">
<button class="btn navbar-search-camera" type="button"> <button class="btn navbar-search-camera" type="button">
<div class="icon icon-camera"></div> <div class="icon icon-camera"></div>
</button> </button>
......
serverside/cihai-pc/src/main/webapp/static/2-3字-百科义.html
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<div class="navbar-collapse"> <div class="navbar-collapse">
<form class="navbar-form clearfix"> <form class="navbar-form clearfix">
<div class="form-group input-group-lg"> <div class="form-group input-group-lg">
<input class="form-control" type="text" placeholder="之云"> <input class="form-control" type="text" placeholder="辞海云">
<button class="btn navbar-search-camera" type="button"> <button class="btn navbar-search-camera" type="button">
<div class="icon icon-camera"></div> <div class="icon icon-camera"></div>
</button> </button>
......
serverside/cihai-pc/src/main/webapp/static/24.html
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<div class="navbar-collapse"> <div class="navbar-collapse">
<form class="navbar-form clearfix"> <form class="navbar-form clearfix">
<div class="form-group input-group-lg"> <div class="form-group input-group-lg">
<input class="form-control" type="text" placeholder="之云"> <input class="form-control" type="text" placeholder="辞海云">
<button class="btn navbar-search-camera" type="button"> <button class="btn navbar-search-camera" type="button">
<div class="icon icon-camera"></div> <div class="icon icon-camera"></div>
</button> </button>
......
serverside/cihai-pc/src/main/webapp/static/css/index.css
body,html{height:100%}.wrapper-index{position:relative;height:100%;min-height:770px;background:url(../images/bg-index.jpg) top center no-repeat}.wrapper-index .navbar-default{padding:40px 0}.wrapper-index .navbar-default,.wrapper-index .navbar-default .navbar-collapse{background-color:transparent;border-color:transparent}.wrapper-index .navbar-nav{top:18px}.wrapper-index .navbar-form .navbar-main-list{margin-top:20px}.wrapper-index .logo{position:absolute;left:40px;top:40px}.wrapper-index .search-main{padding-top:400px}.wrapper-index .search-main .navbar-form{width:775px}.wrapper-index .search-main .navbar-form .btn-link{float:left;margin-left:15px}.wrapper-index .search-main .navbar-form .logo-search{text-align:center;width:380px;height:70px;margin:0 auto 30px}.wrapper-index .search-main .navbar-form .logo-search img{display:inline-block}.wrapper-index .push-main{padding:0 50px}.wrapper-index .push-main .footer-main .qr{float:right;margin-top:-2px}.wrapper-index .push-main .footer-main .qr a:hover .icon-qr{background-image:url(../images/sprite-2.png);background-position:0 0}.wrapper-index .push-main .footer-main .copyright{text-align:left}.wrapper-index .search-main-input-wrapper{position:relative;float:left;padding:0 6px 4px 0;background:url(../images/right.png) right 0 no-repeat}.wrapper-index .search-main-input-wrapper .search-main-input-inner{padding:0 0 6px 0;background:url(../images/bottom.png) 4px bottom no-repeat}.wrapper-index .search-main-input-img{position:absolute;left:-60px;bottom:100%}.btn-search{border:none;width:160px!important;height:75px!important;outline:0;background:url(../images/btn-search.png) center no-repeat}.btn-search:active,.btn-search:focus{background:url(../images/btn-search.png) center no-repeat}.navbar-form .form-group{padding:13px 0!important}.container-fluid .navbar-form .form-group{border-color:#c13633}@media (min-width:1400px){.wrapper-index .navbar-form .navbar-main-list{width:103%;font-size:22px;line-height:30px}.wrapper-index .navbar-form .navbar-main-list .icon-search{margin-top:-4px}.wrapper-index .navbar-form .navbar-main-list a{margin:0 18px}.wrapper-index .navbar .navbar-form{width:1005px}}@media (max-width:1400px){.wrapper-index .container .navbar-form .form-group,.wrapper-index .container-fluid .navbar-form .form-group{width:531px}.wrapper-index .container .navbar-form .form-group .form-control,.wrapper-index .container-fluid .navbar-form .form-group .form-control{width:441px!important}.wrapper-index .container .navbar-form .form-group .btn,.wrapper-index .container-fluid .navbar-form .form-group .btn{width:38px}.wrapper-index .push-main{padding:0 40px}}@media (max-width:1200px){.container-fluid .navbar-header{margin-left:0}.container-fluid .navbar-collapse{margin-right:0}.wrapper-index .push-main{padding:0 10px}}@media (max-width:1200px){.container-fluid .navbar-header{margin-left:-10px}.container-fluid .navbar-collapse{margin-right:0}.wrapper-index .push-main{padding:0}}.word{height:230px;padding:32px 0;background-clip:content-box;background-position:center;background-repeat:no-repeat;background-size:contain;background-image:url(../images/ciyun3.png)}.calendar{position:absolute;right:0;top:0}.container-fluid .navbar-links{padding:15px 0 40px;font-size:16px}.container-fluid .navbar-links>a{color:#999;margin-right:20px}.container-fluid .navbar-links>a:hover{color:#187bb2}
\ No newline at end of file \ No newline at end of file
body,html{height:100%}.wrapper-index{position:relative;height:100%;min-height:770px;background:url(../images/bg-index.jpg) top center no-repeat}.wrapper-index .navbar-default{padding:40px 0}.wrapper-index .navbar-default,.wrapper-index .navbar-default .navbar-collapse{background-color:transparent;border-color:transparent}.wrapper-index .navbar-nav{top:18px}.wrapper-index .navbar-form .navbar-main-list{margin-top:20px}.wrapper-index .brand-index{position:absolute;left:40px;top:40px}.wrapper-index .brand-index .logo{float:left;display:block;height:88px}.wrapper-index .brand-index .logo img{height:100%}.wrapper-index .brand-index .hot-tags{float:left;margin-left:5px;font-size:25px;margin-top:18px}.wrapper-index .brand-index .hot-tags a{color:#666;margin-left:15px}.wrapper-index .brand-index .hot-tags a:hover{color:#187bb2}.wrapper-index .search-main{padding-top:400px}.wrapper-index .search-main .navbar-form{width:775px}.wrapper-index .search-main .navbar-form input:focus{outline:0}.wrapper-index .search-main .navbar-form .btn-link{float:left;margin-left:15px}.wrapper-index .search-main .navbar-form .logo-search{text-align:center;width:380px;height:80px;margin:-10px auto 30px}.wrapper-index .search-main .navbar-form .logo-search img{display:inline-block}.wrapper-index .push-main{padding:0 50px}.wrapper-index .push-main .footer-main .qr{float:right;margin-top:-2px}.wrapper-index .push-main .footer-main .qr a:hover .icon-qr{background-image:url(../images/sprite-2.png);background-position:0 0}.wrapper-index .push-main .footer-main .copyright{text-align:left}.wrapper-index .search-main-input-wrapper{position:relative;float:left;padding:0 6px 4px 0;background:url(../images/right.png) right 0 no-repeat}.wrapper-index .search-main-input-wrapper .search-main-input-inner{padding:0 0 6px 0;background:url(../images/bottom.png) 4px bottom no-repeat}.wrapper-index .search-main-input-img{position:absolute;left:-60px;bottom:100%}.btn-search{border:none;width:160px!important;height:75px!important;outline:0;background:url(../images/btn-search.png) center no-repeat}.btn-search:active,.btn-search:focus{background:url(../images/btn-search.png) center no-repeat}.navbar-form .form-group{padding:13px 0!important}.container-fluid .navbar-form .form-group{border-color:#c13633}@media (min-width:1400px){.wrapper-index .navbar-form .navbar-main-list{width:103%;font-size:22px;line-height:30px}.wrapper-index .navbar-form .navbar-main-list .icon-search{margin-top:-4px}.wrapper-index .navbar-form .navbar-main-list a{margin:0 18px}.wrapper-index .navbar .navbar-form{width:1005px}}@media (max-width:1400px){.wrapper-index .container .navbar-form .form-group,.wrapper-index .container-fluid .navbar-form .form-group{width:531px}.wrapper-index .container .navbar-form .form-group .form-control,.wrapper-index .container-fluid .navbar-form .form-group .form-control{width:441px!important}.wrapper-index .container .navbar-form .form-group .btn,.wrapper-index .container-fluid .navbar-form .form-group .btn{width:38px}.wrapper-index .push-main{padding:0 40px}}@media (max-width:1200px){.container-fluid .navbar-header{margin-left:0}.container-fluid .navbar-collapse{margin-right:0}.wrapper-index .push-main{padding:0 10px}}@media (max-width:1200px){.container-fluid .navbar-header{margin-left:-10px}.container-fluid .navbar-collapse{margin-right:0}.wrapper-index .push-main{padding:0}}.word{position:relative;top:30px;height:174px;background-position:center;background-repeat:no-repeat;background-size:contain;background-image:url(../images/ciyun3.png)}.calendar{position:absolute;right:0;top:0}.container-fluid .navbar-links{padding:15px 10px 40px;font-size:16px}.container-fluid .navbar-links>a{color:#999;margin-right:20px}.container-fluid .navbar-links>a:hover{color:#187bb2}
\ No newline at end of file \ No newline at end of file
serverside/cihai-pc/src/main/webapp/static/css/vendor.css
This diff could not be displayed because it is too large.
serverside/cihai-pc/src/main/webapp/static/index.html
...@@ -10,9 +10,16 @@ ...@@ -10,9 +10,16 @@
</head> </head>
<body> <body>
<div class="wrapper-index"> <div class="wrapper-index">
<div class="brand-index">
<a class="logo" href="index.html"> <a class="logo" href="index.html">
<img src="images/logo.png"> <img src="images/logo.png">
</a> </a>
<div class="hot-tags">
<a href="万国志.html">万国志</a>
<a href="地方志.html">地方志</a>
<a href="人物志.html">人物志</a>
</div>
</div>
<a class="calendar" href="历史上的今天.html"> <a class="calendar" href="历史上的今天.html">
<img src="images/calendar2.png" alt="历史上的今天" title="历史上的今天"> <img src="images/calendar2.png" alt="历史上的今天" title="历史上的今天">
</a> </a>
...@@ -38,9 +45,14 @@ ...@@ -38,9 +45,14 @@
</div> </div>
</form> </form>
<div class="navbar-links navbar-form"> <div class="navbar-links navbar-form">
<a href="万国志.html">万国志</a> <label class="radio-inline">
<a href="地方志.html">地方志</a> <input type="radio" name="search-type" checked>词头</label>
<a href="人物志.html">人物志</a> <label class="radio-inline">
<input type="radio" name="search-type">全文</label>
<label class="radio-inline">
<input type="radio" name="search-type">图片</label>
<label class="radio-inline">
<input type="radio" name="search-type">视频</label>
</div> </div>
</div> </div>
<div class="push-main"> <div class="push-main">
...@@ -79,10 +91,11 @@ ...@@ -79,10 +91,11 @@
<div class="card-title">知识专题</div> <div class="card-title">知识专题</div>
<div class="card-main"> <div class="card-main">
<div class="theme clearfix"> <div class="theme clearfix">
<a class="theme-cell" href="javascript:;">中国特色社会主义</a>
<a class="theme-cell" href="javascript:;">心脏</a> <a class="theme-cell" href="javascript:;">心脏</a>
<a class="theme-cell" href="javascript:;">一般天文数据</a> <br>
<a class="theme-cell" href="javascript:;">中国历史朝代</a> <a class="theme-cell" href="javascript:;">中国历史朝代</a>
<br>
<a class="theme-cell" href="javascript:;">中国特色社会主义</a>
<a class="theme-refresh" href="javascript:;"> <a class="theme-refresh" href="javascript:;">
<div class="icon icon-refresh"></div> <div class="icon icon-refresh"></div>
</a> </a>
......
serverside/cihai-pc/src/main/webapp/static/js/vendor.js
This diff could not be displayed because it is too large.
serverside/cihai-pc/src/main/webapp/static/万国志.html
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<div class="navbar-collapse"> <div class="navbar-collapse">
<form class="navbar-form clearfix"> <form class="navbar-form clearfix">
<div class="form-group input-group-lg"> <div class="form-group input-group-lg">
<input class="form-control" type="text" placeholder="之云"> <input class="form-control" type="text" placeholder="辞海云">
<button class="btn navbar-search-camera" type="button"> <button class="btn navbar-search-camera" type="button">
<div class="icon icon-camera"></div> <div class="icon icon-camera"></div>
</button> </button>
......
serverside/cihai-pc/src/main/webapp/static/人物志.html
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<div class="navbar-collapse"> <div class="navbar-collapse">
<form class="navbar-form clearfix"> <form class="navbar-form clearfix">
<div class="form-group input-group-lg"> <div class="form-group input-group-lg">
<input class="form-control" type="text" placeholder="之云"> <input class="form-control" type="text" placeholder="辞海云">
<button class="btn navbar-search-camera" type="button"> <button class="btn navbar-search-camera" type="button">
<div class="icon icon-camera"></div> <div class="icon icon-camera"></div>
</button> </button>
......
serverside/cihai-pc/src/main/webapp/static/历史上的今天.html
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<div class="navbar-collapse"> <div class="navbar-collapse">
<form class="navbar-form clearfix"> <form class="navbar-form clearfix">
<div class="form-group input-group-lg"> <div class="form-group input-group-lg">
<input class="form-control" type="text" placeholder="之云"> <input class="form-control" type="text" placeholder="辞海云">
<button class="btn navbar-search-camera" type="button"> <button class="btn navbar-search-camera" type="button">
<div class="icon icon-camera"></div> <div class="icon icon-camera"></div>
</button> </button>
......
serverside/cihai-pc/src/main/webapp/static/地方志.html
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<div class="navbar-collapse"> <div class="navbar-collapse">
<form class="navbar-form clearfix"> <form class="navbar-form clearfix">
<div class="form-group input-group-lg"> <div class="form-group input-group-lg">
<input class="form-control" type="text" placeholder="之云"> <input class="form-control" type="text" placeholder="辞海云">
<button class="btn navbar-search-camera" type="button"> <button class="btn navbar-search-camera" type="button">
<div class="icon icon-camera"></div> <div class="icon icon-camera"></div>
</button> </button>
......
serverside/cihai-pc/src/main/webapp/static/太阳系.html
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<div class="navbar-collapse"> <div class="navbar-collapse">
<form class="navbar-form clearfix"> <form class="navbar-form clearfix">
<div class="form-group input-group-lg"> <div class="form-group input-group-lg">
<input class="form-control" type="text" placeholder="之云"> <input class="form-control" type="text" placeholder="辞海云">
<button class="btn navbar-search-camera" type="button"> <button class="btn navbar-search-camera" type="button">
<div class="icon icon-camera"></div> <div class="icon icon-camera"></div>
</button> </button>
......
serverside/cihai-pc/src/main/webapp/static/左翼作家联盟.html
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<div class="navbar-collapse"> <div class="navbar-collapse">
<form class="navbar-form clearfix"> <form class="navbar-form clearfix">
<div class="form-group input-group-lg"> <div class="form-group input-group-lg">
<input class="form-control" type="text" placeholder="之云"> <input class="form-control" type="text" placeholder="辞海云">
<button class="btn navbar-search-camera" type="button"> <button class="btn navbar-search-camera" type="button">
<div class="icon icon-camera"></div> <div class="icon icon-camera"></div>
</button> </button>
......
serverside/cihai-pc/src/main/webapp/static/心脏.html
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<div class="navbar-collapse"> <div class="navbar-collapse">
<form class="navbar-form clearfix"> <form class="navbar-form clearfix">
<div class="form-group input-group-lg"> <div class="form-group input-group-lg">
<input class="form-control" type="text" placeholder="之云"> <input class="form-control" type="text" placeholder="辞海云">
<button class="btn navbar-search-camera" type="button"> <button class="btn navbar-search-camera" type="button">
<div class="icon icon-camera"></div> <div class="icon icon-camera"></div>
</button> </button>
......
serverside/cihai-pc/src/main/webapp/static/说.html
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<div class="navbar-collapse"> <div class="navbar-collapse">
<form class="navbar-form clearfix"> <form class="navbar-form clearfix">
<div class="form-group input-group-lg"> <div class="form-group input-group-lg">
<input class="form-control" type="text" placeholder="之云"> <input class="form-control" type="text" placeholder="辞海云">
<button class="btn navbar-search-camera" type="button"> <button class="btn navbar-search-camera" type="button">
<div class="icon icon-camera"></div> <div class="icon icon-camera"></div>
</button> </button>
......
serverside/cihai-pc/src/main/webapp/static/鲁迅.html
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<div class="navbar-collapse"> <div class="navbar-collapse">
<form class="navbar-form clearfix"> <form class="navbar-form clearfix">
<div class="form-group input-group-lg"> <div class="form-group input-group-lg">
<input class="form-control" type="text" placeholder="之云"> <input class="form-control" type="text" placeholder="辞海云">
<button class="btn navbar-search-camera" type="button"> <button class="btn navbar-search-camera" type="button">
<div class="icon icon-camera"></div> <div class="icon icon-camera"></div>
</button> </button>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!