This commit is contained in:
helloDy
2024-04-11 16:49:48 +08:00
parent 2592551e66
commit 63a753d7d6
32 changed files with 284 additions and 219 deletions

View File

@@ -244,7 +244,8 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('equipment:alarm-group:create')
? 'separate' : '',
},
{
type: this.$auth.hasPermi('equipment:alarm-group:create')

View File

@@ -201,7 +201,8 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('equipment:bind-group:create')
? 'separate' : '',
},
{
type: this.$auth.hasPermi('equipment:bind-group:create')

View File

@@ -158,14 +158,14 @@ export default {
: undefined,
].filter((v) => v),
tableProps: [
{ prop: 'productionLine', label: '产线', width: 120, showOverflowtooltip: true },
{ prop: 'workshopSection', label: '工段', width: 120, showOverflowtooltip: true },
{ prop: 'equipmentName', label: '设备名', width: 120, showOverflowtooltip: true },
{ prop: 'equipmentCode', label: '设备编码', width: 200, showOverflowtooltip: true },
{ prop: 'plcCode', label: '关联表编码', width: 220, showOverflowtooltip: true },
{ prop: 'plcTableName', label: '关联表名', width: 150, showOverflowtooltip: true },
{ prop: 'plcName', label: '标识名称', width: 150, showOverflowtooltip: true },
{ prop: 'bindingParameters', label: '绑定参数数量', width: 120, showOverflowtooltip: true },
{ prop: 'productionLine', label: '产线', minWidth: 120, showOverflowtooltip: true },
{ prop: 'workshopSection', label: '工段', minWidth: 120, showOverflowtooltip: true },
{ prop: 'equipmentName', label: '设备名', minWidth: 120, showOverflowtooltip: true },
{ prop: 'equipmentCode', label: '设备编码', minWidth: 200, showOverflowtooltip: true },
{ prop: 'plcCode', label: '关联表编码', minWidth: 220, showOverflowtooltip: true },
{ prop: 'plcTableName', label: '关联表名', minWidth: 150, showOverflowtooltip: true },
{ prop: 'plcName', label: '标识名称', minWidth: 150, showOverflowtooltip: true },
{ prop: 'bindingParameters', label: '绑定参数数量', minWidth: 120, showOverflowtooltip: true },
// {
// _action: 'params-bind',
// label: '查看绑定',
@@ -217,7 +217,8 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('equipment:collection-config:create')
? 'separate' : '',
},
{
type: this.$auth.hasPermi('equipment:collection-config:create')

View File

@@ -160,13 +160,12 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('base:equipment-plc:create')
? 'separate' : '',
},
{
// type: this.$auth.hasPermi('equipment:realtime-table-config:create')
// ? 'button'
// : '',
type: 'button',
type: this.$auth.hasPermi('base:equipment-plc:create')
? 'button' : '',
btnName: '新增',
name: 'add',
plain: true,
@@ -194,7 +193,7 @@ export default {
input: true,
label: '编码',
prop: 'code',
url: '/base/equipment-group/getCode',
url: '/base/energy-plc/getCode',
rules: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
},
],

View File

@@ -101,7 +101,10 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: (this.$auth.hasPermi('equipment:inspection-confirm:create') ||
this.$auth.hasPermi('equipment:inspection-confirm:confirm') ||
this.$auth.hasPermi('equipment:inspection-confirm:export'))
? 'separate' : '',
},
{
type: this.$auth.hasPermi('equipment:inspection-confirm:create')

View File

@@ -166,7 +166,8 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('equipment:check-record:export')
? 'separate' : '',
},
{
type: this.$auth.hasPermi('equipment:check-record:export')

View File

@@ -157,7 +157,8 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('equipment:check-setting:create')
? 'separate' : '',
},
{
type: this.$auth.hasPermi('equipment:check-setting:create')

View File

@@ -37,11 +37,11 @@
</el-table-column>
<el-table-column
v-if="selectedBox[0]"
width="160"
minWidth="160"
label="设备保养单号"
:show-overflow-tooltip="true"
prop="maintainOrderNumber"></el-table-column>
<el-table-column v-if="selectedBox[1]" width="128" label="保养计划名称" prop="planName">
<el-table-column v-if="selectedBox[1]" minWidth="128" label="保养计划名称" prop="planName">
<template slot-scope="scope">
{{ scope.row.planName || '---' }}
</template>
@@ -67,7 +67,7 @@
</el-table-column>
<el-table-column
v-if="selectedBox[5]"
width="150"
minWidth="150"
label="计划结束时间"
prop="planEndTime">
<template slot-scope="scope">
@@ -76,7 +76,7 @@
</el-table-column>
<el-table-column
v-if="selectedBox[6]"
width="150"
minWidth="150"
label="实际开始时间"
prop="startTime">
<template slot-scope="scope">
@@ -85,7 +85,7 @@
</el-table-column>
<el-table-column
v-if="selectedBox[7]"
width="150"
minWidth="150"
label="实际结束时间"
prop="endTime">
<template slot-scope="scope">
@@ -94,7 +94,7 @@
</el-table-column>
<el-table-column
v-if="selectedBox[8]"
width="150"
minWidth="150"
label="确认截止时间"
prop="confirmDueTime">
<template slot-scope="scope">
@@ -103,7 +103,7 @@
</el-table-column>
<el-table-column
v-if="selectedBox[9]"
width="150"
minWidth="150"
label="保养计划类型"
prop="relatePlan">
<template slot-scope="scope">

View File

@@ -157,7 +157,7 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: (this.$auth.hasPermi('equipment:maintain-confirm:confirm') || this.$auth.hasPermi('equipment:maintain-confirm:confirm') || this.$auth.hasPermi('equipment:maintain-confirm:export')) ? 'separate' : '',
},
{
type: this.$auth.hasPermi('equipment:maintain-confirm:create')

View File

@@ -131,7 +131,7 @@ export default {
// width: 180,
// filter: parseTime(createTime),
// },
{ prop: 'code', label: '保养计划单号', width: 150, showOverflowtooltip: true },
{ prop: 'code', label: '保养计划单号', minWidth: 150, showOverflowtooltip: true },
{ prop: 'name', label: '保养计划名称', minWidth: 118, showOverflowtooltip: true },
{ prop: 'departmentName', label: '部门', minWidth: 100, showOverflowtooltip: true },
{ prop: 'lineName', label: '产线名', minWidth: 100, showOverflowtooltip: true },
@@ -190,7 +190,8 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('equipment:maintain-monitor:export')
? 'separate' : '',
},
{
type: this.$auth.hasPermi('equipment:maintain-monitor:export')

View File

@@ -65,57 +65,57 @@ const tableProps = [
{
prop: 'name',
label: '保养计划名称',
width: 120,
minWidth: 120,
showOverflowtooltip: true
},
{
prop: 'departmentName',
label: '部门',
width: 120,
minWidth: 120,
showOverflowtooltip: true
},
{
prop: 'lineName',
label: '产线名',
width: 120,
minWidth: 120,
showOverflowtooltip: true
},
{
prop: 'maintenancePeriod',
label: '保养频率(天/次)',
width: 150,
minWidth: 150,
showOverflowtooltip: true
},
{
prop: 'firstMaintenanceTime',
label: '首次保养时间',
filter: parseTime,
width: 150,
minWidth: 150,
showOverflowtooltip: true
},
{
prop: 'maintainDuration',
label: '保养时长',
width: 120,
minWidth: 120,
showOverflowtooltip: true
},
{
prop: 'maintainer',
label: '计划保养人员',
width: 150,
minWidth: 150,
showOverflowtooltip: true
},
{
prop: 'confirmTimeLimit',
label: '确认时限',
filter: toDay,
width: 130,
minWidth: 130,
showOverflowtooltip: true
},
{
prop: 'remark',
label: '备注',
width: 150,
minWidth: 150,
showOverflowtooltip: true
}
];
@@ -172,7 +172,7 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('equipment:plan-config:create') ? 'separate' : '',
},
{
type: this.$auth.hasPermi('equipment:plan-config:create') ? 'button' : '',

View File

@@ -131,21 +131,21 @@ export default {
// width: 180,
// filter: timeFilter,
// },
{ prop: 'maintainOrderNumber', label: '设备保养单号', width: 170, showOverflowtooltip: true },
{ prop: 'planName', label: '保养计划名称', width: 150, showOverflowtooltip: true },
{ prop: 'departmentName', label: '部门', width: 120, showOverflowtooltip: true },
{ prop: 'lineName', label: '产线名', width: 120, showOverflowtooltip: true },
{ prop: 'planStartTime', label: '计划开始时间', filter: parseTime, width: 150, showOverflowtooltip: true },
{ prop: 'planEndTime', label: '计划结束时间', filter: parseTime, width: 150, showOverflowtooltip: true },
{ prop: 'startTime', label: '实际开始时间', filter: parseTime, width: 150, showOverflowtooltip: true },
{ prop: 'endTime', label: '实际结束时间', filter: parseTime, width: 150, showOverflowtooltip: true },
{ prop: 'maintainOrderNumber', label: '设备保养单号', minWidth: 170, showOverflowtooltip: true },
{ prop: 'planName', label: '保养计划名称', minWidth: 150, showOverflowtooltip: true },
{ prop: 'departmentName', label: '部门', minWidth: 120, showOverflowtooltip: true },
{ prop: 'lineName', label: '产线名', minWidth: 120, showOverflowtooltip: true },
{ prop: 'planStartTime', label: '计划开始时间', filter: parseTime, minWidth: 150, showOverflowtooltip: true },
{ prop: 'planEndTime', label: '计划结束时间', filter: parseTime, minWidth: 150, showOverflowtooltip: true },
{ prop: 'startTime', label: '实际开始时间', filter: parseTime, minWidth: 150, showOverflowtooltip: true },
{ prop: 'endTime', label: '实际结束时间', filter: parseTime, minWidth: 150, showOverflowtooltip: true },
// { prop: 'equipmentName', label: '设备名称' },
// { prop: 'maintainWorker', label: '保养人员' },
{
prop: 'relatePlan',
label: '保养计划类型',
filter: (v) => (v != null ? ['', '计划型', '非计划型'][v] : ''),
width: 170,
minWidth: 170,
showOverflowtooltip: true
},
{ prop: 'opt', label: '详情', name: '详情', subcomponent: btn }
@@ -198,7 +198,8 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('equipment:maintain-record:export')
? 'separate' : '',
},
{
type: this.$auth.hasPermi('equipment:maintain-record:export')

View File

@@ -173,7 +173,7 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: (this.$auth.hasPermi('equipment:repair:export') || this.$auth.hasPermi('equipment:repair:create')) ? 'separate' : '',
},
{
type: this.$auth.hasPermi('equipment:repair:export') ? 'button' : '',