diff --git a/.env.dev b/.env.dev index 882a92fe..c7978c40 100644 --- a/.env.dev +++ b/.env.dev @@ -1,8 +1,8 @@ ### # @Author: Do not edit # @Date: 2023-08-29 09:40:39 - # @LastEditTime: 2024-04-10 16:58:06 - # @LastEditors: zhp + # @LastEditTime: 2024-04-11 17:04:05 + # @LastEditors: DY # @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' diff --git a/src/views/equipment/base/alarm/Record/index.vue b/src/views/equipment/base/alarm/Record/index.vue index 9c154511..977910fb 100644 --- a/src/views/equipment/base/alarm/Record/index.vue +++ b/src/views/equipment/base/alarm/Record/index.vue @@ -130,8 +130,20 @@ 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 }, - { prop: 'opt1', label: '处理记录', name: '查看', subcomponent: btn }, - { prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn }, + 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: 'remark', label: '备注' }, ], searchBarFormConfig: [ diff --git a/src/views/equipment/base/config/AlarmGroup/index.vue b/src/views/equipment/base/config/AlarmGroup/index.vue index 2224a242..6861407a 100644 --- a/src/views/equipment/base/config/AlarmGroup/index.vue +++ b/src/views/equipment/base/config/AlarmGroup/index.vue @@ -122,19 +122,30 @@ export default { editMode: '', searchBarKeys: ['name', 'code'], tableBtn: [ - this.$auth.hasPermi('equipment:alarm-group:update') - ? { + this.$auth.hasPermiAnd([ + 'base:equipment-group:query', + 'base:equipment-group-alarm:query' + ]) + ? { type: 'detail', btnName: '查看报警', } : 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', btnName: '修改', } : undefined, - this.$auth.hasPermi('equipment:alarm-group:delete') + this.$auth.hasPermi('base:equipment-group:delete') ? { type: 'delete', btnName: '删除', @@ -244,11 +255,11 @@ export default { color: 'primary', }, { - type: this.$auth.hasPermi('equipment:alarm-group:create') + 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' : '', btnName: '新增', diff --git a/src/views/equipment/base/config/BindGroup/index.vue b/src/views/equipment/base/config/BindGroup/index.vue index ccf6189f..3023d94d 100644 --- a/src/views/equipment/base/config/BindGroup/index.vue +++ b/src/views/equipment/base/config/BindGroup/index.vue @@ -123,13 +123,23 @@ export default { return { searchBarKeys: ['groupId', 'equipmentName'], tableBtn: [ - this.$auth.hasPermi('equipment:bind-group:update') + this.$auth.hasPermiAnd([ + 'base:equipment-group-alarm:query', + 'base:core-equipment:query' + ]) ? { type: 'detail', btnName: '查看报警', } : 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', btnName: '修改', @@ -201,12 +211,16 @@ export default { color: 'primary', }, { - type: this.$auth.hasPermi('equipment:bind-group:create') - ? 'separate' : '', + type: this.$auth.hasPermiAnd([ + 'equipment:bind-group:create', + 'base:core-equipment:query' + ]) ? 'separate' : '', }, { - type: this.$auth.hasPermi('equipment:bind-group:create') - ? 'button' + type: this.$auth.hasPermiAnd([ + 'equipment:bind-group:create', + 'base:core-equipment:query' + ]) ? 'button' : '', btnName: '新增', name: 'add', diff --git a/src/views/equipment/base/config/DataCollection/CollectionConfig.vue b/src/views/equipment/base/config/DataCollection/CollectionConfig.vue index 6a2a2d0b..1f5a635b 100644 --- a/src/views/equipment/base/config/DataCollection/CollectionConfig.vue +++ b/src/views/equipment/base/config/DataCollection/CollectionConfig.vue @@ -140,17 +140,28 @@ export default { // tableBtn: [ // ].filter((v) => v), tableBtn: [ - { - type: 'detail', - btnName: '参数绑定', - }, - this.$auth.hasPermi('equipment:collection-config:update') + 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: 'edit', btnName: '修改', } : undefined, - this.$auth.hasPermi('equipment:collection-config:delete') + this.$auth.hasPermi('base:equipment-plc-connect:delete') ? { type: 'delete', btnName: '删除', @@ -217,11 +228,11 @@ export default { color: 'primary', }, { - type: this.$auth.hasPermi('equipment:collection-config:create') + 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' : '', // type: 'button', diff --git a/src/views/equipment/base/config/DataCollection/TableConfig.vue b/src/views/equipment/base/config/DataCollection/TableConfig.vue index c692d44f..012647a1 100644 --- a/src/views/equipment/base/config/DataCollection/TableConfig.vue +++ b/src/views/equipment/base/config/DataCollection/TableConfig.vue @@ -108,13 +108,16 @@ export default { tableKey: Math.random(), searchBarKeys: ['name', 'plcTableName'], tableBtn: [ - this.$auth.hasPermi('equipment:realtime-table-config:update') + this.$auth.hasPermiAnd([ + 'base:equipment-plc:update', + 'base:equipment-plc:query' + ]) ? { type: 'edit', btnName: '修改', } : undefined, - this.$auth.hasPermi('equipment:realtime-table-config:delete') + this.$auth.hasPermi('base:equipment-plc:delete') ? { type: 'delete', btnName: '删除', diff --git a/src/views/equipment/base/inspection/Confirm/WaitingListTable.vue b/src/views/equipment/base/inspection/Confirm/WaitingListTable.vue index 2d3387dd..fccfce40 100644 --- a/src/views/equipment/base/inspection/Confirm/WaitingListTable.vue +++ b/src/views/equipment/base/inspection/Confirm/WaitingListTable.vue @@ -91,7 +91,7 @@