diff --git a/src/views/admin/meeting/MeetingCount.vue b/src/views/admin/meeting/MeetingCount.vue
index 4b3c961..467739a 100644
--- a/src/views/admin/meeting/MeetingCount.vue
+++ b/src/views/admin/meeting/MeetingCount.vue
@@ -69,7 +69,7 @@
-
+
-
+
@@ -506,7 +506,7 @@ export default {
{
name: '服务情况',
type: 'pie',
- radius: ['70%', '100%'],
+ radius: ['50%', '70%'],
avoidLabelOverlap: false,
label: {
show: true
@@ -562,7 +562,7 @@ export default {
{
name: '会议室形式',
type: 'pie',
- radius: ['70%', '100%'],
+ radius: ['50%', '70%'],
avoidLabelOverlap: false,
label: {
show: true
diff --git a/src/views/admin/meeting/RoomContentList.vue b/src/views/admin/meeting/RoomContentList.vue
index 63a41e3..097b98d 100644
--- a/src/views/admin/meeting/RoomContentList.vue
+++ b/src/views/admin/meeting/RoomContentList.vue
@@ -33,24 +33,15 @@
全部
- 0-10
+ 0-20
- 11-20
+ 21-50
- 21-30
-
-
- 31-40
-
-
- 41-50
-
-
51-100
-
+
100以上
@@ -234,24 +225,28 @@ export default {
let minPerNum = 0
let maxPerNum = 1000
let perNumValue = this.queryParam.capacityNum
- if (perNumValue == 6) {
+ if (perNumValue == 1) {
+ // 1-20
+ maxPerNum = 20
+ minPerNum = 1
+ } else if (perNumValue == 2) {
+ // 21-50
+ minPerNum = 21
+ maxPerNum = 50
+ } else if (perNumValue == 3) {
// 51-100
- maxPerNum = 100
minPerNum = 51
- } else if (perNumValue == 7) {
- // 100以上
+ maxPerNum = 100
+ } else if (perNumValue == 4) {
+ // 51-100
minPerNum = 101
maxPerNum = 1000
- } else if (perNumValue == '') {
+ } else {
// 全部
minPerNum = 1
maxPerNum = 1000
- } else {
- // 其余,符合规则即可
- // perNumValue * 10 - 9 ~ perNumValue * 10
- maxPerNum = parseInt(perNumValue) * 10
- minPerNum = maxPerNum - 9
}
+
const param = {
name: this.queryParam.meetingName, // 名称
floor: this.queryParam.typeName, // 楼层名称