diff --git a/src/views/base/equipmentBindGroup/index.vue b/src/views/base/equipmentBindGroup/index.vue
index 93815c64..f830291f 100644
--- a/src/views/base/equipmentBindGroup/index.vue
+++ b/src/views/base/equipmentBindGroup/index.vue
@@ -17,6 +17,7 @@
v-if="tableBtn.length"
slot="handleBtn"
label="操作"
+ :width="120"
:method-list="tableBtn"
@clickBtn="handleTableBtnClick" />
diff --git a/src/views/base/equipmentBindSection/index.vue b/src/views/base/equipmentBindSection/index.vue
index 22892c5a..405c7393 100644
--- a/src/views/base/equipmentBindSection/index.vue
+++ b/src/views/base/equipmentBindSection/index.vue
@@ -17,6 +17,7 @@
v-if="tableBtn.length"
slot="handleBtn"
label="操作"
+ :width="120"
:method-list="tableBtn"
@clickBtn="handleTableBtnClick" />
diff --git a/src/views/base/equipmentGroup/index.vue b/src/views/base/equipmentGroup/index.vue
index 8863d9d1..42afbd26 100644
--- a/src/views/base/equipmentGroup/index.vue
+++ b/src/views/base/equipmentGroup/index.vue
@@ -17,6 +17,7 @@
v-if="tableBtn.length"
slot="handleBtn"
label="操作"
+ :width="120"
:method-list="tableBtn"
@clickBtn="handleTableBtnClick" />
diff --git a/src/views/base/equipmentGroupAlarm/index.vue b/src/views/base/equipmentGroupAlarm/index.vue
index 458c8acb..dda58f82 100644
--- a/src/views/base/equipmentGroupAlarm/index.vue
+++ b/src/views/base/equipmentGroupAlarm/index.vue
@@ -17,6 +17,7 @@
v-if="tableBtn.length"
slot="handleBtn"
label="操作"
+ :width="120"
:method-list="tableBtn"
@clickBtn="handleTableBtnClick" />
diff --git a/src/views/base/equipmentPlc/index.vue b/src/views/base/equipmentPlc/index.vue
index 0f7c603f..59c6fa71 100644
--- a/src/views/base/equipmentPlc/index.vue
+++ b/src/views/base/equipmentPlc/index.vue
@@ -59,13 +59,15 @@ const switchBtn = {
name: 'SwitchBtn',
props: ['injectData'],
data() {
- return {
- active: +this.injectData[this.injectData.prop] == 1 ? true : false,
- };
+ return {};
+ },
+ computed: {
+ active() {
+ return +this.injectData[this.injectData.prop] == 1 ? true : false;
+ },
},
methods: {},
render: function (h) {
- console.log('render....');
return h(
'el-switch',
{
@@ -74,8 +76,6 @@ const switchBtn = {
},
on: {
change: (newVal) => {
- this.active = !this.active;
- console.log('changed emit', newVal);
this.$emit('emitData', {
action: 'update-collect',
payload: {
diff --git a/src/views/base/equipmentPlcConnect/index.vue b/src/views/base/equipmentPlcConnect/index.vue
index e43d31ce..e6022379 100644
--- a/src/views/base/equipmentPlcConnect/index.vue
+++ b/src/views/base/equipmentPlcConnect/index.vue
@@ -17,6 +17,7 @@
v-if="tableBtn.length"
slot="handleBtn"
label="操作"
+ :width="120"
:method-list="tableBtn"
@clickBtn="handleTableBtnClick" />
diff --git a/src/views/base/equipmentPlcParam/index.vue b/src/views/base/equipmentPlcParam/index.vue
index 7c94b48a..6d932706 100644
--- a/src/views/base/equipmentPlcParam/index.vue
+++ b/src/views/base/equipmentPlcParam/index.vue
@@ -17,6 +17,7 @@
v-if="tableBtn.length"
slot="handleBtn"
label="操作"
+ :width="120"
:method-list="tableBtn"
@clickBtn="handleTableBtnClick" />
diff --git a/src/views/core/base/equipment/index.vue b/src/views/core/base/equipment/index.vue
index 6008213e..1e428def 100644
--- a/src/views/core/base/equipment/index.vue
+++ b/src/views/core/base/equipment/index.vue
@@ -16,6 +16,7 @@
@@ -148,7 +149,7 @@ export default {
filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
},
{ prop: 'name', label: '设备名称' },
- { prop: 'code', label: '检测编码' },
+ { width: 256, prop: 'code', label: '检测编码' },
{ prop: 'equipmentType', label: '设备类型' },
{ prop: 'enName', label: '英文名称' },
{ prop: 'abbr', label: '缩写' },
diff --git a/src/views/core/base/equipmentType/index.vue b/src/views/core/base/equipmentType/index.vue
index dca8a1d1..70633ce6 100644
--- a/src/views/core/base/equipmentType/index.vue
+++ b/src/views/core/base/equipmentType/index.vue
@@ -17,6 +17,7 @@
v-if="tableBtn.length"
slot="handleBtn"
label="操作"
+ :width="120"
:method-list="tableBtn"
@clickBtn="handleTableBtnClick" />
diff --git a/src/views/monitoring/equipmentAlarmLog/index.vue b/src/views/monitoring/equipmentAlarmLog/index.vue
index f35ba48f..50bf8d20 100644
--- a/src/views/monitoring/equipmentAlarmLog/index.vue
+++ b/src/views/monitoring/equipmentAlarmLog/index.vue
@@ -16,6 +16,7 @@
diff --git a/src/views/monitoring/equipmentProcessAmount/index.vue b/src/views/monitoring/equipmentProcessAmount/index.vue
index 42370890..dbe13236 100644
--- a/src/views/monitoring/equipmentProcessAmount/index.vue
+++ b/src/views/monitoring/equipmentProcessAmount/index.vue
@@ -230,20 +230,20 @@ export default {
this.$set(factory, 'label', factory.name);
this.$set(factory, 'type', '工厂');
delete factory.name;
- factory.children = factory.lines;
- delete factory.lines;
+ // factory.children = factory.lines;
+ // delete factory.lines;
factory.children?.forEach((line) => {
this.$set(line, 'label', line.name);
this.$set(line, 'type', '产线');
delete line.name;
- line.children = line.sections;
- delete line.sections;
+ // line.children = line.sections;
+ // delete line.sections;
line.children?.forEach((ws) => {
this.$set(ws, 'label', ws.name);
this.$set(ws, 'type', '工段');
delete ws.name;
- ws.children = ws.equipments;
- delete ws.equipments;
+ // ws.children = ws.equipments;
+ // delete ws.equipments;
ws.children?.forEach((eq) => {
this.$set(eq, 'label', eq.name);
this.$set(eq, 'type', '设备');
@@ -258,6 +258,7 @@ export default {
const { data } = await this.$axios('/base/factory/getTree');
this.sidebarContent = data;
this.buildTree(data);
+ console.log('tree', this.sidebarContent)
},
handleSidebarItemClick({ label, id, type }) {
diff --git a/src/views/monitoring/equipmentStatusAndParams/index.vue b/src/views/monitoring/equipmentStatusAndParams/index.vue
index e15b01d3..0e4e1dc3 100644
--- a/src/views/monitoring/equipmentStatusAndParams/index.vue
+++ b/src/views/monitoring/equipmentStatusAndParams/index.vue
@@ -18,6 +18,7 @@
v-if="tableBtn.length"
slot="handleBtn"
label="操作"
+ :width="120"
:method-list="tableBtn"
@clickBtn="handleTableBtnClick" />
diff --git a/src/views/quality/base/qualityInspectionBoxBtn/index.vue b/src/views/quality/base/qualityInspectionBoxBtn/index.vue
index 57ad51e3..0e4390b4 100644
--- a/src/views/quality/base/qualityInspectionBoxBtn/index.vue
+++ b/src/views/quality/base/qualityInspectionBoxBtn/index.vue
@@ -17,6 +17,7 @@
v-if="tableBtn.length"
slot="handleBtn"
label="操作"
+ :width="120"
fixed="right"
:method-list="tableBtn"
@clickBtn="handleTableBtnClick" />
diff --git a/src/views/quality/base/qualityInspectionDet/index.vue b/src/views/quality/base/qualityInspectionDet/index.vue
index fdf99d7e..4f3cf8b3 100644
--- a/src/views/quality/base/qualityInspectionDet/index.vue
+++ b/src/views/quality/base/qualityInspectionDet/index.vue
@@ -17,6 +17,7 @@
v-if="tableBtn.length"
slot="handleBtn"
label="操作"
+ :width="120"
fixed="right"
:method-list="tableBtn"
@clickBtn="handleTableBtnClick" />
diff --git a/src/views/quality/base/qualityInspectionType/index.vue b/src/views/quality/base/qualityInspectionType/index.vue
index bf574449..a66b9745 100644
--- a/src/views/quality/base/qualityInspectionType/index.vue
+++ b/src/views/quality/base/qualityInspectionType/index.vue
@@ -17,6 +17,7 @@
v-if="tableBtn.length"
slot="handleBtn"
label="操作"
+ :width="120"
:method-list="tableBtn"
@clickBtn="handleTableBtnClick" />
diff --git a/src/views/quality/monitoring/qualityInspectionRecord/index.vue b/src/views/quality/monitoring/qualityInspectionRecord/index.vue
index 2da57c25..ac7342af 100644
--- a/src/views/quality/monitoring/qualityInspectionRecord/index.vue
+++ b/src/views/quality/monitoring/qualityInspectionRecord/index.vue
@@ -17,6 +17,7 @@
v-if="tableBtn.length"
slot="handleBtn"
label="操作"
+ :width="120"
fixed="right"
:method-list="tableBtn"
@clickBtn="handleTableBtnClick" />