Merge remote-tracking branch 'origin/master'

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

@@ -45,7 +45,7 @@
                 <div class="bottomText">
                   <img src="../../../assets/data_statistics/ruzhuyiyuan_icon_shouquanyiyuan@2x.png" height="24" width="24">
                   <div class="bottom_font">
-                    当前长期授权医院数
+                    当前长期授权医院数量
                   </div>
                 </div>
               </div>
@@ -262,7 +262,7 @@
                 <span>{{ scope.$index + 1 }}</span>
               </template>
             </el-table-column>
-            <el-table-column sortable label="医院名称" align="left" prop="hospitalName" min-width="120" show-overflow-tooltip />
+            <el-table-column sortable label="医院名称" align="left" prop="hospitalName" min-width="100" show-overflow-tooltip />
             <el-table-column sortable label="医院ID" align="left" prop="ownId" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 <span>{{ scope.row.ownId || '-' }}</span>
@@ -277,7 +277,7 @@
               </template>
             </el-table-column>
             <el-table-column sortable label="联系人" align="left" min-width="60" prop="contactPerson" show-overflow-tooltip />
-            <el-table-column sortable label="联系人手机号" align="left" min-width="80" prop="phonenumber" />
+            <el-table-column sortable label="联系人手机号" align="left" min-width="100" prop="phonenumber" />
             <el-table-column sortable label="医院地址" align="left" min-width="120" prop="hospitalAllAddress" show-overflow-tooltip>
               <template slot-scope="scope">
                 <span>{{ scope.row.hospitalAllAddress }}</span>
@@ -288,7 +288,7 @@
                 <span>{{ parseTime(scope.row.createTime, '{y}/{m}/{d}') }}</span>
               </template>
             </el-table-column>
-            <el-table-column sortable label="授权到期日期" align="left" min-width="120" prop="authorizationExpirationDate">
+            <el-table-column sortable label="授权到期日期" align="left" min-width="90" prop="authorizationExpirationDate">
               <template slot-scope="scope">
                 <span v-if="getHospitalExpireDays(showDueDate(scope.row.authorizationExpirationDate)) >= 30">{{ showDueDate(scope.row.authorizationExpirationDate) || '-' }}</span>
                 <span v-else style="color: #FF9D4E">{{ showDueDate(scope.row.authorizationExpirationDate) || '-' }}</span>
@@ -341,7 +341,6 @@ import ColumnarChart from '@/views/data-statistics/echars-components/columnarCha
 import RadarChartForHospital from '@/views/data-statistics/echars-components/radar-chart-for-hospital.vue'
 import { getHospitalStatistics, listHospital } from '@/api/business/statistics'
 import { parseTime } from '@/utils/ruoyi'
-import { testMsg } from '@/api/business/test'
 import EmptyTool from '@/views/data-statistics/other-components/emptyTool.vue'
 import { moneyFormat } from '@/utils'
 
@@ -408,12 +407,13 @@ export default {
   },
   methods: {
     moneyFormat,
-    justTest() {
-      testMsg().then(res => {
-        if (res) {
-          console.log('测试结果', res)
-        }
-      })
+    getMonthEmptyArray() {
+      const month = new Date().getMonth()
+      const monthArray = []
+      for (let i = 1; i <= month; i++) {
+        monthArray.push(0)
+      }
+      return monthArray
     },
     parseTime,
     getStatistics() {
@@ -422,8 +422,8 @@ export default {
         console.log('dataRes', res)
         this.hospitalInfoStatistics = res.data.hospitalInfoStatistics
         this.hospitalPercentInfo = res.data.hospitalPercentInfo
-        this.yData1.data = res.data.prestoredUndulateDTO.newPrestored
-        this.yData2.data = res.data.prestoredUndulateDTO.balanceArray
+        this.yData1.data = res.data.prestoredUndulateDTO.newPrestored.length > 0 ? res.data.prestoredUndulateDTO.newPrestored : this.getMonthEmptyArray()
+        this.yData2.data = res.data.prestoredUndulateDTO.balanceArray.length > 0 ? res.data.prestoredUndulateDTO.balanceArray : this.getMonthEmptyArray()
         this.mapData = res.data.chinaMapDistributionList
         this.hospitalPrestoredRank = res.data.prestoredRankList
         this.hospitalTimeRank = res.data.enterTimeRankList
@@ -507,11 +507,8 @@ export default {
     },
     /** 医院详情按钮操作 */
     handleDetail(row) {
-      // console.log('详情', row)
-      // const authorizationExpirationDate = this.addDays(row.createTime, row.dueDate)
-      // row.authorizationExpirationDate = authorizationExpirationDate
       const local = process.env.VUE_APP_WEB
-      window.location.href = `${local}/hospital-management/hospital-details?detail=${row}`
+      window.location.href = `${local}/hospital-management/hospital-details?detail=${row}&from='plat'`
       localStorage.setItem('hospitalDetail', JSON.stringify(row))
     },
     handleSortChange(column) {
@@ -614,13 +611,15 @@ export default {
     padding-top: 15px;
     display: flex;
     .bottom_font {
-      //line-height: 24px;
       font-size: 12px;
       font-family: Microsoft YaHei;
       font-weight: 400;
       line-height: 24px;
       color: #333333;
       margin-left: 5px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
   }
 }
@@ -655,6 +654,9 @@ export default {
       line-height: 24px;
       color: #333333;
       margin-left: 5px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
   }
 }
@@ -689,6 +691,9 @@ export default {
       line-height: 24px;
       color: #333333;
       margin-left: 5px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
   }
 }
@@ -723,6 +728,9 @@ export default {
       line-height: 24px;
       color: #333333;
       margin-left: 5px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
   }
 }

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

@@ -254,7 +254,7 @@
               <el-table-column sortable label="宠主ID" min-width="140" show-overflow-tooltip prop="ruleId" />
               <el-table-column sortable label="手机号" min-width="80" show-overflow-tooltip prop="phone" />
               <el-table-column sortable label="注册日期" min-width="80" show-overflow-tooltip prop="registrationDate" />
-              <el-table-column sortable label="绑定医院数量" min-width="80" show-overflow-tooltip prop="hosNum">
+              <el-table-column sortable label="绑定医院数量" min-width="85" show-overflow-tooltip prop="hosNum">
                 <template slot-scope="scope">
                   {{ scope.row.hosNum + ' 家' }}
                 </template>
@@ -264,7 +264,7 @@
                   {{ scope.row.cardNum + ' 张' }}
                 </template>
               </el-table-column>
-              <el-table-column sortable label="绑定宠物数量" min-width="80" show-overflow-tooltip prop="petNum">
+              <el-table-column sortable label="绑定宠物数量" min-width="85" show-overflow-tooltip prop="petNum">
                 <template slot-scope="scope">
                   {{ scope.row.petNum + ' 只' }}
                 </template>
@@ -649,7 +649,7 @@ export default {
         fixNum: 0
       },
       yData2: {
-        label: '活跃用户量',
+        label: '活跃宠主量',
         data: [],
         line_color: '#5FB54B',
         area_color: 'rgba(95,181,75,0.3)',
@@ -720,7 +720,7 @@ export default {
         startColor: '#7C39D2',
         endColor: '#5266EA'
       },
-      cross_x_data: ['1只', '2只', '3~4只', '4~5只', '6只以上'],
+      cross_x_data: ['1只', '2只', '3~4只', '5~6只', '6只以上'],
       vip_analyze_y1_data: {
         name: '会员等级',
         data: [],
@@ -937,6 +937,9 @@ export default {
       line-height: 24px;
       color: #333333;
       margin-left: 5px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
   }
 }
@@ -971,6 +974,9 @@ export default {
       line-height: 24px;
       color: #333333;
       margin-left: 5px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
   }
 }
@@ -1005,6 +1011,9 @@ export default {
       line-height: 24px;
       color: #333333;
       margin-left: 5px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
   }
 }
@@ -1039,6 +1048,9 @@ export default {
       line-height: 24px;
       color: #333333;
       margin-left: 5px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
   }
 }
