From 6381b968171cf8bf624e7fda51451e3418fa8930 Mon Sep 17 00:00:00 2001
From: zhaobing <zhao.bing@free-sun.com.cn>
Date: Tue, 27 Jun 2023 14:50:21 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E9=9A=90=E8=97=8F=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81+=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E5=90=8E=E9=9D=A2=E5=8A=A0=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sections/service/containers/maintenanceRecords.jsx    | 5 +++--
 web/client/src/sections/service/nav-item.jsx              | 8 +++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/web/client/src/sections/service/containers/maintenanceRecords.jsx b/web/client/src/sections/service/containers/maintenanceRecords.jsx
index 7cdd4b6..dfaa729 100644
--- a/web/client/src/sections/service/containers/maintenanceRecords.jsx
+++ b/web/client/src/sections/service/containers/maintenanceRecords.jsx
@@ -61,9 +61,10 @@ const MaintenanceRecords = (props) => {
         {
             title: '项目名称',
             render: (record) => {
-                const currentId = record.equipmentMaintenanceRecordProjects.map((item1) => {
+                const currentId = record.equipmentMaintenanceRecordProjects?.map((item1) => {
                     return item1.projectId;
                 })[0];
+                //const  currnetObj = projectList?.find((item) => item.id === record?.equipmentMaintenanceRecordProjects?.projectId)||{};
                 const  currnetObj = projectList?.find((item) => item.id === currentId)||{};
                 const projectName = currnetObj.name ? currnetObj.name : currnetObj.pepProjectName;
                 return projectName?.length > 15 ? (
@@ -167,7 +168,7 @@ const MaintenanceRecords = (props) => {
                 </div>
                 <div style={{ marginRight: 200 }}>
                     {' '}
-                    <span>项目名称</span>
+                    <span style={{ marginRight: 10 }}>项目名称</span>
                     <Select
                     showClear
                     onChange={(e)=>{setProjectId(e)}}
diff --git a/web/client/src/sections/service/nav-item.jsx b/web/client/src/sections/service/nav-item.jsx
index 31f1d1e..c43d9f4 100644
--- a/web/client/src/sections/service/nav-item.jsx
+++ b/web/client/src/sections/service/nav-item.jsx
@@ -34,9 +34,11 @@ export function getNavItem (user, dispatch) {
                   to: '/service/carrierPigeon/emPush',
                   items: [{
                      itemKey: 'emPush', to: '/service/carrierPigeon/emPush', text: 'EM推送'
-                  }, {
-                     itemKey: 'appPush', to: '/service/carrierPigeon/appPush', text: '应用推送'
-                  }]
+                  }, 
+                  // {
+                  //    itemKey: 'appPush', to: '/service/carrierPigeon/appPush', text: '应用推送'
+                  // }
+               ]
                },
                // {
                //    itemKey: 'preventiveMaintenance',