diff --git a/src/views/modules/fanuc/fanuc.vue b/src/views/modules/fanuc/fanuc.vue
index 35ea78e..f39dadd 100644
--- a/src/views/modules/fanuc/fanuc.vue
+++ b/src/views/modules/fanuc/fanuc.vue
@@ -99,26 +99,46 @@
-
+
-
-
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -436,8 +456,8 @@ export default {
functionId: 501002,
serialNumber: '501002TableSite',
tableId: "501002Table",
- tableName: "工厂编码",
- columnWidth: 80,
+ tableName: "加工中心",
+ columnWidth: 60,
columnProp: 'site',
headerAlign: 'center',
align: "center",
@@ -454,8 +474,8 @@ export default {
functionId: 501002,
serialNumber: '501002TableBuDesc',
tableId: "501002Table",
- tableName: "BU",
- columnWidth: 130,
+ tableName: "加工中心",
+ columnWidth: 100,
columnProp: 'buDesc',
headerAlign: 'center',
align: "left",
@@ -472,8 +492,8 @@ export default {
functionId: 501002,
serialNumber: '501002TableWorkCenterNo',
tableId: "501002Table",
- tableName: "加工中心编码",
- columnWidth: 130,
+ tableName: "加工中心",
+ columnWidth: 120,
columnProp: 'workCenterNo',
headerAlign: 'center',
align: "left",
@@ -490,8 +510,8 @@ export default {
functionId: 501002,
serialNumber: '501002TableWorkCenterDesc',
tableId: "501002Table",
- tableName: "加工中心名称",
- columnWidth: 130,
+ tableName: "加工中心",
+ columnWidth: 150,
columnProp: 'workCenterDesc',
headerAlign: 'center',
align: "left",
@@ -508,8 +528,8 @@ export default {
functionId: 501002,
serialNumber: '501002TableWorkCenterType',
tableId: "501002Table",
- tableName: "加工中心类型",
- columnWidth: 130,
+ tableName: "加工中心",
+ columnWidth: 100,
columnProp: 'workCenterType',
headerAlign: 'center',
align: "center",
@@ -526,8 +546,8 @@ export default {
functionId: 501002,
serialNumber: '501002TableProlineNo',
tableId: "501002Table",
- tableName: "加工中心组编码",
- columnWidth: 130,
+ tableName: "加工中心",
+ columnWidth: 120,
columnProp: 'prolineNo',
headerAlign: 'center',
align: "left",
@@ -544,11 +564,11 @@ export default {
functionId: 501002,
serialNumber: '501002TableResourceCount',
tableId: "501002Table",
- tableName: "状态",
- columnWidth: 60,
+ tableName: "加工中心",
+ columnWidth: 80,
columnProp: 'resourceCount',
headerAlign: 'center',
- align: "center",
+ align: "right",
columnLabel: '机台数',
columnHidden: false,
columnImage: false,
@@ -557,12 +577,84 @@ export default {
status: true,
fixed: '',
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 501002,
+ serialNumber: '501002TableRefDailyProduction',
+ tableId: "501002Table",
+ tableName: "加工中心",
+ columnWidth: 100,
+ columnProp: 'refDailyProduction',
+ headerAlign: 'center',
+ align: "right",
+ columnLabel: '人均日产量',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 501002,
+ serialNumber: '501002TableRefSpeed',
+ tableId: "501002Table",
+ tableName: "加工中心",
+ columnWidth: 100,
+ columnProp: 'refSpeed',
+ headerAlign: 'center',
+ align: "right",
+ columnLabel: '速度',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 501002,
+ serialNumber: '501002TableRefTime',
+ tableId: "501002Table",
+ tableName: "加工中心",
+ columnWidth: 100,
+ columnProp: 'refTime',
+ headerAlign: 'center',
+ align: "right",
+ columnLabel: '时间',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 501002,
+ serialNumber: '501002TableRefEfficiency',
+ tableId: "501002Table",
+ tableName: "加工中心",
+ columnWidth: 100,
+ columnProp: 'refEfficiency',
+ headerAlign: 'center',
+ align: "right",
+ columnLabel: '效率',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ },
{
userId: this.$store.state.user.name,
functionId: 501002,
serialNumber: '501002TableActive',
tableId: "501002Table",
- tableName: "状态",
+ tableName: "加工中心",
columnWidth: 80,
columnProp: 'active',
headerAlign: 'center',
@@ -580,7 +672,7 @@ export default {
functionId: 501002,
serialNumber: '501002TableCreatedDate',
tableId: "501002Table",
- tableName: "录入时间",
+ tableName: "加工中心",
columnWidth: 130,
columnProp: 'createdDate',
headerAlign: 'center',
@@ -598,8 +690,8 @@ export default {
functionId: 501002,
serialNumber: '501002TableCreatedBy',
tableId: "501002Table",
- tableName: "录入人",
- columnWidth: 130,
+ tableName: "加工中心",
+ columnWidth: 100,
columnProp: 'createdBy',
headerAlign: 'center',
align: "left",
@@ -616,11 +708,11 @@ export default {
functionId: 501002,
serialNumber: '501002TableUpdateDate',
tableId: "501002Table",
- tableName: "最近修改时间",
+ tableName: "加工中心",
columnWidth: 130,
columnProp: 'updatedDate',
headerAlign: 'center',
- align: "left",
+ align: "center",
columnLabel: '最近修改时间',
columnHidden: false,
columnImage: false,
@@ -634,8 +726,8 @@ export default {
functionId: 501002,
serialNumber: '501002TableUpdateBy',
tableId: "501002Table",
- tableName: "最近修改人",
- columnWidth: 130,
+ tableName: "加工中心",
+ columnWidth: 100,
columnProp: 'updateBy',
headerAlign: 'center',
align: "left",