mt-fe-group/mt-yd-ui
12
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

fzq #31

Closed
fanzhiqin wants to merge 215 commits from fzq into test
pull from: fzq
merge into: mt-fe-group:test
Conversation 0 Commits 215 Files Changed 195 +30 -30
15 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 666059af6e - Show all commits

4
src/views/modules/monitoring/equipment.vue
View File

@ -228,13 +228,13 @@ const addOrUpdateConfigs = {
{
name: 'save',
url: '/monitoring/equipment',
permission: '',
permission: 'monitoring:equipment:save',
showOnEdit: false
},
{
name: 'update',
url: '/monitoring/equipment',
permission: '',
permission: 'monitoring:equipment:update',
showOnEdit: true
}
]

4
src/views/modules/monitoring/equipmentGroup.vue
View File

@ -50,8 +50,8 @@ const addOrUpdateConfigs = {
fields: [{ name: 'name', label: '分组名称' }, { name: 'code', label: '分组编码' }, 'remark'],
operations: [
{ name: 'cancel', showAlways: true },
{ name: 'save', url: '/monitoring/equipmentGroup', permission: '', showOnEdit: false },
{ name: 'update', url: '/monitoring/equipmentGroup', permission: '', showOnEdit: true }
{ name: 'save', url: '/monitoring/equipmentGroup', permission: 'monitoring:equipmentgroup:save', showOnEdit: false },
{ name: 'update', url: '/monitoring/equipmentGroup', permission: 'monitoring:equipmentgroup:update', showOnEdit: true }
]
}

4
src/views/modules/monitoring/equipmentGroupAlarm.vue
View File

@ -73,8 +73,8 @@ const addOrUpdateConfigs = {
],
operations: [
{ name: 'cancel', showAlways: true },
{ name: 'save', url: '/monitoring/equipmentGroupAlarm', extraFields: { equipmentGroupId: null }, permission: '', showOnEdit: false },
{ name: 'update', url: '/monitoring/equipmentGroupAlarm', extraFields: { equipmentGroupId: null }, permission: '', showOnEdit: true }
{ name: 'save', url: '/monitoring/equipmentGroupAlarm', extraFields: { equipmentGroupId: null }, permission: 'monitoring:equipmentgroupalarm:save', showOnEdit: false },
{ name: 'update', url: '/monitoring/equipmentGroupAlarm', extraFields: { equipmentGroupId: null }, permission: 'monitoring:equipmentgroupalarm:update', showOnEdit: true }
]
}

4
src/views/modules/monitoring/equipmentPlc.vue
View File

@ -74,8 +74,8 @@ const addOrUpdateConfigs = {
],
operations: [
{ name: 'cancel', url: true, showAlways: true },
{ name: 'save', url: '/monitoring/equipmentPlc', permission: '', showOnEdit: false },
{ name: 'update', url: '/monitoring/equipmentPlc', permission: '', showOnEdit: true }
{ name: 'save', url: '/monitoring/equipmentPlc', permission: 'monitoring:equipmentplc:save', showOnEdit: false },
{ name: 'update', url: '/monitoring/equipmentPlc', permission: 'monitoring:equipmentplc:update', showOnEdit: true }
]
}

4
src/views/modules/monitoring/equipmentPlcConnect.vue
View File

@ -64,8 +64,8 @@ const addOrUpdateConfigs = {
],
operations: [
{ name: 'cancel', url: true, showAlways: true },
{ name: 'save', url: '/monitoring/equipmentPlcConnect', permission: '', showOnEdit: false },
{ name: 'update', url: '/monitoring/equipmentPlcConnect', permission: '', showOnEdit: true }
{ name: 'save', url: '/monitoring/equipmentPlcConnect', permission: 'monitoring:equipmentplcconnect:save', showOnEdit: false },
{ name: 'update', url: '/monitoring/equipmentPlcConnect', permission: 'monitoring:equipmentplcconnect:update', showOnEdit: true }
],
subtable: {
title: 'PLC采集参数',

4
src/views/modules/monitoring/equipmentType.vue
View File

@ -54,8 +54,8 @@ const addOrUpdateConfigs = {
],
operations: [
{ name: 'cancel', showAlways: true },
{ name: 'save', url: '/monitoring/equipmentType', permission: '', showOnEdit: false },
{ name: 'update', url: '/monitoring/equipmentType', permission: '', showOnEdit: true }
{ name: 'save', url: '/monitoring/equipmentType', permission: 'monitoring:equipmenttype:save', showOnEdit: false },
{ name: 'update', url: '/monitoring/equipmentType', permission: 'monitoring:equipmenttype:update', showOnEdit: true }
],
extraComponents: [
{

4
src/views/modules/monitoring/factory.vue
View File

@ -63,8 +63,8 @@ const addOrUpdateConfigs = {
operations: [
{ name: 'reset', url: true, showAlways: true },
{ name: 'cancel', url: true, showAlways: true },
{ name: 'save', url: '/monitoring/factory', permission: '', showOnEdit: false },
{ name: 'update', url: '/monitoring/factory', permission: '', showOnEdit: true }
{ name: 'save', url: '/monitoring/factory', permission: 'monitoring:factory:save', showOnEdit: false },
{ name: 'update', url: '/monitoring/factory', permission: 'monitoring:factory:update', showOnEdit: true }
]
}

4
src/views/modules/monitoring/productArrt.vue
View File

@ -78,8 +78,8 @@ const addOrUpdateConfigs = {
],
operations: [
{ name: 'cancel', showAlways: true },
{ name: 'save', url: '/monitoring/productArrt', permission: '', showOnEdit: false },
{ name: 'update', url: '/monitoring/productArrt', permission: '', showOnEdit: true }
{ name: 'save', url: '/monitoring/productArrt', permission: 'monitoring:productarrt:save', showOnEdit: false },
{ name: 'update', url: '/monitoring/productArrt', permission: 'monitoring:productarrt:update', showOnEdit: true }
]
}

4
src/views/modules/monitoring/productionLine.vue
View File

@ -71,8 +71,8 @@ const addOrUpdateConfigs = {
],
operations: [
{ name: 'cancel', url: true, showAlways: true },
{ name: 'save', url: '/monitoring/productionLine', permission: '', showOnEdit: false },
{ name: 'update', url: '/monitoring/productionLine', permission: '', showOnEdit: true }
{ name: 'save', url: '/monitoring/productionLine', permission: 'monitoring:productionline:save', showOnEdit: false },
{ name: 'update', url: '/monitoring/productionLine', permission: 'monitoring:productionline:update', showOnEdit: true }
]
}

4
src/views/modules/monitoring/qualityInspectionDet.vue
View File

@ -55,8 +55,8 @@ const addOrUpdateConfigs = {
],
operations: [
{ name: 'cancel', showAlways: true },
{ name: 'save', url: '/monitoring/qualityInspectionDet', permission: '', showOnEdit: false },
{ name: 'update', url: '/monitoring/qualityInspectionDet', permission: '', showOnEdit: true }
{ name: 'save', url: '/monitoring/qualityInspectionDet', permission: 'monitoring:qualityinspectiondet:save', showOnEdit: false },
{ name: 'update', url: '/monitoring/qualityInspectionDet', permission: 'monitoring:qualityinspectiondet:update', showOnEdit: true }
]
}

