From 8dc2427e1c5e5e349bce2d72759034c406eb0848 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 13 三月 2026 01:15:27 +0800
Subject: [PATCH] 合并
---
项目代码/WCS/WCSClient/src/router/viewGird.js | 73 +-----------------------------------
1 files changed, 2 insertions(+), 71 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSClient/src/router/viewGird.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSClient/src/router/viewGird.js"
index 571ad18..70f9919 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSClient/src/router/viewGird.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSClient/src/router/viewGird.js"
@@ -1,6 +1,5 @@
let viewgird = [
-<<<<<<< HEAD
{
path: '/Sys_Log',
name: 'sys_Log',
@@ -58,7 +57,7 @@
path: '/task_hty',
name: 'task_hty',
component: () => import('@/views/taskinfo/task_hty.vue')
- },{
+ }, {
path: '/router',
name: 'router',
component: () => import('@/views/basicinfo/router.vue')
@@ -66,74 +65,7 @@
path: '/packaxis',
name: 'packaxis',
component: () => import('@/views/PackInfo/packaxis.vue')
- }]
-=======
- {
- path: '/Sys_Log',
- name: 'sys_Log',
- component: () => import('@/views/system/Sys_Log.vue')
- },
- {
- path: '/Sys_User',
- name: 'Sys_User',
- component: () => import('@/views/system/Sys_User.vue')
- },
- {
- path: '/permission',
- name: 'permission',
- component: () => import('@/views/system/Permission.vue')
- },
-
- {
- path: '/Sys_Dictionary',
- name: 'Sys_Dictionary',
- component: () => import('@/views/system/Sys_Dictionary.vue')
- },
- {
- path: '/Sys_Role',
- name: 'Sys_Role',
- component: () => import('@/views/system/Sys_Role.vue')
- }, {
- path: '/Sys_Role1',
- name: 'Sys_Role1',
- component: () => import('@/views/system/Sys_Role1.vue')
- }, {
- path: '/Sys_DictionaryList',
- name: 'Sys_DictionaryList',
- component: () => import('@/views/system/Sys_DictionaryList.vue')
- }, {
- path: '/deviceInfo',
- name: 'deviceInfo',
- component: () => import('@/views/quartzJob/deviceInfo.vue')
- }, {
- path: '/deviceProtocol',
- name: 'deviceProtocol',
- component: () => import('@/views/quartzJob/deviceProtocol.vue')
- }, {
- path: '/deviceProtocolDetail',
- name: 'deviceProtocolDetail',
- component: () => import('@/views/quartzJob/deviceProtocolDetail.vue')
- }, {
- path: '/dispatchInfo',
- name: 'dispatchInfo',
- component: () => import('@/views/quartzJob/dispatchInfo.vue')
- }, {
- path: '/task',
- name: 'task',
- component: () => import('@/views/taskinfo/task.vue')
- }, {
- path: '/task_hty',
- name: 'task_hty',
- component: () => import('@/views/taskinfo/task_hty.vue')
- }, {
- path: '/router',
- name: 'router',
- component: () => import('@/views/basicinfo/router.vue')
- }, {
- path: '/packaxis',
- name: 'packaxis',
- component: () => import('@/views/PackInfo/packaxis.vue')
- }, {
+ }, {
path: '/packtype',
name: 'packtype',
component: () => import('@/views/PackInfo/packtype.vue')
@@ -163,6 +95,5 @@
component: () => import('@/views/taskinfo/packaxistask_hty.vue')
}
]
->>>>>>> main
export default viewgird
--
Gitblit v1.9.3