Merge branch 'master' of http://175.27.215.92:3000/yinq/aucma-mes-ui

src/router/index.js

@@ -91,7 +91,7 @@ export const constantRoutes = [
     ]
   },
   {
-    path: '',
+    path: 'board',
     component: BoardIndex,
     redirect: 'board',
     meta: {
@@ -134,7 +134,7 @@ export const constantRoutes = [
       {
         path: 'pourInto',
         name: 'PourInto',
-        component: () => import('@/views/board/pourInto/index'),
+        component: () => import('@/views/board/pourInto/index2'),
         meta: {title: '总装工序', icon: 'dashboard',}
       },
       {

src/views/board/caseShell/index2.vue

@@ -694,7 +694,6 @@ export default {
                 }
               ]
             })
-            this.laterNum = e
           }
         },
       ]

src/views/board/finalAssembly/index.vue

@@ -114,7 +114,7 @@ export default {
       title: [
         '当日小时产量统计',
         '当日型号产量统计',
-        '表格',
+        '生产统计',
       ],
       titlePosition: [
         {
@@ -148,6 +148,75 @@ export default {
     getData().then(e => {
       this.scrollTableData = e.table7
       this.$refs.chart1.setData({
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            // 坐标轴指示器，坐标轴触发有效
+            type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+          },
+        },
+        grid: {
+          left: "0",
+          right: "4%",
+          bottom: "0",
+          top: 20,
+          containLabel: true,
+        },
+        xAxis: {
+          type: "category",
+          data: e.chart4.x,
+          axisLine: {
+            lineStyle: {
+              color: "white",
+            },
+          },
+          axisLabel: {
+            // interval: 0,
+            // rotate: 40,
+            textStyle: {
+              fontFamily: "Microsoft YaHei",
+            },
+          },
+        },
+
+        yAxis: {
+          type: "value",
+          axisLine: {
+            show: false,
+            lineStyle: {
+              color: "white",
+            },
+          },
+          splitLine: {
+            show: false,
+          },
+          axisLabel: {},
+        },
+        series: [
+          {
+            name: "数量",
+            type: "bar",
+            barWidth: "30%",
+            barMaxWidth: 50,
+            itemStyle: {
+              normal: {
+                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                  {
+                    offset: 0,
+                    color: "#0bca98",
+                  },
+                  {
+                    offset: 1,
+                    color: "#16a144",
+                  },
+                ]),
+              },
+            },
+            data: e.chart4.y.data,
+          },
+        ],
+      })
+      this.$refs.chart2.setData({
         grid: {
           left: "0",
           right: "4%",
@@ -228,75 +297,6 @@ export default {
           },
         ],
       })
-      this.$refs.chart2.setData({
-        tooltip: {
-          trigger: "axis",
-          axisPointer: {
-            // 坐标轴指示器，坐标轴触发有效
-            type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
-          },
-        },
-        grid: {
-          left: "0",
-          right: "4%",
-          bottom: "0",
-          top: 20,
-          containLabel: true,
-        },
-        xAxis: {
-          type: "category",
-          data: e.chart4.x,
-          axisLine: {
-            lineStyle: {
-              color: "white",
-            },
-          },
-          axisLabel: {
-            // interval: 0,
-            // rotate: 40,
-            textStyle: {
-              fontFamily: "Microsoft YaHei",
-            },
-          },
-        },
-
-        yAxis: {
-          type: "value",
-          axisLine: {
-            show: false,
-            lineStyle: {
-              color: "white",
-            },
-          },
-          splitLine: {
-            show: false,
-          },
-          axisLabel: {},
-        },
-        series: [
-          {
-            name: "数量",
-            type: "bar",
-            barWidth: "30%",
-            barMaxWidth: 50,
-            itemStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  {
-                    offset: 0,
-                    color: "#0bca98",
-                  },
-                  {
-                    offset: 1,
-                    color: "#16a144",
-                  },
-                ]),
-              },
-            },
-            data: e.chart4.y.data,
-          },
-        ],
-      })
     })
   },
   methods: {}

src/views/index_v1.vue

@@ -119,7 +119,6 @@ export default {
   data() {
     return {
       lineChartData: lineChartData.newVisitis,
-
       tableData: [
         {
           no: '1',