4
src/views/modules/monitoring/qualityInspectionRecord.vue
View File

@ -83,8 +83,8 @@ const addOrUpdateConfigs = {
],
operations: [
{ name: 'cancel', showAlways: true },
{ name: 'save', url: '/monitoring/qualityInspectionRecord', permission: '', showOnEdit: false },
{ name: 'update', url: '/monitoring/qualityInspectionRecord', permission: '', showOnEdit: true }
{ name: 'save', url: '/monitoring/qualityInspectionRecord', permission: 'monitoring:qualityinspectionrecord:save', showOnEdit: false },
{ name: 'update', url: '/monitoring/qualityInspectionRecord', permission: 'monitoring:qualityinspectionrecord:update', showOnEdit: true }
]
}

4
src/views/modules/monitoring/qualityInspectionType.vue
View File

@ -48,8 +48,8 @@ const addOrUpdateConfigs = {
fields: [{ name: 'name', label: '检测类型' }, { name: 'code', label: '检测类型编码', api: '/monitoring/qualityInspectionType/getCode' }, 'remark'],
operations: [
{ name: 'cancel', showAlways: true },
{ name: 'save', url: '/monitoring/qualityInspectionType', permission: '', showOnEdit: false },
{ name: 'update', url: '/monitoring/qualityInspectionType', permission: '', showOnEdit: true }
{ name: 'save', url: '/monitoring/qualityInspectionType', permission: 'monitoring:qualityinspectiontype:save', showOnEdit: false },
{ name: 'update', url: '/monitoring/qualityInspectionType', permission: 'monitoring:qualityinspectiontype:update', showOnEdit: true }
]
}

4
src/views/modules/monitoring/reportCategory.vue
View File

@ -47,8 +47,8 @@ const addOrUpdateConfigs = {
fields: [{ name: 'name', label: '分类名称', required: true, span: 24 }],
operations: [
{ name: 'cancel', url: true, showAlways: true },
{ name: 'save', url: '/monitoring/reportSheetCategory', permission: '', showOnEdit: false },
{ name: 'update', url: '/monitoring/reportSheetCategory', permission: '', showOnEdit: true }
{ name: 'save', url: '/monitoring/reportSheetCategory', permission: 'monitoring:reportsheetcategory:save', showOnEdit: false },
{ name: 'update', url: '/monitoring/reportSheetCategory', permission: 'monitoring:reportsheetcategory:update', showOnEdit: true }
]
}

4
src/views/modules/monitoring/reportDetail.vue
View File

@ -78,8 +78,8 @@ const addOrUpdateConfigs = {
fields: [{ name: 'fileName', label: '报表名称', required: true, span: 24 }],
operations: [
{ name: 'cancel', url: true, showAlways: true },
{ name: 'save', url: '/monitoring/reportSheet', permission: '', showOnEdit: false },
{ name: 'update', url: '/monitoring/reportSheet', permission: '', showOnEdit: true }
{ name: 'save', url: '/monitoring/reportSheet', permission: 'monitoring:reportsheet:save', showOnEdit: false },
{ name: 'update', url: '/monitoring/reportSheet', permission: 'monitoring:reportsheet:update', showOnEdit: true }
]
}

4
src/views/modules/monitoring/workShopSection.vue
View File

@ -57,8 +57,8 @@ const addOrUpdateConfigs = {
operations: [
{ name: 'reset', url: true, showAlways: true },
{ name: 'cancel', url: true, showAlways: true },
{ name: 'save', url: '/monitoring/workshopSection', permission: '', showOnEdit: false },
{ name: 'update', url: '/monitoring/workshopSection', permission: '', showOnEdit: true }
{ name: 'save', url: '/monitoring/workshopSection', permission: 'monitoring:workshopsection:save', showOnEdit: false },
{ name: 'update', url: '/monitoring/workshopSection', permission: 'monitoring:workshopsection:update', showOnEdit: true }
]
}