From 1fa546e22f9b913868cdeb5a84f3fc3c4f500ffb Mon Sep 17 00:00:00 2001
From: jazz <jazzxhunter@163.com>
Date: 星期四, 21 十二月 2023 19:39:48 +0800
Subject: [PATCH] update_202312211937_增加卸麻通知和称谓显示
---
static/imgs/eye.png | 0
src/components/xio_room_off_narcosis_notice/index.vue | 124 +++++++++++++++++++++++++++++++
src/pages/room/detail.vue | 61 ++++++++++++++-
3 files changed, 181 insertions(+), 4 deletions(-)
diff --git a/src/components/xio_room_off_narcosis_notice/index.vue b/src/components/xio_room_off_narcosis_notice/index.vue
new file mode 100644
index 0000000..f233407
--- /dev/null
+++ b/src/components/xio_room_off_narcosis_notice/index.vue
@@ -0,0 +1,124 @@
+<template>
+ <div v-if="isShow" class="mask" @click="hideDialog">
+ <div class="xio_room_status_chg_dialog" @click.stop="noop">
+ <div class="title">MIC閫氱煡鍗搁夯锛�</div>
+ <div class="btn_box flex flex-center">
+ <div class="btn_box_item flex flex-center" @click="confirm">
+ <div class="flex flex-ver">
+ <div class="tx">鎴戝凡鐭ユ檽</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</template>
+
+<script>
+export default {
+ name: 'XioRoomStatusChg',
+ props: {
+ isActive: {
+ type: Boolean,
+ default: false
+ }
+ },
+ data() {
+ return {
+ isShow: false
+ }
+ },
+ methods: {
+ noop() {
+ return
+ },
+ // 纭
+ confirm() {
+ this.isShow = false
+ this.$emit('confirm', { })
+ },
+ // 鏄剧ず寮圭獥
+ showDialog() {
+ this.isShow = true
+ },
+ // 鍏抽棴寮圭獥
+ hideDialog() {
+ this.isShow = false
+ this.$emit('confirm', { })
+ }
+ }
+}
+</script>
+
+<style scoped>
+.xio_room_status_chg_dialog {
+ width: 1105px;
+ min-height: 602px;
+ /* border-radius: 10px; */
+ background-color: rgba(255,255,255,1);
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ -webkit-transform: translate(-50%, -50%);
+ z-index: 1;
+}
+.xio_room_status_chg_dialog .title {
+ line-height: 112px;
+ color: rgba(16,16,16,1);
+ font-size: 80px;
+ text-align: center;
+ font-family: PingFangSC-medium;
+ font-weight: bold;
+ padding-top: 159px;
+}
+.xio_room_status_chg_dialog .btn_box {
+ margin-top: 131px;
+}
+.xio_room_status_chg_dialog .btn_box .line {
+ width: 100%;
+}
+.xio_room_status_chg_dialog .btn_box_item {
+ width: 300px;
+ height: 100px;
+ line-height: 52px;
+ border-radius: 4px;
+ background-color: rgba(34,123,235,1);
+ color: rgba(255,255,255,1);
+ font-size: 36px;
+ text-align: center;
+ font-family: Microsoft Yahei;
+ box-shadow: 0px 2px 6px 0px rgba(206,206,206,0.86);
+}
+/* .xio_room_status_chg_dialog .btn_box_item.white {
+ background-color: rgba(255,255,255,1);
+}
+.xio_room_status_chg_dialog .btn_box_item.blue {
+ background-color: rgba(46,77,124,1);
+}
+.xio_room_status_chg_dialog .btn_box_item.yellow {
+ background-color: rgba(255,199,115,1);
+}
+.xio_room_status_chg_dialog .btn_box_item.gray {
+ background-color: rgba(206,206,206,1);
+} */
+.xio_room_status_chg_dialog .btn_box_item .icon {
+ width: 60px;
+ height: 60px;
+ display: block;
+ margin-right: 17px;
+}
+.xio_room_status_chg_dialog .btn_box_item .icon .img {
+ width: 100%;
+ height: 100%;
+}
+/* .xio_room_status_chg_dialog .btn_box_item .tx {
+ line-height: 37px;
+ color: rgba(51,51,51,1);
+ font-size: 26px;
+ text-align: center;
+ font-family: PingFangSC-medium;
+}
+.xio_room_status_chg_dialog .btn_box_item .tx.white {
+ color: #ffffff;
+} */
+</style>
diff --git a/src/pages/room/detail.vue b/src/pages/room/detail.vue
index 87d634c..176048d 100644
--- a/src/pages/room/detail.vue
+++ b/src/pages/room/detail.vue
@@ -115,8 +115,16 @@
<div v-if="roomInfo && roomInfo.roomNo" class="room_title">{{ roomInfo.roomNo }}</div>
<div class="room_content">
<div class="tip">璇婄枟瀹夋帓</div>
- <!-- <div class="name">{{ occupyInfoView.userName }}</div> -->
- <div class="name">
+ <!-- <div class="name">{{ occupyInfoView.userName }}</div> appellationName -->
+ <div v-show="isShowAppellationName" class="flex flex-center">
+ <div class="flex flex-ver">
+ <div class="name">{{ occupyInfoView.appellationName }}</div>
+ <div class="name_icon" @click="tapAppellationHandle">
+ <img class="img" src="static/imgs/eye.png">
+ </div>
+ </div>
+ </div>
+ <div v-show="!isShowAppellationName" class="name">
<el-popover
placement="top"
width="400"
@@ -205,6 +213,8 @@
<XioCustomerSelect ref="XioCustomerSelect" @cancel="selectCustomerCancel" @submit="selectCustomerSubmit" />
<!-- 鏇存敼鎴块棿鐘舵�佺獥 -->
<XioRoomStatusChg ref="XioRoomStatusChg" @changeStatus="changeStatus" />
+ <!-- MIC閫氱煡鍗搁夯 -->
+ <XioRoomOffNarcosisNotice ref="XioRoomOffNarcosisNotice" @confirm="offNarcosisNoticeConfirm" />
</div>
</template>
@@ -218,15 +228,19 @@
import XioCustomerSelect from '@/components/xio_customer_select'
// 鏇存敼鎴块棿鐘舵�佺獥
import XioRoomStatusChg from '@/components/xio_room_status_chg'
+// 閫氱煡鍗搁夯
+import XioRoomOffNarcosisNotice from '@/components/xio_room_off_narcosis_notice'
import Req from '../../utils/jun_httpInstall' // http 璇锋眰
// import xioFn from './utils/xio_fn.js'
var isUseDefault = false // 鏄惁宸蹭娇鐢ㄩ粯璁ゅ浜�
var isUseDefaultChg = 0// 宸蹭娇鐢ㄩ粯璁ゅ浜哄悗鎴块棿鏄惁鏈夋敼鍙樼姸鎬�
+var isOffNarcosis = '0'// 鏄惁鍗搁夯锛岄粯璁ゅ凡鍗搁夯锛屽嵆涓嶅脊鍑哄脊妗�
export default {
name: 'RoomDetail',
components: {
XioCustomerSelect,
- XioRoomStatusChg
+ XioRoomStatusChg,
+ XioRoomOffNarcosisNotice
},
inject: ['noop'],
data() {
@@ -237,7 +251,8 @@
assignTreatList: [],
statusTx: ['绌洪棽', '浣跨敤涓�', '瀹汉浼戞伅', '鎵撴壂涓�', '鏁烽夯涓�'],
timeObj: {}, // week锛氭槦鏈燂紝date锛氬勾鏈堟棩锛宼imeMin锛氭椂鍒嗭紝time锛氭椂鍒嗙锛宼imeStamp锛氭椂闂存埑
- curTreatId: ''
+ curTreatId: '',
+ isShowAppellationName: true // 鏄惁鏄剧ず绉拌皳
}
},
computed: {
@@ -281,6 +296,11 @@
console.log('roomDetail mounted')
// 璁板綍褰撳墠鐨勬不鐤桰D
var curTreatId = localStorage.getItem('curTreatId')
+ var localIsOffNarcosis = localStorage.getItem('isOffNarcosis')
+ // 鏄惁宸查�氱煡鍗搁夯
+ if (localIsOffNarcosis) {
+ isOffNarcosis = localIsOffNarcosis
+ }
this.curTreatId = curTreatId || ''
this.id = this.$route.query.id || ''
this.init()
@@ -299,6 +319,20 @@
// 杞getData锛�8绉掍竴娆�
this.pollingAjaxFn(this, 'getData', 'detail', 8000)
// this.getData()
+ },
+ // 鍗搁夯閫氱煡纭
+ offNarcosisNoticeConfirm() {
+ isOffNarcosis = '1'
+ localStorage.setItem('isOffNarcosis', '1')
+ },
+ // 鏄剧ず閫氱煡鍗搁夯寮圭獥
+ showOffNarcosisNotice() {
+ // 鎵撳紑寮圭獥
+ this.$refs['XioRoomOffNarcosisNotice'].showDialog()
+ },
+ // 鐐瑰嚮鏄剧ず闅愯棌绉拌皳
+ tapAppellationHandle() {
+ this.isShowAppellationName = !this.isShowAppellationName
},
// 鑾峰彇褰撳墠娌荤枟淇℃伅
gatCurTreatInfo() {
@@ -343,6 +377,7 @@
res.data.assignTreatList.forEach((o) => {
var st = (o.startTime).split(' ')[1].split(':')
o.startTime = `${st[0]}:${st[1]}`
+ o.appellationName = o.userName[0] + `${o.gender ? ['濂冲＋', '鍏堢敓', '濂冲＋'][o.gender] : '濂冲＋'}`
})
}
// 宸叉湁鍗犵敤鐨勶紝鏇存敼宸蹭娇鐢ㄩ粯璁ゅ浜虹殑鐘舵��
@@ -358,6 +393,9 @@
}
}
// console.log('999999999999999999999999999', res)
+ // todo 寮圭獥鏄剧ず鍒ゆ柇
+ // isOffNarcosis === '0'
+ // this.showOffNarcosisNotice()
})
},
// 杩斿洖
@@ -365,6 +403,8 @@
// 閲嶇疆榛樿宸蹭娇鐢ㄥ浜虹殑鍙傛暟
isUseDefault = false
isUseDefaultChg = 0
+ isOffNarcosis = '0'
+ localStorage.setItem('isOffNarcosis', '0')
// 鍏抽棴璁℃椂
this.stopCountGetTime('detail')
// 鍏抽棴杞
@@ -440,6 +480,7 @@
// 閲嶇疆榛樿宸蹭娇鐢ㄥ浜虹殑鍙傛暟
isUseDefault = false
isUseDefaultChg = 0
+ this.isShowAppellationName = true
}
// console.log('8888888888888888888888888888888888', res)
cb && cb()
@@ -669,6 +710,18 @@
.page_container .main .room_content .name .tx {
max-width: 666px;
margin: auto;
+ text-align: center;
+}
+.page_container .main .room_content .name_icon {
+ width: 40px;
+ height: 40px;
+ display: block;
+ margin-top: 13px;
+ padding: 20px;
+}
+.page_container .main .room_content .name_icon .img {
+ width: 100%;
+ height: 100%;
}
.page_container .main .room_content .ciq {
line-height: 42px;
diff --git a/static/imgs/eye.png b/static/imgs/eye.png
new file mode 100644
index 0000000..1829cd2
--- /dev/null
+++ b/static/imgs/eye.png
Binary files differ
--
Gitblit v1.8.0