Commit df20b866 by 侯昆

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

1 parent b9fd3675
Showing 52 changed files with 161 additions and 119 deletions
...@@ -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("王继如");
} }
......
...@@ -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(
......
...@@ -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>
......
...@@ -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>
......
...@@ -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>
......
...@@ -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);
......
...@@ -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;
} }
} }
...@@ -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("王继如");
} }
......
...@@ -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;
} }
} }
...@@ -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 {
......
...@@ -47,9 +47,16 @@ ...@@ -47,9 +47,16 @@
<%--</div>--%> <%--</div>--%>
<%--</div>--%> <%--</div>--%>
<%--</nav>--%> <%--</nav>--%>
<a class="logo" href="/"> <div class="brand-index">
<img src="/static/images/logo.png"> <a class="logo" href="/">
</a> <img src="/static/images/logo.png">
</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)"
......
...@@ -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">
......
...@@ -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>
......
...@@ -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>
......
...@@ -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>
......
...@@ -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>
......
...@@ -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>
......
...@@ -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>
......
...@@ -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>
......
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
This diff could not be displayed because it is too large.
...@@ -10,9 +10,16 @@ ...@@ -10,9 +10,16 @@
</head> </head>
<body> <body>
<div class="wrapper-index"> <div class="wrapper-index">
<a class="logo" href="index.html"> <div class="brand-index">
<img src="images/logo.png"> <a class="logo" href="index.html">
</a> <img src="images/logo.png">
</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>
......
This diff could not be displayed because it is too large.
...@@ -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>
......
...@@ -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>
......
...@@ -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>
......
...@@ -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>
......
...@@ -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>
......
...@@ -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>
......
...@@ -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>
......
...@@ -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>
......
...@@ -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!