可燃气体报告导出

src/dashoo.cn/backend/api/business/limsdoctemplate/limstemplateenum.go

@@ -123,5 +123,7 @@ const (
 	DAYT_REPORTDETECTORHSGAS_DETAIL string= "DAYT.ReportDetectorHSGas.Detail"
 	// 加热炉
 	DAYT_REPORTHEATINGFURNACE_DETAIL string = "DAYT.ReportHeatingFurnace.Detail"
+	// 可燃气体检测报警器检定证书
+	DAYT_REPORTALERTORKRGASDETECT_REPORT string= "DAYT.ReportAlertorKRGasDetect.Report"
 
 )

src/dashoo.cn/backend/api/business/limsreportalerkrgas/limsreportalerkrgasSessionService.go

@@ -2,12 +2,16 @@ package limsreportalerkrgas
 
 import (
 	"dashoo.cn/backend/api/business/limsreportalertor"
+	"dashoo.cn/backend/api/business/workflow"
+	"errors"
 	"fmt"
+	"reflect"
 	"strconv"
+	"strings"
 
 	. "dashoo.cn/backend/api/mydb"
-	. "dashoo.cn/utils/db"
 	"dashoo.cn/utils"
+	. "dashoo.cn/utils/db"
 	"github.com/go-xorm/xorm"
 )
 
@@ -21,6 +25,110 @@ func GetLimsReportAlerKRSessionService(xormEngine *xorm.Session) *LimsReportAler
 	return s
 }
 
