From 6283f47d248818ef9fa64e4d65f27a343b54bdd2 Mon Sep 17 00:00:00 2001
From: jazz <jazzxhunter@163.com>
Date: 星期三, 27 十二月 2023 18:37:27 +0800
Subject: [PATCH] Merge branch 'xio_dev'
---
src/pages/room/detail.vue | 56 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 15 deletions(-)
diff --git a/src/pages/room/detail.vue b/src/pages/room/detail.vue
index bfc6358..776f69f 100644
--- a/src/pages/room/detail.vue
+++ b/src/pages/room/detail.vue
@@ -124,17 +124,24 @@
</div>
</div>
</div>
- <div v-show="!isShowAppellationName" class="name">
- <el-popover
- placement="top"
- width="400"
- popper-class="top_tx"
- trigger="click"
- :popper-options="{ removeOnDestroy: true }"
- >
- <div>{{ occupyInfoView.userName }}</div>
- <div slot="reference" class="tx ell">{{ occupyInfoView.userName }}</div>
- </el-popover>
+ <div v-show="!isShowAppellationName" class="flex flex-center">
+ <div class="flex flex-ver">
+ <div class="name">
+ <el-popover
+ placement="top"
+ width="400"
+ popper-class="top_tx"
+ trigger="click"
+ :popper-options="{ removeOnDestroy: true }"
+ >
+ <div>{{ occupyInfoView.userName }}</div>
+ <div slot="reference" class="tx ell">{{ occupyInfoView.userName }}</div>
+ </el-popover>
+ </div>
+ <div class="name_icon" @click="tapAppellationHandle">
+ <img class="img" src="static/imgs/eye.png">
+ </div>
+ </div>
</div>
<div v-if="occupyInfoView.ciq" class="ciq">({{ occupyInfoView.ciq }})</div>
<div v-if="occupyInfoView.startTime" class="time">瀹夋帓娌荤枟鏃堕棿锛歿{ occupyInfoView.startTime }} 寮�濮�</div>
@@ -235,6 +242,7 @@
var isUseDefault = false // 鏄惁宸蹭娇鐢ㄩ粯璁ゅ浜�
var isUseDefaultChg = 0// 宸蹭娇鐢ㄩ粯璁ゅ浜哄悗鎴块棿鏄惁鏈夋敼鍙樼姸鎬�
var offNarcosisIds = [] // 鏄惁宸查�氱煡鍗搁夯id鏁扮粍
+var isOffNarcosisShow = false // 鏄惁鏄剧ず宸查�氱煡鍗搁夯寮圭獥
export default {
name: 'RoomDetail',
components: {
@@ -297,12 +305,16 @@
// 璁板綍褰撳墠鐨勬不鐤桰D
var curTreatId = localStorage.getItem('curTreatId')
var localOffNarcosisIds = localStorage.getItem('offNarcosisIds')
+ var localIsOffNarcosisShow = localStorage.getItem('isOffNarcosisShow')
// 鑾峰彇鏄惁宸查�氱煡鍗搁夯鏁扮粍
if (localOffNarcosisIds) {
offNarcosisIds = JSON.parse(localOffNarcosisIds)
} else {
offNarcosisIds = []
this.setLocalStorageOffNarcosisIds()
+ }
+ if (localIsOffNarcosisShow) {
+ isOffNarcosisShow = localIsOffNarcosisShow
}
this.curTreatId = curTreatId || ''
this.id = this.$route.query.id || ''
@@ -330,9 +342,18 @@
// 鍗搁夯閫氱煡纭
offNarcosisNoticeConfirm() {
if (this.occupyInfoView) {
- offNarcosisIds.push(this.occupyInfoView.visitOrderId)
+ if (offNarcosisIds && offNarcosisIds.length) {
+ var flag = offNarcosisIds.find((o) => { return o === this.occupyInfoView.userId })
+ if (!flag) {
+ offNarcosisIds.push(this.occupyInfoView.userId)
+ }
+ } else if (offNarcosisIds) {
+ offNarcosisIds.push(this.occupyInfoView.userId)
+ }
this.setLocalStorageOffNarcosisIds()
}
+ isOffNarcosisShow = true
+ localStorage.setItem('isOffNarcosisShow', true)
},
// 鏄剧ず閫氱煡鍗搁夯寮圭獥
showOffNarcosisNotice() {
@@ -389,6 +410,10 @@
o.appellationName = o.userName[0] + `${o.gender ? ['濂冲＋', '鍏堢敓', '濂冲＋'][o.gender] : '濂冲＋'}`
})
}
+ // 宸插崰鐢ㄧ敤鎴锋暟鎹鐞�
+ if (res.data.occupyInfo && res.data.occupyInfo.userName) {
+ res.data.occupyInfo.appellationName = res.data.occupyInfo.userName[0] + `${res.data.occupyInfo.gender ? ['濂冲＋', '鍏堢敓', '濂冲＋'][res.data.occupyInfo.gender] : '濂冲＋'}`
+ }
// 宸叉湁鍗犵敤鐨勶紝鏇存敼宸蹭娇鐢ㄩ粯璁ゅ浜虹殑鐘舵��
res.data.occupyInfo && (isUseDefaultChg = 1)
res.data.occupyInfo && (isUseDefault = 1)
@@ -404,10 +429,11 @@
// console.log('999999999999999999999999999', res)
var offNarcosisTimer = null
offNarcosisTimer = setTimeout(() => {
- console.log('================================>', this.occupyInfoView)
- if (this.occupyInfoView && this.occupyInfoView.hempStatus === 1 && this.occupyInfoView.visitOrderId) {
+ console.log('================================>', this.occupyInfoView, 'offNarcosisIds:', offNarcosisIds, 'isOffNarcosisShow:', isOffNarcosisShow)
+ if (this.occupyInfoView && this.occupyInfoView.hempStatus === 2 && this.occupyInfoView.userId) {
var flag
- offNarcosisIds && offNarcosisIds.length && (flag = offNarcosisIds.find((o) => { return o === this.occupyInfoView.visitOrderId }))
+ offNarcosisIds && offNarcosisIds.length && (flag = offNarcosisIds.find((o) => { return o === this.occupyInfoView.userId }))
+ // flag = isOffNarcosisShow
if (!flag) {
this.showOffNarcosisNotice()
}
--
Gitblit v1.8.0