Compare commits
No commits in common. "8f11c2f47c437167342e24d189191ad02d193a5a" and "087af452def47123e82efa8a93b7451b5c8e8416" have entirely different histories.
8f11c2f47c
...
087af452de
8
.env.dev
8
.env.dev
@ -1,8 +1,8 @@
|
||||
###
|
||||
# @Author: Do not edit
|
||||
# @Date: 2023-08-29 09:40:39
|
||||
# @LastEditTime: 2024-04-11 17:04:05
|
||||
# @LastEditors: DY
|
||||
# @LastEditTime: 2024-04-10 16:58:06
|
||||
# @LastEditors: zhp
|
||||
# @Description:
|
||||
###
|
||||
# 开发环境配置
|
||||
@ -20,11 +20,11 @@ VUE_APP_TITLE = MES系统
|
||||
# VUE_APP_BASE_API = 'http://192.168.1.8:48082'
|
||||
# VUE_APP_BASE_API = 'http://192.168.4.173:9001'
|
||||
# VUE_APP_BASE_API = 'http://192.168.1.104:48082'
|
||||
VUE_APP_BASE_API = 'http://192.168.0.33:48082'
|
||||
# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
|
||||
# VUE_APP_BASE_API = 'http://192.168.1.62:48082'
|
||||
# VUE_APP_BASE_API = 'http://192.168.1.78:48082'
|
||||
# VUE_APP_BASE_API = 'http://192.168.1.47:48082'
|
||||
# VUE_APP_BASE_API = 'http://192.168.1.78:48082'
|
||||
VUE_APP_BASE_API = 'http://192.168.1.78:48082'
|
||||
# socket地址
|
||||
# VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
|
||||
# VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* @Author: zhp
|
||||
* @Date: 2023-11-07 14:10:18
|
||||
* @LastEditTime: 2024-04-11 16:16:05
|
||||
* @LastEditTime: 2024-04-09 09:17:02
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
*/
|
||||
@ -18,14 +18,14 @@ export function getStatisticalDataPage(query) {
|
||||
|
||||
export function getWorkOrderList(query) {
|
||||
return request({
|
||||
url: 'base/core-work-order/listbyfilter',
|
||||
url: 'base/quality-inspection-record/listbyfilter',
|
||||
method: 'get',
|
||||
params: query,
|
||||
})
|
||||
}
|
||||
export function getProductList(query) {
|
||||
return request({
|
||||
url: 'base/core-product/listAll',
|
||||
url: 'base/statistical-data/listAll',
|
||||
method: 'get',
|
||||
params: query,
|
||||
})
|
||||
|
||||
@ -130,20 +130,8 @@ export default {
|
||||
{ prop: 'createTime', label: '报警时间', filter: timeFilter, width: 150, showOverflowtooltip: true },
|
||||
{ prop: 'alarmCode', label: '设备报警码', width: 180, showOverflowtooltip: true },
|
||||
{ prop: 'alarmContent', label: '报警内容', width: 150, showOverflowtooltip: true },
|
||||
this.$auth.hasPermiAnd([
|
||||
'monitoring:equipment-alarm-log:query',
|
||||
'base:equipment-alarm-hand:query'
|
||||
]) ?
|
||||
{ prop: 'opt1', label: '处理记录', name: '查看', subcomponent: btn } : undefined,
|
||||
this.$auth.hasPermiAnd([
|
||||
'monitoring:equipment-alarm-log:query',
|
||||
'base:equipment-alarm-hand:query',
|
||||
'base:core-worker:query',
|
||||
'base:equipment-alarm-hand:create',
|
||||
'base:equipment-alarm-hand:update',
|
||||
'monitoring:equipment-alarm-log:update'
|
||||
]) ?
|
||||
{ prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn } : undefined,
|
||||
{ prop: 'opt1', label: '处理记录', name: '查看', subcomponent: btn },
|
||||
{ prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn },
|
||||
// { prop: 'remark', label: '备注' },
|
||||
],
|
||||
searchBarFormConfig: [
|
||||
|
||||
@ -122,30 +122,19 @@ export default {
|
||||
editMode: '',
|
||||
searchBarKeys: ['name', 'code'],
|
||||
tableBtn: [
|
||||
this.$auth.hasPermiAnd([
|
||||
'base:equipment-group:query',
|
||||
'base:equipment-group-alarm:query'
|
||||
])
|
||||
? {
|
||||
this.$auth.hasPermi('equipment:alarm-group:update')
|
||||
? {
|
||||
type: 'detail',
|
||||
btnName: '查看报警',
|
||||
}
|
||||
: undefined,
|
||||
this.$auth.hasPermiAnd([
|
||||
'base:equipment-group:update',
|
||||
'base:equipment-group:query',
|
||||
'base:equipment-group-alarm:create',
|
||||
'base:equipment-group-alarm:delete',
|
||||
'base:equipment-group-alarm:update',
|
||||
'base:equipment-group-alarm:query',
|
||||
'base:equipment-group-alarm:query'
|
||||
])
|
||||
this.$auth.hasPermi('equipment:alarm-group:update')
|
||||
? {
|
||||
type: 'edit',
|
||||
btnName: '修改',
|
||||
}
|
||||
: undefined,
|
||||
this.$auth.hasPermi('base:equipment-group:delete')
|
||||
this.$auth.hasPermi('equipment:alarm-group:delete')
|
||||
? {
|
||||
type: 'delete',
|
||||
btnName: '删除',
|
||||
@ -255,11 +244,11 @@ export default {
|
||||
color: 'primary',
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermi('base:equipment-group:create')
|
||||
type: this.$auth.hasPermi('equipment:alarm-group:create')
|
||||
? 'separate' : '',
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermi('base:equipment-group:create')
|
||||
type: this.$auth.hasPermi('equipment:alarm-group:create')
|
||||
? 'button'
|
||||
: '',
|
||||
btnName: '新增',
|
||||
|
||||
@ -123,23 +123,13 @@ export default {
|
||||
return {
|
||||
searchBarKeys: ['groupId', 'equipmentName'],
|
||||
tableBtn: [
|
||||
this.$auth.hasPermiAnd([
|
||||
'base:equipment-group-alarm:query',
|
||||
'base:core-equipment:query'
|
||||
])
|
||||
this.$auth.hasPermi('equipment:bind-group:update')
|
||||
? {
|
||||
type: 'detail',
|
||||
btnName: '查看报警',
|
||||
}
|
||||
: undefined,
|
||||
this.$auth.hasPermiAnd([
|
||||
'equipment:bind-group:update',
|
||||
'base:core-equipment:query',
|
||||
'base:equipment-group-alarm:create',
|
||||
'base:equipment-group-alarm:update',
|
||||
'base:equipment-group-alarm:delete',
|
||||
'base:equipment-group-alarm:query'
|
||||
])
|
||||
this.$auth.hasPermi('equipment:bind-group:update')
|
||||
? {
|
||||
type: 'edit',
|
||||
btnName: '修改',
|
||||
@ -211,16 +201,12 @@ export default {
|
||||
color: 'primary',
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermiAnd([
|
||||
'equipment:bind-group:create',
|
||||
'base:core-equipment:query'
|
||||
]) ? 'separate' : '',
|
||||
type: this.$auth.hasPermi('equipment:bind-group:create')
|
||||
? 'separate' : '',
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermiAnd([
|
||||
'equipment:bind-group:create',
|
||||
'base:core-equipment:query'
|
||||
]) ? 'button'
|
||||
type: this.$auth.hasPermi('equipment:bind-group:create')
|
||||
? 'button'
|
||||
: '',
|
||||
btnName: '新增',
|
||||
name: 'add',
|
||||
|
||||
@ -140,28 +140,17 @@ export default {
|
||||
// tableBtn: [
|
||||
// ].filter((v) => v),
|
||||
tableBtn: [
|
||||
this.$auth.hasPermiAnd([
|
||||
'base:equipment-plc-connect:query',
|
||||
'base:equipment-plc-param:query'
|
||||
])
|
||||
? {
|
||||
type: 'detail',
|
||||
btnName: '参数绑定',
|
||||
} : undefined,
|
||||
this.$auth.hasPermiAnd([
|
||||
'base:equipment-plc-connect:update',
|
||||
'base:equipment-plc-connect:query',
|
||||
'base:equipment-plc-param:create',
|
||||
'base:equipment-plc-param:update',
|
||||
'base:equipment-plc-param:delete',
|
||||
'base:equipment-plc-param:query'
|
||||
])
|
||||
{
|
||||
type: 'detail',
|
||||
btnName: '参数绑定',
|
||||
},
|
||||
this.$auth.hasPermi('equipment:collection-config:update')
|
||||
? {
|
||||
type: 'edit',
|
||||
btnName: '修改',
|
||||
}
|
||||
: undefined,
|
||||
this.$auth.hasPermi('base:equipment-plc-connect:delete')
|
||||
this.$auth.hasPermi('equipment:collection-config:delete')
|
||||
? {
|
||||
type: 'delete',
|
||||
btnName: '删除',
|
||||
@ -228,11 +217,11 @@ export default {
|
||||
color: 'primary',
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermi('base:equipment-plc-connect:create')
|
||||
type: this.$auth.hasPermi('equipment:collection-config:create')
|
||||
? 'separate' : '',
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermi('base:equipment-plc-connect:create')
|
||||
type: this.$auth.hasPermi('equipment:collection-config:create')
|
||||
? 'button'
|
||||
: '',
|
||||
// type: 'button',
|
||||
|
||||
@ -108,16 +108,13 @@ export default {
|
||||
tableKey: Math.random(),
|
||||
searchBarKeys: ['name', 'plcTableName'],
|
||||
tableBtn: [
|
||||
this.$auth.hasPermiAnd([
|
||||
'base:equipment-plc:update',
|
||||
'base:equipment-plc:query'
|
||||
])
|
||||
this.$auth.hasPermi('equipment:realtime-table-config:update')
|
||||
? {
|
||||
type: 'edit',
|
||||
btnName: '修改',
|
||||
}
|
||||
: undefined,
|
||||
this.$auth.hasPermi('base:equipment-plc:delete')
|
||||
this.$auth.hasPermi('equipment:realtime-table-config:delete')
|
||||
? {
|
||||
type: 'delete',
|
||||
btnName: '删除',
|
||||
|
||||
@ -91,7 +91,7 @@
|
||||
<!-- btns -->
|
||||
<el-table-column width="188" label="操作">
|
||||
<template slot-scope="scope">
|
||||
<el-tooltip v-if="$auth.hasPermi('equipment:check:update')" content="确认" placement="top">
|
||||
<el-tooltip content="确认" placement="top">
|
||||
<el-button
|
||||
type="text"
|
||||
style="margin: 5px 0; padding: 0"
|
||||
@ -101,8 +101,8 @@
|
||||
</el-button>
|
||||
</el-tooltip>
|
||||
<!-- line -->
|
||||
<span v-if="$auth.hasPermi('equipment:check:query')" style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
|
||||
<el-tooltip v-if="$auth.hasPermi('equipment:check:query')" content="查看详情" placement="top">
|
||||
<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
|
||||
<el-tooltip content="查看详情" placement="top">
|
||||
<el-button
|
||||
type="text"
|
||||
style="margin: 5px 0; padding: 0"
|
||||
@ -111,26 +111,8 @@
|
||||
</el-button>
|
||||
</el-tooltip>
|
||||
<!-- line -->
|
||||
<span v-if="$auth.hasPermiAnd([
|
||||
'equipment:check:update',
|
||||
'base:core-worker:query',
|
||||
'base:group-classes:query',
|
||||
'base:core-department:query',
|
||||
'equipment:check:query',
|
||||
'equipment:check:create',
|
||||
'equipment:check:delete',
|
||||
'base:core-equipment:query'
|
||||
])" style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
|
||||
<el-tooltip v-if="$auth.hasPermiAnd([
|
||||
'equipment:check:update',
|
||||
'base:core-worker:query',
|
||||
'base:group-classes:query',
|
||||
'base:core-department:query',
|
||||
'equipment:check:query',
|
||||
'equipment:check:create',
|
||||
'equipment:check:delete',
|
||||
'base:core-equipment:query'
|
||||
])" content="编辑" placement="top">
|
||||
<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
|
||||
<el-tooltip content="编辑" placement="top">
|
||||
<el-button
|
||||
type="text"
|
||||
style="margin: 5px 0; padding: 0"
|
||||
@ -139,8 +121,8 @@
|
||||
</el-button>
|
||||
</el-tooltip>
|
||||
<!-- line -->
|
||||
<span v-if="$auth.hasPermi('equipment:check:delete')" style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
|
||||
<el-tooltip v-if="$auth.hasPermi('equipment:check:delete')" content="删除" placement="top">
|
||||
<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
|
||||
<el-tooltip content="删除" placement="top">
|
||||
<el-button
|
||||
type="text"
|
||||
style="margin: 5px 0; padding: 0"
|
||||
|
||||
@ -101,23 +101,13 @@ export default {
|
||||
color: 'primary',
|
||||
},
|
||||
{
|
||||
type: (this.$auth.hasPermiAnd([
|
||||
'equipment:check:create',
|
||||
'base:core-worker:query',
|
||||
'base:group-classes:query',
|
||||
'base:core-department:query'
|
||||
]) ||
|
||||
this.$auth.hasPermi('equipment:check:update') ||
|
||||
this.$auth.hasPermi('equipment:check:export'))
|
||||
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.hasPermiAnd([
|
||||
'equipment:check:create',
|
||||
'base:core-worker:query',
|
||||
'base:group-classes:query',
|
||||
'base:core-department:query'
|
||||
])
|
||||
type: this.$auth.hasPermi('equipment:inspection-confirm:create')
|
||||
? 'button'
|
||||
: '',
|
||||
btnName: '新增',
|
||||
@ -126,7 +116,7 @@ export default {
|
||||
color: 'success',
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermi('equipment:check:update')
|
||||
type: this.$auth.hasPermi('equipment:inspection-confirm:confirm')
|
||||
? 'button'
|
||||
: '',
|
||||
btnName: '批量确认',
|
||||
@ -135,7 +125,7 @@ export default {
|
||||
plain: true,
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermi('equipment:check:export')
|
||||
type: this.$auth.hasPermi('equipment:inspection-confirm:export')
|
||||
? 'button'
|
||||
: '',
|
||||
btnName: '导出',
|
||||
|
||||
@ -100,7 +100,7 @@ export default {
|
||||
addContent: false,
|
||||
searchBarKeys: ['name', 'actualCheckTime'],
|
||||
tableBtn: [
|
||||
this.$auth.hasPermi('equipment:check:query')
|
||||
this.$auth.hasPermi('equipment:check-record:detail')
|
||||
? {
|
||||
type: 'detail',
|
||||
btnName: '详情',
|
||||
@ -166,11 +166,11 @@ export default {
|
||||
color: 'primary',
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermi('equipment:check:export')
|
||||
type: this.$auth.hasPermi('equipment:check-record:export')
|
||||
? 'separate' : '',
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermi('equipment:check:export')
|
||||
type: this.$auth.hasPermi('equipment:check-record:export')
|
||||
? 'button'
|
||||
: '',
|
||||
btnName: '导出',
|
||||
|
||||
@ -68,23 +68,14 @@ export default {
|
||||
addOrEditTitle: '',
|
||||
searchBarKeys: ['equipmentId', 'name'],
|
||||
tableBtn: [
|
||||
this.$auth.hasPermiAnd([
|
||||
'equipment:check:create',
|
||||
'equipment:check:query',
|
||||
'equipment:check:update',
|
||||
'equipment:check:delete'
|
||||
])
|
||||
this.$auth.hasPermi('equipment:check-setting:addInsp')
|
||||
? {
|
||||
type: 'add',
|
||||
btnName: '添加',
|
||||
showTip: '添加巡检',
|
||||
}
|
||||
: undefined,
|
||||
this.$auth.hasPermiAnd([
|
||||
'equipment:check:update',
|
||||
'equipment:check:query',
|
||||
'base:core-department:query'
|
||||
])
|
||||
this.$auth.hasPermi('equipment:check-setting:update')
|
||||
? {
|
||||
type: 'edit',
|
||||
btnName: '修改',
|
||||
@ -96,7 +87,7 @@ export default {
|
||||
// btnName: '查看详情',
|
||||
// }
|
||||
// : undefined,
|
||||
this.$auth.hasPermi('equipment:check:delete')
|
||||
this.$auth.hasPermi('equipment:check-setting:delete')
|
||||
? {
|
||||
type: 'delete',
|
||||
btnName: '删除',
|
||||
@ -166,17 +157,11 @@ export default {
|
||||
color: 'primary',
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermiAnd([
|
||||
'equipment:check:create',
|
||||
'base:core-department:query'
|
||||
])
|
||||
type: this.$auth.hasPermi('equipment:check-setting:create')
|
||||
? 'separate' : '',
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermiAnd([
|
||||
'equipment:check:create',
|
||||
'base:core-department:query'
|
||||
])
|
||||
type: this.$auth.hasPermi('equipment:check-setting:create')
|
||||
? 'button'
|
||||
: '',
|
||||
btnName: '新增',
|
||||
|
||||
@ -118,7 +118,7 @@
|
||||
<!-- btns -->
|
||||
<el-table-column width="188" label="操作">
|
||||
<template slot-scope="scope">
|
||||
<el-tooltip v-if="$auth.hasPermi('equipment:maintain-record:update')" content="确认" placement="top">
|
||||
<el-tooltip content="确认" placement="top">
|
||||
<el-button
|
||||
type="text"
|
||||
style="margin: 5px 0; padding: 0"
|
||||
@ -128,8 +128,8 @@
|
||||
</el-button>
|
||||
</el-tooltip>
|
||||
<!-- line -->
|
||||
<span v-if="$auth.hasPermi('equipment:maintain-record:query')" style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
|
||||
<el-tooltip v-if="$auth.hasPermi('equipment:maintain-record:query')" content="查看详情" placement="top">
|
||||
<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
|
||||
<el-tooltip content="查看详情" placement="top">
|
||||
<el-button
|
||||
type="text"
|
||||
style="margin: 5px 0; padding: 0"
|
||||
@ -138,32 +138,18 @@
|
||||
</el-button>
|
||||
</el-tooltip>
|
||||
<!-- line -->
|
||||
<!-- <span v-if="$auth.hasPermiAnd([
|
||||
'equipment:maintain-record:update',
|
||||
'base:core-production-line:query',
|
||||
'base:core-department:query',
|
||||
'equipment:maintain-record:create',
|
||||
'equipment:maintain-record:query',
|
||||
'equipment:maintain-record:delete'
|
||||
])" style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
|
||||
<el-tooltip v-if="$auth.hasPermiAnd([
|
||||
'equipment:maintain-record:update',
|
||||
'base:core-production-line:query',
|
||||
'base:core-department:query',
|
||||
'equipment:maintain-record:create',
|
||||
'equipment:maintain-record:query',
|
||||
'equipment:maintain-record:delete'
|
||||
])" content="编辑" placement="top">
|
||||
<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
|
||||
<el-tooltip content="编辑" placement="top">
|
||||
<el-button
|
||||
type="text"
|
||||
style="margin: 5px 0; padding: 0"
|
||||
@click="$emit('edit', scope.row)">
|
||||
<i class="iconfont icon-edit primary-color" />
|
||||
</el-button>
|
||||
</el-tooltip> -->
|
||||
</el-tooltip>
|
||||
<!-- line -->
|
||||
<span v-if="$auth.hasPermi('equipment:maintain-record:delete')" style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
|
||||
<el-tooltip v-if="$auth.hasPermi('equipment:maintain-record:delete')" content="删除" placement="top">
|
||||
<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
|
||||
<el-tooltip content="删除" placement="top">
|
||||
<el-button
|
||||
type="text"
|
||||
style="margin: 5px 0; padding: 0"
|
||||
|
||||
@ -157,20 +157,10 @@ export default {
|
||||
color: 'primary',
|
||||
},
|
||||
{
|
||||
type: (this.$auth.hasPermiAnd([
|
||||
'equipment:maintain-record:create',
|
||||
'base:core-worker:query',
|
||||
'base:core-production-line:query',
|
||||
'base:core-department:query'
|
||||
]) || this.$auth.hasPermi('equipment:maintain-record:update') || this.$auth.hasPermi('equipment:maintain-record:export')) ? '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.hasPermiAnd([
|
||||
'equipment:maintain-record:create',
|
||||
'base:core-worker:query',
|
||||
'base:core-production-line:query',
|
||||
'base:core-department:query'
|
||||
])
|
||||
type: this.$auth.hasPermi('equipment:maintain-confirm:create')
|
||||
? 'button'
|
||||
: '',
|
||||
btnName: '新增',
|
||||
@ -179,7 +169,7 @@ export default {
|
||||
color: 'success',
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermi('equipment:maintain-record:update')
|
||||
type: this.$auth.hasPermi('equipment:maintain-confirm:confirm')
|
||||
? 'button'
|
||||
: '',
|
||||
btnName: '批量确认',
|
||||
@ -188,7 +178,7 @@ export default {
|
||||
plain: true,
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermi('equipment:maintain-record:export')
|
||||
type: this.$auth.hasPermi('equipment:maintain-confirm:export')
|
||||
? 'button'
|
||||
: '',
|
||||
btnName: '导出',
|
||||
|
||||
@ -160,8 +160,7 @@ export default {
|
||||
// filter: publicFormatter(this.DICT_TYPE.MAINTAIN_TYPE),
|
||||
// },
|
||||
// { prop: 'opt1', label: '设备保养', name: '操作', subcomponent: btn },
|
||||
this.$auth.hasPermi('equipment:plan-config:query') ?
|
||||
{ prop: 'opt2', label: '保养内容', name: '详情', subcomponent: btn, width: 100 } : undefined,
|
||||
{ prop: 'opt2', label: '保养内容', name: '详情', subcomponent: btn, width: 100 },
|
||||
{
|
||||
prop: 'remainDays',
|
||||
label: '距离下次保养剩余时间(天)',
|
||||
@ -191,11 +190,11 @@ export default {
|
||||
color: 'primary',
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermi('equipment:plan-config:export')
|
||||
type: this.$auth.hasPermi('equipment:maintain-monitor:export')
|
||||
? 'separate' : '',
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermi('equipment:plan-config:export')
|
||||
type: this.$auth.hasPermi('equipment:maintain-monitor:export')
|
||||
? 'button'
|
||||
: '',
|
||||
btnName: '导出',
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
<method-btn
|
||||
v-if="tableBtn.length"
|
||||
slot="handleBtn"
|
||||
:width="180"
|
||||
:width="120"
|
||||
label="操作"
|
||||
:method-list="tableBtn"
|
||||
@clickBtn="handleClick" />
|
||||
@ -138,25 +138,13 @@ export default {
|
||||
planName: undefined
|
||||
},
|
||||
tableBtn: [
|
||||
this.$auth.hasPermiAnd([
|
||||
'equipment:plan-config:query',
|
||||
'equipment:plan-config:create',
|
||||
'equipment:plan-config:update',
|
||||
'equipment:plan-config:delete',
|
||||
'base:core-equipment:query'
|
||||
])
|
||||
this.$auth.hasPermi(`equipment:plan-config:add`)
|
||||
? {
|
||||
type: 'add',
|
||||
btnName: '添加内容',
|
||||
}
|
||||
: undefined,
|
||||
this.$auth.hasPermiAnd([
|
||||
'equipment:plan-config:update',
|
||||
'equipment:plan-config:query',
|
||||
'base:core-worker:query',
|
||||
'base:core-production-line:query',
|
||||
'base:core-department:query'
|
||||
])
|
||||
this.$auth.hasPermi(`equipment:plan-config:update`)
|
||||
? {
|
||||
type: 'edit',
|
||||
btnName: '编辑',
|
||||
@ -184,20 +172,10 @@ export default {
|
||||
color: 'primary',
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermiAnd([
|
||||
'equipment:plan-config:create',
|
||||
'base:core-worker:query',
|
||||
'base:core-production-line:query',
|
||||
'base:core-department:query'
|
||||
]) ? 'separate' : '',
|
||||
type: this.$auth.hasPermi('equipment:plan-config:create') ? 'separate' : '',
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermiAnd([
|
||||
'equipment:plan-config:create',
|
||||
'base:core-worker:query',
|
||||
'base:core-production-line:query',
|
||||
'base:core-department:query'
|
||||
]) ? 'button' : '',
|
||||
type: this.$auth.hasPermi('equipment:plan-config:create') ? 'button' : '',
|
||||
btnName: '新增',
|
||||
name: 'add',
|
||||
color: 'success',
|
||||
|
||||
@ -148,8 +148,7 @@ export default {
|
||||
minWidth: 170,
|
||||
showOverflowtooltip: true
|
||||
},
|
||||
this.$auth.hasPermi('equipment:maintain-record:query') ?
|
||||
{ prop: 'opt', label: '详情', name: '详情', subcomponent: btn } : undefined
|
||||
{ prop: 'opt', label: '详情', name: '详情', subcomponent: btn }
|
||||
// { prop: 'maintainDuration', label: '计划保养用时(h)' },
|
||||
// { prop: 'timeUsed', label: '实际保养用时(h)' },
|
||||
// { prop: 'remark', label: '备注' },
|
||||
|
||||
@ -71,7 +71,7 @@ export default {
|
||||
addOrUpdateVisible: false,
|
||||
searchBarKeys: ['maintenanceResult', 'createTime', 'equipmentId'],
|
||||
tableBtn: [
|
||||
this.$auth.hasPermi('equipment:repair:query')
|
||||
this.$auth.hasPermi('equipment:repair:update')
|
||||
? {
|
||||
type: 'detail',
|
||||
btnName: '详情',
|
||||
@ -173,12 +173,7 @@ export default {
|
||||
color: 'primary',
|
||||
},
|
||||
{
|
||||
type: (this.$auth.hasPermi('equipment:repair:export') ||
|
||||
this.$auth.hasPermiAnd([
|
||||
'equipment:repair:create',
|
||||
'base:core-worker:query',
|
||||
'system:user:list'
|
||||
])) ? 'separate' : '',
|
||||
type: (this.$auth.hasPermi('equipment:repair:export') || this.$auth.hasPermi('equipment:repair:create')) ? 'separate' : '',
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermi('equipment:repair:export') ? 'button' : '',
|
||||
@ -188,11 +183,7 @@ export default {
|
||||
color: 'primary',
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermiAnd([
|
||||
'equipment:repair:create',
|
||||
'base:core-worker:query',
|
||||
'system:user:list'
|
||||
]) ? 'button' : '',
|
||||
type: this.$auth.hasPermi('equipment:repair:create') ? 'button' : '',
|
||||
btnName: '新增',
|
||||
name: 'add',
|
||||
plain: true,
|
||||
|
||||
@ -219,7 +219,7 @@ export default {
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermi(
|
||||
'monitoring:equipment:query'
|
||||
'monitoring:device-parameters:query'
|
||||
)
|
||||
? 'button'
|
||||
: '',
|
||||
|
||||
@ -261,7 +261,7 @@ export default {
|
||||
// },
|
||||
{
|
||||
type: this.$auth.hasPermi(
|
||||
'analysis:equipment:query'
|
||||
'monitoring:equipment-traceability:query'
|
||||
)
|
||||
? 'button'
|
||||
: '',
|
||||
@ -271,14 +271,14 @@ export default {
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermi(
|
||||
'analysis:equipment:export'
|
||||
'monitoring:equipment-traceability:export'
|
||||
)
|
||||
? 'separate'
|
||||
: '',
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermi(
|
||||
'analysis:equipment:export'
|
||||
'monitoring:equipment-traceability:export'
|
||||
)
|
||||
? 'button'
|
||||
: '',
|
||||
|
||||
Loading…
Reference in New Issue
Block a user