Commit 834ee2d6 authored by 陈明豪's avatar 陈明豪

bug修改

parent ce9185f3
......@@ -48,7 +48,7 @@ export default {
},
radar: {
// shape: 'circle',
center: ['50%', '55%'],
center: ['50%', '50%'],
radius: 85,
// indicator: [
// { name: '一星诊疗机构', max: 50 },
......
......@@ -262,8 +262,8 @@
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column sortable label="医院名称" align="left" prop="hospitalName" min-width="80" show-overflow-tooltip />
<el-table-column sortable label="医院ID" align="left" prop="ownId" min-width="80" show-overflow-tooltip>
<el-table-column sortable label="医院名称" align="left" prop="hospitalName" min-width="120" 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>
</template>
......@@ -276,9 +276,9 @@
/>
</template>
</el-table-column>
<el-table-column sortable label="联系人" align="left" min-width="80" prop="contactPerson" show-overflow-tooltip />
<el-table-column sortable label="联系人手机号" align="left" min-width="120" prop="phonenumber" />
<el-table-column sortable label="医院地址" align="left" min-width="80" prop="hospitalAllAddress" show-overflow-tooltip>
<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="120" prop="hospitalAllAddress" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.hospitalAllAddress }}</span>
</template>
......@@ -304,16 +304,17 @@
<span :style="showStatus(scope.row.authorizationExpirationDate) === '• 过期' ? 'color: #F8CA96' : 'color: #67C23A'">{{ showStatus(scope.row.authorizationExpirationDate) || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="left" class-name="small-padding fixed-width">
<el-table-column label="操作" align="left" class-name="small-padding fixed-width" min-width="50">
<template slot-scope="scope">
<el-button
size="mini"
type="success"
icon="el-icon-document"
class="el-button--success--solid"
plain
@click="handleDetail(scope.row)"
>详情
>
<svg-icon icon-class="liebiao_icon_xiangqing" />
详情
</el-button>
</template>
</el-table-column>
......@@ -736,7 +737,7 @@ export default {
-webkit-background-clip:text;
-webkit-text-fill-color:transparent;
padding-top: 3px;
padding-left: 8px;
padding-left: 3px;
}
}
.changqi_percent {
......@@ -752,7 +753,7 @@ export default {
-webkit-background-clip:text;
-webkit-text-fill-color:transparent;
padding-top: 3px;
padding-left: 8px;
padding-left: 3px;
}
}
.yuchuzhi_percent {
......@@ -768,7 +769,7 @@ export default {
-webkit-background-clip:text;
-webkit-text-fill-color:transparent;
padding-top: 3px;
padding-left: 8px;
padding-left: 3px;
}
}
.prestoredRankDiv {
......
......@@ -85,7 +85,7 @@ export default {
-webkit-background-clip:text;
-webkit-text-fill-color:transparent;
padding-top: 3px;
padding-left: 8px;
padding-left: 3px;
}
}
.green_percent {
......@@ -101,7 +101,7 @@ export default {
-webkit-background-clip:text;
-webkit-text-fill-color:transparent;
padding-top: 3px;
padding-left: 8px;
padding-left: 3px;
}
}
.orange_percent {
......@@ -117,7 +117,7 @@ export default {
-webkit-background-clip:text;
-webkit-text-fill-color:transparent;
padding-top: 3px;
padding-left: 8px;
padding-left: 3px;
}
}
......@@ -134,7 +134,7 @@ export default {
-webkit-background-clip:text;
-webkit-text-fill-color:transparent;
padding-top: 3px;
padding-left: 8px;
padding-left: 3px;
}
}
.green_percent_invert {
......@@ -150,7 +150,7 @@ export default {
-webkit-background-clip:text;
-webkit-text-fill-color:transparent;
padding-top: 3px;
padding-left: 8px;
padding-left: 3px;
}
}
.orange_percent_invert {
......@@ -167,7 +167,7 @@ export default {
-webkit-background-clip:text;
-webkit-text-fill-color:transparent;
padding-top: 3px;
padding-left: 8px;
padding-left: 3px;
}
}
......
......@@ -206,8 +206,8 @@
</div>
</el-col>
<el-col :span="9">
<div class="cardDiv" style="padding-bottom: 0px">
<div v-if="radarPetOwnerPlatformCurrentYear.yData1.length > 0 || radarPetOwnerPlatformCurrentYear.yData2.length > 0" style="text-align: right;position: absolute;z-index: 10;width: 34%;">
<div class="cardDiv" style="padding-bottom: 0;position: relative">
<div v-if="radarPetOwnerPlatformCurrentYear.yData1.length > 0 || radarPetOwnerPlatformCurrentYear.yData2.length > 0" class="positionDiv">
<el-radio-group v-model="radarSelect">
<el-radio-button label="lastYear" class="radioButton">去年</el-radio-button>
<el-radio-button label="currentYear" class="radioButton">今年</el-radio-button>
......@@ -239,10 +239,9 @@
<el-table
ref="ownerList"
:data="petOwnerList"
style="width: 100%"
@sort-change="ownerSortChange"
>
<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>
......@@ -252,25 +251,25 @@
{{ scope.row.name || '-' }}
</template>
</el-table-column>
<el-table-column sortable label="宠主ID" min-width="80" show-overflow-tooltip prop="ruleId" />
<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="120" show-overflow-tooltip prop="hosNum">
<el-table-column sortable label="绑定医院数量" min-width="80" show-overflow-tooltip prop="hosNum">
<template slot-scope="scope">
{{ scope.row.hosNum + ' 家' }}
</template>
</el-table-column>
<el-table-column sortable label="会员卡数量" min-width="120" show-overflow-tooltip prop="cardNum">
<el-table-column sortable label="会员卡数量" min-width="80" show-overflow-tooltip prop="cardNum">
<template slot-scope="scope">
{{ scope.row.cardNum + ' 张' }}
</template>
</el-table-column>
<el-table-column sortable label="绑定宠物数量" min-width="120" show-overflow-tooltip prop="petNum">
<el-table-column sortable label="绑定宠物数量" min-width="80" show-overflow-tooltip prop="petNum">
<template slot-scope="scope">
{{ scope.row.petNum + ' 只' }}
</template>
</el-table-column>
<el-table-column sortable label="挂号次数" min-width="100" show-overflow-tooltip prop="registerNum">
<el-table-column sortable label="挂号次数" min-width="80" show-overflow-tooltip prop="registerNum">
<template slot-scope="scope">
{{ scope.row.registerNum + ' 次' }}
</template>
......@@ -285,16 +284,17 @@
{{ moneyFormat(scope.row.consumption) + ' 元' }}
</template>
</el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width">
<el-table-column label="操作" class-name="small-padding fixed-width" min-width="50">
<template slot-scope="scope">
<el-button
size="mini"
type="success"
icon="el-icon-document"
class="el-button--success--solid"
plain
@click="ownerDetail(scope.row)"
>详情
>
<svg-icon icon-class="liebiao_icon_xiangqing" />
详情
</el-button>
</template>
</el-table-column>
......@@ -535,7 +535,7 @@
</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="30px" 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>
......@@ -572,23 +572,24 @@
{{ scope.row.createDate || '-' }}
</template>
</el-table-column>
<el-table-column sortable label="状态" show-overflow-tooltip prop="status">
<el-table-column sortable label="状态" min-width="40" show-overflow-tooltip prop="status">
<template slot-scope="scope">
<!-- {{ scope.row.status === '0' ? '• 已启用': '• 已停用' }}-->
<span v-if="scope.row.status === '0'" style="color: #5FB54B">• 已启用</span>
<span v-else style="color: #FF9D4E">• 已停用</span>
</template>
</el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width">
<el-table-column label="操作" class-name="small-padding fixed-width" min-width="40">
<template slot-scope="scope">
<el-button
size="mini"
type="success"
icon="el-icon-document"
class="el-button--success--solid"
plain
@click="ownerDetail(scope.row)"
>详情
>
<svg-icon icon-class="liebiao_icon_xiangqing" />
详情
</el-button>
</template>
</el-table-column>
......@@ -1087,7 +1088,7 @@ export default {
-webkit-background-clip:text;
-webkit-text-fill-color:transparent;
padding-top: 3px;
padding-left: 8px;
padding-left: 3px;
}
}
.vip_percent {
......@@ -1103,7 +1104,7 @@ export default {
-webkit-background-clip:text;
-webkit-text-fill-color:transparent;
padding-top: 3px;
padding-left: 8px;
padding-left: 3px;
}
}
.repurchase_percent {
......@@ -1119,7 +1120,7 @@ export default {
-webkit-background-clip:text;
-webkit-text-fill-color:transparent;
padding-top: 3px;
padding-left: 8px;
padding-left: 3px;
}
}
.consumeRankDiv {
......@@ -1190,6 +1191,14 @@ export default {
border-color: #E5E5E5 !important;
box-shadow: 0 0 0 0 #E5E5E5;
}
::v-deep .el-radio-button__inner {
height: 32px;
font-weight: bold;
font-size: 14px;
line-height: 32px;
padding-top: 0;
padding-bottom: 0;
}
::v-deep .el-radio-button__inner:hover {
color: #6db45d !important;
}
......@@ -1257,5 +1266,13 @@ export default {
}
.tableDiv {
padding-bottom: 50px;
width: 100%;
}
.positionDiv {
text-align: right;
position: absolute;
z-index: 10;
right: 20px;
top: 14px;
}
</style>
......@@ -72,8 +72,8 @@
</el-row>
<el-row :gutter="24" class="row2">
<el-col :span="24">
<div class="cardDiv orderDiv" style="padding-bottom: 0;">
<div style="position: absolute;z-index: 10;width: 90%;text-align: right;">
<div class="cardDiv orderDiv" style="padding-bottom: 0;position: relative">
<div class="positionDiv">
<el-radio-group v-model="lineSelect">
<el-radio-button label="byYear" class="radioButton"></el-radio-button>
<el-radio-button label="byMonth" class="radioButton"></el-radio-button>
......@@ -268,16 +268,17 @@
<!-- 过期-->
</template>
</el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width">
<el-table-column label="操作" class-name="small-padding fixed-width" min-width="50">
<template slot-scope="scope">
<el-button
size="mini"
type="success"
icon="el-icon-document"
class="el-button--success--solid"
plain
@click="serviceDetail(scope.row)"
>详情
>
<svg-icon icon-class="liebiao_icon_xiangqing" />
详情
</el-button>
</template>
</el-table-column>
......@@ -718,16 +719,17 @@
</template>
</el-table-column>
<el-table-column label="创建日期" show-overflow-tooltip prop="followTime" />
<el-table-column label="操作" class-name="small-padding fixed-width">
<el-table-column label="操作" class-name="small-padding fixed-width" min-width="40">
<template slot-scope="scope">
<el-button
size="mini"
type="success"
icon="el-icon-document"
class="el-button--success--solid"
plain
@click="handleRecordDetail(scope.row)"
>详情
>
<svg-icon icon-class="liebiao_icon_xiangqing" />
详情
</el-button>
</template>
</el-table-column>
......@@ -1073,16 +1075,18 @@ export default {
background-size: 100% 103px;
.numberColor {
font-size: 24px;
line-height: 24px;
font-weight: bold;
background-image: -webkit-linear-gradient(top, #5FB54B, #2AAD9A);
-webkit-background-clip:text;
-webkit-text-fill-color:transparent;
}
.fontColor {
padding-top: 10px;
padding-top: 2px;
padding-left: 2px;
font-size: 12px;
font-weight: bold;
line-height: 24px;
background-image: -webkit-linear-gradient(top, #5FB54B, #2AAD9A);
-webkit-background-clip:text;
-webkit-text-fill-color:transparent;
......@@ -1091,7 +1095,6 @@ export default {
padding-top: 15px;
display: flex;
.bottom_font {
//line-height: 24px;
font-size: 12px;
font-family: Microsoft YaHei;
font-weight: 400;
......@@ -1106,15 +1109,17 @@ export default {
.numberColor {
font-size: 24px;
font-weight: bold;
line-height: 24px;
background-image: -webkit-linear-gradient(top, #5FB54B, #2AAD9A);
-webkit-background-clip:text;
-webkit-text-fill-color:transparent;
}
.fontColor {
padding-top: 10px;
padding-top: 2px;
padding-left: 2px;
font-size: 12px;
font-weight: bold;
line-height: 24px;
background-image: -webkit-linear-gradient(top, #5FB54B, #2AAD9A);
-webkit-background-clip:text;
-webkit-text-fill-color:transparent;
......@@ -1138,15 +1143,17 @@ export default {
.numberColor {
font-size: 24px;
font-weight: bold;
line-height: 24px;
background-image: -webkit-linear-gradient(top, #5561E6, #7B3CD3);
-webkit-background-clip:text;
-webkit-text-fill-color:transparent;
}
.fontColor {
padding-top: 10px;
padding-top: 2px;
padding-left: 2px;
font-size: 12px;
font-weight: bold;
line-height: 24px;
background-image: -webkit-linear-gradient(top, #5561E6, #7B3CD3);
-webkit-background-clip:text;
-webkit-text-fill-color:transparent;
......@@ -1170,15 +1177,17 @@ export default {
.numberColor {
font-size: 24px;
font-weight: bold;
line-height: 24px;
background-image: -webkit-linear-gradient(top, #5561E6, #7B3CD3);
-webkit-background-clip:text;
-webkit-text-fill-color:transparent;
}
.fontColor {
padding-top: 10px;
padding-top: 2px;
padding-left: 2px;
font-size: 12px;
font-weight: bold;
line-height: 24px;
background-image: -webkit-linear-gradient(top, #5561E6, #7B3CD3);
-webkit-background-clip:text;
-webkit-text-fill-color:transparent;
......@@ -1202,15 +1211,17 @@ export default {
.numberColor {
font-size: 24px;
font-weight: bold;
line-height: 24px;
background-image: -webkit-linear-gradient(top, #39A3CF, #386FCD);
-webkit-background-clip:text;
-webkit-text-fill-color:transparent;
}
.fontColor {
padding-top: 10px;
padding-top: 2px;
padding-left: 2px;
font-size: 12px;
font-weight: bold;
line-height: 24px;
background-image: -webkit-linear-gradient(top, #39A3CF, #386FCD);
-webkit-background-clip:text;
-webkit-text-fill-color:transparent;
......@@ -1234,15 +1245,17 @@ export default {
.numberColor {
font-size: 24px;
font-weight: bold;
line-height: 24px;
background-image: -webkit-linear-gradient(top, #39A3CF, #386FCD);
-webkit-background-clip:text;
-webkit-text-fill-color:transparent;
}
.fontColor {
padding-top: 10px;
padding-top: 2px;
padding-left: 2px;
font-size: 12px;
font-weight: bold;
line-height: 24px;
background-image: -webkit-linear-gradient(top, #39A3CF, #386FCD);
-webkit-background-clip:text;
-webkit-text-fill-color:transparent;
......@@ -1266,15 +1279,17 @@ export default {
.numberColor {
font-size: 24px;
font-weight: bold;
line-height: 24px;
background-image: -webkit-linear-gradient(top, #DB9147, #DB4747);
-webkit-background-clip:text;
-webkit-text-fill-color:transparent;
}
.fontColor {
padding-top: 10px;
padding-top: 2px;
padding-left: 2px;
font-size: 12px;
font-weight: bold;
line-height: 24px;
background-image: -webkit-linear-gradient(top, #DB9147, #DB4747);
-webkit-background-clip:text;
-webkit-text-fill-color:transparent;
......@@ -1450,6 +1465,14 @@ export default {
::v-deep .el-radio-button__inner:hover {
color: #6db45d !important;
}
::v-deep .el-radio-button__inner {
height: 32px;
font-weight: bold;
font-size: 14px;
line-height: 32px;
padding-top: 0;
padding-bottom: 0;
}
.rankInnerDiv {
margin-top: 44px;
}
......@@ -1501,4 +1524,11 @@ export default {
.tableDiv {
padding-bottom: 50px;
}
.positionDiv {
text-align: right;
position: absolute;
z-index: 10;
right: 20px;
top: 14px;
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment