液压安全阀，阻火器，空气泡沫添加检测结论

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

@@ -54,6 +54,7 @@ type LimsReportYeyaqf struct {
 	PUType             string    `xorm:"comment('新品 老品') VARCHAR(4)"`
 	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/Limsreportyyaqf/LimsreportyyaqfService.go

@@ -267,7 +267,7 @@ func (s *LimsReportYyaqfService) DataToExcelReport(entrustMainEntity limsentrust
 		}
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "C9", DetectBasis) //依据标准
 		//开启压力处理
-		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), "C11", PospressureStandard)
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "C12", NgpressureStandard)
 		//通气量处理
@@ -377,7 +377,7 @@ func (s *LimsReportYyaqfService) DataToExcelReport(entrustMainEntity limsentrust
 }
 
 // 开启压力处理，分别返回正开启压力两个值，负开启压力两个值，以及正负范围 通气量处理
-func ThroughPutAdd(spec string) (float64, float64, float64, float64, string, string, int, int) {
+func (s *LimsReportYyaqfService) 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/business/Limsreportzuhq/Limsreportzuhq.go

@@ -45,6 +45,7 @@ type LimsReportZuhq struct {
 	PUType             string    `xorm:"comment('新品 老品') VARCHAR(4)"`
 	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/Limsreportzuhq/LimsreportzuhqService.go

@@ -165,7 +165,7 @@ func (s *LimsreportzuhqService) DataToExcelReport(
 			xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "C12", "")
 		}
 		//通气量
-		PosThroughPutInt := ThroughPutAdd(reportList[i].Spec)
+		PosThroughPutInt := s.ThroughPutAdd(reportList[i].Spec)
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "C13", "≥"+strconv.Itoa(PosThroughPutInt))
 		throughput, _ := strconv.ParseFloat(strconv.Itoa(PosThroughPutInt), 64)
 		qulify := 1
@@ -243,7 +243,7 @@ func (s *LimsreportzuhqService) DataToExcelReport(
 	return retDocUrl, err
 }
 
