Browse Source

修改数据展示导出pdf页码位置

zoie 3 weeks ago
parent
commit
5ba633a15f
3 changed files with 11 additions and 8 deletions
  1. 10 5
      controllers/Data.go
  2. 1 1
      go.mod
  3. 0 2
      go.sum

+ 10 - 5
controllers/Data.go

@@ -891,7 +891,7 @@ func (c *DataController) Device_Sensor_Data_PDF() {
 	pagenums := fmt.Sprintf("第 %d 页", pages)
 	pagenum, _ := pdf.MeasureTextWidth(pagenums)
 	pdf.SetX((595 / 2) - (pagenum / 2))
-	pdf.SetY(830)
+	pdf.SetY(810)
 	pdf.Cell(nil, pagenums)
 	var y float64 = 120
 	if T_ist == 1 {
@@ -944,6 +944,11 @@ func (c *DataController) Device_Sensor_Data_PDF() {
 		var textH float64 = 25 // if text height is 25px.
 		pdf.SetNewY(y, textH)
 		y = pdf.GetY()
+		if y > 790 {
+			// 翻页
+			pdf.AddPage()
+			y = pdf.GetY()
+		}
 		// newY = 20
 		if y < 30 {
 			lib.RectFillColor(pdf, "序号", 12, 22, y, 30, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
@@ -968,11 +973,11 @@ func (c *DataController) Device_Sensor_Data_PDF() {
 
 			lib.RectFillColor(pdf, "记录时间", 12, 412, y, 120, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
 			lib.RectFillColor(pdf, "备注", 12, 532, y, 40, 20, 255, 255, 255, lib.AlignCenter, lib.ValignMiddle)
-			pages := pdf.GetNumberOfPages()
-			pagenums := fmt.Sprintf("第 %d 页", pages)
-			pagenum, _ := pdf.MeasureTextWidth(pagenums)
+			pages = pdf.GetNumberOfPages()
+			pagenums = fmt.Sprintf("第 %d 页", pages)
+			pagenum, _ = pdf.MeasureTextWidth(pagenums)
 			pdf.SetX((595 / 2) - (pagenum / 2))
-			pdf.SetY(830) // 设置页码位置
+			pdf.SetY(810) // 设置页码位置
 			pdf.Cell(nil, pagenums)
 			y += 20
 		}

+ 1 - 1
go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/go-sql-driver/mysql v1.7.0
 	github.com/gomodule/redigo v2.0.0+incompatible
 	github.com/google/uuid v1.2.0
+	github.com/gorilla/websocket v1.5.3
 	github.com/mssola/user_agent v0.6.0
 	github.com/nats-io/nats.go v1.22.1
 	github.com/qiniu/go-sdk/v7 v7.14.0
@@ -26,7 +27,6 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect

+ 0 - 2
go.sum

@@ -284,8 +284,6 @@ github.com/richardlehane/msoleps v1.0.3 h1:aznSZzrwYRl3rLKRT3gUk9am7T/mLNSnJINvN
 github.com/richardlehane/msoleps v1.0.3/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
 github.com/robfig/cron/v3 v3.0.0 h1:kQ6Cb7aHOHTSzNVNEhmp8EcWKLb4CbiMW9h9VyIhO4E=
 github.com/robfig/cron/v3 v3.0.0/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
-github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
-github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=