TuringsMachine/imt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

机床信息 上传限制1个，查询和列表改为运行状态字段

Browse Source
This commit is contained in:
xusd 2024-11-12 14:48:59 +08:00
parent e0697e2103
commit ec590f7e9f
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/equip/EquipInfoMapper.java
View File

@ -30,6 +30,7 @@ public interface EquipInfoMapper extends BaseMapperX<EquipInfoDO> {
.likeIfPresent(EquipInfoDO::getEquipName, reqVO.getEquipName()) .likeIfPresent(EquipInfoDO::getEquipName, reqVO.getEquipName())
.likeIfPresent(EquipInfoDO::getEquipNo, reqVO.getEquipNo()) .likeIfPresent(EquipInfoDO::getEquipNo, reqVO.getEquipNo())
.eqIfPresent(EquipInfoDO::getStatus, reqVO.getStatus()) .eqIfPresent(EquipInfoDO::getStatus, reqVO.getStatus())
.eqIfPresent(EquipInfoDO::getRunStatus, reqVO.getRunStatus())
.groupBy(EquipInfoDO::getCustomerId, EquipInfoDO::getModelId) .groupBy(EquipInfoDO::getCustomerId, EquipInfoDO::getModelId)
); );
} }

2
imt-ui/src/views/system/equip/equipInfo/EquipInfoForm.vue
View File

@ -146,7 +146,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="二维码图片"> <el-form-item label="二维码图片">
<ImageUpload v-model="formData.qrcodePicPath" /> <ImageUpload v-model="formData.qrcodePicPath" :limit="1"/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div <div

10
imt-ui/src/views/system/equip/equipInfo/index.vue
View File

@ -58,7 +58,7 @@
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="机床状态" label="机床状态"
prop="status" prop="runStatus"
> >
<el-select <el-select
v-model="queryParams.status" v-model="queryParams.status"
@ -67,7 +67,7 @@
size="small" size="small"
> >
<el-option <el-option
v-for="dict in this.getDictDatas(DICT_TYPE.EQUIP_STATUS)" v-for="dict in this.getDictDatas(DICT_TYPE.EQUIP_RUN_STATUS)"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
@ -178,12 +178,12 @@
<el-table-column <el-table-column
label="机床状态" label="机床状态"
align="center" align="center"
prop="status" prop="runStatus"
> >
<template v-slot="scope"> <template v-slot="scope">
<dict-tag <dict-tag
:type="DICT_TYPE.EQUIP_STATUS" :type="DICT_TYPE.EQUIP_RUN_STATUS"
:value="scope.row.status" :value="scope.row.runStatus"
/> />
</template> </template>
</el-table-column> </el-table-column>