呼吸阀检测结论添加

src/dashoo.cn/backend/api/business/limsreporthuxf/limsreporthuxf.go

@@ -100,6 +100,7 @@ type LimsReportHuxf struct {
 	NgPressEnd         string    `xorm:"default 0.00 comment('负开启压-结尾') DECIMAL(10,2)"`
 	Remark1            string    `xorm:"VARCHAR(255)"`
 	Remark2            string    `xorm:"VARCHAR(255)"`
+	CheckResult        string    `xorm:"VARCHAR(255)"`
 	CreateOn           time.Time `xorm:"not null DATETIME"`
 	CreateUserId       int       `xorm:"INT(10)"`
 	CreateBy           string    `xorm:"VARCHAR(50)"`

src/dashoo.cn/backend/api/business/limsreporthuxf/limsreporthuxfService.go

@@ -335,7 +335,7 @@ func (s *LimsReportHuxfService) DataToExcelReport(entrustMainEntity limsentrust.
 			xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "D16", reportList[i].NgPaAvg) //负p,Pa-平均值
 		}
 		//检测结论判断依据
-		PosPressureFloat, PosPressureFloat2, NgPressureFloat, NgPressureFloat2, PospressureStandard, NgpressureStandard, PosThroughPutInt, NgThroughPutInt := ThroughPutAdd(reportList[i].Spec)
+		PosPressureFloat, PosPressureFloat2, NgPressureFloat, NgPressureFloat2, PospressureStandard, NgpressureStandard, PosThroughPutInt, NgThroughPutInt := s.ThroughPutAdd(reportList[i].Spec)
 		//开启压力
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "B11", PospressureStandard)
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "B12", NgpressureStandard)
@@ -427,7 +427,7 @@ func (s *LimsReportHuxfService) DataToExcelReport(entrustMainEntity limsentrust.
 }
 
 // 开启压力处理，分别返回正开启压力两个值，负开启压力两个值，以及正负范围
