Skip to content

P
pica-admin-consultation
提交 b7059779 编写于 作者: jing.rong's avatar jing.rong
浏览文件
操作

Merge branch 'develop' of... 

Merge branch 'develop' of http://192.168.110.53/com.pica.cloud.education.frontend/pica-admin-consultation into feat/rj
上级 909f9823 ee7e0bf0
隐藏空白字符变更
内嵌 并排
正在显示 包含 440 行增加 和 2 行删除
package-lock.json
浏览文件 @ b7059779
...@@ -22,6 +22,11 @@ ...@@ -22,6 +22,11 @@
"regenerator-runtime": "^0.13.4" "regenerator-runtime": "^0.13.4"
} }
}, },
"@types/component-emitter": {
"version": "1.2.10",
"resolved": "http://192.168.110.93:4873/@types%2fcomponent-emitter/-/component-emitter-1.2.10.tgz",
"integrity": "sha1-71sVibnxZURkLkc9tepWORB+8+o="
},
"abbrev": { "abbrev": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "http://192.168.110.93:4873/abbrev/-/abbrev-1.1.1.tgz", "resolved": "http://192.168.110.93:4873/abbrev/-/abbrev-1.1.1.tgz",
...@@ -1102,6 +1107,11 @@ ...@@ -1102,6 +1107,11 @@
"integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
"dev": true "dev": true
}, },
"backo2": {
"version": "1.0.2",
"resolved": "http://192.168.110.93:4873/backo2/-/backo2-1.0.2.tgz",
"integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc="
},
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "http://192.168.110.93:4873/balanced-match/-/balanced-match-1.0.0.tgz", "resolved": "http://192.168.110.93:4873/balanced-match/-/balanced-match-1.0.0.tgz",
...@@ -1175,6 +1185,11 @@ ...@@ -1175,6 +1185,11 @@
} }
} }
}, },
"base64-arraybuffer": {
"version": "0.1.4",
"resolved": "http://192.168.110.93:4873/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz",
"integrity": "sha1-mBjHngWbE1X5fgQooBfIOOkLqBI="
},
"base64-js": { "base64-js": {
"version": "1.5.1", "version": "1.5.1",
"resolved": "http://192.168.110.93:4873/base64-js/-/base64-js-1.5.1.tgz", "resolved": "http://192.168.110.93:4873/base64-js/-/base64-js-1.5.1.tgz",
...@@ -1717,8 +1732,7 @@ ...@@ -1717,8 +1732,7 @@
"component-emitter": { "component-emitter": {
"version": "1.3.0", "version": "1.3.0",
"resolved": "http://192.168.110.93:4873/component-emitter/-/component-emitter-1.3.0.tgz", "resolved": "http://192.168.110.93:4873/component-emitter/-/component-emitter-1.3.0.tgz",
"integrity": "sha1-FuQHD7qK4ptnnyIVhT7hgasuq8A=", "integrity": "sha1-FuQHD7qK4ptnnyIVhT7hgasuq8A="
"dev": true
}, },
"compressible": { "compressible": {
"version": "2.0.18", "version": "2.0.18",
...@@ -2314,6 +2328,45 @@ ...@@ -2314,6 +2328,45 @@
"integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
"dev": true "dev": true
}, },
"engine.io-client": {
"version": "5.1.2",
"resolved": "http://192.168.110.93:4873/engine.io-client/-/engine.io-client-5.1.2.tgz",
"integrity": "sha1-JxCNqbOa4DJiRD2UXK8sqjZVxMs=",
"requires": {
"base64-arraybuffer": "0.1.4",
"component-emitter": "~1.3.0",
"debug": "~4.3.1",
"engine.io-parser": "~4.0.1",
"has-cors": "1.1.0",
"parseqs": "0.0.6",
"parseuri": "0.0.6",
"ws": "~7.4.2",
"yeast": "0.1.2"
},
"dependencies": {
"debug": {
"version": "4.3.2",
"resolved": "http://192.168.110.93:4873/debug/-/debug-4.3.2.tgz",
"integrity": "sha1-8KScGKyHeeMdSgxgKd+3aHPHQos=",
"requires": {
"ms": "2.1.2"
}
},
"ms": {
"version": "2.1.2",
"resolved": "http://192.168.110.93:4873/ms/-/ms-2.1.2.tgz",
"integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk="
}
}
},
"engine.io-parser": {
"version": "4.0.2",
"resolved": "http://192.168.110.93:4873/engine.io-parser/-/engine.io-parser-4.0.2.tgz",
"integrity": "sha1-5B0LP7Zve/SjZx0gOKFUAk7bUB4=",
"requires": {
"base64-arraybuffer": "0.1.4"
}
},
"enhanced-resolve": { "enhanced-resolve": {
"version": "0.9.1", "version": "0.9.1",
"resolved": "http://192.168.110.93:4873/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz", "resolved": "http://192.168.110.93:4873/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz",
...@@ -3521,6 +3574,11 @@ ...@@ -3521,6 +3574,11 @@
} }
} }
}, },
"has-cors": {
"version": "1.1.0",
"resolved": "http://192.168.110.93:4873/has-cors/-/has-cors-1.1.0.tgz",
"integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk="
},
"has-flag": { "has-flag": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "http://192.168.110.93:4873/has-flag/-/has-flag-1.0.0.tgz", "resolved": "http://192.168.110.93:4873/has-flag/-/has-flag-1.0.0.tgz",
...@@ -5639,6 +5697,16 @@ ...@@ -5639,6 +5697,16 @@
"error-ex": "^1.2.0" "error-ex": "^1.2.0"
} }
}, },
"parseqs": {
"version": "0.0.6",
"resolved": "http://192.168.110.93:4873/parseqs/-/parseqs-0.0.6.tgz",
"integrity": "sha1-jku1oZ0c3IRKCKyXTTTic6+mcNU="
},
"parseuri": {
"version": "0.0.6",
"resolved": "http://192.168.110.93:4873/parseuri/-/parseuri-0.0.6.tgz",
"integrity": "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow=="
},
"parseurl": { "parseurl": {
"version": "1.3.3", "version": "1.3.3",
"resolved": "http://192.168.110.93:4873/parseurl/-/parseurl-1.3.3.tgz", "resolved": "http://192.168.110.93:4873/parseurl/-/parseurl-1.3.3.tgz",
...@@ -7607,6 +7675,60 @@ ...@@ -7607,6 +7675,60 @@
"hoek": "2.x.x" "hoek": "2.x.x"
} }
}, },
"socket.io-client": {
"version": "4.1.3",
"resolved": "http://192.168.110.93:4873/socket.io-client/-/socket.io-client-4.1.3.tgz",
"integrity": "sha1-I22qZCqfIpky4AtyIehDv3QjKmI=",
"requires": {
"@types/component-emitter": "^1.2.10",
"backo2": "~1.0.2",
"component-emitter": "~1.3.0",
"debug": "~4.3.1",
"engine.io-client": "~5.1.2",
"parseuri": "0.0.6",
"socket.io-parser": "~4.0.4"
},
"dependencies": {
"debug": {
"version": "4.3.2",
"resolved": "http://192.168.110.93:4873/debug/-/debug-4.3.2.tgz",
"integrity": "sha1-8KScGKyHeeMdSgxgKd+3aHPHQos=",
"requires": {
"ms": "2.1.2"
}
},
"ms": {
"version": "2.1.2",
"resolved": "http://192.168.110.93:4873/ms/-/ms-2.1.2.tgz",
"integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk="
}
}
},
"socket.io-parser": {
"version": "4.0.4",
"resolved": "http://192.168.110.93:4873/socket.io-parser/-/socket.io-parser-4.0.4.tgz",
"integrity": "sha1-nqIbDWFQjRgZbvBKLGuatjD0wrA=",
"requires": {
"@types/component-emitter": "^1.2.10",
"component-emitter": "~1.3.0",
"debug": "~4.3.1"
},
"dependencies": {
"debug": {
"version": "4.3.2",
"resolved": "http://192.168.110.93:4873/debug/-/debug-4.3.2.tgz",
"integrity": "sha1-8KScGKyHeeMdSgxgKd+3aHPHQos=",
"requires": {
"ms": "2.1.2"
}
},
"ms": {
"version": "2.1.2",
"resolved": "http://192.168.110.93:4873/ms/-/ms-2.1.2.tgz",
"integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk="
}
}
},
"sockjs": { "sockjs": {
"version": "0.3.21", "version": "0.3.21",
"resolved": "http://192.168.110.93:4873/sockjs/-/sockjs-0.3.21.tgz", "resolved": "http://192.168.110.93:4873/sockjs/-/sockjs-0.3.21.tgz",
...@@ -9047,6 +9169,11 @@ ...@@ -9047,6 +9169,11 @@
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
"dev": true "dev": true
}, },
"ws": {
"version": "7.4.6",
"resolved": "http://192.168.110.93:4873/ws/-/ws-7.4.6.tgz",
"integrity": "sha1-VlTKjs3u5HwzqaS/bSjivimAN3w="
},
"xtend": { "xtend": {
"version": "4.0.2", "version": "4.0.2",
"resolved": "http://192.168.110.93:4873/xtend/-/xtend-4.0.2.tgz", "resolved": "http://192.168.110.93:4873/xtend/-/xtend-4.0.2.tgz",
...@@ -9091,6 +9218,11 @@ ...@@ -9091,6 +9218,11 @@
"decamelize": "^1.2.0" "decamelize": "^1.2.0"
} }
}, },
"yeast": {
"version": "0.1.2",
"resolved": "http://192.168.110.93:4873/yeast/-/yeast-0.1.2.tgz",
"integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk="
},
"zrender": { "zrender": {
"version": "4.3.2", "version": "4.3.2",
"resolved": "http://192.168.110.93:4873/zrender/-/zrender-4.3.2.tgz", "resolved": "http://192.168.110.93:4873/zrender/-/zrender-4.3.2.tgz",
......
package.json
浏览文件 @ b7059779
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
"js-cookie": "^2.2.0", "js-cookie": "^2.2.0",
"qiniu-js": "^3.1.2", "qiniu-js": "^3.1.2",
"showdown": "^1.6.4", "showdown": "^1.6.4",
"socket.io-client": "^4.1.3",
"vue": "^2.1.0", "vue": "^2.1.0",
"vue-router": "^2.1.1", "vue-router": "^2.1.1",
"vuex": "^2.0.0" "vuex": "^2.0.0"
......
src/components/common/inquirylist.vue 0 → 100644
浏览文件 @ b7059779
<template>
<div class="inquirylist">
<el-row>
<el-col :span="8" :key="o" :offset="index > 0 ? 2 : 0">
<el-card shadow="always" :body-style="{ padding: '0px' }">
<div class="inquiryname">
<div class="inquiryinfo">
<div class="infone">问诊单{{inquiry.listnumber}}<span class="department">({{inquiry.department}}) </span></div>
<div class="talk">{{inquiry.voice}}</div>
<div class="time">{{inquiry.time}}</div>
</div>
<div class="inquirystatus">
<span class="status">状态：{{inquiry.status}}</span>
<div class="inquiryimg" v-if="inquiry.status==''">图片</div>
<div class="inquirytime" v-if="inquiry.countdown"><span></span> 00:00:15</div>
</div>
</div>
<div class="inquirydoctor">
<div class="visitingdoctor">
<div class="onedoctor"><span>img</span>接诊医生 <el-tag v-if="inquiry.online" size="mini" type="danger" effect="dark">离线</el-tag></div>
<div class="onedoctorname">{{inquiry.visitingdoctor}}</div>
<div class="onedoctornum"> <span>{{inquiry.visitingdoctornum}}</span> <span @click="calldoc()" class="calldoctor"><span v-if="calldoctor">呼叫医生</span> <span v-else>呼叫中...</span></span> </div>
</div>
<div class="helpdoctor">
<div class="onedoctor"><span>img</span>接诊医生 <el-tag v-if="inquiry.online" size="mini" type="danger" effect="dark">离线</el-tag></div>
<div class="onedoctorname">{{inquiry.helpdoctor}}</div>
<div class="onedoctornum"> <span>{{inquiry.helpdoctornum}}</span> <span @click="calldoc()" class="calldoctor"><span v-if="calldoctor">呼叫医生</span> <span v-else>呼叫中...</span></span> </div>
</div>
</div>
<div class="inquiryroom">
<span class="goroom">进入诊室</span>
<span class="suggest">诊断建议</span>
</div>
</el-card>
</el-col>
</el-row>
</div>
</template>
<script>
export default {
data() {
return {
inquiry:{
time:new Date().getFullYear()+'-07-14 14:00-15:00',
status:'异常',
department:'内科',
listnumber:'3520',
countdown:'1',
online:true,
voice:'语音问诊',
visitingdoctor:'孙四百',
helpdoctor:'孙四百',
visitingdoctornum:'111111111111',
helpdoctornum:'1111111111111'
},
calldoctor:true
};
},
created() {
// vm = this;
},
methods: {
calldoc() {
this.calldoctor = false
}
}
}
</script>
<style lang="scss" scoped>
.inquirylist{
display: flex;
flex-basis: 30%;
width: 30%;
margin-bottom: 10px;
margin: 20px 30px 0px;
padding: 10px 5px;
// background: #fff;
overflow: hidden !important;
.el-row{
// flex-basis: 31%;
width: 100%;
height: 100%;
.el-col{
width: 100%;
height: 260px;
.el-card{
height: 100%;
}
}
.el-col-offset-2{
margin-left: 1%;
}
}
.inquiryname{
display: flex;
height: 100px;
border-bottom: rgb(209, 208, 208) 1px solid;
.inquiryinfo{
padding: 8px 7px;
.infone{
font-size: 18px;
font-weight: 700;
margin-bottom: 20px;
>span{
font-size: 14px;
color: #b2aeae;
display: inline-block;
margin-left: 5px;
}
}
.talk{
font-size: 14px;
color: #b2aeae;
margin-bottom: 7px;
}
.time{
color: #b2aeae;
font-size: 14px;
}
}
.inquirystatus{
.status{
position: absolute;
right: 24px;
top: 12px;
}
.inquiryimg{
position: absolute;
right: 24px;
top: 60px;
}
.inquirytime{
position: absolute;
right: 24px;
top: 40px;
font-size: 14px;
color: #b2aeae;
}
}
}
.inquirydoctor{
height: 115px;
border-bottom: rgb(209, 208, 208) 1px solid;
display: flex;
.visitingdoctor{
flex-basis: 50%;
padding: 5px 2px 7px 7px;
border-right: rgb(209, 208, 208) 1px solid;
.el-tag{
width: 30px;
height: 14px;
font-size: 10px !important;
line-height: 12px;
padding-left: 2px;
}
.el-tag--dark.el-tag--danger{
background-color: rgb(208, 2, 27);
border-color: rgb(208, 2, 27);
}
.onedoctor{
font-size: 14px;
color: #b2aeae;
margin: 4px;
margin-top: 10px;
}
.onedoctorname{
margin-top: 18px;
font-size: 14px;
margin-bottom: 7px;
}
.onedoctornum{
font-size: 14px;
.calldoctor{
display: inline-block;
border-radius: 12px;
border: 1px solid rgb(129, 178, 234);
font-size: 12px;
color: rgb(129, 178, 234);
width: 59px;
height: 20px;
padding-left: 4px;
margin-left: 13px;
cursor:pointer;
}
}
}
.helpdoctor{
flex-basis: 50%;
padding: 5px 2px 7px 7px;
.el-tag{
width: 30px;
height: 14px;
font-size: 10px !important;
line-height: 12px;
padding-left: 2px;
}
.el-tag--dark.el-tag--danger{
background-color: rgb(208, 2, 27);
border-color: rgb(208, 2, 27);
}
.onedoctor{
font-size: 14px;
color: #b2aeae;
margin: 4px;
margin-top: 10px;
}
.onedoctorname{
margin-top: 18px;
font-size: 14px;
margin-bottom: 7px;
}
.onedoctornum{
font-size: 14px;
.calldoctor{
display: inline-block;
border-radius: 12px;
border: 1px solid rgb(129, 178, 234);
font-size: 12px;
color: rgb(129, 178, 234);
width: 59px;
height: 20px;
padding-left: 4px;
margin-left: 13px;
cursor:pointer;
}
}
}
}
.inquiryroom{
height: 45px;
display: flex;
.goroom{
display: inline-block;
font-weight: 700;
flex-basis: 50%;
text-align: center;
height: 100%;
line-height: 45px;
border-right: rgb(209, 208, 208) 1px solid;
}
.suggest{
cursor:pointer;
font-weight: 700;
flex-basis: 50%;
display: inline-block;
text-align: center;
height: 100%;
line-height: 45px;
}
}
}
</style>
\ No newline at end of file
src/main.js
浏览文件 @ b7059779
...@@ -49,6 +49,8 @@ const router = new VueRouter({ ...@@ -49,6 +49,8 @@ const router = new VueRouter({
} }
}) })
Vue.use(TRTC) Vue.use(TRTC)
window.TRTC = TRTC window.TRTC = TRTC
Vue.use(TIM) Vue.use(TIM)
......
src/store/modules/loginUser.js 0 → 100644
浏览文件 @ b7059779
import { io } from "socket.io-client";
export default {
namespaced: true,
state: {
socketClient: null
},
actions: {
initSocket ({ commit, rootState }, payload) {
const socket = io("https://example.com", {
reconnectionDelayMax: 10000,
reconnectionAttempts:'Infinity',
reconnection: true,
transports: ["websocket"], // use WebSocket first, if available
extraHeaders: {"my-custom-header": "1234"},
query: {
x: 42
}
});
commit('SET_SOCKET', socket);
},
},
mutations: {
SET_SOCKET: (state, payload) => {
state.socketClient = payload;
},
SET_IOLISTION: (state, payload) => {
if(!state.socketClient){
return false;
}
state.socketClient.on("connection", (socket) => {
console.log(socket);
});
state.socketClient.on("connect_error", (err) => {
if (err.message === "invalid credentials") {
}
});
state.socketClient.on("disconnect", (socket) => {
console.log(socket);
});
state.socketClient.on("data", (socket) => {
console.log(socket);
});
},
},
};
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或