jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/domain/DaCollectionParamConf.java
@@ -102,7 +102,115 @@ /** 预留字段4 */ private String spareField4; public void setId(Long id) /** 工序名称 */ @Excel(name = "工序名称") private String processesName; /** 设备 */ @Excel(name = "设备") private String device; /** 项目 */ @Excel(name = "项目") private String project; /** 精度 */ @Excel(name = "精度") private Long accuracy; /** 数组长度 */ @Excel(name = "数组长度") private Long arrayLength; /** 采集频率 */ @Excel(name = "采集频率") private String acquisitionFrequency; /** 业务需求部门 */ @Excel(name = "业务需求部门") private String demandDepartment; /** 是否采集 */ @Excel(name = "是否采集") private String whetherToCollect; /** 默认值 */ @Excel(name = "默认值") private String defaultValue; public String getProcessesName() { return processesName; } public void setProcessesName(String processesName) { this.processesName = processesName; } public String getDevice() { return device; } public void setDevice(String device) { this.device = device; } public String getProject() { return project; } public void setProject(String project) { this.project = project; } public Long getAccuracy() { return accuracy; } public void setAccuracy(Long accuracy) { this.accuracy = accuracy; } public Long getArrayLength() { return arrayLength; } public void setArrayLength(Long arrayLength) { this.arrayLength = arrayLength; } public String getAcquisitionFrequency() { return acquisitionFrequency; } public void setAcquisitionFrequency(String acquisitionFrequency) { this.acquisitionFrequency = acquisitionFrequency; } public String getDemandDepartment() { return demandDepartment; } public void setDemandDepartment(String demandDepartment) { this.demandDepartment = demandDepartment; } public String getWhetherToCollect() { return whetherToCollect; } public void setWhetherToCollect(String whetherToCollect) { this.whetherToCollect = whetherToCollect; } public String getDefaultValue() { return defaultValue; } public void setDefaultValue(String defaultValue) { this.defaultValue = defaultValue; } public void setId(Long id) { this.id = id; } jcdm-main/src/main/resources/mapper/da/collectionParamConf/DaCollectionParamConfMapper.xml
@@ -30,10 +30,19 @@ <result property="spareField2" column="spare_field_2" /> <result property="spareField3" column="spare_field_3" /> <result property="spareField4" column="spare_field_4" /> <result property="processesName" column="processes_name" /> <result property="device" column="device" /> <result property="project" column="project" /> <result property="accuracy" column="accuracy" /> <result property="arrayLength" column="array_length" /> <result property="acquisitionFrequency" column="acquisition_frequency" /> <result property="demandDepartment" column="demand_department" /> <result property="whetherToCollect" column="whether_to_collect" /> <result property="defaultValue" column="default_value" /> </resultMap> <sql id="selectDaCollectionParamConfVo"> select id, processes_code, parameter_set_code, parameter_set_name, collect_parameter_id, collect_parameter_name, contrast_parameter_flag, collect_parameter_type, collect_parameter_unit, Descriptives, param_upper, param_lower, param_Central, product_code, gather_address, gather_sequence, remarks, create_user, create_time, update_user, update_time, spare_field_1, spare_field_2, spare_field_3, spare_field_4 from da_collection_param_conf select id, processes_code, parameter_set_code, parameter_set_name, collect_parameter_id, collect_parameter_name, contrast_parameter_flag, collect_parameter_type, collect_parameter_unit, Descriptives, param_upper, param_lower, param_Central, product_code, gather_address, gather_sequence, remarks, create_user, create_time, update_user, update_time, spare_field_1, spare_field_2, spare_field_3, spare_field_4, processes_name, device, project, accuracy, array_length, acquisition_frequency, demand_department, whether_to_collect, default_value from da_collection_param_conf </sql> <select id="selectDaCollectionParamConfList" parameterType="DaCollectionParamConf" resultMap="DaCollectionParamConfResult"> @@ -83,6 +92,15 @@ <if test="spareField2 != null">spare_field_2,</if> <if test="spareField3 != null">spare_field_3,</if> <if test="spareField4 != null">spare_field_4,</if> <if test="processesName != null">processes_name,</if> <if test="device != null">device,</if> <if test="project != null">project,</if> <if test="accuracy != null">accuracy,</if> <if test="arrayLength != null">array_length,</if> <if test="acquisitionFrequency != null">acquisition_frequency,</if> <if test="demandDepartment != null">demand_department,</if> <if test="whetherToCollect != null">whether_to_collect,</if> <if test="defaultValue != null">default_value,</if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="id != null">#{id},</if> @@ -110,6 +128,15 @@ <if test="spareField2 != null">#{spareField2},</if> <if test="spareField3 != null">#{spareField3},</if> <if test="spareField4 != null">#{spareField4},</if> <if test="processesName != null">#{processesName},</if> <if test="device != null">#{device},</if> <if test="project != null">#{project},</if> <if test="accuracy != null">#{accuracy},</if> <if test="arrayLength != null">#{arrayLength},</if> <if test="acquisitionFrequency != null">#{acquisitionFrequency},</if> <if test="demandDepartment != null">#{demandDepartment},</if> <if test="whetherToCollect != null">#{whetherToCollect},</if> <if test="defaultValue != null">#{defaultValue},</if> </trim> </insert> @@ -140,6 +167,15 @@ <if test="spareField2 != null">spare_field_2 = #{spareField2},</if> <if test="spareField3 != null">spare_field_3 = #{spareField3},</if> <if test="spareField4 != null">spare_field_4 = #{spareField4},</if> <if test="processesName != null">processes_name = #{processesName},</if> <if test="device != null">device = #{device},</if> <if test="project != null">project = #{project},</if> <if test="accuracy != null">accuracy = #{accuracy},</if> <if test="arrayLength != null">array_length = #{arrayLength},</if> <if test="acquisitionFrequency != null">acquisition_frequency = #{acquisitionFrequency},</if> <if test="demandDepartment != null">demand_department = #{demandDepartment},</if> <if test="whetherToCollect != null">whether_to_collect = #{whetherToCollect},</if> <if test="defaultValue != null">default_value = #{defaultValue},</if> </trim> where id = #{id} </update> jcdm-ui/src/views/main/da/collectionParamConf/index.vue
@@ -129,13 +129,13 @@ </el-table-column> <el-table-column label="工序编号" align="center" width="80" prop="processesCode"> </el-table-column> <el-table-column label="参数集编码" align="center" width="130" prop="parameterSetCode"> <!-- <el-table-column label="参数集编码" align="center" width="130" prop="parameterSetCode">--> <!-- </el-table-column>--> <!-- <el-table-column label="参数集名称" align="center" width="160" prop="parameterSetName">--> <!-- </el-table-column>--> <el-table-column label="参数编码" align="center" width="200" prop="collectParameterId"> </el-table-column> <el-table-column label="参数集名称" align="center" width="160" prop="parameterSetName"> </el-table-column> <el-table-column label="参数编码" align="center" width="130" prop="collectParameterId"> </el-table-column> <el-table-column label="参数名称" align="center" width="160" prop="collectParameterName"> <el-table-column label="参数名称" align="center" width="200" prop="collectParameterName"> </el-table-column> <!-- <el-table-column label="是否作为对比参数" align="center" prop="contrastParameterFlag">--> <!-- </el-table-column>--> @@ -157,8 +157,23 @@ </el-table-column> <el-table-column label="中心值" align="center" prop="paramCentral"> </el-table-column> <el-table-column label="备注" align="center" width="160" prop="remarks"> <el-table-column label="工序名称" width="150" align="center" prop="processesName"> </el-table-column> <el-table-column label="设备" width="150" align="center" prop="device"> </el-table-column> <el-table-column label="项目" align="center" prop="project"> </el-table-column> <el-table-column label="精度" align="center" prop="accuracy"> </el-table-column> <el-table-column label="数组长度" align="center" prop="arrayLength"> </el-table-column> <el-table-column label="采集频率" width="107" align="center" prop="acquisitionFrequency"> </el-table-column> <el-table-column label="业务需求部门" width="155" align="center" prop="demandDepartment"> </el-table-column> <el-table-column label="是否采集" align="center" prop="whetherToCollect"> </el-table-column> <el-table-column label="备注" :show-overflow-tooltip='true' align="center" width="160" prop="remarks"> </el-table-column> <el-table-column label="创建用户" align="center" prop="createUser"> </el-table-column> @@ -259,6 +274,33 @@ </el-form-item> <el-form-item label="采集顺序" prop="gatherSequence"> <el-input v-model="form.gatherSequence" placeholder="请输入采集顺序" /> </el-form-item> <el-form-item label="工序名称" prop="processesName"> <el-input v-model="form.processesName" placeholder="请输入工序名称" /> </el-form-item> <el-form-item label="设备" prop="device"> <el-input v-model="form.device" placeholder="请输入设备" /> </el-form-item> <el-form-item label="项目" prop="project"> <el-input v-model="form.project" placeholder="请输入项目" /> </el-form-item> <el-form-item label="精度" prop="accuracy"> <el-input v-model="form.accuracy" placeholder="请输入精度" /> </el-form-item> <el-form-item label="数组长度" prop="arrayLength"> <el-input v-model="form.arrayLength" placeholder="请输入数组长度" /> </el-form-item> <el-form-item label="采集频率" prop="acquisitionFrequency"> <el-input v-model="form.acquisitionFrequency" placeholder="请输入采集频率" /> </el-form-item> <el-form-item label="业务需求部门" prop="demandDepartment"> <el-input v-model="form.demandDepartment" placeholder="请输入业务需求部门" /> </el-form-item> <el-form-item label="是否采集" prop="whetherToCollect"> <el-input v-model="form.whetherToCollect" placeholder="请输入是否采集" /> </el-form-item> <el-form-item label="默认值" prop="defaultValue"> <el-input v-model="form.defaultValue" placeholder="请输入默认值" /> </el-form-item> <el-form-item label="备注" prop="remarks"> <el-input v-model="form.remarks" placeholder="请输入备注" /> @@ -366,7 +408,16 @@ spareField1: null, spareField2: null, spareField3: null, spareField4: null spareField4: null, processesName: null, device: null, project: null, accuracy: null, arrayLength: null, acquisitionFrequency: null, demandDepartment: null, whetherToCollect: null, defaultValue: null }; this.resetForm("form"); },
