节能-离心泵机组

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

@@ -0,0 +1,91 @@
+package limsreportliquidtransportation
+
+import "time"
+
+type LimsReportLiquidTransportation struct {
+	Id                  int       `xorm:"not null pk autoincr INT(10)"`
+	EId                 int       `xorm:"comment('委托单ID') INT(11)"`
+	TaskBalanceId       int       `xorm:"comment('任务分配表ID') INT(11)"`
+	DataEntryId         int       `xorm:"comment('数据记录表ID') INT(11)"`
+	TestDepartId        int       `xorm:"comment('受检单位ID') INT(11)"`
+	InstalPositionId    int       `xorm:"comment('安装位置ID') INT(11)"`
+	CreateReportStatus  int       `xorm:"comment('报告生成状态') INT(11)"`
+	InstalPosition      string    `xorm:"comment('安装位置') VARCHAR(100)"`
+	TestDepart          string    `xorm:"comment('受检单位') VARCHAR(100)"`
+	DeviceName          string    `xorm:"comment('设备名称及编号') VARCHAR(50)"`
+	LiquidType          string    `xorm:"comment('液体类型') VARCHAR(10)"`
+	SectionMonitor      string    `xorm:"comment('节监通知号') VARCHAR(50)"`
+	Model1              string    `xorm:"comment('泵铭牌型号') VARCHAR(50)"`
+	Flow1               float64   `xorm:"comment('泵流量') DECIMAL(10,2)"`
+	Lift1               float64   `xorm:"comment('泵扬程') DECIMAL(10,2)"`
+	ShaftPower1         float64   `xorm:"comment('泵轴功率') DECIMAL(10,2)"`
+	Speed1              float64   `xorm:"comment('泵转速') DECIMAL(10,2)"`
+	Efficiency1         float64   `xorm:"comment('泵效率') DECIMAL(10,2)"`
+	RatedNoloadPower1   string    `xorm:"comment('泵制造厂') VARCHAR(50)"`
+	Model2              string    `xorm:"comment('电动机铭牌型号') VARCHAR(255)"`
+	MotorPower          float64   `xorm:"comment('电动机功率') DECIMAL(10,2)"`
+	MotorVoltage        float64   `xorm:"comment('电动机电压') DECIMAL(10,2)"`
+	MotorCurrent        float64   `xorm:"comment('电动机电流') DECIMAL(10,2)"`
+	Speed2              float64   `xorm:"comment('电动机转速') DECIMAL(10,2)"`
+	Efficiency2         float64   `xorm:"comment('电动机效率') DECIMAL(10,2)"`
+	RatedNoloadPower2   string    `xorm:"comment('电动机制造厂') VARCHAR(50)"`
+	Basis               string    `xorm:"comment('依据标准') VARCHAR(50)"`
+	Instruments         string    `xorm:"comment('使用仪器') VARCHAR(50)"`
+	State               string    `xorm:"comment('仪器状态') VARCHAR(50)"`
+	LiquidDensity       float64   `xorm:"comment('液体密度') DECIMAL(10,2)"`
+	Temperature         float64   `xorm:"comment('环境温度') DECIMAL(10,2)"`
+	AfterTesting        float64   `xorm:"comment('测试后仪器状态') DECIMAL(10,2)"`
+	RelativeHumidity    float64   `xorm:"comment('相对湿度') DECIMAL(10,2)"`
+	Result              string    `xorm:"comment('检查结果') VARCHAR(50)"`
+	LiquidTemperature   float64   `xorm:"comment('液体温度') DECIMAL(10,2)"`
+	Inhalation          float64   `xorm:"comment('泵吸入管周长') DECIMAL(10,2)"`
+	InhalationPressure  float64   `xorm:"comment('吸入压力测点距基准面') DECIMAL(10,2)"`
+	Imported            float64   `xorm:"comment('进口壁厚 ') DECIMAL(10,2)"`
+	Discharge           float64   `xorm:"comment('泵排出管周长') DECIMAL(10,2)"`
+	DischargePressure   float64   `xorm:"comment('排出压力测点距基准面') DECIMAL(10,2)"`
+	Exit                float64   `xorm:"comment('出口壁厚 ') DECIMAL(10,2)"`
+	ThrottleValve       float64   `xorm:"comment('节阀后管周长') DECIMAL(10,2)"`
+	ThrottlePressure    float64   `xorm:"comment('节阀后压力测点距基准面') DECIMAL(10,2)"`
+	AfterValve          float64   `xorm:"comment('阀后壁厚 ') DECIMAL(10,2)"`
+	Transmission        string    `xorm:"comment('机组传动方式') VARCHAR(20)"`
+	Adjust              string    `xorm:"comment('工况调节方式及监测时调节状态') VARCHAR(20)"`
+	TrafficTest1        float64   `xorm:"comment('测试泵流量1') DECIMAL(10,2)"`
+	TrafficTest2        float64   `xorm:"comment('测试泵流量2') DECIMAL(10,2)"`
+	TrafficTest3        float64   `xorm:"comment('测试泵流量3') DECIMAL(10,2)"`
+	TrafficRecord       float64   `xorm:"comment('测试泵流量均值或合计') DECIMAL(10,2)"`
+	PumpSuction1        float64   `xorm:"comment('泵吸入表压1') DECIMAL(10,2)"`
+	PumpSuction2        float64   `xorm:"comment('泵吸入表压2') DECIMAL(10,2)"`
+	PumpSuction3        float64   `xorm:"comment('泵吸入表压3') DECIMAL(10,2)"`
+	PumpSuctionRecord   float64   `xorm:"comment('泵吸入表压均值或合计') DECIMAL(10,2)"`
+	PumpDischarge1      float64   `xorm:"comment('泵排出表压1') DECIMAL(10,2)"`
+	PumpDischarge2      float64   `xorm:"comment('泵排出表压2') DECIMAL(10,2)"`
+	PumpDischarge3      float64   `xorm:"comment('泵排出表压3') DECIMAL(10,2)"`
+	PumpDischargeRecord float64   `xorm:"comment('泵排出表压均值或合计') DECIMAL(10,2)"`
+	ThrottlePressure1   float64   `xorm:"comment('节阀后表压1') DECIMAL(10,2)"`
+	ThrottlePressure2   float64   `xorm:"comment('节阀后表压2') DECIMAL(10,2)"`
+	ThrottlePressure3   float64   `xorm:"comment('节阀后表压3') DECIMAL(10,2)"`
+	ThrottleRecord      float64   `xorm:"comment('节阀后表压均值或合计') DECIMAL(10,2)"`
+	TestVoltage1        float64   `xorm:"comment('测试电压1') DECIMAL(10,2)"`
+	TestVoltage2        float64   `xorm:"comment('测试电压2') DECIMAL(10,2)"`
+	TestVoltage3        float64   `xorm:"comment('测试电压3') DECIMAL(10,2)"`
+	TestVolRecord       float64   `xorm:"comment('测试电压均值或合计') DECIMAL(10,2)"`
+	TestCurrent1        float64   `xorm:"comment('测试电流1') DECIMAL(10,2)"`
+	TestCurrent2        float64   `xorm:"comment('测试电流2') DECIMAL(10,2)"`
+	TestCurrent3        float64   `xorm:"comment('测试电流3') DECIMAL(10,2)"`
+	TestCurrentRecord   float64   `xorm:"comment('测试电流均值或合计') DECIMAL(10,2)"`
+	MotorPower1         float64   `xorm:"comment('电机输入功率1') DECIMAL(10,2)"`
+	MotorPower2         float64   `xorm:"comment('电机输入功率2') DECIMAL(10,2)"`
+	MotorPower3         float64   `xorm:"comment('电机输入功率3') DECIMAL(10,2)"`
+	MotorPowerRecord    float64   `xorm:"comment('电机输入功率均值或合计') DECIMAL(10,2)"`
+	MotorFactor1        float64   `xorm:"comment('电机功率因数1') DECIMAL(10,2)"`
+	MotorFactor2        float64   `xorm:"comment('电机功率因数2') DECIMAL(10,2)"`
+	MotorFactor3        float64   `xorm:"comment('电机功率因数3') DECIMAL(10,2)"`
+	MotorFactorRecord   float64   `xorm:"comment('电机功率均值或合计') DECIMAL(10,2)"`
+	Remark              string    `xorm:"comment('备注') VARCHAR(255)"`
+	CreateUserId        int       `xorm:"INT(11)"`
+	CreateOn            time.Time `xorm:"DATETIME"`
+	CreateBy            string    `xorm:"VARCHAR(50)"`
+	ModifiedOn          time.Time `xorm:"DATETIME"`
+	ModifiedUserId      int       `xorm:"INT(11)"`
+	ModifiedBy          string    `xorm:"VARCHAR(50)"`
+}

