bug修改

src/views/data-statistics/hospital-data-statistics/hospital-data-statistics.vue

@@ -74,7 +74,7 @@
             当前有效状态医院占比
           </div>
           <div class="youxiao_percent">
-            <el-progress type="circle" :percentage="hospitalPercentInfo ? hospitalPercentInfo.effectivePercent:0" width="90" stroke-width="9" />
+            <el-progress type="circle" :percentage="hospitalPercentInfo ? hospitalPercentInfo.effectivePercent:0" width="100" stroke-width="9" />
             <progressColor style="width: 0;height: 0;" />
           </div>
         </div>
@@ -85,7 +85,7 @@
             当前长期授权医院占比
           </div>
           <div class="changqi_percent">
-            <el-progress type="circle" :percentage="hospitalPercentInfo ? hospitalPercentInfo.longtimePercent:0" width="90" stroke-width="9" />
+            <el-progress type="circle" :percentage="hospitalPercentInfo ? hospitalPercentInfo.longtimePercent:0" width="100" stroke-width="9" />
             <progressColor style="width: 0;height: 0;" />
           </div>
         </div>
@@ -96,7 +96,7 @@
             当前预储值医院占比
           </div>
           <div class="yuchuzhi_percent">
-            <el-progress type="circle" :percentage="hospitalPercentInfo ? hospitalPercentInfo.prestoredPercent:0" width="90" stroke-width="9" />
+            <el-progress type="circle" :percentage="hospitalPercentInfo ? hospitalPercentInfo.prestoredPercent:0" width="100" stroke-width="9" />
             <progressColor style="width: 0;height: 0;" />
           </div>
         </div>
@@ -111,7 +111,7 @@
       </el-col>
       <el-col :span="8">
         <div class="cardDiv">
-          <div class="cardTitle" style="margin-bottom: 29px">
+          <div class="cardTitle">
             医院累计预储值排行
           </div>
           <div class="rankInnerDiv">
@@ -146,7 +146,7 @@
       </el-col>
       <el-col :span="4">
         <div class="cardDiv">
-          <div class="cardTitle" style="margin-bottom: 29px">
+          <div class="cardTitle">
             医院入驻时间排行
           </div>
           <div class="rankInnerDiv">
@@ -247,7 +247,7 @@
     </el-row>
     <el-row class="row2">
       <el-col :span="24">
-        <div class="cardDiv">
+        <div class="cardDiv tableDiv">
           <div class="cardTitle">
             医院授权到期信息
           </div>
@@ -257,7 +257,7 @@
             :data="hospitalList"
             @sort-change="handleSortChange"
           >
-            <el-table-column align="left" label="序号" min-width="60" show-overflow-tooltip prop="index">
+            <el-table-column align="left" label="序号" min-width="40" show-overflow-tooltip prop="index">
               <template slot-scope="scope">
                 <span>{{ scope.$index + 1 }}</span>
               </template>
