From fdb373e0a948296eb5c446dded06b685d987eb2d Mon Sep 17 00:00:00 2001
From: chenlw <874313221@qq.com>
Date: Tue, 10 Jan 2017 08:39:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/developer/html/workspaces.html    |  4 +-
 plugins/developer/less/style.less         | 13 ++++-
 plugins/developer/ts/dataManagerHelper.ts | 70 +++++++++++++----------
 3 files changed, 55 insertions(+), 32 deletions(-)

diff --git a/plugins/developer/html/workspaces.html b/plugins/developer/html/workspaces.html
index 1bb9bad9..4dd507af 100644
--- a/plugins/developer/html/workspaces.html
+++ b/plugins/developer/html/workspaces.html
@@ -7,6 +7,7 @@
                 <ul class="nav nav-tabs sj_nav_taps fl" ng-show="navbarItems.length">
                     <li role="presentation" ng-repeat="item in navbarItems" class="{{item.class}}"><a href="#" ng-click="selectBatchItem(item)">{{item.label}}</a></li>
                 </ul>
+               
                 <div class="fr sj_searchbox">
                     <input type="text" class="sj_search_input" ng-model="keyQuery" placeholder="请选择或输入关键字,多关键字请用空格隔开" onkeydown="if(event.keyCode==13){searchButton.click()}" />
                     <a href="#" class="sj_search_btn" id="searchButton" ng-click="search()"></a>
@@ -18,7 +19,7 @@
             <div ng-show="model.data.length">
                 <table class="table table-striped table-bordered sj_content_table" hawtio-simple-table="tableConfig" id="tableConfig"></table>
                 <div class="row clear">
-                    <div class=" fl">
+                     <div class=" fl">
                         <!--<input type="checkbox" class="fl mr5 " style="margin-top: 8px;" />
                         <label class="fl mr5 " style="margin-top: 5px; font-style:nomal;">全选</label>-->
                         <span class="pull-right">&nbsp;</span>
@@ -30,6 +31,7 @@
                             <i class="glyphicon glyphicon-export"></i> 迁移
                         </button>
                         <span class="pull-right">&nbsp;</span>
+                       <!--  <button style="background-image: -webkit-linear-gradient(top, #fdfdfd,rgb(19, 236, 116));"  -->
                         <button ng-show="isShow" class="btn pull-right sj_btn_grey " ng-disabled="!id && tableConfig.selectedItems.length == 0" ng-click="createOracleService(id || tableConfig.selectedItems)">
                             <i class="glyphicon glyphicon-play-circle"></i> 启动
                         </button>
diff --git a/plugins/developer/less/style.less b/plugins/developer/less/style.less
index fb3934ba..0a7fd3dc 100644
--- a/plugins/developer/less/style.less
+++ b/plugins/developer/less/style.less
@@ -6,7 +6,18 @@ table,tr,td{border:0;cellspacing:0; cellpadding:0;}
 ol,ul,li{ list-style-type:none}
 a:link,a:visited{color:#7f7f7f;text-decoration:none;}
 a:hover,a:active{color:#000;}
-.fl{ float:left;}
+.fl{
+ float:left;
+ }
+.data_manager_button{
+  width:280px;
+  height: 30px;
+  border: 0px;
+  position:fixed;
+  float:right;
+  left:13%;
+  top:95%
+}
 .fr{ float:right;}
 .cl{ clear:both; overflow:hidden;}
 
diff --git a/plugins/developer/ts/dataManagerHelper.ts b/plugins/developer/ts/dataManagerHelper.ts
index 31e79daf..b37322ee 100644
--- a/plugins/developer/ts/dataManagerHelper.ts
+++ b/plugins/developer/ts/dataManagerHelper.ts
@@ -10,45 +10,55 @@ module Developer{
 			 label: "冷区数据管理",
 			 title: "数据汇总任务",
 			 items: [{
-			 	href: UrlHelpers.join(context,"Overview","cold/data-type/all"),
-			 	label: "全部",
-			 	title: "全部数据"
-			 },
-			 {
-				href: UrlHelpers.join(context,"Overview","cold/data-type/financial"),
-			 	label: "财政",
-			 	title: "财政数据"
-			 },
-			 {
-			 	href: UrlHelpers.join(context,"Overview/","cold/data-type/social-security"),
-			 	label: "社保",
-			 	title: "社保数据"
-			 }]
+					 	href: UrlHelpers.join(context,"Overview","cold/data-type/all"),
+					 	label: "全部",
+					 	title: "全部数据"
+					 },
+					 {
+						href: UrlHelpers.join(context,"Overview","cold/data-type/financial"),
+					 	label: "财政",
+					 	title: "财政数据"
+					 },
+					 {
+					 	href: UrlHelpers.join(context,"Overview/","cold/data-type/social-security"),
+					 	label: "社保",
+					 	title: "社保数据"
+					 }]
 			},
 			{
 				href: UrlHelpers.join(context,"Overview","hot/data-type/all"),
 				label: "热区数据管理",
 				title: "查看所有数据",
 				items: [{
-			 	href: UrlHelpers.join(context,"Overview","hot/data-type/all"),
-			 	label: "全部",
-			 	title: "全部数据"
-			},
-			{
-				href: UrlHelpers.join(context,"Overview","hot/data-type/financial"),
-			 	label: "财政",
-			 	title: "财政数据"
-			},
-			{
-			 	href: UrlHelpers.join(context,"Overview/","hot/data-type/social-security"),
-			 	label: "社保",
-			 	title: "社保数据"
-			 }]
+						 	href: UrlHelpers.join(context,"Overview","hot/data-type/all"),
+						 	label: "全部",
+						 	title: "全部数据"
+						},
+						{
+							href: UrlHelpers.join(context,"Overview","hot/data-type/financial"),
+						 	label: "财政",
+						 	title: "财政数据"
+						},
+						{
+						 	href: UrlHelpers.join(context,"Overview/","hot/data-type/social-security"),
+						 	label: "社保",
+						 	title: "社保数据"
+						 }]
 			},			
 			{
 			 	href: UrlHelpers.join(context,"Overview/","task"),
-			 	label: "查看任务",
-			 	title: "任务查看"
+			 	label: "任务管理",
+			 	title: "任务查看",
+			 	items: [{	
+			 				href: UrlHelpers.join(context,"Overview","hot/data-type/all"),
+						 	label: "全部",
+						 	title: "全部数据"
+					 	},
+					 	{
+						 	href: UrlHelpers.join(context,"Overview/","hot/data-type/social-security"),
+						 	label: "社保",
+						 	title: "社保数据"
+					 	}]
 			},			
 		]);
 	}