Jelajahi Sumber

模板样品页面加入

huahaiyan 6 tahun lalu
induk
melakukan
55682aa9c7

+ 8 - 7
src/dashoo.cn/backend/api/controllers/casbin/user.go

@@ -1,16 +1,16 @@
 package casbin
 
 import (
-	"dashoo.cn/backend/api/business/organize"
-	"dashoo.cn/business2/userRole"
-	"dashoo.cn/business2/permission"
-	"dashoo.cn/backend/api/models"
 	"encoding/json"
 	"strings"
 
+	"dashoo.cn/backend/api/business/organize"
+	"dashoo.cn/backend/api/models"
+	"dashoo.cn/business2/permission"
+	"dashoo.cn/business2/userRole"
+
 	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/utils"
-
 )
 
 // Operations about Users
@@ -164,13 +164,14 @@ func (this *UserController) UserPowerPostRole() {
 		this.ServeJSON()
 	}
 }
+
 // @Title 创建用户
 // @Description 创建用户
 // @Param	body	body	business.device.DeviceChannels	"传感器信息"
 // @Success	200	{object} controllers.Request
 // @router / [post]
 func (this *UserController) AddUser() {
-	/*var model UserModel
+	var model UserModel
 	var jsonblob = this.Ctx.Input.RequestBody
 	json.Unmarshal(jsonblob, &model)
 	var errinfo ErrorDataInfo
@@ -242,7 +243,7 @@ func (this *UserController) AddUser() {
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
 		return
-	}*/
+	}
 }
 
 // @Title 编辑用户

+ 0 - 291
src/dashoo.cn/backend/api/controllers/limsmeter/limsreportben.go

