Merge branch 'master' of http://10.0.41.100:3000/lishenfeng/tsg-web

src/views/sq/qzq/qzqda/index.js

@@ -94,7 +94,11 @@ const onExport = () => {
                     {tableProps.dataSource?.map((item, index) => (
                       <Timeline.Item key={index}>
                         <div className='time-line-item'>
-                        <span style={{width:100}}>{item.eventsDate}</span>
+                        <div style={{width:100}}>
+                          <span>{item.eventsDate}</span>
+                          <div className='dsj'>大事记</div>
+                          </div>
+                        
                           <div className='item-right'>
                             <span>{item.eventsDesc}</span>
                             <div style={{ display: "flex"}}>

src/views/sq/qzq/qzqda/index.less

@@ -1,13 +1,14 @@
-.basic-info{
+.basic-info {
     position: relative;
     font-size: 16px;
     margin-bottom: 20px;
-    padding:5px 25px;
+    padding: 5px 25px;
     border-bottom: 1px solid #eee;
-    &::before{
+
+    &::before {
         position: absolute;
-        top:8px;
+        top: 8px;
-        left:0;
+        left: 0;
         content: "";
         display: block;
         width: 5px;
@@ -15,16 +16,35 @@
         background-color: #0079fe;
     }
 }
-.time-line{
+
+.time-line {
     width: 50%;
     margin-left: 6%;
     margin-top: 1%;
-    .time-line-item{
+
+    .time-line-item {
         display: flex;
         // align-items: center;
         column-gap: 20px;
-        .item-right{
+
-            flex:1;
+        .dsj {
+            border-width: 0px;
+            width: 82px;
+            height: 30px;
+            background: inherit;
+            background-color: rgba(128, 255, 255, 1);
+            border: none;
+            border-radius: 4px;
+            -moz-box-shadow: none;
+            -webkit-box-shadow: none;
+            box-shadow: none;
+            line-height: 30px;
+            text-align: center;
+            margin-top: 10px;
+        }
+
+        .item-right {
+            flex: 1;
             display: flex;
             flex-direction: column;
             justify-content: space-between;