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 @@
"resolved": "http://192.168.110.93:4873/boom/-/boom-2.10.1.tgz",
"integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
"dev": true,
"optional": true,
"requires": {
"hoek": "2.x.x"
}
......@@ -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": {
"version": "1.0.2",
"resolved": "http://192.168.110.93:4873/de-indent/-/de-indent-1.0.2.tgz",
......@@ -2831,7 +2837,8 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"aproba": {
"version": "1.2.0",
......@@ -2852,12 +2859,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
......@@ -2872,17 +2881,20 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
......@@ -2999,7 +3011,8 @@
"inherits": {
"version": "2.0.4",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"ini": {
"version": "1.3.5",
......@@ -3011,6 +3024,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
......@@ -3025,6 +3039,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
......@@ -3032,12 +3047,14 @@
"minimist": {
"version": "1.2.5",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"minipass": {
"version": "2.9.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
......@@ -3056,6 +3073,7 @@
"version": "0.5.3",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "^1.2.5"
}
......@@ -3117,7 +3135,8 @@
"npm-normalize-package-bin": {
"version": "1.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"npm-packlist": {
"version": "1.4.8",
......@@ -3145,7 +3164,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
......@@ -3157,6 +3177,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
......@@ -3234,7 +3255,8 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"safer-buffer": {
"version": "2.1.2",
......@@ -3270,6 +3292,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
......@@ -3289,6 +3312,7 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
......@@ -3332,12 +3356,14 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"yallist": {
"version": "3.1.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
}
}
},
......@@ -3718,7 +3744,8 @@
"version": "2.16.3",
"resolved": "http://192.168.110.93:4873/hoek/-/hoek-2.16.3.tgz",
"integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
"dev": true
"dev": true,
"optional": true
},
"home-or-tmp": {
"version": "2.0.0",
......
src/components/IM/chat.vue
浏览文件 @ d732d625
......@@ -970,7 +970,9 @@ export default {
},
closeChat() {
if(window.rtc){
window.rtc.leave();
}
this.clearSession();
this.$store.commit("updateShowChat", false);
this.$store.commit("updateCurrentChat", {});
......
src/components/IM/diagnosis-live.vue
浏览文件 @ d732d625
......@@ -8,7 +8,7 @@
</p>
<span>{{ diagnoseType }}</span>
</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>设定时长: {{ time }}分钟 &nbsp;&nbsp;</p>
<p v-if="startTime && endTime">总时长: {{ useTime }}&nbsp;&nbsp;</p>
......@@ -144,10 +144,8 @@ export default {
return '语音问诊'
case 2:
return '视频问诊'
break;
case 3:
return '图文问诊'
break;
default:
return''
}
......@@ -175,7 +173,6 @@ export default {
this.rtc.muteLocalAudio();
}
this.isMuted = !this.isMuted;
},
// 主动呼叫
drivingCall(data) {
......@@ -295,6 +292,10 @@ export default {
},
// 创建trtcClient
clientLogin() {
if(Number(this.currentChat.diagnoseType) === 3){
console.log('问诊类型', this.currentChat.diagnoseType);
return false;
}
let obj = {
roomId: this.roomId,
role: this.roleAnchor,
......@@ -303,7 +304,6 @@ export default {
userSig: this.userSig,
vueInstance: this,
};
console.log('---obj', obj);
this.rtc = new RtcClient(obj);
window.rtc = this.rtc;
this.$nextTick(() => {
......@@ -353,10 +353,12 @@ export default {
},
// 关闭mc
muteLocalAudio() {
this.isMuted = true;
this.rtc.muteLocalAudio();
},
// 打开mc
unmuteLocalAudio() {
this.isMuted = false;
this.rtc.unmuteLocalAudio();
},
// 显示文案
......@@ -486,6 +488,7 @@ export default {
},
// client离开房间
leave() {
this.muteLocalAudio();
this.rtc.leave();
this.clearSession();
window.location.href = "about:blank";
......@@ -568,6 +571,7 @@ export default {
clearInterval(this.answerTimeFn);
clearInterval(this.useTimeFn);
clearInterval(this.loseTimeFn);
this.isMuted = true;
},
// 清除直播时间相关的seession
clearSession() {
......@@ -779,5 +783,4 @@ export default {
margin: 15px auto 6%;
}
}
</style>
src/components/common/diagnosis-doctor.vue
浏览文件 @ d732d625
......@@ -57,18 +57,21 @@
<el-input v-model="formData.outsideDoctor" placeholder="请输入外部医生姓名" class="set-width" style="width: 135%;"></el-input>
</el-col>
</el-form-item>
<el-form-item label="接诊意向时间">
<el-form-item label="问诊时间" class="required-label">
<el-col :span="15">
<el-date-picker
v-model="rangeTime"
type="datetimerange"
value-format="yyyy-MM-dd HH:mm:ss"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="pickerOptions1"
style="width: 100%;">
</el-date-picker>
<div @click="openDiagnosisStartTimeDialog" class="set-width grey-bg" style="width: 100%;">
<i class="el-icon-alarm-clock"></i>
<span v-if="startTimeValue === ''">请选择问诊时间</span>
<span v-else>{{dayFormatWithoutSecond(startTimeValue)}} -- {{dayFormatWithoutSecond(endTimeValue)}}</span>
</div>
</el-col>
</el-form-item>
<el-form-item class="required-label" prop="diagnoseChannel" label="问诊方式">
<el-col :span="15">
<el-radio-group v-model="formData.diagnoseChannel" size="small" style="line-height: 45px;width: 135%;">
<el-radio :label="1">APP问诊（系统发起问诊）</el-radio>
<el-radio :label="2">线下问诊（APP不会自动发起问诊）</el-radio>
</el-radio-group>
</el-col>
</el-form-item>
......@@ -79,11 +82,63 @@
<el-button type="primary" @click="confirm" :disabled="isClick">确定</el-button>
</span>
</el-dialog>
<el-dialog
title="问诊开始时间"
:visible.sync="diagnosisStartTimeDialog"
>
<div class="startTime-wrap">
<div class="line-wrap">
<div>
<span>问诊开始时间:</span>
<div class="date-wrap">
<el-date-picker
popper-class="scale-datepicker"
size="large"
@change="startTimeChange"
v-model="startTimeValue"
type="datetime"
placeholder="选择日期时间">
</el-date-picker>
</div>
</div>
<div class="mt20">
<span>问诊结束时间:</span>
<div class="date-wrap">
&nbsp;{{dayFormatWithoutSecond(endTimeValue)}}
</div>
</div>
</div>
<div class="time-wrap">
<span>问诊时长:</span>
<div class="time-range">
<el-radio-group v-model="timeRange" @change="timeRangeChange">
<div>
<el-radio border size="large" :label="10">10分钟</el-radio>
</div>
<div class="mt20">
<el-radio border size="medium" :label="15">15分钟</el-radio>
</div>
<div class="mt20">
<el-radio border size="medium" :label="20">20分钟</el-radio>
</div>
<div class="mt20">
<el-radio border size="medium" :label="30">30分钟</el-radio>
</div>
</el-radio-group>
</div>
</div>
</div>
<div class="startTime-footer" style="text-align: center;">
<el-button @click="startTimeConfirm('cancel')">取 消</el-button>
<el-button type="primary" @click="startTimeConfirm('submit')" :disabled="isClick">确定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {updateDiagnosis} from "../../utils/diagnosis";
import dayjs from 'dayjs'
let vm = null;
export default {
props: {
......@@ -123,6 +178,8 @@ export default {
innerFlag:1,
receptionBeginTime:"",
receptionEndTime:'',
bizType:'',
diagnoseChannel:1,
},
doctorList:[],
rangeTime:'',
......@@ -133,17 +190,9 @@ export default {
outsideDoctor: [
{required: true, message: "请输入外部医生姓名", trigger: 'blur'}
],
// rangeTime: [
// {
// type: 'array',
// required: true,
// trigger: 'change',
// fields: {
// 0: {required: true, type: 'date', message: "开始时间不能为空"},
// 1: {required: true, type: 'date', message: '结束时间不能为空'}
// }
// }
// ]
diagnoseChannel: [
{required: true, message: "请选择问诊方式", trigger: 'change'}
],
},
pickerOptions1: {
disabledDate: time => {
......@@ -152,6 +201,10 @@ export default {
); //减去一天的时间代表可以选择同一天;
}
},
diagnosisStartTimeDialog: false,
startTimeValue: '',
endTimeValue:'',
timeRange:''
}
},
created() {
......@@ -173,16 +226,20 @@ export default {
this.formData.receptionId = this.doctorId;
this.doctorChanged(this.doctorId);
}
}
},
},
methods: {
confirm() {
this.$refs.setForm.validate((valid) => {
if(!this.startTimeValue || !this.endTimeValue){
this.$message({
message: "请选择问诊时间",
type: "warning",
duration: 1000,
});
return false;
}
if (valid) {
// if(!(this.rangeTime != null && this.rangeTime.length > 0)){
// vm.$message.warning("请选择接诊意向时间");
// return;
// }
let req = null;
if(this.formData.receptionName == "站外医生" || this.formData.receptionName == "云鹊医助"){
this.formData.innerFlag = 2;// 外部
......@@ -193,8 +250,11 @@ export default {
receptionId:this.formData.receptionId,
receptionName:this.formData.receptionName,
outsideDoctor:this.formData.outsideDoctor,
receptionBeginTime:this.rangeTime[0],
receptionEndTime:this.rangeTime[1],
// receptionBeginTime:this.rangeTime[0],
// receptionEndTime:this.rangeTime[1],
receptionBeginTime: this.dayFormat(this.startTimeValue),
receptionEndTime:this.endTimeValue,
diagnoseChannel: this.formData.diagnoseChannel
}
}
else {
......@@ -205,8 +265,11 @@ export default {
innerFlag:this.formData.innerFlag,
receptionId:this.formData.receptionId,
receptionName:this.formData.receptionName,
receptionBeginTime:this.rangeTime[0],
receptionEndTime:this.rangeTime[1],
// receptionBeginTime:this.rangeTime[0],
// receptionEndTime:this.rangeTime[1],
receptionBeginTime: this.dayFormat(this.startTimeValue),
receptionEndTime:this.endTimeValue,
diagnoseChannel: this.formData.diagnoseChannel
}
}
vm.isClick = true
......@@ -228,6 +291,9 @@ export default {
cancel(){
this.doctorId = "";
this.formData.outsideDoctor = '';
this.startTimeValue = '';
this.endTimeValue = '';
this.timeRange = '';
this.$emit('update:diagnosisDoctorVisible', false);
},
opendialog() {
......@@ -237,6 +303,7 @@ export default {
this.formData.doctorHospital = ""
this.formData.doctorDepartment = ""
this.formData.doctorMobile = ""
// this.formData.diagnoseChannel = 1
this.doctorChanged(this.doctorId)
},
doctorChanged(value) {
......@@ -268,13 +335,102 @@ export default {
this.$message.info('请稍后重试')
});
},
openDiagnosisStartTimeDialog (){
this.diagnosisStartTimeDialog = true;
},
startTimeConfirm(isCancle) {
console.log('isCancle-', isCancle)
if(isCancle == 'cancel'){
this.startTimeValue = '';
this.endTimeValue = '';
this.timeRange = '';
}
if(isCancle == 'submit'){
if(String(this.startTimeValue).trim() === '' || !this.startTimeValue){
this.$message({
message: "请选择问诊开始时间",
type: "warning",
duration: 1000,
});
return false;
}
if(String(this.timeRange).trim() === ''){
this.$message({
message: "请选择问诊时长",
type: "warning",
duration: 1000,
});
return false;
}
this.endTimeValue = dayjs(this.startTimeValue).add(this.timeRange, 'minute').format('YYYY-MM-DD HH:mm:ss');
}
this.diagnosisStartTimeDialog = false;
},
dayFormat (v){
return dayjs(v).format('YYYY-MM-DD HH:mm:ss');
},
dayFormatWithoutSecond (v){
if(!v){
return '';
}
return dayjs(v).format('YYYY-MM-DD HH:mm');
},
timeRangeChange (v) {
if(this.startTimeValue && v){
this.endTimeValue = dayjs(this.startTimeValue).add(v, 'minute').format('YYYY-MM-DD HH:mm:ss');
}
},
startTimeChange (v) {
if(!v){
this.endTimeValue = '';
}
if(this.timeRange && v){
this.endTimeValue = dayjs(v).add(this.timeRange, 'minute').format('YYYY-MM-DD HH:mm:ss');
}
}
}
}
</script>
<style lang="scss" scoped>
<style lang="scss">
.set-width {
width: 300px;
}
.grey-bg{
padding: 0px 15px;
color: rgb(96, 98, 102);
height: 28px;
line-height: 28px;
border-radius: 4px;
border: 1px solid #DCDFE6;
font-size: 12px;
cursor: pointer;
}
.startTime-wrap{
display: flex;
justify-content: space-around;
.time-wrap{
display: flex;
align-items: end;
.time-range{
margin-left: 10px;
.mt20{
margin-top: 20px;
}
}
}
.date-wrap{
display: inline-block;
}
}
.startTime-footer{
margin-top: 100px;
padding-bottom: 50px;
}
.scale-datepicker{
transform: scale(1.3);
top: 289px!important;
}
</style>
src/utils/env-config.js
浏览文件 @ d732d625
......@@ -3,11 +3,11 @@
*/
export const envConfig = {
development: {
baseUrl: 'https://dev-sc.yunqueyi.com',
// baseUrl: 'https://dev-sc.yunqueyi.com',
// // baseUrl: 'http://10.177.15.180:10202/',
// // 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',
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或