Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
This commit is contained in:
commit
54a46fe18c
|
@ -72,8 +72,6 @@
|
|||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="下次检定日期" prop="next_check_date" width="70">
|
||||
</el-table-column>
|
||||
<el-table-column label="精度等级" prop="accuracy_level" show-overflow-tooltip>
|
||||
</el-table-column>
|
||||
<el-table-column label="安装位置" prop="place" show-overflow-tooltip>
|
||||
|
@ -98,6 +96,8 @@
|
|||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="下次检定日期" prop="next_check_date" width="70">
|
||||
</el-table-column>
|
||||
<el-table-column label="备注" show-overflow-tooltip>
|
||||
<template #default="scope">{{ scope.row.description }}</template>
|
||||
</el-table-column>
|
||||
|
|
|
@ -115,7 +115,7 @@
|
|||
:sm="24"
|
||||
v-if="form.mgroup_name == '回转窑' && (form.shift_name == '白班' || form.shift_name == '早班')"
|
||||
>
|
||||
<el-form-item label="煤粉热值(大卡)">
|
||||
<el-form-item label="煤粉热值">
|
||||
<el-input-number
|
||||
v-model="form.pcoal_heat"
|
||||
controls-position="right"
|
||||
|
|
Loading…
Reference in New Issue