Merge remote-tracking branch 'origin/sysprojectms_test' into sysprojectms_test

Andy
2 parents 780bfde5 2611e0dc
Showing 2 changed files with 31 additions and 0 deletions
.project
js/pagejs/index.js
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>sysprojectms</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.aptana.ide.core.unifiedBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.aptana.projects.webnature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1502423714354</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
@@ -745,6 +745,9 @@
 				bar_l_option.xAxis.data.push(countryName);
                 countryIndex[countryName] = i;
+                //拼图
+                var serieData = {name:countryName,value:0};
+				dataCount[i]=serieData;
             }
             bar_l_option.xAxis.data.push("其他");
         	var req= {