src/dashoo.cn/backend/api/business/limsreportliquidtransportation/limsreportliquidtransportationService.go

@@ -0,0 +1,16 @@
+package limsreportliquidtransportation
+
+import (
+. "dashoo.cn/cellbank/backend/api/mydb"
+"github.com/go-xorm/xorm"
+)
+
+type LimsReportLiquidTransportationService struct {
+	MyServiceBase
+}
+
+func GetLimsReportLiquidTransportationService(xormEngine *xorm.Engine) *LimsReportLiquidTransportationService {
+	s := new(LimsReportLiquidTransportationService)
+	s.DBE = xormEngine
+	return s
+}

src/dashoo.cn/backend/api/controllers/base.go

@@ -230,6 +230,7 @@ var (
 	LimsReportAlertorRepeatName			     string = "LimsReportAlertorRepeat" // 计量站报警器  重复性
 	LimsReportAlertorShiftName				 string = "LimsReportAlertorShift" // 计量站报警器 漂移
 	LimsReportAlertorValueName				 string = "LimsReportAlertorValue" // 计量站报警器 报警误差/报警功能及报警动作值
+	LimsReportLiquidTransportationName       string = "LimsReportLiquidTransportation" //离心泵机组液体输送系统节能监测原始记录
 )
 
 //分页信息及数据

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

