Skip to content

石磊 / cihai

Go to a project
Commit 57bb7e30 by 石头
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	serverside/cihai-wechat/src/main/webapp/static/js/special.js
2 parents e756539f 70c7201d
Inline Side-by-side
Showing 2 changed files with 113 additions and 73 deletions
serverside/cihai-wechat/src/main/webapp/WEB-INF/jsp/portal/theme/detail.jsp
......@@ -4,10 +4,21 @@
<jsp:include page="/WEB-INF/jsp/include/header.jsp">
<jsp:param name="pageTitle" value="首页"/>
</jsp:include>
<div id="app">
<div class="statusbar"></div>
<div class="view view-main view-init ios-edges" data-url="/">
<div class="page">
<div class="navbar">
<div class="navbar-inner">
<div class="left">
<a class="link back" href="/">
<i class="iconfont icon-jiantou"></i>
<span class="ios-only">返回</span>
</a>
</div>
</div>
</div>
<div class="page-content special-content">
<!--专题简介-->
<div class="intro-box">
......@@ -26,15 +37,20 @@
</div>
<h5 class="sub-title">基本信息</h5>
<div class="basic-msg">
<b>中文名称：</b>中国共产党第十九次全国代表大会</div>
<b>中文名称：</b>中国共产党第十九次全国代表大会
</div>
<div class="basic-msg">
<b>会议简称：</b>党的十九大</div>
<b>会议简称：</b>党的十九大
</div>
<div class="basic-msg">
<b>会议时间：</b>2017年10月18日-24日</div>
<b>会议时间：</b>2017年10月18日-24日
</div>
<div class="basic-msg">
<b>会议地点：</b>北京</div>
<b>会议地点：</b>北京
</div>
<div class="basic-msg">
<b>代表人数：</b>2287（确认2280名代表资格有效）</div>
<b>代表人数：</b>2287（确认2280名代表资格有效）
</div>
</div>
</div>
<!--相关词条-->
......@@ -211,8 +227,13 @@
<img src="${ctx}/static/images/special-tip.png">
</div>
<div class="title">十九大图谱</div>
<div class="special-title-tools">
<a class="js-enable-drag" href="#" data-target="#relation-pic">
<span class="icon icon-drag"></span>
</a>
</div>
</div>
<div id="mynetwork"></div>
<div id="relation-pic"></div>
</div>
<!--词云解析-->
<div class="word-analysis">
......@@ -221,10 +242,16 @@
<img src="${ctx}/static/images/special-tip.png">
</div>
<div class="title">词云解析</div>
<div class="special-title-tools">
<a class="js-refresh" href="#" data-target="#word-analysis">
<i class="iconfont icon-huanyipi"></i>
</a>
<a class="js-enable-drag" href="#" data-target="#word-analysis">
<span class="icon icon-drag"></span>
</a>
</div>
<div class="inner">
<img src="${ctx}/static/images/special-pic-07.png">
</div>
<div id="word-analysis"></div>
</div>
<!--相关新闻-->
<div class="about-news">
......@@ -255,7 +282,6 @@
</div>
<div class="card-footer">中国共产党第十九次全国代表大会，中国特色社会主义进入新时代的关键时期召开的一次十分重要的大会。</div>
</div>
<div class="more-btn">加载更多</div>
</div>
<!--图说十九大-->
<div class="pic-show">
......@@ -309,13 +335,78 @@
</div>
</div>
</div>
<jsp:include page="/WEB-INF/jsp/include/footer.jsp"/>
<script src="${ctx}/static/js/swiper.min.js"></script>
<script src="${ctx}/static/js/vis.js"></script>
<script src="${ctx}/static/js/special.js"></script>
<script>
$(function () {
function relationPic(id, data) {
return new vis.Network(document.getElementById(id), relationPicData, {
nodes: {
shape: 'dot',
borderWidth: 3,
color: {
border: '#c6c6c6',
background: '#adadad',
highlight: {
border: '#187bb2',
background: '#187bb2'
}
},
font: {
color: '#333'
}
}
});
};
var relationPicData = {
nodes: [{
id: 1,
label: 'Node 1',
value: 15
},
{
id: 2,
label: 'Node 2',
value: 25
},
{
id: 3,
label: 'Node 3',
value: 50
},
{
id: 4,
label: 'Node 4',
value: 30
},
{
id: 5,
label: 'Node 5',
value: 8
}
],
edges: [{
from: 1,
to: 3
},
{
from: 1,
to: 2
},
{
from: 2,
to: 4
},
{
from: 2,
to: 5
}
]
};
relationPic('relation-pic', relationPicData);
relationPicData.edges = [];
var wordAnalysis = relationPic('word-analysis', relationPicData);
})
$('.js-refresh').click(function () {
wordAnalysis.destroy();
wordAnalysis = relationPic('word-analysis', relationPicData);
});
</script>
<jsp:include page="/WEB-INF/jsp/include/footer.jsp"/>
serverside/cihai-wechat/src/main/webapp/static/js/index.js
......@@ -3,79 +3,28 @@ var myApp = new Framework7({
root: '#app',
theme: 'ios',
routes: routes,
modalButtonOk:'去顶'
});
var $loading = $('#loading');
$loading.addClass('fade-out');
setTimeout(function () {
$loading.remove();
}, 300);
},300);
$('.search-area-inner').on('click', function () {
wx.startRecord();
myApp.dialog.create({
title: '正在录音...',
buttons: [
{
text: '完成',
onClick: function () {
wx.stopRecord({
success: function (res) {
myApp.dialog.preloader();
var localId = res.localId;
wx.translateVoice({
localId: localId, // 需要识别的音频的本地Id，由录音相关接口获得
isShowProgressTips: 0, // 默认为1，显示进度提示
success: function (res) {
jQuery.get("/home/search", {keyword: res.translateResult}, function (data) {
myApp.dialog.close();
if (data.code == "OK") {
// myApp.view.main.router.load({
// url:data.data
// });
location.href = data.data;
} else {
myApp.dialog.alert(data.message);
$('.j_search_input').val(res.translateResult);
}
})
}
});
}
onClick:function () {
myApp.view.main.router.load({
url:'/2-1字语词义.html'
});
}
}
]
}).open();
});
$('.brand-index').on('click', function () {
wx.chooseImage({
count: 1, // 默认9
sizeType: ['compressed'], // 可以指定是原图还是压缩图，默认二者都有
sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
success: function (res) {
var localIds = res.localIds; // 返回选定照片的本地ID列表，localId可以作为img标签的src属性显示图片
wx.getLocalImgData({
localId: localIds[0], // 图片的localID
success: function (res) {
var localData = res.localData; // localData是图片的base64数据，可以用img标签显示
alert(localData);
}
});
}
});
})
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!