mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
‘937886381’ 2024-04-12 14:31:56 +08:00
commit e8938a62eb
39 changed files with 518 additions and 316 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
.env.dev
View File

@ -1,7 +1,7 @@
### ###
# @Author: Do not edit # @Author: zhp
# @Date: 2023-08-29 09:40:39 # @Date: 2024-04-12 14:30:48
# @LastEditTime: 2024-04-12 14:13:52 # @LastEditTime: 2024-04-12 14:31:16
# @LastEditors: zhp # @LastEditors: zhp
# @Description: # @Description:
### ###
@ -12,27 +12,18 @@ ENV = 'development'
VUE_APP_TITLE = MES系统 VUE_APP_TITLE = MES系统
# 芋道管理系统/开发环境 # 芋道管理系统/开发环境
# VUE_APP_BASE_API = 'http://100.64.0.26:48082'
# VUE_APP_BASE_API = 'http://10.70.2.2:8080'
# VUE_APP_BASE_API = 'http://192.168.1.20:48080'
# VUE_APP_BASE_API = 'http://192.168.2.173:48080'
# VUE_APP_BASE_API = 'http://192.168.1.49:48082'
# 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'
# socket地址
# VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
# VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
VUE_APP_Socket_API = 'ws://192.168.0.33:48082'
VUE_APP_Socket_Dcs_API = 'ws://192.168.0.33:8080'
# 积木报表指向地址 # 积木报表指向地址
VUE_APP_JIMU_API = 'http://10.70.2.22:8080' VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
# socket地址(现场)
# VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
# socket地址(公司线上)
VUE_APP_Socket_API = 'ws://192.168.0.33:48082'
# socket dcs地址(只有现场)
VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
# 路由懒加载 # 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true

9
.env.prod
View File

@ -1,11 +1,4 @@
### # 生产环境配置（许昌现场）
# @Author: zhp
# @Date: 2023-11-07 19:11:40
# @LastEditTime: 2023-11-16 16:40:59
# @LastEditors: zhp
# @Description:
###
# 生产环境配置
ENV = 'production' ENV = 'production'
# 页面标题 # 页面标题

9
.env.stage
View File

@ -1,4 +1,4 @@
# 生产环境配置 # 公司线上环境（33服务器）
ENV = 'production' ENV = 'production'
# 页面标题 # 页面标题
@ -7,15 +7,12 @@ VUE_APP_TITLE = MES系统
# 芋道管理系统/生产环境 # 芋道管理系统/生产环境
VUE_APP_BASE_API = '/prod-api' VUE_APP_BASE_API = '/prod-api'
# dcs地址
VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
# socket地址
VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
# 积木报表指向地址 # 积木报表指向地址
VUE_APP_JIMU_API = 'http://192.168.0.33:48082' VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
# socket地址 # socket地址
VUE_APP_Socket_API = 'ws://192.168.0.33:48082' VUE_APP_Socket_API = 'ws://192.168.0.33:48082'
# dcs地址（只有现场的）
VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
# 根据服务器或域名修改 # 根据服务器或域名修改

2
src/views/base/coreCustomer/index.vue
View File

