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

wu

2024-09-19 5c7a1ad82238516e5b65189309af88dcbd7db78a

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

# Conflicts:
#	UI-Project/src/router/index.js

 UI-Project/src/lang/zh.js

@@ -148,8 +148,8 @@
        upperSlice:'自动上片机',
        scanQrCodesIdentify:'扫码识别',
        edging:'磨边机',
        edging:'清洗机',
        edging:'翻片台',
        cleaning:'清洗机',
        flipSlice:'翻片台',
        scanQrCodesVerify:'扫码确认',
        marking: '自动打标机',
        silkScreen:'自动丝印机',

 UI-Project/src/router/index.js

@@ -25,186 +25,186 @@
      children: [
        {
          /*----------- 自动上片 ----------------*/
          path: 'MechanicalArm',
          name: 'mechanicalArm',
          component: () => import('../views/MechanicalArm/mechanicalArm.vue'),
          path: 'UpperSlice',
          name: 'upperSlice',
          component: () => import('../views/UpperSlice/upperSlice.vue'),
          children: [
            {
              path: '/MechanicalArm/mechanicalArm',
              name: 'mechanicalArm',
              component: () => import('../views/MechanicalArm/mechanicalArm.vue'),
              path: '/UpperSlice/upperSlice',
              name: 'upperSlice',
              component: () => import('../views/UpperSlice/upperSlice.vue'),
            }
          ]
        },
        {
          /*----------- 自动扫码 ----------------*/
          path: 'ScanQR',
          name: 'scanQR',
          component: () => import('../views/ScanQR/scanQR.vue'),
          path: 'ScanQrCodesIdentify',
          name: 'scanQrCodesIdentify',
          component: () => import('../views/ScanQrCodesIdentify/scanQrCodesIdentify.vue'),
          children: [
            {
              path: '/ScanQR/scanQR',
              name: 'scanQR',
              component: () => import('../views/ScanQR/scanQR.vue'),
              path: '/ScanQrCodesIdentify/scanQrCodesIdentify',
              name: 'scanQrCodesIdentify',
              component: () => import('../views/ScanQrCodesIdentify/scanQrCodesIdentify.vue'),
            }
          ]
        },
        // {
        //   /*----------- 磨边机 ----------------*/
        //   path: 'ZiDongShangpian',
        //   name: 'zidongshangpian',
        //   component: () => import('../views/Marking/marking.vue'),
        //   children: [
        //     {
        //       path: '/Marking/marking',
        //       name: 'marking',
        //       component: () => import('../views/Marking/marking.vue'),
        //     }
        //   ]
        // },
        // {
        //   /*----------- 清洗机 ----------------*/
        //   path: 'ZiDongShangpian',
        //   name: 'zidongshangpian',
        //   component: () => import('../views/Marking/marking.vue'),
        //   children: [
        //     {
        //       path: '/Marking/marking',
        //       name: 'marking',
        //       component: () => import('../views/Marking/marking.vue'),
        //     }
        //   ]
        // },
        // {
        //   /*----------- 翻片台 ----------------*/
        //   path: 'ZiDongShangpian',
        //   name: 'zidongshangpian',
        //   component: () => import('../views/Marking/marking.vue'),
        //   children: [
        //     {
        //       path: '/Marking/marking',
        //       name: 'marking',
        //       component: () => import('../views/Marking/marking.vue'),
        //     }
        //   ]
        // },
        // {
        //   /*----------- 扫码2 ----------------*/
        //   path: 'ZiDongShangpian',
        //   name: 'zidongshangpian',
        //   component: () => import('../views/Marking/marking.vue'),
        //   children: [
        //     {
        //       path: '/Marking/marking',
        //       name: 'marking',
        //       component: () => import('../views/Marking/marking.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: 'ZiDongShangpian',
        //   name: 'zidongshangpian',
        //   component: () => import('../views/Marking/marking.vue'),
        //   children: [
        //     {
        //       path: '/Marking/marking',
        //       name: 'marking',
        //       component: () => import('../views/Marking/marking.vue'),
        //     }
        //   ]
        // },
        // {
        //   /*----------- 烘干线 ----------------*/
        //   path: 'ZiDongShangpian',
        //   name: 'zidongshangpian',
        //   component: () => import('../views/Marking/marking.vue'),
        //   children: [
        //     {
        //       path: '/Marking/marking',
        //       name: 'marking',
        //       component: () => import('../views/Marking/marking.vue'),
        //     }
        //   ]
        // },
        // {
        //   /*----------- 旋转台 ----------------*/
        //   path: 'ZiDongShangpian',
        //   name: 'zidongshangpian',
        //   component: () => import('../views/Marking/marking.vue'),
        //   children: [
        //     {
        //       path: '/Marking/marking',
        //       name: 'marking',
        //       component: () => import('../views/Marking/marking.vue'),
        //     }
        //   ]
        // },
        // {
        //   /*----------- 自动贴膜机 ----------------*/
        //   path: 'ZiDongShangpian',
        //   name: 'zidongshangpian',
        //   component: () => import('../views/Marking/marking.vue'),
        //   children: [
        //     {
        //       path: '/Marking/marking',
        //       name: 'marking',
        //       component: () => import('../views/Marking/marking.vue'),
        //     }
        //   ]
        // },
        // {
        //   /*----------- 报工管理 ----------------*/
        //   path: 'ZiDongShangpian',
        //   name: 'zidongshangpian',
        //   component: () => import('../views/Marking/marking.vue'),
        //   children: [
        //     {
        //       path: '/Marking/marking',
        //       name: 'marking',
        //       component: () => import('../views/Marking/marking.vue'),
        //     }
        //   ]
        // },
        // {
        //   /*----------- 报表管理 ----------------*/
        //   path: 'ZiDongShangpian',
        //   name: 'zidongshangpian',
        //   component: () => import('../views/Marking/marking.vue'),
        //   children: [
        //     {
        //       path: '/Marking/marking',
        //       name: 'marking',
        //       component: () => import('../views/Marking/marking.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'),
            }
          ]
        },
        {
          /*----------- 扫码2 ----------------*/
          path: 'ScanQrCodesVerify',
          name: 'scanQrCodesVerify',
          component: () => import('../views/ScanQrCodesVerify/scanQrCodesVerify.vue'),
          children: [
            {
              path: '/ScanQrCodesVerify/scanQrCodesVerify',
              name: 'scanQrCodesVerify',
              component: () => import('../views/ScanQrCodesVerify/scanQrCodesVerify.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',
          name: 'drying',
          component: () => import('../views/Drying/drying.vue'),
          children: [
            {
              path: '/Drying/drying',
              name: 'drying',
              component: () => import('../views/Drying/drying.vue'),
            }
          ]
        },
        {
          /*----------- 旋转台 ----------------*/
          path: 'Rotate',
          name: 'rotate',
          component: () => import('../views/Rotate/rotate.vue'),
          children: [
            {
              path: '/Rotate/rotate',
              name: 'rotate',
              component: () => import('../views/Rotate/rotate.vue'),
            }
          ]
        },
        {
          /*----------- 自动贴膜机 ----------------*/
          path: 'Lamination',
          name: 'lamination',
          component: () => import('../views/Lamination/lamination.vue'),
          children: [
            {
              path: '/Lamination/lamination',
              name: 'lamination',
              component: () => import('../views/Lamination/lamination.vue'),
            }
          ]
        },
        {
          /*----------- 报工管理 ----------------*/
          path: 'ZiDongShangpian',
          name: 'zidongshangpian',
          component: () => import('../views/Marking/marking.vue'),
          children: [
            {
              path: '/Marking/marking',
              name: 'marking',
              component: () => import('../views/Marking/marking.vue'),
            }
          ]
        },
        {
          /*----------- 报表管理 ----------------*/
          path: 'ZiDongShangpian',
          name: 'zidongshangpian',
          component: () => import('../views/Marking/marking.vue'),
          children: [
            {
              path: '/Marking/marking',
              name: 'marking',
              component: () => import('../views/Marking/marking.vue'),
            }
          ]
        },
        /*----------- 系统管理 ----------------*/
        {
          path: 'User',