Merge branch 'dev-lhk' into shenzhen-dev

src/views/projectFront/BIMBASECenter/singleProgressManagement.vue

@@ -284,7 +284,7 @@
               >
               </quill-editor>
             </el-form-item>
-            <el-form-item label="施工要点" prop="constructionKeyPoint">
+            <el-form-item label="质量控制要点" prop="constructionKeyPoint">
               <quill-editor
                 v-model="riskTipInfo.constructionKeyPoint"
                 ref="myQuillEditor"

src/views/projectFront/BIMCenter/overviewTwo.vue

@@ -239,15 +239,17 @@ export default {
     @include flex;
     margin-top: 10px;
     .selected-box {
-      flex: 1%;
+      flex: 1;
       min-width: 208px;
       min-height: 32px;
+      max-height: 100px;
       border: 1px solid #c0c4cc;
       border-radius: 4px;
       @include flex;
       flex-wrap: wrap;
       padding-left: 6px;
       margin-right: 15px;
+      overflow-y: scroll;
       > div {
         @include flex;
         background-color: #f4f4f5;