Merge branch 'VERSIONS-video/iot-quanXian' into SCHOOL-XiBeiNongLin

src/views/integratedManagement/laboratoryManagement/subject/index.vue

@@ -233,7 +233,7 @@
           <!--左侧图片部分-->
           <div class="subject-dialog-bottom-left-max-big-box">
             <div v-for="(item,index) in dialogData.imgList" class="for-max-box">
-              <p :style="'background-color:'+item.showColour+';'">{{item.classifyName}}</p>
+              <p class="for-title-p" :style="'background-color:'+item.showColour+';'">{{item.classifyName}}</p>
               <div>
                 <img v-for="(minItem) in item.classifyList" :src="minItem">
               </div>
@@ -242,7 +242,7 @@
           <!--右侧文字部分-->
           <div class="subject-dialog-bottom-right-max-big-box">
             <div v-for="(item,index) in dialogData.textList" class="for-max-box">
-              <p :style="'background-color:'+item.showColour+';'">{{item.classifyName}}</p>
+              <p class="for-title-p" :style="'background-color:'+item.showColour+';'">{{item.classifyName}}</p>
               <div>
                 <p v-for="(minItem) in item.classifyList">{{minItem}}</p>
               </div>
@@ -1457,7 +1457,7 @@
           .for-max-box{
             display: flex;
             flex-direction: column;
-            p{
+            .for-title-p{
               padding-left:17px;
               color:#fff;
               font-size:22px;
@@ -1470,7 +1470,7 @@
               padding:10px 12px;
               p{
                 font-size:18px;
-                height:30px;
+                min-height:30px;
                 line-height:30px;
                 color:#333;
               }