Merge pull request #80 from noob-noob/yangminglang

support metrics's base/link-relative notify
uavorg · Dec 1, 2017 · 0119280 · 0119280
2 parents 3561c2c + eb91824
commit 0119280
Show file tree

Hide file tree

Showing 15 changed files with 1,263 additions and 162 deletions.
diff --git a/com.creditease.uav.console/src/main/webapp/uavapp_godeye/notifystgy/css/uav.notifystgy.css b/com.creditease.uav.console/src/main/webapp/uavapp_godeye/notifystgy/css/uav.notifystgy.css
@@ -231,6 +231,40 @@ body {
     height: 34px;
 }
 
+/**时间控件按钮样式**/
+.control-group {
+	margin-bottom: 10px;
+}
+
+.control-group input {
+	background-color: #eeeeee;
+	border:1px solid #cccccc;
+  	border-radius:4px 0 0 4px;
+  	padding: 4px 6px;
+  	color:#333333
+}
+.control-group .add-on {
+	background-color: #eeeeee;
+	border:1px solid #cccccc;
+  	border-radius:0 4px 4px 0;
+  	padding: 4.5px 6px;
+  	color:#333333
+}
+
+/**
+*条件定义 
+*/
+.btn-default.active:focus{
+    color: #333;
+    background-color: #d4d4d4;
+    border-color: #8c8c8c;
+}
+
+.btn-default.active, .btn-default:active{
+    color: #333;
+    background-color: #d4d4d4;
+    border-color: #337ab7;
+}
 
 /**
 *触发策略 begin

diff --git a/com.creditease.uav.console/src/main/webapp/uavapp_godeye/notifystgy/js/notifystgy.add.js b/com.creditease.uav.console/src/main/webapp/uavapp_godeye/notifystgy/js/notifystgy.add.js
@@ -57,20 +57,26 @@ function saveNotify(checkIsExist){
 					/**
 					 * 策略
 					 */
-					var cJson = {
-						"expr" : json.expr
-					};
-					if (json.range) {
-						cJson["range"] = parseInt(json.range);
-					}
-					if ("0" != json.func && "count" == json.func) {
-						cJson["func"] = "count>" + json.cparam;
-					} else if ("0" != json.func) {
-						cJson["func"] = json.func;
+					if(!json.type||json.type=="stream"){
+						var cJson = {
+								"expr" : json.expr,
+								"type" :"stream"
+							};
+							if (json.range) {
+								cJson["range"] = parseInt(json.range);
+							}
+							if ("0" != json.func && "count" == json.func) {
+								cJson["func"] = "count>" + json.cparam;
+							} else if ("0" != json.func) {
+								cJson["func"] = json.func;
+							}
+
+							cJson["id"]=json.id;
+							conditions.push(cJson);
+					}else{
+						conditions.push(json);
 					}
 
-					cJson["id"]=json.id;
-					conditions.push(cJson);
 
 				}catch(e){
 					console.log(e);

diff --git a/com.creditease.uav.console/src/main/webapp/uavapp_godeye/notifystgy/js/notifystgy.init.js b/com.creditease.uav.console/src/main/webapp/uavapp_godeye/notifystgy/js/notifystgy.init.js
@@ -44,6 +44,5 @@ var list = new AppHubTable(listConfig);
 $(document).ready(function() {
 	initHeadDiv();
 	initListClass();
-	initConditionsDiv();
 });