+
+func (s *LimsReportAlerKRSessionService) DataToExcelReport(
+	dataentryName string,
+	creatreportName string,
+	AlertorName string,
+	AlertorCertificateName string,
+	AlertorValueName string,
+	AlertorDeviationName string,
+	AlertorResponseTimeName string,
+	AlertorRepeatName string,
+	AlertorShiftName string,
+	seqStr string,
+	retUrl string,
+	entrustId string,
+	dataentryIds string) (reportUrl string, err error) {
+	var mainmodel limsreportalertor.LimsAlertorMainModel
+	var alertvaluelist []limsreportalertor.LimsReportAlertorValue
+	var cervaluelist []limsreportalertor.LimsReportAlertorCertificate
+	var alertdeviationlist []limsreportalertor.LimsReportAlertorDeviation
+	var alertresponsetimelist []limsreportalertor.LimsReportAlertorResponseTime
+	var alertrepeatlist []limsreportalertor.LimsReportAlertorRepeat
+	var alertshiftlist []limsreportalertor.LimsReportAlertorShift
+	where := " DataEntryId = " + dataentryIds
+	mainmodel = s.GetEntityByOrderbyWhereMain(dataentryName, AlertorName, "a.Id", dataentryIds)
+	fmt.Println(mainmodel)
+	s.GetEntitysByOrderbyWhere(AlertorCertificateName, where, "Id", &cervaluelist)
+	s.GetEntitysByOrderbyWhere(AlertorValueName, where, "Id desc", &alertvaluelist)
+	s.GetEntitysByOrderbyWhere(AlertorDeviationName, where, "Id desc", &alertdeviationlist)
+	s.GetEntitysByOrderbyWhere(AlertorResponseTimeName, where, "Id desc", &alertresponsetimelist)
+	s.GetEntitysByOrderbyWhere(AlertorRepeatName, where, "Id desc", &alertrepeatlist)
+	s.GetEntitysByOrderbyWhere(AlertorShiftName, where, "Id desc", &alertshiftlist)
+	datamap := StructToMapDemo(mainmodel)
+	datamap["CheckDate"] = mainmodel.CheckDate.Format("2006年01月02日")
+	for i := 0; i < len(cervaluelist); i++ {
+		datamap["StanDevice"+utils.ToStr(i)] = cervaluelist[i].StanDevice
+		datamap["CerNum"+utils.ToStr(i)] = cervaluelist[i].CerNum
+		datamap["Uncertainty"+utils.ToStr(i)] = cervaluelist[i].Uncertainty
+		datamap["EffectDate"+utils.ToStr(i)] = cervaluelist[i].EffectDate.Format("2006年01月02日")
+	}
+	checkstatus := 1
+	for i:= 0;i < len(alertvaluelist); i++ {
+		datamap["ActionValue"+utils.ToStr(i)] = alertvaluelist[i].ActionValue
+		if alertvaluelist[i].AlertFunction == "1" {
+			datamap["AlertFunction"] = "正常"
+		}else {
+			datamap["AlertFunction"] = "不正常"
+			checkstatus = 0
+		}
+	}
+	SumDeia := 0.0
+	AvgDeia := 0.0
+	for i:=0; i<len(alertdeviationlist); i++ {
+		SumDeia +=  alertdeviationlist[i].Deviation
+	}
+	AvgDeia = SumDeia/float64(len(alertvaluelist))
+	datamap["Deviation"] = AvgDeia
+	if AvgDeia >= -5 && AvgDeia <= 5 {
+		datamap["Result1"] = "合格"
+	}else {
+		datamap["Result1"] = "不合格"
+		checkstatus = 0
+	}
+	datamap["RepeatValue"] = alertrepeatlist[0].RepeatValue
+	if alertrepeatlist[0].RepeatValue > 2{
+		datamap["Result2"] = "不合格"
+		checkstatus = 0
+	}else {
+		datamap["Result2"] = "合格"
+	}
+	datamap["TimeDeviation"] = alertresponsetimelist[0].Deviation
+	if alertresponsetimelist[0].Deviation > 60{
+		datamap["Result3"] = "不合格"
+		checkstatus = 0
+	}else {
+		datamap["Result3"] = "合格"
+	}
+	if checkstatus == 1{
+		datamap["CheckResult"] = "合格"
+	}else {
+		datamap["CheckResult"] = "不合格"
+	}
+	svcActiviti := workflow.GetActivitiService(utils.DBE)
+	if (retUrl !="") {
+		urlArr := strings.Split(retUrl, "|")
+		templateUrl := "http://" + urlArr[0]
+		fileName := urlArr[1]
+		reportUrl = svcActiviti.FillWordTemplate(datamap, templateUrl, fileName)
+		err = nil
+	} else {
+		reportUrl = ""
+		err = errors.New("")
+	}
+	return reportUrl, err
+}
+
+func StructToMapDemo(obj interface{}) map[string]interface{} {
+	obj1 := reflect.TypeOf(obj)
+	obj2 := reflect.ValueOf(obj)
+	var data = make(map[string]interface{})
+	for i := 0; i < obj1.NumField(); i++ {
+		data[obj1.Field(i).Name] = obj2.Field(i).Interface()
+	}
+	return data
+}
 //获取ben信息
 func (s *LimsReportAlerKRSessionService) GetAllPagingEntitiesWithOrderBytbl(tblbalance string, tblentry string, pageIndex, itemsPerPage int64, order, where string) (int64, []LimsReportBenModel) {
 	var err error

src/dashoo.cn/backend/api/controllers/lims/limscreatereport.go

@@ -1,6 +1,7 @@
 package lims
 
 import (
+	"dashoo.cn/backend/api/business/limsreportalerkrgas"
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
@@ -949,7 +950,14 @@ func (this *CreateReportController) generateExcelReportN(entrustMain limsentrust
 		svc := limsreportldbh.GetLimsReportldbhService(utils.DBE)
 		reportUrl, err = svc.DataToExcelReport("○", entrustMain, this.User.AccCode+LimsReportLeakProtectName, this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsCreateReportName, BaseUserName, seqStr, docTemplate.FileURL, entrustId, this.User.Description, dataentryIds)
 		UnHGReportUrl, err = svc.DataToExcelReport("×", entrustMain, this.User.AccCode+LimsReportLeakProtectName, this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsCreateReportName, BaseUserName, seqStr, docTemplate.FileURL, entrustId, this.User.Description, dataentryIds)
+		//可燃气体检测报警器检定证书
+	case limsdoctemplate.DAYT_REPORTALERTORKRGASDETECT_REPORT:
+		seqStr := entrustMain.EntrustNo
+		sessions := utils.DBE.NewSession()
+		svc := limsreportalerkrgas.GetLimsReportAlerKRSessionService(sessions)
+		reportUrl, err = svc.DataToExcelReport(this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsCreateReportName, this.User.AccCode+LimsReportAlertorName, this.User.AccCode+LimsReportAlertorCertificateName, this.User.AccCode+LimsReportAlertorValueName, this.User.AccCode+LimsReportAlertorDeviationName, this.User.AccCode+LimsReportAlertorResponseTimeName, this.User.AccCode+LimsReportAlertorRepeatName, this.User.AccCode+LimsReportAlertorShiftName, seqStr, docTemplate.FileURL, entrustId, dataentryIds)
 	}
+
 	return reportUrl, UnHGReportUrl, err
 }
 

src/dashoo.cn/frontend_web/src/assets/styles/modules/global.scss

@@ -74,10 +74,10 @@ body {
 
     > .content {
       flex: 1;
-      margin: 0 $content-margin 0 0;
+      // margin: 0 $content-margin 0 0;
       overflow: auto;
-      border-top-left-radius: $content-margin * .6;
-      border-top-right-radius: $content-margin * .6;
+      // border-top-left-radius: $content-margin * .6;
+      // border-top-right-radius: $content-margin * .6;
       background-color: $content-background;
       color: $content-color;
       font-size: .875rem;

src/dashoo.cn/frontend_web/src/pages/lims/reportalertorkrgasdetect/_opera/operation.vue

@@ -190,7 +190,7 @@
           <template slot-scope="scope">
             <el-checkbox-group v-model="scope.row.AlertFunc" :max="1">
               <el-checkbox label="1">正常</el-checkbox>
-              <el-checkbox label="2">不正常</el-checkbox>
+              <el-checkbox label="0">不正常</el-checkbox>
             </el-checkbox-group>
             <!-- <el-input v-model.trim="scope.row.AlertFunction" style="width: 60%" size="mini"></el-input> -->
           </template>
@@ -198,23 +198,23 @@
         <el-table-column align="center" label="实测报警值（%LEL）">
           <el-table-column align="center" label="" prop="Value1">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" label="" prop="Value2">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" label="" prop="Value3">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column prop="ActionValue" align="center" label="报警动作值（%LEL）" min-width="90">
           <template slot-scope="scope">
-            <el-input  type="number" step="0.01" v-model.number="scope.row.ActionValue" style="width: 160px" size="mini"></el-input>
+            <el-input  type="number" step="0.1" v-model.number="scope.row.ActionValue" style="width: 160px" size="mini"></el-input>
           </template>
         </el-table-column>
       </el-table>
@@ -227,34 +227,34 @@
       <el-table :data="deviationData" border style="width: 100%">
         <el-table-column align="center" prop="GasValue" label="标准气体浓度值（%LEL）" width="180">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.GasValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.GasValue" style="width: 100%" size="mini" :disabled="true"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="仪器示值（%LEL）" min-width="180">
           <el-table-column align="center" prop="Value1" label="1">
             <template slot-scope="scope">
-              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
+              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value2" label="2">
             <template slot-scope="scope">
-              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
+              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value3" label="3">
             <template slot-scope="scope">
-              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
+              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="AvgValue" label="平均值">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.AvgValue" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.AvgValue" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column align="center" prop="Deviation" label="示值误差（%FS）" min-width="180">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Deviation" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Deviation" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
       </el-table>
@@ -267,28 +267,28 @@
       <el-table :data="responseTimeData" border style="width: 100%">
         <el-table-column align="center" prop="GasValue" label="标准气体浓度值（×10-6  mol/mol)" width="180">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.GasValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.GasValue" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="时间" min-width="180">
           <el-table-column align="center" prop="Value1" label="1">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value2" label="2">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value3" label="3">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Deviation" label="响应时间">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Deviation" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.Deviation" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
         </el-table-column>
@@ -302,49 +302,49 @@
       <el-table :data="RepeatData" border style="width: 100%">
         <el-table-column align="center" prop="GasValue" label="标准气体浓度值（%LEL）" width="180">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.GasValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.GasValue" style="width: 100%" size="mini" :disabled="true"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="仪器示值（%LEL）" min-width="180">
           <el-table-column align="center" prop="Value1" label="1">
             <template slot-scope="scope">
-              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
+              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value2" label="2">
             <template slot-scope="scope">
-              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
+              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value3" label="3">
             <template slot-scope="scope">
-              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
+              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value4" label="4">
             <template slot-scope="scope">
-              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value4" style="width: 100%" size="mini"></el-input>
+              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value4" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value5" label="5">
             <template slot-scope="scope">
-              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value5" style="width: 100%" size="mini"></el-input>
+              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value5" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value6" label="6">
             <template slot-scope="scope">
-              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value6" style="width: 100%" size="mini"></el-input>
+              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value6" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="AvgValue" label="平均值">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.AvgValue" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.AvgValue" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column align="center" prop="RepeatValue" label="重复性（%）" min-width="180">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.RepeatValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.RepeatValue" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
       </el-table>
@@ -359,47 +359,47 @@
         </el-table-column>
         <el-table-column prop="value0" align="center" label="0">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value0" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value0" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value1" align="center" label="1h   （10min）" min-width="80">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value2" align="center" label="2h   （20min）" min-width="80">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value3" align="center" label="3h   （30min）" min-width="80">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value4" align="center" label="4h   （40min）" min-width="80">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value4" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value4" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value5" align="center" label="5h   （50min）" min-width="80">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value5" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value5" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value6" align="center" label="6h   （60min）" min-width="80">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value6" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value6" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="ZeroValue" label="零点漂移（%FS）" min-width="150">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.ZeroValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.ZeroValue" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="ShowValue" label="量程漂移（%FS）" min-width="150">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.ShowValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.ShowValue" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
       </el-table>
@@ -573,7 +573,7 @@
         }],
         //示值误差及响应时间
         deviationData: [{
-          GasValue: '',
+          GasValue: 10,
           Value1: '',
           Value2: '',
           Value3: '',
@@ -582,7 +582,7 @@
           DeviationRelative: '0',
           Deviation: ''
         }, {
-          GasValue: '',
+          GasValue: 40.2,
           Value1: '',
           Value2: '',
           Value3: '',
@@ -591,7 +591,7 @@
           DeviationRelative: '0',
           Deviation: ''
         }, {
-          GasValue: '',
+          GasValue: 60.8,
           Value1: '',
           Value2: '',
           Value3: '',
@@ -628,7 +628,7 @@
           RepeatValue: ''
         },
         RepeatData: [{
-          GasValue: '',
+          GasValue: 40.2,
           Value1: '',
           Value2: '',
           Value3: '',
@@ -805,7 +805,7 @@
           sum = sum + parseInt(row.Value3)
         }
         if (divisor !== 0) {
-          row.AvgValue = (sum / divisor).toFixed(2)
+          row.AvgValue = (sum / divisor).toFixed(1)
         } else {
           row.AvgValue = '0'
         }
@@ -838,7 +838,7 @@
           sum = sum + parseInt(row.Value6)
         }
         if (divisor !== 0) {
-          row.AvgValue = (sum / divisor).toFixed(2)
+          row.AvgValue = (sum / divisor).toFixed(1)
         } else {
           row.AvgValue = '0'
         }