Skip to content

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

Merge branch 'develop' into 'release' 

Develop

See merge request com.pica.cloud.education.frontend/pica-admin-consultation!121
上级 cd17a73f da3917ca
展开全部 显示空白字符变更
内嵌 并排
正在显示 包含 243 行增加 和 54 行删除
package-lock.json
浏览文件 @ d732d625
...@@ -1308,6 +1308,7 @@ ...@@ -1308,6 +1308,7 @@
"resolved": "http://192.168.110.93:4873/boom/-/boom-2.10.1.tgz", "resolved": "http://192.168.110.93:4873/boom/-/boom-2.10.1.tgz",
"integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"hoek": "2.x.x" "hoek": "2.x.x"
} }
...@@ -2099,6 +2100,11 @@ ...@@ -2099,6 +2100,11 @@
} }
} }
}, },
"dayjs": {
"version": "1.10.6",
"resolved": "http://192.168.110.93:4873/dayjs/-/dayjs-1.10.6.tgz",
"integrity": "sha1-KIsqqC8thBimydTfWJjAc3rQKmM="
},
"de-indent": { "de-indent": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "http://192.168.110.93:4873/de-indent/-/de-indent-1.0.2.tgz", "resolved": "http://192.168.110.93:4873/de-indent/-/de-indent-1.0.2.tgz",
...@@ -2831,7 +2837,8 @@ ...@@ -2831,7 +2837,8 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
...@@ -2852,12 +2859,14 @@ ...@@ -2852,12 +2859,14 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -2872,17 +2881,20 @@ ...@@ -2872,17 +2881,20 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -2999,7 +3011,8 @@ ...@@ -2999,7 +3011,8 @@
"inherits": { "inherits": {
"version": "2.0.4", "version": "2.0.4",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -3011,6 +3024,7 @@ ...@@ -3011,6 +3024,7 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -3025,6 +3039,7 @@ ...@@ -3025,6 +3039,7 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
...@@ -3032,12 +3047,14 @@ ...@@ -3032,12 +3047,14 @@
"minimist": { "minimist": {
"version": "1.2.5", "version": "1.2.5",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.9.0", "version": "2.9.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -3056,6 +3073,7 @@ ...@@ -3056,6 +3073,7 @@
"version": "0.5.3", "version": "0.5.3",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "^1.2.5" "minimist": "^1.2.5"
} }
...@@ -3117,7 +3135,8 @@ ...@@ -3117,7 +3135,8 @@
"npm-normalize-package-bin": { "npm-normalize-package-bin": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"npm-packlist": { "npm-packlist": {
"version": "1.4.8", "version": "1.4.8",
...@@ -3145,7 +3164,8 @@ ...@@ -3145,7 +3164,8 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -3157,6 +3177,7 @@ ...@@ -3157,6 +3177,7 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -3234,7 +3255,8 @@ ...@@ -3234,7 +3255,8 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -3270,6 +3292,7 @@ ...@@ -3270,6 +3292,7 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -3289,6 +3312,7 @@ ...@@ -3289,6 +3312,7 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -3332,12 +3356,14 @@ ...@@ -3332,12 +3356,14 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.1.1", "version": "3.1.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
} }
} }
}, },
...@@ -3718,7 +3744,8 @@ ...@@ -3718,7 +3744,8 @@
"version": "2.16.3", "version": "2.16.3",
"resolved": "http://192.168.110.93:4873/hoek/-/hoek-2.16.3.tgz", "resolved": "http://192.168.110.93:4873/hoek/-/hoek-2.16.3.tgz",
"integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
"dev": true "dev": true,
"optional": true
}, },
"home-or-tmp": { "home-or-tmp": {
"version": "2.0.0", "version": "2.0.0",
......
src/components/IM/chat.vue
浏览文件 @ d732d625
...@@ -970,7 +970,9 @@ export default { ...@@ -970,7 +970,9 @@ export default {
}, },
closeChat() { closeChat() {
if(window.rtc){
window.rtc.leave(); window.rtc.leave();
}
this.clearSession(); this.clearSession();
this.$store.commit("updateShowChat", false); this.$store.commit("updateShowChat", false);
this.$store.commit("updateCurrentChat", {}); this.$store.commit("updateCurrentChat", {});
......
src/components/IM/diagnosis-live.vue
浏览文件 @ d732d625
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
</p> </p>
<span>{{ diagnoseType }}</span> <span>{{ diagnoseType }}</span>
</div> </div>
<div class="time-message ml10"> <div class="time-message ml10" v-if="currentChat.diagnoseType != 3">
<p class="msg-img"> <img :src="im_time" alt /></p> <p class="msg-img"> <img :src="im_time" alt /></p>
<p>设定时长: {{ time }}分钟 &nbsp;&nbsp;</p> <p>设定时长: {{ time }}分钟 &nbsp;&nbsp;</p>
<p v-if="startTime && endTime">总时长: {{ useTime }}&nbsp;&nbsp;</p> <p v-if="startTime && endTime">总时长: {{ useTime }}&nbsp;&nbsp;</p>
...@@ -144,10 +144,8 @@ export default { ...@@ -144,10 +144,8 @@ export default {
return '语音问诊' return '语音问诊'
case 2: case 2:
return '视频问诊' return '视频问诊'
break;
case 3: case 3:
return '图文问诊' return '图文问诊'
break;
default: default:
return'' return''
} }
...@@ -175,7 +173,6 @@ export default { ...@@ -175,7 +173,6 @@ export default {
this.rtc.muteLocalAudio(); this.rtc.muteLocalAudio();
} }
this.isMuted = !this.isMuted; this.isMuted = !this.isMuted;
}, },
// 主动呼叫 // 主动呼叫
drivingCall(data) { drivingCall(data) {
...@@ -295,6 +292,10 @@ export default { ...@@ -295,6 +292,10 @@ export default {
}, },
// 创建trtcClient // 创建trtcClient
clientLogin() { clientLogin() {
if(Number(this.currentChat.diagnoseType) === 3){
console.log('问诊类型', this.currentChat.diagnoseType);
return false;
}
let obj = { let obj = {
roomId: this.roomId, roomId: this.roomId,
role: this.roleAnchor, role: this.roleAnchor,
...@@ -303,7 +304,6 @@ export default { ...@@ -303,7 +304,6 @@ export default {
userSig: this.userSig, userSig: this.userSig,
vueInstance: this, vueInstance: this,
}; };
console.log('---obj', obj);
this.rtc = new RtcClient(obj); this.rtc = new RtcClient(obj);
window.rtc = this.rtc; window.rtc = this.rtc;
this.$nextTick(() => { this.$nextTick(() => {
...@@ -353,10 +353,12 @@ export default { ...@@ -353,10 +353,12 @@ export default {
}, },
// 关闭mc // 关闭mc
muteLocalAudio() { muteLocalAudio() {
this.isMuted = true;
this.rtc.muteLocalAudio(); this.rtc.muteLocalAudio();
}, },
// 打开mc // 打开mc
unmuteLocalAudio() { unmuteLocalAudio() {
this.isMuted = false;
this.rtc.unmuteLocalAudio(); this.rtc.unmuteLocalAudio();
}, },
// 显示文案 // 显示文案
...@@ -486,6 +488,7 @@ export default { ...@@ -486,6 +488,7 @@ export default {
}, },
// client离开房间 // client离开房间
leave() { leave() {
this.muteLocalAudio();
this.rtc.leave(); this.rtc.leave();
this.clearSession(); this.clearSession();
window.location.href = "about:blank"; window.location.href = "about:blank";
...@@ -568,6 +571,7 @@ export default { ...@@ -568,6 +571,7 @@ export default {
clearInterval(this.answerTimeFn); clearInterval(this.answerTimeFn);
clearInterval(this.useTimeFn); clearInterval(this.useTimeFn);
clearInterval(this.loseTimeFn); clearInterval(this.loseTimeFn);
this.isMuted = true;
}, },
// 清除直播时间相关的seession // 清除直播时间相关的seession
clearSession() { clearSession() {
...@@ -779,5 +783,4 @@ export default { ...@@ -779,5 +783,4 @@ export default {
margin: 15px auto 6%; margin: 15px auto 6%;
} }
} }
</style> </style>
src/utils/env-config.js
浏览文件 @ d732d625
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
*/ */
export const envConfig = { export const envConfig = {
development: { development: {
baseUrl: 'https://dev-sc.yunqueyi.com', // baseUrl: 'https://dev-sc.yunqueyi.com',
// // baseUrl: 'http://10.177.15.180:10202/', // // baseUrl: 'http://10.177.15.180:10202/',
// // baseUrl: 'http://192.168.140.14:10201/', // // baseUrl: 'http://192.168.140.14:10201/',
// baseUrl: 'https://test1-sc.yunqueyi.com', baseUrl: 'https://test1-sc.yunqueyi.com',
// baseUrl: 'https://uat-sc.yunqueyi.com', // baseUrl: 'https://uat-sc.yunqueyi.com',
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或