From fe1925996a963cfb5a8b8b1e1f608d339a58cf58 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 06 五月 2023 08:01:24 +0800
Subject: [PATCH] 1.看板调整2.上云路由整合
---
src/views/kb/zpcj.vue | 110 +++++--
src/views/xtsy/index.vue | 20
src/views/bbgl/bzgz.vue | 10
src/views/kb/ckgl.vue | 4
src/store/modules/permission.js | 4
src/router/index.js | 576 +++++++++++++++++++++++++++++++++++++++++
src/views/kb/jgcj.vue | 110 +++++--
src/views/bbgl/rygz.vue | 4
8 files changed, 758 insertions(+), 80 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 9a1dd5b..5345c15 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -30,6 +30,7 @@
* a base page that does not have permission requirements
* all roles can be accessed
*/
+// 鍏敤妯″潡
export const commonRoutes = [
/*
* 鐪嬫澘閮ㄥ垎璺敱
@@ -85,7 +86,582 @@
}
// { path: '*', redirect: '/404', hidden: true }
]
+// 鏈笂浜戞ā鍧�
export const asyncRoutes = [
+ // {
+ // 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: 'zdpc2',
+ // name: 'YYQDCancel',
+ // code: '1012',
+ // component: () => import('@/views/gantt_back/zdpc2'),
+ // meta: { code: '1012', title: '鑷姩鎺掔▼2', icon: '', keepAlive: true }
+ // }]
+ // },
+ {
+ path: '/jcsz',
+ component: Layout,
+ redirect: '/jcsz/zzjg',
+ name: '鍩虹璁剧疆',
+ code: '1001',
+ meta: { code: '1001', title: '鍩虹璁剧疆', icon: 'tree2' },
+ alwaysShow: true, // 褰揷hildren鍙湁涓�涓椂锛屼篃鏄剧ず鐖惰彍鍗�
+ children: [
+ {
+ path: 'zzjg',
+ name: 'ZZJGCancel',
+ code: '1010',
+ component: () => import('@/views/jcsz/zzjg'),
+ meta: { code: '1010', title: '缁勭粐鏋舵瀯', icon: '', keepAlive: true }
+ }, {
+ path: 'yhqd',
+ name: 'YYQDCancel',
+ code: '1011',
+ component: () => import('@/views/jcsz/yhqd'),
+ meta: { code: '1011', title: '鐢ㄦ埛娓呭崟', icon: '', keepAlive: true }
+ }, {
+ 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 }
+ }, {
+ path: 'adsz',
+ name: 'ADZZCancel',
+ code: '1014',
+ component: () => import('@/views/jcsz/adsz'),
+ meta: { code: '1014', title: '瀹夌伅璁剧疆', icon: '', keepAlive: true }
+ }
+ ]
+ },
+ {
+ path: '/sbgl',
+ component: Layout,
+ redirect: '/sbgl/sblx',
+ name: '璁惧绠＄悊',
+ code: '1002',
+ meta: { code: '1002', title: '璁惧绠＄悊', icon: 'example' },
+ alwaysShow: true,
+ children: [
+ {
+ path: 'sblx',
+ name: 'SBLXCancel',
+ code: '1020',
+ component: () => import('@/views/sbgl/sblx'),
+ meta: { code: '1020', title: '璁惧绫诲瀷', icon: '', keepAlive: true }
+ },
+ {
+ path: 'wxjl',
+ code: '1029Cancel',
+ name: 'WXJL',
+ component: () => import('@/views/sbgl/wxjl'),
+ meta: { code: '1029', 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: 'wxjl',
+ name: 'WXJLCancel',
+ code: '1029',
+ component: () => import('@/views/sbgl/wxjl'),
+ meta: { code: '1029', title: '璁惧缁翠慨璁板綍', icon: '', keepAlive: true }
+ },
+ {
+ path: 'swsqjl',
+ name: 'WXSQJLCancel',
+ code: '1019',
+ component: () => import('@/views/sbgl/swsqjl'),
+ meta: { code: '1019', title: '璁惧鐢宠缁翠慨璁板綍', icon: '', keepAlive: true }
+ }
+ ]
+ },
+ {
+ path: '/gzgl',
+ component: Layout,
+ redirect: '/gzgl/gzlx',
+ name: '宸ヨ绠＄悊',
+ code: '1003',
+ meta: { code: '1003', title: '宸ヨ绠＄悊', icon: 'component' },
+ alwaysShow: true,
+ children: [
+ {
+ 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: '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: '/zzmx',
+ component: Layout,
+ redirect: '/zzmx/gylx',
+ name: '鍒堕�犳ā鍨�',
+ code: '1005',
+ meta: { code: '1005', title: '鍒堕�犳ā鍨�', icon: 'icu' },
+ alwaysShow: true,
+ children: [
+ {
+ path: 'wllx',
+ name: 'WLLXCancel',
+ code: '1060',
+ component: () => import('@/views/zzmx/wllx'),
+ meta: { code: '1060', title: '鐗╂枡绫诲瀷', icon: '', keepAlive: true }
+ },
+ {
+ path: 'chda',
+ name: 'CHDACancel',
+ code: '1061',
+ component: () => import('@/views/zzmx/chda'),
+ meta: { code: '1061', title: '瀛樿揣妗ｆ', icon: '', keepAlive: true }
+ }, {
+ path: 'wlqd',
+ name: 'WLQDCancel',
+ code: '1062',
+ component: () => import('@/views/zzmx/wlqd'),
+ meta: { code: '1062', title: '鐗╂枡娓呭崟', icon: '', keepAlive: true }
+ },
+ {
+ path: 'gylx',
+ name: 'GYLXCancel',
+ code: '1063',
+ component: () => import('@/views/zzmx/gylx'),
+ meta: { code: '1063', title: '宸ヨ壓璺嚎', icon: '', keepAlive: true }
+ }, {
+ path: 'gxdy',
+ name: 'GXDYCancel',
+ code: '1064',
+ component: () => import('@/views/zzmx/gxdy'),
+ meta: { code: '1064', title: '宸ュ簭瀹氫箟', icon: '', keepAlive: true }
+ },
+ {
+ path: 'jpgj',
+ name: 'JPGJCancel',
+ code: '1065',
+ component: () => import('@/views/zzmx/jpgj'),
+ meta: { code: '1065', title: '鑺傛媿宸ヤ环', icon: '', keepAlive: true }
+ }
+ ]
+ },
+ {
+ path: '/scgl',
+ component: Layout,
+ redirect: '/scgl/scdd',
+ name: '鐢熶骇绠＄悊',
+ code: '1006',
+ meta: { code: '1006', title: '鐢熶骇绠＄悊', icon: 'production' },
+ alwaysShow: true,
+ children: [
+ {
+ 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: 'cngh',
+ name: 'CNGHCancel',
+ code: '1075',
+ component: () => import('@/views/scgl/cngh'),
+ meta: { code: '1075', title: '浜ц兘瑙勫垝', icon: '', keepAlive: true }
+ }, {
+ path: 'zdpc',
+ name: 'ZDPCCancel',
+ code: '1076',
+ component: () => import('@/views/scgl/zdpc'),
+ meta: { code: '1076', title: '鑷姩鎺掔▼', icon: '', keepAlive: true }
+ }
+ ]
+ },
+ {
+ path: '/zlgl',
+ component: Layout,
+ redirect: '/zlgl/zjbz',
+ name: '璐ㄩ噺绠＄悊',
+ code: '1007',
+ meta: { code: '1007', title: '璐ㄩ噺绠＄悊', icon: 'quality' },
+ alwaysShow: true,
+ children: [
+ {
+ 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: 'zjfa',
+ name: 'ZJFACancel',
+ code: '1088',
+ component: () => import('@/views/zlgl/zjfa'),
+ meta: { code: '1088', 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: 'adbb',
+ name: 'ADBBJCancel',
+ code: '1096',
+ component: () => import('@/views/bbgl/adbb'),
+ meta: { code: '1096', 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: '/cggl',
+ component: Layout,
+ redirect: '/cggl/cgdd',
+ name: '閲囪喘绠＄悊',
+ code: '1000',
+ meta: { code: '1000', title: '閲囪喘绠＄悊', icon: 'cggl' },
+ alwaysShow: true,
+ children: [
+ {
+ path: 'cgdd',
+ name: 'CGDDCancel',
+ code: '1201',
+ component: () => import('@/views/cggl/cgdd'),
+ meta: { code: '1201', title: '閲囪喘璁㈠崟', icon: '', keepAlive: true }
+ }
+ ]
+ }
+]
+// 涓婁簯妯″潡
+export const asyncRoutesCloud = [
// 1.绯荤粺绠＄悊锛堝熀纭�璁剧疆绫伙級
{
path: '/systemSetting',
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 13f545d..cb0aa64 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -1,4 +1,4 @@
-import { asyncRoutes, commonRoutes } from '@/router'
+import {asyncRoutes, asyncRoutesCloud, commonRoutes} from '@/router'
import Layout from '@/layout'
import {getCookie} from "@/utils/auth";
@@ -104,7 +104,7 @@
let newRoutes
if (getCookie('cloud')) {
const arr = menu.map(i => i.code)
- newRoutes = asyncRoutes.filter(i => {
+ newRoutes = asyncRoutesCloud.filter(i => {
if (arr.includes(i.code)) {
return i
}
diff --git a/src/views/bbgl/bzgz.vue b/src/views/bbgl/bzgz.vue
index f8c3d09..7a183ba 100644
--- a/src/views/bbgl/bzgz.vue
+++ b/src/views/bbgl/bzgz.vue
@@ -122,8 +122,7 @@
:data="tableData"
:height="isExpandForm?(tableHeight-70):(tableHeight-30)+'px'"
border
- :summary-method="getSummaries"
- show-summary
+
:row-class-name="tableRowClassName"
:style="{width: 100+'%',height:isExpandForm?(tableHeight-70):(tableHeight-30)+'px',}"
highlight-current-row
@@ -131,6 +130,8 @@
:cell-style="this.$cellStyle"
@sort-change="sortChange"
>
+<!-- :summary-method="getSummaries"-->
+<!-- show-summary-->
<el-table-column
prop="RowNum"
width="50"
@@ -286,8 +287,7 @@
:data="tableData2"
:height="isExpandForm?(tableHeight-70):(tableHeight-30)+'px'"
border
- :summary-method="getSummaries"
- show-summary
+
:row-class-name="tableRowClassName"
:style="{width: 100+'%',height:isExpandForm?(tableHeight-70):(tableHeight-30)+'px',}"
highlight-current-row
@@ -295,6 +295,8 @@
:cell-style="this.$cellStyle"
@sort-change="sortChange"
>
+<!-- :summary-method="getSummaries"-->
+<!-- show-summary-->
<el-table-column
prop="RowNum"
width="50"
diff --git a/src/views/bbgl/rygz.vue b/src/views/bbgl/rygz.vue
index 1575232..4bc59d2 100644
--- a/src/views/bbgl/rygz.vue
+++ b/src/views/bbgl/rygz.vue
@@ -121,8 +121,6 @@
:data="tableData"
:height="isExpandForm?(tableHeight-80):(tableHeight-40)+'px'"
border
- :summary-method="getSummaries"
- show-summary
:row-class-name="tableRowClassName"
:style="{width: 100+'%',height:isExpandForm?(tableHeight-80):(tableHeight-40)+'px',}"
highlight-current-row
@@ -279,8 +277,6 @@
:data="tableData2"
:height="isExpandForm?(tableHeight-80):(tableHeight-40)+'px'"
border
- :summary-method="getSummaries"
- show-summary
:row-class-name="tableRowClassName"
:style="{width: 100+'%',height:isExpandForm?(tableHeight-80):(tableHeight-40)+'px',}"
highlight-current-row
diff --git a/src/views/kb/ckgl.vue b/src/views/kb/ckgl.vue
index 2aa7c9d..0989e72 100644
--- a/src/views/kb/ckgl.vue
+++ b/src/views/kb/ckgl.vue
@@ -417,7 +417,7 @@
}
})
}
- }, this.tableDataTop.length <= 10 ? 1000 * 3 : 100)
+ }, this.tableDataTop.length <= 10 ? 1000 * 15 : 100)
})
},
// 鑾峰彇宸︿笅table鏁版嵁
@@ -445,7 +445,7 @@
}
})
}
- }, this.tableDataBottom.length <= 10 ? 1000 * 3 : 100)
+ }, this.tableDataBottom.length <= 10 ? 1000 * 15 : 100)
})
},
diff --git a/src/views/kb/jgcj.vue b/src/views/kb/jgcj.vue
index e8947d8..b0ff71b 100644
--- a/src/views/kb/jgcj.vue
+++ b/src/views/kb/jgcj.vue
@@ -23,6 +23,22 @@
<div class="smallTitle">
<svg-icon icon-class="cxjg" class="svg_class"/>
浜х嚎鍔犲伐涓换鍔�
+
+ <div style="display: flex;margin-left: 85px;">
+
+ <div class="circle" style="background-color: rgb(255 255 255)"></div>
+ <div style="margin-left: 10px" >鏈紑濮�</div>
+
+ <div class="circle" style="margin-left: 10px;background-color: blue;"></div>
+ <div style="margin-left: 10px" >寮�宸�</div>
+
+ <div class="circleYellow" style="margin-left: 10px"></div>
+ <div style="margin-left: 10px" >鎵ц涓�</div>
+
+ <div class="circle" style="margin-left: 10px"></div>
+ <div style="margin-left: 10px" >瀹屽伐</div>
+
+ </div>
</div>
<div class="lineContent horn">
<div v-for="item in lineContent3" :key="item.workcode" class="kb_left_top_block">
@@ -132,7 +148,7 @@
<el-table-column
prop="lm_date"
label="娲惧彂鏃堕棿"
- width="120"
+ width="140"
>
<template slot-scope="{row}">
<div>{{ row.lm_date.substring(0, 10) }}</div>
@@ -141,7 +157,7 @@
<el-table-column
prop="saleOrderCode"
label="閿�鍞鍗曞彿"
- width="170"
+ width="190"
>
<template slot-scope="{row}">
<div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
@@ -151,12 +167,12 @@
<el-table-column
prop="wo_code"
label="鍔犲伐鍗曞彿"
- width="190"
+ width="220"
/>
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
- width="350"
+ width="320"
>
<template slot-scope="{row}">
<div v-if="row.partname" class="ellipsis">{{ row.partname }}</div>
@@ -166,21 +182,21 @@
<el-table-column
prop="plan_qty"
label="浠诲姟鏁伴噺"
- width="105"
+ width="125"
/>
<el-table-column
prop="good_qty"
label="瀹屽伐鏁伴噺"
- width="105"
+ width="125"
/>
- <el-table-column
- prop="ng_qty"
- label="涓嶈壇鏁伴噺"
- width="105"
- />
+<!-- <el-table-column-->
+<!-- prop="ng_qty"-->
+<!-- label="涓嶈壇鏁伴噺"-->
+<!-- width="105"-->
+<!-- />-->
<el-table-column
label="瀹屾垚鐜�"
- width="105"
+ width="134"
>
<template slot-scope="{row}">
<div>{{ parseFloat((row.good_qty * 100 / row.plan_qty).toFixed(2)) }}%</div>
@@ -415,31 +431,56 @@
}
nowLoop++
- }, 1000 * 10)
+ }, 1000 * 20)
})
},
// 浜х嚎鍔犲伐浠诲姟 宸︿笅鏁版嵁
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 * 15)
+ // })
- LineSearchBottomLeftData({shopcode: this.ShopArr.join(',')}).then(res => {
- this.tableDataLeftBottomTemp = res.data
- this.tableDataLeftBottom = this.tableDataLeftBottomTemp.slice(startValue, startValue + scale)
+ LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ 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 * 15 : 100)
})
},
@@ -622,6 +663,17 @@
border-radius: 50%;
}
+::v-deep .el-table__body-wrapper{
+ overflow: hidden !important;
+}
+
+.circle {
+ width: 26px;
+ height: 26px;
+ background-color: #00ff8b;
+ border-radius: 50%;
+}
+
</style>
<!--鏄熺┖-->
diff --git a/src/views/kb/zpcj.vue b/src/views/kb/zpcj.vue
index 73f10ad..dfb12e9 100644
--- a/src/views/kb/zpcj.vue
+++ b/src/views/kb/zpcj.vue
@@ -23,6 +23,23 @@
<div class="smallTitle">
<svg-icon icon-class="cxjg" class="svg_class"/>
浜х嚎鍔犲伐涓换鍔�
+
+ <div style="display: flex;margin-left: 85px;">
+
+ <div class="circle" style="background-color: rgb(255 255 255)"></div>
+ <div style="margin-left: 10px" >鏈紑濮�</div>
+
+ <div class="circle" style="margin-left: 10px;background-color: blue;"></div>
+ <div style="margin-left: 10px" >寮�宸�</div>
+
+ <div class="circleYellow" style="margin-left: 10px"></div>
+ <div style="margin-left: 10px" >鎵ц涓�</div>
+
+ <div class="circle" style="margin-left: 10px"></div>
+ <div style="margin-left: 10px" >瀹屽伐</div>
+
+ </div>
+
</div>
<div class="lineContent horn">
<div v-for="item in lineContent3" :key="item.workcode" class="kb_left_top_block">
@@ -132,7 +149,7 @@
<el-table-column
prop="lm_date"
label="娲惧彂鏃堕棿"
- width="120"
+ width="140"
>
<template slot-scope="{row}">
<div>{{ row.lm_date.substring(0, 10) }}</div>
@@ -141,7 +158,7 @@
<el-table-column
prop="saleOrderCode"
label="閿�鍞鍗曞彿"
- width="170"
+ width="190"
>
<template slot-scope="{row}">
<div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
@@ -151,12 +168,12 @@
<el-table-column
prop="wo_code"
label="鍔犲伐鍗曞彿"
- width="190"
+ width="220"
/>
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
- width="350"
+ width="320"
>
<template slot-scope="{row}">
<div v-if="row.partname" class="ellipsis">{{ row.partname }}</div>
@@ -166,21 +183,21 @@
<el-table-column
prop="plan_qty"
label="浠诲姟鏁伴噺"
- width="105"
+ width="125"
/>
<el-table-column
prop="good_qty"
label="瀹屽伐鏁伴噺"
- width="105"
+ width="125"
/>
- <el-table-column
- prop="ng_qty"
- label="涓嶈壇鏁伴噺"
- width="105"
- />
+<!-- <el-table-column-->
+<!-- prop="ng_qty"-->
+<!-- label="涓嶈壇鏁伴噺"-->
+<!-- width="105"-->
+<!-- />-->
<el-table-column
label="瀹屾垚鐜�"
- width="105"
+ width="134"
>
<template slot-scope="{row}">
<div>{{ parseFloat((row.good_qty * 100 / row.plan_qty).toFixed(2)) }}%</div>
@@ -420,26 +437,50 @@
},
// 浜х嚎鍔犲伐浠诲姟 宸︿笅鏁版嵁
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.tableDataLeftBottom = res.data
- LineSearchBottomLeftData({shopcode: this.ShopArr.join(',')}).then(res => {
- this.tableDataLeftBottomTemp = res.data
- this.tableDataLeftBottom = this.tableDataLeftBottomTemp.slice(startValue, startValue + scale)
+ 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 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()
+ if (this.tableDataLeftBottom.length > 10) {
+ clearInterval(aaa)
+ this.getLeftBottomData()
+ }
+ })
}
-
- nowLoop++
- }, 1000 * 10)
+ }, this.tableDataLeftBottom.length <= 10 ? 1000 * 15 : 100)
})
},
@@ -622,6 +663,17 @@
border-radius: 50%;
}
+::v-deep .el-table__body-wrapper{
+ overflow: hidden !important;
+}
+
+.circle {
+ width: 26px;
+ height: 26px;
+ background-color: #00ff8b;
+ border-radius: 50%;
+}
+
</style>
<!--鏄熺┖-->
diff --git a/src/views/xtsy/index.vue b/src/views/xtsy/index.vue
index 2906260..0070f89 100644
--- a/src/views/xtsy/index.vue
+++ b/src/views/xtsy/index.vue
@@ -179,16 +179,16 @@
async getBar01() {
// const res=await xxx()
let data = [
- { key: 'admin0', value: 300 },
- { key: 'admin1', value: 310 },
- { key: 'admin2', value: 180 },
- { key: 'admin3', value: 190 },
- { key: 'admin4', value: 120 },
- { key: 'admin5', value: 230 },
- { key: 'admin6', value: 270 },
- { key: 'admin7', value: 250 },
- { key: 'admin8', value: 260 },
- { key: 'admin9', value: 180 }
+ { key: '鐭虫枃瓒�', value: 300 },
+ { key: '鐜嬩繆', value: 310 },
+ { key: '娓╅『', value: 180 },
+ { key: '闄堜簯绉�', value: 190 },
+ { key: '鏉滅兢鍐�', value: 120 },
+ { key: '鏈卞浗鍏�', value: 230 },
+ { key: '鐢板叴鏉�', value: 270 },
+ { key: '鏉庝紵', value: 250 },
+ { key: '鏉ㄨ儨鍒�', value: 260 },
+ { key: '娼樿嚮', value: 180 }
]
data = data.sort((a, b) => b.value - a.value)
loadEcharts('bar01', bar01(data))
--
Gitblit v1.9.3