From 886190e340964bb409bd15d62644f33fdb08f98e Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 26 四月 2023 13:13:44 +0800
Subject: [PATCH] 1.提交
---
vue.config.js | 4
src/views/jcsz/jsqd.vue | 32
src/views/kb/ckgl.vue | 4
src/store/modules/permission.js | 1
src/views/kb/zhkb.vue | 61 +
src/router/index.js | 1673 ++++++++++++++++++++++++++++++++++++++-----------------
6 files changed, 1,218 insertions(+), 557 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 9907e4b..6ee4f04 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -95,616 +95,520 @@
// { path: '*', redirect: '/404', hidden: true }
]
export const asyncRoutes = [
- // 1.绯荤粺绠＄悊锛堝熀纭�璁剧疆绫伙級
+ // {
+ // path: '/gtt',
+ // component: Layout,
+ // redirect: '/gtt/back',
+ // name: '鍩虹璁剧疆',
+ // code: '1001',
+ // meta: { code: '1001', title: '鍩虹璁剧疆', icon: 'tree' },
+ // alwaysShow: true, // 褰揷hildren鍙湁涓�涓椂锛屼篃鏄剧ず鐖惰彍鍗�
+ // children: [{
+ // path: 'back',
+ // name: 'YYQDCancel',
+ // code: '1011',
+ // component: () => import('@/views/gantt_back/gantt_back'),
+ // meta: { code: '1011', title: '鐢ㄦ埛娓呭崟', icon: '', keepAlive: true }
+ // }]
+ // },
{
- path: '/systemSetting',
+ path: '/jcsz',
component: Layout,
- redirect: '/systemSetting/organizationList',
- name: '绯荤粺绠＄悊',
- code: '2001',
- meta: { code: '2001', title: '绯荤粺绠＄悊', icon: 'xtsz' },
+ redirect: '/jcsz/zzjg',
+ name: '鍩虹璁剧疆',
+ code: '1001',
+ meta: { code: '1001', title: '鍩虹璁剧疆', icon: 'tree' },
alwaysShow: true, // 褰揷hildren鍙湁涓�涓椂锛屼篃鏄剧ず鐖惰彍鍗�
children: [
{
- path: 'organizationList',
- name: 'organizationListCancel',
+ path: 'zzjg',
+ name: 'ZZJGCancel',
code: '1010',
component: () => import('@/views/jcsz/zzjg'),
meta: { code: '1010', title: '缁勭粐鏋舵瀯', icon: '', keepAlive: true }
}, {
- path: 'roleList',
- name: 'roleListCancel',
- code: '1012',
- component: () => import('@/views/jcsz/jsqd'),
- meta: { code: '1012', title: '瑙掕壊娓呭崟', icon: '', keepAlive: true }
- }
-
- ]
- },
- // 2.瀹㈡埛绠＄悊
- {
- path: '/basicSettings',
- component: Layout,
- redirect: '/basicSettings/userList',
- name: '瀹㈡埛绠＄悊',
- code: '2002',
- meta: { code: '2002', title: '瀹㈡埛绠＄悊', icon: 'khgl' },
- alwaysShow: true, // 褰揷hildren鍙湁涓�涓椂锛屼篃鏄剧ず鐖惰彍鍗�
- children: [
- {
- path: 'userList',
- name: 'userListCancel',
+ path: 'yhqd',
+ name: 'YYQDCancel',
code: '1011',
component: () => import('@/views/jcsz/yhqd'),
meta: { code: '1011', title: '鐢ㄦ埛娓呭崟', icon: '', keepAlive: true }
}, {
- path: 'contactUnitList',
- name: 'contactUnitListCancel',
+ path: 'jsqd',
+ name: 'JSQDCancel',
+ code: '1012',
+ component: () => import('@/views/jcsz/jsqd'),
+ meta: { code: '1012', title: '瑙掕壊娓呭崟', icon: '', keepAlive: true }
+ }, {
+ path: 'wldw',
+ name: 'WLDWCancel',
code: '1013',
component: () => import('@/views/jcsz/wldw'),
meta: { code: '1013', title: '寰�鏉ュ崟浣�', icon: '', keepAlive: true }
- }
- ]
- },
- // 3.鏁版嵁閲囬泦绠＄悊 sop涓婁紶 鐏电繑椤圭洰鐨勭湅涓�
- // {
- // path: '/dataCollect',
- // component: Layout,
- // redirect: '/dataCollect/purchasesList',
- // name: '鏁版嵁閲囬泦绠＄悊',
- // code: '2003',
- // meta: { code: '2003', title: '鏁版嵁閲囬泦绠＄悊', icon: 'cggl' },
- // alwaysShow: true,
- // children: [
- // {
- // path: 'purchasesList',
- // name: 'CGDDCancel',
- // code: '1104',
- // component: () => import('@/views/xtsz/sc'),
- // meta: { code: '1104', title: 'SOP涓婁紶', icon: '', keepAlive: true }
- // }
- // ]
- // },
-
- // 4.璁㈠崟绠＄悊
- {
- path: '/orderManager',
- component: Layout,
- redirect: '/orderManager/erpProduceOrder',
- name: '鐢熶骇绠＄悊',
- code: '2004',
- meta: { code: '2004', title: '鐢熶骇绠＄悊', icon: 'production' },
- alwaysShow: true,
- children: [
- {
- path: 'erpProduceOrder',
- name: 'produceOrderCancel',
- code: '1070',
- component: () => import('@/views/scgl/scdd'),
- meta: { code: '1070', title: 'ERP鐢熶骇璁㈠崟', icon: '', keepAlive: true }
- }
- ]
- },
-
- // 5.鐗╂枡璁″垝绠＄悊
- // {
- // path: '/materialPlanManager',
- // component: Layout,
- // redirect: '/materialPlanManager/materialList',
- // name: '鐗╂枡璁″垝绠＄悊',
- // code: '2005',
- // meta: { code: '2005', title: '鐗╂枡璁″垝绠＄悊', icon: 'icu' },
- // alwaysShow: true,
- // children: [
- // {
- // path: 'materialList',
- // name: 'materialListCancel',
- // code: '1062',
- // component: () => import('@/views/zzmx/wlqd'),
- // meta: { code: '1062', title: '鐗╂枡娓呭崟', icon: '', keepAlive: true }
- // }
- // ]
- // },
-
- // 6.璐ㄩ噺绠＄悊
- {
- path: '/qualityManager',
- component: Layout,
- redirect: '/qualityManager/defectDefine',
- name: '璐ㄩ噺绠＄悊',
- code: '2006',
- meta: { code: '2006', title: '璐ㄩ噺绠＄悊', icon: 'quality' },
- alwaysShow: true,
- children: [
- {
- path: 'defectDefine',
- name: 'defectDefineCancel',
- code: '1081',
- component: () => import('@/views/zlgl/qxdy'),
- meta: { code: '1081', title: '缂洪櫡瀹氫箟', icon: '', keepAlive: true }
- }
- // {
- // path: 'qualityPlaning',
- // name: 'ZJFACancel',
- // code: '1088',
- // component: () => import('@/views/qualityManager/qualityPlaning'),
- // meta: { code: '1088', title: '璐ㄦ鏂规', icon: '', keepAlive: true }
- // }
- ]
- },
-
- // 7.宸ュ簭绠＄悊
- {
- path: '/processManager',
- component: Layout,
- redirect: '/processManager/processCheck',
- name: '宸ュ簭绠＄悊',
- code: '2007',
- meta: { code: '2007', title: '宸ュ簭绠＄悊', icon: 'gxgl' },
- alwaysShow: true,
- children: [
- {
- path: 'processCheck',
- name: 'processCheckCancel',
- code: '1082',
- component: () => import('@/views/zlgl/gxjy'),
- meta: { code: '1082', title: '宸ュ簭妫�楠�', icon: '', keepAlive: true }
},
{
- path: 'processCheckStandard',
- name: 'processCheckStandardCancel',
- code: '1085',
- component: () => import('@/views/zlgl/gxjybz'),
- meta: { code: '1085', title: '宸ュ簭妫�楠屾爣鍑�', icon: '', keepAlive: true }
- },
- {
- path: 'processCheckItem',
- name: 'processCheckItemCancel',
- code: '1086',
- component: () => import('@/views/zlgl/gxjyxm'),
- meta: { code: '1086', title: '宸ュ簭妫�楠岄」鐩�', icon: '', keepAlive: true }
- },
- {
- path: 'processCheckRecord',
- name: 'processCheckRecordCancel',
- code: '1087',
- component: () => import('@/views/zlgl/gxjyjl'),
- meta: { code: '1087', title: '宸ュ簭妫�楠岃褰�', icon: '', keepAlive: true }
+ path: 'adsz',
+ name: 'ADZZCancel',
+ code: '1014',
+ component: () => import('@/views/jcsz/adsz'),
+ meta: { code: '1014', title: '瀹夌伅璁剧疆', icon: '', keepAlive: true }
}
]
},
-
- // 8.浜哄姏璧勬簮绠＄悊
{
- path: '/resourcesManager',
+ path: '/sbgl',
component: Layout,
- redirect: '/resourcesManager/groupSalaryList',
- name: '浜哄姏璧勬簮绠＄悊',
- code: '2008',
- meta: { code: '1008', title: '浜哄姏璧勬簮绠＄悊', icon: 'rlzy' },
+ redirect: '/sbgl/sblx',
+ name: '璁惧绠＄悊',
+ code: '1002',
+ meta: { code: '1002', title: '璁惧绠＄悊', icon: 'example' },
alwaysShow: true,
children: [
{
- path: 'groupSalaryList',
- name: 'groupSalaryListCancel',
- code: '1090',
- component: () => import('@/views/bbgl/bzgz'),
- meta: { code: '1090', title: '鐝粍宸ヨ祫缁熻鎶ヨ〃', icon: '', keepAlive: true }
+ path: 'sblx',
+ name: 'SBLXCancel',
+ code: '1020',
+ component: () => import('@/views/sbgl/sblx'),
+ meta: { code: '1020', title: '璁惧绫诲瀷', icon: '', keepAlive: true }
},
- // {
- // path: 'personSalaryList',
- // name: 'personSalaryListCancel',
- // code: '1091',
- // component: () => import('@/views/bbgl/rygz'),
- // meta: { code: '1091', title: '浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃', icon: '', keepAlive: true }
- // },
{
- path: 'subcontractingOperation',
- name: 'subcontractingOperationCancel',
- code: '1092',
- component: () => import('@/views/bbgl/wwgx'),
- meta: { code: '1092', title: '濮斿宸ュ簭鏄庣粏鎶ヨ〃', icon: '', keepAlive: true }
- }
- ]
- },
-
- // 9.鏅鸿兘鎶ヨ〃
- {
- path: '/reportManager',
- component: Layout,
- redirect: '/reportManager/defectDetailList',
- name: '鏅鸿兘鎶ヨ〃',
- code: '2009',
- meta: { code: '2009', title: '鏅鸿兘鎶ヨ〃', icon: 'bbgl' },
- alwaysShow: true,
- children: [
- {
- path: 'defectDetailList',
- name: 'defectDetailListCancel',
- code: '1093',
- component: () => import('@/views/bbgl/blmx'),
- meta: { code: '1093', title: '涓嶈壇鏄庣粏鎶ヨ〃', icon: '', keepAlive: true }
+ path: 'wxjl',
+ code: '1029Cancel',
+ name: 'WXJL',
+ component: () => import('@/views/sbgl/wxjl'),
+ meta: { code: '1029', title: '缁翠慨璁板綍', icon: '', keepAlive: true }
}, {
- path: 'abnormalQualityList',
- name: 'abnormalQualityListCancel',
- code: '1094',
- component: () => import('@/views/bbgl/pzyc'),
- meta: { code: '1094', title: '鍝佽川寮傚父鎺掕鎶ヨ〃', icon: '', keepAlive: true }
- }, {
- path: 'repairDetailList',
- name: 'repairDetailListCancel',
- code: '1095',
- component: () => import('@/views/bbgl/wxmx'),
- meta: { code: '1095', title: '缁翠慨鏄庣粏鎶ヨ〃', icon: '', keepAlive: true }
+ path: 'sbz',
+ name: 'SBZCancel',
+ code: '1021',
+ component: () => import('@/views/sbgl/sbz'),
+ meta: { code: '1021', title: '璁惧缁�', icon: '', keepAlive: true }
+ },
+ {
+ path: 'sbqd',
+ name: 'sbqdCancel',
+ code: '1022',
+ component: () => import('@/views/sbgl/sbqd'),
+ meta: { code: '1022', title: '璁惧娓呭崟', icon: '', keepAlive: true }
+ },
+ {
+ path: 'djbz',
+ name: 'DJBZCancel',
+ code: '1023',
+ component: () => import('@/views/sbgl/djbz'),
+ meta: { code: '1023', title: '鐐规鏍囧噯', icon: '', keepAlive: true }
+ },
+ {
+ path: 'djbw',
+ name: 'DJBWCancel',
+ code: '1024',
+ component: () => import('@/views/sbgl/djbw'),
+ meta: { code: '1024', title: '鐐规閮ㄤ綅', icon: '', keepAlive: true }
+ },
+ {
+ path: 'bybz',
+ name: 'BYBZCancel',
+ code: '1025',
+ component: () => import('@/views/sbgl/bybz'),
+ meta: { code: '1025', title: '淇濆吇鏍囧噯', icon: '', keepAlive: true }
+ },
+ {
+ path: 'bybw',
+ name: 'BYBWCancel',
+ code: '1026',
+ component: () => import('@/views/sbgl/bybw'),
+ meta: { code: '1026', title: '淇濆吇閮ㄤ綅', icon: '', keepAlive: true }
+ },
+ {
+ path: 'djjl',
+ name: 'DJJLCancel',
+ code: '1027',
+ component: () => import('@/views/sbgl/djjl'),
+ meta: { code: '1027', title: '鐐规璁板綍', icon: '', keepAlive: true }
+ },
+ {
+ path: 'byjl',
+ name: 'BYJLCancel',
+ code: '1028',
+ component: () => import('@/views/sbgl/byjl'),
+ meta: { code: '1028', title: '淇濆吇璁板綍', icon: '', keepAlive: true }
}
- // {
- // path: 'installationLampList',
- // name: 'installationLampListCancel',
- // code: '1096',
- // component: () => import('@/views/reportManager/installationLampList'),
- // meta: { code: '1096', title: '瀹夌伅鎶ヨ〃', icon: '', keepAlive: true }
- // }
]
},
-
- // 10.搴撳瓨绠＄悊
{
- path: '/inventoryManager',
+ path: '/gzgl',
component: Layout,
- redirect: '/inventoryManager/storehouseDefine',
- name: '搴撳瓨绠＄悊',
- code: '2010',
- meta: { code: '2010', title: '搴撳瓨绠＄悊', icon: 'table' },
+ redirect: '/gzgl/gzlx',
+ name: '宸ヨ绠＄悊',
+ code: '1003',
+ meta: { code: '1003', title: '宸ヨ绠＄悊', icon: 'component' },
alwaysShow: true,
children: [
{
- path: 'storehouseDefine',
- name: 'storehouseDefineCancel',
+ path: 'gzlx',
+ name: 'GZLXCancel',
+ code: '1030',
+ component: () => import('@/views/gzgl/gzlx'),
+ meta: { code: '1030', title: '宸ヨ绫诲瀷', icon: '', keepAlive: true }
+ }, {
+ path: 'sjxj',
+ name: 'SJXJCancel',
+ code: '1039',
+ component: () => import('@/views/gzgl/sjxj'),
+ meta: { code: '1039', title: '涓婃満涓嬫満', icon: '', keepAlive: true }
+ }, {
+ path: 'ckrk',
+ name: 'CKRKCancel',
+ code: '1040',
+ component: () => import('@/views/gzgl/ckrk'),
+ meta: { code: '1040', title: '鍑哄簱鍏ュ簱', icon: '', keepAlive: true }
+ }, {
+ path: 'gzqd',
+ name: 'GZQDCancel',
+ code: '1031',
+ component: () => import('@/views/gzgl/gzqd'),
+ meta: { code: '1031', title: '宸ヨ娓呭崟', icon: '', keepAlive: true }
+ }, {
+ path: 'djbz',
+ name: 'DJBZCancel',
+ code: '1032',
+ component: () => import('@/views/gzgl/djbz'),
+ meta: { code: '1032', title: '鐐规鏍囧噯', icon: '', keepAlive: true }
+ }, {
+ path: 'djbw',
+ name: 'DJBWCancel',
+ code: '1033',
+ component: () => import('@/views/gzgl/djbw'),
+ meta: { code: '1033', title: '鐐规閮ㄤ綅', icon: '', keepAlive: true }
+ }, {
+ path: 'bybz',
+ name: 'BYBZCancel',
+ code: '1034',
+ component: () => import('@/views/gzgl/bybz'),
+ meta: { code: '1034', title: '淇濆吇鏍囧噯', icon: '', keepAlive: true }
+ }, {
+ path: 'bybw',
+ name: 'BYBWCancel',
+ code: '1035',
+ component: () => import('@/views/gzgl/bybw'),
+ meta: { code: '1035', title: '淇濆吇閮ㄤ綅', icon: '', keepAlive: true }
+ }, {
+ path: 'djjl',
+ name: 'DJJLCancel',
+ code: '1036',
+ component: () => import('@/views/gzgl/djjl'),
+ meta: { code: '1036', title: '鐐规璁板綍', icon: '', keepAlive: true }
+ }, {
+ path: 'byjl',
+ name: 'BYJLCancel',
+ code: '1037',
+ component: () => import('@/views/gzgl/byjl'),
+ meta: { code: '1037', title: '淇濆吇璁板綍', icon: '', keepAlive: true }
+ }, {
+ path: 'gzwx',
+ name: 'GZWXCancel',
+ code: '1038',
+ component: () => import('@/views/gzgl/gzwx'),
+ meta: { code: '1038', title: '宸ヨ缁翠慨', icon: '', keepAlive: true }
+ }
+ ]
+ },
+ {
+ path: '/wlgl',
+ component: Layout,
+ redirect: '/wlgl/ckdy',
+ name: '鐗╂枡绠＄悊',
+ code: '1004',
+ meta: { code: '1004', title: '鐗╂枡绠＄悊', icon: 'table' },
+ alwaysShow: true,
+ children: [
+ {
+ path: 'ckdy',
+ name: 'CKDYCancel',
code: '1050',
component: () => import('@/views/wlgl/ckdy'),
meta: { code: '1050', title: '浠撳簱瀹氫箟', icon: '', keepAlive: true }
},
{
- path: 'locationDefine',
- name: 'locationDefineCancel',
+ path: 'kwdy',
+ name: 'KWDYCancel',
code: '1051',
component: () => import('@/views/wlgl/kwdy'),
meta: { code: '1051', title: '搴撲綅瀹氫箟', icon: '', keepAlive: true }
+ }, {
+ path: 'rqlx',
+ name: 'RYLXCancel',
+ code: '1052',
+ component: () => import('@/views/wlgl/rqlx'),
+ meta: { code: '1052', title: '瀹瑰櫒绫诲瀷', icon: '', keepAlive: true }
+ }, {
+ path: 'rqqd',
+ name: 'RQQDCancel',
+ code: '1053',
+ component: () => import('@/views/wlgl/rqqd'),
+ meta: { code: '1053', title: '瀹瑰櫒娓呭崟', icon: '', keepAlive: true }
+ }, {
+ path: 'crkjl',
+ name: 'CRKJLCancel',
+ code: '1054',
+ component: () => import('@/views/wlgl/crkjl'),
+ meta: { code: '1054', title: '鍑哄叆搴撹褰�', icon: '', keepAlive: true }
+ }, {
+ path: 'kccx',
+ name: 'KCCXCancel',
+ code: '1055',
+ component: () => import('@/views/wlgl/kccx'),
+ meta: { code: '1055', title: '搴撳瓨鏌ヨ', icon: '', keepAlive: true }
}
- // {
- // path: 'containerType',
- // name: 'containerTypeCancel',
- // code: '1052',
- // component: () => import('@/views/materialManager/containerType'),
- // meta: { code: '1052', title: '瀹瑰櫒绫诲瀷', icon: '', keepAlive: true }
- // }, {
- // path: 'containerList',
- // name: 'containerListCancel',
- // code: '1053',
- // component: () => import('@/views/materialManager/containerList'),
- // meta: { code: '1053', title: '瀹瑰櫒娓呭崟', icon: '', keepAlive: true }
- // }, {
- // path: 'inOutboundRecord',
- // name: 'inOutboundRecordCancel',
- // code: '1054',
- // component: () => import('@/views/materialManager/inOutboundRecord'),
- // meta: { code: '1054', title: '鍑哄叆搴撹褰�', icon: '', keepAlive: true }
- // }, {
- // path: 'inventoryQuery',
- // name: 'inventoryQueryCancel',
- // code: '1055',
- // component: () => import('@/views/materialManager/inventoryQuery'),
- // meta: { code: '1055', title: '搴撳瓨鏌ヨ', icon: '', keepAlive: true }
- // },
-
- // {
- // path: 'InventoryLedgerList',
- // name: 'InventoryLedgerListCancel',
- // code: '1205',
- // component: () => import('@/views/purchasesManager/InventoryLedgerList'),
- // meta: { code: '1205', title: '搴撳瓨鍙拌处', icon: '', keepAlive: true }
- // }
]
},
-
- // 11.閲囪喘绠＄悊
- // {
- // path: '/purchasesManager',
- // component: Layout,
- // redirect: '/purchasesManager/purchasesList',
- // name: '閲囪喘绠＄悊',
- // code: '2011',
- // meta: { code: '2011', title: '閲囪喘绠＄悊', icon: 'cggl' },
- // alwaysShow: true,
- // children: [
- // {
- // path: 'purchasesList',
- // name: 'CGDDCancel',
- // code: '1201',
- // component: () => import('@/views/purchasesManager/purchasesList'),
- // meta: { code: '1201', title: '閲囪喘璁㈠崟', icon: '', keepAlive: true }
- // }, {
- // path: 'arrivalNoticeList',
- // name: 'arrivalNoticeListCancel',
- // code: '1202',
- // component: () => import('@/views/purchasesManager/arrivalNoticeList'),
- // meta: { code: '1202', title: '閲囪喘鏀惰揣鍗�', icon: '', keepAlive: true }
- // }
- // ]
- // },
-
- // 12.閿�鍞鐞�
- // {
- // path: '/sale',
- // component: Layout,
- // redirect: '/sale/salesStatisticsList',
- // name: '閿�鍞鐞�',
- // code: '2012',
- // meta: { code: '2012', title: '閿�鍞鐞�', icon: 'xsgl' },
- // alwaysShow: true,
- // children: [
- // {
- // path: 'salesStatisticsList',
- // name: 'salesStatisticsCancel',
- // code: '1203',
- // component: () => import('@/views/purchasesManager/salesStatisticsList'),
- // meta: { code: '1203', title: '閿�鍞鍗�', icon: '', keepAlive: true }
- // }, {
- // path: 'goodsStatisticsList',
- // name: 'goodsStatisticsListCancel',
- // code: '1204',
- // component: () => import('@/views/purchasesManager/goodsStatisticsList'),
- // meta: { code: '1204', title: '閿�璐у崟', icon: '', keepAlive: true }
- // }
- // ]
- // },
-
- // 13.宸ュ崟绠＄悊
{
- path: '/work',
+ path: '/zzmx',
component: Layout,
- redirect: '/work/workOrder',
- name: '宸ュ崟绠＄悊',
- code: '2013',
- meta: { code: '2013', title: '宸ュ崟绠＄悊', icon: 'gzgl' },
+ redirect: '/zzmx/gylx',
+ name: '鍒堕�犳ā鍨�',
+ code: '1005',
+ meta: { code: '1005', title: '鍒堕�犳ā鍨�', icon: 'icu' },
alwaysShow: true,
children: [
{
- path: 'workOrder',
- name: 'workOrderCancel',
- code: '1071',
- component: () => import('@/views/scgl/gd'),
- meta: { code: '1071', title: 'MES宸ュ崟', icon: '', keepAlive: true }
+ path: 'wllx',
+ name: 'WLLXCancel',
+ code: '1060',
+ component: () => import('@/views/zzmx/wllx'),
+ meta: { code: '1060', title: '鐗╂枡绫诲瀷', icon: '', keepAlive: true }
},
{
- path: 'workOrderBatchClose',
- name: 'workOrderBatchCloseCancel',
- code: '1074',
- component: () => import('@/views/scgl/gdplgb'),
- meta: { code: '1074', title: 'MES宸ュ崟鎵归噺鍏抽棴', icon: '', keepAlive: true }
- }
- // {
- // path: 'updateWorkOrder',
- // name: 'XGBGCancel',
- // code: '1077',
- // component: () => import('@/views/scgl/xgbg'),
- // meta: { code: '1077', title: '淇敼鎶ュ伐', icon: '', keepAlive: true }
- // }
- ]
- },
-
- // 14.宸ュ崟鎺掍骇
- // {
- // path: '/produceManager',
- // component: Layout,
- // redirect: '/produceManager/produceOrder',
- // name: '宸ュ崟鎺掍骇',
- // code: '2014',
- // meta: { code: '2014', title: '宸ュ崟鎺掍骇', icon: 'scgl' },
- // alwaysShow: true,
- // children: [
- // {
- // path: 'AutoScheduling',
- // name: 'AutoSchedulingCancel',
- // code: '1076',
- // component: () => import('@/views/produceManager/AutoScheduling'),
- // meta: { code: '1076', title: '鑷姩鎺掔▼', icon: '', keepAlive: true }
- // }
- // ]
- // },
-
- // 15.鐢熶骇绠＄悊
- {
- path: '/extendedModule',
- component: Layout,
- redirect: '/extendedModule/produceStartOrder',
- name: '鐢熶骇绠＄悊',
- code: '2015',
- meta: { code: '2015', title: '鐢熶骇绠＄悊', icon: 'tree2' },
- alwaysShow: true, // 褰揷hildren鍙湁涓�涓椂锛屼篃鏄剧ず鐖惰彍鍗�
- children: [
+ path: 'chda',
+ name: 'CHDACancel',
+ code: '1061',
+ component: () => import('@/views/zzmx/chda'),
+ meta: { code: '1061', title: '瀛樿揣妗ｆ', icon: '', keepAlive: true }
+ },
{
- path: 'produceStartOrder',
- name: 'produceStartOrderCancel',
- code: '1073',
- component: () => import('@/views/scgl/sckbg'),
- meta: { code: '1073', title: '鐢熶骇寮�鎶ュ伐', icon: '', keepAlive: true }
- }
- // {
- // path: 'capacityPlanning',
- // name: 'capacityPlanningCancel',
- // code: '1075',
- // component: () => import('@/views/produceManager/capacityPlanning'),
- // meta: { code: '1075', title: '浜ц兘瑙勫垝', icon: '', keepAlive: true }
- // }
- ]
- },
-
- // 16.宸ヨ壓绠＄悊
- {
- path: '/makeModel',
- component: Layout,
- redirect: '/makeModel/processRoute',
- name: '杞﹂棿绠＄悊',
- code: '2016',
- meta: { code: '2016', title: '杞﹂棿绠＄悊', icon: 'cjgl' },
- alwaysShow: true,
- children: [
+ path: 'wlqd',
+ name: 'WLQDCancel',
+ code: '1062',
+ component: () => import('@/views/zzmx/wlqd'),
+ meta: { code: '1062', title: '鐗╂枡娓呭崟', icon: '', keepAlive: true }
+ },
{
- path: 'processRoute',
- name: 'processRouteCancel',
+ path: 'gylx',
+ name: 'GYLXCancel',
code: '1063',
component: () => import('@/views/zzmx/gylx'),
meta: { code: '1063', title: '宸ヨ壓璺嚎', icon: '', keepAlive: true }
}, {
- path: 'processDefine',
- name: 'processDefineCancel',
+ path: 'gxdy',
+ name: 'GXDYCancel',
code: '1064',
component: () => import('@/views/zzmx/gxdy'),
meta: { code: '1064', title: '宸ュ簭瀹氫箟', icon: '', keepAlive: true }
},
{
- path: 'meterPrice',
- name: 'meterPriceCancel',
+ path: 'jpgj',
+ name: 'JPGJCancel',
code: '1065',
component: () => import('@/views/zzmx/jpgj'),
meta: { code: '1065', title: '鑺傛媿宸ヤ环', icon: '', keepAlive: true }
}
]
},
-
- // 17.璁惧绠＄悊
{
- path: '/deviceManager',
+ path: '/scgl',
component: Layout,
- redirect: '/deviceManager/deviceList',
- name: '璁惧绠＄悊',
- code: '2017',
- meta: { code: '2017', title: '璁惧绠＄悊', icon: 'example' },
+ redirect: '/scgl/scdd',
+ name: '鐢熶骇绠＄悊',
+ code: '1006',
+ meta: { code: '1006', title: '鐢熶骇绠＄悊', icon: 'production' },
alwaysShow: true,
children: [
{
- path: 'deviceList',
- name: 'deviceListCancel',
- code: '1022',
- component: () => import('@/views/sbgl/sbqd'),
- meta: { code: '1022', title: '璁惧娓呭崟', icon: '', keepAlive: true }
+ path: 'scdd',
+ name: 'SCDDCancel',
+ code: '1070',
+ component: () => import('@/views/scgl/scdd'),
+ meta: { code: '1070', title: 'ERP鐢熶骇璁㈠崟', icon: '', keepAlive: true }
+ }, {
+ path: 'gd',
+ name: 'GDCancel',
+ code: '1071',
+ component: () => import('@/views/scgl/gd'),
+ meta: { code: '1071', title: 'MES宸ュ崟', icon: '', keepAlive: true }
+ }, {
+ path: 'gdpg',
+ name: 'GDPDCancel',
+ code: '1072',
+ component: () => import('@/views/scgl/gdpg'),
+ meta: { code: '1072', title: '宸ュ崟娲惧伐', icon: '', keepAlive: true }
+ }, {
+ path: 'sckbg',
+ name: 'SCKBGCancel',
+ code: '1073',
+ component: () => import('@/views/scgl/sckbg'),
+ meta: { code: '1073', title: '鐢熶骇寮�鎶ュ伐', icon: '', keepAlive: true }
+ }, {
+ path: 'gdplgb',
+ name: 'GDPLGBCancel',
+ code: '1074',
+ component: () => import('@/views/scgl/gdplgb'),
+ meta: { code: '1074', title: 'MES宸ュ崟鎵归噺鍏抽棴', icon: '', keepAlive: true }
}
- // {
- // path: 'checkStandard',
- // name: 'checkStandardCancel',
- // code: '1023',
- // component: () => import('@/views/deviceManager/checkStandard'),
- // meta: { code: '1023', title: '璁惧鐐规鏍囧噯', icon: '', keepAlive: true }
- // },
- // {
- // path: 'checkPosition',
- // name: 'checkPositionCancel',
- // code: '1024',
- // component: () => import('@/views/deviceManager/checkPosition'),
- // meta: { code: '1024', title: '璁惧鐐规閮ㄤ綅', icon: '', keepAlive: true }
- // },
- // {
- // path: 'maintainStandard',
- // name: 'maintainStandardCancel',
- // code: '1025',
- // component: () => import('@/views/deviceManager/maintainStandard'),
- // meta: { code: '1025', title: '璁惧淇濆吇鏍囧噯', icon: '', keepAlive: true }
- // },
- // {
- // path: 'maintainPosition',
- // name: 'maintainPositionCancel',
- // code: '1026',
- // component: () => import('@/views/deviceManager/maintainPosition'),
- // meta: { code: '1026', title: '璁惧淇濆吇閮ㄤ綅', icon: '', keepAlive: true }
- // },
- // {
- // path: 'checkRecord',
- // name: 'checkRecordCancel',
- // code: '1027',
- // component: () => import('@/views/deviceManager/checkRecord'),
- // meta: { code: '1027', title: '璁惧鐐规璁板綍', icon: '', keepAlive: true }
- // },
- // {
- // path: 'maintainRecord',
- // name: 'maintainRecordCancel',
- // code: '1028',
- // component: () => import('@/views/deviceManager/maintainRecord'),
- // meta: { code: '1028', title: '璁惧淇濆吇璁板綍', icon: '', keepAlive: true }
- // },
- // {
- // path: 'repairRecord',
- // code: '1029',
- // name: 'repairRecordCancel',
- // component: () => import('@/views/deviceManager/repairRecord'),
- // meta: { code: '1029', title: '璁惧缁翠慨璁板綍', icon: '', keepAlive: true }
- // }
]
},
-
- // 18.鍏跺畠ERP闆嗘垚
{
- path: '/otherErp',
+ path: '/zlgl',
component: Layout,
- redirect: '/otherErp/InventoryList',
- name: '鍏跺畠ERP闆嗘垚',
- code: '2018',
- meta: { code: '2018', title: '鍏跺畠ERP闆嗘垚', icon: 'erpjc' },
+ redirect: '/zlgl/zjbz',
+ name: '璐ㄩ噺绠＄悊',
+ code: '1007',
+ meta: { code: '1007', title: '璐ㄩ噺绠＄悊', icon: 'quality' },
alwaysShow: true,
children: [
{
- path: 'InventoryList',
- name: 'InventoryListCancel',
- code: '1061',
- component: () => import('@/views/zzmx/chda'),
- meta: { code: '1061', title: '瀛樿揣妗ｆ', icon: '', keepAlive: true }
+ path: 'zjbz',
+ name: 'ZJBZCancel',
+ code: '1080',
+ component: () => import('@/views/zlgl/zjbz'),
+ meta: { code: '1080', title: '璐ㄦ鏍囧噯', icon: '', keepAlive: true }
+ }, {
+ path: 'qxdy',
+ name: 'QXDYCancel',
+ code: '1081',
+ component: () => import('@/views/zlgl/qxdy'),
+ meta: { code: '1081', title: '缂洪櫡瀹氫箟', icon: '', keepAlive: true }
+ }, {
+ path: 'gxjy',
+ name: 'GXDYCancel',
+ code: '1082',
+ component: () => import('@/views/zlgl/gxjy'),
+ meta: { code: '1082', title: '宸ュ簭妫�楠�', icon: '', keepAlive: true }
+ }, {
+ path: 'wljy',
+ name: 'WLJYCancel',
+ code: '1083',
+ component: () => import('@/views/zlgl/wljy'),
+ meta: { code: '1083', title: '鐗╂祦妫�楠�', icon: '', keepAlive: true }
+ }, {
+ path: 'qxsj',
+ name: 'QXSJCancel',
+ code: '1084',
+ component: () => import('@/views/zlgl/qxsj'),
+ meta: { code: '1084', title: '缂洪櫡缁熻', icon: '', keepAlive: true }
+ },
+ {
+ path: 'gxjybz',
+ name: 'QXJYBZCancel',
+ code: '1085',
+ component: () => import('@/views/zlgl/gxjybz'),
+ meta: { code: '1085', title: '宸ュ簭妫�楠屾爣鍑�', icon: '', keepAlive: true }
+ },
+ {
+ path: 'gxjyxm',
+ name: 'GXJYXMCancel',
+ code: '1086',
+ component: () => import('@/views/zlgl/gxjyxm'),
+ meta: { code: '1086', title: '宸ュ簭妫�楠岄」鐩�', icon: '', keepAlive: true }
+ }, {
+ path: 'gxjyjl',
+ name: 'GXJYJLCancel',
+ code: '1087',
+ component: () => import('@/views/zlgl/gxjyjl'),
+ meta: { code: '1087', title: '宸ュ簭妫�楠岃褰�', icon: '', keepAlive: true }
+ }
+ ]
+ },
+ {
+ path: '/bbgl',
+ component: Layout,
+ redirect: '/bbgl/sczxbb',
+ name: '鎶ヨ〃绠＄悊',
+ code: '1008',
+ meta: { code: '1008', title: '鎶ヨ〃绠＄悊', icon: 'bbgl' },
+ alwaysShow: true,
+ children: [
+ {
+ path: 'bzgztj',
+ name: 'BZGZTJCancel',
+ code: '1090',
+ component: () => import('@/views/bbgl/bzgz'),
+ meta: { code: '1090', title: '鐝粍宸ヨ祫缁熻', icon: '', keepAlive: true }
+ }, {
+ path: 'rygz',
+ name: 'RYGZCancel',
+ code: '1091',
+ component: () => import('@/views/bbgl/rygz'),
+ meta: { code: '1091', title: '浜哄憳宸ヨ祫', icon: '', keepAlive: true }
+ }, {
+ path: 'wwgx',
+ name: 'WWGXCancel',
+ code: '1092',
+ component: () => import('@/views/bbgl/wwgx'),
+ meta: { code: '1092', title: '濮斿宸ュ簭', icon: '', keepAlive: true }
+ }, {
+ path: 'blmx',
+ name: 'BLMXJCancel',
+ code: '1093',
+ component: () => import('@/views/bbgl/blmx'),
+ meta: { code: '1093', title: '涓嶈壇鏄庣粏', icon: '', keepAlive: true }
+ }, {
+ path: 'pzyc',
+ name: 'PZYCJCancel',
+ code: '1094',
+ component: () => import('@/views/bbgl/pzyc'),
+ meta: { code: '1094', title: '鍝佽川寮傚父', icon: '', keepAlive: true }
+ }, {
+ path: 'wxmx',
+ name: 'WXMXJCancel',
+ code: '1095',
+ component: () => import('@/views/bbgl/wxmx'),
+ meta: { code: '1095', title: '缁翠慨鏄庣粏', icon: '', keepAlive: true }
+ }
+ ]
+ },
+ {
+ path: '/xtsz',
+ component: Layout,
+ redirect: '/xtsz/bmgz',
+ name: '绯荤粺璁剧疆',
+ code: '1009',
+ meta: { code: '1009', title: '绯荤粺璁剧疆', icon: 'xtsz' },
+ alwaysShow: true,
+ children: [
+ {
+ path: 'bmgz',
+ name: 'BMGZCancel',
+ code: '1101',
+ component: () => import('@/views/xtsz/bmgz'),
+ meta: { code: '1101', title: '缂栫爜瑙勫垯', icon: '', keepAlive: true }
+ },
+ {
+ path: 'mmxg',
+ name: 'MMXGCancel',
+ code: '1102',
+ component: () => import('@/views/xtsz/mmxg'),
+ meta: { code: '1102', title: '瀵嗙爜淇敼', icon: '', keepAlive: true }
+ },
+ {
+ path: 'xtrz',
+ name: 'XTRZCancel',
+ code: '1103',
+ component: () => import('@/views/xtsz/xtrz'),
+ meta: { code: '1103', title: '绯荤粺鏃ュ織', icon: '', keepAlive: true }
+ }, {
+ path: 'sc',
+ name: 'SCCancel',
+ code: '1104',
+ component: () => import('@/views/xtsz/sc'),
+ meta: { code: '1104', title: 'SOP涓婁紶', icon: '', keepAlive: true }
+ }, {
+ path: 'cjgg',
+ name: 'CJGGancel',
+ code: '1105',
+ component: () => import('@/views/xtsz/cjgg'),
+ meta: { code: '1105', title: '杞﹂棿鍏憡', icon: '', keepAlive: true }
}
]
}
-
- // {
- // path: '/systemSettings',
- // component: Layout,
- // redirect: '/systemSettings/bmgz',
- // name: '绯荤粺璁剧疆',
- // code: '1009',
- // meta: { code: '1009', title: '绯荤粺璁剧疆', icon: 'xtsz' },
- // alwaysShow: true,
- // children: [
- // {
- // path: 'codingRules',
- // name: 'codingRulesCancel',
- // code: '1101',
- // component: () => import('@/views/systemSettings/codingRules'),
- // meta: { code: '1101', title: '缂栫爜瑙勫垯', icon: '', keepAlive: true }
- // }, {
- // path: 'passwordEdit',
- // name: 'passwordEditCancel',
- // code: '1102',
- // component: () => import('@/views/systemSettings/passwordEdit'),
- // meta: { code: '1102', title: '瀵嗙爜淇敼', icon: '', keepAlive: true }
- // }, {
- // path: 'systemLog',
- // name: 'systemLogCancel',
- // code: '1103',
- // component: () => import('@/views/systemSettings/systemLog'),
- // meta: { code: '1103', title: '绯荤粺鏃ュ織', icon: '', keepAlive: true }
- // }, {
- // path: 'sopUpload',
- // name: 'sopUploadCancel',
- // code: '1104',
- // component: () => import('@/views/systemSettings/sopUpload'),
- // meta: { code: '1104', title: 'SOP涓婁紶', icon: '', keepAlive: true }
- // }, {
- // path: 'shopNotice',
- // name: 'shopNoticeCancel',
- // code: '1105',
- // component: () => import('@/views/systemSettings/shopNotice'),
- // meta: { code: '1105', title: '杞﹂棿鍏憡', icon: '', keepAlive: true }
- // }
- // ]
- // }
-
]
const createRouter = () => new Router({
@@ -722,3 +626,728 @@
}
export default router
+
+// import Vue from 'vue'
+// import Router from 'vue-router'
+//
+// Vue.use(Router)
+//
+// /* Layout */
+// import Layout from '@/layout'
+//
+// /**
+// * Note: sub-menu only appear when route children.length >= 1
+// * Detail see: https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
+// *
+// * hidden: true if set true, item will not show in the sidebar(default is false)
+// * alwaysShow: true if set true, will always show the root menu
+// * if not set alwaysShow, when item has more than one children route,
+// * it will becomes nested mode, otherwise not show the root menu
+// * redirect: noRedirect if set noRedirect will no redirect in the breadcrumb
+// * name:'router-name' the name is used by <keep-alive> (must set!!!)
+// * meta : {
+// roles: ['admin','editor'] control the page roles (you can set multiple roles)
+// title: 'title' the name show in sidebar and breadcrumb (recommend set)
+// icon: 'svg-name'/'el-icon-x' the icon show in the sidebar
+// breadcrumb: false if set false, the item will hidden in breadcrumb(default is true)
+// activeMenu: '/example/list' if set path, the sidebar will highlight the path you set
+// }
+// */
+//
+// /**
+// * constantRoutes
+// * a base page that does not have permission requirements
+// * all roles can be accessed
+// */
+// export const commonRoutes = [
+// /*
+// * 鐪嬫澘閮ㄥ垎璺敱
+// * */
+// {
+// path: '/cjzl',
+// component: () => import('@/views/kb/cjzl'),
+// hidden: true
+// },
+// {
+// path: '/zhkb',
+// component: () => import('@/views/kb/zhkb'),
+// hidden: true
+// },
+// {
+// path: '/cjsc',
+// component: () => import('@/views/kb/cjsc'),
+// hidden: true
+// },
+// {
+// path: '/ckgl',
+// component: () => import('@/views/kb/ckgl'),
+// hidden: true
+// },
+// {
+// path: '/cgdd',
+// component: () => import('@/views/kb/cgdd'),
+// hidden: true
+// },
+// {
+// path: '/login',
+// component: () => import('@/views/login/index'),
+// hidden: true
+// },
+// {
+// path: '/404',
+// component: () => import('@/views/404'),
+// hidden: true
+// },
+// {
+// path: '/redirect',
+// component: Layout,
+// hidden: true,
+// children: [
+// {
+// path: '/redirect/:path(.*)',
+// component: () => import('@/views/redirect/index')
+// }
+// ]
+// },
+// {
+// path: '/',
+// component: Layout,
+// redirect: '/index',
+// name: '绯荤粺棣栭〉',
+// children: [{
+// path: 'index',
+// name: 'index',
+// component: () => import('@/views/xtsy/index'),
+// meta: { title: '绯荤粺棣栭〉', icon: 'home', affix: true }
+// }]
+// }
+// // { path: '*', redirect: '/404', hidden: true }
+// ]
+// export const asyncRoutes = [
+// // 1.绯荤粺绠＄悊锛堝熀纭�璁剧疆绫伙級
+// {
+// path: '/systemSetting',
+// component: Layout,
+// redirect: '/systemSetting/organizationList',
+// name: '绯荤粺绠＄悊',
+// code: '2001',
+// meta: { code: '2001', title: '绯荤粺绠＄悊', icon: 'xtsz' },
+// alwaysShow: true, // 褰揷hildren鍙湁涓�涓椂锛屼篃鏄剧ず鐖惰彍鍗�
+// children: [
+// {
+// path: 'organizationList',
+// name: 'organizationListCancel',
+// code: '1010',
+// component: () => import('@/views/jcsz/zzjg'),
+// meta: { code: '1010', title: '缁勭粐鏋舵瀯', icon: '', keepAlive: true }
+// }, {
+// path: 'roleList',
+// name: 'roleListCancel',
+// code: '1012',
+// component: () => import('@/views/jcsz/jsqd'),
+// meta: { code: '1012', title: '瑙掕壊娓呭崟', icon: '', keepAlive: true }
+// }
+//
+// ]
+// },
+// // 2.瀹㈡埛绠＄悊
+// {
+// path: '/basicSettings',
+// component: Layout,
+// redirect: '/basicSettings/userList',
+// name: '瀹㈡埛绠＄悊',
+// code: '2002',
+// meta: { code: '2002', title: '瀹㈡埛绠＄悊', icon: 'khgl' },
+// alwaysShow: true, // 褰揷hildren鍙湁涓�涓椂锛屼篃鏄剧ず鐖惰彍鍗�
+// children: [
+// {
+// path: 'userList',
+// name: 'userListCancel',
+// code: '1011',
+// component: () => import('@/views/jcsz/yhqd'),
+// meta: { code: '1011', title: '鐢ㄦ埛娓呭崟', icon: '', keepAlive: true }
+// }, {
+// path: 'contactUnitList',
+// name: 'contactUnitListCancel',
+// code: '1013',
+// component: () => import('@/views/jcsz/wldw'),
+// meta: { code: '1013', title: '寰�鏉ュ崟浣�', icon: '', keepAlive: true }
+// }
+// ]
+// },
+// // 3.鏁版嵁閲囬泦绠＄悊 sop涓婁紶 鐏电繑椤圭洰鐨勭湅涓�
+// // {
+// // path: '/dataCollect',
+// // component: Layout,
+// // redirect: '/dataCollect/purchasesList',
+// // name: '鏁版嵁閲囬泦绠＄悊',
+// // code: '2003',
+// // meta: { code: '2003', title: '鏁版嵁閲囬泦绠＄悊', icon: 'cggl' },
+// // alwaysShow: true,
+// // children: [
+// // {
+// // path: 'purchasesList',
+// // name: 'CGDDCancel',
+// // code: '1104',
+// // component: () => import('@/views/xtsz/sc'),
+// // meta: { code: '1104', title: 'SOP涓婁紶', icon: '', keepAlive: true }
+// // }
+// // ]
+// // },
+//
+// // 4.璁㈠崟绠＄悊
+// {
+// path: '/orderManager',
+// component: Layout,
+// redirect: '/orderManager/erpProduceOrder',
+// name: '鐢熶骇绠＄悊',
+// code: '2004',
+// meta: { code: '2004', title: '鐢熶骇绠＄悊', icon: 'production' },
+// alwaysShow: true,
+// children: [
+// {
+// path: 'erpProduceOrder',
+// name: 'produceOrderCancel',
+// code: '1070',
+// component: () => import('@/views/scgl/scdd'),
+// meta: { code: '1070', title: 'ERP鐢熶骇璁㈠崟', icon: '', keepAlive: true }
+// }
+// ]
+// },
+//
+// // 5.鐗╂枡璁″垝绠＄悊
+// // {
+// // path: '/materialPlanManager',
+// // component: Layout,
+// // redirect: '/materialPlanManager/materialList',
+// // name: '鐗╂枡璁″垝绠＄悊',
+// // code: '2005',
+// // meta: { code: '2005', title: '鐗╂枡璁″垝绠＄悊', icon: 'icu' },
+// // alwaysShow: true,
+// // children: [
+// // {
+// // path: 'materialList',
+// // name: 'materialListCancel',
+// // code: '1062',
+// // component: () => import('@/views/zzmx/wlqd'),
+// // meta: { code: '1062', title: '鐗╂枡娓呭崟', icon: '', keepAlive: true }
+// // }
+// // ]
+// // },
+//
+// // 6.璐ㄩ噺绠＄悊
+// {
+// path: '/qualityManager',
+// component: Layout,
+// redirect: '/qualityManager/defectDefine',
+// name: '璐ㄩ噺绠＄悊',
+// code: '2006',
+// meta: { code: '2006', title: '璐ㄩ噺绠＄悊', icon: 'quality' },
+// alwaysShow: true,
+// children: [
+// {
+// path: 'defectDefine',
+// name: 'defectDefineCancel',
+// code: '1081',
+// component: () => import('@/views/zlgl/qxdy'),
+// meta: { code: '1081', title: '缂洪櫡瀹氫箟', icon: '', keepAlive: true }
+// }
+// // {
+// // path: 'qualityPlaning',
+// // name: 'ZJFACancel',
+// // code: '1088',
+// // component: () => import('@/views/qualityManager/qualityPlaning'),
+// // meta: { code: '1088', title: '璐ㄦ鏂规', icon: '', keepAlive: true }
+// // }
+// ]
+// },
+//
+// // 7.宸ュ簭绠＄悊
+// {
+// path: '/processManager',
+// component: Layout,
+// redirect: '/processManager/processCheck',
+// name: '宸ュ簭绠＄悊',
+// code: '2007',
+// meta: { code: '2007', title: '宸ュ簭绠＄悊', icon: 'gxgl' },
+// alwaysShow: true,
+// children: [
+// {
+// path: 'processCheck',
+// name: 'processCheckCancel',
+// code: '1082',
+// component: () => import('@/views/zlgl/gxjy'),
+// meta: { code: '1082', title: '宸ュ簭妫�楠�', icon: '', keepAlive: true }
+// },
+// {
+// path: 'processCheckStandard',
+// name: 'processCheckStandardCancel',
+// code: '1085',
+// component: () => import('@/views/zlgl/gxjybz'),
+// meta: { code: '1085', title: '宸ュ簭妫�楠屾爣鍑�', icon: '', keepAlive: true }
+// },
+// {
+// path: 'processCheckItem',
+// name: 'processCheckItemCancel',
+// code: '1086',
+// component: () => import('@/views/zlgl/gxjyxm'),
+// meta: { code: '1086', title: '宸ュ簭妫�楠岄」鐩�', icon: '', keepAlive: true }
+// },
+// {
+// path: 'processCheckRecord',
+// name: 'processCheckRecordCancel',
+// code: '1087',
+// component: () => import('@/views/zlgl/gxjyjl'),
+// meta: { code: '1087', title: '宸ュ簭妫�楠岃褰�', icon: '', keepAlive: true }
+// }
+// ]
+// },
+//
+// // 8.浜哄姏璧勬簮绠＄悊
+// {
+// path: '/resourcesManager',
+// component: Layout,
+// redirect: '/resourcesManager/groupSalaryList',
+// name: '浜哄姏璧勬簮绠＄悊',
+// code: '2008',
+// meta: { code: '1008', title: '浜哄姏璧勬簮绠＄悊', icon: 'rlzy' },
+// alwaysShow: true,
+// children: [
+// {
+// path: 'groupSalaryList',
+// name: 'groupSalaryListCancel',
+// code: '1090',
+// component: () => import('@/views/bbgl/bzgz'),
+// meta: { code: '1090', title: '鐝粍宸ヨ祫缁熻鎶ヨ〃', icon: '', keepAlive: true }
+// },
+// // {
+// // path: 'personSalaryList',
+// // name: 'personSalaryListCancel',
+// // code: '1091',
+// // component: () => import('@/views/bbgl/rygz'),
+// // meta: { code: '1091', title: '浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃', icon: '', keepAlive: true }
+// // },
+// {
+// path: 'subcontractingOperation',
+// name: 'subcontractingOperationCancel',
+// code: '1092',
+// component: () => import('@/views/bbgl/wwgx'),
+// meta: { code: '1092', title: '濮斿宸ュ簭鏄庣粏鎶ヨ〃', icon: '', keepAlive: true }
+// }
+// ]
+// },
+//
+// // 9.鏅鸿兘鎶ヨ〃
+// {
+// path: '/reportManager',
+// component: Layout,
+// redirect: '/reportManager/defectDetailList',
+// name: '鏅鸿兘鎶ヨ〃',
+// code: '2009',
+// meta: { code: '2009', title: '鏅鸿兘鎶ヨ〃', icon: 'bbgl' },
+// alwaysShow: true,
+// children: [
+// {
+// path: 'defectDetailList',
+// name: 'defectDetailListCancel',
+// code: '1093',
+// component: () => import('@/views/bbgl/blmx'),
+// meta: { code: '1093', title: '涓嶈壇鏄庣粏鎶ヨ〃', icon: '', keepAlive: true }
+// }, {
+// path: 'abnormalQualityList',
+// name: 'abnormalQualityListCancel',
+// code: '1094',
+// component: () => import('@/views/bbgl/pzyc'),
+// meta: { code: '1094', title: '鍝佽川寮傚父鎺掕鎶ヨ〃', icon: '', keepAlive: true }
+// }, {
+// path: 'repairDetailList',
+// name: 'repairDetailListCancel',
+// code: '1095',
+// component: () => import('@/views/bbgl/wxmx'),
+// meta: { code: '1095', title: '缁翠慨鏄庣粏鎶ヨ〃', icon: '', keepAlive: true }
+// }
+// // {
+// // path: 'installationLampList',
+// // name: 'installationLampListCancel',
+// // code: '1096',
+// // component: () => import('@/views/reportManager/installationLampList'),
+// // meta: { code: '1096', title: '瀹夌伅鎶ヨ〃', icon: '', keepAlive: true }
+// // }
+// ]
+// },
+//
+// // 10.搴撳瓨绠＄悊
+// {
+// path: '/inventoryManager',
+// component: Layout,
+// redirect: '/inventoryManager/storehouseDefine',
+// name: '搴撳瓨绠＄悊',
+// code: '2010',
+// meta: { code: '2010', title: '搴撳瓨绠＄悊', icon: 'table' },
+// alwaysShow: true,
+// children: [
+// {
+// path: 'storehouseDefine',
+// name: 'storehouseDefineCancel',
+// code: '1050',
+// component: () => import('@/views/wlgl/ckdy'),
+// meta: { code: '1050', title: '浠撳簱瀹氫箟', icon: '', keepAlive: true }
+// },
+// {
+// path: 'locationDefine',
+// name: 'locationDefineCancel',
+// code: '1051',
+// component: () => import('@/views/wlgl/kwdy'),
+// meta: { code: '1051', title: '搴撲綅瀹氫箟', icon: '', keepAlive: true }
+// }
+// // {
+// // path: 'containerType',
+// // name: 'containerTypeCancel',
+// // code: '1052',
+// // component: () => import('@/views/materialManager/containerType'),
+// // meta: { code: '1052', title: '瀹瑰櫒绫诲瀷', icon: '', keepAlive: true }
+// // }, {
+// // path: 'containerList',
+// // name: 'containerListCancel',
+// // code: '1053',
+// // component: () => import('@/views/materialManager/containerList'),
+// // meta: { code: '1053', title: '瀹瑰櫒娓呭崟', icon: '', keepAlive: true }
+// // }, {
+// // path: 'inOutboundRecord',
+// // name: 'inOutboundRecordCancel',
+// // code: '1054',
+// // component: () => import('@/views/materialManager/inOutboundRecord'),
+// // meta: { code: '1054', title: '鍑哄叆搴撹褰�', icon: '', keepAlive: true }
+// // }, {
+// // path: 'inventoryQuery',
+// // name: 'inventoryQueryCancel',
+// // code: '1055',
+// // component: () => import('@/views/materialManager/inventoryQuery'),
+// // meta: { code: '1055', title: '搴撳瓨鏌ヨ', icon: '', keepAlive: true }
+// // },
+//
+// // {
+// // path: 'InventoryLedgerList',
+// // name: 'InventoryLedgerListCancel',
+// // code: '1205',
+// // component: () => import('@/views/purchasesManager/InventoryLedgerList'),
+// // meta: { code: '1205', title: '搴撳瓨鍙拌处', icon: '', keepAlive: true }
+// // }
+// ]
+// },
+//
+// // 11.閲囪喘绠＄悊
+// // {
+// // path: '/purchasesManager',
+// // component: Layout,
+// // redirect: '/purchasesManager/purchasesList',
+// // name: '閲囪喘绠＄悊',
+// // code: '2011',
+// // meta: { code: '2011', title: '閲囪喘绠＄悊', icon: 'cggl' },
+// // alwaysShow: true,
+// // children: [
+// // {
+// // path: 'purchasesList',
+// // name: 'CGDDCancel',
+// // code: '1201',
+// // component: () => import('@/views/purchasesManager/purchasesList'),
+// // meta: { code: '1201', title: '閲囪喘璁㈠崟', icon: '', keepAlive: true }
+// // }, {
+// // path: 'arrivalNoticeList',
+// // name: 'arrivalNoticeListCancel',
+// // code: '1202',
+// // component: () => import('@/views/purchasesManager/arrivalNoticeList'),
+// // meta: { code: '1202', title: '閲囪喘鏀惰揣鍗�', icon: '', keepAlive: true }
+// // }
+// // ]
+// // },
+//
+// // 12.閿�鍞鐞�
+// // {
+// // path: '/sale',
+// // component: Layout,
+// // redirect: '/sale/salesStatisticsList',
+// // name: '閿�鍞鐞�',
+// // code: '2012',
+// // meta: { code: '2012', title: '閿�鍞鐞�', icon: 'xsgl' },
+// // alwaysShow: true,
+// // children: [
+// // {
+// // path: 'salesStatisticsList',
+// // name: 'salesStatisticsCancel',
+// // code: '1203',
+// // component: () => import('@/views/purchasesManager/salesStatisticsList'),
+// // meta: { code: '1203', title: '閿�鍞鍗�', icon: '', keepAlive: true }
+// // }, {
+// // path: 'goodsStatisticsList',
+// // name: 'goodsStatisticsListCancel',
+// // code: '1204',
+// // component: () => import('@/views/purchasesManager/goodsStatisticsList'),
+// // meta: { code: '1204', title: '閿�璐у崟', icon: '', keepAlive: true }
+// // }
+// // ]
+// // },
+//
+// // 13.宸ュ崟绠＄悊
+// {
+// path: '/work',
+// component: Layout,
+// redirect: '/work/workOrder',
+// name: '宸ュ崟绠＄悊',
+// code: '2013',
+// meta: { code: '2013', title: '宸ュ崟绠＄悊', icon: 'gzgl' },
+// alwaysShow: true,
+// children: [
+// {
+// path: 'workOrder',
+// name: 'workOrderCancel',
+// code: '1071',
+// component: () => import('@/views/scgl/gd'),
+// meta: { code: '1071', title: 'MES宸ュ崟', icon: '', keepAlive: true }
+// },
+// {
+// path: 'workOrderBatchClose',
+// name: 'workOrderBatchCloseCancel',
+// code: '1074',
+// component: () => import('@/views/scgl/gdplgb'),
+// meta: { code: '1074', title: 'MES宸ュ崟鎵归噺鍏抽棴', icon: '', keepAlive: true }
+// }
+// // {
+// // path: 'updateWorkOrder',
+// // name: 'XGBGCancel',
+// // code: '1077',
+// // component: () => import('@/views/scgl/xgbg'),
+// // meta: { code: '1077', title: '淇敼鎶ュ伐', icon: '', keepAlive: true }
+// // }
+// ]
+// },
+//
+// // 14.宸ュ崟鎺掍骇
+// // {
+// // path: '/produceManager',
+// // component: Layout,
+// // redirect: '/produceManager/produceOrder',
+// // name: '宸ュ崟鎺掍骇',
+// // code: '2014',
+// // meta: { code: '2014', title: '宸ュ崟鎺掍骇', icon: 'scgl' },
+// // alwaysShow: true,
+// // children: [
+// // {
+// // path: 'AutoScheduling',
+// // name: 'AutoSchedulingCancel',
+// // code: '1076',
+// // component: () => import('@/views/produceManager/AutoScheduling'),
+// // meta: { code: '1076', title: '鑷姩鎺掔▼', icon: '', keepAlive: true }
+// // }
+// // ]
+// // },
+//
+// // 15.鐢熶骇绠＄悊
+// {
+// path: '/extendedModule',
+// component: Layout,
+// redirect: '/extendedModule/produceStartOrder',
+// name: '鐢熶骇绠＄悊',
+// code: '2015',
+// meta: { code: '2015', title: '鐢熶骇绠＄悊', icon: 'tree2' },
+// alwaysShow: true, // 褰揷hildren鍙湁涓�涓椂锛屼篃鏄剧ず鐖惰彍鍗�
+// children: [
+// {
+// path: 'produceStartOrder',
+// name: 'produceStartOrderCancel',
+// code: '1073',
+// component: () => import('@/views/scgl/sckbg'),
+// meta: { code: '1073', title: '鐢熶骇寮�鎶ュ伐', icon: '', keepAlive: true }
+// }
+// // {
+// // path: 'capacityPlanning',
+// // name: 'capacityPlanningCancel',
+// // code: '1075',
+// // component: () => import('@/views/produceManager/capacityPlanning'),
+// // meta: { code: '1075', title: '浜ц兘瑙勫垝', icon: '', keepAlive: true }
+// // }
+// ]
+// },
+//
+// // 16.宸ヨ壓绠＄悊
+// {
+// path: '/makeModel',
+// component: Layout,
+// redirect: '/makeModel/processRoute',
+// name: '杞﹂棿绠＄悊',
+// code: '2016',
+// meta: { code: '2016', title: '杞﹂棿绠＄悊', icon: 'cjgl' },
+// alwaysShow: true,
+// children: [
+// {
+// path: 'processRoute',
+// name: 'processRouteCancel',
+// code: '1063',
+// component: () => import('@/views/zzmx/gylx'),
+// meta: { code: '1063', title: '宸ヨ壓璺嚎', icon: '', keepAlive: true }
+// }, {
+// path: 'processDefine',
+// name: 'processDefineCancel',
+// code: '1064',
+// component: () => import('@/views/zzmx/gxdy'),
+// meta: { code: '1064', title: '宸ュ簭瀹氫箟', icon: '', keepAlive: true }
+// },
+// {
+// path: 'meterPrice',
+// name: 'meterPriceCancel',
+// code: '1065',
+// component: () => import('@/views/zzmx/jpgj'),
+// meta: { code: '1065', title: '鑺傛媿宸ヤ环', icon: '', keepAlive: true }
+// }
+// ]
+// },
+//
+// // 17.璁惧绠＄悊
+// {
+// path: '/deviceManager',
+// component: Layout,
+// redirect: '/deviceManager/deviceList',
+// name: '璁惧绠＄悊',
+// code: '2017',
+// meta: { code: '2017', title: '璁惧绠＄悊', icon: 'example' },
+// alwaysShow: true,
+// children: [
+// {
+// path: 'deviceList',
+// name: 'deviceListCancel',
+// code: '1022',
+// component: () => import('@/views/sbgl/sbqd'),
+// meta: { code: '1022', title: '璁惧娓呭崟', icon: '', keepAlive: true }
+// }
+// // {
+// // path: 'checkStandard',
+// // name: 'checkStandardCancel',
+// // code: '1023',
+// // component: () => import('@/views/deviceManager/checkStandard'),
+// // meta: { code: '1023', title: '璁惧鐐规鏍囧噯', icon: '', keepAlive: true }
+// // },
+// // {
+// // path: 'checkPosition',
+// // name: 'checkPositionCancel',
+// // code: '1024',
+// // component: () => import('@/views/deviceManager/checkPosition'),
+// // meta: { code: '1024', title: '璁惧鐐规閮ㄤ綅', icon: '', keepAlive: true }
+// // },
+// // {
+// // path: 'maintainStandard',
+// // name: 'maintainStandardCancel',
+// // code: '1025',
+// // component: () => import('@/views/deviceManager/maintainStandard'),
+// // meta: { code: '1025', title: '璁惧淇濆吇鏍囧噯', icon: '', keepAlive: true }
+// // },
+// // {
+// // path: 'maintainPosition',
+// // name: 'maintainPositionCancel',
+// // code: '1026',
+// // component: () => import('@/views/deviceManager/maintainPosition'),
+// // meta: { code: '1026', title: '璁惧淇濆吇閮ㄤ綅', icon: '', keepAlive: true }
+// // },
+// // {
+// // path: 'checkRecord',
+// // name: 'checkRecordCancel',
+// // code: '1027',
+// // component: () => import('@/views/deviceManager/checkRecord'),
+// // meta: { code: '1027', title: '璁惧鐐规璁板綍', icon: '', keepAlive: true }
+// // },
+// // {
+// // path: 'maintainRecord',
+// // name: 'maintainRecordCancel',
+// // code: '1028',
+// // component: () => import('@/views/deviceManager/maintainRecord'),
+// // meta: { code: '1028', title: '璁惧淇濆吇璁板綍', icon: '', keepAlive: true }
+// // },
+// // {
+// // path: 'repairRecord',
+// // code: '1029',
+// // name: 'repairRecordCancel',
+// // component: () => import('@/views/deviceManager/repairRecord'),
+// // meta: { code: '1029', title: '璁惧缁翠慨璁板綍', icon: '', keepAlive: true }
+// // }
+// ]
+// },
+//
+// // 18.鍏跺畠ERP闆嗘垚
+// {
+// path: '/otherErp',
+// component: Layout,
+// redirect: '/otherErp/InventoryList',
+// name: '鍏跺畠ERP闆嗘垚',
+// code: '2018',
+// meta: { code: '2018', title: '鍏跺畠ERP闆嗘垚', icon: 'erpjc' },
+// alwaysShow: true,
+// children: [
+// {
+// path: 'InventoryList',
+// name: 'InventoryListCancel',
+// code: '1061',
+// component: () => import('@/views/zzmx/chda'),
+// meta: { code: '1061', title: '瀛樿揣妗ｆ', icon: '', keepAlive: true }
+// }
+// ]
+// }
+//
+// // {
+// // path: '/systemSettings',
+// // component: Layout,
+// // redirect: '/systemSettings/bmgz',
+// // name: '绯荤粺璁剧疆',
+// // code: '1009',
+// // meta: { code: '1009', title: '绯荤粺璁剧疆', icon: 'xtsz' },
+// // alwaysShow: true,
+// // children: [
+// // {
+// // path: 'codingRules',
+// // name: 'codingRulesCancel',
+// // code: '1101',
+// // component: () => import('@/views/systemSettings/codingRules'),
+// // meta: { code: '1101', title: '缂栫爜瑙勫垯', icon: '', keepAlive: true }
+// // }, {
+// // path: 'passwordEdit',
+// // name: 'passwordEditCancel',
+// // code: '1102',
+// // component: () => import('@/views/systemSettings/passwordEdit'),
+// // meta: { code: '1102', title: '瀵嗙爜淇敼', icon: '', keepAlive: true }
+// // }, {
+// // path: 'systemLog',
+// // name: 'systemLogCancel',
+// // code: '1103',
+// // component: () => import('@/views/systemSettings/systemLog'),
+// // meta: { code: '1103', title: '绯荤粺鏃ュ織', icon: '', keepAlive: true }
+// // }, {
+// // path: 'sopUpload',
+// // name: 'sopUploadCancel',
+// // code: '1104',
+// // component: () => import('@/views/systemSettings/sopUpload'),
+// // meta: { code: '1104', title: 'SOP涓婁紶', icon: '', keepAlive: true }
+// // }, {
+// // path: 'shopNotice',
+// // name: 'shopNoticeCancel',
+// // code: '1105',
+// // component: () => import('@/views/systemSettings/shopNotice'),
+// // meta: { code: '1105', title: '杞﹂棿鍏憡', icon: '', keepAlive: true }
+// // }
+// // ]
+// // }
+//
+// ]
+//
+// const createRouter = () => new Router({
+// // mode: 'history', // require service support
+// scrollBehavior: () => ({ y: 0 }),
+// routes: commonRoutes
+// })
+//
+// const router = createRouter()
+//
+// // Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465
+// export function resetRouter() {
+// const newRouter = createRouter()
+// router.matcher = newRouter.matcher // reset router
+// }
+//
+// export default router
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 2f48bdb..9a124d0 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -108,6 +108,7 @@
return i
}
})
+ newRoutes.push({ path: '*', redirect: '/404', hidden: true })
} else {
newRoutes = getAsyncRoutes(asyncRoutes, menu)
}
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 8a26993..c8ad272 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -410,7 +410,7 @@
</el-button>
</div>
<el-table
- ref="multipleTable"
+ ref="multipleTableRef"
:data="dialogFormUserTable"
border
:row-class-name="tableRowClassName"
@@ -981,7 +981,7 @@
},
/* 鍏宠仈鐢ㄦ埛妯″潡*/
- async userClick(row) {
+ userClick(row) {
if (row.role_code === 'S001') {
return this.$message.info('姝よ鑹叉棤娉曟搷浣滐紒')
}
@@ -995,29 +995,31 @@
this.userForm.roleName = row.role_name
this.dialogFormUser.rolecode = row.role_code
- const res = await this.getRoleAssociationUser()
- if (res.code === '200') {
- setTimeout(() => {
- loading.close()
- this.userDialogVisible = true
- this.$nextTick(() => {
- this.$refs.multipleTable.doLayout()
+ this.getRoleAssociationUser().then(res => {
+ if (res.code === '200') {
+ setTimeout(() => {
+ loading.close()
+
+ this.$nextTick(() => {
+ this.$refs.multipleTableRef.doLayout()
+ })
})
- }, 1000)
- } else {
- loading.close()
- }
+ } else {
+ loading.close()
+ }
+ })
},
// 鑾峰彇瑙掕壊娓呭崟鍏宠仈鐢ㄦ埛
async getRoleAssociationUser() {
const res = await RoleAssociationUser(this.dialogFormUser)
this.dialogFormUserTable = res.data
this.dialogFormUserTableLength = res.count
+ this.userDialogVisible = true
this.$nextTick(() => {
this.dialogFormUserTable.forEach((item, index) => {
if (item.flag === 'Y') {
- this.$refs.multipleTable.toggleRowSelection(this.dialogFormUserTable[index], true)
+ this.$refs.multipleTableRef.toggleRowSelection(this.dialogFormUserTable[index], true)
}
})
})
@@ -1064,7 +1066,7 @@
this.dialogFormUser.orgcode = ''
this.dialogFormUser.isrole = ''
this.$refs.dialogCascaderUser.checkedValue = ''
- this.$refs.multipleTable.clearSelection()
+ this.$refs.multipleTableRef.clearSelection()
},
// 鍏宠仈鐢ㄦ埛瀵硅瘽妗嗗叧闂�
userDialogVisibleCancel() {
diff --git a/src/views/kb/ckgl.vue b/src/views/kb/ckgl.vue
index ec29bf4..a44160d 100644
--- a/src/views/kb/ckgl.vue
+++ b/src/views/kb/ckgl.vue
@@ -122,7 +122,7 @@
>
<template slot-scope="{row}">
<!-- <div v-if="row.totalStockInQuantity">{{ row.totalStockInQuantity }}</div>-->
- <div v-if="row.quantity">{{ row.quantity*0.8 }}</div>
+ <div v-if="row.quantity">{{ Math.round(row.quantity*0.8) }}</div>
<div v-else>0</div>
</template>
</el-table-column>
@@ -258,7 +258,7 @@
>
<template slot-scope="{row}">
<!-- <div v-if="row.saleOutQuantity" class="ellipsis">{{ row.saleOutQuantity }}</div>-->
- <div v-if="row.quantity" class="ellipsis">{{ row.quantity*0.8 }}</div>
+ <div v-if="row.quantity" class="ellipsis">{{ Math.round(row.quantity*0.8) }}</div>
<div v-else>0</div>
</template>
</el-table-column>
diff --git a/src/views/kb/zhkb.vue b/src/views/kb/zhkb.vue
index 1694ba1..c6e29ee 100644
--- a/src/views/kb/zhkb.vue
+++ b/src/views/kb/zhkb.vue
@@ -151,7 +151,7 @@
<el-table-column
prop="wo_code"
label="鍔犲伐鍗曞彿"
- width="190"
+ width="194"
/>
<el-table-column
prop="partname"
@@ -420,26 +420,51 @@
},
// 浜х嚎鍔犲伐浠诲姟 宸︿笅鏁版嵁
getLeftBottomData() {
- let startValue = 0 // 鍒濆鍊�
- const scale = 10// 鍒诲害
+ // let startValue = 0 // 鍒濆鍊�
+ // const scale = 10// 鍒诲害
+ //
+ // LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ // this.tableDataLeftBottomTemp = res.data
+ // this.tableDataLeftBottom = this.tableDataLeftBottomTemp.slice(startValue, startValue + scale)
+ //
+ // const loop = Math.floor(this.tableDataLeftBottomTemp.length / scale)// 闇�瑕佸惊鐜殑娆℃暟
+ // let nowLoop = 0// 褰撳墠寰幆鐨勬鏁�
+ //
+ // const timer = setInterval(() => {
+ // startValue = startValue + scale
+ // this.tableDataLeftBottom = this.tableDataLeftBottomTemp.slice(startValue, startValue + scale)
+ // if (nowLoop === loop) {
+ // clearInterval(timer)
+ // this.getLeftBottomData()
+ // }
+ //
+ // nowLoop++
+ // }, 1000 * 10)
+ // })
LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
- this.tableDataLeftBottomTemp = res.data
- this.tableDataLeftBottom = this.tableDataLeftBottomTemp.slice(startValue, startValue + scale)
+ this.tableDataLeftBottom = res.data
- const loop = Math.floor(this.tableDataLeftBottomTemp.length / scale)// 闇�瑕佸惊鐜殑娆℃暟
- let nowLoop = 0// 褰撳墠寰幆鐨勬鏁�
+ const divData = this.$refs.tableDataLeftBottomRef.bodyWrapper
+ // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
+ const aaa = setInterval(() => {
+ // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
+ divData.scrollTop += 1
+ // divData.scrollTop += divData.scrollHeight / this.tableData.length
+ // 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
+ if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
+ // 閲嶇疆table璺濈椤堕儴璺濈
+ divData.scrollTop = 0
+ LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ this.tableDataLeftBottom = res.data
- const timer = setInterval(() => {
- startValue = startValue + scale
- this.tableDataLeftBottom = this.tableDataLeftBottomTemp.slice(startValue, startValue + scale)
- if (nowLoop === loop) {
- clearInterval(timer)
- this.getLeftBottomData()
+ if (this.tableDataLeftBottom.length > 10) {
+ clearInterval(aaa)
+ this.getLeftBottomData()
+ }
+ })
}
-
- nowLoop++
- }, 1000 * 10)
+ }, this.tableDataLeftBottom.length <= 10 ? 1000 * 5 : 100)
})
},
@@ -622,6 +647,10 @@
border-radius: 50%;
}
+::v-deep .el-table__body-wrapper{
+ overflow: hidden !important;
+}
+
</style>
<!--鏄熺┖-->
diff --git a/vue.config.js b/vue.config.js
index c2e85c4..44bb5aa 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -51,8 +51,8 @@
proxy: {
[process.env.VUE_APP_BASE_API]: {
// target: 'http://121.196.36.24:8007', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴鏈嶅姟鍣�(瀵屽皵杈�)
- // target: 'http://192.168.16.246:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 瀹㈡埛鏈嶅姟鍣�(瀵屽皵杈�) (鏈笂浜�)
- target: 'http://rz5qwd.natappfree.cc', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 瀹㈡埛鏈嶅姟鍣�(瀵屽皵杈�) (涓婁簯)
+ target: 'http://192.168.16.246:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 瀹㈡埛鏈嶅姟鍣�(瀵屽皵杈�) (鏈笂浜�)
+ // target: 'http://rz5qwd.natappfree.cc', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 瀹㈡埛鏈嶅姟鍣�(瀵屽皵杈�) (涓婁簯)
changeOrigin: true, // 璇锋眰璺ㄥ煙鏃讹紝闇� 閰嶇疆姝ら」
pathRewrite: { // 璺緞閲嶅啓,鏇挎崲target涓殑璇锋眰鍦板潃
--
Gitblit v1.9.3