完成打印功能

Harrison0984 · Jul 24, 2015 · 2af979b · 2af979b
1 parent 241b957
commit 2af979b
Show file tree

Hide file tree

Showing 14 changed files with 510 additions and 473 deletions.
diff --git a/app/.DS_Store b/app/.DS_Store
diff --git a/app/assets/.DS_Store b/app/assets/.DS_Store
diff --git a/app/assets/images/index.swf b/app/assets/images/index.swf
diff --git a/app/controllers/jsondata_controller.rb b/app/controllers/jsondata_controller.rb
@@ -12,21 +12,15 @@ def index
 			time = curtime.strftime("%H:%M:%S")
 
 			render :json => {
-							:nexttime => tasklog.nexttime.strftime("%H:%M:%S"),
-							:seconds => seconds.to_i+10,
+							:seconds => seconds.to_i,
 							:nownum => curtime.strftime("%Y%m%d")+(tasklog.currentbar).to_s,
 							:nowlog => grids[0].x1.to_s+","+grids[0].x2.to_s+","+grids[0].x3.to_s+","+
 									grids[0].y1.to_s+","+grids[0].y2.to_s+","+grids[0].y3.to_s+","+
 									grids[0].z1.to_s+","+grids[0].z2.to_s+","+grids[0].z3.to_s,
-							:hisnum1 => curtime.strftime("%Y%m%d")+(tasklog.currentbar-1).to_s,
-							:hislog1 => grids[1].x1.to_s+","+grids[1].x2.to_s+","+grids[1].x3.to_s+","+
+							:hisnum => curtime.strftime("%Y%m%d")+(tasklog.currentbar-1).to_s,
+							:hislog => grids[1].x1.to_s+","+grids[1].x2.to_s+","+grids[1].x3.to_s+","+
 									grids[1].y1.to_s+","+grids[1].y2.to_s+","+grids[1].y3.to_s+","+
 									grids[1].z1.to_s+","+grids[1].z2.to_s+","+grids[1].z3.to_s,
-							:hisnum2 => curtime.strftime("%Y%m%d")+(tasklog.currentbar-2).to_s,
- 							:hislog2 => grids[2].x1.to_s+","+grids[2].x2.to_s+","+grids[2].x3.to_s+","+
-									grids[2].y1.to_s+","+grids[2].y2.to_s+","+grids[2].y3.to_s+","+
-									grids[2].z1.to_s+","+grids[2].z2.to_s+","+grids[2].z3.to_s,
-							:nextNum => tasklog.nextgameid,
                         }
 		end
 	end