Skip to content

石磊 / cihai

Go to a project
Commit 810cac7f by 侯昆
Options

0126

1 parent 6ecc6dd8
Expand all
Inline Side-by-side
Showing 23 changed files with 11 additions and 9 deletions
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/word/character_baike.jsp
...@@ -11,11 +11,11 @@ ...@@ -11,11 +11,11 @@
<%--<%=JSON.toJSONString(vo)%>--%> <%--<%=JSON.toJSONString(vo)%>--%>
<div class="container-fluid"> <div class="container-fluid">
<div class="wrapper-ipad-app-h5"> <div class="wrapper-ipad-app-h5">
<div class="header-main-2 clearfix"> <div class="header-main-2 mb-2 clearfix">
<div class="header-main-left"> <div class="header-main-left">
<h1>${vo.word}</h1> <h1>${vo.word}</h1>
<div class="header-main-desc"> <div class="header-main-desc clear">
<div class="word-read"> <div class="word-read pt-0">
<c:forEach var="item" items="${vo.spell}"> <c:forEach var="item" items="${vo.spell}">
<span>【${item}】</span> <span>【${item}】</span>
</c:forEach> </c:forEach>
......
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/word/statement_paraph.jsp
...@@ -17,7 +17,9 @@ ...@@ -17,7 +17,9 @@
<h1>${vo.word}</h1> <h1>${vo.word}</h1>
<div class="header-main-desc"> <div class="header-main-desc">
<div class="word-read"> <div class="word-read">
<c:if test="${vo.spell.length() > 0}">
<span>【 <c:forEach var="item" items="${vo.spell}"> ${item} </c:forEach> 】</span> <span>【 <c:forEach var="item" items="${vo.spell}"> ${item} </c:forEach> 】</span>
</c:if>
<a class="link js-play-voice" href="javascript:;"> <a class="link js-play-voice" href="javascript:;">
<i class="icon icon-shengyin"></i> <i class="icon icon-shengyin"></i>
</a> </a>
......
serverside/cihai-app/src/main/webapp/static/baike.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html lang="zh-CN"> <html lang="zh-CN">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,minimal-ui">
<title>baike</title> <title>baike</title>
<link rel="stylesheet" href="css/vendor.css"> <link rel="stylesheet" href="css/vendor.css">
<link rel="stylesheet" href="js/plugins/vis/vis.min.css"> <link rel="stylesheet" href="js/plugins/vis/vis.min.css">
......
serverside/cihai-app/src/main/webapp/static/css/vendor.css
This diff could not be displayed because it is too large.
serverside/cihai-app/src/main/webapp/static/index.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html lang="zh-CN"> <html lang="zh-CN">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,minimal-ui">
<title>index</title> <title>index</title>
<link rel="stylesheet" href="css/vendor.css"> <link rel="stylesheet" href="css/vendor.css">
</head> </head>
......
serverside/cihai-app/src/main/webapp/static/历史上的今天-无数据.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html lang="zh-CN"> <html lang="zh-CN">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,minimal-ui">
<title>历史上的今天-无数据</title> <title>历史上的今天-无数据</title>
<link rel="stylesheet" href="css/vendor.css"> <link rel="stylesheet" href="css/vendor.css">
</head> </head>
......
serverside/cihai-app/src/main/webapp/static/历史上的今天.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html lang="zh-CN"> <html lang="zh-CN">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,minimal-ui">
<title>历史上的今天</title> <title>历史上的今天</title>
<link rel="stylesheet" href="css/vendor.css"> <link rel="stylesheet" href="css/vendor.css">
</head> </head>
......
serverside/cihai-app/src/main/webapp/static/百科详情-相关词-弹出框.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html lang="zh-CN"> <html lang="zh-CN">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,minimal-ui">
<title>百科详情-相关词-弹出框</title> <title>百科详情-相关词-弹出框</title>
<link rel="stylesheet" href="css/vendor.css"> <link rel="stylesheet" href="css/vendor.css">
</head> </head>
......
serverside/cihai-core/src/test/java/com/dookay/cihai/core/excel/TestImportWord.java
...@@ -46,7 +46,7 @@ public class TestImportWord extends CihaiCoreApplicationTests { ...@@ -46,7 +46,7 @@ public class TestImportWord extends CihaiCoreApplicationTests {
@Autowired @Autowired
private WordMapper wordMapper; private WordMapper wordMapper;
// private String[] files = {"三言二拍系列", "中国的相关词", "二十四节气", "太阳", "太阳系", "春节", "象", "银河系", "马克思", "鲁迅"}; // private String[] files = {"三言二拍系列", "中国的相关词", "二十四节气", "太阳", "太阳系", "春节", "象", "银河系", "马克思", "鲁迅"};
private String[] files = {"历史上的今天新增词条"}; private String[] files = {"历史上的今天新增词条"};
@Test @Test
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!