Yangwl
/
xy_tyrems
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

页面调整

Browse Source
master
杨万里 2 years ago
parent 8b3941f856
commit 9f7654d29d
11 changed files with 124 additions and 258 deletions
Show Stats Download Patch File Download Diff File

12
ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/controller/BaseCarController.java
Unescape Escape View File

@ -132,11 +132,17 @@ public class BaseCarController extends BaseController
return ajaxResult;
}
@GetMapping("/getDeviceList")
public TableDataInfo getDeviceList(String deviceId){
/**
* 设备列表
* @param baseCar
* @return
*/
@PostMapping("/getDeviceList")
public TableDataInfo getDeviceList(@RequestBody BaseCar baseCar){
BaseDevice baseDevice = new BaseDevice();
baseDevice.setState((long) 0);
baseDevice.setInternetThingsNo(deviceId);
baseDevice.setInternetThingsNo(baseCar.getDeviceId());
List<BaseDevice> baseDeviceList = baseDeviceService.selectBaseDeviceList(baseDevice);
return getDataTable(baseDeviceList);
}

49
ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/controller/BaseTyreController.java
Unescape Escape View File

@ -2,9 +2,6 @@ package com.ruoyi.basetyre.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -25,24 +22,22 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 轮胎基础信息Controller
* 轮胎Controller
*
* @author Yangwl
* @date 2023-02-06
* @date 2023-02-15
*/
@Api("用户信息管理")
@RestController
@RequestMapping("/basetyre/basetyre")
@RequestMapping("/basetyre/tyre")
public class BaseTyreController extends BaseController
{
@Autowired
private IBaseTyreService baseTyreService;
/**
* 查询轮胎基础信息列表
* 查询轮胎列表
*/
@ApiOperation("获取轮胎基础数据列表")
@PreAuthorize("@ss.hasPermi('basetyre:basetyre:list')")
@PreAuthorize("@ss.hasPermi('basetyre:tyre:list')")
@GetMapping("/list")
public TableDataInfo list(BaseTyre baseTyre)
{
@ -52,22 +47,22 @@ public class BaseTyreController extends BaseController
}
/**
* 导出轮胎基础信息列表
* 导出轮胎列表
*/
@PreAuthorize("@ss.hasPermi('basetyre:basetyre:export')")
@Log(title = "轮胎基础信息", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('basetyre:tyre:export')")
@Log(title = "轮胎", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, BaseTyre baseTyre)
{
List<BaseTyre> list = baseTyreService.selectBaseTyreList(baseTyre);
ExcelUtil<BaseTyre> util = new ExcelUtil<BaseTyre>(BaseTyre.class);
util.exportExcel(response, list, "轮胎基础信息数据");
util.exportExcel(response, list, "轮胎数据");
}
/**
* 获取轮胎基础信息详细信息
* 获取轮胎详细信息
*/
@PreAuthorize("@ss.hasPermi('basetyre:basetyre:query')")
@PreAuthorize("@ss.hasPermi('basetyre:tyre:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id)
{
@ -75,10 +70,10 @@ public class BaseTyreController extends BaseController
}
/**
* 新增轮胎基础信息
* 新增轮胎
*/
@PreAuthorize("@ss.hasPermi('basetyre:basetyre:add')")
@Log(title = "轮胎基础信息", businessType = BusinessType.INSERT)
@PreAuthorize("@ss.hasPermi('basetyre:tyre:add')")
@Log(title = "轮胎", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody BaseTyre baseTyre)
{
@ -86,10 +81,10 @@ public class BaseTyreController extends BaseController
}
/**
* 修改轮胎基础信息
* 修改轮胎
*/
@PreAuthorize("@ss.hasPermi('basetyre:basetyre:edit')")
@Log(title = "轮胎基础信息", businessType = BusinessType.UPDATE)
@PreAuthorize("@ss.hasPermi('basetyre:tyre:edit')")
@Log(title = "轮胎", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody BaseTyre baseTyre)
{
@ -97,17 +92,13 @@ public class BaseTyreController extends BaseController
}
/**
* 删除轮胎基础信息
* 删除轮胎
*/
@PreAuthorize("@ss.hasPermi('basetyre:basetyre:remove')")
@Log(title = "轮胎基础信息", businessType = BusinessType.DELETE)
@PreAuthorize("@ss.hasPermi('basetyre:tyre:remove')")
@Log(title = "轮胎", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids)
{
return toAjax(baseTyreService.deleteBaseTyreByIds(ids));
}
public static void main(String[] args) {
System.out.println();
}
}

20
ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/domain/BaseTyre.java
Unescape Escape View File

@ -8,10 +8,10 @@ import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 轮胎基础信息对象 base_tyre
* 轮胎对象 base_tyre
*
* @author Yangwl
* @date 2023-02-06
* @date 2023-02-15
*/
public class BaseTyre extends BaseEntity
{
@ -52,9 +52,9 @@ public class BaseTyre extends BaseEntity
@Excel(name = "品牌ID")
private String tureBrandId;
/** RFID */
@Excel(name = "RFID")
private String tyreRfid;
/** 花纹 */
@Excel(name = "花纹")
private String tyrePattern;
/** 轮位（拼四段式1-1-1-21）第一轴左侧外，总第21个胎 */
@Excel(name = "轮位", readConverterExp = "拼=四段式1-1-1-21")
@ -182,14 +182,14 @@ public class BaseTyre extends BaseEntity
{
return tureBrandId;
}
public void setTyreRfid(String tyreRfid)
public void setTyrePattern(String tyrePattern)
{
this.tyreRfid = tyreRfid;
this.tyrePattern = tyrePattern;
}
public String getTyreRfid()
public String getTyrePattern()
{
return tyreRfid;
return tyrePattern;
}
public void setTyrePosition(String tyrePosition)
{
@ -303,7 +303,7 @@ public class BaseTyre extends BaseEntity
.append("tureModel", getTureModel())
.append("tureModelId", getTureModelId())
.append("tureBrandId", getTureBrandId())
.append("tyreRfid", getTyreRfid())
.append("tyrePattern ", getTyrePattern())
.append("tyrePosition", getTyrePosition())
.append("sensorId", getSensorId())
.append("currentTextureDepth", getCurrentTextureDepth())

32
ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/service/IBaseTyreService.java
Unescape Escape View File

@ -4,57 +4,57 @@ import java.util.List;
import com.ruoyi.basetyre.domain.BaseTyre;
/**
* 轮胎基础信息Service接口
* 轮胎Service接口
*
* @author Yangwl
* @date 2023-02-06
* @date 2023-02-15
*/
public interface IBaseTyreService
{
/**
* 查询轮胎基础信息
* 查询轮胎
*
* @param id 轮胎基础信息主键
* @return 轮胎基础信息
* @param id 轮胎主键
* @return 轮胎
*/
public BaseTyre selectBaseTyreById(String id);
/**
* 查询轮胎基础信息列表
* 查询轮胎列表
*
* @param baseTyre 轮胎基础信息
* @return 轮胎基础信息集合
* @param baseTyre 轮胎
* @return 轮胎集合
*/
public List<BaseTyre> selectBaseTyreList(BaseTyre baseTyre);
/**
* 新增轮胎基础信息
* 新增轮胎
*
* @param baseTyre 轮胎基础信息
* @param baseTyre 轮胎
* @return 结果
*/
public int insertBaseTyre(BaseTyre baseTyre);
/**
* 修改轮胎基础信息
* 修改轮胎
*
* @param baseTyre 轮胎基础信息
* @param baseTyre 轮胎
* @return 结果
*/
public int updateBaseTyre(BaseTyre baseTyre);
/**
* 批量删除轮胎基础信息
* 批量删除轮胎
*
* @param ids 需要删除的轮胎基础信息主键集合
* @param ids 需要删除的轮胎主键集合
* @return 结果
*/
public int deleteBaseTyreByIds(String[] ids);
/**
* 删除轮胎基础信息信息
* 删除轮胎信息
*
* @param id 轮胎基础信息主键
* @param id 轮胎主键
* @return 结果
*/
public int deleteBaseTyreById(String id);

2
ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/service/impl/BaseDeviceServiceImpl.java
Unescape Escape View File

@ -62,8 +62,6 @@ public class BaseDeviceServiceImpl implements IBaseDeviceService
LoginUser loginUser= SecurityUtils.getLoginUser();
baseDevice.setCreateBy(loginUser.getUserId().toString());
baseDevice.setCreateName(loginUser.getUsername());
baseDevice.setModifyBy(loginUser.getUserId().toString());
baseDevice.setModifyTime(DateUtils.getNowDate());
return baseDeviceMapper.insertBaseDevice(baseDevice);
}

39
ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/service/impl/BaseTyreServiceImpl.java
Unescape Escape View File

@ -1,7 +1,11 @@
package com.ruoyi.basetyre.service.impl;
import java.util.List;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.basetyre.mapper.BaseTyreMapper;
@ -9,10 +13,10 @@ import com.ruoyi.basetyre.domain.BaseTyre;
import com.ruoyi.basetyre.service.IBaseTyreService;
/**
* 轮胎基础信息Service业务层处理
* 轮胎Service业务层处理
*
* @author Yangwl
* @date 2023-02-06
* @date 2023-02-15
*/
@Service
public class BaseTyreServiceImpl implements IBaseTyreService
@ -21,10 +25,10 @@ public class BaseTyreServiceImpl implements IBaseTyreService
private BaseTyreMapper baseTyreMapper;
/**
* 查询轮胎基础信息
* 查询轮胎
*
* @param id 轮胎基础信息主键
* @return 轮胎基础信息
* @param id 轮胎主键
* @return 轮胎
*/
@Override
public BaseTyre selectBaseTyreById(String id)
@ -33,10 +37,10 @@ public class BaseTyreServiceImpl implements IBaseTyreService
}
/**
* 查询轮胎基础信息列表
* 查询轮胎列表
*
* @param baseTyre 轮胎基础信息
* @return 轮胎基础信息
* @param baseTyre 轮胎
* @return 轮胎
*/
@Override
public List<BaseTyre> selectBaseTyreList(BaseTyre baseTyre)
@ -45,22 +49,25 @@ public class BaseTyreServiceImpl implements IBaseTyreService
}
/**
* 新增轮胎基础信息
* 新增轮胎
*
* @param baseTyre 轮胎基础信息
* @param baseTyre 轮胎
* @return 结果
*/
@Override
public int insertBaseTyre(BaseTyre baseTyre)
{
baseTyre.setCreateTime(DateUtils.getNowDate());
LoginUser loginUser= SecurityUtils.getLoginUser();
baseTyre.setCreateBy(loginUser.getUserId().toString());
baseTyre.setCreateName(loginUser.getUsername());
return baseTyreMapper.insertBaseTyre(baseTyre);
}
/**
* 修改轮胎基础信息
* 修改轮胎
*
* @param baseTyre 轮胎基础信息
* @param baseTyre 轮胎
* @return 结果
*/
@Override
@ -70,9 +77,9 @@ public class BaseTyreServiceImpl implements IBaseTyreService
}
/**
* 批量删除轮胎基础信息
* 批量删除轮胎
*
* @param ids 需要删除的轮胎基础信息主键
* @param ids 需要删除的轮胎主键
* @return 结果
*/
@Override
@ -82,9 +89,9 @@ public class BaseTyreServiceImpl implements IBaseTyreService
}
/**
* 删除轮胎基础信息信息
* 删除轮胎信息
*
* @param id 轮胎基础信息主键
* @param id 轮胎主键
* @return 结果
*/
@Override

15
ruoyi-basetyre/src/main/resources/mapper/basetyre/BaseCarMapper.xml
Unescape Escape View File

@ -192,10 +192,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
delete from base_car where id = #{id}
</delete>
<delete id="deleteBaseCarByIds" parameterType="String">
delete from base_car where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<!-- <delete id="deleteBaseCarByIds" parameterType="String">-->
<!-- delete from base_car where id in -->
<!-- <foreach item="id" collection="array" open="(" separator="," close=")">-->
<!-- #{id}-->
<!-- </foreach>-->
<!-- </delete>-->
<update id="deleteBaseCarByIds" parameterType="String">
</update>
</mapper>

14
ruoyi-basetyre/src/main/resources/mapper/basetyre/BaseTyreMapper.xml
Unescape Escape View File

@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="tureModel" column="ture_model" />
<result property="tureModelId" column="ture_model_id" />
<result property="tureBrandId" column="ture_brand_id" />
<result property="tyreRfid" column="tyre_rfid" />
<result property="tyrePattern" column="tyre_pattern" />
<result property="tyrePosition" column="tyre_position" />
<result property="sensorId" column="sensor_id" />
<result property="currentTextureDepth" column="current_texture_depth" />
@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectBaseTyreVo">
select id, tyre_fac_code, company_code, car_id, car_license, ture_code, ture_model, ture_model_id, ture_brand_id, tyre_rfid, tyre_position, sensor_id, current_texture_depth, state, is_delete, create_time, create_id, create_by, create_name, modify_time, modify_id, modify_by, modify__name from base_tyre
select id, tyre_fac_code, company_code, car_id, car_license, ture_code, ture_model, ture_model_id, ture_brand_id, tyre_pattern, tyre_position, sensor_id, current_texture_depth, state, is_delete, create_time, create_id, create_by, create_name, modify_time, modify_id, modify_by, modify__name from base_tyre
</sql>
<select id="selectBaseTyreList" parameterType="BaseTyre" resultMap="BaseTyreResult">
@ -41,11 +41,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="companyCode != null and companyCode != ''"> and company_code = #{companyCode}</if>
<if test="carId != null and carId != ''"> and car_id = #{carId}</if>
<if test="carLicense != null and carLicense != ''"> and car_license = #{carLicense}</if>
<if test="tureCode != null and tureCode != ''"> and ture_code like concat('%', #{tureCode}, '%')</if>
<if test="tureCode != null and tureCode != ''"> and ture_code = #{tureCode}</if>
<if test="tureModel != null and tureModel != ''"> and ture_model = #{tureModel}</if>
<if test="tureModelId != null and tureModelId != ''"> and ture_model_id = #{tureModelId}</if>
<if test="tureBrandId != null and tureBrandId != ''"> and ture_brand_id = #{tureBrandId}</if>
<if test="tyreRfid != null and tyreRfid != ''"> and tyre_rfid = #{tyreRfid}</if>
<if test="tyrePattern != null and tyrePattern != ''"> and tyre_pattern = #{tyrePattern}</if>
<if test="tyrePosition != null and tyrePosition != ''"> and tyre_position = #{tyrePosition}</if>
<if test="sensorId != null and sensorId != ''"> and sensor_id = #{sensorId}</if>
<if test="currentTextureDepth != null "> and current_texture_depth = #{currentTextureDepth}</if>
@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="tureModel != null">ture_model,</if>
<if test="tureModelId != null">ture_model_id,</if>
<if test="tureBrandId != null">ture_brand_id,</if>
<if test="tyreRfid != null">tyre_rfid,</if>
<if test="tyrePattern != null">tyre_pattern,</if>
<if test="tyrePosition != null">tyre_position,</if>
<if test="sensorId != null">sensor_id,</if>
<if test="currentTextureDepth != null">current_texture_depth,</if>
@ -102,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="tureModel != null">#{tureModel},</if>
<if test="tureModelId != null">#{tureModelId},</if>
<if test="tureBrandId != null">#{tureBrandId},</if>
<if test="tyreRfid != null">#{tyreRfid},</if>
<if test="tyrePattern != null">#{tyrePattern},</if>
<if test="tyrePosition != null">#{tyrePosition},</if>
<if test="sensorId != null">#{sensorId},</if>
<if test="currentTextureDepth != null">#{currentTextureDepth},</if>
@ -130,7 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="tureModel != null">ture_model = #{tureModel},</if>
<if test="tureModelId != null">ture_model_id = #{tureModelId},</if>
<if test="tureBrandId != null">ture_brand_id = #{tureBrandId},</if>
<if test="tyreRfid != null">tyre_rfid = #{tyreRfid},</if>
<if test="tyrePattern!= null">tyre_pattern = #{tyrePattern},</if>
<if test="tyrePosition != null">tyre_position = #{tyrePosition},</if>
<if test="sensorId != null">sensor_id = #{sensorId},</if>
<if test="currentTextureDepth != null">current_texture_depth = #{currentTextureDepth},</if>

2
ruoyi-ui/src/api/basetyre/basetyre.js
Unescape Escape View File

@ -3,7 +3,7 @@ import request from '@/utils/request'
// 查询轮胎基础信息列表
export function listBasetyre(query) {
return request({
url: '/basetyre/basetyre/list',
url: '/basetyre/tyre/list',
method: 'get',
params: query
})

2
ruoyi-ui/src/views/basecar/car/index.vue
Unescape Escape View File

@ -301,7 +301,7 @@ const bindHandleSelectionChange = (selection) => {
// 搜索接收器
const bindSearch = () => {
let params = {id: bindInput.value}
let params = {deviceId: bindInput.value}
getBindList(params).then(response => {
bindList.value = response.rows;
})

195
ruoyi-ui/src/views/tireManagement/info/index.vue
Unescape Escape View File

@ -67,118 +67,6 @@
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<!-- <el-form-item :label="t('tireManagement.tireFactoryCode')" prop="tyreFacCode">-->
<!-- <el-input-->
<!-- v-model="queryParams.tyreFacCode"-->
<!-- :placeholder=" t('common.pleaseEnter') + t('tireManagement.tireFactoryCode')"-->
<!-- style="width: 200px"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="t('tireManagement.enterpriseCode')" prop="companyCode">-->
<!-- <el-input-->
<!-- v-model="queryParams.companyCode"-->
<!-- :placeholder="t('common.pleaseEnter') + t('tireManagement.enterpriseCode')"-->
<!-- style="width: 200px"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="t('tireManagement.plateNumber')" prop="carLicense">-->
<!-- <el-input-->
<!-- v-model="queryParams.carLicense"-->
<!-- :placeholder="t('common.pleaseEnter') + t('tireManagement.plateNumber')"-->
<!-- style="width: 200px"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="RFID" prop="tyreRfid">-->
<!-- <el-input-->
<!-- v-model="queryParams.tyreRfid"-->
<!-- :placeholder="t('common.pleaseEnter') +'RFID'"-->
<!-- style="width: 200px"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="t('tireManagement.wheelPosition')" prop="tyrePosition">-->
<!-- <el-input-->
<!-- v-model="queryParams.tyrePosition"-->
<!-- :placeholder="t('common.pleaseEnter') + t('tireManagement.wheelPosition')"-->
<!-- style="width: 200px"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="t('tireManagement.treadDepth')" prop="currentTextureDepth">-->
<!-- <el-input-->
<!-- v-model="queryParams.currentTextureDepth"-->
<!-- :placeholder="t('common.pleaseEnter') + t('tireManagement.treadDepth')"-->
<!-- style="width: 200px"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="t('common.state')" prop="state">-->
<!-- <el-input-->
<!-- v-model="queryParams.state"-->
<!-- :placeholder="t('common.pleaseEnter') + t('common.state')"-->
<!-- style="width: 200px"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="t('common.isRemove')" prop="isDelete">-->
<!-- <el-input-->
<!-- v-model="queryParams.isDelete"-->
<!-- :placeholder="t('common.pleaseEnter') + t('common.isRemove')"-->
<!-- style="width: 200px"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="t('common.creatorName')" prop="createName">-->
<!-- <el-input-->
<!-- v-model="queryParams.createName"-->
<!-- :placeholder="t('common.pleaseEnter') + t('common.creatorName')"-->
<!-- style="width: 200px"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="t('common.editTime')" prop="modifyTime">-->
<!-- <el-date-picker-->
<!-- clearable-->
<!-- style="width: 200px"-->
<!-- v-model="queryParams.modifyTime"-->
<!-- type="date"-->
<!-- format="YYYY/MM/DD"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- :placeholder="t('common.PleaseSelect') + t('common.editTime')"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="t('common.editAccount')" prop="modifyBy">-->
<!-- <el-input-->
<!-- v-model="queryParams.modifyBy"-->
<!-- :placeholder="t('common.pleaseEnter') + t('common.editAccount')"-->
<!-- style="width: 200px"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="t('common.editName')" prop="modifyName">-->
<!-- <el-input-->
<!-- v-model="queryParams.modifyName"-->
<!-- :placeholder="t('common.pleaseEnter') + t('common.editName')"-->
<!-- style="width: 200px"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label=" ">
<el-button type="primary" icon="Search" @click="handleQuery">{{ t('option.search') }}</el-button>
<el-button icon="Refresh" @click="resetQuery">{{ t('option.reset') }}</el-button>
@ -237,7 +125,8 @@
<el-table-column type="selection" width="55" align="center" fixed/>
<!-- <el-table-column :label="t('tireManagement.tireFactoryCode')" align="center" prop="tyreFacCode" width="150"/>-->
<!-- <el-table-column :label="t('tireManagement.enterpriseCode')" align="center" prop="companyCode" width="150"/>-->
<el-table-column :label="t('tireManagement.tireNo')" align="center" prop="tureCode" width="150"/>
<el-table-column label="外胎号" align="center" prop="tureCode" width="150"/>
<el-table-column label="条码号" align="center" prop="tureCode" width="150"/>
<el-table-column label="品牌" align="center" prop="tureBrandId" width="150"/>
<el-table-column label="规格型号" align="center" prop="tureModel" width="150"/>
<el-table-column label="花纹" align="center" prop="tureModel" width="150"/>
@ -250,9 +139,9 @@
<!-- <el-table-column label="RFID" align="center" prop="tyreRfid" width="150"/>-->
<el-table-column label="安装轮位" align="center" prop="tyrePosition" width="150"/>
<el-table-column label="传感器编号" align="center" prop="sensorId" width="150"/>
<el-table-column label="最新花纹深度" align="center" prop="currentTextureDepth" width="150"/>
<el-table-column label="创建时间" align="center" prop="createName" width="150"/>
<el-table-column label="创建者" align="center" prop="createName" width="150"/>
<el-table-column label="最新花纹深度(mm)" align="center" prop="currentTextureDepth" width="170"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="170"/>
<el-table-column label="创建者" align="center" prop="createName" width="170"/>
<!-- <el-table-column :label="t('common.state')" align="center" prop="state" width="150"/>-->
<!-- <el-table-column :label="t('common.isRemove')" align="center" prop="isDelete" width="150"/>-->
<!-- <el-table-column :label="t('common.creatorId')" align="center" prop="createId" width="150"/>-->
@ -301,59 +190,33 @@
<el-form-item prop="id" v-if="false">
<el-input v-model="form.id"/>
</el-form-item>
<el-form-item :label="t('tireManagement.tireFactoryCode')" prop="tyreFacCode">
<el-input v-model="form.tyreFacCode"
:placeholder=" t('common.pleaseEnter') + t('tireManagement.tireFactoryCode')"/>
</el-form-item>
<el-form-item :label="t('tireManagement.enterpriseCode')" prop="companyCode">
<el-input v-model="form.companyCode"
:placeholder="t('common.pleaseEnter') + t('tireManagement.enterpriseCode')"/>
</el-form-item>
<el-form-item :label="t('tireManagement.plateNumber')" prop="carLicense">
<el-input v-model="form.carLicense" :placeholder="t('common.pleaseEnter') + t('tireManagement.plateNumber')"/>
</el-form-item>
<el-form-item :label="t('tireManagement.tireNo')" prop="tureCode">
<el-input v-model="form.tureCode" :placeholder="t('common.pleaseEnter') + t('tireManagement.tireNo')"/>
</el-form-item>
<el-form-item label="RFID" prop="tyreRfid">
<el-input v-model="form.tyreRfid" :placeholder="t('common.pleaseEnter') +'RFID'"/>
</el-form-item>
<el-form-item :label="t('tireManagement.wheelPosition')" prop="tyrePosition">
<el-input v-model="form.tyrePosition"
:placeholder="t('common.pleaseEnter') + t('tireManagement.wheelPosition')"/>
<el-input v-model="form.tureCode" :placeholder="t('common.pleaseEnter') + t('tireManagement.tireNo')" />
</el-form-item>
<el-form-item label="品牌" prop="tureCode">
<el-input v-model="form.tureCode" />
</el-form-item>
<el-form-item label="花纹" prop="tureCode">
<el-input v-model="form.tureCode" />
</el-form-item>
<el-form-item label="规格型号" prop="tureCode">
<el-input v-model="form.tureCode" />
</el-form-item>
<el-form-item :label="t('tireManagement.tireSensorID')" prop="sensorId">
<el-input v-model="form.sensorId" :placeholder="t('common.pleaseEnter') + t('tireManagement.tireSensorID')"/>
</el-form-item>
<el-form-item :label="t('tireManagement.treadDepth')" prop="currentTextureDepth">
<el-input v-model="form.currentTextureDepth"
:placeholder="t('common.pleaseEnter') + t('tireManagement.treadDepth')"/>
</el-form-item>
<el-form-item :label="t('common.state')" prop="state">
<el-input v-model="form.state" :placeholder="t('common.pleaseEnter') + t('common.state')"/>
</el-form-item>
<el-form-item :label="t('common.isRemove')" prop="isDelete">
<el-input v-model="form.isDelete" :placeholder="t('common.pleaseEnter') + t('common.isRemove')"/>
</el-form-item>
<el-form-item :label="t('common.creatorName')" prop="createName">
<el-input v-model="form.createName" :placeholder="t('common.pleaseEnter') + t('common.creatorName')"/>
</el-form-item>
<el-form-item :label="t('common.editTime')" prop="modifyTime">
<el-date-picker
clearable
v-model="form.modifyTime"
type="date"
format="YYYY/MM/DD"
value-format="YYYY-MM-DD"
:placeholder="t('common.PleaseSelect') + t('common.editTime')">
</el-date-picker>
</el-form-item>
<el-form-item :label="t('common.editAccount')" prop="modifyBy">
<el-input v-model="form.modifyBy" :placeholder="t('common.pleaseEnter') + t('common.editAccount')"/>
</el-form-item>
<el-form-item :label="t('common.editName')" prop="modifyName">
<el-input v-model="form.modifyName" :placeholder="t('common.pleaseEnter') + t('common.editName')"/>
<el-input-number
v-model="form.currentTextureDepth"
autocomplete="off"
:min="0"
:max="99"
:step="0.1"
:precision="2"
/>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
@ -426,10 +289,9 @@ const queryParams = ref({
// 表单验证规则
const rules = {
brand: [{required: true, message: "轮胎品牌不能为空", trigger: "blur"}],
type: [{required: true, message: "轮胎型号不能为空", trigger: "blur"}],
serialNumber: [{required: true, message: "轮胎编号不能为空", trigger: "blur"}],
depth: [{required: true, message: "花纹深度不能为空", trigger: "blur"}],
tureCode: [{required: true, message: "外胎号不能为空", trigger: "blur"}],
type: [{required: true, message: "轮胎型号不能为空", trigger: "blur"}],
serialNumber: [{required: true, message: "轮胎编号不能为空", trigger: "blur"}],
}
// 表单数据
@ -561,7 +423,6 @@ function handleExport() {
...queryParams.value
}, `post_${new Date().getTime()}.xlsx`);
}
getList();
</script>

Write Preview
Loading…
Cancel
Save