公告支持滚动、双击弹窗；

zhangzzzz
1 parent 843dc198
Showing 2 changed files with 16 additions and 3 deletions
src/mes/scheduledTasks/machineTasks/index.js
src/mes/scheduledTasks/machineTasks/index.less
@@ -759,7 +759,14 @@
                   {carouselData.map(item => (
                     <div key={item.id} className={`tasksCarousel`}>
                       <h2>{item.title}</h2>
-                      <p>{item.content}</p>
+                      <p onDoubleClick={() => {
+                        if (item.id === 999) return;
+                        Modal.info({
+                          width: "40vw",
+                          title: item.title,
+                          content: item.content
+                        });
+                      }}>{item.content}</p>
                     </div>
                   ))}
                 </Carousel>
@@ -172,7 +172,9 @@
       }
       .tasksCarousel {
-        height: calc(100% - 8px);
+        height: 100%;
+        display: flex !important;
+        flex-direction: column;
         h2 {
           padding-left: 30px;
@@ -184,9 +186,13 @@
         }
         p {
-          margin-top: @margin-top;
+          flex: 1;
+          overflow: auto;
+          margin: @margin-top 0 0 0;
           line-height: 28px;
           font-size: 18px;
+          cursor: default;
+          user-select: none;
         }
       }
     }