bugfix zentao 1

This commit is contained in:
lb
2023-09-15 14:30:19 +08:00
parent 27ebe39a96
commit 772a4b0633
29 changed files with 594 additions and 385 deletions

View File

@@ -84,13 +84,12 @@ export default {
width: 180,
filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
},
{ prop: 'name', label: '设备分组名称', align: 'center' },
{ prop: 'code', label: '检测分组编码', align: 'center' },
{ prop: 'remark', label: '备注', align: 'center' },
{ prop: 'name', label: '设备分组名称' },
{ prop: 'code', label: '设备分组编码' },
{ prop: 'remark', label: '备注' },
{
_action: 'equipment-group-show-alert',
label: '报警',
align: 'center',
subcomponent: {
props: ['injectData'],
render: function (h) {
@@ -127,7 +126,7 @@ export default {
type: 'input',
label: '分组编码',
placeholder: '请输入设备分组编码',
param: 'codes',
param: 'code',
},
{
type: 'button',
@@ -172,6 +171,7 @@ export default {
label: '分组编码',
prop: 'code',
url: '/base/equipment-group/getCode',
rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
},
],
[
@@ -302,11 +302,7 @@ export default {
handleDelete(row) {
const id = row.id;
this.$modal
.confirm(
'是否确认删除设备分组(用于同类型不同厂家的设备区分)编号为"' +
id +
'"的数据项?'
)
.confirm('是否确认删除设备分组 "' + row.name + '"?')
.then(function () {
return deleteEquipmentGroup(id);
})