diff --git a/src/mixins/lb/basicPageMixin.js b/src/mixins/lb/basicPageMixin.js
index c131407b..61d46432 100644
--- a/src/mixins/lb/basicPageMixin.js
+++ b/src/mixins/lb/basicPageMixin.js
@@ -76,6 +76,9 @@ export default {
info(payload) {
return this.http(this.infoUrl == '' ? this.infoPath : this.infoUrl, 'get', payload);
},
+ del(payload) {
+ return this.http(this.deleteUrl == '' ? this.deletePath : this.deleteUrl, 'delete', payload);
+ },
// 过滤后端传回的详情数据
diff --git a/src/utils/dict.js b/src/utils/dict.js
index f90ec7c2..0174516c 100644
--- a/src/utils/dict.js
+++ b/src/utils/dict.js
@@ -99,7 +99,10 @@ export const DICT_TYPE = {
ORDER_STATUS: 'order_status',
ORDER_ORIGIN: 'order_Origin',
ORDER_PRIORITY: 'order_priority',
- PACK_SPEC: 'pack_spec'
+ PACK_SPEC: 'pack_spec',
+
+ // ============== EQUIPMENT - 设备模块 =============
+ MAINTAIN_TYPE: 'maintain_type',
}
/**
diff --git a/src/views/equipment/base/config/DataCollection/CollectionConfig.vue b/src/views/equipment/base/config/DataCollection/CollectionConfig.vue
index b6cc7b15..700cbb94 100644
--- a/src/views/equipment/base/config/DataCollection/CollectionConfig.vue
+++ b/src/views/equipment/base/config/DataCollection/CollectionConfig.vue
@@ -75,13 +75,13 @@
pageSize: 10,
},
tableBtn: [
- this.$auth.hasPermi('base:equipment-plc-param:update')
+ this.$auth.hasPermi('equipment:collection-config-param:update')
? {
type: 'edit',
btnName: '修改',
}
: undefined,
- this.$auth.hasPermi('base:equipment-plc-param:delete')
+ this.$auth.hasPermi('equipment:collection-config-param:delete')
? {
type: 'delete',
btnName: '删除',
@@ -120,45 +120,26 @@ export default {
return {
searchBarKeys: ['equipmentId', 'plcId'],
// tableBtn: [
- // this.$auth.hasPermi('base:equipment-plc:update')
- // ? {
- // type: 'edit',
- // btnName: '修改',
- // }
- // : undefined,
- // this.$auth.hasPermi('base:equipment-plc:delete')
- // ? {
- // type: 'delete',
- // btnName: '删除',
- // }
- // : undefined,
// ].filter((v) => v),
tableBtn: [
{
type: 'detail',
btnName: '参数绑定',
},
- {
- type: 'edit',
- btnName: '修改',
- },
- // {
- // type: 'params-bind',
- // btnName: '参数绑定',
- // },
- {
- type: 'delete',
- btnName: '删除',
- },
- ],
+ this.$auth.hasPermi('equipment:collection-config:update')
+ ? {
+ type: 'edit',
+ btnName: '修改',
+ }
+ : undefined,
+ this.$auth.hasPermi('equipment:collection-config:delete')
+ ? {
+ type: 'delete',
+ btnName: '删除',
+ }
+ : undefined,
+ ].filter((v) => v),
tableProps: [
- // {
- // prop: 'createTime',
- // label: '添加时间',
- // fixed: true,
- // width: 180,
- // filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
- // },
{ prop: 'productionLine', label: '产线' },
{ prop: 'workshopSection', label: '工段' },
{ prop: 'equipmentName', label: '设备名' },
@@ -219,17 +200,17 @@ export default {
type: 'separate',
},
{
- // type: this.$auth.hasPermi('base:equipment-plc:create')
- // ? 'button'
- // : '',
- type: 'button',
+ type: this.$auth.hasPermi('equipment:collection-config:create')
+ ? 'button'
+ : '',
+ // type: 'button',
btnName: '新增',
name: 'add',
plain: true,
color: 'success',
},
// {
- // type: this.$auth.hasPermi('base:equipment-plc:export') ? 'button' : '',
+ // type: this.$auth.hasPermi('equipment:collection-config:export') ? 'button' : '',
// btnName: '导出',
// name: 'export',
// color: 'warning',
@@ -302,6 +283,22 @@ export default {
label: '单位',
filter: publicFormatter('unit_dict'),
},
+ {
+ prop: 'equipment_param_type',
+ label: '设备参数类型',
+ filter: (val) =>
+ val != null
+ ? ['', '一般参数', '工艺参数', '报警参数', ''][val]
+ : '-',
+ },
+ {
+ prop: 'production_param_type',
+ label: '生产参数类型',
+ filter: (val) =>
+ val != null
+ ? ['', '进片数量', '出片数量', '破损数量', '无类型', ''][val]
+ : '-',
+ },
{
prop: 'collection',
label: '是否采集',
diff --git a/src/views/equipment/base/config/DataCollection/components/BasicDrawer.vue b/src/views/equipment/base/config/DataCollection/components/BasicDrawer.vue
index ddb8ce35..617ba9b5 100644
--- a/src/views/equipment/base/config/DataCollection/components/BasicDrawer.vue
+++ b/src/views/equipment/base/config/DataCollection/components/BasicDrawer.vue
@@ -36,7 +36,7 @@
v-if="showForm"
ref="form"
:disabled="mode.includes('detail')"
- :dataForm="form"
+ v-model="form"
:rows="formRows" />
@@ -193,6 +193,32 @@ export default {
},
},
],
+ [
+ {
+ select: true,
+ label: '设备参数类型',
+ prop: 'equipment_param_type',
+ options: [
+ { label: '一般参数', value: 1 },
+ { label: '工艺参数', value: 2 },
+ { label: '报警参数', value: 3 },
+ ],
+ rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ },
+ {
+ select: true,
+ label: '生产参数类型',
+ prop: 'production_param_type',
+ options: [
+ { label: '进片数量', value: 1 },
+ { label: '出片数量', value: 2 },
+ { label: '破损数量', value: 3 },
+ { label: '无类型', value: 4 },
+
+ ],
+ rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ },
+ ],
[
{
input: true,
@@ -437,7 +463,7 @@ export default {
method: isEdit ? 'put' : 'post',
data: {
...this.attrForm,
- connectId: this.infoData.id
+ connectId: this.infoData.id,
},
});
diff --git a/src/views/equipment/base/maintain/Monitor/index.vue b/src/views/equipment/base/maintain/Monitor/index.vue
new file mode 100644
index 00000000..de7db8af
--- /dev/null
+++ b/src/views/equipment/base/maintain/Monitor/index.vue
@@ -0,0 +1,325 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/equipment/base/maintain/PlanConfig/index.vue b/src/views/equipment/base/maintain/PlanConfig/index.vue
new file mode 100644
index 00000000..3ba157a0
--- /dev/null
+++ b/src/views/equipment/base/maintain/PlanConfig/index.vue
@@ -0,0 +1,343 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+