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

Compare commits

base: TuringsMachine:26a10d4200ec99d6280d9f069c025026f8560e4f
Branches Tags
TuringsMachine:master
TuringsMachine:zjw
TuringsMachine:xusd
...
compare: TuringsMachine:3b9763cd03ede433572fff28020ad055be10684e
Branches Tags
TuringsMachine:master
TuringsMachine:zjw
TuringsMachine:xusd

2 Commits
26a10d4200 ... 3b9763cd03

Author SHA1 Message Date
zhangjunwen
3b9763cd03 Merge branch 'master' into zjw 2024-09-20 13:54:30 +08:00
xusd
462a7fdc58 1、机床信息、机床组件新增、修改删除状态下拉框 
2、机床型号图片、机床信息列表判断图片是否为空
 2024-09-20 11:33:31 +08:00
4 changed files with 14 additions and 14 deletions
Show Stats Expand all files Collapse all files

2
imt-ui/src/views/system/baseData/modelinfo/index.vue
View File

@ -63,7 +63,7 @@
<!-- :src="scope.row.modelPicPath"-->
<!-- style="display: block; width: 100px; height: 100px; margin: 0 auto"-->
<!-- />-->
<span v-if="scope.row.modelPicPath == null">-</span>
<span v-if="scope.row.modelPicPath == null || scope.row.modelPicPath === ''">-</span>
<el-image v-else
style="width: 100px; height: 100px"
:src="scope.row.modelPicPath"

12
imt-ui/src/views/system/equip/componentInfo/ComponentInfoForm.vue
View File

@ -35,12 +35,12 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item label="组件状态" prop="status">
<el-select v-model="formData.status" placeholder="请选择组件状态" style="width:100%">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMPONENT_STATUS)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select>
</el-form-item>
<!-- <el-form-item label="组件状态" prop="status">-->
<!-- <el-select v-model="formData.status" placeholder="请选择组件状态" style="width:100%">-->
<!-- <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMPONENT_STATUS)"-->
<!-- :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" :rows="4" type="textarea" placeholder="请输入备注"/>
</el-form-item>

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

@ -48,12 +48,12 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item label="机床状态" prop="status">
<el-select v-model="formData.status" placeholder="请选择机床状态" style="width: 100%">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.EQUIP_STATUS)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)"/>
</el-select>
</el-form-item>
<!-- <el-form-item label="机床状态" prop="status">-->
<!-- <el-select v-model="formData.status" placeholder="请选择机床状态" style="width: 100%">-->
<!-- <el-option v-for="dict in this.getDictDatas(DICT_TYPE.EQUIP_STATUS)"-->
<!-- :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"/>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" type="textarea" :rows="4" placeholder="请输入备注"/>
</el-form-item>

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

@ -60,7 +60,7 @@
</el-table-column>
<el-table-column label="二维码" align="center" prop="qrcodePicPath">
<template v-slot="scope">
<span v-if="scope.row.qrcodePicPath == null">-</span>
<span v-if="scope.row.qrcodePicPath == null || scope.row.qrcodePicPath === ''">-</span>
<!-- <img-->
<!-- :src="scope.row.qrcodePicPath"-->
<!-- style="display: block; width: 100px; height: 100px; margin: 0 auto"-->