Merge branch 'qingban' of http://139.155.176.112:8091/project-all/mes-admin-temp into qingban

src/views/base/craftManagement/route/components/configs.ts

@@ -385,23 +385,19 @@ interface comType {
 }
 export const comTypes: comType[] = [
   {
-    compentName: "记录项",
-    compentType: "jiluxiang",
-    index: 12,
-  },
-  {
     compentName: "物料采集",
     compentType: "wuliaocaiji",
     index: 0,
   },
-  // {
-  //   compentName: "辅料采集",
-  //   compentType: "fuliaoCJ",
-  // },
   {
-    compentName: "ESOP",
-    compentType: "ESOP",
-    index: 24,
+    compentName: "设备记录",
+    compentType: "shebeijilu",
+    index: 3,
+  },
+  {
+    compentName: "设备数据",
+    compentType: "ceshishuju",
+    index: 6,
   },
   {
     compentName: "点检",
@@ -409,10 +405,16 @@ export const comTypes: comType[] = [
     index: 9,
   },
   {
-    compentName: "设备记录",
-    compentType: "shebeijilu",
-    index: 3,
+    compentName: "记录项",
+    compentType: "jiluxiang",
+    index: 12,
   },
+
+  // {
+  //   compentName: "辅料采集",
+  //   compentType: "fuliaoCJ",
+  // },
+
   // {
   //   compentName: "紧固",
   //   compentType: "jingu",
@@ -425,21 +427,13 @@ export const comTypes: comType[] = [
 		compentName: "铭牌绑定",
 		compentType: "mingpai",
 	},*/
-  {
-    compentName: "多媒体采集",
-    compentType: "duomeiticaiji",
-    index: 21,
-  },
+
   {
     compentName: "工序表单",
     compentType: "operationExcel",
     index: 15,
   },
-  {
-    compentName: "设备数据",
-    compentType: "ceshishuju",
-    index: 6,
-  },
+
   // {
   //   compentName: "数据采集",
   //   compentType: "screwdriver",
@@ -449,4 +443,14 @@ export const comTypes: comType[] = [
     compentType: "gongxuwenjian",
     index: 18,
   },
+  {
+    compentName: "多媒体采集",
+    compentType: "duomeiticaiji",
+    index: 21,
+  },
+  {
+    compentName: "ESOP",
+    compentType: "ESOP",
+    index: 24,
+  },
 ];