@ -138,7 +138,7 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', type: this.$auth.hasPermi('base:core-customer:create') ? 'separate' : '',
}, },
{ {
type: this.$auth.hasPermi('base:core-customer:create') ? 'button' : '', type: this.$auth.hasPermi('base:core-customer:create') ? 'button' : '',

2
src/views/base/coreDepartment/index.vue
View File

@ -110,7 +110,7 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', type: this.$auth.hasPermi('base:core-department:create') ? 'separate' : '',
}, },
{ {
type: this.$auth.hasPermi('base:core-department:create') ? 'button' : '', type: this.$auth.hasPermi('base:core-department:create') ? 'button' : '',

8
src/views/base/coreEquipment/index.vue
View File

@ -156,11 +156,11 @@ export default {
prop: 'createTime', prop: 'createTime',
label: '添加时间', label: '添加时间',
fixed: true, fixed: true,
width: 180, minWidth: 180,
filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'), filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
}, },
{ prop: 'name', label: '设备名称', width: 180, showOverflowtooltip: true }, { prop: 'name', label: '设备名称', minWidth: 180, showOverflowtooltip: true },
{ width: 250, prop: 'code', label: '设备编码' }, { minWidth: 250, prop: 'code', label: '设备编码' },
{ prop: 'equipmentTypeName', label: '设备类型' }, { prop: 'equipmentTypeName', label: '设备类型' },
{ prop: 'enName', label: '英文名称' }, { prop: 'enName', label: '英文名称' },
{ prop: 'abbr', label: '缩写' }, { prop: 'abbr', label: '缩写' },
@ -211,7 +211,7 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', type: (this.$auth.hasPermi('base:core-equipment:export') || this.$auth.hasPermi('base:core-equipment:create')) ? 'separate' : '',
}, },
{ {
type: this.$auth.hasPermi('base:core-equipment:export') type: this.$auth.hasPermi('base:core-equipment:export')

3
src/views/base/coreEquipmentLineBind/index.vue
View File

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

5
src/views/base/coreEquipmentType/index.vue
View File

@ -90,7 +90,7 @@ export default {
prop: 'createTime', prop: 'createTime',
label: '添加时间', label: '添加时间',
fixed: true, fixed: true,
width: 180, minWidth: 180,
filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'), filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
}, },
{ prop: 'name', label: '类型名称' }, { prop: 'name', label: '类型名称' },
@ -111,7 +111,8 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', type: this.$auth.hasPermi('base:core-equipment-type:create')
? 'separate' : '',
}, },
{ {
type: this.$auth.hasPermi('base:core-equipment-type:create') type: this.$auth.hasPermi('base:core-equipment-type:create')

2
src/views/base/coreHotMaterial/index.vue
View File

@ -137,7 +137,7 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', type: this.$auth.hasPermi('base:core-hot-material-check:create') ? 'separate' : '',
}, },
{ {
type: this.$auth.hasPermi('base:core-hot-material-check:create') ? 'button' : '', type: this.$auth.hasPermi('base:core-hot-material-check:create') ? 'button' : '',

2
src/views/base/coreMajor/index.vue
View File

@ -110,7 +110,7 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', type: this.$auth.hasPermi('base:core-major:create') ? 'separate' : '',
}, },
{ {
type: this.$auth.hasPermi('base:core-major:create') ? 'button' : '', type: this.$auth.hasPermi('base:core-major:create') ? 'button' : '',

18
src/views/base/coreProduct/index.vue
View File

@ -14,7 +14,7 @@
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="120" :Width="120"
label="操作" label="操作"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" /> @clickBtn="handleClick" />
@ -48,45 +48,45 @@ const tableProps = [
prop: 'createTime', prop: 'createTime',
label: '添加时间', label: '添加时间',
filter: parseTime, filter: parseTime,
width: 150, minWidth: 150,
showOverflowtooltip: true showOverflowtooltip: true
}, },
{ {
prop: 'name', prop: 'name',
label: '产品名称', label: '产品名称',
width: 150, minWidth: 150,
showOverflowtooltip: true showOverflowtooltip: true
}, },
{ {
prop: 'code', prop: 'code',
label: '产品编码', label: '产品编码',
width: 190, minWidth: 190,
showOverflowtooltip: true showOverflowtooltip: true
}, },
{ {
prop: 'productType', prop: 'productType',
label: '产品类型', label: '产品类型',
filter: publicFormatter('product_type'), filter: publicFormatter('product_type'),
width: 180, minWidth: 180,
showOverflowtooltip: true showOverflowtooltip: true
}, },
{ {
prop: 'specifications', prop: 'specifications',
label: '规格', label: '规格',
width: 150, minWidth: 150,
showOverflowtooltip: true showOverflowtooltip: true
}, },
{ {
prop: 'unit', prop: 'unit',
label: '单位', label: '单位',
filter: publicFormatter('unit_dict'), filter: publicFormatter('unit_dict'),
width: 90, minWidth: 90,
showOverflowtooltip: true showOverflowtooltip: true
}, },
{ {
prop: 'remark', prop: 'remark',
label: '备注', label: '备注',
width: 120, minWidth: 120,
showOverflowtooltip: true showOverflowtooltip: true
}, },
]; ];
@ -141,7 +141,7 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', type: this.$auth.hasPermi('base:core-product:create') ? 'separate' : '',
}, },
{ {
type: this.$auth.hasPermi('base:core-product:create') ? 'button' : '', type: this.$auth.hasPermi('base:core-product:create') ? 'button' : '',

22
src/views/base/coreProductionLine/index.vue
View File

@ -14,7 +14,7 @@
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="120" :minWidth="120"
label="操作" label="操作"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" /> @clickBtn="handleClick" />
@ -30,7 +30,7 @@
@cancel="handleCancel" @cancel="handleCancel"
@confirm="handleConfirm" @confirm="handleConfirm"
:before-close="handleCancel" :before-close="handleCancel"
width="50%"> minWidth="50%">
<add-or-update <add-or-update
ref="addOrUpdate" ref="addOrUpdate"
@refreshDataList="successSubmit"></add-or-update> @refreshDataList="successSubmit"></add-or-update>
@ -56,39 +56,39 @@ const tableProps = [
prop: 'createTime', prop: 'createTime',
label: '添加时间', label: '添加时间',
filter: parseTime, filter: parseTime,
width: 150, minWidth: 150,
showOverflowtooltip: true showOverflowtooltip: true
}, },
{ {
prop: 'factoryName', prop: 'factoryName',
label: '工厂', label: '工厂',
width: 150, minWidth: 150,
showOverflowtooltip: true showOverflowtooltip: true
}, },
{ {
prop: 'roomNameDict', prop: 'roomNameDict',
label: '车间名称', label: '车间名称',
filter: publicFormatter('workshop'), filter: publicFormatter('workshop'),
width: 120, minWidth: 120,
showOverflowtooltip: true showOverflowtooltip: true
}, },
{ {
prop: 'name', prop: 'name',
label: '产线名称', label: '产线名称',
width: 120, minWidth: 120,
showOverflowtooltip: true showOverflowtooltip: true
}, },
{ {
prop: 'code', prop: 'code',
label: '产线编码', label: '产线编码',
width: 150, minWidth: 150,
showOverflowtooltip: true showOverflowtooltip: true
}, },
{ {
prop: 'enabled', prop: 'enabled',
label: '当前状态', label: '当前状态',
filter: codeFilter('lineStatus'), filter: codeFilter('lineStatus'),
width: 120, minWidth: 120,
showOverflowtooltip: true showOverflowtooltip: true
}, },
// { // {
@ -98,13 +98,13 @@ const tableProps = [
{ {
prop: 'description', prop: 'description',
label: '描述', label: '描述',
width: 120, minWidth: 120,
showOverflowtooltip: true showOverflowtooltip: true
}, },
{ {
prop: 'remark', prop: 'remark',
label: '备注', label: '备注',
width: 120, minWidth: 120,
showOverflowtooltip: true showOverflowtooltip: true
} }
]; ];
@ -147,7 +147,7 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', type: this.$auth.hasPermi('base:core-production-line:create') ? 'separate' : '',
}, },
{ {
type: this.$auth.hasPermi('base:core-production-line:create') ? 'button' : '', type: this.$auth.hasPermi('base:core-production-line:create') ? 'button' : '',

2
src/views/base/coreSupplier/index.vue
View File

@ -132,7 +132,7 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', type: this.$auth.hasPermi('base:core-supplier:create') ? 'separate' : '',
}, },
{ {
type: this.$auth.hasPermi('base:core-supplier:create') ? 'button' : '', type: this.$auth.hasPermi('base:core-supplier:create') ? 'button' : '',

6
src/views/base/coreWorkOrder/detail.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-11-18 14:16:25 * @Date: 2021-11-18 14:16:25
* @LastEditors: DY * @LastEditors: DY
* @LastEditTime: 2024-04-08 14:27:29 * @LastEditTime: 2024-04-10 16:16:31
* @Description: * @Description:
--> -->
<template> <template>
@ -201,6 +201,7 @@
@pagination="getList" /> --> @pagination="getList" /> -->
</div> </div>
<div v-if="this.$auth.hasPermiAnd(['base:material-product-bom-det:query', 'extend:process-flow:query'])">
<div class="card" style="padding-bottom: 16px;"> <div class="card" style="padding-bottom: 16px;">
<div class="boxTitle"> <div class="boxTitle">
<span class="blueTitle"></span> <span class="blueTitle"></span>
@ -220,6 +221,7 @@
:page-sizes="[5, 10, 15]" :page-sizes="[5, 10, 15]"
@pagination="getList" /> --> @pagination="getList" /> -->
</div> </div>
</div>
<!-- <div class="drawer-body__footer"> <!-- <div class="drawer-body__footer">
<el-button type="primary" @click="goback()">关闭</el-button> <el-button type="primary" @click="goback()">关闭</el-button>
@ -461,7 +463,7 @@ export default {
}); });
// 获取预使用原料列表 // 获取预使用原料列表
console.log('111我看看', this.dataForm.materialMethod) console.log('111我看看', this.dataForm.materialMethod)
if (this.dataForm.id) { if (this.dataForm.id && this.$auth.hasPermiAnd(['base:material-product-bom-det:query', 'extend:process-flow:query'])) {
if (this.dataForm.materialMethod === 1) { if (this.dataForm.materialMethod === 1) {
// 产品 // 产品
getlistByProductId({ getlistByProductId({

35
src/views/base/coreWorkOrder/index.vue
View File

@ -157,7 +157,8 @@ export default {
// showTip: '预使用原料信息' // showTip: '预使用原料信息'
// } // }
// : undefined, // : undefined,
{ this.$auth.hasPermi(`base:core-work-order:update`)
? {
type: 'active', type: 'active',
btnName: '激活', btnName: '激活',
showParam: { showParam: {
@ -175,8 +176,10 @@ export default {
} }
] ]
} }
}, }
{ : undefined,
this.$auth.hasPermi(`base:core-work-order:update`)
? {
type: 'pause', type: 'pause',
btnName: '暂停', btnName: '暂停',
showParam: { showParam: {
@ -189,8 +192,10 @@ export default {
} }
] ]
} }
}, }
{ : undefined,
this.$auth.hasPermi(`base:core-work-order:update`)
? {
type: 'nullify', type: 'nullify',
btnName: '作废', btnName: '作废',
showParam: { showParam: {
@ -203,8 +208,10 @@ export default {
} }
] ]
} }
}, }
{ : undefined,
this.$auth.hasPermi(`base:core-work-order:update`)
? {
type: 'finish', type: 'finish',
btnName: '完成', btnName: '完成',
showParam: { showParam: {
@ -222,8 +229,10 @@ export default {
} }
] ]
} }
}, }
{ : undefined,
this.$auth.hasPermi(`base:core-work-order:update`)
? {
type: 'stop', type: 'stop',
btnName: '终止', btnName: '终止',
showParam: { showParam: {
@ -241,8 +250,12 @@ export default {
} }
] ]
} }
}, }
this.$auth.hasPermi(`base:core-work-order:detail`) : undefined,
this.$auth.hasPermiAnd([
'base:core-work-order:query',
'base:order:query'
])
? { ? {
type: 'detail', type: 'detail',
btnName: '查看详情', btnName: '查看详情',

2
src/views/base/coreWorker/index.vue
View File

@ -163,7 +163,7 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', type: this.$auth.hasPermi('base:core-worker:create') ? 'separate' : '',
}, },
{ {
type: this.$auth.hasPermi('base:core-worker:create') ? 'button' : '', type: this.$auth.hasPermi('base:core-worker:create') ? 'button' : '',

5
src/views/base/coreWorkshopSection/index.vue
View File

@ -52,8 +52,7 @@ const tableProps = [
{ {
prop: 'createTime', prop: 'createTime',
label: '添加时间', label: '添加时间',
filter: parseTime, filter: parseTime
}, },
{ {
prop: 'code', prop: 'code',
@ -116,7 +115,7 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', type: this.$auth.hasPermi('base:core-workshop-section:create') ? 'separate' : '',
}, },
{ {
type: this.$auth.hasPermi('base:core-workshop-section:create') ? 'button' : '', type: this.$auth.hasPermi('base:core-workshop-section:create') ? 'button' : '',

51
src/views/base/material/add-or-updata.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-11-18 14:16:25 * @Date: 2021-11-18 14:16:25
* @LastEditors: DY * @LastEditors: DY
* @LastEditTime: 2024-03-21 15:21:32 * @LastEditTime: 2024-04-11 16:22:19
* @Description: * @Description:
--> -->
<template> <template>
@ -122,14 +122,14 @@
</el-form> </el-form>
</div> </div>
<div class="attr-list" v-if="idAttrShow"> <div class="attr-list" v-if="idAttrShow && this.$auth.hasPermi('base:material-attr:query')">
<small-title <small-title
style="margin: 16px 0; padding-left: 8px" style="margin: 16px 0; padding-left: 8px"
:no-padding="true"> :no-padding="true">
物料属性 物料属性
</small-title> </small-title>
<div v-if="!isdetail" class="action_btn"> <div v-if="!isdetail && this.$auth.hasPermi('base:material-attr:create')" class="action_btn">
<template> <template>
<span style="display: inline-block;"> <span style="display: inline-block;">
<el-button type="text" @click="addNew()" icon="el-icon-plus">新增</el-button> <el-button type="text" @click="addNew()" icon="el-icon-plus">新增</el-button>
@ -182,16 +182,23 @@ import { parseTime } from '../../core/mixins/code-filter';
import attrAdd from './attr-add'; import attrAdd from './attr-add';
import { getDictDatas } from "@/utils/dict"; import { getDictDatas } from "@/utils/dict";
const tableBtn = [ // const tableBtn = [
{ // this.$auth.hasPermiAnd([
type: 'edit', // 'base:material-attr:create',
btnName: '编辑', // 'base:material-attr:update'
}, // ]) ?
{ // {
type: 'delete', // type: 'edit',
btnName: '删除', // btnName: '编辑',
}, // }
]; // : undefined,
// this.$auth.hasPermi('base:material-attr:delete') ?
// {
// type: 'delete',
// btnName: '删除',
// }
// : undefined,
// ];
const tableProps = [ const tableProps = [
{ {
prop: 'createTime', prop: 'createTime',
@ -213,7 +220,23 @@ export default {
components: { SmallTitle, attrAdd }, components: { SmallTitle, attrAdd },
data() { data() {
return { return {
tableBtn, tableBtn: [
this.$auth.hasPermiAnd([
'base:material-attr:create',
'base:material-attr:update'
]) ?
{
type: 'edit',
btnName: '编辑',
}
: undefined,
this.$auth.hasPermi('base:material-attr:delete') ?
{
type: 'delete',
btnName: '删除',
}
: undefined,
],
tableProps, tableProps,
addOrUpdateVisible: false, addOrUpdateVisible: false,
urlOptions: { urlOptions: {

2
src/views/base/material/index.vue
View File

@ -134,7 +134,7 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', type: this.$auth.hasPermi('base:material:create') ? 'separate' : '',
}, },
{ {
type: this.$auth.hasPermi('base:material:create') ? 'button' : '', type: this.$auth.hasPermi('base:material:create') ? 'button' : '',

45
src/views/base/materialProductBom/add-or-updata.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-11-18 14:16:25 * @Date: 2021-11-18 14:16:25
* @LastEditors: DY * @LastEditors: DY
* @LastEditTime: 2024-03-21 14:39:52 * @LastEditTime: 2024-04-11 16:44:41
* @Description: * @Description:
--> -->
<template> <template>
@ -56,14 +56,14 @@
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
<div class="attr-list" v-if="idAttrShow"> <div class="attr-list" v-if="idAttrShow && this.$auth.hasPermiAnd(['base:material-product-bom:query', 'base:material-product-bom-det:query'])">
<small-title <small-title
style="margin: 16px 0; padding-left: 8px" style="margin: 16px 0; padding-left: 8px"
:no-padding="true"> :no-padding="true">
BOM明细 BOM明细
</small-title> </small-title>
<div v-if="!isdetail" class="action_btn"> <div v-if="!isdetail && this.$auth.hasPermi('base:material-product-bom:create')" class="action_btn">
<template> <template>
<span style="display: inline-block;"> <span style="display: inline-block;">
<el-button type="text" @click="addNew()" icon="el-icon-plus">添加</el-button> <el-button type="text" @click="addNew()" icon="el-icon-plus">添加</el-button>
@ -116,16 +116,16 @@ import { parseTime } from '../../core/mixins/code-filter';
import attrAdd from './attr-add'; import attrAdd from './attr-add';
import { publicFormatter } from '@/utils/dict'; import { publicFormatter } from '@/utils/dict';
const tableBtn = [ // const tableBtn = [
{ // {
type: 'edit', // type: 'edit',
btnName: '编辑', // btnName: '编辑',
}, // },
{ // {
type: 'delete', // type: 'delete',
btnName: '删除', // btnName: '删除',
}, // },
]; // ];
const tableProps = [ const tableProps = [
{ {
prop: 'createTime', prop: 'createTime',
@ -160,7 +160,24 @@ export default {
components: { SmallTitle, attrAdd }, components: { SmallTitle, attrAdd },
data() { data() {
return { return {
tableBtn, tableBtn: [
this.$auth.hasPermiAnd([
'base:material-product-bom:update',
'base:material-product-bom-det:create',
'base:material-product-bom-det:update'
]) ?
{
type: 'edit',
btnName: '编辑',
}
: undefined,
this.$auth.hasPermi('base:material-product-bom:delete') ?
{
type: 'delete',
btnName: '删除',
}
: undefined,
],
tableProps, tableProps,
addOrUpdateVisible: false, addOrUpdateVisible: false,
urlOptions: { urlOptions: {

2
src/views/base/materialProductBom/index.vue
View File

@ -110,7 +110,7 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', type: this.$auth.hasPermi('base:material:create') ? 'separate' : '',
}, },
{ {
type: this.$auth.hasPermi('base:material:create') ? 'button' : '', type: this.$auth.hasPermi('base:material:create') ? 'button' : '',

2
src/views/core/base/factory/index.vue
View File

@ -125,7 +125,7 @@ export default {
// name: 'reset', // name: 'reset',
// }, // },
{ {
type: 'separate', type: this.$auth.hasPermi('base:core-factory:create') ? 'separate' : '',
}, },
{ {
type: this.$auth.hasPermi('base:core-factory:create') ? 'button' : '', type: this.$auth.hasPermi('base:core-factory:create') ? 'button' : '',

8
src/views/energy/analysis/trendAnalysis/index.vue
View File

@ -57,10 +57,14 @@ export default {
let listObj = { useNum: '消耗量' }; // 数据 let listObj = { useNum: '消耗量' }; // 数据
for (let i = 0; i < arr.length; i++) { for (let i = 0; i < arr.length; i++) {
let obj = {}; let obj = {};
if (this.timeDim === '3') {
let fName = arr[i].time.slice(0, 4); let fName = arr[i].time.slice(0, 4);
let lName = arr[i].time.slice(4, 6); let lName = arr[i].time.slice(4, 6);
obj.prop = arr[i].time;
obj.label = fName + ' 第 ' + lName + ' 周'; obj.label = fName + ' 第 ' + lName + ' 周';
} else {
obj.label = arr[i].time;
}
obj.prop = arr[i].time;
obj.minWidth = 100; obj.minWidth = 100;
tempX.push(obj); tempX.push(obj);
listObj[arr[i].time] = arr[i].useNum || null; listObj[arr[i].time] = arr[i].useNum || null;
@ -97,7 +101,7 @@ export default {
}, },
}; };
</script> </script>
<style lang='scss'> <style lang="scss">
.trendAnalysisBox { .trendAnalysisBox {
.trend-out-table { .trend-out-table {
margin-bottom: 15px; margin-bottom: 15px;

3
src/views/energy/monitoring/energyLimit/index.vue
View File

@ -266,8 +266,9 @@ export default {
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
console.log(row);
this.$modal this.$modal
.confirm('是否确认删除监控对象为"' + row.objName + '"的数据项?') .confirm('是否确认删除第"' + row._pageIndex + '"条数据项?')
.then(function () { .then(function () {
return deleteEnergyLimit(row.id); return deleteEnergyLimit(row.id);
}) })

16
src/views/equipment/base/alarm/Record/index.vue
View File

@ -130,8 +130,20 @@ export default {
{ prop: 'createTime', label: '报警时间', filter: timeFilter, width: 150, showOverflowtooltip: true }, { prop: 'createTime', label: '报警时间', filter: timeFilter, width: 150, showOverflowtooltip: true },
{ prop: 'alarmCode', label: '设备报警码', width: 180, showOverflowtooltip: true }, { prop: 'alarmCode', label: '设备报警码', width: 180, showOverflowtooltip: true },
{ prop: 'alarmContent', label: '报警内容', width: 150, showOverflowtooltip: true }, { prop: 'alarmContent', label: '报警内容', width: 150, showOverflowtooltip: true },
{ prop: 'opt1', label: '处理记录', name: '查看', subcomponent: btn }, this.$auth.hasPermiAnd([
{ prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn }, '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: 'remark', label: '备注' }, // { prop: 'remark', label: '备注' },
], ],
searchBarFormConfig: [ searchBarFormConfig: [

22
src/views/equipment/base/config/AlarmGroup/index.vue
View File

@ -122,19 +122,30 @@ export default {
editMode: '', editMode: '',
searchBarKeys: ['name', 'code'], searchBarKeys: ['name', 'code'],
tableBtn: [ tableBtn: [
this.$auth.hasPermi('equipment:alarm-group:update') this.$auth.hasPermiAnd([
'base:equipment-group:query',
'base:equipment-group-alarm:query'
])
? { ? {
type: 'detail', type: 'detail',
btnName: '查看报警', btnName: '查看报警',
} }
: undefined, : undefined,
this.$auth.hasPermi('equipment:alarm-group:update') 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'
])
? { ? {
type: 'edit', type: 'edit',
btnName: '修改', btnName: '修改',
} }
: undefined, : undefined,
this.$auth.hasPermi('equipment:alarm-group:delete') this.$auth.hasPermi('base:equipment-group:delete')
? { ? {
type: 'delete', type: 'delete',
btnName: '删除', btnName: '删除',
@ -244,10 +255,11 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', type: this.$auth.hasPermi('base:equipment-group:create')
? 'separate' : '',
}, },
{ {
type: this.$auth.hasPermi('equipment:alarm-group:create') type: this.$auth.hasPermi('base:equipment-group:create')
? 'button' ? 'button'
: '', : '',
btnName: '新增', btnName: '新增',

25
src/views/equipment/base/config/BindGroup/index.vue
View File

@ -123,13 +123,23 @@ export default {
return { return {
searchBarKeys: ['groupId', 'equipmentName'], searchBarKeys: ['groupId', 'equipmentName'],
tableBtn: [ tableBtn: [
this.$auth.hasPermi('equipment:bind-group:update') this.$auth.hasPermiAnd([
'base:equipment-group-alarm:query',
'base:core-equipment:query'
])
? { ? {
type: 'detail', type: 'detail',
btnName: '查看报警', btnName: '查看报警',
} }
: undefined, : undefined,
this.$auth.hasPermi('equipment:bind-group:update') 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'
])
? { ? {
type: 'edit', type: 'edit',
btnName: '修改', btnName: '修改',
@ -201,11 +211,16 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', type: this.$auth.hasPermiAnd([
'equipment:bind-group:create',
'base:core-equipment:query'
]) ? 'separate' : '',
}, },
{ {
type: this.$auth.hasPermi('equipment:bind-group:create') type: this.$auth.hasPermiAnd([
? 'button' 'equipment:bind-group:create',
'base:core-equipment:query'
]) ? 'button'
: '', : '',
btnName: '新增', btnName: '新增',
name: 'add', name: 'add',

40
src/views/equipment/base/config/DataCollection/CollectionConfig.vue
View File

@ -140,17 +140,28 @@ export default {
// tableBtn: [ // tableBtn: [
// ].filter((v) => v), // ].filter((v) => v),
tableBtn: [ tableBtn: [
{ this.$auth.hasPermiAnd([
'base:equipment-plc-connect:query',
'base:equipment-plc-param:query'
])
? {
type: 'detail', type: 'detail',
btnName: '参数绑定', btnName: '参数绑定',
}, } : undefined,
this.$auth.hasPermi('equipment:collection-config:update') 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: 'edit', type: 'edit',
btnName: '修改', btnName: '修改',
} }
: undefined, : undefined,
this.$auth.hasPermi('equipment:collection-config:delete') this.$auth.hasPermi('base:equipment-plc-connect:delete')
? { ? {
type: 'delete', type: 'delete',
btnName: '删除', btnName: '删除',
@ -158,14 +169,14 @@ export default {
: undefined, : undefined,
].filter((v) => v), ].filter((v) => v),
tableProps: [ tableProps: [
{ prop: 'productionLine', label: '产线', width: 120, showOverflowtooltip: true }, { prop: 'productionLine', label: '产线', minWidth: 120, showOverflowtooltip: true },
{ prop: 'workshopSection', label: '工段', width: 120, showOverflowtooltip: true }, { prop: 'workshopSection', label: '工段', minWidth: 120, showOverflowtooltip: true },
{ prop: 'equipmentName', label: '设备名', width: 120, showOverflowtooltip: true }, { prop: 'equipmentName', label: '设备名', minWidth: 120, showOverflowtooltip: true },
{ prop: 'equipmentCode', label: '设备编码', width: 200, showOverflowtooltip: true }, { prop: 'equipmentCode', label: '设备编码', minWidth: 200, showOverflowtooltip: true },
{ prop: 'plcCode', label: '关联表编码', width: 220, showOverflowtooltip: true }, { prop: 'plcCode', label: '关联表编码', minWidth: 220, showOverflowtooltip: true },
{ prop: 'plcTableName', label: '关联表名', width: 150, showOverflowtooltip: true }, { prop: 'plcTableName', label: '关联表名', minWidth: 150, showOverflowtooltip: true },
{ prop: 'plcName', label: '标识名称', width: 150, showOverflowtooltip: true }, { prop: 'plcName', label: '标识名称', minWidth: 150, showOverflowtooltip: true },
{ prop: 'bindingParameters', label: '绑定参数数量', width: 120, showOverflowtooltip: true }, { prop: 'bindingParameters', label: '绑定参数数量', minWidth: 120, showOverflowtooltip: true },
// { // {
// _action: 'params-bind', // _action: 'params-bind',
// label: '查看绑定', // label: '查看绑定',
@ -217,10 +228,11 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', type: this.$auth.hasPermi('base:equipment-plc-connect:create')
? 'separate' : '',
}, },
{ {
type: this.$auth.hasPermi('equipment:collection-config:create') type: this.$auth.hasPermi('base:equipment-plc-connect:create')
? 'button' ? 'button'
: '', : '',
// type: 'button', // type: 'button',

18
src/views/equipment/base/config/DataCollection/TableConfig.vue
View File

@ -108,13 +108,16 @@ export default {
tableKey: Math.random(), tableKey: Math.random(),
searchBarKeys: ['name', 'plcTableName'], searchBarKeys: ['name', 'plcTableName'],
tableBtn: [ tableBtn: [
this.$auth.hasPermi('equipment:realtime-table-config:update') this.$auth.hasPermiAnd([
'base:equipment-plc:update',
'base:equipment-plc:query'
])
? { ? {
type: 'edit', type: 'edit',
btnName: '修改', btnName: '修改',
} }
: undefined, : undefined,
this.$auth.hasPermi('equipment:realtime-table-config:delete') this.$auth.hasPermi('base:equipment-plc:delete')
? { ? {
type: 'delete', type: 'delete',
btnName: '删除', btnName: '删除',
@ -160,13 +163,12 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', type: this.$auth.hasPermi('base:equipment-plc:create')
? 'separate' : '',
}, },
{ {
// type: this.$auth.hasPermi('equipment:realtime-table-config:create') type: this.$auth.hasPermi('base:equipment-plc:create')
// ? 'button' ? 'button' : '',
// : '',
type: 'button',
btnName: '新增', btnName: '新增',
name: 'add', name: 'add',
plain: true, plain: true,
@ -194,7 +196,7 @@ export default {
input: true, input: true,
label: '编码', label: '编码',
prop: 'code', prop: 'code',
url: '/base/equipment-group/getCode', url: '/base/energy-plc/getCode',
rules: [{ required: true, message: '编码不能为空', trigger: 'blur' }], rules: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
}, },
], ],

32
src/views/equipment/base/inspection/Confirm/WaitingListTable.vue
View File

@ -91,7 +91,7 @@
<!-- btns --> <!-- btns -->
<el-table-column width="188" label="操作"> <el-table-column width="188" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip content="确认" placement="top"> <el-tooltip v-if="$auth.hasPermi('equipment:check:update')" content="确认" placement="top">
<el-button <el-button
type="text" type="text"
style="margin: 5px 0; padding: 0" style="margin: 5px 0; padding: 0"
@ -101,8 +101,8 @@
</el-button> </el-button>
</el-tooltip> </el-tooltip>
<!-- line --> <!-- line -->
<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span> <span v-if="$auth.hasPermi('equipment:check:query')" style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
<el-tooltip content="查看详情" placement="top"> <el-tooltip v-if="$auth.hasPermi('equipment:check:query')" content="查看详情" placement="top">
<el-button <el-button
type="text" type="text"
style="margin: 5px 0; padding: 0" style="margin: 5px 0; padding: 0"
@ -111,8 +111,26 @@
</el-button> </el-button>
</el-tooltip> </el-tooltip>
<!-- line --> <!-- line -->
<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span> <span v-if="$auth.hasPermiAnd([
<el-tooltip content="编辑" placement="top"> '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">
<el-button <el-button
type="text" type="text"
style="margin: 5px 0; padding: 0" style="margin: 5px 0; padding: 0"
@ -121,8 +139,8 @@
</el-button> </el-button>
</el-tooltip> </el-tooltip>
<!-- line --> <!-- line -->
<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span> <span v-if="$auth.hasPermi('equipment:check:delete')" style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
<el-tooltip content="删除" placement="top"> <el-tooltip v-if="$auth.hasPermi('equipment:check:delete')" content="删除" placement="top">
<el-button <el-button
type="text" type="text"
style="margin: 5px 0; padding: 0" style="margin: 5px 0; padding: 0"

21
src/views/equipment/base/inspection/Confirm/index.vue
View File

@ -101,10 +101,23 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', 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'))
? 'separate' : '',
}, },
{ {
type: this.$auth.hasPermi('equipment:inspection-confirm:create') type: this.$auth.hasPermiAnd([
'equipment:check:create',
'base:core-worker:query',
'base:group-classes:query',
'base:core-department:query'
])
? 'button' ? 'button'
: '', : '',
btnName: '新增', btnName: '新增',
@ -113,7 +126,7 @@ export default {
color: 'success', color: 'success',
}, },
{ {
type: this.$auth.hasPermi('equipment:inspection-confirm:confirm') type: this.$auth.hasPermi('equipment:check:update')
? 'button' ? 'button'
: '', : '',
btnName: '批量确认', btnName: '批量确认',
@ -122,7 +135,7 @@ export default {
plain: true, plain: true,
}, },
{ {
type: this.$auth.hasPermi('equipment:inspection-confirm:export') type: this.$auth.hasPermi('equipment:check:export')
? 'button' ? 'button'
: '', : '',
btnName: '导出', btnName: '导出',

7
src/views/equipment/base/inspection/Record/index.vue
View File

@ -100,7 +100,7 @@ export default {
addContent: false, addContent: false,
searchBarKeys: ['name', 'actualCheckTime'], searchBarKeys: ['name', 'actualCheckTime'],
tableBtn: [ tableBtn: [
this.$auth.hasPermi('equipment:check-record:detail') this.$auth.hasPermi('equipment:check:query')
? { ? {
type: 'detail', type: 'detail',
btnName: '详情', btnName: '详情',
@ -166,10 +166,11 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', type: this.$auth.hasPermi('equipment:check:export')
? 'separate' : '',
}, },
{ {
type: this.$auth.hasPermi('equipment:check-record:export') type: this.$auth.hasPermi('equipment:check:export')
? 'button' ? 'button'
: '', : '',
btnName: '导出', btnName: '导出',

26
src/views/equipment/base/inspection/Settings/index.vue
View File

@ -68,14 +68,23 @@ export default {
addOrEditTitle: '', addOrEditTitle: '',
searchBarKeys: ['equipmentId', 'name'], searchBarKeys: ['equipmentId', 'name'],
tableBtn: [ tableBtn: [
this.$auth.hasPermi('equipment:check-setting:addInsp') this.$auth.hasPermiAnd([
'equipment:check:create',
'equipment:check:query',
'equipment:check:update',
'equipment:check:delete'
])
? { ? {
type: 'add', type: 'add',
btnName: '添加', btnName: '添加',
showTip: '添加巡检', showTip: '添加巡检',
} }
: undefined, : undefined,
this.$auth.hasPermi('equipment:check-setting:update') this.$auth.hasPermiAnd([
'equipment:check:update',
'equipment:check:query',
'base:core-department:query'
])
? { ? {
type: 'edit', type: 'edit',
btnName: '修改', btnName: '修改',
@ -87,7 +96,7 @@ export default {
// btnName: '查看详情', // btnName: '查看详情',
// } // }
// : undefined, // : undefined,
this.$auth.hasPermi('equipment:check-setting:delete') this.$auth.hasPermi('equipment:check:delete')
? { ? {
type: 'delete', type: 'delete',
btnName: '删除', btnName: '删除',
@ -157,10 +166,17 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', type: this.$auth.hasPermiAnd([
'equipment:check:create',
'base:core-department:query'
])
? 'separate' : '',
}, },
{ {
type: this.$auth.hasPermi('equipment:check-setting:create') type: this.$auth.hasPermiAnd([
'equipment:check:create',
'base:core-department:query'
])
? 'button' ? 'button'
: '', : '',
btnName: '新增', btnName: '新增',

44
src/views/equipment/base/maintain/Confirm/WaitingListTable.vue
View File

@ -37,11 +37,11 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="selectedBox[0]" v-if="selectedBox[0]"
width="160" minWidth="160"
label="设备保养单号" label="设备保养单号"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="maintainOrderNumber"></el-table-column> 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"> <template slot-scope="scope">
{{ scope.row.planName || '---' }} {{ scope.row.planName || '---' }}
</template> </template>
@ -67,7 +67,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="selectedBox[5]" v-if="selectedBox[5]"
width="150" minWidth="150"
label="计划结束时间" label="计划结束时间"
prop="planEndTime"> prop="planEndTime">
<template slot-scope="scope"> <template slot-scope="scope">
@ -76,7 +76,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="selectedBox[6]" v-if="selectedBox[6]"
width="150" minWidth="150"
label="实际开始时间" label="实际开始时间"
prop="startTime"> prop="startTime">
<template slot-scope="scope"> <template slot-scope="scope">
@ -85,7 +85,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="selectedBox[7]" v-if="selectedBox[7]"
width="150" minWidth="150"
label="实际结束时间" label="实际结束时间"
prop="endTime"> prop="endTime">
<template slot-scope="scope"> <template slot-scope="scope">
@ -94,7 +94,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="selectedBox[8]" v-if="selectedBox[8]"
width="150" minWidth="150"
label="确认截止时间" label="确认截止时间"
prop="confirmDueTime"> prop="confirmDueTime">
<template slot-scope="scope"> <template slot-scope="scope">
@ -103,7 +103,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="selectedBox[9]" v-if="selectedBox[9]"
width="150" minWidth="150"
label="保养计划类型" label="保养计划类型"
prop="relatePlan"> prop="relatePlan">
<template slot-scope="scope"> <template slot-scope="scope">
@ -118,7 +118,7 @@
<!-- btns --> <!-- btns -->
<el-table-column width="188" label="操作"> <el-table-column width="188" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip content="确认" placement="top"> <el-tooltip v-if="$auth.hasPermi('equipment:maintain-record:update')" content="确认" placement="top">
<el-button <el-button
type="text" type="text"
style="margin: 5px 0; padding: 0" style="margin: 5px 0; padding: 0"
@ -128,8 +128,8 @@
</el-button> </el-button>
</el-tooltip> </el-tooltip>
<!-- line --> <!-- line -->
<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span> <span v-if="$auth.hasPermi('equipment:maintain-record:query')" style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
<el-tooltip content="查看详情" placement="top"> <el-tooltip v-if="$auth.hasPermi('equipment:maintain-record:query')" content="查看详情" placement="top">
<el-button <el-button
type="text" type="text"
style="margin: 5px 0; padding: 0" style="margin: 5px 0; padding: 0"
@ -138,18 +138,32 @@
</el-button> </el-button>
</el-tooltip> </el-tooltip>
<!-- line --> <!-- line -->
<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span> <!-- <span v-if="$auth.hasPermiAnd([
<el-tooltip content="编辑" placement="top"> '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">
<el-button <el-button
type="text" type="text"
style="margin: 5px 0; padding: 0" style="margin: 5px 0; padding: 0"
@click="$emit('edit', scope.row)"> @click="$emit('edit', scope.row)">
<i class="iconfont icon-edit primary-color" /> <i class="iconfont icon-edit primary-color" />
</el-button> </el-button>
</el-tooltip> </el-tooltip> -->
<!-- line --> <!-- line -->
<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span> <span v-if="$auth.hasPermi('equipment:maintain-record:delete')" style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
<el-tooltip content="删除" placement="top"> <el-tooltip v-if="$auth.hasPermi('equipment:maintain-record:delete')" content="删除" placement="top">
<el-button <el-button
type="text" type="text"
style="margin: 5px 0; padding: 0" style="margin: 5px 0; padding: 0"

18
src/views/equipment/base/maintain/Confirm/index.vue
View File

@ -157,10 +157,20 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', 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:create') type: this.$auth.hasPermiAnd([
'equipment:maintain-record:create',
'base:core-worker:query',
'base:core-production-line:query',
'base:core-department:query'
])
? 'button' ? 'button'
: '', : '',
btnName: '新增', btnName: '新增',
@ -169,7 +179,7 @@ export default {
color: 'success', color: 'success',
}, },
{ {
type: this.$auth.hasPermi('equipment:maintain-confirm:confirm') type: this.$auth.hasPermi('equipment:maintain-record:update')
? 'button' ? 'button'
: '', : '',
btnName: '批量确认', btnName: '批量确认',
@ -178,7 +188,7 @@ export default {
plain: true, plain: true,
}, },
{ {
type: this.$auth.hasPermi('equipment:maintain-confirm:export') type: this.$auth.hasPermi('equipment:maintain-record:export')
? 'button' ? 'button'
: '', : '',
btnName: '导出', btnName: '导出',

10
src/views/equipment/base/maintain/Monitor/index.vue
View File

@ -131,7 +131,7 @@ export default {
// width: 180, // width: 180,
// filter: parseTime(createTime), // 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: 'name', label: '保养计划名称', minWidth: 118, showOverflowtooltip: true },
{ prop: 'departmentName', label: '部门', minWidth: 100, showOverflowtooltip: true }, { prop: 'departmentName', label: '部门', minWidth: 100, showOverflowtooltip: true },
{ prop: 'lineName', label: '产线名', minWidth: 100, showOverflowtooltip: true }, { prop: 'lineName', label: '产线名', minWidth: 100, showOverflowtooltip: true },
@ -160,7 +160,8 @@ export default {
// filter: publicFormatter(this.DICT_TYPE.MAINTAIN_TYPE), // filter: publicFormatter(this.DICT_TYPE.MAINTAIN_TYPE),
// }, // },
// { prop: 'opt1', label: '设备保养', name: '操作', subcomponent: btn }, // { prop: 'opt1', label: '设备保养', name: '操作', subcomponent: btn },
{ prop: 'opt2', label: '保养内容', name: '详情', subcomponent: btn, width: 100 }, this.$auth.hasPermi('equipment:plan-config:query') ?
{ prop: 'opt2', label: '保养内容', name: '详情', subcomponent: btn, width: 100 } : undefined,
{ {
prop: 'remainDays', prop: 'remainDays',
label: '距离下次保养剩余时间(天)', label: '距离下次保养剩余时间(天)',
@ -190,10 +191,11 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', type: this.$auth.hasPermi('equipment:plan-config:export')
? 'separate' : '',
}, },
{ {
type: this.$auth.hasPermi('equipment:maintain-monitor:export') type: this.$auth.hasPermi('equipment:plan-config:export')
? 'button' ? 'button'
: '', : '',
btnName: '导出', btnName: '导出',

50
src/views/equipment/base/maintain/PlanConfig/index.vue
View File

@ -14,7 +14,7 @@
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="120" :width="180"
label="操作" label="操作"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" /> @clickBtn="handleClick" />
@ -65,57 +65,57 @@ const tableProps = [
{ {
prop: 'name', prop: 'name',
label: '保养计划名称', label: '保养计划名称',
width: 120, minWidth: 120,
showOverflowtooltip: true showOverflowtooltip: true
}, },
{ {
prop: 'departmentName', prop: 'departmentName',
label: '部门', label: '部门',
width: 120, minWidth: 120,
showOverflowtooltip: true showOverflowtooltip: true
}, },
{ {
prop: 'lineName', prop: 'lineName',
label: '产线名', label: '产线名',
width: 120, minWidth: 120,
showOverflowtooltip: true showOverflowtooltip: true
}, },
{ {
prop: 'maintenancePeriod', prop: 'maintenancePeriod',
label: '保养频率(天/次)', label: '保养频率(天/次)',
width: 150, minWidth: 150,
showOverflowtooltip: true showOverflowtooltip: true
}, },
{ {
prop: 'firstMaintenanceTime', prop: 'firstMaintenanceTime',
label: '首次保养时间', label: '首次保养时间',
filter: parseTime, filter: parseTime,
width: 150, minWidth: 150,
showOverflowtooltip: true showOverflowtooltip: true
}, },
{ {
prop: 'maintainDuration', prop: 'maintainDuration',
label: '保养时长', label: '保养时长',
width: 120, minWidth: 120,
showOverflowtooltip: true showOverflowtooltip: true
}, },
{ {
prop: 'maintainer', prop: 'maintainer',
label: '计划保养人员', label: '计划保养人员',
width: 150, minWidth: 150,
showOverflowtooltip: true showOverflowtooltip: true
}, },
{ {
prop: 'confirmTimeLimit', prop: 'confirmTimeLimit',
label: '确认时限', label: '确认时限',
filter: toDay, filter: toDay,
width: 130, minWidth: 130,
showOverflowtooltip: true showOverflowtooltip: true
}, },
{ {
prop: 'remark', prop: 'remark',
label: '备注', label: '备注',
width: 150, minWidth: 150,
showOverflowtooltip: true showOverflowtooltip: true
} }
]; ];
@ -138,13 +138,25 @@ export default {
planName: undefined planName: undefined
}, },
tableBtn: [ tableBtn: [
this.$auth.hasPermi(`equipment:plan-config:add`) this.$auth.hasPermiAnd([
'equipment:plan-config:query',
'equipment:plan-config:create',
'equipment:plan-config:update',
'equipment:plan-config:delete',
'base:core-equipment:query'
])
? { ? {
type: 'add', type: 'add',
btnName: '添加内容', btnName: '添加内容',
} }
: undefined, : undefined,
this.$auth.hasPermi(`equipment:plan-config:update`) this.$auth.hasPermiAnd([
'equipment:plan-config:update',
'equipment:plan-config:query',
'base:core-worker:query',
'base:core-production-line:query',
'base:core-department:query'
])
? { ? {
type: 'edit', type: 'edit',
btnName: '编辑', btnName: '编辑',
@ -172,10 +184,20 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', 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') ? 'button' : '', type: this.$auth.hasPermiAnd([
'equipment:plan-config:create',
'base:core-worker:query',
'base:core-production-line:query',
'base:core-department:query'
]) ? 'button' : '',
btnName: '新增', btnName: '新增',
name: 'add', name: 'add',
color: 'success', color: 'success',

24
src/views/equipment/base/maintain/Record/index.vue
View File

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

15
src/views/equipment/base/repair/index.vue
View File

@ -71,7 +71,7 @@ export default {
addOrUpdateVisible: false, addOrUpdateVisible: false,
searchBarKeys: ['maintenanceResult', 'createTime', 'equipmentId'], searchBarKeys: ['maintenanceResult', 'createTime', 'equipmentId'],
tableBtn: [ tableBtn: [
this.$auth.hasPermi('equipment:repair:update') this.$auth.hasPermi('equipment:repair:query')
? { ? {
type: 'detail', type: 'detail',
btnName: '详情', btnName: '详情',
@ -173,7 +173,12 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', 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') ? 'button' : '', type: this.$auth.hasPermi('equipment:repair:export') ? 'button' : '',
@ -183,7 +188,11 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: this.$auth.hasPermi('equipment:repair:create') ? 'button' : '', type: this.$auth.hasPermiAnd([
'equipment:repair:create',
'base:core-worker:query',
'system:user:list'
]) ? 'button' : '',
btnName: '新增', btnName: '新增',
name: 'add', name: 'add',
plain: true, plain: true,