@@ -1,291 +0,0 @@
-package limsreportben
-
-import (
-	"dashoo.cn/backend/api/business/limsdataentry"
-	"dashoo.cn/backend/api/business/limsreportbeampumpingunits"
-	"dashoo.cn/backend/api/business/limsreportben"
-	"encoding/json"
-
-	"time"
-
-	. "dashoo.cn/backend/api/controllers"
-	"dashoo.cn/utils"
-)
-
-type LimsBenController struct {
-	BaseController
-}
-
-
-// @Title 获取列表
-// @Description get user by token
-// @Success 200 {object}
-// @router /list [get]
-//func (this *LimsBenController) GetEntityList() {
-//	//获取分页信息
-//	page := this.GetPageInfoForm()
-//	where := " 1=1 "
-//	orderby := "Id"
-//	asc := false
-//	Order := this.GetString("Order")
-//	Prop := this.GetString("Prop")
-//	if Order != "" && Prop != "" {
-//		orderby = Prop
-//		if Order == "asc" {
-//			asc = true
-//		}
-//	}
-//	Id := this.GetString("Id")
-	//EId := this.GetString("EId")
-	//TaskBalanceId := this.GetString("TaskBalanceId")
-	//DataEntryId := this.GetString("DataEntryId")
-	//RelativeHumanity := this.GetString("RelativeHumanity")
-	//ManuCompany := this.GetString("ManuCompany")
-	//Spec := this.GetString("Spec")
-	//FactoryNum := this.GetString("FactoryNum")
-	//AudibleAlarm := this.GetString("AudibleAlarm")
-	//AlarmConcentration := this.GetString("AlarmConcentration")
-	//InstrumentLevel := this.GetString("InstrumentLevel")
-	//DielecStrength := this.GetString("DielecStrength")
-	//Remark := this.GetString("Remark")
-	//CreateOn := this.GetString("CreateOn")
-	//CreateUserId := this.GetString("CreateUserId")
-	//CreateBy := this.GetString("CreateBy")
-	//ModifiedOn := this.GetString("ModifiedOn")
-	//ModifiedUserId := this.GetString("ModifiedUserId")
-	//ModifiedBy := this.GetString("ModifiedBy")
-	//if Id != "" {
-	//	where = where + " and Id like '%" + Id + "%'"
-	//}
-
-	//if EId != "" {
-	//	where = where + " and EId like '%" + EId + "%'"
-	//}
-	//
-	//if TaskBalanceId != "" {
-	//	where = where + " and TaskBalanceId like '%" + TaskBalanceId + "%'"
-	//}
-	//
-	//if DataEntryId != "" {
-	//	where = where + " and DataEntryId =" + DataEntryId
-	//} else {
-	//	where = where + " and DataEntryId =" + "0"
-	//}
-	//
-	//if RelativeHumanity != "" {
-	//	where = where + " and RelativeHumanity like '%" + RelativeHumanity + "%'"
-	//}
-	//
-	//if ManuCompany != "" {
-	//	where = where + " and ManuCompany like '%" + ManuCompany + "%'"
-	//}
-	//
-	//if FactoryNum != "" {
-	//	where = where + " and FactoryNum like '%" + FactoryNum + "%'"
-	//}
-	//
-	//if Spec != "" {
-	//	where = where + " and Spec like '%" + Spec + "%'"
-	//}
-	//
-	//if AudibleAlarm != "" {
-	//	where = where + " and AudibleAlarm like '%" + AudibleAlarm + "%'"
-	//}
-	//
-	//if AlarmConcentration != "" {
-	//	where = where + " and AlarmConcentration like '%" + AlarmConcentration + "%'"
-	//}
-	//
-	//if InstrumentLevel != "" {
-	//	where = where + " and InstrumentLevel like '%" + InstrumentLevel + "%'"
-	//}
-	//
-	//if DielecStrength != "" {
-	//	where = where + " and DielecStrength like '%" + DielecStrength + "%'"
-	//}
-	//if Remark != "" {
-	//	where = where + " and Remark like '%" + Remark + "%'"
-	//}
-	//
-	//if CreateOn != "" {
-	//	where = where + " and CreateOn like '%" + CreateOn + "%'"
-	//}
-	//
-	//if CreateUserId != "" {
-	//	where = where + " and CreateUserId like '%" + CreateUserId + "%'"
-	//}
-	//
-	//if CreateBy != "" {
-	//	where = where + " and CreateBy like '%" + CreateBy + "%'"
-	//}
-	//
-	//if ModifiedOn != "" {
-	//	where = where + " and ModifiedOn like '%" + ModifiedOn + "%'"
-	//}
-	//
-	//if ModifiedUserId != "" {
-	//	where = where + " and ModifiedUserId like '%" + ModifiedUserId + "%'"
-	//}
-	//
-	//if ModifiedBy != "" {
-	//	where = where + " and ModifiedBy like '%" + ModifiedBy + "%'"
-	//}
-	//
-	//if CreateOn != "" {
-	//	dates := strings.Split(CreateOn, ",")
-	//	if len(dates) == 2 {
-	//		minDate := dates[0]
-	//		maxDate := dates[1]
-	//		where = where + " and CreateOn>='" + minDate + "' and CreateOn<='" + maxDate + "'"
-	//	}
-	//}
-//
-//	svc := limsreportben.GetLimsReportBenService(utils.DBE)
-//	var list []limsreportben.LimsReportBenModel
-//	total,list :=svc.GetAllPagingEntitiesWithOrderBytbl(this.User.AccCode, ,page.CurrentPage, page.Size, orderby, asc, &list, where)
-//	var datainfo DataInfo
-//	datainfo.Items = list
-//	datainfo.CurrentItemCount = total
-//	datainfo.PageIndex = page.CurrentPage
-//	datainfo.ItemsPerPage = page.Size
-//	this.Data["json"] = &datainfo
-//	this.ServeJSON()
-//}
-
-// @Title 获取实体
-// @Description 获取实体
-// @Success 200 {object} limss5ovelimsreportalertor.LimsS5OVELimsReportAlertor
-// @router /get/:id [get]
-//func (this *LimsBenController) GetEntity() {
-//	Id := this.Ctx.Input.Param(":id")
-//	var dataentrylist []limsdataentry.LimsDateEntry
-//	var alertorlist []limsreportalertor.LimsReportAlertor
-//	var alertvaluelist []limsreportalertor.LimsReportAlertorValue
-//	var alertdeviationlist []limsreportalertor.LimsReportAlertorDeviation
-//	var alertresponsetimelist []limsreportalertor.LimsReportAlertorResponseTime
-//	var alertrepeatlist []limsreportalertor.LimsReportAlertorRepeat
-//	var alertshiftlist []limsreportalertor.LimsReportAlertorShift
-//	svc := limsreportben.GetLimsReportBenService(utils.DBE)
-//	svc.GetListEntityByIdBytbl(this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsReportAlertorName, this.User.AccCode+LimsReportAlertorValueName, this.User.AccCode+LimsReportAlertorDeviationName, this.User.AccCode+LimsReportAlertorRepeatName,this.User.AccCode+LimsReportAlertorShiftName,Id, &model)
-//
-//	this.Data["json"] = &model
-//	this.ServeJSON()
-//}
-
-// @Title 添加
-// @Description 新增
-// @Param 	body body limsreportbeampumpingunits.LimsReportBeamPumpingUnits
-// @Success	200	{object} controllers.Request
-// @router /add [post]
-func (this *LimsBenController) AddEntity() {
-	var model limsreportbeampumpingunits.LimsReportBeamPumpingUnits
-	var jsonBlob = this.Ctx.Input.RequestBody
-	svc := limsreportben.GetLimsReportBenService(utils.DBE)
-
-	json.Unmarshal(jsonBlob, &model)
-	model.CreateOn = time.Now()
-	model.CreateBy = this.User.Realname
-	model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
-	//model.OrganizeId, _ = utils.StrTo(this.User.DepartmentId).Int()
-
-	_, err := svc.InsertEntityBytbl(this.User.AccCode+LimsReportBeamPumpingUnitName, &model)
-
-	var errinfo ErrorDataInfo
-	if err == nil {
-		//新增
-		errinfo.Message = "添加成功!"
-		errinfo.Code = 0
-		errinfo.Item = model.Id
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-	} else {
-		errinfo.Message = "添加失败!" + utils.AlertProcess(err.Error())
-		errinfo.Code = -1
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-	}
-}
-
-// @Title 删除数据录入信息
-// @Description
-// @Success 200 {object} ErrorInfo
-// @Failure 403 :id 为空
-// @router /dataentrydelect/:Id [delete]
-func (this *LimsBenController) DelDataEntry() {
-	Id := this.Ctx.Input.Param(":Id")
-	var errinfo ErrorInfo
-	if Id == "" {
-		errinfo.Message = "操作失败!请求信息不完整"
-		errinfo.Code = -2
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-		return
-	}
-	where := " Id= " + Id
-	svc := limsreportben.GetLimsReportBenService(utils.DBE)
-	err := svc.DeleteEntityBytbl(this.User.AccCode+LimsDateEntryName, where)
-	if err == nil {
-		errinfo.Message = "删除成功"
-		errinfo.Code = 0
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-	} else {
-		errinfo.Message = "删除失败!" + utils.AlertProcess(err.Error())
-		errinfo.Code = -1
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-	}
-}
-
-// @Title 修改数据录入表
-// @Description 修改数据录入表
-// @Param 	body body limsdataentry.LimsDateEntry
-// @Success	200	{object} controllers.Request
-// @router /updateEntity/:id [post]
-func (this *LimsBenController) UpdateEntity() {
-	id := this.Ctx.Input.Param(":id")
-	var errinfo ErrorInfo
-	if id == "" {
-		errinfo.Message = "操作失败!请求信息不完整"
-		errinfo.Code = -2
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-		return
-	}
-
-	var model limsdataentry.LimsDateEntry
-	svc := limsreportben.GetLimsReportBenService(utils.DBE)
-
-	var jsonBlob = this.Ctx.Input.RequestBody
-	json.Unmarshal(jsonBlob, &model)
-	model.ModifiedOn = time.Now()
-	model.ModifiedBy = this.User.Realname
-	model.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
-
-	cols := []string{
-		"TestDepartId",
-		"TestDepart",
-		"PositionCheckId",
-		"PositionCheck",
-		"Instrument1",
-		"Instrument2",
-		"Instrument3",
-		"Temperature",
-		"DetectBasis",
-		"StandardDesc",
-		"CheckDate",
-	}
-	err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, id, &model, cols)
-	if err == nil {
-		errinfo.Message = "保存成功!"
-		errinfo.Code = 0
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-	} else {
-		errinfo.Message = "保存失败!" + utils.AlertProcess(err.Error())
-		errinfo.Code = -1
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-	}
-}
-