@@ -1073,6 +1085,9 @@ export default {
       line-height: 24px;
       color: #333333;
       margin-left: 5px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
   }
 }

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

@@ -238,7 +238,7 @@
                 </template>
               </el-table-column>
               <el-table-column sortable label="操作医院" show-overflow-tooltip prop="hospitalName" />
-              <el-table-column sortable label="提交时间" show-overflow-tooltip prop="appointTime">
+              <el-table-column sortable label="提交时间" min-width="100" show-overflow-tooltip prop="appointTime">
                 <template slot-scope="scope">
                   {{ parseTime(scope.row.appointTime, '{y}/{m}/{d} {h}:{i}') }}
                 </template>
@@ -259,11 +259,11 @@
                 <template slot-scope="scope">
                   <span
                     v-if="scope.row.checkSchedule >= 3"
-                    style="font-size: 12px;font-family: Microsoft YaHei;ont-weight: 400;color: #5FB54B;"
+                    style="color: #5FB54B;"
                   >• 已完成</span>
                   <span
                     v-else
-                    style="font-size: 12px;font-family: Microsoft YaHei;font-weight: 400;color: #FF9D4E;"
+                    style="color: #FF9D4E;"
                   >• 待检查</span>
                   <!--• 过期-->
                 </template>
@@ -637,7 +637,7 @@
               </el-table-column>
               <el-table-column label="检查项目" min-width="120px" show-overflow-tooltip prop="itemName" />
               <el-table-column label="服务次数" show-overflow-tooltip prop="number" />
-              <el-table-column label="总服务金额(元)" show-overflow-tooltip prop="money">
+              <el-table-column label="总服务金额(元)" min-width="90px" show-overflow-tooltip prop="money">
                 <template slot-scope="scope">
                   <span>{{ scope.row.money.toFixed(2) }}</span>
                 </template>
@@ -666,7 +666,7 @@
               </el-table-column>
               <el-table-column label="治疗项目" min-width="120px" show-overflow-tooltip prop="itemName" />
               <el-table-column label="服务次数" show-overflow-tooltip prop="number" />
-              <el-table-column label="总销售金额(元)" show-overflow-tooltip prop="money">
+              <el-table-column label="总销售金额(元)" min-width="90px" show-overflow-tooltip prop="money">
                 <template slot-scope="scope">
                   <span>{{ scope.row.money.toFixed(2) }}</span>
                 </template>
@@ -1102,6 +1102,9 @@ export default {
       line-height: 24px;
       color: #333333;
       margin-left: 5px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
   }
 }
@@ -1136,6 +1139,9 @@ export default {
       line-height: 24px;
       color: #333333;
       margin-left: 5px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
   }
 }
@@ -1170,6 +1176,9 @@ export default {
       line-height: 24px;
       color: #333333;
       margin-left: 5px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
   }
 }
@@ -1204,6 +1213,9 @@ export default {
       line-height: 24px;
       color: #333333;
       margin-left: 5px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
   }
 }
@@ -1238,6 +1250,9 @@ export default {
       line-height: 24px;
       color: #333333;
       margin-left: 5px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
   }
 }
@@ -1272,6 +1287,9 @@ export default {
       line-height: 30px;
       color: #333333;
       margin-left: 5px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
   }
 }
@@ -1306,6 +1324,9 @@ export default {
       line-height: 24px;
       color: #333333;
       margin-left: 5px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
   }
 }