diff --git a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/myMeeting/myMeeting.vue b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/myMeeting/myMeeting.vue index 687d9af..26a684d 100644 --- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/myMeeting/myMeeting.vue +++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/myMeeting/myMeeting.vue @@ -15,16 +15,25 @@
-
- {{item.room_type_str}} +
+ + {{item.userName}}
-
- - {{item.begin_time + '--' + (item.delayed_time && item.delayed_time !== '' ? item.delayed_time : item.end_time)}} -
-
- - {{item.theme}} +
+
{{item.send_apply_time}}
+
+
+ {{item.room_type_str}} +
+
+ + {{item.begin_time + '--' + (item.delayed_time && item.delayed_time !== '' ? item.delayed_time : item.end_time)}} +
+
+ + {{item.theme}} +
+
{{item.meeting_status_str}} @@ -84,6 +93,7 @@ import InterConfig from '../meetingRoom/interConfig'; import moment from 'moment'; import ApplyInfo from './applyInfo.vue'; + import Portrait from '../common/portrait.vue'; export default{ data(){ return { @@ -147,6 +157,12 @@ if (status === 1) item.meeting_status_str = "进行中"; if (status === 2) item.meeting_status_str = "延时中"; if (status === -1) item.meeting_status_str = "已结束"; + + let userName = item.apply_person_name; + if (userName && userName.length > 3) { + userName = userName.substring(userName.length - 3); + } + item.userName = userName; }) this.totolNum = resData.data.total_row; this.totalPage = resData.data.total_page; @@ -254,7 +270,7 @@ this.applyId = item.apply_id; this.pageType = 1; }, - cancelPage:function () { + cancelPage: function () { this.pageType = 0; this.getMyMeetingList(); } @@ -267,7 +283,8 @@ AIcon: Icon, AModal: Modal, ADatePicker: DatePicker, - ApplyInfo + ApplyInfo, + Portrait } } @@ -304,50 +321,82 @@ width: 100%; min-height: 5rem; display: flex; - flex-direction: column; - padding: 0.5rem 0 0.5rem 0; + /* flex-direction: column;*/ border-bottom: 1px solid #f2f2f2; position: relative; - .top-info-row-div { - width: 100%; + background-color: #f2f2f2; + margin-top: 0.5rem; + color: #7F7F7F; + padding: 0.5rem; + .user-image-box { + width: 80px; + height: auto; display: flex; - margin-bottom: 0.2rem; - .room-type-div { - border: 1px solid #31a8fa; - color: #31a8fa; - padding: 0 0.2rem; - border-radius: 5px; - } - .default-span-div { - width: calc(100% - 10rem); - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - margin-left: 0.5rem; - } + flex-direction: column; + justify-content: center; + align-items: center; } - .info-row-div { - width: 100%; - height: 100%; + .apply-info-box { + width: calc(100% - 80px); + height: auto; display: flex; - flex-wrap: wrap; - justify-content: flex-start; - margin-top: 0.5rem; - overflow-y: hidden; - text-overflow: ellipsis; - white-space: nowrap; - .room-other-info-div { - padding: 0 0.5rem; - /*background-color: #f59a23;*/ - color: var(--moduleFontColor); - border-radius: 10px; - margin-right: 0.5rem; - margin-bottom: 0.2rem; + flex-direction: column; + position: relative; + .time-row-style { + width: 100%; + height: 2rem; + line-height: 2rem; } - .no-data-tips { - background-color: #f2f2f2; - color: black; + .meeting-info-style { + width: 100%; + height: 6rem; + background-color: white; + margin-top: 0.2rem; + display: flex; + flex-direction: column; + padding: 0.2rem; + .top-info-row-div { + width: 100%; + display: flex; + margin-bottom: 0.2rem; + .room-type-div { + border: 1px solid #31a8fa; + color: #31a8fa; + padding: 0 0.2rem; + border-radius: 5px; + } + .default-span-div { + width: calc(100% - 10rem); + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + margin-left: 0.5rem; + } + } + .info-row-div { + width: 100%; + height: 100%; + display: flex; + flex-wrap: wrap; + justify-content: flex-start; + margin-top: 0.5rem; + overflow-y: hidden; + text-overflow: ellipsis; + white-space: nowrap; + .room-other-info-div { + padding: 0 0.5rem; + /*background-color: #f59a23;*/ + border-radius: 10px; + margin-right: 0.5rem; + margin-bottom: 0.2rem; + } + .no-data-tips { + background-color: #f2f2f2; + color: black; + } + } } + } .meeting-status-flag-style { position: absolute; diff --git a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/myMeeting/myMeetingLarge.vue b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/myMeeting/myMeetingLarge.vue index 9c10d12..edddd0c 100644 --- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/myMeeting/myMeetingLarge.vue +++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/myMeeting/myMeetingLarge.vue @@ -15,15 +15,25 @@
-
- {{item.room_type_str}} +
+ + {{item.userName}}
-
- - {{item.begin_time + '--' + (item.delayed_time && item.delayed_time !== ''?item.delayed_time:item.end_time)}} -
-
- {{item.theme}} +
+
{{item.send_apply_time}}
+
+
+ {{item.room_type_str}} +
+
+ + {{item.begin_time + '--' + (item.delayed_time && item.delayed_time !== '' ? item.delayed_time : item.end_time)}} +
+
+ + {{item.theme}} +
+
{{item.meeting_status_str}} @@ -81,6 +91,7 @@ import InterConfig from '../meetingRoom/interConfig'; import moment from 'moment'; import ApplyInfo from './applyInfo.vue'; + import Portrait from '../common/portrait.vue'; export default{ data(){ return { @@ -144,6 +155,11 @@ if (status === 1) item.meeting_status_str = "进行中"; if (status === 2) item.meeting_status_str = "延时中"; if (status === -1) item.meeting_status_str = "已结束"; + let userName = item.apply_person_name; + if (userName && userName.length > 3) { + userName = userName.substring(userName.length - 3); + } + item.userName = userName; }) this.totolNum = resData.data.total_row; this.totalPage = resData.data.total_page; @@ -264,7 +280,8 @@ AIcon: Icon, AModal: Modal, ADatePicker: DatePicker, - ApplyInfo + ApplyInfo, + Portrait } } @@ -304,50 +321,82 @@ width: 50%; min-height: 5rem; display: flex; - flex-direction: column; - padding: 0.5rem 0 0.5rem 0; + /* flex-direction: column;*/ border-bottom: 1px solid #f2f2f2; position: relative; - .top-info-row-div { - width: 100%; + background-color: #f2f2f2; + margin-top: 0.5rem; + color: #7F7F7F; + padding: 0.5rem; + .user-image-box { + width: 80px; + height: auto; display: flex; - margin-bottom: 0.2rem; - .room-type-div { - border: 1px solid #31a8fa; - color: #31a8fa; - padding: 0 0.2rem; - border-radius: 5px; - } - .default-span-div { - width: calc(100% - 10rem); - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - margin-left: 0.5rem; - } + flex-direction: column; + justify-content: center; + align-items: center; } - .info-row-div { - width: 100%; - height: 100%; + .apply-info-box { + width: calc(100% - 80px); + height: auto; display: flex; - flex-wrap: wrap; - justify-content: flex-start; - margin-top: 0.5rem; - overflow-y: hidden; - text-overflow: ellipsis; - white-space: nowrap; - .room-other-info-div { - padding: 0 0.5rem; - /*background-color: #f59a23;*/ - color: var(--moduleFontColor); - border-radius: 10px; - margin-right: 0.5rem; - margin-bottom: 0.2rem; + flex-direction: column; + position: relative; + .time-row-style { + width: 100%; + height: 2rem; + line-height: 2rem; } - .no-data-tips { - background-color: #f2f2f2; - color: black; + .meeting-info-style { + width: 100%; + height: 6rem; + background-color: white; + margin-top: 0.2rem; + display: flex; + flex-direction: column; + padding: 0.2rem; + .top-info-row-div { + width: 100%; + display: flex; + margin-bottom: 0.2rem; + .room-type-div { + border: 1px solid #31a8fa; + color: #31a8fa; + padding: 0 0.2rem; + border-radius: 5px; + } + .default-span-div { + width: calc(100% - 10rem); + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + margin-left: 0.5rem; + } + } + .info-row-div { + width: 100%; + height: 100%; + display: flex; + flex-wrap: wrap; + justify-content: flex-start; + margin-top: 0.5rem; + overflow-y: hidden; + text-overflow: ellipsis; + white-space: nowrap; + .room-other-info-div { + padding: 0 0.5rem; + /*background-color: #f59a23;*/ + border-radius: 10px; + margin-right: 0.5rem; + margin-bottom: 0.2rem; + } + .no-data-tips { + background-color: #f2f2f2; + color: black; + } + } } + } .meeting-status-flag-style { position: absolute;