提交 9fb217cc 编写于 作者: lyf's avatar lyf

修改呼叫状态

...@@ -150,7 +150,7 @@ export default { ...@@ -150,7 +150,7 @@ export default {
.content { .content {
background: #f0f2f5; background: #f0f2f5;
position: absolute; position: absolute;
left: 255px; left: 215px;
right: 0; right: 0;
top: 64px; top: 64px;
bottom: 0; bottom: 0;
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</div> </div>
</div> </div>
<div class="inquiry-user-info"> <div class="inquiry-user-info">
<div> <div class="info-name-wrap">
<span class="info-name"> <span class="info-name">
{{ item.doctorName }} {{ item.doctorName }}
</span> </span>
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
</div> </div>
</div> </div>
<div class="call-status"> <div class="call-status" v-if="item.diagnoseType == 1 || item.diagnoseType == 2">
<img <img
v-if="isCall" v-if="isCall"
@click="drivingCall(item.doctorId, 2)" @click="drivingCall(item.doctorId, 2)"
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
</div> </div>
</div> </div>
<div class="inquiry-user-info"> <div class="inquiry-user-info">
<div> <div class="info-name-wrap">
<span class="info-name"> <span class="info-name">
{{ item.userName }} {{ item.userName }}
</span> </span>
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
</div> </div>
</div> </div>
<div class="call-status"> <div class="call-status" v-if="item.diagnoseType == 1 || item.diagnoseType == 2">
<img <img
v-if="isCall" v-if="isCall"
@click="drivingCall(item.userId, 1)" @click="drivingCall(item.userId, 1)"
...@@ -385,7 +385,7 @@ export default { ...@@ -385,7 +385,7 @@ export default {
.inquiry-wrap { .inquiry-wrap {
box-sizing: border-box; box-sizing: border-box;
margin-bottom: 10px; margin-bottom: 10px;
padding: 20px 34px; padding: 20px 32px;
background: #ffffff; background: #ffffff;
border-radius: 18px; border-radius: 18px;
user-select: none; user-select: none;
...@@ -488,8 +488,16 @@ export default { ...@@ -488,8 +488,16 @@ export default {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
.info-name-wrap{
display: flex;
align-items: center;
}
.info-name { .info-name {
display: inline-block;
max-width: 85px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-size: 18px; font-size: 18px;
color: #02120f; color: #02120f;
font-weight: bold; font-weight: bold;
......
...@@ -56,7 +56,10 @@ export default { ...@@ -56,7 +56,10 @@ export default {
const n = {notifyIndex: l.length, ...socket} const n = {notifyIndex: l.length, ...socket}
store.commit('updateNoticeList', l); store.commit('updateNoticeList', l);
console.log('--_VM', _VM) console.log('--_VM', _VM)
store.commit('socket/SET_NOTIFY', n); const {path} =_VM.$route;
if(path && String(path).indexOf('workbench') > -1){
store.commit('socket/SET_NOTIFY', n);
}
}); });
state.socketClient.on('ping', function () { state.socketClient.on('ping', function () {
console.log('[E] 心跳请求已发出 →', true); console.log('[E] 心跳请求已发出 →', true);
......
...@@ -128,7 +128,7 @@ html,body{ ...@@ -128,7 +128,7 @@ html,body{
// width: 163vh !important; // width: 163vh !important;
// height: 66vh !important; // height: 66vh !important;
// height: 430px !important; // height: 430px !important;
margin: 20px 30px 0px; margin: 10px 10px 0px;
overflow: auto; overflow: auto;
} }
} }
...@@ -138,7 +138,7 @@ html,body{ ...@@ -138,7 +138,7 @@ html,body{
// height: 78vh !important; // height: 78vh !important;
// height: 800px !important; // height: 800px !important;
overflow: auto; overflow: auto;
margin: 20px 30px 0px; margin: 10px 10px 0px;
} }
} }
......
...@@ -89,6 +89,7 @@ export default { ...@@ -89,6 +89,7 @@ export default {
isSuperAdmin(newdata, olddata) { isSuperAdmin(newdata, olddata) {
// console.log("ererer") // console.log("ererer")
if (newdata !== olddata && newdata.userID) { if (newdata !== olddata && newdata.userID) {
console.log('-isSuperAdminisSuperAdmin', newdata)
const s = storejs.get("soketQuest"); const s = storejs.get("soketQuest");
const d = s ? s.dateTime : new Date().format("yyyy-MM-dd"); const d = s ? s.dateTime : new Date().format("yyyy-MM-dd");
let id = let id =
...@@ -297,8 +298,8 @@ export default { ...@@ -297,8 +298,8 @@ export default {
} }
} }
.workbench-content { .workbench-content {
min-width: 1250px; //min-width: 1250px;
padding: 20px; padding: 20px 10px;
.workbench-li-c { .workbench-li-c {
width: 100%; width: 100%;
.grid-c { .grid-c {
...@@ -373,4 +374,16 @@ export default { ...@@ -373,4 +374,16 @@ export default {
padding: 10px 0; padding: 10px 0;
background-color: #f9fafc; background-color: #f9fafc;
} }
// 屏幕适配
@media screen and (min-width: 1240px) and (max-width: 1441px){
.workbench-container{
.workbench-li-c{
.grid-c{
.workbench-li{
//max-width: 572px;
}
}
}
}
}
</style> </style>
...@@ -136,7 +136,7 @@ export default { ...@@ -136,7 +136,7 @@ export default {
// background-color: #242f42; // background-color: #242f42;
.logo { .logo {
float: left; float: left;
width: 255px; width: 215px;
text-align: center; text-align: center;
color: #fff; color: #fff;
background: #0b2f3f; background: #0b2f3f;
......
...@@ -157,7 +157,7 @@ export default { ...@@ -157,7 +157,7 @@ export default {
left: 0; left: 0;
top: 64px; top: 64px;
bottom: 0; bottom: 0;
width: 255px; width: 215px;
background: #06232c; background: #06232c;
.el-menu { .el-menu {
background: #06232c; background: #06232c;
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册