1
0
mirror of https://github.com/chatopera/cosin.git synced 2025-08-01 16:38:02 +08:00

Closed #81 笔记UI修改

This commit is contained in:
Kyle 2018-09-17 10:46:06 +08:00
parent beb0e0d5c1
commit f443eb1dc4
No known key found for this signature in database
GPG Key ID: E9D96D736A2D3F3C
2 changed files with 47 additions and 120 deletions

View File

@ -36,19 +36,35 @@
<div class="layui-colla-content layui-show">
<div id="timeline" class="timeline-container" type="text">
</div>
<!--<div id="timeline" class="timeline-container" type="text" style="height: 617px; overflow-y: auto;">-->
<!--</div>-->
</div>
</div>
</div>
</div>
</div>
</div>
<link rel="stylesheet" href="/js/timelineMe/jquery.timelineMe.css" type="text/css">
<script type="text/javascript" src="/js/timelineMe/jquery.timelineMe.js"></script>
<style>
.card {
/* Add shadows to create the "card" effect */
box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2);
transition: 0.3s;
margin-top: 5px;
}
/* On mouse-over, add a deeper shadow */
.card:hover {
box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2);
}
/* Add some padding inside the card container */
.container {
width: 100%;
/*padding: 2px 16px;*/
}
</style>
<script src="/js/CSKeFu_Rest_Request.v1.js"></script>
<script>
// save time line datas
var items = [];
function getNotesByContactId () {
// 获取数据
var id = $('#contactsId').val();
@ -65,20 +81,18 @@
}
if(data.rc === 0){
// var items = [];
if(data.totalElements > 0) {
for(var item of data.data){
items.push({
type: 'bigItem',
label: item.updatetime,
picto: '<div style="background-color: #3ac3e8;width: 100%;height: 100%;"></div>',
shortContent: '<div style="border: solid 1px #333333; line-height: 2em;font-weight: 300;word-break:break-all"><p>事件类型:' + item.category + '</p>' + '<p>创建者:' + item.creatername + '</p>' + '<div><label>内容:</label><span>' + item.content + '</span></div></div>',
forcePosition: 'right'
});
$("#timeline").append('<div class="card">' +
'<div class="container">' +
'<h4>时间:' + item.updatetime + '</h4>' +
'<h5>笔记者:' + item.creatername + '</h5>' +
'<h5>事件类型:' + item.category + '</h5>' +
'<div>笔记:' + item.content + '</div>' +
'</div>' +
'</div>');
}
}
// time line
makeTimeline()
} else {
}
}, function (err) {
@ -86,22 +100,6 @@
});
}
// make time line
function makeTimeline() {
var el = $('#timeline');
if(el){
$(el).empty();
$('#timeline').timelineMe({});
$('#timeline').timelineMe('load',
items
);
} else {
$('#timeline').timelineMe({
items: items,
});
}
}
// unselect tag
function unOrselectTag(id) {
var el = $("#tag_" + id);
@ -235,16 +233,14 @@
if(data.rc === 0){
var item = data.data;
// get all notes by contact id.
items.unshift({
type: 'bigItem',
label: item.updatetime,
picto: '<div style="background-color: #3ac3e8;width: 100%;height: 100%;"></div>',
shortContent: '<div style="border: solid 1px #333333; line-height: 2em;font-weight: 300;word-break:break-all"><p>事件类型:' + category + '</p>' + '<p>创建者:' + item.creatername + '</p>' + '<div><label>内容:</label><span>' + content + '</span></div></div>',
forcePosition: 'right'
});
// time line
makeTimeline()
$("#timeline").prepend('<div class="card">' +
'<div class="container">' +
'<h4><b>时间:' + item.updatetime + '</b></h4>' +
'<h5>笔记者:' + item.creatername + '</h5>' +
'<h5>事件类型:' + category + '</h5>' +
'<div>笔记:' + content + '</div>' +
'</div>' +
'</div>');
} else {
}
}, function (err) {

View File

@ -60,21 +60,20 @@
<button class="layui-btn" lay-submit lay-filter="notesbtn" id="notesAddBtn">立即添加</button>
</div>
</div>
<!--<div class="layui-form-item">-->
<!--<div class="layui-button-inline" style="float: right;">-->
<!--<button class="layui-btn" lay-submit lay-filter="notesbtn" id="notesAddBtn">立即添加</button>-->
<!--</div>-->
<!--</div>-->
</div>
</div>
</div>
</div>
</div>
<div class="layui-collapse">
<div class="layui-colla-item">
<h2 class="layui-colla-title">往来历史</h2>
<div class="layui-colla-content layui-show">
<div id="timeline" class="timeline-container" type="text" style="height: 617px; overflow-y: auto;">
<div class="box-body ukefu-im-theme">
<div class="uk-layui-form">
<div class="layui-collapse">
<div class="layui-colla-item">
<h2 class="layui-colla-title">往来历史</h2>
<div class="layui-colla-content layui-show">
<div id="timeline" class="timeline-container" type="text" style="height: 617px; overflow-y: auto;">
</div>
</div>
</div>
</div>
</div>
@ -207,76 +206,12 @@
</div>
</div>
</div>
<!--<div class="box-body ukefu-im-theme" style="margin-top: 20px;">-->
<!--<div class="uk-layui-form">-->
<!--<div class="layui-collapse">-->
<!--<div class="layui-colla-item">-->
<!--<h2 class="layui-colla-title">标签</h2>-->
<!--<div class="layui-colla-content layui-show">-->
<!--<div class="layui-form-item">-->
<!--<div class="layui-inline">-->
<!--<label class="layui-form-label" style="text-align: left;">已有标签:</label>-->
<!--<div id="contactTags" class="layui-input-inline" style="width: 100%;">-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="box-body ukefu-im-theme" style="margin-top: 20px;">-->
<!--<div class="uk-layui-form">-->
<!--<div class="layui-collapse">-->
<!--<div class="layui-colla-item">-->
<!--<h2 class="layui-colla-title">笔记</h2>-->
<!--<div class="layui-colla-content layui-show">-->
<!--<div class="layui-form-item">-->
<!--<label class="layui-form-label" style="text-align: left;">笔记分类:</label>-->
<!--<div class="layui-input-inline">-->
<!--<select id="notesCategory" name="notesCategory" lay-filter="category" required lay-verify="required" style="display: inline">-->
<!--<option value="callout">外呼</option>-->
<!--<option value="callin">呼入</option>-->
<!--<option value="webim">网页</option>-->
<!--</select>-->
<!--</div>-->
<!--</div>-->
<!--<div class="layui-form-item">-->
<!--<div class="layui-inline">-->
<!--<label class="layui-form-label" style="text-align: left;">内容:</label>-->
<!--<div class="layui-input-inline" style="width: 149%;">-->
<!--<textarea id="notesContent" name="notes" class="layui-textarea" ></textarea>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="layui-form-item">-->
<!--<div class="layui-button-inline" style="float: right;">-->
<!--<button class="layui-btn" lay-submit lay-filter="notesbtn" id="notesAddBtn">立即添加</button>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
</div>
<!--<div class="col-lg-6" style="padding-left: 10px;">-->
<!--<div class="layui-collapse">-->
<!--<div class="layui-colla-item">-->
<!--<h2 class="layui-colla-title">往来历史</h2>-->
<!--<div class="layui-colla-content layui-show">-->
<!--<div id="timeline" class="timeline-container" type="text" style="height: 1243px; overflow-y: auto;">-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
</div>
</div>
</div>
</div>
<script src="/js/lodash-4.17.4.min.js"></script>
<script src="/js/CSKeFu_Rest_Request.v1.js"></script>
<style>
.unselectedClass {
@ -311,13 +246,10 @@
/* Add some padding inside the card container */
.container {
width: 100%;
padding: 2px 16px;
/*padding: 2px 16px;*/
}
</style>
<script>
// save time line datas
var items = [];
function getNotesByContactId () {
// 获取数据
var id = $('#contactsId').val();
@ -334,7 +266,6 @@
}
if(data.rc === 0){
// var items = [];
if(data.totalElements > 0) {
for(var item of data.data){
$("#timeline").append('<div class="card">' +