Merge branch 'develop' of 192.168.3.17:zhanghongbo/qfw into develop

core/src/web/staticres/js/relation.js

@@ -522,8 +522,8 @@ Relation.prototype.tick = function(){
 	        dtxs = x - Math.cos(theta),
 	        dtys = y - Math.sin(theta);
 			var dd = 39;
-		//return "M" + sx + "," + sy + "A" + dr + " " + 2*dr + ",0 0 1," + x + "," + y;
-		return "M" + sx + "," + sy + "A" + dr + " " + 2*dr + ",0 0 1," + x + "," + y + "A" + dr + " " + 2*dr + ",0 0 0," + sx + "," + sy + "M" + dtxs + "," + dtys +  "l" + (3.5 * Math.cos(d90 - theta) - 10 * Math.cos(theta)) + "," + (-3.5 * Math.sin(d90 - theta) - 10 * Math.sin(theta)) + "L" + (dtxs - 3.5 * Math.cos(d90 - theta) - 10 * Math.cos(theta)) + "," + (dtys + 3.5 * Math.sin(d90 - theta) - 10 * Math.sin(theta)) + "z";
+		return "M" + sx + "," + sy + "A" + dr + " " + dr + ",0 0 1," + x + "," + y;
+		//return "M" + sx + "," + sy + "A" + dr + " " + dr + ",0 0 1," + x + "," + y + "A" + dr + " " + dr + ",0 0 0," + sx + "," + sy + "M" + dtxs + "," + dtys +  "l" + (3.5 * Math.cos(d90 - theta) - 10 * Math.cos(theta)) + "," + (-3.5 * Math.sin(d90 - theta) - 10 * Math.sin(theta)) + "L" + (dtxs - 3.5 * Math.cos(d90 - theta) - 10 * Math.cos(theta)) + "," + (dtys + 3.5 * Math.sin(d90 - theta) - 10 * Math.sin(theta)) + "z";
 	});
 	this.nodes.attr("transform", function(d) {
 		if(thisClass.tickFlag && d.type == "ce"){