Skip to content

P
pica-admin-consultation
提交 62f79770 编写于 作者: 张磊's avatar 张磊
浏览文件
操作

Merge branch 'feat/zl' into 'develop' 

save

See merge request !56
上级 73d817df 4690d448
隐藏空白字符变更
内嵌 并排
正在显示 包含 585 行增加 和 574 行删除
src/App.vue
浏览文件 @ 62f79770
...@@ -69,8 +69,6 @@ export default { ...@@ -69,8 +69,6 @@ export default {
bindDragHeader('.c-header', '.chat-wrap'); bindDragHeader('.c-header', '.chat-wrap');
}, 1000) }, 1000)
// this.$store.dispatch( 'socket/initSocket',{url: 'http://10.177.11.251:15202'})
}, },
methods: { methods: {
// 修改token // 修改token
......
src/components/IM/diagnosis-live.vue
浏览文件 @ 62f79770
...@@ -123,7 +123,8 @@ export default { ...@@ -123,7 +123,8 @@ export default {
memberList: [], memberList: [],
tid: "", // 群id tid: "", // 群id
diagnoseLogId: "", //问诊id diagnoseLogId: "", //问诊id
isMuted: false isMuted: false,
liveInfoSave: {}
}; };
}, },
created() { created() {
...@@ -185,7 +186,10 @@ export default { ...@@ -185,7 +186,10 @@ export default {
let url = `/im/team/call/direct/`; let url = `/im/team/call/direct/`;
let params = { let params = {
imAccId: data.accId, imAccId: data.accId,
imTeamId: this.currentChat.tid,
liveRoomId: this.roomId
}; };
this.POST(url, params).then((res) => { this.POST(url, params).then((res) => {
if (res.code === "000000") { if (res.code === "000000") {
// this.tid = this.$route.query.tid || ""; // this.tid = this.$route.query.tid || "";
......
src/components/common/inquirylist.vue
浏览文件 @ 62f79770
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<em v-if="item.userTrtcEntryStatus==2" class="offline"></em> <em v-if="item.userTrtcEntryStatus==2" class="offline"></em>
<div class="onedoctor"> <el-avatar src="https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png"></el-avatar></div> <div class="onedoctor"> <el-avatar src="https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png"></el-avatar></div>
<div class="onedoctorname"> {{item.userName}} <span>助诊医生</span> <div class="onedoctorname"> {{item.userName}} <span>助诊医生</span>
<div class="onedoctornum">{{item.userMobile}} <span v-if="item.userCallTime">{{}}小时前呼叫</span> <span v-if="inquiry.answer">未接听</span> <div class="onedoctornum">{{item.userMobile}} <span v-if="item.userCallTime">{{item.userCallTime}}小时前呼叫</span> <span v-if="inquiry.answer">未接听</span>
<img class="doctorcallImg" :src="doctorIncomingcallImg" v-show="item.userCallKfStatus =='0'" alt /> <img class="doctorcallImg" :src="doctorIncomingcallImg" v-show="item.userCallKfStatus =='0'" alt />
</div> </div>
</div> </div>
...@@ -124,8 +124,8 @@ export default { ...@@ -124,8 +124,8 @@ export default {
}, },
appointBeginTime() { appointBeginTime() {
if(this.item.appointBeginTime) { if(this.item.appointBeginTime) {
let starttime =this.item.appointBeginTime.slice(0,10) let starttime = String(this.item.appointBeginTime).slice(0,10)
let endtime = `${this.item.appointBeginTime.slice(11,16)}-${this.item.appointEndTime.slice(11,16)}` let endtime = `${String(this.item.appointBeginTime).slice(11,16)}-${String(this.item.appointEndTime).slice(11,16)}`
return starttime +' '+ endtime return starttime +' '+ endtime
}else{ }else{
return '' return ''
...@@ -412,625 +412,625 @@ export default { ...@@ -412,625 +412,625 @@ export default {
} }
} }
} }
@media screen and (min-width: 1911px) { @media screen and (min-width: 1911px) {
.inquirylist{ .inquirylist{
display: flex; display: flex;
margin-bottom: 10px; margin-bottom: 10px;
// margin: 20px 30px 0px; // margin: 20px 30px 0px;
padding: 10px 14px; padding: 10px 14px;
// background: #fff; // background: #fff;
overflow: hidden !important; overflow: hidden !important;
.el-row{ .el-row{
width: 100%; width: 100%;
height: 100%; height: 100%;
.el-col{ .el-col{
width: 510px; width: 510px;
height: 208px; height: 208px;
margin-left: 5px; margin-left: 5px;
margin-bottom: 12px; margin-bottom: 12px;
.el-card{ .el-card{
height: 100%; height: 100%;
border-radius: 18px; border-radius: 18px;
padding: 12px 32px 20px 34px ; padding: 12px 32px 20px 34px ;
}
} }
} }
}
.inquiryname{ .inquiryname{
display: flex; display: flex;
margin-bottom: 4px; margin-bottom: 4px;
.inquiryinfo{ .inquiryinfo{
.infone{ .infone{
font-size: 24px; font-size: 24px;
font-weight: 700; font-weight: 700;
margin-bottom: 6px; margin-bottom: 6px;
color: #063948;
>span{
font-size: 16px;
color: #063948; color: #063948;
>span{
font-size: 16px;
color: #063948;
display: inline-block;
margin-left: 6px;
}
}
.talk{
width: 96px;
height: 20px;
background: #F0F2F5;
border-radius: 23px;
color: #6A7990;
font-size: 13px;
line-height: 20px;
text-align: center;
display: inline-block; display: inline-block;
} margin-left: 6px;
.time{
width: 183px;
height: 20px;
background: #F0F2F5;
border-radius: 23px;
display: inline-block;
text-align: center;
line-height: 20px;
color: #6A7990;
margin-left: 5px;
font-size: 13px;
} }
} }
.inquirystatus{ .talk{
.status{ width: 96px;
position: relative; height: 20px;
right: -114px; background: #F0F2F5;
top: 6px; border-radius: 23px;
} color: #6A7990;
.inquirytime{ font-size: 13px;
position: relative; line-height: 20px;
left: 65px; text-align: center;
top: 12px; display: inline-block;
font-size: 14px;
color: #6A7990;
}
} }
} .time{
.inquirydoctor{ width: 183px;
margin-bottom: 10px; height: 20px;
padding-top: 14px; background: #F0F2F5;
display: flex; border-radius: 23px;
.visitingdoctor{ display: inline-block;
text-align: center;
line-height: 20px;
color: #6A7990;
margin-left: 5px;
font-size: 13px;
}
}
.inquirystatus{
.status{
position: relative; position: relative;
flex-basis: 50%; right: -114px;
display: flex; top: 6px;
padding: 5px 2px 7px 7px; }
.onedoctor{ .inquirytime{
width: 36px; position: relative;
height: 36px; left: 65px;
top: 12px;
font-size: 14px;
color: #6A7990;
}
}
}
.inquirydoctor{
margin-bottom: 10px;
padding-top: 14px;
display: flex;
.visitingdoctor{
position: relative;
flex-basis: 50%;
display: flex;
padding: 5px 2px 7px 7px;
.onedoctor{
width: 36px;
height: 36px;
}
.offline{
position: absolute;
top: 5px;
left: 4px;
width: 16px;
height: 16px;
background-image: url('../../assets/image/workbench/offline.png');
} }
.offline{ .onedoctorname{
position: absolute; // margin-top: 18px;
top: 5px; font-size: 15px;
left: 4px; color: #063948;
width: 16px; margin-bottom: 7px;
height: 16px; font-weight: 700;
background-image: url('../../assets/image/workbench/offline.png'); >span{
} font-size: 13px;
.onedoctorname{
// margin-top: 18px;
font-size: 15px;
color: #063948;
margin-bottom: 7px;
font-weight: 700;
>span{
font-size: 13px;
}
} }
.onedoctornum{ }
font-size: 14px; .onedoctornum{
margin-top: 5px; font-size: 14px;
.doctorcallImg{ margin-top: 5px;
width: 14px; .doctorcallImg{
height: 14px; width: 14px;
} height: 14px;
} }
} }
.helpdoctor{ }
flex-basis: 50%; .helpdoctor{
position: relative; flex-basis: 50%;
display: flex; position: relative;
margin-left: 8px; display: flex;
padding: 5px 2px 7px 7px;s margin-left: 8px;
.onedoctor{ padding: 5px 2px 7px 7px;s
width: 36px; .onedoctor{
height: 36px; width: 36px;
height: 36px;
}
.offline{
position: absolute;
top: 5px;
left: 4px;
width: 16px;
height: 16px;
background-image: url('../../assets/image/workbench/offline.png');
} }
.offline{ .onedoctorname{
position: absolute; // margin-top: 18px;
top: 5px; font-size: 15px;
left: 4px; color: #063948;
width: 16px; margin-bottom: 7px;
height: 16px; font-weight: 700;
background-image: url('../../assets/image/workbench/offline.png'); >span{
} font-size: 13px;
.onedoctorname{
// margin-top: 18px;
font-size: 15px;
color: #063948;
margin-bottom: 7px;
font-weight: 700;
>span{
font-size: 13px;
}
}
.onedoctornum{
font-size: 14px;
margin-top: 5px;
.doctorcallImg{
width: 14px;
height: 14px;
}
} }
} }
} .onedoctornum{
.inquiryroom{ font-size: 14px;
height: 45px; margin-top: 5px;
display: flex; .doctorcallImg{
font-size: 14px; width: 14px;
.goroom{ height: 14px;
cursor:pointer;
width: 238px;
height: 37px;
background: rgb(239, 246, 244);
border-radius: 23px;
text-align: center;
line-height: 37px;
>span{
color: #449284;
opacity: 1;
font-weight: 700;
} }
} }
.suggest{ }
cursor:pointer; }
width: 238px; .inquiryroom{
height: 45px;
display: flex;
font-size: 14px;
.goroom{
cursor:pointer;
width: 238px;
height: 37px;
background: rgb(239, 246, 244);
border-radius: 23px;
text-align: center;
line-height: 37px;
>span{
color: #449284; color: #449284;
margin-left: 24px; opacity: 1;
height: 37px;
background: rgb(239, 246, 244);
border-radius: 23px;
text-align: center;
line-height: 37px;
font-weight: 700; font-weight: 700;
.writesuggest{
position: relative;
top: -50px;
right: -150px;
color: #fff;
font-size: 14px;
text-align: center;
line-height: 20px;
width: 48px;
height: 20px;
background: #449284;
border-radius: 7px 7px 7px 0px;
}
} }
} }
.suggest{
cursor:pointer;
width: 238px;
color: #449284;
margin-left: 24px;
height: 37px;
background: rgb(239, 246, 244);
border-radius: 23px;
text-align: center;
line-height: 37px;
font-weight: 700;
.writesuggest{
position: relative;
top: -50px;
right: -150px;
color: #fff;
font-size: 14px;
text-align: center;
line-height: 20px;
width: 48px;
height: 20px;
background: #449284;
border-radius: 7px 7px 7px 0px;
}
}
} }
} }
@media screen and (max-width: 1509px) { }
.inquirylist{ @media screen and (max-width: 1509px) {
display: flex; .inquirylist{
margin-bottom: 10px; display: flex;
padding: 10px 5px; margin-bottom: 10px;
overflow: hidden !important; padding: 10px 5px;
.el-row{ overflow: hidden !important;
width: 100%; .el-row{
height: 100%; width: 100%;
.el-col{ height: 100%;
width: 510px; .el-col{
height: 208px; width: 510px;
margin-left: 5px; height: 208px;
margin-bottom: 12px; margin-left: 5px;
.el-card{ margin-bottom: 12px;
height: 100%; .el-card{
border-radius: 18px; height: 100%;
padding: 12px 32px 20px 34px ; border-radius: 18px;
} padding: 12px 32px 20px 34px ;
} }
} }
}
.inquiryname{ .inquiryname{
display: flex; display: flex;
margin-bottom: 4px; margin-bottom: 4px;
.inquiryinfo{ .inquiryinfo{
.infone{ .infone{
font-size: 24px; font-size: 24px;
font-weight: 700; font-weight: 700;
margin-bottom: 6px; margin-bottom: 6px;
color: #063948;
>span{
font-size: 16px;
color: #063948; color: #063948;
>span{
font-size: 16px;
color: #063948;
display: inline-block;
margin-left: 6px;
}
}
.talk{
width: 96px;
height: 20px;
background: #F0F2F5;
border-radius: 23px;
color: #6A7990;
font-size: 13px;
line-height: 20px;
text-align: center;
display: inline-block;
}
.time{
width: 183px;
height: 20px;
background: #F0F2F5;
border-radius: 23px;
display: inline-block; display: inline-block;
text-align: center; margin-left: 6px;
line-height: 20px;
color: #6A7990;
margin-left: 5px;
font-size: 13px;
} }
} }
.inquirystatus{ .talk{
.status{ width: 96px;
position: relative; height: 20px;
right: -114px; background: #F0F2F5;
top: 12px; border-radius: 23px;
} color: #6A7990;
.inquirytime{ font-size: 13px;
position: relative; line-height: 20px;
left: 65px; text-align: center;
top: 12px; display: inline-block;
font-size: 14px;
color: #6A7990;
}
} }
} .time{
.inquirydoctor{ width: 183px;
margin-bottom: 10px; height: 20px;
padding-top: 14px; background: #F0F2F5;
display: flex; border-radius: 23px;
.visitingdoctor{ display: inline-block;
text-align: center;
line-height: 20px;
color: #6A7990;
margin-left: 5px;
font-size: 13px;
}
}
.inquirystatus{
.status{
position: relative;
right: -114px;
top: 12px;
}
.inquirytime{
position: relative; position: relative;
flex-basis: 50%; left: 65px;
display: flex; top: 12px;
padding: 5px 2px 7px 7px; font-size: 14px;
.onedoctor{ color: #6A7990;
width: 36px; }
height: 36px; }
}
.inquirydoctor{
margin-bottom: 10px;
padding-top: 14px;
display: flex;
.visitingdoctor{
position: relative;
flex-basis: 50%;
display: flex;
padding: 5px 2px 7px 7px;
.onedoctor{
width: 36px;
height: 36px;
}
.offline{
position: absolute;
top: 5px;
left: 4px;
width: 16px;
height: 16px;
background-image: url('../../assets/image/workbench/offline.png');
} }
.offline{ .onedoctorname{
position: absolute; // margin-top: 18px;
top: 5px; font-size: 15px;
left: 4px; color: #063948;
width: 16px; margin-bottom: 7px;
height: 16px; font-weight: 700;
background-image: url('../../assets/image/workbench/offline.png'); >span{
}
.onedoctorname{
// margin-top: 18px;
font-size: 15px;
color: #063948;
margin-bottom: 7px;
font-weight: 700;
>span{
font-size: 14px;
}
}
.onedoctornum{
font-size: 14px; font-size: 14px;
margin-top: 5px;
.doctorcallImg{
width: 14px;
height: 14px;
}
} }
} }
.helpdoctor{ .onedoctornum{
flex-basis: 50%; font-size: 14px;
position: relative; margin-top: 5px;
display: flex; .doctorcallImg{
margin-left: 8px; width: 14px;
padding: 5px 2px 7px 7px;s height: 14px;
.onedoctor{
width: 36px;
height: 36px;
} }
.offline{ }
position: absolute; }
top: 5px; .helpdoctor{
left: 4px; flex-basis: 50%;
width: 16px; position: relative;
height: 16px; display: flex;
background-image: url('../../assets/image/workbench/offline.png'); margin-left: 8px;
} padding: 5px 2px 7px 7px;s
.onedoctorname{ .onedoctor{
// margin-top: 18px; width: 36px;
font-size: 15px; height: 36px;
color: #063948;
margin-bottom: 7px; }
font-weight: 700; .offline{
>span{ position: absolute;
font-size: 14px; top: 5px;
} left: 4px;
width: 16px;
height: 16px;
background-image: url('../../assets/image/workbench/offline.png');
} }
.onedoctornum{ .onedoctorname{
// margin-top: 18px;
font-size: 15px;
color: #063948;
margin-bottom: 7px;
font-weight: 700;
>span{
font-size: 14px; font-size: 14px;
margin-top: 5px;
.doctorcallImg{
width: 14px;
height: 14px;
}
} }
} }
} .onedoctornum{
.inquiryroom{ font-size: 14px;
height: 45px; margin-top: 5px;
display: flex; .doctorcallImg{
font-size: 14px; width: 14px;
.goroom{ height: 14px;
cursor:pointer;
width: 238px;
height: 37px;
background: rgb(239, 246, 244);
border-radius: 23px;
text-align: center;
line-height: 37px;
>span{
color: #449284;
opacity: 1;
font-weight: 700;
} }
} }
.suggest{ }
cursor:pointer; }
width: 238px; .inquiryroom{
height: 45px;
display: flex;
font-size: 14px;
.goroom{
cursor:pointer;
width: 238px;
height: 37px;
background: rgb(239, 246, 244);
border-radius: 23px;
text-align: center;
line-height: 37px;
>span{
color: #449284; color: #449284;
margin-left: 24px; opacity: 1;
height: 37px;
background: rgb(239, 246, 244);
border-radius: 23px;
text-align: center;
line-height: 37px;
font-weight: 700; font-weight: 700;
.writesuggest{
position: relative;
top: -50px;
right: -150px;
color: #fff;
font-size: 14px;
text-align: center;
line-height: 20px;
width: 48px;
height: 20px;
background: #449284;
border-radius: 7px 7px 7px 0px;
}
} }
} }
.suggest{
cursor:pointer;
width: 238px;
color: #449284;
margin-left: 24px;
height: 37px;
background: rgb(239, 246, 244);
border-radius: 23px;
text-align: center;
line-height: 37px;
font-weight: 700;
.writesuggest{
position: relative;
top: -50px;
right: -150px;
color: #fff;
font-size: 14px;
text-align: center;
line-height: 20px;
width: 48px;
height: 20px;
background: #449284;
border-radius: 7px 7px 7px 0px;
}
}
} }
} }
@media screen and (max-width: 1385px) { }
.inquirylist{ @media screen and (max-width: 1385px) {
display: flex; .inquirylist{
margin-bottom: 10px; display: flex;
padding: 10px 5px; margin-bottom: 10px;
overflow: hidden !important; padding: 10px 5px;
.el-row{ overflow: hidden !important;
width: 100%; .el-row{
height: 100%; width: 100%;
.el-col{ height: 100%;
width: 447px; .el-col{
height: 208px; width: 447px;
margin-left: 5px; height: 208px;
margin-bottom: 12px; margin-left: 5px;
.el-card{ margin-bottom: 12px;
height: 100%; .el-card{
border-radius: 18px; height: 100%;
padding: 12px 32px 20px 34px ; border-radius: 18px;
} padding: 12px 32px 20px 34px ;
} }
} }
}
.inquiryname{ .inquiryname{
display: flex; display: flex;
margin-bottom: 4px; margin-bottom: 4px;
.inquiryinfo{ .inquiryinfo{
.infone{ .infone{
font-size: 20px; font-size: 20px;
font-weight: 700; font-weight: 700;
margin-bottom: 6px; margin-bottom: 6px;
color: #063948; color: #063948;
>span{ >span{
font-size: 13px;
color: #063948;
display: inline-block;
margin-left: 6px;
}
}
.talk{
width: 80px;
height: 20px;
background: #F0F2F5;
border-radius: 23px;
color: #6A7990;
font-size: 13px; font-size: 13px;
line-height: 20px; color: #063948;
text-align: center;
display: inline-block;
}
.time{
width: 183px;
height: 20px;
background: #F0F2F5;
border-radius: 23px;
display: inline-block; display: inline-block;
text-align: center; margin-left: 6px;
line-height: 20px;
color: #6A7990;
margin-left: 5px;
font-size: 13px;
} }
} }
.inquirystatus{ .talk{
.status{ width: 80px;
position: relative; height: 20px;
right: -77px; background: #F0F2F5;
top: 6px; border-radius: 23px;
font-size: 14px; color: #6A7990;
} font-size: 13px;
.inquirytime{ line-height: 20px;
position: relative; text-align: center;
left: 35px; display: inline-block;
top: 10px;
font-size: 13px;
color: #6A7990;
}
} }
} .time{
.inquirydoctor{ width: 183px;
margin-bottom: 10px; height: 20px;
padding-top: 14px; background: #F0F2F5;
display: flex; border-radius: 23px;
.visitingdoctor{ display: inline-block;
text-align: center;
line-height: 20px;
color: #6A7990;
margin-left: 5px;
font-size: 13px;
}
}
.inquirystatus{
.status{
position: relative; position: relative;
flex-basis: 50%; right: -77px;
display: flex; top: 6px;
padding: 5px 2px 7px 7px; font-size: 14px;
.onedoctor{ }
width: 36px; .inquirytime{
height: 36px; position: relative;
left: 35px;
top: 10px;
font-size: 13px;
color: #6A7990;
}
}
}
.inquirydoctor{
margin-bottom: 10px;
padding-top: 14px;
display: flex;
.visitingdoctor{
position: relative;
flex-basis: 50%;
display: flex;
padding: 5px 2px 7px 7px;
.onedoctor{
width: 36px;
height: 36px;
}
.offline{
position: absolute;
top: 5px;
left: 4px;
width: 16px;
height: 16px;
background-image: url('../../assets/image/workbench/offline.png');
} }
.offline{ .onedoctorname{
position: absolute; // margin-top: 18px;
top: 5px; font-size: 13px;
left: 4px; color: #063948;
width: 16px; margin-bottom: 7px;
height: 16px; font-weight: 700;
background-image: url('../../assets/image/workbench/offline.png'); >span{
} font-size: 12px;
.onedoctorname{
// margin-top: 18px;
font-size: 13px;
color: #063948;
margin-bottom: 7px;
font-weight: 700;
>span{
font-size: 12px;
}
} }
.onedoctornum{ }
font-size: 14px; .onedoctornum{
margin-top: 5px; font-size: 14px;
.doctorcallImg{ margin-top: 5px;
width: 14px; .doctorcallImg{
height: 14px; width: 14px;
} height: 14px;
} }
} }
.helpdoctor{ }
flex-basis: 50%; .helpdoctor{
position: relative; flex-basis: 50%;
display: flex; position: relative;
margin-left: 8px; display: flex;
padding: 5px 2px 7px 7px;s margin-left: 8px;
.onedoctor{ padding: 5px 2px 7px 7px;s
width: 36px; .onedoctor{
height: 36px; width: 36px;
height: 36px;
}
.offline{
position: absolute;
top: 5px;
left: 4px;
width: 16px;
height: 16px;
background-image: url('../../assets/image/workbench/offline.png');
} }
.offline{ .onedoctorname{
position: absolute; // margin-top: 18px;
top: 5px; font-size: 13px;
left: 4px; color: #063948;
width: 16px; margin-bottom: 7px;
height: 16px; font-weight: 700;
background-image: url('../../assets/image/workbench/offline.png'); >span{
} font-size: 12px;
.onedoctorname{
// margin-top: 18px;
font-size: 13px;
color: #063948;
margin-bottom: 7px;
font-weight: 700;
>span{
font-size: 12px;
}
}
.onedoctornum{
font-size: 14px;
margin-top: 5px;
.doctorcallImg{
width: 14px;
height: 14px;
}
} }
} }
} .onedoctornum{
.inquiryroom{ font-size: 14px;
height: 45px; margin-top: 5px;
display: flex; .doctorcallImg{
font-size: 14px; width: 14px;
.goroom{ height: 14px;
cursor:pointer;
width: 238px;
height: 37px;
background: rgb(239, 246, 244);
border-radius: 23px;
text-align: center;
line-height: 37px;
>span{
color: #449284;
opacity: 1;
font-weight: 700;
} }
} }
.suggest{ }
cursor:pointer; }
width: 238px; .inquiryroom{
height: 45px;
display: flex;
font-size: 14px;
.goroom{
cursor:pointer;
width: 238px;
height: 37px;
background: rgb(239, 246, 244);
border-radius: 23px;
text-align: center;
line-height: 37px;
>span{
color: #449284; color: #449284;
margin-left: 24px; opacity: 1;
height: 37px;
background: rgb(239, 246, 244);
border-radius: 23px;
text-align: center;
line-height: 37px;
font-weight: 700; font-weight: 700;
.writesuggest{
position: relative;
top: -50px;
right: -150px;
color: #fff;
font-size: 14px;
text-align: center;
line-height: 20px;
width: 48px;
height: 20px;
background: #449284;
border-radius: 7px 7px 7px 0px;
}
} }
} }
.suggest{
cursor:pointer;
width: 238px;
color: #449284;
margin-left: 24px;
height: 37px;
background: rgb(239, 246, 244);
border-radius: 23px;
text-align: center;
line-height: 37px;
font-weight: 700;
.writesuggest{
position: relative;
top: -50px;
right: -150px;
color: #fff;
font-size: 14px;
text-align: center;
line-height: 20px;
width: 48px;
height: 20px;
background: #449284;
border-radius: 7px 7px 7px 0px;
}
}
} }
} }
.appointment{ }
width: 12px; .appointment{
height: 12px; width: 12px;
display: inline-block; height: 12px;
background: url('../../assets/image/workbench/appointment.png') no-repeat; display: inline-block;
background-size: cover; background: url('../../assets/image/workbench/appointment.png') no-repeat;
} background-size: cover;
}
.video{ .video{
width: 12px; width: 12px;
height: 12px; height: 12px;
......
src/store/module/socket.js
浏览文件 @ 62f79770
...@@ -11,8 +11,8 @@ export default { ...@@ -11,8 +11,8 @@ export default {
initSocket ({ commit, rootState }, payload) { initSocket ({ commit, rootState }, payload) {
const socket = io.connect(payload.url, { const socket = io.connect(payload.url, {
query: { query: {
// loginUserNum: `diagnose_list_socket_${userId}` loginUserNum: `diagnose_list_socket_${payload.userId}`
loginUserNum: `diagnose_list_socket_888` // loginUserNum: `diagnose_list_socket_888`
} }
}); });
commit('SET_SOCKET', socket); commit('SET_SOCKET', socket);
...@@ -46,14 +46,14 @@ export default { ...@@ -46,14 +46,14 @@ export default {
}); });
state.socketClient.on("diagnose_call_push_event", (socket) => { state.socketClient.on("diagnose_call_push_event", (socket) => {
console.log('diagnose_call_push_event---', socket); console.log('diagnose_call_push_event---', socket);
const l = store.noticeList; const l = store.state.noticeList;
if(l.length >=5){ if(l.length >=5){
l.shift(); l.shift();
} }
l.push(socket); l.push(socket);
const n = {notifyIndex: l.length, ...socket} const n = {notifyIndex: l.length, ...socket}
store.commit('updateNoticeList', l); store.commit('updateNoticeList', l);
store.commit('SET_NOTIFY', n); store.commit('socket/SET_NOTIFY', n);
}); });
state.socketClient.on('ping', function () { state.socketClient.on('ping', function () {
console.log('[E] 心跳请求已发出 →', true); console.log('[E] 心跳请求已发出 →', true);
...@@ -63,14 +63,14 @@ export default { ...@@ -63,14 +63,14 @@ export default {
console.log('[E] 心跳响应已收到 ←', true); console.log('[E] 心跳响应已收到 ←', true);
}); });
}, },
SET_NOTIFY: (state, payload) => { SET_NOTIFY: (state, payload) => {
console.log('--payload', payload) console.log('--payload', payload)
let doms = document.getElementsByClassName('el-notification') let doms = document.getElementsByClassName('el-notification')
if (doms.length >= 5) return if (doms.length >= 5) return
const h = _VM.$createElement; const h = _VM.$createElement;
const t = payload.department ? `问诊单${payload.diagnoseLogId}(${payload.department})` : `问诊单${payload.diagnoseLogId}`
const cn = _VM.$notify({ const cn = _VM.$notify({
title: `问诊单195(${payload.department})`, title: t,
message: h("p", [ message: h("p", [
h("i", {style: `color: teal;`}, `${payload.doctorName}正在呼叫你`), h("i", {style: `color: teal;`}, `${payload.doctorName}正在呼叫你`),
h( h(
...@@ -79,7 +79,6 @@ export default { ...@@ -79,7 +79,6 @@ export default {
style: `float:right;margin-top:${30}px;`, style: `float:right;margin-top:${30}px;`,
on: { on: {
click: function () { click: function () {
console.log('--click', payload)
store.dispatch('gotoInquiry', payload); store.dispatch('gotoInquiry', payload);
cn.close(); cn.close();
}, },
...@@ -91,7 +90,7 @@ export default { ...@@ -91,7 +90,7 @@ export default {
onClose: function () { onClose: function () {
console.log('--onClose',payload ) console.log('--onClose',payload )
}, },
duration: 0, duration: 5000,
position: 'top-right', position: 'top-right',
}) })
} }
......
src/views/IM/diagnosis-admin/workbench.vue
浏览文件 @ 62f79770
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<el-radio-button v-for="(item, index) in currentCalList" :key="'for'+index" :label="item.status"> <el-radio-button v-for="(item, index) in currentCalList" :key="'for'+index" :label="item.status">
{{item.statusStr}}({{item.count}}) {{item.statusStr}}({{item.count}})
</el-radio-button> </el-radio-button>
<el-radio-button label="1">待处理({{currentCalList}})</el-radio-button> <!-- <el-radio-button label="1">待处理({{currentCalList}})</el-radio-button>-->
</el-radio-group> </el-radio-group>
<div class="forbox"> <div class="forbox">
<div class="for" v-for="(item, index) in currentDiagList" :key="'for'+index"> <div class="for" v-for="(item, index) in currentDiagList" :key="'for'+index">
...@@ -63,6 +63,25 @@ export default { ...@@ -63,6 +63,25 @@ export default {
soketQuest:'soketQuest', soketQuest:'soketQuest',
isSuperAdmin: 'isSuperAdmin' isSuperAdmin: 'isSuperAdmin'
}), }),
},
watch: {
isSuperAdmin(newdata,olddata){
if(newdata !==olddata && newdata.userID){
const s = storejs.get('soketQuest');
const d = s ? s.dateTime : new Date().format('yyyy-MM-dd');
console.log('---s', s, this.isSuperAdmin);
let id = s && s.operateUserId ? s.operateUserId : this.isSuperAdmin.userID;
const p = {
dateTime: d,
operateUserId: id,
pageNo: s ? s.pageNo : 1,
pageSize: s ? s.pageSize : 6,
returnStatus: s ? s.returnStatus : 1,
};
this.searchParam = p;
this.inquirySearch()
}
}
}, },
data(){ data(){
const s = storejs.get('soketQuest'); const s = storejs.get('soketQuest');
...@@ -76,7 +95,7 @@ export default { ...@@ -76,7 +95,7 @@ export default {
dateTime: d, dateTime: d,
operateUserId: '', operateUserId: '',
returnStatus: 1, returnStatus: 1,
pageSize: 6, pageSize: 1,
pageNo: 1, pageNo: 1,
}, },
testlistdata: [ testlistdata: [
...@@ -110,18 +129,7 @@ export default { ...@@ -110,18 +129,7 @@ export default {
} }
}, },
created(){ created(){
const s = storejs.get('soketQuest');
const d = s ? s.dateTime : new Date().format('yyyy-MM-dd');
let id = s ? s.operateUserId : this.isSuperAdmin.userID;
const p = {
dateTime: d,
operateUserId: id,
pageNo: s ? s.pageNo : 1,
pageSize: s ? s.pageSize : 6,
returnStatus: s ? s.returnStatus : 1,
};
this.searchParam = p;
this.inquirySearch()
}, },
methods:{ methods:{
tabChange (val) { tabChange (val) {
...@@ -161,9 +169,9 @@ export default { ...@@ -161,9 +169,9 @@ export default {
} }
}) })
// 测试代码 // 测试代码
const l = this.currentDiagList; // const l = this.currentDiagList;
l.push(...this.testlistdata); // l.push(...this.testlistdata);
this.$store.commit('updateCurrentDiagList', l); // this.$store.commit('updateCurrentDiagList', l);
// this.$store.commit('socket/SET_NOTIFY', ...this.testlistdata); // this.$store.commit('socket/SET_NOTIFY', ...this.testlistdata);
}, },
}, },
......
src/views/layout/slidebar.vue
浏览文件 @ 62f79770
...@@ -68,6 +68,7 @@ export default { ...@@ -68,6 +68,7 @@ export default {
this.POST("/basic-data/menu/list", { systemType: this.systemType }).then(res => { this.POST("/basic-data/menu/list", { systemType: this.systemType }).then(res => {
if (res.code == "000000") { if (res.code == "000000") {
let { vueMenuDtos, userId } = res.data; let { vueMenuDtos, userId } = res.data;
console.log('---userId', res.data, userId);
// let vueMenuDtos = []; // let vueMenuDtos = [];
// // TODO 开发调试时写死, 发布时去掉 // // TODO 开发调试时写死, 发布时去掉
...@@ -81,6 +82,7 @@ export default { ...@@ -81,6 +82,7 @@ export default {
isSuper:false, isSuper:false,
userID: userId userID: userId
}; };
this.$store.dispatch( 'socket/initSocket',{url: 'https://dev-sockets.yunqueyi.com',userId: userId})
vueMenuDtos.map( item => { vueMenuDtos.map( item => {
if(item.index.indexOf('administrators') > -1){ if(item.index.indexOf('administrators') > -1){
// 超级管理员 // 超级管理员
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或