@@ -0,0 +1,755 @@
+
+
+package lims
+
+import (
+	"dashoo.cn/business/userRole"
+	"dashoo.cn/backend/api/business/baseUser"
+	"dashoo.cn/backend/api/business/limsreportliquidtransportation"
+	. "dashoo.cn/backend/api/controllers"
+	"dashoo.cn/utils"
+	"encoding/json"
+	"strconv"
+	"strings"
+	"time"
+)
+
+type LimsReportLiquidTransportationController struct {
+	BaseController
+}
+
+// @Title 获取列表
+// @Description get user by token
+// @Success 200 {object} []limss5ovelimsreportliquidtransportation.LimsReportLiquidTransportation
+// @router /list [get]
+func (this *LimsReportLiquidTransportationController) 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")
+	DataEntryId, _ := this.GetInt("entityId", 0)
+	SectionMonitor := this.GetString("SectionMonitor")
+	Model1 := this.GetString("Model1")
+	Flow1 := this.GetString("Flow1")
+	Lift1 := this.GetString("Lift1")
+	ShaftPower1 := this.GetString("ShaftPower1")
+	Speed1 := this.GetString("Speed1")
+	Efficiency1 := this.GetString("Efficiency1")
+	RatedNoloadPower1 := this.GetString("RatedNoloadPower1")
+	Model2 := this.GetString("Model2")
+	Flow2 := this.GetString("Flow2")
+	Lift2 := this.GetString("Lift2")
+	ShaftPower2 := this.GetString("ShaftPower2")
+	Speed2 := this.GetString("Speed2")
+	Efficiency2 := this.GetString("Efficiency2")
+	RatedNoloadPower2 := this.GetString("RatedNoloadPower2")
+	Basis := this.GetString("Basis")
+	Instruments := this.GetString("Instruments")
+	State := this.GetString("State")
+	LiquidDensity := this.GetString("LiquidDensity")
+	Temperature := this.GetString("Temperature")
+	AfterTesting := this.GetString("AfterTesting")
+	RelativeHumidity := this.GetString("RelativeHumidity")
+	Result := this.GetString("Result")
+	LiquidTemperature := this.GetString("LiquidTemperature")
+	Inhalation := this.GetString("Inhalation")
+	InhalationPressure := this.GetString("InhalationPressure")
+	Imported := this.GetString("Imported")
+	Discharge := this.GetString("Discharge")
+	DischargePressure := this.GetString("DischargePressure")
+	Exit := this.GetString("Exit")
+	ThrottleValve := this.GetString("ThrottleValve")
+	ThrottlePressure := this.GetString("ThrottlePressure")
+	AfterValve := this.GetString("AfterValve")
+	Transmission := this.GetString("Transmission")
+	Adjust := this.GetString("Adjust")
+	TrafficTest1 := this.GetString("TrafficTest1")
+	TrafficTest2 := this.GetString("TrafficTest2")
+	TrafficTest3 := this.GetString("TrafficTest3")
+	TrafficRecord := this.GetString("TrafficRecord")
+	PumpSuction1 := this.GetString("PumpSuction1")
+	PumpSuction2 := this.GetString("PumpSuction2")
+	PumpSuction3 := this.GetString("PumpSuction3")
+	PumpSuctionRecord := this.GetString("PumpSuctionRecord")
+	PumpDischarge1 := this.GetString("PumpDischarge1")
+	PumpDischarge2 := this.GetString("PumpDischarge2")
+	PumpDischarge3 := this.GetString("PumpDischarge3")
+	PumpDischargeRecord := this.GetString("PumpDischargeRecord")
+	ThrottlePressure1 := this.GetString("ThrottlePressure1")
+	ThrottlePressure2 := this.GetString("ThrottlePressure2")
+	ThrottlePressure3 := this.GetString("ThrottlePressure3")
+	ThrottleRecord := this.GetString("ThrottleRecord")
+	TestVoltage1 := this.GetString("TestVoltage1")
+	TestVoltage2 := this.GetString("TestVoltage2")
+	TestVoltage3 := this.GetString("TestVoltage3")
+	TestVolRecord := this.GetString("TestVolRecord")
+	TestCurrent1 := this.GetString("TestCurrent1")
+	TestCurrent2 := this.GetString("TestCurrent2")
+	TestCurrent3 := this.GetString("TestCurrent3")
+	TestCurrentRecord := this.GetString("TestCurrentRecord")
+	MotorPower1 := this.GetString("MotorPower1")
+	MotorPower2 := this.GetString("MotorPower2")
+	MotorPower3 := this.GetString("MotorPower3")
+	MotorPowerRecord := this.GetString("MotorPowerRecord")
+	MotorFactor1 := this.GetString("MotorFactor1")
+	MotorFactor2 := this.GetString("MotorFactor2")
+	MotorFactor3 := this.GetString("MotorFactor3")
+	MotorFactorRecord := this.GetString("MotorFactorRecord")
+	Remark := this.GetString("Remark")
+	CreateUserId := this.GetString("CreateUserId")
+	CreateOn := this.GetString("CreateOn")
+	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 DataEntryId > 0 {
+		where = where + " and DataEntryId =" + strconv.Itoa(DataEntryId)
+	}
+
+	if SectionMonitor != "" {
+		where = where + " and SectionMonitor like '%" + SectionMonitor + "%'"
+	}
+
+
+	if Model1 != "" {
+		where = where + " and Model1 like '%" + Model1 + "%'"
+	}
+
+
+	if Flow1 != "" {
+		where = where + " and Flow1 like '%" + Flow1 + "%'"
+	}
+
+
+	if Lift1 != "" {
+		where = where + " and Lift1 like '%" + Lift1 + "%'"
+	}
+
+
+	if ShaftPower1 != "" {
+		where = where + " and ShaftPower1 like '%" + ShaftPower1 + "%'"
+	}
+
+
+	if Speed1 != "" {
+		where = where + " and Speed1 like '%" + Speed1 + "%'"
+	}
+
+
+	if Efficiency1 != "" {
+		where = where + " and Efficiency1 like '%" + Efficiency1 + "%'"
+	}
+
+
+	if RatedNoloadPower1 != "" {
+		where = where + " and RatedNoloadPower1 like '%" + RatedNoloadPower1 + "%'"
+	}
+
+
+	if Model2 != "" {
+		where = where + " and Model2 like '%" + Model2 + "%'"
+	}
+
+
+	if Flow2 != "" {
+		where = where + " and Flow2 like '%" + Flow2 + "%'"
+	}
+
+
+	if Lift2 != "" {
+		where = where + " and Lift2 like '%" + Lift2 + "%'"
+	}
+
+
+	if ShaftPower2 != "" {
+		where = where + " and ShaftPower2 like '%" + ShaftPower2 + "%'"
+	}
+
+
+	if Speed2 != "" {
+		where = where + " and Speed2 like '%" + Speed2 + "%'"
+	}
+
+
+	if Efficiency2 != "" {
+		where = where + " and Efficiency2 like '%" + Efficiency2 + "%'"
+	}
+
+
+	if RatedNoloadPower2 != "" {
+		where = where + " and RatedNoloadPower2 like '%" + RatedNoloadPower2 + "%'"
+	}
+
+
+	if Basis != "" {
+		where = where + " and Basis like '%" + Basis + "%'"
+	}
+
+
+	if Instruments != "" {
+		where = where + " and Instruments like '%" + Instruments + "%'"
+	}
+
+
+	if State != "" {
+		where = where + " and State like '%" + State + "%'"
+	}
+
+
+	if LiquidDensity != "" {
+		where = where + " and LiquidDensity like '%" + LiquidDensity + "%'"
+	}
+
+
+	if Temperature != "" {
+		where = where + " and Temperature like '%" + Temperature + "%'"
+	}
+
+
+	if AfterTesting != "" {
+		where = where + " and AfterTesting like '%" + AfterTesting + "%'"
+	}
+
+
+	if RelativeHumidity != "" {
+		where = where + " and RelativeHumidity like '%" + RelativeHumidity + "%'"
+	}
+
+
+	if Result != "" {
+		where = where + " and Result like '%" + Result + "%'"
+	}
+
+
+	if LiquidTemperature != "" {
+		where = where + " and LiquidTemperature like '%" + LiquidTemperature + "%'"
+	}
+
+
+	if Inhalation != "" {
+		where = where + " and Inhalation like '%" + Inhalation + "%'"
+	}
+
+
+	if InhalationPressure != "" {
+		where = where + " and InhalationPressure like '%" + InhalationPressure + "%'"
+	}
+
+
+	if Imported != "" {
+		where = where + " and Imported like '%" + Imported + "%'"
+	}
+
+
+	if Discharge != "" {
+		where = where + " and Discharge like '%" + Discharge + "%'"
+	}
+
+
+	if DischargePressure != "" {
+		where = where + " and DischargePressure like '%" + DischargePressure + "%'"
+	}
+
+
+	if Exit != "" {
+		where = where + " and Exit like '%" + Exit + "%'"
+	}
+
+
+	if ThrottleValve != "" {
+		where = where + " and ThrottleValve like '%" + ThrottleValve + "%'"
+	}
+
+
+	if ThrottlePressure != "" {
+		where = where + " and ThrottlePressure like '%" + ThrottlePressure + "%'"
+	}
+
+
+	if AfterValve != "" {
+		where = where + " and AfterValve like '%" + AfterValve + "%'"
+	}
+
+
+	if Transmission != "" {
+		where = where + " and Transmission like '%" + Transmission + "%'"
+	}
+
+
+	if Adjust != "" {
+		where = where + " and Adjust like '%" + Adjust + "%'"
+	}
+
+
+	if TrafficTest1 != "" {
+		where = where + " and TrafficTest1 like '%" + TrafficTest1 + "%'"
+	}
+
+
+	if TrafficTest2 != "" {
+		where = where + " and TrafficTest2 like '%" + TrafficTest2 + "%'"
+	}
+
+
+	if TrafficTest3 != "" {
+		where = where + " and TrafficTest3 like '%" + TrafficTest3 + "%'"
+	}
+
+
+	if TrafficRecord != "" {
+		where = where + " and TrafficRecord like '%" + TrafficRecord + "%'"
+	}
+
+
+	if PumpSuction1 != "" {
+		where = where + " and PumpSuction1 like '%" + PumpSuction1 + "%'"
+	}
+
+
+	if PumpSuction2 != "" {
+		where = where + " and PumpSuction2 like '%" + PumpSuction2 + "%'"
+	}
+
+
+	if PumpSuction3 != "" {
+		where = where + " and PumpSuction3 like '%" + PumpSuction3 + "%'"
+	}
+
+
+	if PumpSuctionRecord != "" {
+		where = where + " and PumpSuctionRecord like '%" + PumpSuctionRecord + "%'"
+	}
+
+
+	if PumpDischarge1 != "" {
+		where = where + " and PumpDischarge1 like '%" + PumpDischarge1 + "%'"
+	}
+
+
+	if PumpDischarge2 != "" {
+		where = where + " and PumpDischarge2 like '%" + PumpDischarge2 + "%'"
+	}
+
+
+	if PumpDischarge3 != "" {
+		where = where + " and PumpDischarge3 like '%" + PumpDischarge3 + "%'"
+	}
+
+
+	if PumpDischargeRecord != "" {
+		where = where + " and PumpDischargeRecord like '%" + PumpDischargeRecord + "%'"
+	}
+
+
+	if ThrottlePressure1 != "" {
+		where = where + " and ThrottlePressure1 like '%" + ThrottlePressure1 + "%'"
+	}
+
+
+	if ThrottlePressure2 != "" {
+		where = where + " and ThrottlePressure2 like '%" + ThrottlePressure2 + "%'"
+	}
+
+
+	if ThrottlePressure3 != "" {
+		where = where + " and ThrottlePressure3 like '%" + ThrottlePressure3 + "%'"
+	}
+
+
+	if ThrottleRecord != "" {
+		where = where + " and ThrottleRecord like '%" + ThrottleRecord + "%'"
+	}
+
+
+	if TestVoltage1 != "" {
+		where = where + " and TestVoltage1 like '%" + TestVoltage1 + "%'"
+	}
+
+
+	if TestVoltage2 != "" {
+		where = where + " and TestVoltage2 like '%" + TestVoltage2 + "%'"
+	}
+
+
+	if TestVoltage3 != "" {
+		where = where + " and TestVoltage3 like '%" + TestVoltage3 + "%'"
+	}
+
+
+	if TestVolRecord != "" {
+		where = where + " and TestVolRecord like '%" + TestVolRecord + "%'"
+	}
+
+
+	if TestCurrent1 != "" {
+		where = where + " and TestCurrent1 like '%" + TestCurrent1 + "%'"
+	}
+
+
+	if TestCurrent2 != "" {
+		where = where + " and TestCurrent2 like '%" + TestCurrent2 + "%'"
+	}
+
+
+	if TestCurrent3 != "" {
+		where = where + " and TestCurrent3 like '%" + TestCurrent3 + "%'"
+	}
+
+
+	if TestCurrentRecord != "" {
+		where = where + " and TestCurrentRecord like '%" + TestCurrentRecord + "%'"
+	}
+
+
+	if MotorPower1 != "" {
+		where = where + " and MotorPower1 like '%" + MotorPower1 + "%'"
+	}
+
+
+	if MotorPower2 != "" {
+		where = where + " and MotorPower2 like '%" + MotorPower2 + "%'"
+	}
+
+
+	if MotorPower3 != "" {
+		where = where + " and MotorPower3 like '%" + MotorPower3 + "%'"
+	}
+
+
+	if MotorPowerRecord != "" {
+		where = where + " and MotorPowerRecord like '%" + MotorPowerRecord + "%'"
+	}
+
+
+	if MotorFactor1 != "" {
+		where = where + " and MotorFactor1 like '%" + MotorFactor1 + "%'"
+	}
+
+
+	if MotorFactor2 != "" {
+		where = where + " and MotorFactor2 like '%" + MotorFactor2 + "%'"
+	}
+
+
+	if MotorFactor3 != "" {
+		where = where + " and MotorFactor3 like '%" + MotorFactor3 + "%'"
+	}
+
+
+	if MotorFactorRecord != "" {
+		where = where + " and MotorFactorRecord like '%" + MotorFactorRecord + "%'"
+	}
+
+
+	if Remark != "" {
+		where = where + " and Remark like '%" + Remark + "%'"
+	}
+
+
+	if CreateUserId != "" {
+		where = where + " and CreateUserId like '%" + CreateUserId + "%'"
+	}
+
+
+	if CreateOn != "" {
+		where = where + " and CreateOn like '%" + CreateOn + "%'"
+	}
+
+
+	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 := limsreportliquidtransportation.GetLimsReportLiquidTransportationService(utils.DBE)
+	var list []limsreportliquidtransportation.LimsReportLiquidTransportation
+	total := svc.GetPagingEntitiesWithOrderBytbl(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 get user by token
+// @Success 200 {object} map[string]interface{}
+// @router /dictlist [get]
+func (this *LimsReportLiquidTransportationController) GetDictList() {
+	dictList := make(map[string]interface{})
+	//dictSvc := items.GetItemsService(utils.DBE)
+	userSvc := baseUser.GetBaseUserService(utils.DBE)
+	//customerSvc := svccustomer.GetCustomerService(utils.DBE)
+	//dictList["WellNo"] = dictSvc.GetKeyValueItems("WellNo", this.User.AccCode)
+	var userEntity userRole.Base_User
+	userSvc.GetEntityById(this.User.Id, &userEntity)
+	dictList["Supervisers"] = userSvc.GetUserListByDepartmentId(this.User.AccCode, userEntity.Departmentid)
+
+	//var dictCustomer []svccustomer.Customer
+	//customerSvc.GetEntitysByWhere(this.User.AccCode + CustomerName, "", &dictCustomer)
+	//dictList["EntrustCorp"] = &dictCustomer
+
+	var datainfo DataInfo
+	datainfo.Items = dictList
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
+
+// @Title 获取实体
+// @Description 获取实体
+// @Success 200 {object} limsreportliquidtransportation.LimsReportLiquidTransportation
+// @router /get/:id [get]
+func (this *LimsReportLiquidTransportationController) GetEntity() {
+	Id := this.Ctx.Input.Param(":id")
+
+	var model limsreportliquidtransportation.LimsReportLiquidTransportation
+	svc := limsreportliquidtransportation.GetLimsReportLiquidTransportationService(utils.DBE)
+	where := "DataEntryId=" + Id
+	//svc.GetEntityByIdBytbl(this.User.AccCode+LimsReportLiquidTransportationName, Id, &model)
+	has := svc.GetEntityByWhere(this.User.AccCode+LimsReportLiquidTransportationName, where, &model)
+
+	var data ErrorDataInfo
+	if (has) {
+		data.Code = 0
+	} else {
+		data.Code = -1
+	}
+	data.Item = model
+	this.Data["json"] = &data
+	this.ServeJSON()
+}
+
+// @Title 添加
+// @Description 新增
+// @Param 	body body limsreportliquidtransportation.LimsReportLiquidTransportation
+// @Success	200	{object} controllers.Request
+// @router /add [post]
+func (this *LimsReportLiquidTransportationController) AddEntity() {
+	var model limsreportliquidtransportation.LimsReportLiquidTransportation
+	var jsonBlob = this.Ctx.Input.RequestBody
+	svc := limsreportliquidtransportation.GetLimsReportLiquidTransportationService(utils.DBE)
+
+	json.Unmarshal(jsonBlob, &model)
+	model.CreateOn = time.Now()
+	model.CreateBy = this.User.Realname
+	model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+
+	_, err := svc.InsertEntityBytbl(this.User.AccCode+LimsReportLiquidTransportationName, &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 修改实体
+// @Param 	body body limsreportliquidtransportation.LimsReportLiquidTransportation
+// @Success	200	{object} controllers.Request
+// @router /update/:id [post]
+func (this *LimsReportLiquidTransportationController) 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 limsreportliquidtransportation.LimsReportLiquidTransportation
+	svc := limsreportliquidtransportation.GetLimsReportLiquidTransportationService(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{
+
+		"Id",
+		"EId",
+		"TaskBalanceId",
+		"DataEntryId",
+		"TestDepartId",
+		"InstalPositionId",
+		"CreateReportStatus",
+		"InstalPosition",
+		"TestDepart",
+		"DeviceName",
+		"LiquidType",
+		"SectionMonitor",
+		"Model1",
+		"Flow1",
+		"Lift1",
+		"ShaftPower1",
+		"Speed1",
+		"Efficiency1",
+		"RatedNoloadPower1",
+		"Model2",
+		"Flow2",
+		"Lift2",
+		"ShaftPower2",
+		"Speed2",
+		"Efficiency2",
+		"RatedNoloadPower2",
+		"Basis",
+		"Instruments",
+		"State",
+		"LiquidDensity",
+		"Temperature",
+		"AfterTesting",
+		"RelativeHumidity",
+		"Result",
+		"LiquidTemperature",
+		"Inhalation",
+		"InhalationPressure",
+		"Imported",
+		"Discharge",
+		"DischargePressure",
+		"Exit",
+		"ThrottleValve",
+		"ThrottlePressure",
+		"AfterValve",
+		"Transmission",
+		"Adjust",
+		"TrafficTest1",
+		"TrafficTest2",
+		"TrafficTest3",
+		"TrafficRecord",
+		"PumpSuction1",
+		"PumpSuction2",
+		"PumpSuction3",
+		"PumpSuctionRecord",
+		"PumpDischarge1",
+		"PumpDischarge2",
+		"PumpDischarge3",
+		"PumpDischargeRecord",
+		"ThrottlePressure1",
+		"ThrottlePressure2",
+		"ThrottlePressure3",
+		"ThrottleRecord",
+		"TestVoltage1",
+		"TestVoltage2",
+		"TestVoltage3",
+		"TestVolRecord",
+		"TestCurrent1",
+		"TestCurrent2",
+		"TestCurrent3",
+		"TestCurrentRecord",
+		"MotorPower1",
+		"MotorPower2",
+		"MotorPower3",
+		"MotorPowerRecord",
+		"MotorFactor1",
+		"MotorFactor2",
+		"MotorFactor3",
+		"MotorFactorRecord",
+		"Remark",
+		"CreateUserId",
+		"CreateOn",
+		"CreateBy",
+		"ModifiedOn",
+		"ModifiedUserId",
+		"ModifiedBy",
+	}
+	err := svc.UpdateEntityBytbl(this.User.AccCode+LimsReportLiquidTransportationName, 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()
+	}
+}
+
+// @Title 删除单条信息
+// @Description
+// @Success 200 {object} ErrorInfo
+// @Failure 403 :id 为空
+// @router /delete/:Id [delete]
+func (this *LimsReportLiquidTransportationController) DeleteEntity() {
+	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 limsreportliquidtransportation.LimsReportLiquidTransportation
+	var entityempty limsreportliquidtransportation.LimsReportLiquidTransportation
+	svc := limsreportliquidtransportation.GetLimsReportLiquidTransportationService(utils.DBE)
+	opdesc := "删除-" + Id
+	err := svc.DeleteOperationAndWriteLogBytbl(this.User.AccCode+LimsReportLiquidTransportationName, BaseOperationLogName, Id, &model, &entityempty, utils.ToStr(this.User.Id), this.User.Username, opdesc, this.User.AccCode, "钻井日报")
+	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()
+	}
+}

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

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

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

@@ -3,7 +3,7 @@
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
       <el-breadcrumb-item :to="{ path: '/lims/dataentry' }">数据录入</el-breadcrumb-item>
-      <el-breadcrumb-item>编辑</el-breadcrumb-item>
+      <el-breadcrumb-item>离心泵机组液体输送系统节能监测原始记录</el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card">
       <div slot="header">
@@ -21,22 +21,22 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="被测单位" label-width="120px">
-              <el-input v-model.trim="formData.SectionMonitor" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model.trim="formData.TestDepart" placeholder="请输入" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="安装地点">
-              <el-input v-model.trim="formData.SectionMonitor" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model.trim="formData.InstalPosition" placeholder="请输入" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="设备名称及编号">
-              <el-input v-model.trim="formData.SectionMonitor" placeholder="请输入" style="width: 100%"></el-input>
+            <el-form-item label="设备名称及编号" label-width="120px">
+              <el-input v-model.trim="formData.DeviceName" placeholder="请输入" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="液体类型">
-              <el-input v-model.trim="formData.SectionMonitor" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model.trim="formData.LiquidType" placeholder="请输入" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -60,45 +60,40 @@
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="流量"
-                                  prop="Flow1"
-                                  :rules="[ { type: 'number', message: '流量必须为数字'}]">
-                      <el-input v-model.number="formData.Flow1" placeholder="请输入" style="width: 100%">
+                                  prop="Flow1">
+                      <el-input type="number" step="0.01" v-model.number="formData.Flow1" placeholder="请输入" style="width: 100%">
                         <template slot="append">m3/h</template>
                       </el-input>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="扬程"
-                                  prop="Lift1"
-                                  :rules="[ { type: 'number', message: '扬程必须为数字'}]">
-                      <el-input v-model.number="formData.Lift1" placeholder="请输入" style="width: 100%">
-                        <template slot="append">m</template>
+                                  prop="Lift1">
+                      <el-input type="number" step="0.01" v-model.number="formData.Lift1" placeholder="请输入" style="width: 100%">
+                      <template slot="append">m</template>
                       </el-input>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="轴功率"
-                                  prop="ShaftPower1"
-                                  :rules="[ { type: 'number', message: '轴功率必须为数字'}]">
-                      <el-input v-model.number="formData.ShaftPower1" placeholder="请输入" style="width: 100%">
+                                  prop="ShaftPower1">
+                      <el-input type="number" step="0.01" v-model.number="formData.ShaftPower1" placeholder="请输入" style="width: 100%">
                         <template slot="append">kW</template>
                       </el-input>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="转速"
-                                  prop="Speed1"
-                                  :rules="[ { type: 'number', message: '转速必须为数字'}]">
-                      <el-input v-model.number="formData.Speed1" placeholder="请输入" style="width: 100%">
+                                  prop="Speed1">
+                      <el-input type="number" step="0.01" v-model.number="formData.Speed1" placeholder="请输入" style="width: 100%">
                         <template slot="append">r/min</template>
                       </el-input>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="效率"
-                                  prop="Efficiency1"
-                                  :rules="[ { type: 'number', message: '效率必须为数字'}]">
-                      <el-input v-model.number="formData.Efficiency1" placeholder="请输入" style="width: 100%">
+                                  prop="Efficiency1">
+                      <el-input type="number" step="0.01" v-model.number="formData.Efficiency1" placeholder="请输入" style="width: 100%">
                         <template slot="append">%</template>
                       </el-input>
                     </el-form-item>
@@ -126,45 +121,40 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="功率"
-                                prop="MotorPower"
-                                :rules="[ { type: 'number', message: '功率必须为数字'}]">
-                    <el-input v-model.number="formData.MotorPower" placeholder="请输入" style="width: 100%">
+                                prop="MotorPower">
+                    <el-input type="number" step="0.01" v-model.number="formData.MotorPower" placeholder="请输入" style="width: 100%">
                       <template slot="append">kW</template>
                     </el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="电压"
-                                prop="MotorVoltage"
-                                :rules="[ { type: 'number', message: '电压必须为数字'}]">
-                    <el-input v-model.number="formData.MotorVoltage" placeholder="请输入" style="width: 100%">
+                                prop="MotorVoltage">
+                    <el-input type="number" step="0.01" v-model.number="formData.MotorVoltage" placeholder="请输入" style="width: 100%">
                       <template slot="append">V</template>
                     </el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="电流"
-                                prop="MotorCurrent"
-                                :rules="[ { type: 'number', message: '电流必须为数字'}]">
-                    <el-input v-model.number="formData.MotorCurrent" placeholder="请输入" style="width: 100%">
+                                prop="MotorCurrent">
+                    <el-input type="number" step="0.01" v-model.number="formData.MotorCurrent" placeholder="请输入" style="width: 100%">
                       <template slot="append">A</template>
                     </el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="转速"
-                                prop="Speed2"
-                                :rules="[ { type: 'number', message: '转速必须为数字'}]">
-                    <el-input v-model.number="formData.Speed2" placeholder="请输入" style="width: 100%">
+                                prop="Speed2">
+                    <el-input type="number" step="0.01" v-model.number="formData.Speed2" placeholder="请输入" style="width: 100%">
                       <template slot="append">r/min</template>
                     </el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="效率"
-                                prop="Efficiency2"
-                                :rules="[ { type: 'number', message: '效率必须为数字'}]">
-                    <el-input v-model.number="formData.Efficiency2" placeholder="请输入" style="width: 100%">
+                                prop="Efficiency2">
+                    <el-input type="number" step="0.01" v-model.number="formData.Efficiency2" placeholder="请输入" style="width: 100%">
                       <template slot="append">%</template>
                     </el-input>
                   </el-form-item>
@@ -199,8 +189,8 @@
             <el-col :span="6">
               <el-form-item label="液体密度"
                             prop="LiquidDensity"
-                            :rules="[ { type: 'number', message: '必须为数字'}]">
-                <el-input v-model.number="formData.LiquidDensity" placeholder="请输入" style="width: 100%">
+                            >
+                <el-input type="number" step="0.01" v-model.number="formData.LiquidDensity" placeholder="请输入" style="width: 100%">
                   <template slot="append">kg/m3</template>
                 </el-input>
               </el-form-item>
@@ -208,8 +198,8 @@
             <el-col :span="6">
               <el-form-item label="环境温度"
                             prop="Temperature"
-                            :rules="[ { type: 'number', message: '必须为数字'}]">
-                <el-input v-model.number="formData.Temperature" placeholder="请输入" style="width: 100%">
+                            >
+                <el-input type="number" step="0.01" v-model.number="formData.Temperature" placeholder="请输入" style="width: 100%">
                   <template slot="append">℃</template>
                 </el-input>
               </el-form-item>
@@ -217,8 +207,8 @@
             <el-col :span="6">
               <el-form-item label="相对湿度"
                             prop="RelativeHumidity"
-                            :rules="[ { type: 'number', message: '必须为数字'}]">
-                <el-input v-model.number="formData.RelativeHumidity" placeholder="请输入" style="width: 100%">
+                            >
+                <el-input type="number" step="0.01" v-model.number="formData.RelativeHumidity" placeholder="请输入" style="width: 100%">
                   <template slot="append">%</template>
                 </el-input>
               </el-form-item>
@@ -226,8 +216,8 @@
             <el-col :span="6">
               <el-form-item label="液体温度"
                             prop="LiquidTemperature"
-                            :rules="[ { type: 'number', message: '必须为数字'}]">
-                <el-input v-model.number="formData.LiquidTemperature" placeholder="请输入" style="width: 100%">
+                            >
+                <el-input type="number" step="0.01" v-model.number="formData.LiquidTemperature" placeholder="请输入" style="width: 100%">
                   <template slot="append">℃</template>
                 </el-input>
               </el-form-item>
@@ -240,8 +230,8 @@
             <el-col :span="6">
               <el-form-item label="泵吸入管周长"
                             prop="Inhalation"
-                            :rules="[ { type: 'number', message: '必须为数字'}]">
-                <el-input v-model.number="formData.Inhalation" placeholder="请输入" style="width: 100%">
+                            >
+                <el-input type="number" step="0.01" v-model.number="formData.Inhalation" placeholder="请输入" style="width: 100%">
                   <template slot="append">mm</template>
                 </el-input>
               </el-form-item>
@@ -249,8 +239,8 @@
             <el-col :span="6">
               <el-form-item label="吸入压力测点距基准面" label-width="200px"
                             prop="InhalationPressure"
-                            :rules="[ { type: 'number', message: '必须为数字'}]">
-                <el-input v-model.number="formData.InhalationPressure" placeholder="请输入" style="width: 100%">
+                            >
+                <el-input type="number" step="0.01" v-model.number="formData.InhalationPressure" placeholder="请输入" style="width: 100%">
                   <template slot="append">mm</template>
                 </el-input>
               </el-form-item>
@@ -258,8 +248,8 @@
             <el-col :span="6">
               <el-form-item label="进口壁厚"
                             prop="Imported"
-                            :rules="[ { type: 'number', message: '必须为数字'}]">
-                <el-input v-model.number="formData.Imported" placeholder="请输入" style="width: 100%">
+                            >
+                <el-input type="number" step="0.01" v-model.number="formData.Imported" placeholder="请输入" style="width: 100%">
                   <template slot="append">mm</template>
                 </el-input>
               </el-form-item>
@@ -267,17 +257,16 @@
             <el-col :span="6">
               <el-form-item label="泵排出管周长"
                             prop="Discharge"
-                            :rules="[ { type: 'number', message: '必须为数字'}]">
-                <el-input v-model.number="formData.Discharge" placeholder="请输入" style="width: 100%">
+                            >
+                <el-input type="number" step="0.01" v-model.number="formData.Discharge" placeholder="请输入" style="width: 100%">
                   <template slot="append">mm</template>
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="排出压力测点距基准面" label-width="170px"
-                            prop="DischargePressure"
-                            :rules="[ { type: 'number', message: '必须为数字'}]">
-                <el-input v-model.number="formData.DischargePressure" placeholder="请输入" style="width: 100%">
+                            prop="DischargePressure">
+                <el-input type="number" step="0.01" v-model.number="formData.DischargePressure" placeholder="请输入" style="width: 100%">
                   <template slot="append">mm</template>
                 </el-input>
               </el-form-item>
@@ -285,8 +274,8 @@
             <el-col :span="6">
               <el-form-item label="出口壁厚"
                             prop="Exit"
-                            :rules="[ { type: 'number', message: '必须为数字'}]">
-                <el-input v-model.number="formData.Exit" placeholder="请输入" style="width: 100%">
+                            >
+                <el-input type="number" step="0.01" v-model.number="formData.Exit" placeholder="请输入" style="width: 100%">
                   <template slot="append">mm</template>
                 </el-input>
               </el-form-item>
@@ -294,8 +283,8 @@
             <el-col :span="6">
               <el-form-item label="节阀后管周长"
                             prop="ThrottleValve"
-                            :rules="[ { type: 'number', message: '必须为数字'}]">
-                <el-input v-model.number="formData.ThrottleValve" placeholder="请输入" style="width: 100%">
+                            >
+                <el-input type="number" step="0.01" v-model.number="formData.ThrottleValve" placeholder="请输入" style="width: 100%">
                   <template slot="append">mm</template>
                 </el-input>
               </el-form-item>
@@ -303,8 +292,8 @@
             <el-col :span="6">
               <el-form-item label="节阀后压力测点距基准面" label-width="180px"
                             prop="ThrottlePressure"
-                            :rules="[ { type: 'number', message: '必须为数字'}]">
-                <el-input v-model.number="formData.ThrottlePressure" placeholder="请输入" style="width: 100%">
+                            >
+                <el-input type="number" step="0.01" v-model.number="formData.ThrottlePressure" placeholder="请输入" style="width: 100%">
                   <template slot="append">mm</template>
                 </el-input>
               </el-form-item>
@@ -312,8 +301,8 @@
             <el-col :span="6">
               <el-form-item label="阀后壁厚"
                             prop="AfterValve"
-                            :rules="[ { type: 'number', message: '必须为数字'}]">
-                <el-input v-model.number="formData.AfterValve" placeholder="请输入" style="width: 100%">
+                            >
+                <el-input type="number" step="0.01" v-model.number="formData.AfterValve" placeholder="请输入" style="width: 100%">
                   <template slot="append">mm</template>
                 </el-input>
               </el-form-item>
@@ -337,114 +326,91 @@
             <span>测试数据</span>
           </div>
           <el-row :gutter="10">
-            <el-col :span="6">
+            <el-col :span="8">
               <el-form-item label="测试流量(m3/h)">
-                <el-input v-model="formData.TrafficTest1" style="width: 25%"
-                          @keyup.native="numberCheck('TrafficTest1')"></el-input>
-                <el-input v-model="formData.TrafficTest2" style="width: 25%"
-                          @keyup.native="numberCheck('TrafficTest2')"></el-input>
-                <el-input v-model="formData.TrafficTest3" style="width: 25%"
-                          @keyup.native="numberCheck('TrafficTest3')"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.TrafficTest1" style="width: 25%"
+                          @blur="getTrafficRecord"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.TrafficTest2" style="width: 25%" @blur="getTrafficRecord"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.TrafficTest3" style="width: 25%" @blur="getTrafficRecord"></el-input>
                 <el-tooltip content="均值或合计" placement="top" effect="dark">
-                  <el-input label="均值或合计" v-model="formData.TrafficRecord" placeholder="均值或合计" style="width: 25%"
+                  <el-input label="均值或合计" v-model.number="formData.TrafficRecord" placeholder="均值或合计" style="width: 25%"
                             readonly></el-input>
                 </el-tooltip>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="8">
               <el-form-item label="泵吸入表压(MPa)">
-                <el-input v-model="formData.PumpSuction1" style="width: 25%"
-                          @keyup.native="numberCheck('PumpSuction1')"></el-input>
-                <el-input v-model="formData.PumpSuction2" style="width: 25%"
-                          @keyup.native="numberCheck('PumpSuction2')"></el-input>
-                <el-input v-model="formData.PumpSuction3" style="width: 25%"
-                          @keyup.native="numberCheck('PumpSuction3')"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.PumpSuction1" style="width: 25%" @blur="getPumpSuctionRecord"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.PumpSuction2" style="width: 25%" @blur="getPumpSuctionRecord"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.PumpSuction3" style="width: 25%" @blur="getPumpSuctionRecord"></el-input>
                 <el-tooltip content="均值或合计" placement="top" effect="dark">
-                  <el-input label="均值或合计" v-model="formData.TrafficRecord" placeholder="均值或合计" style="width: 25%"
+                  <el-input label="均值或合计" v-model.number="formData.PumpSuctionRecord" placeholder="均值或合计" style="width: 25%"
                             readonly></el-input>
                 </el-tooltip>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="8">
               <el-form-item label="泵排出表压(MPa)">
-                <el-input v-model="formData.PumpDischarge1" style="width: 25%"
-                          @keyup.native="numberCheck('PumpDischarge1')"></el-input>
-                <el-input v-model="formData.PumpDischarge2" style="width: 25%"
-                          @keyup.native="numberCheck('PumpDischarge2')"></el-input>
-                <el-input v-model="formData.PumpDischarge3" style="width: 25%"
-                          @keyup.native="numberCheck('PumpDischarge3')"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.PumpDischarge1" style="width: 25%" @blur="getPumpDischargeRecord"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.PumpDischarge2" style="width: 25%" @blur="getPumpDischargeRecord"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.PumpDischarge3" style="width: 25%" @blur="getPumpDischargeRecord"></el-input>
                 <el-tooltip content="均值或合计" placement="top" effect="dark">
-                  <el-input label="均值或合计" v-model="formData.PumpDischargeRecord" placeholder="均值或合计" style="width: 25%"
+                  <el-input label="均值或合计" v-model.number="formData.PumpDischargeRecord" placeholder="均值或合计" style="width: 25%"
                             readonly></el-input>
                 </el-tooltip>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="8">
               <el-form-item label="节阀后表压(MPa)">
-                <el-input v-model="formData.ThrottlePressure1" style="width: 25%"
-                          @keyup.native="numberCheck('ThrottlePressure1')"></el-input>
-                <el-input v-model="formData.ThrottlePressure2" style="width: 25%"
-                          @keyup.native="numberCheck('ThrottlePressure2')"></el-input>
-                <el-input v-model="formData.ThrottlePressure3" style="width: 25%"
-                          @keyup.native="numberCheck('ThrottlePressure3')"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.ThrottlePressure1" style="width: 25%" @blur="getThrottleRecord"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.ThrottlePressure2" style="width: 25%" @blur="getThrottleRecord"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.ThrottlePressure3" style="width: 25%" @blur="getThrottleRecord"></el-input>
                 <el-tooltip content="均值或合计" placement="top" effect="dark">
-                  <el-input label="均值或合计" v-model="formData.ThrottlePressureRecord" placeholder="均值或合计"
+                  <el-input label="均值或合计" v-model.number="formData.ThrottleRecord" placeholder="均值或合计"
                             style="width: 25%" readonly></el-input>
                 </el-tooltip>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="8">
               <el-form-item label="测试电压(V)">
-                <el-input v-model="formData.TestVoltage1" style="width: 25%"
-                          @keyup.native="numberCheck('TestVoltage1')"></el-input>
-                <el-input v-model="formData.TestVoltage2" style="width: 25%"
-                          @keyup.native="numberCheck('TestVoltage2')"></el-input>
-                <el-input v-model="formData.TestVoltage3" style="width: 25%"
-                          @keyup.native="numberCheck('TestVoltage3')"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.TestVoltage1" style="width: 25%" @blur="getTestVolRecord"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.TestVoltage2" style="width: 25%" @blur="getTestVolRecord"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.TestVoltage3" style="width: 25%" @blur="getTestVolRecord"></el-input>
                 <el-tooltip content="均值或合计" placement="top" effect="dark">
-                  <el-input label="均值或合计" v-model="formData.TestVolRecord" placeholder="均值或合计" style="width: 25%"
+                  <el-input label="均值或合计" v-model.number="formData.TestVolRecord" placeholder="均值或合计" style="width: 25%"
                             readonly></el-input>
                 </el-tooltip>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="8">
               <el-form-item label="测试电流(A)">
-                <el-input v-model="formData.TestCurrent1" style="width: 25%"
-                          @keyup.native="numberCheck('TestCurrent1')"></el-input>
-                <el-input v-model="formData.TestCurrent2" style="width: 25%"
-                          @keyup.native="numberCheck('TestCurrent2')"></el-input>
-                <el-input v-model="formData.TestCurrent3" style="width: 25%"
-                          @keyup.native="numberCheck('TestCurrent3')"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.TestCurrent1" style="width: 25%" @blur="getTestCurrentRecord"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.TestCurrent2" style="width: 25%" @blur="getTestCurrentRecord"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.TestCurrent3" style="width: 25%" @blur="getTestCurrentRecord"></el-input>
                 <el-tooltip content="均值或合计" placement="top" effect="dark">
-                  <el-input label="均值或合计" v-model="formData.TestCurrentRecord" placeholder="均值或合计" style="width: 25%"
+                  <el-input label="均值或合计" v-model.number="formData.TestCurrentRecord" placeholder="均值或合计" style="width: 25%"
                             readonly></el-input>
                 </el-tooltip>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="8">
               <el-form-item label="电机输入功率(kW)">
-                <el-input v-model="formData.MotorPower1" style="width: 25%"
-                          @keyup.native="numberCheck('MotorPower1')"></el-input>
-                <el-input v-model="formData.MotorPower2" style="width: 25%"
-                          @keyup.native="numberCheck('MotorPower2')"></el-input>
-                <el-input v-model="formData.MotorPower3" style="width: 25%"
-                          @keyup.native="numberCheck('MotorPower3')"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.MotorPower1" style="width: 25%" @blur="getMotorPowerRecord"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.MotorPower2" style="width: 25%" @blur="getMotorPowerRecord"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.MotorPower3" style="width: 25%" @blur="getMotorPowerRecord"></el-input>
                 <el-tooltip content="均值或合计" placement="top" effect="dark">
-                  <el-input label="均值或合计" v-model="formData.MotorPowerRecord" placeholder="均值或合计" style="width: 25%"
+                  <el-input label="均值或合计" v-model.number="formData.MotorPowerRecord" placeholder="均值或合计" style="width: 25%"
                             readonly></el-input>
                 </el-tooltip>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="8">
               <el-form-item label="电机功率因数">
-                <el-input v-model="formData.MotorFactor1" style="width: 25%"
-                          @keyup.native="numberCheck('MotorFactor1')"></el-input>
-                <el-input v-model="formData.MotorFactor2" style="width: 25%"
-                          @keyup.native="numberCheck('MotorFactor2')"></el-input>
-                <el-input v-model="formData.MotorPower3" style="width: 25%"
-                          @keyup.native="numberCheck('MotorFactor3')"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.MotorFactor1" style="width: 25%" @blur="getMotorFactorRecord"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.MotorFactor2" style="width: 25%" @blur="getMotorFactorRecord"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.MotorFactor3" style="width: 25%" @blur="getMotorFactorRecord"></el-input>
                 <el-tooltip content="均值或合计" placement="top" effect="dark">
-                  <el-input label="均值或合计" v-model="formData.MotorFactorRecord" placeholder="均值或合计" style="width: 25%"
+                  <el-input label="均值或合计" v-model.number="formData.MotorFactorRecord" placeholder="均值或合计" style="width: 25%"
                             readonly></el-input>
                 </el-tooltip>
               </el-form-item>
@@ -472,6 +438,7 @@
   import {
     mapGetters
   } from 'vuex'
+  import api from '@/api/lims/reportliquidtransportation'
 
   export default {
     computed: {
@@ -482,6 +449,10 @@
     name: '',
     data () {
       return {
+        Id: '',
+        EId: '',
+        TaskBalanceId: '',
+        DataEntryId: '',
         formData: {
           Id: '',
           EId: '',
@@ -576,94 +547,100 @@
         }
       }
     },
+    created () {
+      // this.EId = this.$route.query.eid
+      // this.TaskBalanceId = this.$route.query.tbid
+      this.DataEntryId = 15// this.$route.query.deid
+      this.initData()
+    },
     methods: {
       saveEntity () {
         this.$refs['formData'].validate((valid) => {
           if (valid) {
-            alert('submit!')
+            this.formData.DataEntryId = parseInt(this.DataEntryId)
+            if (this.formData.Id > 0) {
+              this.updateEntity()
+            } else {
+              this.addEntity()
+            }
           } else {
             console.log('error submit!!')
             return false
           }
         })
       },
-      numberCheck (str) {
-        switch (str) {
-          case 'TrafficTest1':
-            this.formData.TrafficTest1 = this.formData.TrafficTest1.replace(/[^0-9.-]/g, '')
-            break
-          case 'TrafficTest2':
-            this.formData.TrafficTest2 = this.formData.TrafficTest2.replace(/[^0-9.-]/g, '')
-            break
-          case 'TrafficTest3':
-            this.formData.TrafficTest3 = this.formData.TrafficTest3.replace(/[^0-9.-]/g, '')
-            break
-          case 'PumpSuction1':
-            this.formData.PumpSuction1 = this.formData.PumpSuction1.replace(/[^0-9.-]/g, '')
-            break
-          case 'PumpSuction2':
-            this.formData.PumpSuction2 = this.formData.PumpSuction2.replace(/[^0-9.-]/g, '')
-            break
-          case 'PumpSuction3':
-            this.formData.PumpSuction3 = this.formData.PumpSuction3.replace(/[^0-9.-]/g, '')
-            break
-          case 'PumpDischarge1':
-            this.formData.PumpDischarge1 = this.formData.PumpDischarge1.replace(/[^0-9.-]/g, '')
-            break
-          case 'PumpDischarge2':
-            this.formData.PumpDischarge2 = this.formData.PumpDischarge2.replace(/[^0-9.-]/g, '')
-            break
-          case 'PumpDischarge3':
-            this.formData.PumpDischarge3 = this.formData.PumpDischarge3.replace(/[^0-9.-]/g, '')
-            break
-          case 'ThrottlePressure1':
-            this.formData.ThrottlePressure1 = this.formData.ThrottlePressure1.replace(/[^0-9.-]/g, '')
-            break
-          case 'ThrottlePressure2':
-            this.formData.ThrottlePressure2 = this.formData.ThrottlePressure2.replace(/[^0-9.-]/g, '')
-            break
-          case 'ThrottlePressure3':
-            this.formData.ThrottlePressure3 = this.formData.ThrottlePressure3.replace(/[^0-9.-]/g, '')
-            break
-          case 'TestVoltage1':
-            this.formData.TestVoltage1 = this.formData.TestVoltage1.replace(/[^0-9.-]/g, '')
-            break
-          case 'TestVoltage2':
-            this.formData.TestVoltage2 = this.formData.TestVoltage2.replace(/[^0-9.-]/g, '')
-            break
-          case 'TestVoltage3':
-            this.formData.TestVoltage3 = this.formData.TestVoltage3.replace(/[^0-9.-]/g, '')
-            break
-          case 'TestCurrent1':
-            this.formData.TestCurrent1 = this.formData.TestCurrent1.replace(/[^0-9.-]/g, '')
-            break
-          case 'TestCurrent2':
-            this.formData.TestCurrent2 = this.formData.TestCurrent2.replace(/[^0-9.-]/g, '')
-            break
-          case 'TestCurrent3':
-            this.formData.TestCurrent3 = this.formData.TestCurrent3.replace(/[^0-9.-]/g, '')
-            break
-          case 'MotorPower1':
-            this.formData.MotorPower1 = this.formData.MotorPower1.replace(/[^0-9.-]/g, '')
-            break
-          case 'MotorPower2':
-            this.formData.MotorPower2 = this.formData.MotorPower2.replace(/[^0-9.-]/g, '')
-            break
-          case 'MotorPower3':
-            this.formData.MotorPower3 = this.formData.MotorPower3.replace(/[^0-9.-]/g, '')
-            break
-          case 'MotorFactor1':
-            this.formData.MotorFactor1 = this.formData.MotorFactor1.replace(/[^0-9.-]/g, '')
-            break
-          case 'MotorFactor2':
-            this.formData.MotorFactor2 = this.formData.MotorFactor2.replace(/[^0-9.-]/g, '')
-            break
-          case 'MotorFactor3':
-            this.formData.MotorFactor3 = this.formData.MotorFactor3.replace(/[^0-9.-]/g, '')
-            break
-        }
-      }
+      addEntity () {
+        api.addEntity(this.formData, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            // 保存成功后，初始化数据，变成修改
+            this.formData.Id = res.data.item
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      updateEntity () {
+        api.updateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            this.initData()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      initData () {
+        api.getEntity(this.DataEntryId, this.$axios).then(res => { // this.formData.Id
+          if (res.data.code === 0) {
+            this.formData = res.data.item
+          } else {
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
 
+      getTrafficRecord () {
+        this.formData.TrafficRecord = (this.formData.TrafficTest1 + this.formData.TrafficTest2 + this.formData.TrafficTest3).toFixed(2)
+      },
+      getPumpSuctionRecord () {
+        this.formData.PumpSuctionRecord = (this.formData.PumpSuction1 + this.formData.PumpSuction2 + this.formData.PumpSuction3).toFixed(2)
+      },
+      getPumpDischargeRecord () {
+        this.formData.PumpDischargeRecord = (this.formData.PumpDischarge1 + this.formData.PumpDischarge2 + this.formData.PumpDischarge3).toFixed(2)
+      },
+      getThrottleRecord () {
+        this.formData.ThrottleRecord = (this.formData.ThrottlePressure1 + this.formData.ThrottlePressure2 + this.formData.ThrottlePressure3).toFixed(2)
+      },
+      getTestVolRecord () {
+        this.formData.TestVolRecord = (this.formData.TestCurrent1 + this.formData.TestCurrent2 + this.formData.TestCurrent3).toFixed(2)
+      },
+      getTestCurrentRecord () {
+        this.formData.TestCurrentRecord = (this.formData.TestCurrent1 + this.formData.TestCurrent2 + this.formData.TestCurrent3).toFixed(2)
+      },
+      getMotorFactorRecord () {
+        this.formData.MotorFactorRecord = (this.formData.MotorFactor1 + this.formData.MotorFactor2 + this.formData.MotorFactor3).toFixed(2)
+      },
+      getMotorPowerRecord () {
+        this.formData.MotorPowerRecord = (this.formData.MotorPower1 + this.formData.MotorPower2 + this.formData.MotorPower3).toFixed(2)
+      }
     }
   }
 </script>
@@ -672,19 +649,4 @@
   .clearfix {
     font-size: 18px;
   }
-
-  .ce-row {
-    text-align: center;
-    height: 38px;
-    margin-bottom: 1px;
-    background-color: #FFFFFF;
-  }
-
-  .ce-col {
-    margin-top: 7px;
-  }
-
-  .col-input {
-    margin-top: 4px;
-  }
 </style>