From cbcf2f774d7bd505502cf05a09eb38ee553f7c34 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 06 五月 2023 07:59:14 +0800
Subject: [PATCH] 1.看板调整2.上云路由整合
---
src/views/xtsy/index.vue | 42 +-
src/views/bbgl/bzgz.vue | 5
src/views/zzmx/jpgj.vue | 4
vue.config.js | 4
src/views/kb/ckgl.vue | 34 +-
src/views/kb/zhkbc.vue | 32 ++
src/views/kb/zhkb.vue | 28 ++
src/router/index.js | 526 +++++++++++++++++++++++++++++++++++++++++++
src/utils/myEcharts.js | 4
src/views/bbgl/rygz.vue | 5
10 files changed, 632 insertions(+), 52 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 434a914..8fa53a3 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 = [
/*
* 鐪嬫澘閮ㄥ垎璺敱
@@ -94,7 +95,532 @@
}
// { 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: '/jcsz',
+ component: Layout,
+ redirect: '/jcsz/zzjg',
+ name: '鍩虹璁剧疆',
+ code: '1001',
+ meta: { code: '1001', title: '鍩虹璁剧疆', icon: 'tree' },
+ 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: '/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: 'xgbg',
+ name: 'XGBGCancel',
+ code: '1077',
+ component: () => import('@/views/scgl/xgbg'),
+ meta: { code: '1077', 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: '/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 }
+ }
+ ]
+ }
+]
+// 涓婁簯妯″潡
+export const asyncRoutesCloud = [
// 1.绯荤粺绠＄悊锛堝熀纭�璁剧疆绫伙級
{
path: '/systemSetting',
diff --git a/src/utils/myEcharts.js b/src/utils/myEcharts.js
index ac3560d..da2e1d9 100644
--- a/src/utils/myEcharts.js
+++ b/src/utils/myEcharts.js
@@ -305,9 +305,9 @@
}
},
yAxis: {
- max: 1,
+ max: 10,
min: 0,
- interval: 0.2,
+ interval: 2,
splitLine: {
show: false
},
diff --git a/src/views/bbgl/bzgz.vue b/src/views/bbgl/bzgz.vue
index 4a48745..f2876dd 100644
--- a/src/views/bbgl/bzgz.vue
+++ b/src/views/bbgl/bzgz.vue
@@ -92,8 +92,7 @@
:data="tableData"
:height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
border
- :summary-method="getSummaries"
- show-summary
+
:row-class-name="tableRowClassName"
:style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
highlight-current-row
@@ -101,6 +100,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 cc6d6dd..70b12c0 100644
--- a/src/views/bbgl/rygz.vue
+++ b/src/views/bbgl/rygz.vue
@@ -90,8 +90,7 @@
:data="tableData"
:height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
border
- :summary-method="getSummaries"
- show-summary
+
:row-class-name="tableRowClassName"
:style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
highlight-current-row
@@ -99,6 +98,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/kb/ckgl.vue b/src/views/kb/ckgl.vue
index c96122b..26ba633 100644
--- a/src/views/kb/ckgl.vue
+++ b/src/views/kb/ckgl.vue
@@ -34,7 +34,7 @@
<el-table-column
prop="voucherdate"
label="鍗曟嵁鏃ユ湡"
- width="140"
+ width="160"
>
<template slot-scope="{row}">
<div v-if="row.voucherdate" class="ellipsis">{{ row.voucherdate.substring(0, 10) }}</div>
@@ -50,15 +50,15 @@
<div class="ellipsis">{{ row.wo }}</div>
</template>
</el-table-column>
- <el-table-column
- prop="wkshp_name"
- label="鐢熶骇杞﹂棿"
- width="105"
- >
- <template slot-scope="{row}">
- <div class="ellipsis">{{ row.wkshp_name }}</div>
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="wkshp_name"-->
+ <!-- label="鐢熶骇杞﹂棿"-->
+ <!-- width="105"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div class="ellipsis">{{ row.wkshp_name }}</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
prop="saleOrderCode"
label="閿�鍞鍗曞彿"
@@ -81,7 +81,7 @@
<el-table-column
prop="materiel_name"
label="浜у搧鍚嶇О"
- width="180"
+ width="205"
>
<template slot-scope="{row}">
<div class="ellipsis">{{ row.materiel_name }}</div>
@@ -100,7 +100,7 @@
<el-table-column
prop="stck_name"
label="棰勫叆浠撳簱"
- width="100"
+ width="120"
>
<template slot-scope="{row}">
<div v-if="row.stck_name" class="ellipsis">{{ row.stck_name }}</div>
@@ -110,7 +110,7 @@
<el-table-column
prop="quantity"
label="鏁伴噺"
- width="63"
+ width="83"
/>
<el-table-column
prop="totalStockInQuantity"
@@ -140,7 +140,7 @@
<el-table-column
prop="preFinishDate"
label="棰勮鍏ュ簱"
- width="140"
+ width="160"
>
<template slot-scope="{row}">
<div v-if="row.preFinishDate">{{ row.preFinishDate.substring(0, 10) }}</div>
@@ -423,13 +423,13 @@
WareHouseTopLeftData().then(res => {
this.tableDataTop = res.data
this.number1 = this.tableDataTop.length
- if (this.tableDataTop.length > 9) {
+ if (this.tableDataTop.length > 10) {
clearInterval(this.tableTopTask)
this.getWareHouseTopLeftData()
}
})
}
- }, this.tableDataTop.length <= 9 ? 1000 * 3 : 100)
+ }, this.tableDataTop.length <= 10 ? 1000 * 15 : 100)
})
},
// 鑾峰彇宸︿笅table鏁版嵁
@@ -457,7 +457,7 @@
}
})
}
- }, this.tableDataBottom.length <= 10 ? 1000 * 3 : 100)
+ }, this.tableDataBottom.length <= 10 ? 1000 * 15 : 100)
})
},
diff --git a/src/views/kb/zhkb.vue b/src/views/kb/zhkb.vue
index c720546..eda59bb 100644
--- a/src/views/kb/zhkb.vue
+++ b/src/views/kb/zhkb.vue
@@ -24,6 +24,21 @@
<!-- <svg-icon icon-class="sccx" />-->
浜х嚎鍔犲伐涓换鍔�
<div style="margin-left: 30px">{{ number1 }} 鍗�</div>
+ <div style="display: flex;margin-left: 25px;">
+
+ <div class="circle" style="background-color: rgb(255 255 255)" />
+ <div style="margin-left: 10px">鏈紑濮�</div>
+
+ <div class="circle" style="margin-left: 10px;background-color: blue;" />
+ <div style="margin-left: 10px">寮�宸�</div>
+
+ <div class="circleYellow" style="margin-left: 10px" />
+ <div style="margin-left: 10px">鎵ц涓�</div>
+
+ <div class="circle" style="margin-left: 10px" />
+ <div style="margin-left: 10px">瀹屽伐</div>
+
+ </div>
</div>
<div class="kb_left_top kb_pd10">
@@ -638,7 +653,7 @@
}
})
}
- }, this.tableData.length <= 10 ? 1000 * 3 : 100)
+ }, this.tableData.length <= 10 ? 1000 * 15 : 100)
})
},
// 褰撴棩瀹屽伐浜у搧鏁伴噺鎺掕
@@ -966,4 +981,15 @@
background-color: rgb(255 255 0);
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/zhkbc.vue b/src/views/kb/zhkbc.vue
index 0957399..436f7e6 100644
--- a/src/views/kb/zhkbc.vue
+++ b/src/views/kb/zhkbc.vue
@@ -24,6 +24,21 @@
<!-- <svg-icon icon-class="sccx" />-->
浜х嚎鍔犲伐涓换鍔�
<div style="margin-left: 30px">{{ number1 }} 鍗�</div>
+ <div style="display: flex;margin-left: 25px;">
+
+ <div class="circle" style="background-color: rgb(255 255 255)" />
+ <div style="margin-left: 10px">鏈紑濮�</div>
+
+ <div class="circle" style="margin-left: 10px;background-color: blue;" />
+ <div style="margin-left: 10px">寮�宸�</div>
+
+ <div class="circleYellow" style="margin-left: 10px" />
+ <div style="margin-left: 10px">鎵ц涓�</div>
+
+ <div class="circle" style="margin-left: 10px" />
+ <div style="margin-left: 10px">瀹屽伐</div>
+
+ </div>
</div>
<div class="kb_left_top kb_pd10">
@@ -598,7 +613,7 @@
}
})
}
- }, this.tableData.length <= 10 ? 1000 * 3 : 100)
+ }, this.tableData.length <= 10 ? 1000 * 15 : 100)
})
},
// 褰撴棩瀹屽伐浜у搧鏁伴噺鎺掕
@@ -619,13 +634,13 @@
LineSearchTopRightData({ shopcode: this.ShopArr.join(',') }).then(res => {
this.tableDataRank = res.data
- if (this.tableDataRank.length > 9) {
+ if (this.tableDataRank.length > 10) {
clearInterval(this.TableDataRankRollTask)
this.getTableDataRankRoll()
}
})
}
- }, this.tableDataRank.length <= 9 ? 1000 * 3 : 100)
+ }, this.tableDataRank.length <= 10 ? 1000 * 3 : 100)
})
},
// 鑾峰彇echarts
@@ -926,4 +941,15 @@
background-color: rgb(255 255 0);
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 0d6325c..55dde80 100644
--- a/src/views/xtsy/index.vue
+++ b/src/views/xtsy/index.vue
@@ -161,16 +161,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: 'yang', value: 180 }
]
data = data.sort((a, b) => b.value - a.value)
loadEcharts('bar01', bar01(data))
@@ -184,17 +184,17 @@
// console.log(document.getElementById('line01'))
const data2 = [
{ key: '2', value: 0 },
- { key: '4', value: 0.2 },
- { key: '6', value: 0.3 },
- { key: '8', value: 0.1 },
- { key: '10', value: 0.8 },
- { key: '12', value: 0.2 },
- { key: '14', value: 0.3 },
- { key: '16', value: 0.3 },
- { key: '18', value: 0 },
- { key: '20', value: 0.2 },
- { key: '22', value: 0.1 },
- { key: '24', value: 0.4 }
+ { key: '4', value: 0 },
+ { key: '6', value: 0 },
+ { key: '8', value: 8 },
+ { key: '10', value: 6 },
+ { key: '12', value: 3 },
+ { key: '14', value: 6 },
+ { key: '16', value: 4 },
+ { key: '18', value: 2 },
+ { key: '20', value: 0 },
+ { key: '22', value: 0 },
+ { key: '24', value: 0 }
]
loadEcharts('line01', line01(data2))
}
diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index de97457..fc1bd8c 100644
--- a/src/views/zzmx/jpgj.vue
+++ b/src/views/zzmx/jpgj.vue
@@ -16,7 +16,7 @@
style="display: flex;justify-content: space-between"
>
<div class="elForm">
- <el-form-item label-width="70px" label="浜у搧鍚嶇О" style=" display: flex;">
+ <el-form-item label="浜у搧鍚嶇О/缂栫爜" style=" display: flex;">
<el-select
v-model="form.partcode"
filterable
@@ -30,7 +30,7 @@
<el-option
v-for="item in partArr"
:key="item.partcode"
- :label="item.partname"
+ :label="item.partname+' / ' + item.partcode"
:value="item.partcode"
/>
</el-select>
diff --git a/vue.config.js b/vue.config.js
index a44c866..b810e3b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -50,8 +50,8 @@
},
proxy: {
[process.env.VUE_APP_BASE_API]: {
- target: 'http://121.196.36.24:8005', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴鏈嶅姟鍣�(鐏电繑)
- // target: 'http://192.168.0.230:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 瀹㈡埛鏈嶅姟鍣�(鐏电繑) (鏈笂浜�)
+ // target: 'http://121.196.36.24:8005', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴鏈嶅姟鍣�(鐏电繑)
+ target: 'http://192.168.0.230:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 瀹㈡埛鏈嶅姟鍣�(鐏电繑) (鏈笂浜�)
// target: 'http://3up6ju.natappfree.cc', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 瀹㈡埛鏈嶅姟鍣�(鐏电繑) (涓婁簯)
changeOrigin: true, // 璇锋眰璺ㄥ煙鏃讹紝闇� 閰嶇疆姝ら」
pathRewrite: { // 璺緞閲嶅啓,鏇挎崲target涓殑璇锋眰鍦板潃
--
Gitblit v1.9.3