jiulinxiri/rocketmq-dashboard
1
0
Fork 0
mirror of https://github.com/apache/rocketmq-dashboard.git synced 2025-09-11 03:49:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix cluster page's bug closes apache/incubator-rocketmq-externals#2

Browse Source
This commit is contained in:
StyleTang
2017-03-17 21:32:38 +08:00
committed by zander
parent b29f52bdfb
commit 843d82e8d4
3 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/static/index.html
View File

@@ -103,7 +103,7 @@
<script type="text/javascript" src="vendor/echarts/echarts.min.js"></script> <script type="text/javascript" src="vendor/echarts/echarts.min.js"></script>
<script type="text/javascript" src="src/app.js"></script> <script type="text/javascript" src="src/app.js"></script>
<script type="text/javascript" src="src/controller.js?v=201702250025"></script> <script type="text/javascript" src="src/controller.js?v=201702250025"></script>
<script type="text/javascript" src="src/tools/tools.js"></script> <script type="text/javascript" src="src/tools/tools.js?v=201703171710"></script>
<script type="text/javascript" src="src/cluster.js?timestamp=4"></script> <script type="text/javascript" src="src/cluster.js?timestamp=4"></script>
<script type="text/javascript" src="src/topic.js"></script> <script type="text/javascript" src="src/topic.js"></script>
<script type="text/javascript" src="src/consumer.js?timestamp=6"></script> <script type="text/javascript" src="src/consumer.js?timestamp=6"></script>

6
src/main/resources/static/src/controller.js
View File

@@ -311,16 +311,16 @@ app.controller('dashboardCtrl', ['$scope','$rootScope','$translate','$filter','N
var callback = function (resp) { var callback = function (resp) {
$scope.barChart.hideLoading(); $scope.barChart.hideLoading();
if (resp.status == 0) { if (resp.status == 0) {
var clusterMap = resp.data.clusterInfo.clusterAddrTable; var clusterAddrTable = resp.data.clusterInfo.clusterAddrTable;
var brokerMap = resp.data.clusterInfo.brokerAddrTable; var brokerMap = resp.data.clusterInfo.brokerAddrTable;
var brokerDetail = resp.data.brokerServer; var brokerDetail = resp.data.brokerServer;
var clusterMap = tools.generateBrokerMap(brokerDetail,clusterMap,brokerMap); var clusterMap = tools.generateBrokerMap(brokerDetail,clusterAddrTable,brokerMap);
$scope.brokerArray = []; $scope.brokerArray = [];
$.each(clusterMap,function(clusterName,brokers){ $.each(clusterMap,function(clusterName,brokers){
$.each(brokers,function(i,broker){ $.each(brokers,function(i,broker){
$scope.brokerArray.push(broker) $scope.brokerArray.push(broker)
}) })
}) });
//sort the brokerArray //sort the brokerArray
$scope.brokerArray.sort(function(firstBroker,lastBroker){ $scope.brokerArray.sort(function(firstBroker,lastBroker){

32
src/main/resources/static/src/tools/tools.js
View File

@@ -20,30 +20,28 @@ app.service('tools', ['$http', function ($http) {
var ctx = ""; var ctx = "";
var dashboardRefreshTime = 5000; // todo improve. when data size is large,request is too slow var dashboardRefreshTime = 5000; // todo improve. when data size is large,request is too slow
var generateBrokerMap = function(brokerDetail,clusterMap,brokerMap){ var generateBrokerMap = function (brokerServer, clusterAddrTable, brokerAddrTable) {
var map = {}; var map = {};
$.each(brokerDetail,function(k,v){ $.each(brokerServer, function (brokerName, brokerStatusList) { // broker
$.each(clusterMap,function (ck, cv) { $.each(clusterAddrTable, function (clusterName, brokerNameList) { //clusterAddrTable
if(angular.isUndefined(map[ck])){ if (angular.isUndefined(map[clusterName])) {
map[ck] = []; map[clusterName] = [];
} }
$.each(cv,function(cvi,cvv){ $.each(brokerNameList, function (listIndex, clusterBrokerName) {
if(cvv == k){ if (clusterBrokerName == brokerName) {
var index = 0; $.each(brokerStatusList, function (index, brokerStatus) {
$.each(v,function(vi,vv){ brokerStatus.split = brokerName;
vv.split = k; brokerStatus.index = index;
vv.index = index; brokerStatus.address = brokerAddrTable[clusterBrokerName].brokerAddrs[index];
vv.address = brokerMap[cvv].brokerAddrs[index]; brokerStatus.brokerName = brokerAddrTable[clusterBrokerName].brokerName;
vv.brokerName = brokerMap[cvv].brokerName; map[clusterName].push(brokerStatus);
map[ck].push(vv);
index++;
}) })
} }
}) })
}) })
}) });
return map; return map;
} };
var fastSort = function (arrayToSort, propertyToSortWith, sortDirection) { var fastSort = function (arrayToSort, propertyToSortWith, sortDirection) {
// temporary holder of position and sort-value // temporary holder of position and sort-value