baishaojie 1 год назад
Родитель
Сommit
95ad029f6e
2 измененных файлов с 11 добавлено и 10 удалено
  1. 1 0
      apiserver/service/report.go
  2. 10 10
      cmd/conf/app.ini

+ 1 - 0
apiserver/service/report.go

@@ -129,6 +129,7 @@ func MaintainList(pastureName, eqClassIdStr string, startTime, endTime time.Time
 			count1 := float64(len(mainMap))
 			count1 := float64(len(mainMap))
 			allCount := (24 * (count1 + float64(len(equipmentList)))) * float64(day)
 			allCount := (24 * (count1 + float64(len(equipmentList)))) * float64(day)
 			data["mtbf"] = FloatRound(allCount/count, 2)
 			data["mtbf"] = FloatRound(allCount/count, 2)
+			//申请时间 - 接单时间 +stopTime
 			data["mttr"] = FloatRound((t2+t3)/count, 2)
 			data["mttr"] = FloatRound((t2+t3)/count, 2)
 			data["mttf"] = FloatRound((allCount-t2-t3)/count, 2)
 			data["mttf"] = FloatRound((allCount-t2-t3)/count, 2)
 			data["count"] = count
 			data["count"] = count

+ 10 - 10
cmd/conf/app.ini

@@ -71,8 +71,8 @@ EasUrl = http://60.174.151.11:6888
 
 
 
 
 [database]
 [database]
-DsnDsn = eq:Xdmy@1234@tcp(192.168.61.42:3306)/eq?charset=utf8&parseTime=True&loc=Local
-; ####DsnDsn = root:kepaiteng!QAZ@tcp(222.73.129.15:31306)/eqmn?charset=utf8&parseTime=True&loc=Local
+; ####DsnDsn = eq:Xdmy@1234@tcp(192.168.61.42:3306)/eq?charset=utf8&parseTime=True&loc=Local
+DsnDsn = root:kepaiteng!QAZ@tcp(222.73.129.15:31306)/eqmn?charset=utf8&parseTime=True&loc=Local
 ; ####DsnDsn = eq:Xdmy@1234@tcp(192.168.63.42:3306)/eq?charset=utf8&parseTime=True&loc=Local
 ; ####DsnDsn = eq:Xdmy@1234@tcp(192.168.63.42:3306)/eq?charset=utf8&parseTime=True&loc=Local
 ; ####DsnDsn = root:root@tcp(127.0.0.1:3309)/test?charset=utf8&parseTime=True&loc=Local
 ; ####DsnDsn = root:root@tcp(127.0.0.1:3309)/test?charset=utf8&parseTime=True&loc=Local
 ; ####DsnDsn = root:root@tcp(192.168.1.93:3326)/eqdev?charset=utf8&parseTime=True&loc=Local
 ; ####DsnDsn = root:root@tcp(192.168.1.93:3326)/eqdev?charset=utf8&parseTime=True&loc=Local
@@ -80,16 +80,16 @@ DsnDsn = eq:Xdmy@1234@tcp(192.168.61.42:3306)/eq?charset=utf8&parseTime=True&loc
 
 
 Type = mysql
 Type = mysql
 #####本地
 #####本地
-#User = root
-#Password = kepaiteng!QAZ
-#Host = 222.73.129.15:31306
-#Name = eqmn
+User = root
+Password = kepaiteng!QAZ
+Host = 222.73.129.15:31306
+Name = eqmn
 
 
 #####线上
 #####线上
-User = eq
-Password = Xdmy@1234
-Host = 192.168.61.42:3306
-Name = eq
+#User = eq
+#Password = Xdmy@1234
+#Host = 192.168.61.42:3306
+#Name = eq
 #TablePrefix =
 #TablePrefix =
 
 
 #####现代牧业测试线
 #####现代牧业测试线