Merge branch 'master' of http://10.153.19.25:10105/r/JiuMuMES

严智鑫

2024-10-12 9973bb6887f668cd91f1c4a0b8a7d05f9bd229ad

 UI-Project/src/router/index.js

@@ -23,71 +23,84 @@
      name: 'main',
      component: () => import('../layout/MainErpView.vue'),
      children: [
        // {
        //   /*----------- 自动上片 ----------------*/
        //   path: 'UpperSlice',
        //   name: 'upperSlice',
        //   component: () => import('../views/UpperSlice/upperSlice.vue'),
        //   children: [
        //     {
        //       path: '/UpperSlice/upperSlice',
        //       name: 'upperSlice',
        //       component: () => import('../views/UpperSlice/upperSlice.vue'),
        //     }
        //   ]
        // },
        // {
        //   /*----------- 自动扫码 ----------------*/
        //   path: 'ScanQrCodesIdentify',
        //   name: 'scanQrCodesIdentify',
        //   component: () => import('../views/ScanQrCodesIdentify/scanQrCodesIdentify.vue'),
        //   children: [
        //     {
        //       path: '/ScanQrCodesIdentify/scanQrCodesIdentify',
        //       name: 'scanQrCodesIdentify',
        //       component: () => import('../views/ScanQrCodesIdentify/scanQrCodesIdentify.vue'),
        //     }
        //   ]
        // },
        // {
        //   /*----------- 磨边机 ----------------*/
        //   path: 'Edging',
        //   name: 'edging',
        //   component: () => import('../views/Edging/edging.vue'),
        //   children: [
        //     {
        //       path: '/Edging/edging',
        //       name: 'edging',
        //       component: () => import('../views/Edging/edging.vue'),
        //     }
        //   ]
        // },
        // {
        //   /*----------- 清洗机 ----------------*/
        //   path: 'Cleaning',
        //   name: 'cleaning',
        //   component: () => import('../views/Cleaning/cleaning.vue'),
        //   children: [
        //     {
        //       path: '/Cleaning/cleaning',
        //       name: 'cleaning',
        //       component: () => import('../views/Cleaning/cleaning.vue'),
        //     }
        //   ]
        // },flipSlice
        // {
        //   /*----------- 翻片台 ----------------*/
        //   path: 'FlipSlice',
        //   name: 'flipSlice',
        //   component: () => import('../views/FlipSlice/flipSlice.vue'),
        //   children: [
        //     {
        //       path: '/FlipSlice/flipSlice',
        //       name: 'flipSlice',
        //       component: () => import('../views/FlipSlice/flipSlice.vue'),
        //     }
        //   ]
        // },
        {
          /*----------- 自动上片 ----------------*/
          path: 'MechanicalArm',
          name: 'mechanicalArm',
          component: () => import('../views/MechanicalArm/mechanicalArm.vue'),
          children: [
            {
              path: '/mechanicalArm/mechanicalArm',
              name: 'mechanicalArm',
              component: () => import('../views/MechanicalArm/mechanicalArm.vue'),
            }
          ]
        },
        {
          /*----------- 自动扫码 ----------------*/
          path: 'ScanQrCodesIdentify',
          name: 'scanQrCodesIdentify',
          component: () => import('../views/ScanQrCodesIdentify/scanQrCodesIdentify.vue'),
          children: [
            {
              path: '/ScanQrCodesIdentify/scanQrCodesIdentify',
              name: 'scanQrCodesIdentify',
              component: () => import('../views/ScanQrCodesIdentify/scanQrCodesIdentify.vue'),
            }
          ]
        },
        {
          /*----------- 磨边机 ----------------*/
          path: 'Edging',
          name: 'edging',
          component: () => import('../views/Edging/edging.vue'),
          children: [
            {
              path: '/Edging/edging',
              name: 'edging',
              component: () => import('../views/Edging/edging.vue'),
            }
          ]
        },
        {
          /*----------- 清洗机 ----------------*/
          path: 'Cleaning',
          name: 'cleaning',
          component: () => import('../views/Cleaning/cleaning.vue'),
          children: [
            {
              path: '/Cleaning/cleaning',
              name: 'cleaning',
              component: () => import('../views/Cleaning/cleaning.vue'),
            }
          ]
        },
        {
          /*----------- 翻片台 ----------------*/
          path: 'FlipSlice',  
          name: 'flipSlice',
          component: () => import('../views/FlipSlice/flipSlice.vue'),
          children: [
            {
              path: '/FlipSlice/flipSlice',
              name: 'flipSlice',
              component: () => import('../views/FlipSlice/flipSlice.vue'),
            }
          ]
        },
        {
          /*----------- 翻片台 ----------------*/
          path: 'ScanQrCodesReport',  
          name: 'scanQrCodesReport',
          component: () => import('../views/ScanQrCodesReport/scanQrCodesReport.vue'),
          children: [
            {
              path: '/ScanQrCodesReport/scanQrCodesReport',
              name: 'scanQrCodesReport',
              component: () => import('../views/ScanQrCodesReport/scanQrCodesReport.vue'),
            }
          ]
        },
        // {
        //   /*----------- 扫码2 ----------------*/
        //   path: 'ScanQrCodesVerify',
@@ -101,45 +114,45 @@
        //     }
        //   ]
        // },
        {
          /*----------- 自动打标机 ----------------*/
          path: 'Marking',
          name: 'marking',
          component: () => import('../views/Marking/marking.vue'),
          children: [
            {
              path: '/Marking/marking',
              name: 'marking',
              component: () => import('../views/Marking/marking.vue'),
            }
          ]
        },
        {
          /*----------- 自动丝印机 ----------------*/
          path: 'SilkScreen',
          name: 'silkScreen',
          component: () => import('../views/SilkScreen/silkScreen.vue'),
          children: [
            {
              path: '/SilkScreen/silkScreen',
              name: 'silkScreen',
              component: () => import('../views/SilkScreen/silkScreen.vue'),
            }
          ]
        },
        {
          /*----------- 自动点胶机 ----------------*/
          path: 'GlueDispenser',
          name: 'glueDispenser',
          component: () => import('../views/GlueDispenser/glueDispenser.vue'),
          children: [
            {
              path: '/GlueDispenser/glueDispenser',
              name: 'glueDispenser',
              component: () => import('../views/GlueDispenser/glueDispenser.vue'),
            }
          ]
        },
        // {
        //   /*----------- 自动打标机 ----------------*/
        //   path: 'Marking',
        //   name: 'marking',
        //   component: () => import('../views/Marking/marking.vue'),
        //   children: [
        //     {
        //       path: '/Marking/marking',
        //       name: 'marking',
        //       component: () => import('../views/Marking/marking.vue'),
        //     }
        //   ]
        // },
        // {
        //   /*----------- 自动丝印机 ----------------*/
        //   path: 'SilkScreen',
        //   name: 'silkScreen',
        //   component: () => import('../views/SilkScreen/silkScreen.vue'),
        //   children: [
        //     {
        //       path: '/SilkScreen/silkScreen',
        //       name: 'silkScreen',
        //       component: () => import('../views/SilkScreen/silkScreen.vue'),
        //     }
        //   ]
        // },
        // {
        //   /*----------- 自动点胶机 ----------------*/
        //   path: 'GlueDispenser',
        //   name: 'glueDispenser',
        //   component: () => import('../views/GlueDispenser/glueDispenser.vue'),
        //   children: [
        //     {
        //       path: '/GlueDispenser/glueDispenser',
        //       name: 'glueDispenser',
        //       component: () => import('../views/GlueDispenser/glueDispenser.vue'),
        //     }
        //   ]
        // },
        // {
        //   /*----------- 烘干线 ----------------*/
        //   path: 'Drying',
@@ -179,19 +192,19 @@
        //     }
        //   ]
        // },
        // {
        //   /*----------- 报工管理 ----------------*/
        //   path: 'ZiDongShangpian',
        //   name: 'zidongshangpian',
        //   component: () => import('../views/Marking/marking.vue'),
        //   children: [
        //     {
        //       path: '/Marking/marking',
        //       name: 'marking',
        //       component: () => import('../views/Marking/marking.vue'),
        //     }
        //   ]
        // },
        {
          /*----------- 报工管理 ----------------*/
          path: 'ManualReporting',
          name: 'manualReporting',
          component: () => import('../views/ManualReporting/manualReporting.vue'),
          children: [
            {
              path: '/ManualReporting/manualReporting',
              name: 'manualReporting',
              component: () => import('../views/ManualReporting/manualReporting.vue'),
            }
          ]
        },
        // {
        //   /*----------- 报表管理 ----------------*/
        //   path: 'ZiDongShangpian',