From 7919a76dcecbd7b7c62a03c7be286d3ba3d06fdf Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Tue, 13 Jun 2023 15:22:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=87=A0=E4=B8=AA=E8=8F=9C?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/.vscode/launch.json | 3 +- web/client/src/sections/facility/nav-item.jsx | 17 +-- web/client/src/sections/install/nav-item.jsx | 17 +-- web/client/src/sections/service/nav-item.jsx | 114 +++++++++--------- 4 files changed, 78 insertions(+), 73 deletions(-) diff --git a/api/.vscode/launch.json b/api/.vscode/launch.json index be8a665..3b6039f 100644 --- a/api/.vscode/launch.json +++ b/api/.vscode/launch.json @@ -16,7 +16,8 @@ "-p 4600", "-f http://localhost:4600", // 研发 - "-g postgres://postgres:123@10.8.30.32:5432/orational_service", + // "-g postgres://postgres:123@10.8.30.32:5432/orational_service", + "-g postgres://postgres:123@10.8.30.166:5432/POMS_2306", // 测试 // "-g postgres://FashionAdmin:123456@10.8.30.156:5432/POMS", "-k 10.8.30.72:29092,10.8.30.73:29092,10.8.30.74:29092", diff --git a/web/client/src/sections/facility/nav-item.jsx b/web/client/src/sections/facility/nav-item.jsx index ec85973..47d2263 100644 --- a/web/client/src/sections/facility/nav-item.jsx +++ b/web/client/src/sections/facility/nav-item.jsx @@ -9,15 +9,16 @@ export function getNavItem (user, dispatch) { text: '设备', icon: , items: [ + // { + // itemKey: 'deviceQuery', + // text: '设备查询', + // icon: , + // to: '/facility/deviceQuery/maintenanceRecords1', + // items: [{ + // itemKey: 'maintenanceRecords1', to: '/facility/deviceQuery/maintenanceRecords1', text: '维护记录' + // }] + // }, { - itemKey: 'deviceQuery', - text: '设备查询', - icon: , - to: '/facility/deviceQuery/maintenanceRecords1', - items: [{ - itemKey: 'maintenanceRecords1', to: '/facility/deviceQuery/maintenanceRecords1', text: '维护记录' - }] - }, { itemKey: 'serverInformation', text: '服务器信息', icon: , diff --git a/web/client/src/sections/install/nav-item.jsx b/web/client/src/sections/install/nav-item.jsx index 7c93f27..261e1c6 100644 --- a/web/client/src/sections/install/nav-item.jsx +++ b/web/client/src/sections/install/nav-item.jsx @@ -33,15 +33,16 @@ export function getNavItem (user, dispatch) { items: [{ itemKey: 'setup', to: '/install/order/setup', text: '工单设置' }] - }, { - itemKey: 'relation', - text: '容差管理', - icon: , - to: '/install/relation/set', - items: [{ - itemKey: 'set', to: '/install/relation/set', text: '容差设置' - }] }, + // { + // itemKey: 'relation', + // text: '容差管理', + // icon: , + // to: '/install/relation/set', + // items: [{ + // itemKey: 'set', to: '/install/relation/set', text: '容差设置' + // }] + // }, ] }, ] diff --git a/web/client/src/sections/service/nav-item.jsx b/web/client/src/sections/service/nav-item.jsx index cd770ad..0ef8afa 100644 --- a/web/client/src/sections/service/nav-item.jsx +++ b/web/client/src/sections/service/nav-item.jsx @@ -2,60 +2,62 @@ import React from 'react'; import { IconCode } from '@douyinfe/semi-icons'; export function getNavItem (user, dispatch) { - return ( - [ - { - itemKey: 'service', - text: '服务', - icon: , - items: [ - { - itemKey: 'reportingServices', - text: '报表服务', - icon: , - to: '/service/reportingServices/reportManagement', - items: [{ - itemKey: 'reportManagement', to: '/service/reportingServices/reportManagement', text: '报表管理' - }] - }, { - itemKey: 'maintenancePlan', - text: '维护计划', - icon: , - to: '/service/maintenancePlan/cyclePlan', - items: [{ - itemKey: 'cyclePlan', to: '/service/maintenancePlan/cyclePlan', text: '周期计划' - }, { - itemKey: 'temporaryResponse', to: '/service/maintenancePlan/temporaryResponse', text: '临时响应' - }] - }, { - itemKey: 'carrierPigeon', - text: '信鸽服务', - icon: , - to: '/service/carrierPigeon/emPush', - items: [{ - itemKey: 'emPush', to: '/service/carrierPigeon/emPush', text: 'EM推送' - },{ - itemKey: 'appPush', to: '/service/carrierPigeon/appPush', text: '应用推送' - }] - },{ - itemKey: 'preventiveMaintenance', - text: '预防性维保', - icon: , - to: '/service/preventiveMaintenance/maintenanceModel', - items: [{ - itemKey: 'maintenanceModel', to: '/service/preventiveMaintenance/maintenanceModel', text: '维保模型' - }] - },{ - itemKey: 'serviceRecord', - text: '服务记录', - icon: , - to: '/service/serviceRecord/serviceRecord1', - items: [{ - itemKey: 'serviceRecord1', to: '/service/serviceRecord/serviceRecord1', text: '服务记录' - }] - } - ] - }, - ] - ); + return ( + [ + { + itemKey: 'service', + text: '服务', + icon: , + items: [ + { + itemKey: 'reportingServices', + text: '报表服务', + icon: , + to: '/service/reportingServices/reportManagement', + items: [{ + itemKey: 'reportManagement', to: '/service/reportingServices/reportManagement', text: '报表管理' + }] + }, { + itemKey: 'maintenancePlan', + text: '维护计划', + icon: , + to: '/service/maintenancePlan/cyclePlan', + items: [{ + itemKey: 'cyclePlan', to: '/service/maintenancePlan/cyclePlan', text: '周期计划' + }, { + itemKey: 'temporaryResponse', to: '/service/maintenancePlan/temporaryResponse', text: '临时响应' + }] + }, { + itemKey: 'carrierPigeon', + text: '信鸽服务', + icon: , + to: '/service/carrierPigeon/emPush', + items: [{ + itemKey: 'emPush', to: '/service/carrierPigeon/emPush', text: 'EM推送' + }, { + itemKey: 'appPush', to: '/service/carrierPigeon/appPush', text: '应用推送' + }] + }, + // { + // itemKey: 'preventiveMaintenance', + // text: '预防性维保', + // icon: , + // to: '/service/preventiveMaintenance/maintenanceModel', + // items: [{ + // itemKey: 'maintenanceModel', to: '/service/preventiveMaintenance/maintenanceModel', text: '维保模型' + // }] + // }, + { + itemKey: 'serviceRecord', + text: '服务记录', + icon: , + to: '/service/serviceRecord/serviceRecord1', + items: [{ + itemKey: 'serviceRecord1', to: '/service/serviceRecord/serviceRecord1', text: '服务记录' + }] + } + ] + }, + ] + ); } \ No newline at end of file