-func ThroughPutAdd(spec string) int {
+func (s *LimsreportzuhqService) ThroughPutAdd(spec string) int {
 	Spec := strings.Split(spec, "-")
 	throughstandard, _ := strconv.Atoi(Spec[2])
 	//通气量

src/dashoo.cn/backend/api/business/limsreportkqpm/Limsreportkqpm.go

@@ -34,6 +34,7 @@ type LimsReportAirFoamGenerator struct {
 	PUType             string    `xorm:"comment('新品 老品') VARCHAR(4)"`
 	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/controllers/lims/limsZuhq.go

@@ -1,17 +1,18 @@
 package lims
 
 import (
-	"dashoo.cn/business2/parameter"
 	"dashoo.cn/backend/api/business/instrument"
 	"dashoo.cn/backend/api/business/limscustomerposition"
 	"dashoo.cn/backend/api/business/limsdataentry"
+	"dashoo.cn/business2/parameter"
 	"encoding/json"
+	"strconv"
 	"strings"
 	"time"
 
-	"dashoo.cn/business2/userRole"
 	"dashoo.cn/backend/api/business/baseUser"
 	"dashoo.cn/backend/api/business/items"
+	"dashoo.cn/business2/userRole"
 
 	"dashoo.cn/backend/api/business/Limsreportzuhq"
 	svccustomer "dashoo.cn/backend/api/business/customer"
@@ -355,6 +356,7 @@ func (this *LimsReportZuhqController) UpdateEntity() {
 		"Remark1",
 
 		"Remark2",
+		"CheckResult",
 
 		"CreateOn",
 
@@ -512,4 +514,60 @@ func (this *LimsReportZuhqController) AddRunRecord() {
 			svc.InsertEntityBytbl(this.User.AccCode+InstrumenRunRecordName, &runrecord)
 		}
 	}
+}
+
+// @Title 获取列表
+// @Description get user by token
+// @router /getzuhcheckresult [put]
+func (this *LimsReportZuhqController) GetZuhCheckResultList() {
+	var checkresult string
+	var model Limsreportzuhq.LimsReportZuhq
+	var jsonBlob = this.Ctx.Input.RequestBody
+	svc := Limsreportzuhq.GetLimsreportzuhqService(utils.DBE)
+	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
+	}
+	//检测结论判断依据
+	var pressureleak limsdataentry.LimsPressureLeak
+	where2 := "Pressure = '" + utils.ToStr(model.PyPapot) + "'"
+	svc.GetEntityByWhere(LimsPressureLeakName, where2, &pressureleak)
+	PosThroughPutInt := svc.ThroughPutAdd(model.Spec)
+	throughput, _ := strconv.ParseFloat(strconv.Itoa(PosThroughPutInt), 64)
+	qulify := 1
+	PaDiff, _ := strconv.ParseFloat(model.PaDiff, 64)
+	PressureLeak, _ := strconv.ParseFloat(pressureleak.PressureLeak, 64)
+	if model.PaDiff == "0.00" {
+		qulify = 1
+	} else {
+		if PaDiff <= PressureLeak {
+			qulify = 1
+		} else {
+			qulify = 0
+		}
+	}
+	VentVolume4, _ := strconv.ParseFloat(model.VentVolume4, 64)
+	if model.VentVolume4 == "0.00" {
+		qulify = 1
+	} else {
+		if VentVolume4 >= throughput {
+			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/backend/api/controllers/lims/limsreportairfoamgenerator.go

@@ -1,20 +1,21 @@
 package lims
 
 import (
-	"dashoo.cn/business2/parameter"
 	"dashoo.cn/backend/api/business/instrument"
 	"dashoo.cn/backend/api/business/items"
 	"dashoo.cn/backend/api/business/limscustomerposition"
 	"dashoo.cn/backend/api/business/limsdataentry"
+	"dashoo.cn/business2/parameter"
 	"encoding/json"
+	"strconv"
 	"strings"
 	"time"
 
-	"dashoo.cn/business2/userRole"
 	"dashoo.cn/backend/api/business/baseUser"
 	svccustomer "dashoo.cn/backend/api/business/customer"
 	"dashoo.cn/backend/api/business/limsreportkqpm"
 	. "dashoo.cn/backend/api/controllers"
+	"dashoo.cn/business2/userRole"
 	"dashoo.cn/utils"
 )
 
@@ -349,6 +350,7 @@ func (this *LimsReportAirFoamGeneratorController) UpdateEntity() {
 		"Remark1",
 
 		"Remark2",
+		"CheckResult",
 
 		"CreateOn",
 
@@ -474,3 +476,44 @@ func (this *LimsReportAirFoamGeneratorController) AddRunRecord() {
 		}
 	}
 }
+// @Title 获取列表
+// @Description get user by token
+// @router /getkqcheckresult [put]
+func (this *LimsReportAirFoamGeneratorController) GetKqCheckResultList() {
+	var checkresult string
+	var model limsreportkqpm.LimsReportAirFoamGenerator
+	var jsonBlob = this.Ctx.Input.RequestBody
+	svc := limsreportkqpm.GetLimsReportkqpmService(utils.DBE)
+	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
+	}
+	//检测结论判断依据
+	qulify := 1
+	PosPress, _ := strconv.ParseFloat(model.PosPress, 64)
+	if PosPress >= 0.5 {
+		qulify = 1
+	} else {
+		qulify = 0
+	}
+	PosGlass, _ := strconv.ParseFloat(model.PosGlass, 64)
+	if PosGlass >= 0.1 && PosGlass <= 0.3 {
+		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/backend/api/controllers/lims/limsreportyeyaqf.go

@@ -1,19 +1,22 @@
 package lims
 
 import (
-	"dashoo.cn/business2/parameter"
-	"dashoo.cn/backend/api/business/instrument"
-	"dashoo.cn/backend/api/business/limscustomerposition"
-	"dashoo.cn/backend/api/business/limsdataentry"
 	"encoding/json"
+	"fmt"
+	"strconv"
 	"strings"
 	"time"
-	svccustomer "dashoo.cn/backend/api/business/customer"
-	"dashoo.cn/business2/userRole"
+
 	"dashoo.cn/backend/api/business/Limsreportyyaqf"
 	"dashoo.cn/backend/api/business/baseUser"
+	svccustomer "dashoo.cn/backend/api/business/customer"
+	"dashoo.cn/backend/api/business/instrument"
 	"dashoo.cn/backend/api/business/items"
+	"dashoo.cn/backend/api/business/limscustomerposition"
+	"dashoo.cn/backend/api/business/limsdataentry"
 	. "dashoo.cn/backend/api/controllers"
+	"dashoo.cn/business2/parameter"
+	"dashoo.cn/business2/userRole"
 	"dashoo.cn/utils"
 )
 
@@ -93,7 +96,7 @@ func (this *LimsReportYeyaqfController) GetEntityList() {
 	total := svc.GetPagingEntitiesWithOrderBytbl(this.User.AccCode, page.CurrentPage, page.Size, orderby, asc, &list, where)
 
 	var list1 []limsreportyyaqf.LimsReportYeyaqf
-	svc.GetPagingEntitiesWithOrderBytbl(this.User.AccCode, 1,total, orderby, asc, &list1, where)
+	svc.GetPagingEntitiesWithOrderBytbl(this.User.AccCode, 1, total, orderby, asc, &list1, where)
 	var maxorderno = 0
 	for i := 0; i < len(list1); i++ {
 		if maxorderno < list1[i].OrderNo {
@@ -132,11 +135,11 @@ func (this *LimsReportYeyaqfController) GetDictList() {
 	dictList["Supervisers"] = userSvc.GetUserListByDepartmentId(this.User.AccCode, userEntity.Departmentid)
 
 	var dictCustomer []svccustomer.Customer
-	customerSvc.GetEntitysByWhere(this.User.AccCode + CustomerName, "", &dictCustomer)
+	customerSvc.GetEntitysByWhere(this.User.AccCode+CustomerName, "", &dictCustomer)
 	dictList["EntrustCorp"] = &dictCustomer
 
 	where := "ItemsId=246"
-	dictList["StandardItems"] = itemsSvc.GetTreeitemsdetailByWhere(Base_ItemTreeDetailsName,where)
+	dictList["StandardItems"] = itemsSvc.GetTreeitemsdetailByWhere(Base_ItemTreeDetailsName, where)
 
 	//常见问题
 	where = "ParentId=144"
@@ -166,19 +169,19 @@ func (this *LimsReportYeyaqfController) GetDictList() {
 	// 检测仪器--压力变送器
 	var list []instrument.Instrument
 	where = "Classification='压力变送器'"
-	instsvc.GetEntitysByWhere(this.User.AccCode+InstrumentName, where,&list)
+	instsvc.GetEntitysByWhere(this.User.AccCode+InstrumentName, where, &list)
 	dictList["DifPressTran"] = list
 
 	// 检测仪器--安全附件检测仪
 	var list1 []instrument.Instrument
 	where = "Classification='安全附件检测仪'"
-	instsvc.GetEntitysByWhere(this.User.AccCode+InstrumentName, where,&list1)
+	instsvc.GetEntitysByWhere(this.User.AccCode+InstrumentName, where, &list1)
 	dictList["SafAccDetector"] = list1
 
 	// 检测仪器--热式气体质量流量计
 	var list2 []instrument.Instrument
 	where = "Classification='热式气体质量流量计'"
-	instsvc.GetEntitysByWhere(this.User.AccCode+InstrumentName, where,&list2)
+	instsvc.GetEntitysByWhere(this.User.AccCode+InstrumentName, where, &list2)
 	dictList["GasFlowMeter"] = list2
 
 	dictList["DefaultStandardYyaqf"] = paramSvc.GetBaseparameterMessage("s5OVE", "paramset", "StandardYyaqf")
@@ -186,7 +189,7 @@ func (this *LimsReportYeyaqfController) GetDictList() {
 	// 相关联的检测仪器
 	var instrumentgroup []instrument.LimsInstrumentGroup
 	where = "1 = 1"
-	instsvc.GetEntitysByWhere(this.User.AccCode+LimsInstrumentGroup, where,&instrumentgroup)
+	instsvc.GetEntitysByWhere(this.User.AccCode+LimsInstrumentGroup, where, &instrumentgroup)
 	dictList["instrumentgroup"] = instrumentgroup
 
 	var datainfo DataInfo
@@ -346,6 +349,7 @@ func (this *LimsReportYeyaqfController) UpdateEntity() {
 		"Remark1",
 
 		"Remark2",
+		"CheckResult",
 
 		"CreateOn",
 
@@ -418,12 +422,12 @@ func (this *LimsReportYeyaqfController) GetEntrustCorpItems() {
 	svc := limscustomerposition.GetLimsCustomerpositionService(utils.DBE)
 
 	where := "CustomerId=" + cId + " and ParentId = 0"
-	svc.GetEntitysByWhere(this.User.AccCode+LimsCustomerpositionName, where,&model)
+	svc.GetEntitysByWhere(this.User.AccCode+LimsCustomerpositionName, where, &model)
 	dictList["PositionCheck"] = model
 
 	var Positionmodel []limscustomerposition.LimsCustomerPosition
 	where = "CustomerId=" + cId + " and ParentId <> 0"
-	svc.GetEntitysByWhere(this.User.AccCode+LimsCustomerpositionName,where, &Positionmodel)
+	svc.GetEntitysByWhere(this.User.AccCode+LimsCustomerpositionName, where, &Positionmodel)
 	dictList["Position"] = Positionmodel
 
 	var datainfo DataInfo
@@ -503,4 +507,64 @@ func (this *LimsReportYeyaqfController) AddRunRecord() {
 			svc.InsertEntityBytbl(this.User.AccCode+InstrumenRunRecordName, &runrecord)
 		}
 	}
-}
+}
+
+// @Title 获取列表
+// @Description get user by token
+// @router /getyeyacheckresult [put]
+func (this *LimsReportYeyaqfController) GetYeyaCheckResultList() {
+	var checkresult string
+	var model limsreportyyaqf.LimsReportYeyaqf
+	var jsonBlob = this.Ctx.Input.RequestBody
+	svc := limsreportyyaqf.GetLimsReportYyaqfService(utils.DBE)
+	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/reportairfoamgenerator.js

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

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

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

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

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

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

@@ -2,7 +2,7 @@
   <div>
     <el-dialog
       title="空气泡沫信息"
-      :visible.sync="dialogVisible" top="5vh"
+      :visible.sync="dialogVisible" 
       width="80%" >
 
       <el-form ref="EntityForm" :model="formData" label-width="120px">
@@ -207,6 +207,12 @@
               </el-input>
             </el-form-item>
           </el-col>
+         <el-col :span="24">
+          <el-form-item label="检测结论">
+            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4}" placeholder="请输入内容" v-model="formData.CheckResult">
+            </el-input>
+          </el-form-item>
+          </el-col>
 
           <el-col :span="24">
             <el-form-item :span="24" style="text-align: center;">
@@ -286,6 +292,7 @@
           LineCheck: '',
           Remark1: '',
           Remark2: '',
+          CheckResult: '依据《泡沫灭火系统及部件通用技术条件 GB20031-2005》标准，检测数据符合标准要求，检测结论：合格。',
           PUType: 'O',
           StandardDesc: '',
           CreateOn: '',
@@ -780,8 +787,15 @@
               this.formData.PosGlass = '0'
             }
             if (!this.formData.Id) {
-              this.addEntity()
-              this.setChosenPosition()
+              // 检测结论获取
+              api.getcheckresult(this.formData, this.$axios).then(res => {
+                this.formData.CheckResult = res.data.items
+                this.addEntity()
+                this.changePosition()
+              }).catch(err => {
+              // handle error
+                console.error(err)
+              })
             } else {
               this.updateEntity()
             }

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

@@ -798,7 +798,7 @@
           NgPressEnd: '0',
           Remark1: '',
           Remark2: '',
-          CheckResult: '',
+          CheckResult: '依据《石油储罐附件第一部分：呼吸阀 中华人民共和国石油天然气行业标准 SY/T 0511.1-2010》标准，检测数据符合标准要求，检测结论：合格。',
           CreateOn: '',
           CreateUserId: '',
           CreateBy: '',
@@ -1835,27 +1835,18 @@
             // if (this.formData.PosPaAvg === '') {
             //   this.formData.PosPaAvg = '0'
             // }
-            // 检测结论获取
-            if (this.formData.CheckResult == '') {
+            if (!this.formData.Id) {
+              // 检测结论获取
               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()
-                }
+                this.addEntity()
+                this.changePosition()
               }).catch(err => {
               // handle error
                 console.error(err)
               })
             } else {
-              if (!this.formData.Id) {
-                this.addEntity()
-                this.changePosition()
-              } else {
-                this.updateEntity()
-              }
+              this.updateEntity()
             }
           } else {
             return false

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

@@ -311,6 +311,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-col :span="24">
             <el-form-item :span="24" style="text-align: center;">
@@ -416,7 +422,10 @@
           NgCloud3: '',
           NgCloudAvg: '',
           StandardDesc: '',
-          PUType: 'O'
+          PUType: 'O',
+          Remark1: '',
+          Remark2: '',
+          CheckResult: '依据《石油储罐附件第二部分：液压安全阀 中华人民共和国石油天然气行业标准 SY/T 0511.2-2010》标准，检测数据符合标准要求，检测结论：合格。'
         },
         // 下拉选择项
         StandardItemsOptions: [],
@@ -1007,10 +1016,16 @@
             // this.formData.PositionCheck = this.$refs.selectPositionCheck.selectedLabel + ''
             this.formData.OrderNo = parseInt(this.formData.OrderNo)
             this.setDefaultVaile()
-
             if (!this.formData.Id) {
-              this.addEntity()
-              this.setChosenPosition()
+              // 检测结论获取
+              api.getcheckresult(this.formData, this.$axios).then(res => {
+                this.formData.CheckResult = res.data.items
+                this.addEntity()
+                this.changePosition()
+              }).catch(err => {
+              // handle error
+                console.error(err)
+              })
             } else {
               this.updateEntity()
             }

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

@@ -266,6 +266,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> {{
@@ -361,6 +367,7 @@
           StandardDesc: '',
           Remark1: '',
           Remark2: '',
+          CheckResult: '依据《石油储罐阻火器 中华人民共和国国家标准 GB 5908-2005》标准，检测数据符合标准要求，检测结论：合格。',
           CreateOn: '',
           CreateUserId: '',
           CreateBy: '',
@@ -944,8 +951,15 @@
               this.formData.PaDiff = '0'
             }
             if (!this.formData.Id) {
-              this.addEntity()
-              this.changePosition()
+              // 检测结论获取
+              api.getcheckresult(this.formData, this.$axios).then(res => {
+                this.formData.CheckResult = res.data.items
+                this.addEntity()
+                this.changePosition()
+              }).catch(err => {
+              // handle error
+                console.error(err)
+              })
             } else {
               this.updateEntity()
             }