Skip to content

Excel3 #796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 59 commits into
base: master
Choose a base branch
from
Open

Excel3 #796

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
64db4b8
add html
wangxp2016 Jul 31, 2017
2ca5b46
Mod:translate; .gitignore
caozhongzheng Aug 2, 2017
446754c
Merge pull request #1 from peersafe/change_translate
wangxp2016 Aug 2, 2017
ffc1e40
ui page edit
wangxp2016 Aug 2, 2017
25bea7d
Merge pull request #4 from peersafe/ui-page-edit
caozhongzheng Aug 2, 2017
b4a7dc2
edit home page
wangxp2016 Aug 2, 2017
cb68b2f
Merge pull request #5 from peersafe/ui-home-page
caozhongzheng Aug 2, 2017
5d2099f
html edit
wangxp2016 Aug 3, 2017
6d4962c
edit home page
wangxp2016 Aug 3, 2017
4f8e526
Merge pull request #8 from peersafe/html-edit
caozhongzheng Aug 4, 2017
ff2e976
login html
wangxp2016 Aug 4, 2017
f0fb724
edit login
wangxp2016 Aug 4, 2017
8e42021
edit login page
wangxp2016 Aug 7, 2017
145d4fb
Merge pull request #9 from peersafe/login-page
caozhongzheng Aug 7, 2017
5397918
Add blacklist
caozhongzheng Aug 7, 2017
4eb12d0
change service
caozhongzheng Aug 7, 2017
f961a34
Mod:Service
caozhongzheng Aug 7, 2017
e1e91b6
Mod:黑名单页面的增删改查
caozhongzheng Aug 7, 2017
66ff123
Merge pull request #10 from peersafe/cd
wangxp2016 Aug 8, 2017
9f64553
edit html
wangxp2016 Aug 8, 2017
935a425
Add: login page logic
caozhongzheng Aug 9, 2017
3695e5c
css edit
wangxp2016 Aug 9, 2017
3591b28
jquery
wangxp2016 Aug 9, 2017
c8ec22f
main.min.js
wangxp2016 Aug 9, 2017
f1bcbd3
Merge pull request #12 from peersafe/leveldb
wangxp2016 Aug 9, 2017
b831fde
Merge pull request #13 from peersafe/ui-edit-page
caozhongzheng Aug 9, 2017
d0c7d44
edit TXBydate
wangxp2016 Aug 10, 2017
2afc9b3
edit H5 and blockByDate
wangxp2016 Aug 11, 2017
52b1067
Merge pull request #14 from peersafe/address-page
efdssdf Aug 11, 2017
de8117e
添加excel导出模块
efdssdf Aug 11, 2017
e1dc76b
Merge branch 'develop' into excel
wangxp2016 Aug 11, 2017
f766899
Merge pull request #15 from peersafe/excel
wangxp2016 Aug 11, 2017
362b81f
Mod:登录和黑名单用bitcore-service支持实现
caozhongzheng Aug 11, 2017
7993832
Merge pull request #16 from peersafe/use-bitcore-service
caozhongzheng Aug 11, 2017
a1dc000
main.min.js and main.min.css
wangxp2016 Aug 11, 2017
abb3b87
Merge branch 'develop' of https://github.com/peersafe/insight-ui into…
wangxp2016 Aug 11, 2017
f1f99fb
delete ripplecharts
wangxp2016 Aug 11, 2017
7d63078
add ripplecharts
wangxp2016 Aug 11, 2017
e7987f6
edit ripplecharts
wangxp2016 Aug 11, 2017
921f991
Add: history txs of blacklist
caozhongzheng Aug 11, 2017
4a3bd2c
Merge pull request #18 from peersafe/feature/history2
caozhongzheng Aug 11, 2017
6e1b917
Mod:历史界面数据展示
caozhongzheng Aug 11, 2017
0acc7c3
Merge pull request #19 from peersafe/feature/history3
caozhongzheng Aug 11, 2017
db7e282
Add:黑名单用需求要求的UI方式实现
caozhongzheng Aug 12, 2017
ad179c4
Merge pull request #20 from peersafe/feature/blacklist-ui
caozhongzheng Aug 12, 2017
610bc22
Mod:增加title行
efdssdf Aug 12, 2017
b939466
Merge pull request #21 from peersafe/excel2
wangxp2016 Aug 12, 2017
232bc86
edit ui
wangxp2016 Aug 12, 2017
bd9fad8
Add:黑名单的删除实现
caozhongzheng Aug 12, 2017
a1c2138
Merge pull request #22 from peersafe/feature/blacklist-ui2
caozhongzheng Aug 12, 2017
0ce157e
edit all ui
wangxp2016 Aug 12, 2017
4015873
Merge branch 'develop' into uiedit-page
wangxp2016 Aug 12, 2017
b75fb17
Merge pull request #23 from peersafe/uiedit-page
wangxp2016 Aug 12, 2017
9bb0412
Fix:开始时无法关闭添加黑名单的问题
caozhongzheng Aug 12, 2017
4648c33
Merge pull request #24 from peersafe/bug/cancel-add-blacklist
caozhongzheng Aug 12, 2017
59abef4
history show and hide
wangxp2016 Aug 12, 2017
c647666
Merge pull request #25 from peersafe/historyshow
wangxp2016 Aug 12, 2017
f093a51
Mod:修改导出
efdssdf Aug 12, 2017
aecc2e4
Merge branch 'develop' into excel3
wangxp2016 Aug 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add: history txs of blacklist
  • Loading branch information
