Merge branch 'dev' of gitlab.suntrayoa.com:geqilin/zhxf_vue into dev

src/pages/components/cardWarp.vue

@@ -6,7 +6,8 @@
     div.card-title(:style="{'font-size':size+'px','font-weight':weight}")
         div {{ title }}
         slot(name="left")
-        slot(name="right" style='font-size:12px;position:absolute;right:0;')
+        .slot-right(style='font-size:12px;position:absolute;right:0;')
+            slot(name="right" )
   .card-content
     slot(name="content")
 </template>

src/pages/ol/kanban/index.vue

@@ -16,7 +16,7 @@ el-container(style="padding: 0px; height: 77.6vh")
                         el-row(type='flex' justify='center'   :gutter='10'  )
                             el-col(:span='3' v-for="item in dataList[0].list")
                                 card-warp(:title="item.resourceName",size='12' height="30px" weight='550')
-                                    span( slot="right" style='transform:scale(.9)') B3栋-负一层加压送风机房
+                                    div( slot="right" style='transform:scale(.9)') B3栋-负一层加压送风机房
                                     div(slot="content")
                                         el-row(type='flex'  justify='center'  )
                                             el-col(:span='24' v-for="children in item.children")
@@ -202,6 +202,7 @@ el-container(style="padding: 0px; height: 77.6vh")
                         el-row(type='flex' justify='center' )
                             el-col(:span='24' v-for="item in dataList[0].list")
                                 card-warp(:title="item.resourceName", height="30px" size='13' :gutter='10' weight='550')
+                                    div( slot="right" style='transform:scale(.9)') B3栋-负一层加压送风机房
                                     div(slot="content")
                                         el-row(type='flex'    :gutter='10')
                                             el-col(:span='24' v-for="children in item.children")