Merge branch 'master' of http://git.2weisou.com/wangxiao/zkPCproject into master

src/views/Equipment/equipmentDetailList.vue

@@ -40,7 +40,7 @@
           padding-top: 18px;
         "
       >
-        <span style="line-height: 40px" class="demonstration">使用趋势：</span>
+        <span style="line-height: 40px" class="demonstration">使用时间：</span>
         <div class="toptimeqhuan">
           <div :class="{ tophove: timeType == 4 }" @click="tabtimetap(4)">
             近7天

src/views/Statistics/dataScreeOrg.vue

@@ -85,7 +85,8 @@
           <div class="text1">设备总数</div>
           <div class="text2">{{ firstTab.equipmentQuantity || 0 }}</div>
         </div>
-        <div class="grid-content">
+
+        <!-- <div class="grid-content">
           <div class="text1">已售设备数</div>
           <div class="text2">{{ firstTab.equipmentQuantityWithSold || 0 }}</div>
         </div>
@@ -108,7 +109,8 @@
         <div class="grid-content">
           <div class="text1">正常设备数</div>
           <div class="text2">{{ firstTab.normalequipmentQuantity || 0 }}</div>
-        </div>
+        </div> -->
+
         <div class="grid-content">
           <div class="text1">用户数</div>
           <div class="text2">{{ firstTab.userQuantity || 0 }}</div>

src/views/Statistics/dataScreeSys.vue

@@ -119,7 +119,8 @@
             {{ firstTab.equipmentQuantityWithNotSold || 0 }}
           </div>
         </div>
-        <div class="grid-content">
+
+        <!-- <div class="grid-content">
           <div class="text1">待验收设备数</div>
           <div class="text2">
             {{ firstTab.equipmentQuantityWithNotAccept || 0 }}
@@ -132,7 +133,9 @@
         <div class="grid-content">
           <div class="text1">正常设备数</div>
           <div class="text2">{{ firstTab.normalequipmentQuantity || 0 }}</div>
-        </div>
+        </div> -->
+
+
         <div class="grid-content">
           <div class="text1">用户数</div>
           <div class="text2">{{ firstTab.userQuantity || 0 }}</div>

src/views/building/area.vue

@@ -3,7 +3,7 @@
     <div class="center-er">
       <div class="app-titel">
         <div class="app-titel-name">
-          <div style=" line-height: 32px">公司名称:</div>
+          <div style=" line-height: 32px"></div>
           <div style="margin-left: 20px" v-if="orgType == 0">
             <el-select
               v-model="orgCode"