Переглянути джерело

Merge branch 'master' into VERSIONS-FenJiFenLei

dedsudiyu 6 місяців тому
батько
коміт
30f123d97c

+ 2 - 1
README.md

@@ -139,6 +139,7 @@
 >##### 修改时务必注意版本分支关系,从底层开始迭代
 
     ├─master基础分支(于2024/7/30号封版,用于西农项目验收)
-    ├─versions-aqjc_fjfl(新版 安全检查-分级分类)
+    │  └─SCHOOL-XiBeiNongLin(基于master分支-用于西农现场部署)
+    ├─VERSIONS-FenJiFenLei(新版分类分级-包含电子信息牌图片导出)
     ├─leb-web-dev(当前正在开发的分支)
     ├─leb-web-test(测试分支)

+ 24 - 5
src/views/emergencyManagement/performEvacuation/performEvacuationHome.vue

@@ -1451,14 +1451,33 @@
             }
           }
           .content-select-box{
-            width:158px;
-            position: relative;
+            width:128px;
+            height: 534px;
+            margin-right:30px;
+            display: flex;
+            overflow: hidden;
+            .for-select-box::-webkit-scrollbar{
+              width: 6px!important;     /*高宽分别对应横竖滚动条的尺寸*/
+              height: 6px!important;
+            }
+            .for-select-box::-webkit-scrollbar-thumb{
+              border-radius: 5px!important;
+              -webkit-box-shadow: inset 0 0 5px #116e8e!important;
+              background: #116e8e!important;
+            }
+            .for-select-box::-webkit-scrollbar-track{
+              -webkit-box-shadow: inset 0 0 5px rgba(255,255,255,0)!important;
+              border-radius: 0!important;
+              background: rgba(255,255,255,0)!important;
+            }
             .for-select-box{
-              position: absolute;
-              bottom:31px;
-              left:59px;
+              flex:1;
+              margin: 0 0 51px 29px;
+              padding-right:30px;
               display: flex;
               flex-direction: column-reverse;
+              align-items: flex-end;
+              overflow-y: scroll;
               .for-select-p:nth-child(1){
                 border-bottom:1px solid #19667e;
                 border-bottom-left-radius:4px;