diff --git a/src/router/index.js b/src/router/index.js index 5735de51..a11c81fb 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -41,6 +41,19 @@ export const constantRoutes = [ } ] }, + { + path: '', + component: Layout, + redirect: 'index', + children: [ + { + path: 'index', + component: () => import('@/views/index'), + name: 'Index', + meta: { title: '首页', icon: 'dashboard', affix: true } + } + ] + }, { path: '/login', component: () => import('@/views/login1'), @@ -61,138 +74,6 @@ export const constantRoutes = [ component: () => import('@/views/error/401'), hidden: true }, - { - path: '', - component: Layout, - redirect: 'index', - children: [ - { - path: 'index', - component: () => import('@/views/index'), - name: 'Index', - meta: { title: '首页', icon: 'dashboard', affix: true } - }, - - { - path: 'equipment-ledger', - component: () => import('@/views/EquipmentLedger/index.vue'), - name: 'EquipmentLedger', - meta: { title: '设备台账', icon: 'dashboard', affix: true } - }, - { - path: 'equipment-roam-record', - component: () => import('@/views/EquipmentRoamRecord/index.vue'), - name: 'EquipmentRoamRecord', - meta: { title: '装备流转记录', icon: 'dashboard', affix: true } - }, - { - path: 'equipment-servicing', - component: () => import('@/views/EquipmentServicing/index.vue'), - name: 'EquipmentServicing', - meta: { title: '装备维保记录', icon: 'dashboard', affix: true } - }, - { - path: 'equipment-retire', - component: () => import('@/views/EquipmentRetire/index.vue'), - name: 'EquipmentRetire', - meta: { title: '装备退役', icon: 'dashboard', affix: true } - }, - { - path: 'equipment-entry-apply', - component: () => import('@/views/EquipmentEntryApply/index.vue'), - name: 'EquipmentEntryApply', - meta: { title: '装备录入申请', icon: 'dashboard', affix: true } - }, - { - path: 'equipment-entry-approval', - component: () => import('@/views/EquipmentEntryApproval/index.vue'), - name: 'EquipmentEntryApproval', - meta: { title: '装备录入审批', icon: 'dashboard', affix: true } - }, - { - path: 'equipment-shared-hall', - component: () => import('@/views/EquipmentSharedHall/index.vue'), - name: 'EquipmentSharedHall', - meta: { title: '装备工共享大厅', icon: 'dashboard', affix: true } - }, - { - path: 'equipment-shared-order', - component: () => import('@/views/EquipmentSharedOrder/order/index.vue'), - name: 'search', - meta: { title: '租赁订单管理', icon: 'dashboard', affix: true } - }, - { - path: 'contract-manage', - component: () => import('@/views/contract-manage/index.vue'), - name: 'search', - meta: { title: '合同管理', icon: 'dashboard', affix: true } - }, - { - path: 'rent-facility', - component: () => import('@/views/rent-facility/index.vue'), - name: 'search', - meta: { title: '机械化施工装备配置率', icon: 'dashboard', affix: true } - }, - - { - path: 'sourcingNeed', - component: () => import('@/views/sourcingNeed/index.vue'), - name: 'search', - meta: { title: '需求管理', icon: 'dashboard', affix: true } - }, - - { - path: 'address-manage', - component: () => import('@/views/address-manage/index.vue'), - name: 'search', - meta: { title: '收货地址管理', icon: 'dashboard', affix: true } - }, - - { - path: 'equipment-shared-lessor', - component: () => import('@/views/EquipmentSharedLease/order/index.vue'), - name: 'search', - meta: { title: '出租订单管理', icon: 'dashboard', affix: true } - }, - { - path: 'equipment-type-config', - component: () => import('@/views/EquipmentTypeConfig/index.vue'), - name: 'EquipmentTypeConfig', - meta: { title: '装备类型配置', icon: 'dashboard', affix: true } - }, - { - path: 'interface-config', - component: () => import('@/views/InterfaceConfig/index.vue'), - name: 'InterfaceConfig', - meta: { title: '接口配置', icon: 'dashboard', affix: true } - }, - - { - path: 'equipment-ledger-out', - component: () => import('@/views/EquipmentLedger/components/euq-out.vue'), - name: 'EquipmentLedgerOut', - meta: { title: '设备台账出库', icon: 'dashboard', affix: true } - }, - { - path: 'equipment-ledger-store', - component: () => import('@/views/EquipmentLedger/components/equ-store.vue'), - name: 'EquipmentLedgerStore', - meta: { title: '设备台账入库', icon: 'dashboard', affix: true } - }, - { - path: 'equipment-ledger-repair', - component: () => import('@/views/EquipmentLedger/components/equ-repair.vue'), - name: 'EquipmentLedgerRepair', - meta: { title: '设备台账维修', icon: 'dashboard', affix: true } - }, - { - path: 'equipment-ledger-retire', - component: () => import('@/views/EquipmentLedger/components/equ-retire.vue'), - name: 'EquipmentLedgerRetire', - meta: { title: '设备台账退役', icon: 'dashboard', affix: true } - } - ] - }, { path: '/qrCode/qrCodePage', component: () => import('@/views/qrCode/qrCode'), @@ -299,6 +180,63 @@ export const dynamicRoutes = [ } ] }, + { + path: '/equipment-ledger-out', + component: Layout, + hidden: true, + permissions: ['system:dict:list'], + children: [ + { + path: 'index', + component: () => import('@/views/EquipmentLedger/components/euq-out.vue'), + name: 'EquipmentLedgerOut', + meta: { title: '设备台账出库',activeMenu: '/equipment/equipment-input' } + } + ] + }, + { + path: '/equipment-ledger-store', + component: Layout, + hidden: true, + permissions: ['system:dict:list'], + children: [ + { + path: 'index', + component: () => import('@/views/EquipmentLedger/components/equ-store.vue'), + name: 'EquipmentLedgerStore', + meta: { title: '设备台账入库', icon: 'dashboard', affix: true } + } + ] + }, + { + path: '/equipment-ledger-repair', + component: Layout, + hidden: true, + permissions: ['system:dict:list'], + children: [ + { + path: 'index', + component: () => import('@/views/EquipmentLedger/components/equ-repair.vue'), + name: 'EquipmentLedgerRepair', + meta: { title: '设备台账维修', icon: 'dashboard', affix: true } + } + ] + }, + { + path: '/equipment-ledger-retire', + component: Layout, + hidden: true, + permissions: ['system:dict:list'], + children: [ + { + path: 'index', + component: () => import('@/views/EquipmentLedger/components/equ-retire.vue'), + name: 'EquipmentLedgerRetire', + meta: { title: '设备台账退役', icon: 'dashboard', affix: true } + } + ] + }, + { path: '/face/face-data', component: Layout, diff --git a/src/utils/drawMixin.js b/src/utils/drawMixin.js index 18c6bf38..4804553b 100644 --- a/src/utils/drawMixin.js +++ b/src/utils/drawMixin.js @@ -36,9 +36,9 @@ export default { // 调试模式 - start if (DEBUG_MODE) { // 调试模式,不缩放,居中显示 - appRef.style.transform = `translate(-25%, -45%) scale(0.9, 0.9)` - appRef.style.overflow = 'visible' - return + // appRef.style.transform = `translate(-25%, -45%) scale(0.9, 0.9)` + // appRef.style.overflow = 'visible' + return } // 调试模式 - end diff --git a/src/views/EquipmentEntryApply/index.vue b/src/views/EquipmentEntryApply/index.vue index 4cbe16b5..81afa9c3 100644 --- a/src/views/EquipmentEntryApply/index.vue +++ b/src/views/EquipmentEntryApply/index.vue @@ -70,11 +70,11 @@ -