-func ThroughPutAdd(spec string) (float64, float64, float64, float64, string, string, int, int) {
+func (s *LimsReportHuxfService) ThroughPutAdd(spec string) (float64, float64, float64, float64, string, string, int, int) {
 	Spec := strings.Split(spec, "-")
 	throughstandard, _ := strconv.Atoi(Spec[1])
 	pressurestandard := Spec[2]

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

@@ -5,19 +5,20 @@ import (
 	"dashoo.cn/backend/api/business/limscustomerposition"
 	"dashoo.cn/backend/api/business/limsdataentry"
 	"encoding/json"
+	"fmt"
 	"strconv"
 	"strings"
 	"time"
 
-	"dashoo.cn/business2/parameter"
 	"dashoo.cn/backend/api/business/items"
+	"dashoo.cn/business2/parameter"
 
-	baseitems "dashoo.cn/business2/items"
-	"dashoo.cn/business2/userRole"
 	"dashoo.cn/backend/api/business/baseUser"
 	svccustomer "dashoo.cn/backend/api/business/customer"
 	"dashoo.cn/backend/api/business/limsreporthuxf"
 	. "dashoo.cn/backend/api/controllers"
+	baseitems "dashoo.cn/business2/items"
+	"dashoo.cn/business2/userRole"
 	"dashoo.cn/utils"
 )
 
@@ -668,6 +669,7 @@ func (this *LimsReportHuxfController) UpdateEntity() {
 		"Remark1",
 
 		"Remark2",
+		"CheckResult",
 
 		"CreateOn",
 
@@ -879,4 +881,61 @@ func (this *LimsReportHuxfController) AddRunRecord() {
 			svc.InsertEntityBytbl(this.User.AccCode+InstrumenRunRecordName, &runrecord)
 		}
 	}
+}
+// @Title 获取列表
+// @Description get user by token
+// @router /getmoscheckresult [put]
+func (this *LimsReportHuxfController) GetMosCheckResultList() {
+	var model limsreporthuxf.LimsReportHuxf
+	var checkresult string
+	svc := limsreporthuxf.GetLimsReportHuxfService(utils.DBE)
+	var jsonBlob = this.Ctx.Input.RequestBody
+	json.Unmarshal(jsonBlob, &model)
+	var reportmainlist limsdataentry.LimsDateEntry
+	svc.GetEntityByWhere(this.User.AccCode+LimsDateEntryName, " Id= "+utils.ToStr(model.DataEntryId), &reportmainlist)
+	var DetectBasis string
+	if strings.Contains(reportmainlist.DetectBasis, ",") == true {
+		DetectBasis = strings.Replace(reportmainlist.DetectBasis, ",", " ", -1)
+	} else {
+		DetectBasis = reportmainlist.DetectBasis
+	}
+	//检测结论判断依据
+	PosPressureFloat, PosPressureFloat2, NgPressureFloat, NgPressureFloat2, PospressureStandard, NgpressureStandard, PosThroughPutInt, NgThroughPutInt := svc.ThroughPutAdd(model.Spec)
+	fmt.Println(PospressureStandard,NgpressureStandard)
+	PosThroughPut, _ := strconv.ParseFloat(strconv.Itoa(PosThroughPutInt), 64)
+	NgThroughPut, _ := strconv.ParseFloat(strconv.Itoa(NgThroughPutInt), 64)
+	qulify := 1
+	PosPressAvg, _ := strconv.ParseFloat(model.PosPressAvg, 64)
+	if PosPressAvg >= PosPressureFloat && PosPressAvg <= PosPressureFloat2 {
+		qulify = 1
+	} else {
+		qulify = 0
+	}
+	NgPressAvg, _ := strconv.ParseFloat(model.NgPressAvg, 64)
+	if NgPressAvg >= NgPressureFloat && NgPressAvg <= NgPressureFloat2 {
+		qulify = 1
+	} else {
+		qulify = 0
+	}
+	PosCloudAvg, _ := strconv.ParseFloat(model.PosCloudAvg, 64)
+	if PosCloudAvg >= PosThroughPut {
+		qulify = 1
+	} else {
+		qulify = 0
+	}
+	NgCloudAvg, _ := strconv.ParseFloat(model.NgCloudAvg, 64)
+	if NgCloudAvg >= NgThroughPut {
+		qulify = 1
+	} else {
+		qulify = 0
+	}
+	if qulify == 1 {
+		checkresult = "依据《"+DetectBasis+"》标准，检测数据符合标准要求，检测结论：合格。"
+	} else if qulify == 0 {
+		checkresult = "依据《"+DetectBasis+"》标准，检测数据不符合标准要求，检测结论：不合格。"
+	}
+	var datainfo DataInfo
+	datainfo.Items = checkresult
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
 }

src/dashoo.cn/frontend_web/src/api/lims/reportatmosvalve.js

@@ -1,45 +1,50 @@
 
-
 export default {
-    getList(CreateOn, params, myAxios) {
-      return myAxios({
-        url: '/limsreporthuxf/list?CreateOn='+ CreateOn,
-        method: 'GET',
-        params: params
-      });
-    },
-    getDictList(myAxios) {
-      return myAxios({
-        url: '/limsreporthuxf/dictlist/',
-        method: 'GET'
+  getList (CreateOn, params, myAxios) {
+    return myAxios({
+      url: '/limsreporthuxf/list?CreateOn=' + CreateOn,
+      method: 'GET',
+      params: params
+    })
+  },
+  getDictList (myAxios) {
+    return myAxios({
+      url: '/limsreporthuxf/dictlist/',
+      method: 'GET'
 
-      });
-    },
-    getEntity(entityId, myAxios) {
-      return myAxios({
-        url: '/limsreporthuxf/get/'+entityId,
-        method: 'GET',
-      })
-    },
-    addEntity(formData, myAxios) {
-      return myAxios({
-        url: '/limsreporthuxf/add',
-        method: 'post',
-        data: formData
-      })
-    },
-    updateEntity(entityId, formData, myAxios) {
-      return myAxios({
-        url: '/limsreporthuxf/update/'+entityId,
-        method: 'post',
-        data: formData
-      })
-    },
-    deleteEntity(entityId, myAxios) {
-      return myAxios({
-        url: '/limsreporthuxf/delete/'+entityId,
-        method: 'delete'
-      })
-    },
+    })
+  },
+  getEntity (entityId, myAxios) {
+    return myAxios({
+      url: '/limsreporthuxf/get/' + entityId,
+      method: 'GET'
+    })
+  },
+  addEntity (formData, myAxios) {
+    return myAxios({
+      url: '/limsreporthuxf/add',
+      method: 'post',
+      data: formData
+    })
+  },
+  updateEntity (entityId, formData, myAxios) {
+    return myAxios({
+      url: '/limsreporthuxf/update/' + entityId,
+      method: 'post',
+      data: formData
+    })
+  },
+  deleteEntity (entityId, myAxios) {
+    return myAxios({
+      url: '/limsreporthuxf/delete/' + entityId,
+      method: 'delete'
+    })
+  },
+  getcheckresult (formData, myAxios) {
+    return myAxios({
+      url: '/limsreporthuxf/getmoscheckresult',
+      method: 'put',
+      data: formData
+    })
   }
-
+}

src/dashoo.cn/frontend_web/src/pages/lims/reportatmosvalve/subdata/dataopera.vue

@@ -620,6 +620,12 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-form-item label="检测结论" label-width="90px">
+            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4}" placeholder="请输入内容" v-model="formData.CheckResult">
+            </el-input>
+          </el-form-item>
+          </el-row>
         <el-form-item :span="24" style="text-align: center;">
           <el-button type="primary" size="small" @click="saveEntity"><i class="el-icon-circle-check"></i> {{
             this.saveBtnName }}
@@ -792,6 +798,7 @@
           NgPressEnd: '',
           Remark1: '',
           Remark2: '',
+          CheckResult: '',
           CreateOn: '',
           CreateUserId: '',
           CreateBy: '',
@@ -1828,11 +1835,27 @@
             // if (this.formData.PosPaAvg === '') {
             //   this.formData.PosPaAvg = '0'
             // }
-            if (!this.formData.Id) {
-              this.addEntity()
-              this.changePosition()
+            // 检测结论获取
+            if (this.formData.CheckResult == '') {
+              api.getcheckresult(this.formData, this.$axios).then(res => {
+                this.formData.CheckResult = res.data.items
+                if (!this.formData.Id) {
+                  this.addEntity()
+                  this.changePosition()
+                } else {
+                  this.updateEntity()
+                }
+              }).catch(err => {
+              // handle error
+                console.error(err)
+              })
             } else {
-              this.updateEntity()
+              if (!this.formData.Id) {
+                this.addEntity()
+                this.changePosition()
+              } else {
+                this.updateEntity()
+              }
             }
           } else {
             return false