@@ -304,7 +304,7 @@
                 <span :style="showStatus(scope.row.authorizationExpirationDate) === '• 过期' ? 'color: #F8CA96' : 'color: #67C23A'">{{ showStatus(scope.row.authorizationExpirationDate) || '-' }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
               <template slot-scope="scope">
                 <el-button
                   size="mini"
@@ -565,7 +565,7 @@ export default {
   text-align: center;
   //padding-bottom: 10px;
   .cardTitle {
-    margin-bottom: 10px;
+    margin-bottom: 20px;
   }
 }
 .cardDiv {
@@ -847,6 +847,7 @@ export default {
   margin-bottom: 24px;
 }
 .rankInnerDiv {
+  margin-top: 44px;
   //height: 389px;
 }
 .emptyDiv {
@@ -893,4 +894,7 @@ export default {
     }
   }
 }
+.tableDiv {
+  padding-bottom: 50px;
+}
 </style>

src/views/data-statistics/other-components/emptyTool.vue

@@ -8,7 +8,7 @@
         <div>
           <img src="../../../assets/data_statistics/guahao_img_wushuju.png">
         </div>
-        <div>暂无数据</div>
+        <div class="emptyText">暂无数据</div>
       </div>
     </div>
   </div>
@@ -48,4 +48,7 @@ export default {
   color: #AFAFAF;
   display:flex;
 }
+.emptyText {
+  margin-top: 10px;
+}
 </style>

src/views/data-statistics/other-components/percentTool.vue

@@ -4,7 +4,7 @@
       <div class="noRotateProgress">
         <el-progress
           type="circle"
-          width="110"
+          width="100"
           :percentage="percentReal"
           :stroke-width="strokeWidth"
           :format="formatPercent"
@@ -17,7 +17,7 @@
         <el-progress
           style="transform: rotateY(180deg);"
           type="circle"
-          width="110"
+          width="100"
           :percentage="percentReal"
           :stroke-width="strokeWidth"
           :format="formatPercent"

src/views/data-statistics/other-components/progress-color.vue

@@ -56,16 +56,6 @@
 
 <script>
 export default {
-  // props: {
-  //   startColor: {
-  //     type: String,
-  //     default: 'rgb(2, 0, 255)'
-  //   },
-  //   endColor: {
-  //     type: String,
-  //     default: 'rgb(0, 200, 255)'
-  //   }
-  // },
   name: 'ProgressColor'
 }
 </script>

src/views/data-statistics/pet-data-statistics/pet-data-statistics.vue

@@ -75,7 +75,7 @@
               活跃客户占比
             </div>
             <div class="activeUser_percent">
-              <el-progress type="circle" :percentage="customerStatistics.activeCustomers" width="90" stroke-width="9" />
+              <el-progress type="circle" :percentage="customerStatistics.activeCustomers" width="100" stroke-width="9" />
               <progressColor style="width: 0;height: 0;" />
             </div>
           </div>
@@ -86,7 +86,7 @@
               会员客户占比
             </div>
             <div class="vip_percent">
-              <el-progress type="circle" :percentage="customerStatistics.memberCustomers" width="90" stroke-width="9" />
+              <el-progress type="circle" :percentage="customerStatistics.memberCustomers" width="100" stroke-width="9" />
               <progressColor style="width: 0;height: 0;" />
             </div>
           </div>
@@ -97,7 +97,7 @@
               复购客户占比
             </div>
             <div class="repurchase_percent">
-              <el-progress type="circle" :percentage="customerStatistics.repurchaseCustomers" width="90" stroke-width="9" />
+              <el-progress type="circle" :percentage="customerStatistics.repurchaseCustomers" width="100" stroke-width="9" />
               <progressColor style="width: 0;height: 0;" />
             </div>
           </div>
@@ -118,7 +118,7 @@
         </el-col>
         <el-col :span="8">
           <div class="cardDiv">
-            <div v-if="petOwnerConsumeRank.length > 0" class="cardTitle" style="margin-bottom: 29px">
+            <div v-if="petOwnerConsumeRank.length > 0" class="cardTitle">
               宠主累计消费排行
             </div>
             <div v-if="petOwnerConsumeRank.length > 0" class="rankInnerDiv">
@@ -146,7 +146,7 @@
         </el-col>
         <el-col :span="4">
           <div class="cardDiv">
-            <div v-if="petOwnerTimeRank.length > 0" class="cardTitle" style="margin-bottom: 29px">
+            <div v-if="petOwnerTimeRank.length > 0" class="cardTitle">
               宠主注册天数排行
             </div>
             <div v-if="petOwnerTimeRank.length > 0" class="rankInnerDiv">
@@ -231,7 +231,7 @@
       </el-row>
       <el-row class="row2">
         <el-col :span="24">
-          <div class="cardDiv">
+          <div class="cardDiv tableDiv">
             <div class="cardTitle">
               宠主注册信息
             </div>
@@ -385,7 +385,7 @@
               会员客户占比
             </div>
             <div class="activeUser_percent">
-              <el-progress type="circle" :percentage="parseInt(customerStatistics.memberCustomers || 0)" width="90" stroke-width="9" />
+              <el-progress type="circle" :percentage="parseInt(customerStatistics.memberCustomers || 0)" width="100" stroke-width="9" />
               <progressColor style="width: 0;height: 0;" />
             </div>
           </div>
@@ -396,7 +396,7 @@
               复购客户占比
             </div>
             <div class="vip_percent">
-              <el-progress type="circle" :percentage="parseInt(customerStatistics.repurchaseCustomers || 0)" width="90" stroke-width="9" />
+              <el-progress type="circle" :percentage="parseInt(customerStatistics.repurchaseCustomers || 0)" width="100" stroke-width="9" />
               <progressColor style="width: 0;height: 0;" />
             </div>
           </div>
@@ -407,7 +407,7 @@
               续费会员占比
             </div>
             <div class="repurchase_percent">
-              <el-progress type="circle" :percentage="parseInt(customerStatistics.renewalCustomers || 0)" width="90" stroke-width="9" />
+              <el-progress type="circle" :percentage="parseInt(customerStatistics.renewalCustomers || 0)" width="100" stroke-width="9" />
               <progressColor style="width: 0;height: 0;" />
             </div>
           </div>
@@ -529,13 +529,13 @@
       </el-row>
       <el-row class="row2">
         <el-col :span="24">
-          <div class="cardDiv">
+          <div class="cardDiv tableDiv">
             <div class="cardTitle">
               会员卡余额信息
             </div>
             <el-divider class="dividerLine" />
             <el-table ref="balanceList" :data="balanceList" style="width: 100%" @sort-change="balanceSortChange">
-              <el-table-column align="left" label="序号" min-width="60" show-overflow-tooltip prop="index">
+              <el-table-column align="left" label="序号" min-width="30px" show-overflow-tooltip prop="index">
                 <template slot-scope="scope">
                   <span>{{ scope.$index + 1 }}</span>
                 </template>
@@ -887,7 +887,7 @@ export default {
   height: 181px;
   text-align: center;
   .cardTitle {
-    margin-bottom: 10px;
+    margin-bottom: 20px;
   }
 }
 .cardTitle {
@@ -1198,7 +1198,7 @@ export default {
   margin-bottom: 24px;
 }
 .rankInnerDiv {
-   //height: 389px;
+  margin-top: 44px;
  }
 
 .crosswiseNull {
@@ -1255,4 +1255,7 @@ export default {
     }
   }
 }
+.tableDiv {
+  padding-bottom: 50px;
+}
 </style>

src/views/data-statistics/service-statistics/service-statistics.vue

@@ -119,7 +119,7 @@
       <el-row :gutter="24" class="row2 autoRow3_3">
         <el-col :span="6">
           <div class="cardDiv">
-            <div v-if="orderRank.length > 0" class="cardTitle" style="margin-bottom: 29px">
+            <div v-if="orderRank.length > 0" class="cardTitle">
               平台服务项目预约次数排行
             </div>
             <div v-if="orderRank.length > 0" class="rankInnerDiv">
@@ -149,7 +149,7 @@
         </el-col>
         <el-col :span="6">
           <div class="cardDiv">
-            <div v-if="deviceRank.length > 0" class="cardTitle" style="margin-bottom: 29px">
+            <div v-if="deviceRank.length > 0" class="cardTitle">
               平台服务设备服务次数排行
             </div>
             <div v-if="deviceRank.length > 0" class="rankInnerDiv">
@@ -214,7 +214,7 @@
       </el-row>
       <el-row class="row2">
         <el-col :span="24">
-          <div class="cardDiv">
+          <div class="cardDiv tableDiv">
             <div class="cardTitle">
               服务项目预约记录
             </div>
@@ -691,7 +691,7 @@
       </el-row>
       <el-row :gutter="24" class="row2">
         <el-col :span="24">
-          <div class="cardDiv">
+          <div class="cardDiv tableDiv">
             <div class="cardTitle">
               病历记录
             </div>
@@ -1451,7 +1451,7 @@ export default {
   color: #6db45d !important;
 }
 .rankInnerDiv {
-  //height: 389px;
+  margin-top: 44px;
 }
 .tableClass {
   //::v-deep .el-table__cell {
@@ -1498,4 +1498,7 @@ export default {
     }
   }
 }
+.tableDiv {
+  padding-bottom: 50px;
+}
 </style>