Commit 2b17eae61565b907ad68bde6cd9df76aeede6040
Merge branch 'release/customer/2025/AJT' of http://git.xlyprint.cn/qiangmj/ebc-M…
…es into release/customer/2025/AJT
Showing
2 changed files
with
16 additions
and
3 deletions
src/mes/scheduledTasks/machineTasks/index.js
| ... | ... | @@ -759,7 +759,14 @@ |
| 759 | 759 | {carouselData.map(item => ( |
| 760 | 760 | <div key={item.id} className={`tasksCarousel`}> |
| 761 | 761 | <h2>{item.title}</h2> |
| 762 | - <p>{item.content}</p> | |
| 762 | + <p onDoubleClick={() => { | |
| 763 | + if (item.id === 999) return; | |
| 764 | + Modal.info({ | |
| 765 | + width: "40vw", | |
| 766 | + title: item.title, | |
| 767 | + content: item.content | |
| 768 | + }); | |
| 769 | + }}>{item.content}</p> | |
| 763 | 770 | </div> |
| 764 | 771 | ))} |
| 765 | 772 | </Carousel> | ... | ... |
src/mes/scheduledTasks/machineTasks/index.less
| ... | ... | @@ -172,7 +172,9 @@ |
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | .tasksCarousel { |
| 175 | - height: calc(100% - 8px); | |
| 175 | + height: 100%; | |
| 176 | + display: flex !important; | |
| 177 | + flex-direction: column; | |
| 176 | 178 | |
| 177 | 179 | h2 { |
| 178 | 180 | padding-left: 30px; |
| ... | ... | @@ -184,9 +186,13 @@ |
| 184 | 186 | } |
| 185 | 187 | |
| 186 | 188 | p { |
| 187 | - margin-top: @margin-top; | |
| 189 | + flex: 1; | |
| 190 | + overflow: auto; | |
| 191 | + margin: @margin-top 0 0 0; | |
| 188 | 192 | line-height: 28px; |
| 189 | 193 | font-size: 18px; |
| 194 | + cursor: default; | |
| 195 | + user-select: none; | |
| 190 | 196 | } |
| 191 | 197 | } |
| 192 | 198 | } | ... | ... |