@caozhongzheng
caozhongzheng committed Aug 11, 2017
commit 921f99136c80b47893c89d40623cbc57bc528841
2 changes: 2 additions & 0 deletions public/src/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ angular.module('insight',[
'insight.connection',
'insight.currency',
'insight.messages',
'insight.history',
'insight.blacklists',
'insight.login'
]);
Expand All @@ -39,5 +40,6 @@ angular.module('insight.status', []);
angular.module('insight.connection', []);
angular.module('insight.currency', []);
angular.module('insight.messages', []);
angular.module('insight.history', []);
angular.module('insight.blacklists', []);
angular.module('insight.login', []);
20 changes: 20 additions & 0 deletions public/src/js/controllers/history.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
'use strict';

angular.module('insight.history').controller('HistoryController',
function ($scope, $rootScope, $routeParams, HistoryService) {
console.log("historys controller start");

// $scope.historys = HistoryService.list();
$scope.list = function () {
HistoryService.get({}, function (res) {
console.log('res', res)
if (res.code === 0) {
$scope.histories = res.data;
}
});
}
$scope.list();

$scope.params = $routeParams;

});
8 changes: 8 additions & 0 deletions public/src/js/services/history.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
'use strict';

angular.module('insight.history')
.factory('HistoryService',
function ($resource, Service) {
console.log("Service:", Service.apiPrefix)
return $resource(Service.apiPrefix + '/history/histories');
});
113 changes: 13 additions & 100 deletions public/views/history.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,119 +1,32 @@
<div class="history">
<div class="history" data-ng-controller="HistoryController">
<h1>黑名单地址历史交易量统计</h1>
<div class="hdr">
<table class="tab1">
<tr>
<td class="td1">导入时间：2017-06-11 09:30:05</td>
<td class="td1">导入时间：{{histories.length > 0 ? histories[0].import_time : ''}}</td>
<td class="td2 dc">导出</td>
</tr>
</table>
<table class="tab1 tab2">
<table class="tab1 tab2" data-ng-repeat="h in histories">
<tr>
<td class="td1"><a href="Wallet-address-details.html">122tYZpUvaSZ7wi5nCrsjFKbroVSR9CcPc </a></td>
<td class="">这是孙张三的账户地址。</td>
<td class="td2">5 个交易</td>
<td class="td1"><a href="address/{{h.user.addr}}">{{h.user.addr}}</a></td>
<td class="">{{h.user.comment}}</td>
<td class="td2">{{h.user.txsnum}}个交易</td>
</tr>
</table>
<table class="tab1 tab2">
<tr>
<td class="td1"><a href="Wallet-address-details.html">122tYZpUvaSZ7wi5nCrsjFKbroVSR9CcPc </a></td>
<td class="">这是孙张三的账户地址。</td>
<td class="td2">5 个交易</td>
</tr>
</table>
<table class="tab1 tab2">
<tr>
<td class="td1"><a href="Wallet-address-details.html">122tYZpUvaSZ7wi5nCrsjFKbroVSR9CcPc </a></td>
<td class="">这是孙张三的账户地址。</td>
<td class="td2">5 个交易</td>
</tr>
</table>
<table class="tab1 tab2">
<tr>
<td class="td1"><a href="Wallet-address-details.html">122tYZpUvaSZ7wi5nCrsjFKbroVSR9CcPc </a></td>
<td class="">这是孙张三的账户地址。</td>
<td class="td2">5 个交易</td>
</tr>
</table>
<table class="tab1 tab2">
<tr>
<td class="td1"><a href="Wallet-address-details.html">122tYZpUvaSZ7wi5nCrsjFKbroVSR9CcPc </a></td>
<td class="">这是孙张三的账户地址。</td>
<td class="td2">5 个交易</td>
</tr>
</table>
<b>100个交易</b>
<b>{{h.txsnum}}个交易</b>
<div class="zs">
<table class="tab1 tab2">
<tr>
<td class="td1"><a href="Wallet-address-details.html">122tYZpUvaSZ7wi5nCrsjFKbroVSR9CcPc </a></td>
<td class="">这是孙张三的账户地址。</td>
<td class="td2">5 个交易</td>
<td class="td1"><a href="address/{{h.user.addr}}">{{h.user.addr}}</a></td>
<td class="">{{h.user.comment}}</td>
<td class="td2">{{h.user.txsnum}}个交易</td>
</tr>
</table>
</div>
<div class="bot">
<span class="span1"><img src="images/zk.png" width="30" alt=""></span>
<span class="span2"><img src="images/sq.png" width="30" alt=""></span>
<span class="span1"><img src="images/zk.png" width="30" alt="" data-ng-click="expand(true, h)"></span>
<span class="span2"><img src="images/sq.png" width="30" alt="" data-ng-click="expand(false, h)"></span>
</div>
</div>
</div>
</div>
<div class="history">
<div class="hdr">
<table class="tab1">
<tr>
<td class="td1">导入时间：2017-06-11 09:30:05</td>
<td class="td2 dc">导出</td>
</tr>
</table>
<table class="tab1 tab2">
<tr>
<td class="td1"><a href="Wallet-address-details.html">122tYZpUvaSZ7wi5nCrsjFKbroVSR9CcPc </a></td>
<td class="">这是孙张三的账户地址。</td>
<td class="td2">5 个交易</td>
</tr>
</table>
<table class="tab1 tab2">
<tr>
<td class="td1"><a href="Wallet-address-details.html">122tYZpUvaSZ7wi5nCrsjFKbroVSR9CcPc </a></td>
<td class="">这是孙张三的账户地址。</td>
<td class="td2">5 个交易</td>
</tr>
</table>
<table class="tab1 tab2">
<tr>
<td class="td1"><a href="Wallet-address-details.html">122tYZpUvaSZ7wi5nCrsjFKbroVSR9CcPc </a></td>
<td class="">这是孙张三的账户地址。</td>
<td class="td2">5 个交易</td>
</tr>
</table>
<table class="tab1 tab2">
<tr>
<td class="td1"><a href="Wallet-address-details.html">122tYZpUvaSZ7wi5nCrsjFKbroVSR9CcPc </a></td>
<td class="">这是孙张三的账户地址。</td>
<td class="td2">5 个交易</td>
</tr>
</table>
<table class="tab1 tab2">
<tr>
<td class="td1"><a href="Wallet-address-details.html">122tYZpUvaSZ7wi5nCrsjFKbroVSR9CcPc </a></td>
<td class="">这是孙张三的账户地址。</td>
<td class="td2">5 个交易</td>
</tr>
</table>
<b>100个交易</b>
<div class="zs">
<table class="tab1 tab2">
<tr>
<td class="td1"><a href="Wallet-address-details.html">122tYZpUvaSZ7wi5nCrsjFKbroVSR9CcPc </a></td>
<td class="">这是孙张三的账户地址。</td>
<td class="td2">5 个交易</td>
</tr>
</table>
</div>
<div class="bot">
<span class="span1"><img src="images/zk.png" width="30" alt=""></span>
<span class="span2"><img src="images/sq.png" width="30" alt=""></span>
</div>
</div>
</div>