+ 461 - 0
src/dashoo.cn/backend/api/controllers/metering/limsreportben.go

@@ -0,0 +1,461 @@
+package metering
+
+import (
+	"encoding/json"
+
+	"dashoo.cn/backend/api/business/limsdataentry"
+	"dashoo.cn/backend/api/business/limsreportalertor"
+	"dashoo.cn/backend/api/business/limsreportben"
+
+	"time"
+
+	. "dashoo.cn/backend/api/controllers"
+	"dashoo.cn/utils"
+)
+
+type LimsReportBenController struct {
+	BaseController
+}
+
+// @Title 获取列表
+// @Description get user by token
+// @Success 200 {object}
+// @router /list [get]
+//func (this *LimsBenController) GetEntityList() {
+//	//获取分页信息
+//	page := this.GetPageInfoForm()
+//	where := " 1=1 "
+//	orderby := "Id"
+//	asc := false
+//	Order := this.GetString("Order")
+//	Prop := this.GetString("Prop")
+//	if Order != "" && Prop != "" {
+//		orderby = Prop
+//		if Order == "asc" {
+//			asc = true
+//		}
+//	}
+//	Id := this.GetString("Id")
+//EId := this.GetString("EId")
+//TaskBalanceId := this.GetString("TaskBalanceId")
+//DataEntryId := this.GetString("DataEntryId")
+//RelativeHumanity := this.GetString("RelativeHumanity")
+//ManuCompany := this.GetString("ManuCompany")
+//Spec := this.GetString("Spec")
+//FactoryNum := this.GetString("FactoryNum")
+//AudibleAlarm := this.GetString("AudibleAlarm")
+//AlarmConcentration := this.GetString("AlarmConcentration")
+//InstrumentLevel := this.GetString("InstrumentLevel")
+//DielecStrength := this.GetString("DielecStrength")
+//Remark := this.GetString("Remark")
+//CreateOn := this.GetString("CreateOn")
+//CreateUserId := this.GetString("CreateUserId")
+//CreateBy := this.GetString("CreateBy")
+//ModifiedOn := this.GetString("ModifiedOn")
+//ModifiedUserId := this.GetString("ModifiedUserId")
+//ModifiedBy := this.GetString("ModifiedBy")
+//if Id != "" {
+//	where = where + " and Id like '%" + Id + "%'"
+//}
+
+//if EId != "" {
+//	where = where + " and EId like '%" + EId + "%'"
+//}
+//
+//if TaskBalanceId != "" {
+//	where = where + " and TaskBalanceId like '%" + TaskBalanceId + "%'"
+//}
+//
+//if DataEntryId != "" {
+//	where = where + " and DataEntryId =" + DataEntryId
+//} else {
+//	where = where + " and DataEntryId =" + "0"
+//}
+//
+//if RelativeHumanity != "" {
+//	where = where + " and RelativeHumanity like '%" + RelativeHumanity + "%'"
+//}
+//
+//if ManuCompany != "" {
+//	where = where + " and ManuCompany like '%" + ManuCompany + "%'"
+//}
+//
+//if FactoryNum != "" {
+//	where = where + " and FactoryNum like '%" + FactoryNum + "%'"
+//}
+//
+//if Spec != "" {
+//	where = where + " and Spec like '%" + Spec + "%'"
+//}
+//
+//if AudibleAlarm != "" {
+//	where = where + " and AudibleAlarm like '%" + AudibleAlarm + "%'"
+//}
+//
+//if AlarmConcentration != "" {
+//	where = where + " and AlarmConcentration like '%" + AlarmConcentration + "%'"
+//}
+//
+//if InstrumentLevel != "" {
+//	where = where + " and InstrumentLevel like '%" + InstrumentLevel + "%'"
+//}
+//
+//if DielecStrength != "" {
+//	where = where + " and DielecStrength like '%" + DielecStrength + "%'"
+//}
+//if Remark != "" {
+//	where = where + " and Remark like '%" + Remark + "%'"
+//}
+//
+//if CreateOn != "" {
+//	where = where + " and CreateOn like '%" + CreateOn + "%'"
+//}
+//
+//if CreateUserId != "" {
+//	where = where + " and CreateUserId like '%" + CreateUserId + "%'"
+//}
+//
+//if CreateBy != "" {
+//	where = where + " and CreateBy like '%" + CreateBy + "%'"
+//}
+//
+//if ModifiedOn != "" {
+//	where = where + " and ModifiedOn like '%" + ModifiedOn + "%'"
+//}
+//
+//if ModifiedUserId != "" {
+//	where = where + " and ModifiedUserId like '%" + ModifiedUserId + "%'"
+//}
+//
+//if ModifiedBy != "" {
+//	where = where + " and ModifiedBy like '%" + ModifiedBy + "%'"
+//}
+//
+//if CreateOn != "" {
+//	dates := strings.Split(CreateOn, ",")
+//	if len(dates) == 2 {
+//		minDate := dates[0]
+//		maxDate := dates[1]
+//		where = where + " and CreateOn>='" + minDate + "' and CreateOn<='" + maxDate + "'"
+//	}
+//}
+//
+//	svc := limsreportben.GetLimsReportBenService(utils.DBE)
+//	var list []limsreportben.LimsReportBenModel
+//	total,list :=svc.GetAllPagingEntitiesWithOrderBytbl(this.User.AccCode, ,page.CurrentPage, page.Size, orderby, asc, &list, where)
+//	var datainfo DataInfo
+//	datainfo.Items = list
+//	datainfo.CurrentItemCount = total
+//	datainfo.PageIndex = page.CurrentPage
+//	datainfo.ItemsPerPage = page.Size
+//	this.Data["json"] = &datainfo
+//	this.ServeJSON()
+//}
+
+// @Title 获取实体
+// @Description 获取实体
+// @Success 200 {object} limss5ovelimsreportalertor.LimsS5OVELimsReportAlertor
+// @router /get/:id [get]
+//func (this *LimsBenController) GetEntity() {
+//	Id := this.Ctx.Input.Param(":id")
+//	var dataentrylist []limsdataentry.LimsDateEntry
+//	var alertorlist []limsreportalertor.LimsReportAlertor
+//	var alertvaluelist []limsreportalertor.LimsReportAlertorValue
+//	var alertdeviationlist []limsreportalertor.LimsReportAlertorDeviation
+//	var alertresponsetimelist []limsreportalertor.LimsReportAlertorResponseTime
+//	var alertrepeatlist []limsreportalertor.LimsReportAlertorRepeat
+//	var alertshiftlist []limsreportalertor.LimsReportAlertorShift
+//	svc := limsreportben.GetLimsReportBenService(utils.DBE)
+//	svc.GetListEntityByIdBytbl(this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsReportAlertorName, this.User.AccCode+LimsReportAlertorValueName, this.User.AccCode+LimsReportAlertorDeviationName, this.User.AccCode+LimsReportAlertorRepeatName,this.User.AccCode+LimsReportAlertorShiftName,Id, &model)
+//
+//	this.Data["json"] = &model
+//	this.ServeJSON()
+//}
+
+// @Title 添加
+// @Description 新增
+// @Success	200	{object} controllers.Request
+// @router /add/:TypeId  [post]
+func (this *LimsReportBenController) AddEntity() {
+	TypeId := this.Ctx.Input.Param(":TypeId")
+	switch TypeId {
+	case "0":
+		//主表和扩展表
+		var dataentrymodel limsdataentry.LimsDateEntry
+		var almodel limsreportalertor.LimsReportAlertor
+		var jsonBlob = this.Ctx.Input.RequestBody
+		svc := limsreportben.GetLimsReportBenService(utils.DBE)
+
+		json.Unmarshal(jsonBlob, &dataentrymodel)
+		dataentrymodel.CreateOn = time.Now()
+		dataentrymodel.CreateBy = this.User.Realname
+		dataentrymodel.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+
+		json.Unmarshal(jsonBlob, &almodel)
+		almodel.CreateOn = time.Now()
+		almodel.CreateBy = this.User.Realname
+		almodel.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+
+		_, err := svc.InsertEntityBytbl(this.User.AccCode+LimsDateEntryName, &dataentrymodel)
+		_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorName, &almodel)
+
+		var errinfo ErrorDataInfo
+		if err == nil {
+			//新增
+			errinfo.Message = "添加成功!"
+			errinfo.Code = 0
+			errinfo.Item = dataentrymodel.Id
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+		} else {
+			errinfo.Message = "添加失败!" + utils.AlertProcess(err.Error())
+			errinfo.Code = -1
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+		}
+	case "1":
+		//证书表
+		var cermodel limsreportalertor.LimsReportAlertorCertificate
+		var jsonBlob = this.Ctx.Input.RequestBody
+		svc := limsreportben.GetLimsReportBenService(utils.DBE)
+
+		json.Unmarshal(jsonBlob, &cermodel)
+		cermodel.Createon = time.Now()
+		cermodel.Createby = this.User.Realname
+		cermodel.Createuserid, _ = utils.StrTo(this.User.Id).Int()
+
+		_, err := svc.InsertEntityBytbl(this.User.AccCode+LimsReportBeamPumpingUnitName, &cermodel)
+
+		var errinfo ErrorDataInfo
+		if err == nil {
+			//新增
+			errinfo.Message = "添加成功!"
+			errinfo.Code = 0
+			errinfo.Item = cermodel.Id
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+		} else {
+			errinfo.Message = "添加失败!" + utils.AlertProcess(err.Error())
+			errinfo.Code = -1
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+		}
+	case "2":
+		//报警功能表
+		var alermodel limsreportalertor.LimsReportAlertorValue
+		var jsonBlob = this.Ctx.Input.RequestBody
+		svc := limsreportben.GetLimsReportBenService(utils.DBE)
+
+		json.Unmarshal(jsonBlob, &alermodel)
+		alermodel.Createon = time.Now()
+		alermodel.Createby = this.User.Realname
+		alermodel.Createuserid, _ = utils.StrTo(this.User.Id).Int()
+
+		_, err := svc.InsertEntityBytbl(this.User.AccCode+LimsReportBeamPumpingUnitName, &alermodel)
+
+		var errinfo ErrorDataInfo
+		if err == nil {
+			//新增
+			errinfo.Message = "添加成功!"
+			errinfo.Code = 0
+			errinfo.Item = alermodel.Id
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+		} else {
+			errinfo.Message = "添加失败!" + utils.AlertProcess(err.Error())
+			errinfo.Code = -1
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+		}
+	case "3":
+		//示值误差表
+		var deviamodel limsreportalertor.LimsReportAlertorDeviation
+		var jsonBlob = this.Ctx.Input.RequestBody
+		svc := limsreportben.GetLimsReportBenService(utils.DBE)
+
+		json.Unmarshal(jsonBlob, &deviamodel)
+		deviamodel.Createon = time.Now()
+		deviamodel.Createby = this.User.Realname
+		deviamodel.Createuserid, _ = utils.StrTo(this.User.Id).Int()
+
+		_, err := svc.InsertEntityBytbl(this.User.AccCode+LimsReportBeamPumpingUnitName, &deviamodel)
+
+		var errinfo ErrorDataInfo
+		if err == nil {
+			//新增
+			errinfo.Message = "添加成功!"
+			errinfo.Code = 0
+			errinfo.Item = deviamodel.Id
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+		} else {
+			errinfo.Message = "添加失败!" + utils.AlertProcess(err.Error())
+			errinfo.Code = -1
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+		}
+	case "4":
+		//响应时间表
+		var responmodel limsreportalertor.LimsReportAlertorResponseTime
+		var jsonBlob = this.Ctx.Input.RequestBody
+		svc := limsreportben.GetLimsReportBenService(utils.DBE)
+
+		json.Unmarshal(jsonBlob, &responmodel)
+		responmodel.Createon = time.Now()
+		responmodel.Createby = this.User.Realname
+		responmodel.Createuserid, _ = utils.StrTo(this.User.Id).Int()
+
+		_, err := svc.InsertEntityBytbl(this.User.AccCode+LimsReportBeamPumpingUnitName, &responmodel)
+
+		var errinfo ErrorDataInfo
+		if err == nil {
+			//新增
+			errinfo.Message = "添加成功!"
+			errinfo.Code = 0
+			errinfo.Item = responmodel.Id
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+		} else {
+			errinfo.Message = "添加失败!" + utils.AlertProcess(err.Error())
+			errinfo.Code = -1
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+		}
+	case "5":
+		//重复性表
+		var repemodel limsreportalertor.LimsReportAlertorRepeat
+		var jsonBlob = this.Ctx.Input.RequestBody
+		svc := limsreportben.GetLimsReportBenService(utils.DBE)
+
+		json.Unmarshal(jsonBlob, &repemodel)
+		repemodel.Createon = time.Now()
+		repemodel.Createby = this.User.Realname
+		repemodel.Createuserid, _ = utils.StrTo(this.User.Id).Int()
+
+		_, err := svc.InsertEntityBytbl(this.User.AccCode+LimsReportBeamPumpingUnitName, &repemodel)
+
+		var errinfo ErrorDataInfo
+		if err == nil {
+			//新增
+			errinfo.Message = "添加成功!"
+			errinfo.Code = 0
+			errinfo.Item = repemodel.Id
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+		} else {
+			errinfo.Message = "添加失败!" + utils.AlertProcess(err.Error())
+			errinfo.Code = -1
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+		}
+	case "6":
+		//漂移表
+		var shiftmodel limsreportalertor.LimsReportAlertorShift
+		var jsonBlob = this.Ctx.Input.RequestBody
+		svc := limsreportben.GetLimsReportBenService(utils.DBE)
+
+		json.Unmarshal(jsonBlob, &shiftmodel)
+		shiftmodel.Createon = time.Now()
+		shiftmodel.Createby = this.User.Realname
+		shiftmodel.Createuserid, _ = utils.StrTo(this.User.Id).Int()
+
+		_, err := svc.InsertEntityBytbl(this.User.AccCode+LimsReportBeamPumpingUnitName, &shiftmodel)
+
+		var errinfo ErrorDataInfo
+		if err == nil {
+			//新增
+			errinfo.Message = "添加成功!"
+			errinfo.Code = 0
+			errinfo.Item = shiftmodel.Id
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+		} else {
+			errinfo.Message = "添加失败!" + utils.AlertProcess(err.Error())
+			errinfo.Code = -1
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+		}
+	}
+}
+
+// @Title 删除数据录入信息
+// @Description
+// @Success 200 {object} ErrorInfo
+// @Failure 403 :id 为空
+// @router /dataentrydelect/:Id [delete]
+func (this *LimsReportBenController) DelDataEntry() {
+	Id := this.Ctx.Input.Param(":Id")
+	var errinfo ErrorInfo
+	if Id == "" {
+		errinfo.Message = "操作失败!请求信息不完整"
+		errinfo.Code = -2
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+	where := " Id= " + Id
+	svc := limsreportben.GetLimsReportBenService(utils.DBE)
+	err := svc.DeleteEntityBytbl(this.User.AccCode+LimsDateEntryName, where)
+	if err == nil {
+		errinfo.Message = "删除成功"
+		errinfo.Code = 0
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "删除失败!" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}
+
+// @Title 修改数据录入表
+// @Description 修改数据录入表
+// @Success	200	{object} controllers.Request
+// @router /updateEntity/:id [post]
+func (this *LimsReportBenController) UpdateEntity() {
+	id := this.Ctx.Input.Param(":id")
+	var errinfo ErrorInfo
+	if id == "" {
+		errinfo.Message = "操作失败!请求信息不完整"
+		errinfo.Code = -2
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
+	var model limsdataentry.LimsDateEntry
+	svc := limsreportben.GetLimsReportBenService(utils.DBE)
+
+	var jsonBlob = this.Ctx.Input.RequestBody
+	json.Unmarshal(jsonBlob, &model)
+	model.ModifiedOn = time.Now()
+	model.ModifiedBy = this.User.Realname
+	model.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
+	cols := []string{
+		"TestDepartId",
+		"TestDepart",
+		"PositionCheckId",
+		"PositionCheck",
+		"Instrument1",
+		"Instrument2",
+		"Instrument3",
+		"Temperature",
+		"DetectBasis",
+		"StandardDesc",
+		"CheckDate",
+	}
+	err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, id, &model, cols)
+	if err == nil {
+		errinfo.Message = "保存成功!"
+		errinfo.Code = 0
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "保存失败!" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}

+ 9 - 2
src/dashoo.cn/backend/api/routers/router.go

@@ -5,13 +5,14 @@ package routers
 
 import (
 	"dashoo.cn/backend/api/controllers"
-	"dashoo.cn/backend/api/controllers/lims"
 	"dashoo.cn/backend/api/controllers/casbin"
 	"dashoo.cn/backend/api/controllers/document"
 	"dashoo.cn/backend/api/controllers/equipment"
 	"dashoo.cn/backend/api/controllers/instrument"
+	"dashoo.cn/backend/api/controllers/lims"
 	"dashoo.cn/backend/api/controllers/logs"
 	"dashoo.cn/backend/api/controllers/material"
+	"dashoo.cn/backend/api/controllers/metering"
 	"dashoo.cn/backend/api/controllers/setting"
 	"dashoo.cn/backend/api/controllers/system"
 	"dashoo.cn/backend/api/controllers/trigger"
@@ -239,7 +240,6 @@ func init() {
 			),
 		),
 
-
 		//lims首页
 		beego.NSNamespace("/limsindex",
 			beego.NSInclude(
@@ -408,6 +408,7 @@ func init() {
 				&lims.LimsCustomerpositionController{},
 			),
 		),
+
 		beego.NSNamespace("/orderadd",
 			beego.NSInclude(
 				&lims.OrderaddController{},
@@ -433,6 +434,12 @@ func init() {
 				&casbin.OrganizesController{},
 			),
 		),
+		//苯
+		beego.NSNamespace("/limsreportben",
+			beego.NSInclude(
+				&metering.LimsReportBenController{},
+			),
+		),
 	)
 	beego.AddNamespace(ns)
 }

+ 2 - 2
src/dashoo.cn/frontend_web/src/api/meter/reportalertor.js

@@ -18,9 +18,9 @@ export default {
         method: 'GET',
       })
     },
-    addEntity(formData, myAxios) {
+    addEntity(formData, myAxios, TypeId) {
       return myAxios({
-        url: '/limsreportben/add',
+        url: '/limsreportben/add/'+TypeId,
         method: 'post',
         data: formData
       })

+ 136 - 35
src/dashoo.cn/frontend_web/src/pages/lims/reportalertorbendetect/_opera/operation.vue

@@ -91,32 +91,32 @@
           </el-col>
         </el-row>
       </el-form>
-        <el-form label-width="100px" ref="EntityForm" v-for="item in certificateData" :key="item.value" :model="item">
-          <el-row>
-            <el-col :span="6">
-              <el-form-item label="证书编号:" label-width="80px">
-                <el-input v-model="item.CerNum" placeholder="请输入" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="标准值(%LEL):" label-width="120px">
-                <el-input v-model="item.StandVal" placeholder="请输入" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="不确定度:" label-width="80px">
-                <el-input v-model="item.Uncertainty" placeholder="请输入" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="有效期至:" label-width="80px">
-                <el-date-picker style="width: 100%" v-model="item.EffectDate" type="date" format="yyyy 年 MM 月 dd 日"
-                  placeholder="请选择">
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+      <el-form label-width="100px" ref="EntityForm" v-for="item in certificateData" :key="item.value" :model="item">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="证书编号:" label-width="80px">
+              <el-input v-model="item.CerNum" placeholder="请输入" style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准值(%LEL):" label-width="120px">
+              <el-input v-model="item.StandVal" placeholder="请输入" style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="不确定度:" label-width="80px">
+              <el-input v-model="item.Uncertainty" placeholder="请输入" style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效期至:" label-width="80px">
+              <el-date-picker style="width: 100%" v-model="item.EffectDate" type="date" format="yyyy 年 MM 月 dd 日"
+                placeholder="请选择">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
       <el-form label-width="100px" ref="certificateForm" :model="formCertificateData">
         <el-col :span="8">
           <el-form-item label="标准器名称:">
@@ -445,7 +445,7 @@
         },
         //证书编号
         formCertificateData: {
-          StanDevice:'',
+          StanDevice: '',
           CerNum: '',
           StandardUnit: '',
           StandVal: '',
@@ -661,7 +661,7 @@
         this.$refs['EntityForm'].validate((valid) => {
           if (valid) {
             if (!this.formData.Id) {
-              this.addEntity();
+              this.addEntityMain();
             } else {
               this.updateEntity();
             }
@@ -671,19 +671,120 @@
           }
         })
       },
-
-      addEntity() {
-        console.log("-------this.formdata---",this.formData)
-        api.addEntity(this.formData, this.$axios).then(res => {
+      //添加主数据
+      addEntityMain() {
+        console.log("-------this.formdata---", this.formData)
+        this.addEntityCertificate();
+        // api.addEntity(this.formData, this.$axios).then(res => {
+        //   if (res.data.code === 0) {
+        //     //保存成功后,初始化数据,变成修改
+        //     this.formData.Id = res.data.item;
+        //     this.initDatas();
+        //     this.addEntityCertificate();
+        //   } else {
+        //     this.$message({
+        //       type: 'warning',
+        //       message: res.data.message
+        //     });
+        //   }
+        // }).catch(err => {
+        //   console.error(err)
+        // });
+      },
+      //添加证书数据
+      addEntityCertificate() {
+        this.formCertificateData = Object.assign(this.formCertificateData, this.certificateData)
+        console.log("--------cer=-----",this.formCertificateData)
+        api.addEntity(this.certificateData, this.$axios, 1).then(res => {
+          if (res.data.code === 0) {
+            //保存成功后,初始化数据,变成修改
+            //this.initDatas();
+            //this.addEntityAlertVal();
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            });
+          }
+        }).catch(err => {
+          console.error(err)
+        });
+      },
+      //添加报警数据
+      addEntityAlertVal() {
+        api.addEntity(this.alerValData, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后,初始化数据,变成修改
-            this.formData.Id = res.data.item;
             this.initDatas();
+            this.addEntityDeviation();
+          } else {
             this.$message({
-              type: 'success',
+              type: 'warning',
               message: res.data.message
             });
-
+          }
+        }).catch(err => {
+          console.error(err)
+        });
+      },
+      //添加示值误差数据
+      addEntityDeviation() {
+        api.addEntity(this.deviationData, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            //保存成功后,初始化数据,变成修改
+            this.initDatas();
+            this.addEntityResponseTime();
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            });
+          }
+        }).catch(err => {
+          console.error(err)
+        });
+      },
+      //添加响应时间数据
+      addEntityResponseTime() {
+        api.addEntity(this.responseTimeData, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            //保存成功后,初始化数据,变成修改
+            this.initDatas();
+            this.addEntityRepeat();
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            });
+          }
+        }).catch(err => {
+          console.error(err)
+        });
+      },
+      //添加重复性数据
+      addEntityRepeat() {
+        api.addEntity(this.RepeatData, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            //保存成功后,初始化数据,变成修改
+            this.initDatas();
+            this.addEntityShift();
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            });
+          }
+        }).catch(err => {
+          console.error(err)
+        });
+      },
+      //添加漂移数据
+      addEntityShift() {
+        api.addEntity(this.ShiftData, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            //保存成功后,初始化数据,变成修改
+            this.initDatas();
+            this.addEntityAlertVal()
           } else {
             this.$message({
               type: 'warning',

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/system/users.vue

@@ -495,7 +495,7 @@
           if (valid) {
             this.userform.departmentid = this.selectedorg[this.selectedorg.length - 1] + ''
             if (_this.operatingitem === 1) {
-              _this.$axios.post('users', _this.userform)
+              _this.$axios.post('users/', _this.userform)
                 .then(res => {
                   // response
                   if (res.data.code === 0) {