Browse Source

feat:隐藏应用推送+项目名称后面加空格

dev
zhaobing 2 years ago
parent
commit
6381b96817
  1. 5
      web/client/src/sections/service/containers/maintenanceRecords.jsx
  2. 8
      web/client/src/sections/service/nav-item.jsx

5
web/client/src/sections/service/containers/maintenanceRecords.jsx

@ -61,9 +61,10 @@ const MaintenanceRecords = (props) => {
{ {
title: '项目名称', title: '项目名称',
render: (record) => { render: (record) => {
const currentId = record.equipmentMaintenanceRecordProjects.map((item1) => { const currentId = record.equipmentMaintenanceRecordProjects?.map((item1) => {
return item1.projectId; return item1.projectId;
})[0]; })[0];
//const currnetObj = projectList?.find((item) => item.id === record?.equipmentMaintenanceRecordProjects?.projectId)||{};
const currnetObj = projectList?.find((item) => item.id === currentId)||{}; const currnetObj = projectList?.find((item) => item.id === currentId)||{};
const projectName = currnetObj.name ? currnetObj.name : currnetObj.pepProjectName; const projectName = currnetObj.name ? currnetObj.name : currnetObj.pepProjectName;
return projectName?.length > 15 ? ( return projectName?.length > 15 ? (
@ -167,7 +168,7 @@ const MaintenanceRecords = (props) => {
</div> </div>
<div style={{ marginRight: 200 }}> <div style={{ marginRight: 200 }}>
{' '} {' '}
<span>项目名称</span> <span style={{ marginRight: 10 }}>项目名称</span>
<Select <Select
showClear showClear
onChange={(e)=>{setProjectId(e)}} onChange={(e)=>{setProjectId(e)}}

8
web/client/src/sections/service/nav-item.jsx

@ -34,9 +34,11 @@ export function getNavItem (user, dispatch) {
to: '/service/carrierPigeon/emPush', to: '/service/carrierPigeon/emPush',
items: [{ items: [{
itemKey: 'emPush', to: '/service/carrierPigeon/emPush', text: 'EM推送' itemKey: 'emPush', to: '/service/carrierPigeon/emPush', text: 'EM推送'
}, { },
itemKey: 'appPush', to: '/service/carrierPigeon/appPush', text: '应用推送' // {
}] // itemKey: 'appPush', to: '/service/carrierPigeon/appPush', text: ''
// }
]
}, },
// { // {
// itemKey: 'preventiveMaintenance', // itemKey: 'preventiveMaintenance',

Loading…
Cancel
Save