Merge branch 'master' of http://124.70.43.205:3000/yangxiao/sis_zhfx

# Conflicts:
#	src/views/WindSite/components/boosterstation/ak.vue

src/views/LightMatrix1/LightMatrix1.vue

@@ -1,5 +1,4 @@
 <template >
-	<el-scrollbar>
   <div class="light-matrix">
     <Row class="panel-2" type="">
       <Col :span="12" class="left-50-16">
@@ -130,6 +129,7 @@
         </div>
       </Col>
     </Row>
+    <el-scrollbar>
     <div class="panel-box">
       <div v-for="(pItem, pIndex) in sourceMap.fjmap" :key="pIndex">
         <div class="panel-title" v-if="sourceMap.fjmap[pIndex][0].wpId.includes('FDC')">
@@ -186,12 +186,12 @@
             {{ cItem.wtnum }}
           </div>
           <!-- 站位用 保证卡片布局最后一行不会有问题 -->
-          <i class="blank" v-for="i in pItem.length" :key="i"></i>
+          <i class="blank" v-for="i in (pItem.length > 44? pItem.length: 44 - pItem.length)" :key="i"></i>
         </div>
       </div>
     </div>
-  </div>
   </el-scrollbar>
+  </div>
 </template>
 
 <script>