From 3fce634eeb56f9425d5e745b1d4333da962fc3d7 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 25 八月 2023 11:19:10 +0800
Subject: [PATCH] 1.新增功能菜单
---
src/views/deviceManager/maintainPosition.vue | 0
src/views/deviceManager/checkStandard.vue | 0
src/views/materialManager/inventoryList.vue | 11 +
src/views/workOrder/produceOrderList.vue | 11 +
src/views/deviceManager/maintainRecord.vue | 0
src/views/qualityManager/processCheckRecord.vue | 11 +
src/views/deviceManager/repairRecord.vue | 0
src/views/deviceManager/deviceList.vue | 0
src/views/materialManager/unitList.vue | 11 +
src/views/deviceManager/checkPosition.vue | 0
src/layout/components/Sidebar/index.vue | 12
src/views/qualityManager/qualityPlaning.vue | 11 +
src/views/basicSettings/storageList.vue | 11 +
src/store/modules/user.js | 3
src/router/index.js | 354 +++++++++++++++++++++++++++++---------
src/views/basicSettings/contactUnitList.vue | 11 +
src/views/qualityManager/defectDefine.vue | 0
src/views/basicSettings/personList.vue | 7
src/utils/request.js | 3
src/views/deviceManager/checkRecord.vue | 0
src/views/deviceManager/maintainStandard.vue | 0
src/views/qualityManager/processCheckItem.vue | 0
src/views/basicSettings/powerDivider.vue | 13 +
src/views/qualityManager/processCheck.vue | 0
src/views/basicSettings/installLampList.vue | 11 +
src/views/basicSettings/warehouseList.vue | 11 +
src/icons/svg/component.svg | 21 +-
src/views/materialManager/materialList.vue | 11 +
28 files changed, 416 insertions(+), 107 deletions(-)
diff --git a/src/icons/svg/component.svg b/src/icons/svg/component.svg
index 17d1c0b..1975534 100644
--- a/src/icons/svg/component.svg
+++ b/src/icons/svg/component.svg
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <!-- Generator: Sketch 55.2 (78181) - https://sketchapp.com -->
- <title>宸ヨ绠＄悊澶囦唤</title>
- <desc>Created with Sketch.</desc>
- <g id="宸ヨ绠＄悊澶囦唤" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
- <rect id="鐭╁舰" x="0" y="0" width="20" height="20"></rect>
- <path d="M6.78926121,0.5 L3.19007351,0.5 C1.71249893,0.5 0.500187903,1.71240277 0.500187903,3.1710221 L0.500187903,6.7701364 C0.500187903,8.22879243 1.71249893,9.38432942 3.17111827,9.38432942 L9.38446229,9.38432942 L9.38446229,3.1710221 C9.38446229,1.71240277 8.22892528,0.5 6.78926121,0.5 L6.78926121,0.5 Z M8.07737495,8.07722373 L3.17111827,8.07722373 C2.45131375,8.07722373 1.82613875,7.48999596 1.82613875,6.7701364 L1.82613875,3.1710221 C1.82613875,2.45112585 2.45131375,1.82604258 3.17111827,1.82604258 L6.77032432,1.82604258 C7.49012883,1.82604258 8.07737495,2.43222561 8.07737495,3.1710221 L8.07737495,8.07722373 L8.07737495,8.07722373 Z M16.9048936,0.5 L13.3056876,0.5 C11.8470682,0.5 10.6346104,1.71240277 10.6346104,3.1710221 L10.6346104,9.38431107 L16.9048753,9.38431107 C18.3633111,9.38431107 19.4998928,8.22879243 19.4998928,6.77011804 L19.4998928,3.17100375 C19.4998928,1.71240277 18.344521,0.5 16.9048936,0.5 L16.9048936,0.5 Z M18.1741438,6.7701364 C18.1741438,7.48999596 17.6246614,8.07722373 16.8857182,8.07722373 L11.9228526,8.07722373 L11.9228526,3.1520852 C11.9228526,2.43222563 12.5668361,1.80710569 13.2867874,1.80710569 L16.8856998,1.80710569 C17.6058347,1.80710569 18.1741438,2.41328872 18.1741438,3.1520852 L18.1741438,6.7701364 L18.1741438,6.7701364 Z M0.500187903,13.2865077 L0.500187903,16.8857872 C0.500187903,18.3443148 1.71249893,19.4999802 3.17111827,19.4999802 L6.77032432,19.4999802 C8.22894365,19.4999802 9.36552537,18.3443148 9.36552537,16.8857872 L9.36552537,10.6157241 L3.17111827,10.6157241 C1.71249893,10.6157241 0.500187903,11.8279985 0.500187903,13.2865077 L0.500187903,13.2865077 Z M8.0773566,16.8858055 C8.0773566,17.6055733 7.50906571,18.1738642 6.77030595,18.1738642 L3.17111827,18.1738642 C2.45131375,18.1738642 1.82613875,17.6055733 1.82613875,16.8858055 L1.82613875,13.2865077 C1.82613875,12.5666482 2.45131375,11.9226647 3.17111827,11.9226647 L8.0773566,11.9226647 L8.0773566,16.8858055 L8.0773566,16.8858055 Z M16.9048936,10.6157241 L10.6157286,10.6157241 L10.6157286,16.8858055 C10.6157286,18.3443331 11.8280946,19.4999985 13.2868057,19.4999985 L16.8857182,19.4999985 C18.344521,19.4999985 19.4811027,18.3443331 19.4811027,16.8858055 L19.4811027,13.2865077 C19.4998928,11.8279985 18.344521,10.6157241 16.9048936,10.6157241 L16.9048936,10.6157241 Z M18.1741438,16.8858055 C18.1741438,17.6055733 17.6246614,18.1738642 16.8857182,18.1738642 L13.2867874,18.1738642 C12.5668361,18.1738642 11.9228526,17.6055733 11.9228526,16.8858055 L11.9228526,11.922683 L16.9048753,11.922683 C17.6246431,11.922683 18.1929339,12.547858 18.1929339,13.2865261 L18.1929339,16.8858055 L18.1741438,16.8858055 Z" id="褰㈢姸" fill="#00A79D" fill-rule="nonzero"></path>
- </g>
-</svg>
\ No newline at end of file
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink">
+ <!-- Generator: Sketch 55.2 (78181) - https://sketchapp.com -->
+ <title>宸ヨ绠＄悊澶囦唤</title>
+ <desc>Created with Sketch.</desc>
+ <g id="宸ヨ绠＄悊澶囦唤" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+ <rect id="鐭╁舰" x="0" y="0" width="20" height="20"></rect>
+ <path
+ d="M6.78926121,0.5 L3.19007351,0.5 C1.71249893,0.5 0.500187903,1.71240277 0.500187903,3.1710221 L0.500187903,6.7701364 C0.500187903,8.22879243 1.71249893,9.38432942 3.17111827,9.38432942 L9.38446229,9.38432942 L9.38446229,3.1710221 C9.38446229,1.71240277 8.22892528,0.5 6.78926121,0.5 L6.78926121,0.5 Z M8.07737495,8.07722373 L3.17111827,8.07722373 C2.45131375,8.07722373 1.82613875,7.48999596 1.82613875,6.7701364 L1.82613875,3.1710221 C1.82613875,2.45112585 2.45131375,1.82604258 3.17111827,1.82604258 L6.77032432,1.82604258 C7.49012883,1.82604258 8.07737495,2.43222561 8.07737495,3.1710221 L8.07737495,8.07722373 L8.07737495,8.07722373 Z M16.9048936,0.5 L13.3056876,0.5 C11.8470682,0.5 10.6346104,1.71240277 10.6346104,3.1710221 L10.6346104,9.38431107 L16.9048753,9.38431107 C18.3633111,9.38431107 19.4998928,8.22879243 19.4998928,6.77011804 L19.4998928,3.17100375 C19.4998928,1.71240277 18.344521,0.5 16.9048936,0.5 L16.9048936,0.5 Z M18.1741438,6.7701364 C18.1741438,7.48999596 17.6246614,8.07722373 16.8857182,8.07722373 L11.9228526,8.07722373 L11.9228526,3.1520852 C11.9228526,2.43222563 12.5668361,1.80710569 13.2867874,1.80710569 L16.8856998,1.80710569 C17.6058347,1.80710569 18.1741438,2.41328872 18.1741438,3.1520852 L18.1741438,6.7701364 L18.1741438,6.7701364 Z M0.500187903,13.2865077 L0.500187903,16.8857872 C0.500187903,18.3443148 1.71249893,19.4999802 3.17111827,19.4999802 L6.77032432,19.4999802 C8.22894365,19.4999802 9.36552537,18.3443148 9.36552537,16.8857872 L9.36552537,10.6157241 L3.17111827,10.6157241 C1.71249893,10.6157241 0.500187903,11.8279985 0.500187903,13.2865077 L0.500187903,13.2865077 Z M8.0773566,16.8858055 C8.0773566,17.6055733 7.50906571,18.1738642 6.77030595,18.1738642 L3.17111827,18.1738642 C2.45131375,18.1738642 1.82613875,17.6055733 1.82613875,16.8858055 L1.82613875,13.2865077 C1.82613875,12.5666482 2.45131375,11.9226647 3.17111827,11.9226647 L8.0773566,11.9226647 L8.0773566,16.8858055 L8.0773566,16.8858055 Z M16.9048936,10.6157241 L10.6157286,10.6157241 L10.6157286,16.8858055 C10.6157286,18.3443331 11.8280946,19.4999985 13.2868057,19.4999985 L16.8857182,19.4999985 C18.344521,19.4999985 19.4811027,18.3443331 19.4811027,16.8858055 L19.4811027,13.2865077 C19.4998928,11.8279985 18.344521,10.6157241 16.9048936,10.6157241 L16.9048936,10.6157241 Z M18.1741438,16.8858055 C18.1741438,17.6055733 17.6246614,18.1738642 16.8857182,18.1738642 L13.2867874,18.1738642 C12.5668361,18.1738642 11.9228526,17.6055733 11.9228526,16.8858055 L11.9228526,11.922683 L16.9048753,11.922683 C17.6246431,11.922683 18.1929339,12.547858 18.1929339,13.2865261 L18.1929339,16.8858055 L18.1741438,16.8858055 Z"
+ id="褰㈢姸" fill="#157b7e" fill-rule="nonzero"></path>
+ </g>
+</svg>
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index a5507e8..890bc5f 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -77,14 +77,16 @@
activeMenu() {
const route = this.$route
const { meta, path } = route
- // console.log(meta, path, 7)
+ console.log(meta, path, 7)
// if set path, the sidebar will highlight the path you set
removeCookie('ruleCode')
setCookie('ruleCode', meta.code) // 灏嗙紪鐮佽鍒檆ode瀛樺埌cookie閲岄潰
- // Vue.prototype.$buttoncode = meta.buttoncode
- // Vue.prototype.$datacode = meta.datacode
- // setCookie('buttoncode', meta.buttoncode)// 鎸夐挳鏉冮檺
- // setCookie('datacode', meta.datacode)// 鏁版嵁鏉冮檺
+
+ removeCookie('datacode')
+ setCookie('datacode', meta.datacode) // 鏁版嵁鏉冮檺
+
+ Vue.prototype.$buttoncode = meta.buttoncode // 鎸夐挳鏉冮檺
+
if (meta.activeMenu) {
return meta.activeMenu
}
diff --git a/src/router/index.js b/src/router/index.js
index 86d8d21..d634c45 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -91,183 +91,365 @@
component: Layout,
redirect: '/basicSettings/organizationList',
name: '鍩虹璁剧疆',
- code: '1001',
- meta: { code: '1001', title: '鍩虹璁剧疆', icon: 'tree2' },
+ code: '01',
+ meta: { code: '01', title: '鍩虹璁剧疆', icon: 'tree2' },
alwaysShow: true, // 褰揷hildren鍙湁涓�涓椂锛屼篃鏄剧ず鐖惰彍鍗�
children: [
{
path: 'organizationList',
name: 'organizationListCancel',
- code: '1010',
+ code: '0101',
component: () => import('@/views/basicSettings/organizationList'),
- meta: { code: '1010', title: '缁勭粐鏋舵瀯', icon: '', keepAlive: true }
+ meta: { code: '0101', title: '缁勭粐鏋舵瀯', icon: '', keepAlive: true }
+ },
+ {
+ path: 'postList',
+ name: 'personListCancel',
+ code: '0102',
+ component: () => import('@/views/basicSettings/postList'),
+ meta: { code: '0102', title: '宀椾綅绠＄悊', icon: '', keepAlive: true }
+ }, {
+ path: 'groupList',
+ name: 'groupListCancel',
+ code: '0103',
+ component: () => import('@/views/basicSettings/groupList'),
+ meta: { code: '0103', title: '鐝粍绠＄悊', icon: '', keepAlive: true }
},
{
path: 'personList',
name: 'personListCancel',
- code: '1011',
+ code: '0104',
component: () => import('@/views/basicSettings/personList'),
- meta: { code: '1011', title: '浜哄憳绠＄悊', icon: '', keepAlive: true }
- }, {
- path: 'postList',
- name: 'personListCancel',
- code: '1012',
- component: () => import('@/views/basicSettings/postList'),
- meta: { code: '1012', title: '宀椾綅绠＄悊', icon: '', keepAlive: true }
+ meta: { code: '0104', title: '浜哄憳绠＄悊', icon: '', keepAlive: true }
}, {
path: 'roleList',
name: 'roleListCancel',
- code: '1013',
+ code: '0105',
component: () => import('@/views/basicSettings/roleList'),
- meta: { code: '1013', title: '瑙掕壊绠＄悊', icon: '', keepAlive: true }
+ meta: { code: '0105', title: '瑙掕壊绠＄悊', icon: '', keepAlive: true }
}, {
- path: 'groupList',
- name: 'groupListCancel',
- code: '1014',
- component: () => import('@/views/basicSettings/groupList'),
- meta: { code: '1014', title: '鐝粍绠＄悊', icon: '', keepAlive: true }
+ path: 'contactUnitList',
+ name: 'contactUnitListCancel',
+ code: '0106',
+ component: () => import('@/views/basicSettings/contactUnitList'),
+ meta: { code: '0106', title: '寰�鏉ュ崟浣�', icon: '', keepAlive: true }
+ }, {
+ path: 'warehouseList',
+ name: 'warehouseListCancel',
+ code: '0107',
+ component: () => import('@/views/basicSettings/warehouseList'),
+ meta: { code: '0107', title: '浠撳簱璁剧疆', icon: '', keepAlive: true }
+ }, {
+ path: 'storageList',
+ name: 'storageListCancel',
+ code: '0108',
+ component: () => import('@/views/basicSettings/storageList'),
+ meta: { code: '0108', title: '搴撲綅璁剧疆', icon: '', keepAlive: true }
+ }, {
+ path: 'installLampList',
+ name: 'installLampListCancel',
+ code: '0109',
+ component: () => import('@/views/basicSettings/installLampList'),
+ meta: { code: '0109', title: '瀹夌伅璁剧疆', icon: '', keepAlive: true }
},
{
path: 'powerDivider',
name: 'powerDividerCancel',
- code: '1015',
+ code: '0110',
component: () => import('@/views/basicSettings/powerDivider'),
- meta: { code: '1015', title: '鏉冮檺鍒嗛厤', icon: '', keepAlive: true }
+ meta: { code: '0110', title: '鏉冮檺鍒嗛厤', icon: '', keepAlive: true }
},
{
path: 'roleDivider',
name: 'roleDividerCancel',
- code: '1016',
+ code: '0111',
hidden: true,
component: () => import('@/views/basicSettings/roleDivider'),
- meta: { code: '1016', title: '瑙掕壊鍒嗛厤', icon: '', keepAlive: true }
+ meta: { code: '0111', title: '瑙掕壊鍒嗛厤', icon: '', keepAlive: true }
}
]
},
+
+ {
+ path: '/materialManager',
+ component: Layout,
+ redirect: '/materialManager/unitList',
+ name: '鐗╂枡绠＄悊',
+ code: '02',
+ meta: { code: '02', title: '鐗╂枡绠＄悊', icon: 'table' },
+ alwaysShow: true, // 褰揷hildren鍙湁涓�涓椂锛屼篃鏄剧ず鐖惰彍鍗�
+ children: [
+ {
+ path: 'unitList',
+ name: 'unitListCancel',
+ code: '0201',
+ component: () => import('@/views/materialManager/unitList'),
+ meta: { code: '0201', title: '璁￠噺鍗曚綅', icon: '', keepAlive: true }
+ },
+ {
+ path: 'inventoryList',
+ name: 'inventoryListCancel',
+ code: '0202',
+ component: () => import('@/views/materialManager/inventoryList'),
+ meta: { code: '0202', title: '瀛樿揣妗ｆ', icon: '', keepAlive: true }
+ }, {
+ path: 'materialList',
+ name: 'materialListCancel',
+ code: '0203',
+ component: () => import('@/views/materialManager/materialList'),
+ meta: { code: '0203', title: '鐗╂枡娓呭崟', icon: '', keepAlive: true }
+ }
+
+ ]
+ },
+
+ {
+ path: '/deviceManager',
+ component: Layout,
+ redirect: '/deviceManager/deviceType',
+ name: '璁惧绠＄悊',
+ code: '03',
+ meta: { code: '03', title: '璁惧绠＄悊', icon: 'example' },
+ alwaysShow: true,
+ children: [
+ {
+ path: 'deviceList',
+ name: 'deviceListCancel',
+ code: '0301',
+ component: () => import('@/views/deviceManager/deviceList'),
+ meta: { code: '0301', title: '璁惧娓呭崟', icon: '', keepAlive: true }
+ },
+ {
+ path: 'checkStandard',
+ name: 'checkStandardCancel',
+ code: '0302',
+ component: () => import('@/views/deviceManager/checkStandard'),
+ meta: { code: '0302', title: '鐐规鏍囧噯', icon: '', keepAlive: true }
+ },
+ {
+ path: 'checkPosition',
+ name: 'checkPositionCancel',
+ code: '0303',
+ component: () => import('@/views/deviceManager/checkPosition'),
+ meta: { code: '0303', title: '鐐规閮ㄤ綅', icon: '', keepAlive: true }
+ },
+ {
+ path: 'maintainStandard',
+ name: 'maintainStandardCancel',
+ code: '0304',
+ component: () => import('@/views/deviceManager/maintainStandard'),
+ meta: { code: '0304', title: '淇濆吇鏍囧噯', icon: '', keepAlive: true }
+ },
+ {
+ path: 'maintainPosition',
+ name: 'maintainPositionCancel',
+ code: '0305',
+ component: () => import('@/views/deviceManager/maintainPosition'),
+ meta: { code: '0305', title: '淇濆吇閮ㄤ綅', icon: '', keepAlive: true }
+ },
+ {
+ path: 'checkRecord',
+ name: 'checkRecordCancel',
+ code: '0306',
+ component: () => import('@/views/deviceManager/checkRecord'),
+ meta: { code: '0306', title: '鐐规璁板綍', icon: '', keepAlive: true }
+ },
+ {
+ path: 'maintainRecord',
+ name: 'maintainRecordCancel',
+ code: '0307',
+ component: () => import('@/views/deviceManager/maintainRecord'),
+ meta: { code: '0307', title: '淇濆吇璁板綍', icon: '', keepAlive: true }
+ },
+ {
+ path: 'repairRecord',
+ code: '0308',
+ name: 'repairRecordCancel',
+ component: () => import('@/views/deviceManager/repairRecord'),
+ meta: { code: '0308', title: '缁翠慨璁板綍', icon: '', keepAlive: true }
+ }
+ ]
+ },
+
+ {
+ path: '/qualityManager',
+ component: Layout,
+ redirect: '/qualityManager/defectDefine',
+ name: '璐ㄩ噺绠＄悊',
+ code: '04',
+ meta: { code: '04', title: '璐ㄩ噺绠＄悊', icon: 'quality' },
+ alwaysShow: true,
+ children: [
+ {
+ path: 'defectDefine',
+ name: 'defectDefineCancel',
+ code: '0401',
+ component: () => import('@/views/qualityManager/defectDefine'),
+ meta: { code: '0401', title: '缂洪櫡瀹氫箟', icon: '', keepAlive: true }
+ },
+ {
+ path: 'processCheckItem',
+ name: 'processCheckItemCancel',
+ code: '0402',
+ component: () => import('@/views/qualityManager/processCheckItem'),
+ meta: { code: '0402', title: '妫�楠岄」璁剧疆', icon: '', keepAlive: true }
+ }, {
+ path: 'qualityPlaning',
+ name: 'qualityPlaningCancel',
+ code: '0403',
+ component: () => import('@/views/qualityManager/qualityPlaning'),
+ meta: { code: '0403', title: '璐ㄦ鏂规', icon: '', keepAlive: true }
+ }, {
+ path: 'processCheck',
+ name: 'processCheckCancel',
+ code: '0404',
+ component: () => import('@/views/qualityManager/processCheck'),
+ meta: { code: '0404', title: '宸ュ簭妫�楠�', icon: '', keepAlive: true }
+ }, {
+ path: 'processCheckRecord',
+ name: 'processCheckRecordCancel',
+ code: '0405',
+ component: () => import('@/views/qualityManager/processCheckRecord'),
+ meta: { code: '0405', title: '宸ュ簭妫�楠�', icon: '', keepAlive: true }
+ }
+ ]
+ },
+
{
path: '/workOrder',
component: Layout,
redirect: '/workOrder/workOrderList',
name: '宸ュ崟绠＄悊',
- code: '1002',
- meta: { code: '1002', title: '宸ュ崟绠＄悊', icon: 'bbgl' },
+ code: '05',
+ meta: { code: '05', title: '宸ュ崟绠＄悊', icon: 'bbgl' },
alwaysShow: true, // 褰揷hildren鍙湁涓�涓椂锛屼篃鏄剧ず鐖惰彍鍗�
children: [
{
+ path: 'produceOrderList',
+ name: 'produceOrderListCancel',
+ code: '0501',
+ component: () => import('@/views/workOrder/produceOrderList'),
+ meta: { code: '0501', title: 'ERP璁㈠崟', icon: '', keepAlive: true }
+ },
+ {
path: 'workOrderList',
name: 'workOrderListCancel',
- code: '1020',
+ code: '0502',
component: () => import('@/views/workOrder/workOrderList'),
- meta: { code: '1010', title: '宸ュ崟鍒楄〃', icon: '', keepAlive: true }
+ meta: { code: '0502', title: 'MES宸ュ崟', icon: '', keepAlive: true }
},
{
path: 'workOrderSend',
name: 'workOrderSendCancel',
- code: '1021',
+ code: '0503',
component: () => import('@/views/workOrder/workOrderSend'),
- meta: { code: '1021', title: '宸ュ崟娲惧彂', icon: '', keepAlive: true }
+ meta: { code: '0503', title: '宸ュ崟娲惧彂', icon: '', keepAlive: true }
}, {
path: 'workOrderClose',
name: 'workOrderCloseCancel',
- code: '1022',
+ code: '0504',
component: () => import('@/views/workOrder/workOrderClose'),
- meta: { code: '1022', title: '宸ュ崟鍏抽棴', icon: '', keepAlive: true }
+ meta: { code: '0504', title: '宸ュ崟鍏抽棴', icon: '', keepAlive: true }
}
]
},
+
{
path: '/produce',
component: Layout,
redirect: '/produce/stepReport',
name: '鐢熶骇鎵ц',
- code: '1003',
- meta: { code: '1003', title: '鐢熶骇鎵ц', icon: 'production' },
+ code: '06',
+ meta: { code: '06', title: '鐢熶骇鎵ц', icon: 'component' },
alwaysShow: true, // 褰揷hildren鍙湁涓�涓椂锛屼篃鏄剧ず鐖惰彍鍗�
children: [
{
path: 'stepReport',
name: 'stepReportCancel',
- code: '1030',
+ code: '0601',
component: () => import('@/views/produce/stepReport'),
- meta: { code: '1030', title: '宸ュ簭鎶ュ伐', icon: '', keepAlive: true }
+ meta: { code: '0601', title: '宸ュ簭鎶ュ伐', icon: '', keepAlive: true }
},
{
path: 'reportCorrect',
name: 'reportCorrectCancel',
- code: '1031',
+ code: '0602',
component: () => import('@/views/produce/reportCorrect'),
- meta: { code: '1031', title: '鎶ュ伐淇', icon: '', keepAlive: true }
+ meta: { code: '0602', title: '鎶ュ伐璋冩暣', icon: '', keepAlive: true }
}, {
path: 'reportVerify',
name: 'reportVerifyCancel',
- code: '1032',
+ code: '0603',
component: () => import('@/views/produce/reportVerify'),
- meta: { code: '1032', title: '鎶ュ伐瀹℃牳', icon: '', keepAlive: true }
+ meta: { code: '0603', title: '鎶ュ伐瀹℃牳', icon: '', keepAlive: true }
}
]
},
- {
- path: '/statistic',
- component: Layout,
- redirect: '/statistic/reportList',
- name: '缁熻鎶ヨ〃',
- code: '1004',
- meta: { code: '1004', title: '缁熻鎶ヨ〃', icon: 'quality' },
- alwaysShow: true, // 褰揷hildren鍙湁涓�涓椂锛屼篃鏄剧ず鐖惰彍鍗�
- children: [
- {
- path: 'reportList',
- name: 'reportListCancel',
- code: '1040',
- component: () => import('@/views/statistic/reportList'),
- meta: { code: '1040', title: '鎶ュ伐璁板綍', icon: '', keepAlive: true }
- },
- {
- path: 'monthReport',
- name: 'monthReportCancel',
- code: '1041',
- component: () => import('@/views/statistic/monthReport'),
- meta: { code: '1041', title: '鏈堝害缁熻', icon: '', keepAlive: true }
- }, {
- path: 'workOrderProcess',
- name: 'workOrderProcessCancel',
- code: '1042',
- component: () => import('@/views/statistic/workOrderProcess'),
- meta: { code: '1042', title: '宸ュ崟杩涘害', icon: '', keepAlive: true }
- }, {
- path: 'inProcessList',
- name: 'inProcessListCancel',
- code: '1043',
- component: () => import('@/views/statistic/inProcessList'),
- meta: { code: '1043', title: '鍦ㄥ埗鍒楄〃', icon: '', keepAlive: true }
- }
- ]
- },
+ // {
+ // path: '/statistic',
+ // component: Layout,
+ // redirect: '/statistic/reportList',
+ // name: '缁熻鎶ヨ〃',
+ // code: '1004',
+ // meta: { code: '1004', title: '缁熻鎶ヨ〃', icon: 'quality' },
+ // alwaysShow: true, // 褰揷hildren鍙湁涓�涓椂锛屼篃鏄剧ず鐖惰彍鍗�
+ // children: [
+ // {
+ // path: 'reportList',
+ // name: 'reportListCancel',
+ // code: '1040',
+ // component: () => import('@/views/statistic/reportList'),
+ // meta: { code: '1040', title: '鎶ュ伐璁板綍', icon: '', keepAlive: true }
+ // },
+ // {
+ // path: 'monthReport',
+ // name: 'monthReportCancel',
+ // code: '1041',
+ // component: () => import('@/views/statistic/monthReport'),
+ // meta: { code: '1041', title: '鏈堝害缁熻', icon: '', keepAlive: true }
+ // }, {
+ // path: 'workOrderProcess',
+ // name: 'workOrderProcessCancel',
+ // code: '1042',
+ // component: () => import('@/views/statistic/workOrderProcess'),
+ // meta: { code: '1042', title: '宸ュ崟杩涘害', icon: '', keepAlive: true }
+ // }, {
+ // path: 'inProcessList',
+ // name: 'inProcessListCancel',
+ // code: '1043',
+ // component: () => import('@/views/statistic/inProcessList'),
+ // meta: { code: '1043', title: '鍦ㄥ埗鍒楄〃', icon: '', keepAlive: true }
+ // }
+ //
+ // ]
+ // },
+
{
path: '/systemSetting',
component: Layout,
redirect: '/systemSetting/encodingRules',
name: '绯荤粺璁剧疆',
- code: '1005',
- meta: { code: '1005', title: '绯荤粺璁剧疆', icon: 'xtsz' },
+ code: '08',
+ meta: { code: '08', title: '绯荤粺璁剧疆', icon: 'xtsz' },
alwaysShow: true, // 褰揷hildren鍙湁涓�涓椂锛屼篃鏄剧ず鐖惰彍鍗�
children: [
{
- path: 'reportList',
- name: 'reportListCancel',
- code: '1050',
- component: () => import('@/views/systemSetting/encodingRules'),
- meta: { code: '1050', title: '缂栫爜瑙勫垯', icon: '', keepAlive: true }
- }, {
path: 'menuList',
name: 'menuListCancel',
- code: '1051',
+ code: '0801',
component: () => import('@/views/systemSetting/menuList'),
- meta: { code: '1051', title: '鑿滃崟绠＄悊', icon: '', keepAlive: true }
+ meta: { code: '0801', title: '鑿滃崟绠＄悊', icon: '', keepAlive: true }
+ },
+ {
+ path: 'reportList',
+ name: 'reportListCancel',
+ code: '0802',
+ component: () => import('@/views/systemSetting/encodingRules'),
+ meta: { code: '0802', title: '缂栫爜瑙勫垯', icon: '', keepAlive: true }
}
]
}
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 291baf5..11e2fed 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -75,7 +75,6 @@
// get user menu
getMenu({ commit, state }) {
return new Promise((resolve, reject) => {
- // console.log('鑿滃崟鎺ュ彛杩涙潵浜�11111')
LoginMenu({
usertype: 'PC',
usercode: localStorage.getItem('usercode'),
@@ -83,8 +82,6 @@
}).then(res => {
if (res.code === '200') {
ButtonData().then(res2 => {
- // localStorage.setItem('buttoncode', res2.data.map(i => i.buttoncode))
- Vue.prototype.$buttoncode = res2.data.map(i => i.buttoncode)
localStorage.setItem('ButtonData', JSON.stringify(res2.data))
})
diff --git a/src/utils/request.js b/src/utils/request.js
index 6bfb054..9a4e6fc 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,8 @@
config.headers['Token'] = localStorage.getItem('token')
config.headers['Menucode'] = getCookie('ruleCode') // 缂栫爜瑙勫垯
+
+ config.headers['Datacode'] = getCookie('datacode') // 鏁版嵁鏉冮檺
return config
},
error => {
@@ -96,6 +98,7 @@
type: 'error',
duration: 5 * 1000
})
+ store.state.app.buttonIsDisabled = false
return Promise.reject(error)
}
)
diff --git a/src/views/basicSettings/contactUnitList.vue b/src/views/basicSettings/contactUnitList.vue
new file mode 100644
index 0000000..d3131ff
--- /dev/null
+++ b/src/views/basicSettings/contactUnitList.vue
@@ -0,0 +1,11 @@
+<template />
+
+<script>
+export default {
+ name: 'ContactUnitList'
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/basicSettings/installLampList.vue b/src/views/basicSettings/installLampList.vue
new file mode 100644
index 0000000..43a2260
--- /dev/null
+++ b/src/views/basicSettings/installLampList.vue
@@ -0,0 +1,11 @@
+<template />
+
+<script>
+export default {
+ name: 'InstallLampList'
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/basicSettings/personList.vue b/src/views/basicSettings/personList.vue
index ecfc4c6..4635050 100644
--- a/src/views/basicSettings/personList.vue
+++ b/src/views/basicSettings/personList.vue
@@ -22,6 +22,7 @@
<el-tree
ref="treeLeftRef"
+ key="treeLeftKey"
style="padding: 10px;overflow: auto;"
:style="{height:(tableHeight+180)+'px'}"
:data="treeLeft"
@@ -526,8 +527,10 @@
customID: 'torg_code',
childrenProperty: 'children'
})
-
- this.treeLeft = this.cascaderOptions
+ this.$nextTick(() => {
+ this.treeLeft = this.cascaderOptions
+ this.$forceUpdate()
+ })
},
// 宀椾綅 瑙掕壊 鐝粍
async getAllSelectData() {
diff --git a/src/views/basicSettings/powerDivider.vue b/src/views/basicSettings/powerDivider.vue
index a823b49..4a55af6 100644
--- a/src/views/basicSettings/powerDivider.vue
+++ b/src/views/basicSettings/powerDivider.vue
@@ -57,7 +57,7 @@
<div style="display: flex;">
<div
ref="scrollLeft"
- style="border-right: 1px solid rgba(0,0,0,0.2);width: 220px;
+ style="border-right: 1px solid rgba(0,0,0,0.2);width:260px;
overflow-y: auto;overflow-x:hidden;"
:style="{height:(tableHeight-40)+'px'}"
@scroll="scrollLeftScroll()"
@@ -83,7 +83,7 @@
</div>
<div
ref="scrollCenter"
- style="width: 660px;padding-left: 10px;overflow-y: auto"
+ style="width: calc(100% - 260px );padding-left: 10px;overflow-y: auto"
:style="{height:(tableHeight-40)+'px'}"
@scroll="scrollCenterScroll()"
@mouseover="isScroll='center'"
@@ -476,4 +476,13 @@
::v-deep .el-checkbox__label {
width: 55px;
}
+
+.el-checkbox-group {
+ margin-left: 0 !important;
+ padding-left: 40px;
+}
+
+.el-checkbox-group:hover {
+ background: #f0f7ff;
+}
</style>
diff --git a/src/views/basicSettings/storageList.vue b/src/views/basicSettings/storageList.vue
new file mode 100644
index 0000000..22d566a
--- /dev/null
+++ b/src/views/basicSettings/storageList.vue
@@ -0,0 +1,11 @@
+<template />
+
+<script>
+export default {
+ name: 'StorageList'
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/basicSettings/warehouseList.vue b/src/views/basicSettings/warehouseList.vue
new file mode 100644
index 0000000..404dcc0
--- /dev/null
+++ b/src/views/basicSettings/warehouseList.vue
@@ -0,0 +1,11 @@
+<template />
+
+<script>
+export default {
+ name: 'WarehouseLIst'
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/deviceManager/checkPosition.vue b/src/views/deviceManager/checkPosition.vue
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/views/deviceManager/checkPosition.vue
diff --git a/src/views/deviceManager/checkRecord.vue b/src/views/deviceManager/checkRecord.vue
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/views/deviceManager/checkRecord.vue
diff --git a/src/views/deviceManager/checkStandard.vue b/src/views/deviceManager/checkStandard.vue
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/views/deviceManager/checkStandard.vue
diff --git a/src/views/deviceManager/deviceList.vue b/src/views/deviceManager/deviceList.vue
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/views/deviceManager/deviceList.vue
diff --git a/src/views/deviceManager/maintainPosition.vue b/src/views/deviceManager/maintainPosition.vue
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/views/deviceManager/maintainPosition.vue
diff --git a/src/views/deviceManager/maintainRecord.vue b/src/views/deviceManager/maintainRecord.vue
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/views/deviceManager/maintainRecord.vue
diff --git a/src/views/deviceManager/maintainStandard.vue b/src/views/deviceManager/maintainStandard.vue
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/views/deviceManager/maintainStandard.vue
diff --git a/src/views/deviceManager/repairRecord.vue b/src/views/deviceManager/repairRecord.vue
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/views/deviceManager/repairRecord.vue
diff --git a/src/views/materialManager/inventoryList.vue b/src/views/materialManager/inventoryList.vue
new file mode 100644
index 0000000..19d920b
--- /dev/null
+++ b/src/views/materialManager/inventoryList.vue
@@ -0,0 +1,11 @@
+<template />
+
+<script>
+export default {
+ name: 'InventoryList'
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/materialManager/materialList.vue b/src/views/materialManager/materialList.vue
new file mode 100644
index 0000000..6daa823
--- /dev/null
+++ b/src/views/materialManager/materialList.vue
@@ -0,0 +1,11 @@
+<template />
+
+<script>
+export default {
+ name: 'MaterialList'
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/materialManager/unitList.vue b/src/views/materialManager/unitList.vue
new file mode 100644
index 0000000..e747241
--- /dev/null
+++ b/src/views/materialManager/unitList.vue
@@ -0,0 +1,11 @@
+<template />
+
+<script>
+export default {
+ name: 'UnitList'
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/qualityManager/defectDefine.vue b/src/views/qualityManager/defectDefine.vue
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/views/qualityManager/defectDefine.vue
diff --git a/src/views/qualityManager/processCheck.vue b/src/views/qualityManager/processCheck.vue
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/views/qualityManager/processCheck.vue
diff --git a/src/views/qualityManager/processCheckItem.vue b/src/views/qualityManager/processCheckItem.vue
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/views/qualityManager/processCheckItem.vue
diff --git a/src/views/qualityManager/processCheckRecord.vue b/src/views/qualityManager/processCheckRecord.vue
new file mode 100644
index 0000000..1be8c89
--- /dev/null
+++ b/src/views/qualityManager/processCheckRecord.vue
@@ -0,0 +1,11 @@
+<template />
+
+<script>
+export default {
+ name: 'ProcessCheckRecord'
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/qualityManager/qualityPlaning.vue b/src/views/qualityManager/qualityPlaning.vue
new file mode 100644
index 0000000..a08b4e3
--- /dev/null
+++ b/src/views/qualityManager/qualityPlaning.vue
@@ -0,0 +1,11 @@
+<template />
+
+<script>
+export default {
+ name: 'QualityPlaning'
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/workOrder/produceOrderList.vue b/src/views/workOrder/produceOrderList.vue
new file mode 100644
index 0000000..a734cf0
--- /dev/null
+++ b/src/views/workOrder/produceOrderList.vue
@@ -0,0 +1,11 @@
+<template />
+
+<script>
+export default {
+ name: 'ProduceOrderList'
+}
+</script>
+
+<style scoped>
+
+</style>
--
Gitblit v1.9.3