Merge branch 'master-v32-lushangqing' into 'master'

业务导航字数过多换行修改，大屏的业务性能指标折线图右y轴的单位换成个



See merge request !96

@@ -52,8 +52,12 @@
     background-color: #112a72;
     background-color: #112a72;
 }
 }
 .nullDiv{
 .nullDiv{
-    width:20%;
-    padding: 0px 8px;
+    padding:0px 53px;
+    font-size: 16px;
+    box-sizing: border-box;
+    height: 40px;
+    align-items: center;
+    display: flex;
 }
 }
 .navTabs-card .el-carousel__item--card{
 .navTabs-card .el-carousel__item--card{
     width:20%;
     width:20%;

@@ -258,7 +258,7 @@ export default {
                         interval:(100-0)/5
                         interval:(100-0)/5
                     },
                     },
                     {
                     {
-                        name: '单位:万',
+                        name: '单位:个',
                         type: 'value',
                         type: 'value',
                         axisLabel: {
                         axisLabel: {
                             show: true,
                             show: true,

@@ -13,8 +13,9 @@
         <el-carousel-item  v-for="(item,index) in listItem" :key="item" >
         <el-carousel-item  v-for="(item,index) in listItem" :key="item" >
             <div class="tabContaier">
             <div class="tabContaier">
                 <div @click="clickTabs(itemData.busId)" v-if="listArray" v-for="(itemData,index) in dataShow" :class="['tabItem', {'active':checkId==itemData.busId,'borderColorGood':itemData.healthStatus==2,'borderColorMi':itemData.healthStatus==1}]">{{itemData.busTypeName}}</div>
                 <div @click="clickTabs(itemData.busId)" v-if="listArray" v-for="(itemData,index) in dataShow" :class="['tabItem', {'active':checkId==itemData.busId,'borderColorGood':itemData.healthStatus==2,'borderColorMi':itemData.healthStatus==1}]">{{itemData.busTypeName}}</div>
+                <div v-for="i in isDiv"  class="nullDiv" ></div>
             </div>
             </div>
-            <div v-for="i in isDiv"  class="nullDiv" ></div>
+
 
 
 
 
         </el-carousel-item>
         </el-carousel-item>

@@ -260,7 +260,7 @@ export default {
                         interval:(100-0)/10
                         interval:(100-0)/10
                     },
                     },
                     {
                     {
-                        name: '单位:万',
+                        name: '单位:个',
                         type: 'value',
                         type: 'value',
                         axisLabel: {
                         axisLabel: {
                             show: true,
                             show: true,