Skip to content

P
pica-admin-consultation
提交 60e497c0 编写于 作者: haochangdi's avatar haochangdi
浏览文件
操作

Merge branch 'dev-diagnosis-20210323' of... 

Merge branch 'dev-diagnosis-20210323' of http://192.168.110.53/com.pica.cloud.education.frontend/pica-admin-consultation into dev-diagnosis-20210323

# Conflicts:
#	src/views/layout/slidebar.vue
上级 b3318574 5261c00e
展开全部 显示空白字符变更
内嵌 并排
正在显示 包含 240 行增加 和 265 行删除
src/router/router.js
浏览文件 @ 60e497c0
...@@ -25,7 +25,7 @@ export default [{ ...@@ -25,7 +25,7 @@ export default [{
children: [ children: [
{ {
path: '', path: '',
redirect: '/diagnosisList' redirect: '/diagnosis-list'
},{ },{
path: '/diagnosis-list', path: '/diagnosis-list',
component: diagnosisList component: diagnosisList
......
src/utils/env-config.js
浏览文件 @ 60e497c0
...@@ -18,7 +18,7 @@ export const envConfig = { ...@@ -18,7 +18,7 @@ export const envConfig = {
innerLoginUrl: 'https://dev-sso.yunqueyi.com/PICA_SSO_FE/html/pica_index.html', innerLoginUrl: 'https://dev-sso.yunqueyi.com/PICA_SSO_FE/html/pica_index.html',
yuequeyiIndexUrl: 'https://dev-saas.yunqueyi.com/pica_index.html', yuequeyiIndexUrl: 'https://dev-saas.yunqueyi.com/pica_index.html',
phomeDemain: 'https://dev-phome.yunqueyi.com', phomeDemain: 'https://dev-phome.yunqueyi.com',
picakfAccId: 'picakf_dev', picakfAccId: 'picaop_dev',
}, },
dev: { dev: {
baseUrl: 'https://dev-sc.yunqueyi.com', baseUrl: 'https://dev-sc.yunqueyi.com',
...@@ -29,7 +29,7 @@ export const envConfig = { ...@@ -29,7 +29,7 @@ export const envConfig = {
innerLoginUrl: 'https://dev-sso.yunqueyi.com/PICA_SSO_FE/html/pica_index.html', innerLoginUrl: 'https://dev-sso.yunqueyi.com/PICA_SSO_FE/html/pica_index.html',
yuequeyiIndexUrl: 'https://dev-saas.yunqueyi.com/pica_index.html', yuequeyiIndexUrl: 'https://dev-saas.yunqueyi.com/pica_index.html',
phomeDemain: 'https://dev-phome.yunqueyi.com', phomeDemain: 'https://dev-phome.yunqueyi.com',
picakfAccId: 'picakf_dev', picakfAccId: 'picaop_dev',
}, },
test: { test: {
baseUrl: 'https://test1-sc.yunqueyi.com', baseUrl: 'https://test1-sc.yunqueyi.com',
...@@ -40,7 +40,7 @@ export const envConfig = { ...@@ -40,7 +40,7 @@ export const envConfig = {
innerLoginUrl: 'https://test1-sso.yunqueyi.com/PICA_SSO_FE/html/pica_index.html', innerLoginUrl: 'https://test1-sso.yunqueyi.com/PICA_SSO_FE/html/pica_index.html',
yuequeyiIndexUrl: 'https://test1.yunqueyi.com/pica_index.html', yuequeyiIndexUrl: 'https://test1.yunqueyi.com/pica_index.html',
phomeDemain: 'https://test1-phome.yunqueyi.com', phomeDemain: 'https://test1-phome.yunqueyi.com',
picakfAccId: 'picakf_test', picakfAccId: 'picaop_test',
}, },
uat: { uat: {
baseUrl: 'https://uat-sc.yunqueyi.com', baseUrl: 'https://uat-sc.yunqueyi.com',
...@@ -53,7 +53,7 @@ export const envConfig = { ...@@ -53,7 +53,7 @@ export const envConfig = {
innerLoginUrl: 'https://uat-sso.yunqueyi.com/PICA_SSO_FE/html/pica_index.html', innerLoginUrl: 'https://uat-sso.yunqueyi.com/PICA_SSO_FE/html/pica_index.html',
yuequeyiIndexUrl: 'https://uat.yunqueyi.com/pica_index.html', yuequeyiIndexUrl: 'https://uat.yunqueyi.com/pica_index.html',
phomeDemain: 'https://uat-phome.yunqueyi.com', phomeDemain: 'https://uat-phome.yunqueyi.com',
picakfAccId: 'picakf_uat', picakfAccId: 'picaop_uat',
}, },
pro: { pro: {
baseUrl: 'https://sc.yunqueyi.com', baseUrl: 'https://sc.yunqueyi.com',
...@@ -64,6 +64,6 @@ export const envConfig = { ...@@ -64,6 +64,6 @@ export const envConfig = {
innerLoginUrl: 'https://sso.yunqueyi.com/PICA_SSO_FE/html/pica_index.html', innerLoginUrl: 'https://sso.yunqueyi.com/PICA_SSO_FE/html/pica_index.html',
yuequeyiIndexUrl: 'https://www.yunqueyi.com/pica_index.html', yuequeyiIndexUrl: 'https://www.yunqueyi.com/pica_index.html',
phomeDemain: 'https://phome.yunqueyi.com', phomeDemain: 'https://phome.yunqueyi.com',
picakfAccId: 'picakf', picakfAccId: 'picaop',
} }
} }
src/utils/fetch.js
浏览文件 @ 60e497c0
...@@ -3,6 +3,7 @@ import store from '../store' ...@@ -3,6 +3,7 @@ import store from '../store'
// import { getHostnameAndPort } from '../utils' // import { getHostnameAndPort } from '../utils'
// axios.defaults.withCredentials = true // axios.defaults.withCredentials = true
// 创建axios实例对象
const service = axios.create({ const service = axios.create({
// baseURL: process.env.BASE_API // baseURL: process.env.BASE_API
timeout: 600000, timeout: 600000,
......
src/views/IM/diagnosis-admin/diagnosis-list.vue
浏览文件 @ 60e497c0
...@@ -73,12 +73,14 @@ ...@@ -73,12 +73,14 @@
<el-table-column prop="statusStr" label="问诊状态" min-width="80" align="left"></el-table-column> <el-table-column prop="statusStr" label="问诊状态" min-width="80" align="left"></el-table-column>
<el-table-column label="操作" fixed="right" align="center" min-width="150"> <el-table-column label="操作" fixed="right" align="center" min-width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- 1 初始状态 2待咨询 3 咨询中 4已结束 -->
<div> <div>
<el-button type="primary" size="small" @click="timeHandle(scope.row)">预约时间</el-button> <el-button v-if="scope.row.status != 4" type="primary" size="small" @click="timeHandle(scope.row)">修改时间</el-button>
<el-button type="primary" size="small" @click="endDiagnosis(scope.row)">结束问诊</el-button> <el-button v-if="scope.row.status == 3" type="primary" size="small" @click="endDiagnosis(scope.row)">结束</el-button>
</div> </div>
<div style="margin-top: 10px;"> <div style="margin-top: 10px;">
<el-button type="primary" size="small" @click="callAll(scope.row)">呼叫双方</el-button> <el-button v-if="scope.row.status == 3 && scope.row.imStatus == 1" type="primary" size="small" @click="callAll(scope.row)">呼叫双方</el-button>
<el-button v-if="scope.row.status == 3 && scope.row.imStatus == 2" type="primary" size="small" @click="callAll(scope.row)">加入问诊</el-button>
<el-button type="primary" size="small" @click="sendMessage(scope.row)">发送消息</el-button> <el-button type="primary" size="small" @click="sendMessage(scope.row)">发送消息</el-button>
</div> </div>
</template> </template>
...@@ -281,12 +283,17 @@ export default { ...@@ -281,12 +283,17 @@ export default {
this.loading = false; this.loading = false;
if (res.code == "000000") { if (res.code == "000000") {
this.$message({ this.$message({
message: '预约成功', message: '修改预约时间成功',
type: "success" type: "success"
}); });
this.searchParam.tab = 1; this.searchParam.tab = 1;
this.timeVisible = false; this.timeVisible = false;
this.search(); this.search();
}else {
this.$message({
message: res.message,
type: "error"
})
} }
}); });
} }
...@@ -294,6 +301,11 @@ export default { ...@@ -294,6 +301,11 @@ export default {
}, },
// 结束问诊 // 结束问诊
endDiagnosis(row) { endDiagnosis(row) {
this.$confirm('确定结束问诊吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.POST(`/diagnose/admin/diagnose/end/${row.diagnoseLogId}`, '').then(res => { this.POST(`/diagnose/admin/diagnose/end/${row.diagnoseLogId}`, '').then(res => {
if (res.code == "000000") { if (res.code == "000000") {
this.$message({ this.$message({
...@@ -302,8 +314,14 @@ export default { ...@@ -302,8 +314,14 @@ export default {
}); });
this.searchParam.tab = 1; this.searchParam.tab = 1;
this.search(); this.search();
}else {
this.$message({
message: res.message,
type: "error"
})
} }
}); });
})
}, },
// 呼叫双方 // 呼叫双方
callAll() { callAll() {
...@@ -311,7 +329,7 @@ export default { ...@@ -311,7 +329,7 @@ export default {
}, },
// 发送消息 // 发送消息
sendMessage(row) { sendMessage(row) {
this.$router.push('/diagnosis-im') this.$router.push({path: '/diagnosis-im', query: {tid: row.imTeamId}})
}, },
// 选择 // 选择
selectBtn(row) { selectBtn(row) {
...@@ -323,6 +341,11 @@ export default { ...@@ -323,6 +341,11 @@ export default {
}); });
this.searchParam.tab = 1; this.searchParam.tab = 1;
this.search(); this.search();
}else {
this.$message({
message: res.message,
type: "error"
})
} }
}); });
this.activeName = 'first'; this.activeName = 'first';
......
src/views/IM/diagnosis-admin/im.scss
浏览文件 @ 60e497c0
...@@ -300,7 +300,6 @@ ...@@ -300,7 +300,6 @@
color: #B4B4B4; color: #B4B4B4;
} }
} }
} }
& > .time-box { & > .time-box {
width: 260px; width: 260px;
...@@ -324,8 +323,71 @@ ...@@ -324,8 +323,71 @@
color: #7C7C7C; color: #7C7C7C;
} }
} }
& > .suggession-box {
width: 260px;
text-align: left;
padding: 10px 15px;
background: #f0f1f2;
border-radius: 8px;
min-height: 80px;
.title {
padding-bottom: 10px;
font-size: 14px;
font-weight: 700;
}
.suggession-text {
font-size: 12px;
color: #7C7C7C;
.label {
color: #B4B4B4;
}
}
} }
& > .audio-box audio {
width: 242px;
height: 44px;
background: #EBF5FC;
border-radius: 20px;
}
& > .live-box {
width: 202px;
height: 44px;
line-height: 44px;
background: #f0f1f2;
border-radius: 8px;
text-align: center;
}
& > .diagnosis-end {
width: 100%;
.split-line {
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
margin: 15px 0;
font-size: 14px;
color: #999999;
&::before {
flex: 1;
content: '';
height: 1px;
margin-right: 18px;
background: #f0f1f2;
}
&::after {
flex: 1;
content: '';
height: 1px;
margin-left: 18px;
background: #f0f1f2;
}
}
}
}
}
.msg-item-detail.line {
width: 100%;
} }
&.cr { &.cr {
flex-direction: row-reverse; flex-direction: row-reverse;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或