Skip to content

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

fix eslint

上级 69d7a644 53f0c5fa
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 2612 行增加 和 1422 行删除
.env.testing
浏览文件 @ 301d389f
NODE_ENV=production NODE_ENV=production
# 自定义 VUE_APP_ENV # 自定义 VUE_APP_ENV
VUE_APP_ENV ='test' VUE_APP_ENV ='testing'
VUE_APP_SERVICE_URL=https://test1-sc.yunqueyi.com VUE_APP_SERVICE_URL=https://test1-sc.yunqueyi.com
# 阿里云OSS对象存储地址 # 阿里云OSS对象存储地址
......
src/api/diagnosis.js
浏览文件 @ 301d389f
...@@ -302,3 +302,18 @@ export const departmentAll = async () => { ...@@ -302,3 +302,18 @@ export const departmentAll = async () => {
method: 'get', method: 'get',
}); });
}; };
//
export const updateDepartmentId = async (data) => {
return request({
url: '/diagnose/admin/diagnose/diagnoseId/fresh/departmentId',
data: data,
method: 'post',
});
};
export const savePCDayCount = async (data) => {
return request({
url: '/diagnose/doctor/work/savePCDayCount',
data: data,
method: 'post',
});
};
src/api/serviceSchedule.js
浏览文件 @ 301d389f
...@@ -67,7 +67,7 @@ export const previewWork = async (data) => { ...@@ -67,7 +67,7 @@ export const previewWork = async (data) => {
}; };
export const setPlatformUpper = async (data) => { export const setPlatformUpper = async (data) => {
return request({ return request({
url: `/diagnose/doctor/work/setPlatformUpper/${data.num}`, url: '/diagnose/doctor/work/setPlatformUpper',
data: data, data: data,
method: 'post', method: 'post',
}); });
...@@ -92,3 +92,10 @@ export const getLevelAndDayCount = async (data) => { ...@@ -92,3 +92,10 @@ export const getLevelAndDayCount = async (data) => {
method: 'post', method: 'post',
}); });
}; };
// 暂时添加刷新问诊接口
export const getOrderNoFresh = async (diagnoseLogId) => {
return request({
url: `/diagnose/admin/diagnose/diagnoseOrderNo/fresh/${diagnoseLogId}`,
method: 'get',
});
};
src/components/IM/diagnosis-live.vue
浏览文件 @ 301d389f
...@@ -614,8 +614,35 @@ ...@@ -614,8 +614,35 @@
const that = this; const that = this;
this.timerOfStatus = setInterval(function () { this.timerOfStatus = setInterval(function () {
getOnlineStatus(roomId).then((res) => { getOnlineStatus(roomId).then((res) => {
const l = res.data; if (!res.data) {
console.log('res==', res, that.memberList); return false;
}
const l = res.data.map((i) => {
return i.userId;
});
// l = [1089725294, 1089728785];
// that.memberList = [
// {
// accId: 'd_3651506947_uat',
// avatarImageUrl: 'https://test-file.yunqueyi.com/File/doctor_default.png',
// id: 1089725294,
// liveUserId: 'd_3651506947_uat_1089725294',
// name: '顾超',
// role: 2,
// status: 3,
// type: 1
// },
// {
// accId: 'd_1909506947_uat',
// avatarImageUrl: 'https://test-file.yunqueyi.com/File/doctor_default.png',
// id: 1089728785,
// liveUserId: 'd_1909506947_uat_1089728785',
// name: '陈影',
// role: 1,
// status: 3,
// type: 1,
// }
// ];
if ( if (
l && l &&
l.length > 0 && l.length > 0 &&
...@@ -623,20 +650,27 @@ ...@@ -623,20 +650,27 @@
that.memberList.length > 0 that.memberList.length > 0
) { ) {
that.memberList.map((i) => { that.memberList.map((i) => {
if (l.includes[i]) { console.log('res==---', l, i.id, l.includes(i.id));
if (l.includes(i.id)) {
// 在线 更新状态 // 在线 更新状态
that.addNewMember(i.liveUserId); that.addNewMember(i.liveUserId);
} else { } else {
// 不在线 更新状态 // 不在线 更新状态
if (i.role == 1 && that.doctorTrtcEntryStatus != 3) { if (i.role == 1 && that.doctorTrtcEntryStatus != 3) {
that.addNewMember(i.liveUserId); that.removeMember(i.liveUserId);
} }
if (i.role == 2 && that.userTrtcEntryStatus != 3) { if (i.role == 2 && that.userTrtcEntryStatus != 3) {
that.addNewMember(i.liveUserId); that.removeMember(i.liveUserId);
} }
} }
}); });
} else {
if (that.memberList && that.memberList.length > 0) {
that.memberList.map((i) => {
that.removeMember(i.liveUserId);
});
}
} }
}); });
}, 2000); }, 2000);
......
src/components/common/diagnosis-time.vue
浏览文件 @ 301d389f
...@@ -24,11 +24,11 @@ ...@@ -24,11 +24,11 @@
</div> </div>
<div class="doctor-info"> <div class="doctor-info">
<div class="name-floor"> <div class="name-floor">
<span class="name-info-detail">{{ userName }}</span>
<span class="doctor-info-name">基层医生</span> <span class="doctor-info-name">基层医生</span>
<p class="info-phone"> <span class="name-info-detail">{{ userName }}</span>
<span class="info-phone">
{{ userNamePhone }} {{ userNamePhone }}
</p> </span>
</div> </div>
<div class="daignose-info"> <div class="daignose-info">
<span>分诊科室：{{ triageDepartment }}</span> <span>分诊科室：{{ triageDepartment }}</span>
...@@ -276,15 +276,17 @@ ...@@ -276,15 +276,17 @@
border-radius: 8px; border-radius: 8px;
height: 68px; height: 68px;
display: flex; display: flex;
padding: 20px 30px 20px 0;
.name-floor { .name-floor {
width: 50%; width: 50%;
padding: 10px 26px; padding: 10px 26px;
display: flex;
align-items: center;
.name-info-detail { .name-info-detail {
font-size: 18px; font-size: 18px;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #02120f; color: #02120f;
margin-bottom: 8px;
margin-right: 5px; margin-right: 5px;
} }
.doctor-info-name { .doctor-info-name {
...@@ -292,7 +294,9 @@ ...@@ -292,7 +294,9 @@
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #666666; color: #666666;
margin-bottom: 8px; border-radius: 9px;
border: 1px solid #d9d9d9;
margin-right: 8px;
} }
.info-phone { .info-phone {
font-size: 18px; font-size: 18px;
...@@ -306,7 +310,10 @@ ...@@ -306,7 +310,10 @@
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #666666; color: #666666;
padding-top: 40px; display: flex;
align-items: center;
width: 50%;
justify-content: flex-end;
} }
} }
.work-info-Num { .work-info-Num {
......
src/components/common/updateDepartId.vue 0 → 100644
浏览文件 @ 301d389f
<template>
<div class="update-departId">
<el-dialog
:title="title"
:visible.sync="diaUpdateDeIdVisible"
@close="cancel"
>
<div class="update-shownamephone">
<div class="update-namephone">
<div class="update-name">
<span class="doctor-name">基层医生</span>
<span class="namephone-show">{{ userName }}</span>
<span class="namephone-show">{{ userNamePhone }}</span>
</div>
<div class="depart-show">
原分诊科室：{{ triageDepartment }}
</div>
</div>
<div class="deparment-show">
<p class="update-dename">
修改新分诊科室
</p>
<el-cascader
ref="cascader"
v-model="triageDepartmentId"
filterable
clearable
class="serviceSchedule-cascader"
:options="allTilst"
placeholder="选择科室"
:show-all-levels="false"
@change="changeDepartment"
>
<template slot-scope="{ data }">
<span :style="{ fontSize: '15px', color: '#606266' }">{{
data.label
}}</span>
<span
:style="{
fontSize: '10px',
color: '#606266',
marginLeft: '10px',
opacity: '0.7',
}"
>{{ data.text }}</span>
</template>
</el-cascader>
</div>
<div class="work-info-botton">
<span
slot="footer"
class="dialog-footer"
style="text-align: center"
>
<el-button
class="contest"
type="primary"
:disabled="isClick"
@click="confirm"
>确定</el-button>
<el-button
class="cancel-submit"
@click="cancel"
>取 消</el-button>
</span>
</div>
</div>
</el-dialog>
</div>
</template>
<script>
import { updateDepartmentId, departmentAll } from '@/api/diagnosis';
let vm = null;
export default {
props: {
diaUpdateDeIdVisible: {
type: Boolean,
default: false,
},
diagnoseLogId: {
type: Number,
default: 0,
},
triageDepartment: {
type: String,
default: '',
},
userName: {
type: String,
default: '',
},
userNamePhone: {
type: String,
default: '',
},
},
data() {
return {
show: false,
title: '',
confirmTxt: '确定',
cancleTxt: '',
triageDepartmentId: '',
newTriageDepartment: '',
allTilst: [],
allList: {},
};
},
created() {
vm = this;
this.departmentAll();
},
methods: {
departmentAll() {
departmentAll().then((res) => {
if (res.code == '000000') {
this.allList = res.data || {};
this.showListALL();
}
});
},
showListALL() {
const arr = [];
const { departmentMapList, parentDepartmentList } = this.allList;
parentDepartmentList.map((item) => {
const obj = {
label: item.departmentName,
value: item.departmentId,
children: [],
};
departmentMapList.map((info) => {
if (info.parentDepartmentId === obj.value) {
const children = [];
info.diagnoseDepartmentRespList.map((detail) => {
const secondObj = {
label: detail.departmentName,
value: detail.departmentId,
text: '',
};
let secondChildren = '';
(detail.departmentDeseaseRespList || []).map((res) => {
secondChildren += res.deseaseName + ' ';
});
secondObj.text = secondChildren ? `（${secondChildren}）` : '';
children.push(secondObj);
});
obj.children = children;
}
});
arr.push(obj);
});
console.log(arr);
this.allTilst = arr;
},
confirm() {
if (this.newTriageDepartment == '') {
this.$message({
message: '请选择修改科室',
type: 'warning',
duration: 1000,
});
return false;
}
const params = {
diagnoseLogId: this.diagnoseLogId,
triageDepartmentId: this.triageDepartmentId,
triageDepartment: this.newTriageDepartment,
};
vm.isClick = true;
updateDepartmentId(params)
.then((res) => {
vm.isClick = false;
if (res.code == '000000') {
vm.cancel();
vm.$emit('search');
} else {
vm.$message.error(res.message);
}
})
.catch(function () {
vm.isClick = false;
// vm.$message.error(err.message);
});
},
cancel() {
this.$emit('update:diaUpdateDeIdVisible', false);
},
// 获取选择的值
changeDepartment() {
const checkedNodes = this.$refs['cascader'].getCheckedNodes();
console.log(checkedNodes);
if (checkedNodes.length > 0) {
this.triageDepartmentId = checkedNodes[0].value;
this.newTriageDepartment = checkedNodes[0].label;
} else {
this.triageDepartmentId = '';
this.newTriageDepartment = '';
}
},
},
};
</script>
<style lang="scss" scoped>
.update-departId {
.update-shownamephone {
padding: 20px 30px;
.update-namephone {
padding: 20px 30px;
background: rgba(240, 242, 245, 0.6);
border-radius: 8px;
display: flex;
width: 100%;
.update-name {
width: 50%;
display: flex;
justify-content: flex-start;
align-items: center;
.doctor-name {
padding: 2px 3px;
border-radius: 10px;
border: 1px solid #d9d9d9;
margin-right: 8px;
}
.namephone-show {
font-size: 18px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #02120f;
margin-right: 8px;
}
}
.depart-show {
width: 50%;
display: flex;
justify-content: flex-end;
}
}
.deparment-show {
margin-top: 28px;
.update-dename {
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #02120f;
margin-bottom: 9px;
}
/deep/.serviceSchedule-cascader {
.el-input {
.el-input__inner {
width: 180px;
height: 32px;
background: #ffffff;
border-radius: 16px;
border: 1px solid rgba(0, 0, 0, 0.15);
}
.el-input__suffix {
display: flex;
align-items: center;
}
}
input::-webkit-input-placeholder {
color: #89888b;
}
}
}
.work-info-botton {
padding: 35px 0;
.dialog-footer {
.contest {
width: 180px;
height: 40px;
background: #0d9078;
border-radius: 20px;
}
.cancel-submit {
width: 180px;
height: 40px;
border-radius: 20px;
border: 1px solid #0d9078;
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #0d9078;
}
}
}
}
}
</style>
src/components/editor/upload-music.vue
浏览文件 @ 301d389f
...@@ -77,6 +77,7 @@ ...@@ -77,6 +77,7 @@
}, },
watch: { watch: {
musicList(newv) { musicList(newv) {
console.log(newv);
this.musicArr = newv || []; this.musicArr = newv || [];
}, },
}, },
...@@ -87,10 +88,11 @@ ...@@ -87,10 +88,11 @@
}, },
methods: { methods: {
musicUrl(item) { musicUrl(item) {
console.log(item);
if (item.url) { if (item.url) {
return item.url; return item.url;
} }
return item.response.data.domainPath + item.response.data.path; return item.data.domainPath + item.data.path;
}, },
beforeRemove() { beforeRemove() {
this.loading = true; this.loading = true;
...@@ -104,7 +106,8 @@ ...@@ -104,7 +106,8 @@
}, 1000); }, 1000);
}, },
sucess(fileList) { sucess(fileList) {
this.musicArr = fileList; console.log(fileList);
this.musicArr.push(fileList);
this.loading = false; this.loading = false;
}, },
errfn() { errfn() {
...@@ -116,10 +119,8 @@ ...@@ -116,10 +119,8 @@
const newArr = []; const newArr = [];
if (this.musicArr && this.musicArr.length) { if (this.musicArr && this.musicArr.length) {
this.musicArr.forEach((item) => { this.musicArr.forEach((item) => {
if (item.response) { if (item.data) {
newArr.push( newArr.push(item.data.domainPath + item.data.path);
item.response.data.domainPath + item.response.data.path
);
} else if (item.url && item.from) { } else if (item.url && item.from) {
newArr.push(item.url); newArr.push(item.url);
} }
......
src/components/list/table-serviceSchedule.vue
浏览文件 @ 301d389f
...@@ -68,6 +68,12 @@ ...@@ -68,6 +68,12 @@
:filters="createList" :filters="createList"
:filter-method="getLevel" :filter-method="getLevel"
/> />
<el-table-column
prop="preNum"
label="接诊上限/小时"
width="150"
align="center"
/>
<el-table-column <el-table-column
prop="workStatus" prop="workStatus"
label="排班状态" label="排班状态"
...@@ -121,7 +127,7 @@ ...@@ -121,7 +127,7 @@
label="操作" label="操作"
fixed="right" fixed="right"
align="center" align="center"
min-width="200" min-width="270"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div <div
...@@ -148,6 +154,12 @@ ...@@ -148,6 +154,12 @@
> >
查看 查看
</div> </div>
<div
class="download-btn"
@click="setMaxNumValue(scope.row)"
>
接诊上限
</div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -225,6 +237,7 @@ ...@@ -225,6 +237,7 @@
text: '未开通', text: '未开通',
}, },
], ],
// maxNumValue: '',
}; };
}, },
computed: {}, computed: {},
...@@ -254,6 +267,10 @@ ...@@ -254,6 +267,10 @@
addSchedule(value, val) { addSchedule(value, val) {
this.$emit('addSchedule', value, val); this.$emit('addSchedule', value, val);
}, },
// 点击接诊上限按钮弹框打开
setMaxNumValue(value) {
this.$emit('setMaxNumValue', value);
},
// 分页 // 分页
handleSizeChange(value) { handleSizeChange(value) {
this.$emit('handleSizeChange', value); this.$emit('handleSizeChange', value);
......
src/components/list/table-set-component.vue
浏览文件 @ 301d389f
...@@ -118,6 +118,15 @@ ...@@ -118,6 +118,15 @@
> >
设为待匹配医生 设为待匹配医生
</el-button> </el-button>
<el-button
v-if="showBtn(scope.row, 22, 21)"
type="primary"
size="small"
class="btn"
@click="updateDepartId(scope.row)"
>
修改科室
</el-button>
<el-button <el-button
v-if="showBtn(scope.row, 3, 4, 5, 6, 21, 22, 23, 24, 25, 26)" v-if="showBtn(scope.row, 3, 4, 5, 6, 21, 22, 23, 24, 25, 26)"
type="primary" type="primary"
...@@ -356,6 +365,10 @@ ...@@ -356,6 +365,10 @@
waitMatchDot(row) { waitMatchDot(row) {
this.$emit('waitMatchDot', row); this.$emit('waitMatchDot', row);
}, },
// 修改科室
updateDepartId(row) {
this.$emit('updateDepartId', row);
},
// 发送消息 // 发送消息
sendMessage(row) { sendMessage(row) {
this.$emit('sendMessage', row); this.$emit('sendMessage', row);
......
src/router/index.js
浏览文件 @ 301d389f
...@@ -80,12 +80,25 @@ const overviewScheduling = (r) => ...@@ -80,12 +80,25 @@ const overviewScheduling = (r) =>
() => r(require('@/views/IM/diagnosis-admin/overviewScheduling.vue')), () => r(require('@/views/IM/diagnosis-admin/overviewScheduling.vue')),
'overviewScheduling' 'overviewScheduling'
); );
const schedReminder = (r) =>
require.ensure(
[],
() => r(require('@/views/IM/diagnosis-admin/schedReminder.vue')),
'overviewScheduling'
);
const administrators = (r) => const administrators = (r) =>
require.ensure( require.ensure(
[], [],
() => r(require('@/views/IM/diagnosis-admin/administrators.vue')), () => r(require('@/views/IM/diagnosis-admin/administrators.vue')),
'administrators' 'administrators'
); );
const orderStatusUpdate = (r) =>
require.ensure(
[],
() => r(require('@/views/IM/diagnosis-admin/orderStatusUpdate.vue')),
'orderStatusUpdate'
);
const Layout = (r) => const Layout = (r) =>
require.ensure([], () => r(require('@/views/layout/Layout.vue')), 'Layout'); require.ensure([], () => r(require('@/views/layout/Layout.vue')), 'Layout');
...@@ -154,10 +167,18 @@ const routerConfig = [ ...@@ -154,10 +167,18 @@ const routerConfig = [
path: '/overviewScheduling', path: '/overviewScheduling',
component: overviewScheduling, component: overviewScheduling,
}, },
{
path: '/schedReminder',
component: schedReminder,
},
{ {
path: '/administrators', path: '/administrators',
component: administrators, component: administrators,
}, },
{
path: '/orderStatusUpdate',
component: orderStatusUpdate,
},
], ],
}, },
]; ];
......
src/utils/GeneralData/diagnosis-list-new.js
浏览文件 @ 301d389f
...@@ -14,12 +14,23 @@ export const DIAGNOS_LIST_NEW = [ ...@@ -14,12 +14,23 @@ export const DIAGNOS_LIST_NEW = [
label: '订单金额', label: '订单金额',
showtooltip: false, showtooltip: false,
}, },
{
prop: 'consultRoad',
label: '订单业务类型',
showtooltip: false,
},
{ {
prop: 'diagnoseTypeStr', prop: 'diagnoseTypeStr',
label: '预约类型', label: '预约类型',
showtooltip: false, showtooltip: false,
with: '200', with: '200',
}, },
{
prop: 'type',
label: '问诊类型',
showtooltip: false,
with: '200',
},
{ {
prop: 'refundRemark', prop: 'refundRemark',
label: '外呼状态', label: '外呼状态',
......
src/utils/RtcClient.js
浏览文件 @ 301d389f
此差异已折叠。
src/utils/constants.js
浏览文件 @ 301d389f
...@@ -119,7 +119,7 @@ export const STATUS_LIST = [ ...@@ -119,7 +119,7 @@ export const STATUS_LIST = [
value: 6, value: 6,
}, },
{ {
label: '已匹配', label: '待联系',
value: 21, value: 21,
}, },
{ {
...@@ -289,21 +289,21 @@ export const ALL_TAB_LIST = [ ...@@ -289,21 +289,21 @@ export const ALL_TAB_LIST = [
active: '99', active: '99',
}, },
{ {
label: '待匹配', label: '待分诊',
active: '2', active: '2',
}, },
{ {
label: '已匹配', label: '待联系',
active: '102', active: '102',
}, },
{ {
label: '稍后跟进', label: '稍后跟进',
active: '101', active: '101',
}, },
{ // {
label: '待分诊', // label: '待分诊',
active: '22', // active: '22',
}, // },
{ {
label: '待匹配医生', label: '待匹配医生',
active: '23', active: '23',
...@@ -389,7 +389,7 @@ export const TRIAGE_TAB_LIST = [ ...@@ -389,7 +389,7 @@ export const TRIAGE_TAB_LIST = [
// active: '22' // active: '22'
// }, // },
{ {
label: '待匹配', label: '待分诊',
active: '2', active: '2',
}, },
]; ];
...@@ -421,7 +421,7 @@ export const MATCH_TAB_LIST = [ ...@@ -421,7 +421,7 @@ export const MATCH_TAB_LIST = [
active: '99', active: '99',
}, },
{ {
label: '已匹配', label: '待联系',
active: '102', active: '102',
}, },
{ {
......
src/utils/env-config.js
浏览文件 @ 301d389f
...@@ -15,7 +15,8 @@ export const envConfig = { ...@@ -15,7 +15,8 @@ export const envConfig = {
qiniuImgUrl: 'https://test1-file.yunqueyi.com', qiniuImgUrl: 'https://test1-file.yunqueyi.com',
loginUrl: 'https://dev-saas.yunqueyi.com/pica-login/work_station.html', loginUrl: 'https://dev-saas.yunqueyi.com/pica-login/work_station.html',
// innerLoginUrl: 'http://localhost:8090/PICA_SSO_FE/html/pica_index.html', // innerLoginUrl: 'http://localhost:8090/PICA_SSO_FE/html/pica_index.html',
innerLoginUrl: 'https://dev-sso.yunqueyi.com/PICA_SSO_FE/html/pica_login.html', innerLoginUrl:
'https://dev-sso.yunqueyi.com/PICA_SSO_FE/html/pica_login.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: 'picaop_dev', picakfAccId: 'picaop_dev',
...@@ -27,18 +28,20 @@ export const envConfig = { ...@@ -27,18 +28,20 @@ export const envConfig = {
qiniuResourceUrl: 'https://test1-videos.yunqueyi.com', qiniuResourceUrl: 'https://test1-videos.yunqueyi.com',
qiniuImgUrl: 'https://test1-file.yunqueyi.com', qiniuImgUrl: 'https://test1-file.yunqueyi.com',
loginUrl: 'https://dev-saas.yunqueyi.com/pica-login/work_station.html', loginUrl: 'https://dev-saas.yunqueyi.com/pica-login/work_station.html',
innerLoginUrl: 'https://dev-sso.yunqueyi.com/PICA_SSO_FE/html/pica_login.html', innerLoginUrl:
'https://dev-sso.yunqueyi.com/PICA_SSO_FE/html/pica_login.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: 'picaop_dev', picakfAccId: 'picaop_dev',
}, },
test: { testing: {
baseUrl: 'https://test1-sc.yunqueyi.com', baseUrl: 'https://test1-sc.yunqueyi.com',
qiniuFileUrl: 'https://test1-sc.yunqueyi.com/contents/admin/qiniu/token1', qiniuFileUrl: 'https://test1-sc.yunqueyi.com/contents/admin/qiniu/token1',
qiniuResourceUrl: 'https://test1-videos.yunqueyi.com', qiniuResourceUrl: 'https://test1-videos.yunqueyi.com',
qiniuImgUrl: 'https://test1-file.yunqueyi.com', qiniuImgUrl: 'https://test1-file.yunqueyi.com',
loginUrl: 'https://test1.yunqueyi.com/pica-login/work_station.html', loginUrl: 'https://test1.yunqueyi.com/pica-login/work_station.html',
innerLoginUrl: 'https://test1-sso.yunqueyi.com/PICA_SSO_FE/html/pica_login.html', innerLoginUrl:
'https://test1-sso.yunqueyi.com/PICA_SSO_FE/html/pica_login.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: 'picaop_test', picakfAccId: 'picaop_test',
...@@ -51,7 +54,8 @@ export const envConfig = { ...@@ -51,7 +54,8 @@ export const envConfig = {
qiniuImgUrl: 'https://test1-file.yunqueyi.com', qiniuImgUrl: 'https://test1-file.yunqueyi.com',
qiniuResourceUrl: 'https://test1-videos.yunqueyi.com', qiniuResourceUrl: 'https://test1-videos.yunqueyi.com',
loginUrl: 'https://uat.yunqueyi.com/pica-login/work_station.html', loginUrl: 'https://uat.yunqueyi.com/pica-login/work_station.html',
innerLoginUrl: 'https://uat-sso.yunqueyi.com/PICA_SSO_FE/html/pica_login.html', innerLoginUrl:
'https://uat-sso.yunqueyi.com/PICA_SSO_FE/html/pica_login.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: 'picaop_uat', picakfAccId: 'picaop_uat',
...@@ -66,5 +70,5 @@ export const envConfig = { ...@@ -66,5 +70,5 @@ export const envConfig = {
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: 'picaop', picakfAccId: 'picaop',
} },
}; };
src/utils/fetch-qiniu.js
浏览文件 @ 301d389f
// api路径 /* eslint-disable */
import {isNotEmptyUtils} from './utils'; import { isNotEmptyUtils } from './utils';
export default async(url = '', data = {}, type = 'POST', method = 'fetch') => { export default async (url = '', data = {}, type = 'POST', method = 'fetch') => {
type = type.toUpperCase(); type = type.toUpperCase();
// url = (server==='WECHAT'?wechatUrl:baseUrl) + url; // url = (server==='WECHAT'?wechatUrl:baseUrl) + url;
if (url.match('^http') == null) { if (url.match('^http') == null) {
url = localStorage.getItem('Url') + url; url = localStorage.getItem('Url') + url;
} }
console.log('完整url:', url); console.log('完整url:', url);
if (type == 'GET' && data) { if (type == 'GET' && data) {
let dataStr = ''; // 数据拼接字符串 let dataStr = ''; // 数据拼接字符串
Object.keys(data).forEach(key => { Object.keys(data).forEach((key) => {
dataStr += key + '=' + data[key] + '&'; dataStr += key + '=' + data[key] + '&';
}); });
if (dataStr !== '') { if (dataStr !== '') {
dataStr = dataStr.substr(0, dataStr.lastIndexOf('&')); dataStr = dataStr.substr(0, dataStr.lastIndexOf('&'));
url = url + '?' + dataStr; url = url + '?' + dataStr;
// url = encodeURI(url + '?' + dataStr, true); // url = encodeURI(url + '?' + dataStr, true);
} }
} }
if (window.fetch && method == 'fetch') { if (window.fetch && method == 'fetch') {
const requestConfig = { const requestConfig = {
credentials: 'include', credentials: 'include',
method: type, method: type,
// mode: "cors", // mode: "cors",
headers: { headers: {
// 'Access-Control-Allow-Origin': '*', // 'Access-Control-Allow-Origin': '*',
'Accept': '*', Accept: '*',
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'sysCode':'2' sysCode: '2',
// 'token': localStorage.getItem('token') || null, //固定传header： // 'token': localStorage.getItem('token') || null, //固定传header：
// 'system_code': 'todo' //固定传header：系统编号 // 'system_code': 'todo' //固定传header：系统编号
}, },
}; };
if (type == 'POST' || type === 'PUT' || type === 'PATCH' || type === 'DELETE' && data) { if (
Object.defineProperty(requestConfig, 'body', { type == 'POST' ||
value: JSON.stringify(data) type === 'PUT' ||
}); type === 'PATCH' ||
} (type === 'DELETE' && data)
try { ) {
const response = await fetch(url, requestConfig); Object.defineProperty(requestConfig, 'body', {
const responseJson = await response.json(); value: JSON.stringify(data),
});
}
try {
const response = await fetch(url, requestConfig);
const responseJson = await response.json();
return responseJson; return responseJson;
} catch (error) { } catch (error) {
throw new Error(error); throw new Error(error);
} }
} else { } else {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let requestObj; let requestObj;
if (window.XMLHttpRequest) { if (window.XMLHttpRequest) {
requestObj = new XMLHttpRequest(); requestObj = new XMLHttpRequest();
} else { } else {
requestObj = new ActiveXObject(); requestObj = new ActiveXObject();
} }
let sendData = ''; let sendData = '';
if (type == 'POST' || type == 'DELETE' || type == 'PUT') { if (type == 'POST' || type == 'DELETE' || type == 'PUT') {
sendData = JSON.stringify(data); sendData = JSON.stringify(data);
} }
requestObj.open(type, url, true); requestObj.open(type, url, true);
requestObj.setRequestHeader('Content-Type', 'application/json'); requestObj.setRequestHeader('Content-Type', 'application/json');
requestObj.send(sendData); requestObj.send(sendData);
requestObj.onreadystatechange = () => { requestObj.onreadystatechange = () => {
if (requestObj.readyState == 4) { if (requestObj.readyState == 4) {
if (requestObj.status == 200) { if (requestObj.status == 200) {
let obj = requestObj.response; let obj = requestObj.response;
if (typeof obj !== 'object' && isNotEmptyUtils(obj)) { if (typeof obj !== 'object' && isNotEmptyUtils(obj)) {
obj = JSON.parse(obj); obj = JSON.parse(obj);
} }
resolve(obj); resolve(obj);
} else { } else {
reject(requestObj); reject(requestObj);
} }
} }
}; };
}); });
} }
}; };
src/utils/fetch.js
浏览文件 @ 301d389f
import axios from 'axios'; import axios from 'axios';
import store from '../store';
// import { getHostnameAndPort } from '../utils' // import { getHostnameAndPort } from '../utils'
// axios.defaults.withCredentials = true // axios.defaults.withCredentials = true
...@@ -7,48 +6,45 @@ import store from '../store'; ...@@ -7,48 +6,45 @@ import store from '../store';
const service = axios.create({ const service = axios.create({
// baseURL: process.env.BASE_API // baseURL: process.env.BASE_API
timeout: 600000, timeout: 600000,
withCredentials: false withCredentials: false,
}); });
// request拦截器 // request拦截器
service.interceptors.request.use(config => { service.interceptors.request.use(
config.headers['sysCode'] = 26; (config) => {
config.headers['token'] = localStorage.getItem('token'); config.headers['sysCode'] = 26;
config.headers['deviceInfo'] = JSON.stringify({ 'app_channel': '', 'app_mac': '', 'app_uuid': '', 'app_version': '', 'device_brand': '', 'device_ip': '', 'device_model': '', 'device_net': '', 'device_ops': '', 'resolution_wh': '', 'system_level': '', 'device_type': '10' }); config.headers['token'] = localStorage.getItem('token');
Object.assign(config.headers, config.changeHeader); config.headers['deviceInfo'] = JSON.stringify({
if (config.fileHeader) { app_channel: '',
config.headers['Content-Type'] = 'application/x-www-form-urlencoded'; app_mac: '',
app_uuid: '',
app_version: '',
device_brand: '',
device_ip: '',
device_model: '',
device_net: '',
device_ops: '',
resolution_wh: '',
system_level: '',
device_type: '10',
});
Object.assign(config.headers, config.changeHeader);
if (config.fileHeader) {
config.headers['Content-Type'] = 'application/x-www-form-urlencoded';
}
return config;
},
(error) => {
Promise.reject(error);
} }
);
// if (config.data && config.data.setEntry) {
// config.headers['sysCode'] = config.data.sysCode || 10
// if(config.data.token){
// config.headers['token'] = config.data.token || '63C3FA92AF8A45A48B31EB7FD97B95EB'
// }
// config.headers['deviceInfo'] = JSON.stringify({ "app_channel": "", "app_mac": "", "app_uuid": "", "app_version": "", "device_brand": "", "device_ip": "", "device_model": "", "device_net": "", "device_ops": "", "resolution_wh": "", "system_level": "", "device_type": '10' })
// }
return config;
}, error => {
Promise.reject(error);
});
// respone拦截器 // respone拦截器
service.interceptors.response.use( service.interceptors.response.use(
response => { (response) => {
const res = response.data; return response.data;
/*
baseUrl时，返回000000为成功
apiUrl时，返回200为成功
*/
// if (res.code !== '000000') {
// return Promise.reject(response.data)
// } else {
return response.data;
// }
}, },
error => { (error) => {
return Promise.reject(error); return Promise.reject(error);
} }
); );
......
src/utils/index.js
浏览文件 @ 301d389f
/** /* eslint-disable */
* Created by Anndy Yang on 18/09/18.
*/
import { envConfig } from '@/utils/env-config'; import { envConfig } from '@/utils/env-config';
export function setEventByModuleCode(itemData) { export function setEventByModuleCode(itemData) {
const modeCode = itemData.appModuleInfo.code || ''; const modeCode = itemData.appModuleInfo.code || '';
let paramList = itemData.appModuleInfo.paramList ? itemData.appModuleInfo.paramList : ''; let paramList = itemData.appModuleInfo.paramList
if (modeCode === 'M001' || modeCode === 'M002' || modeCode === 'M003') { ? itemData.appModuleInfo.paramList
paramList = ''; : '';
} else if (modeCode === 'M100' || modeCode === 'M300') { if (modeCode === 'M001' || modeCode === 'M002' || modeCode === 'M003') {
paramList = '';
const urlPara = getUrlParmByCode(paramList); } else if (modeCode === 'M100' || modeCode === 'M300') {
paramList[0] && (paramList[0].value += urlPara); const urlPara = getUrlParmByCode(paramList);
paramList[0] && (paramList[0].value += urlPara);
} else if (modeCode === 'M400') { } else if (modeCode === 'M400') {
}
} if (typeof paramList === 'string' && !paramList) {
if (typeof paramList === 'string' && !paramList) { paramList = [];
paramList = []; }
}
return paramList;
return paramList;
} }
function getUrlParmByCode(paramList) { function getUrlParmByCode(paramList) {
if (paramList.length <= 1) { if (paramList.length <= 1) {
return '';
}
let dataStr = '';
const list = [];
for (let i = 1; i < paramList.length; i++) {
list.push(paramList[i].key + '=' + paramList[i].value);
}
dataStr = list.join('&');
if (dataStr !== '') {
return '?' + dataStr;
}
return ''; return '';
}
let dataStr = '';
const list = [];
for (let i = 1; i < paramList.length; i++) {
list.push(paramList[i].key + '=' + paramList[i].value);
}
dataStr = list.join('&');
if (dataStr !== '') {
return '?' + dataStr;
}
return '';
} }
export function p_getElm(elmId) { export function p_getElm(elmId) {
return document.getElementById(elmId); return document.getElementById(elmId);
} }
export function deepCopy(obj) { export function deepCopy(obj) {
var result = Array.isArray(obj) ? [] : {}; var result = Array.isArray(obj) ? [] : {};
for (var key in obj) { for (var key in obj) {
if (Object.prototype.hasOwnProperty.call(obj, key)) { if (Object.prototype.hasOwnProperty.call(obj, key)) {
if (typeof obj[key] === 'object') { if (typeof obj[key] === 'object') {
result[key] = deepCopy(obj[key]); // 递归复制 result[key] = deepCopy(obj[key]); // 递归复制
} else { } else {
result[key] = obj[key]; result[key] = obj[key];
} }
}
} }
return result; }
return result;
} }
/** /**
* *
* @param {Array} originData 初始数据 * @param {Array} originData 初始数据
* @param {Boolean} isUp true: 升序 false: 降序 * @param {Boolean} isUp true: 升序 false: 降序
* @param {String} sortField 排序字段，如果没有，则直接排序 * @param {String} sortField 排序字段，如果没有，则直接排序
* @param {Function} converFun 字段对应的数值转换函数 * @param {Function} converFun 字段对应的数值转换函数
*/ */
export function arraySort(originData, isUp = true, sortedField, converFun) { export function arraySort(originData, isUp = true, sortedField, converFun) {
// debugger // debugger
const sortedData = originData.slice(); const sortedData = originData.slice();
let swap, sourceA, sourceB; let swap, sourceA, sourceB;
for (let i = 0; i < sortedData.length - 1; i++) { for (let i = 0; i < sortedData.length - 1; i++) {
for (let j = 0; j < sortedData.length - i - 1; j++) { for (let j = 0; j < sortedData.length - i - 1; j++) {
sourceA = sortedData[j]; sourceA = sortedData[j];
sourceB = sortedData[j + 1]; sourceB = sortedData[j + 1];
if (sortedField && !converFun) { if (sortedField && !converFun) {
sourceA = sourceA[sortedField]; sourceA = sourceA[sortedField];
sourceB = sourceB[sortedField]; sourceB = sourceB[sortedField];
} else if (sortedField && converFun && typeof converFun === 'function') { } else if (sortedField && converFun && typeof converFun === 'function') {
if (!sourceA[sortedField] || !sourceB[sortedField]) { if (!sourceA[sortedField] || !sourceB[sortedField]) {
sourceA = 0; sourceA = 0;
sourceB = 0; sourceB = 0;
} else { } else {
sourceA = converFun(sourceA[sortedField]); sourceA = converFun(sourceA[sortedField]);
sourceB = converFun(sourceB[sortedField]); sourceB = converFun(sourceB[sortedField]);
}
}
// if(!sourceA || !sourceB) {
// sourceA = 0
// sourceB = 0
// }
if (isUp) {
if ((sourceA - 0) > (sourceB - 0)) {
swap = sortedData[j];
sortedData[j] = sortedData[j + 1];
sortedData[j + 1] = swap;
}
} else {
if ((sourceA - 0) < (sourceB - 0)) {
swap = sortedData[j];
sortedData[j] = sortedData[j + 1];
sortedData[j + 1] = swap;
}
}
} }
}
if (isUp) {
if (sourceA - 0 > sourceB - 0) {
swap = sortedData[j];
sortedData[j] = sortedData[j + 1];
sortedData[j + 1] = swap;
}
} else {
if (sourceA - 0 < sourceB - 0) {
swap = sortedData[j];
sortedData[j] = sortedData[j + 1];
sortedData[j + 1] = swap;
}
}
} }
return sortedData; }
return sortedData;
} }
export function sortParmData(originData, orderCol) { export function sortParmData(originData, orderCol) {
return originData.sort((a, b) => { return originData.sort((a, b) => {
return (a[orderCol] - b[orderCol]) * -1; return (a[orderCol] - b[orderCol]) * -1;
}); });
} }
// 获取SC服务器域名地址 // 获取SC服务器域名地址
export function getBaseUrl(url) { export function getBaseUrl(url) {
return getConfigByEnvType('baseUrl') + url; return getConfigByEnvType('baseUrl') + url;
} }
// 获取七牛token // 获取七牛token
export function getQiniuToken1() { export function getQiniuToken1() {
return getConfigByEnvType('qiniuFileUrl'); return getConfigByEnvType('qiniuFileUrl');
} }
// 登录URL // 登录URL
export function getLoginUrl() { export function getLoginUrl() {
return getConfigByEnvType('loginUrl'); return getConfigByEnvType('loginUrl');
} }
export function getInnerLoginUrl() { export function getInnerLoginUrl() {
return getConfigByEnvType('innerLoginUrl'); return getConfigByEnvType('innerLoginUrl');
} }
// 云鹊医首页 // 云鹊医首页
export function getYunQueYiUrl() { export function getYunQueYiUrl() {
return getConfigByEnvType('yuequeyiIndexUrl'); return getConfigByEnvType('yuequeyiIndexUrl');
} }
// 七牛上传视频和图片 // 七牛上传视频和图片
export function uploadVideo() { export function uploadVideo() {
return getConfigByEnvType('qiniuResourceUrl'); return getConfigByEnvType('qiniuResourceUrl');
} }
export function uploadImg() { export function uploadImg() {
return getConfigByEnvType('qiniuImgUrl'); return getConfigByEnvType('qiniuImgUrl');
} }
// 根据不同环境，生成URL // 根据不同环境，生成URL
function getConfigByEnvType(urlType) { function getConfigByEnvType(urlType) {
return envConfig[process.env.VUE_APP_ENV][urlType]; return envConfig[process.env.VUE_APP_ENV][urlType];
} }
// 获取客服的云信ID // 获取客服的云信ID
export function getPicaKFAccid() { export function getPicaKFAccid() {
return getConfigByEnvType('picakfAccId'); return getConfigByEnvType('picakfAccId');
} }
// 获取客服的云信ID // 获取客服的云信ID
export function getPhomeDemain() { export function getPhomeDemain() {
return getConfigByEnvType('phomeDemain'); return getConfigByEnvType('phomeDemain');
} }
// 根据身份证获取生日 // 根据身份证获取生日
export function getBirth(idCard) { export function getBirth(idCard) {
let birthday = ''; let birthday = '';
if (idCard != null && idCard != '') { if (idCard != null && idCard != '') {
if (idCard.length == 15) { if (idCard.length == 15) {
birthday = '19' + idCard.slice(6, 12); birthday = '19' + idCard.slice(6, 12);
} else if (idCard.length == 18) { } else if (idCard.length == 18) {
birthday = idCard.slice(6, 14); birthday = idCard.slice(6, 14);
}
birthday = birthday.replace(/(.{4})(.{2})/, '$1-$2-');
// 通过正则表达式来指定输出格式为:1990-01-01
} }
return birthday; birthday = birthday.replace(/(.{4})(.{2})/, '$1-$2-');
} // 通过正则表达式来指定输出格式为:1990-01-01
\ No newline at end of file }
return birthday;
}
src/utils/live/RtcClient.js
浏览文件 @ 301d389f
此差异已折叠。
src/utils/live/index.js
浏览文件 @ 301d389f
/* eslint-disable */
/* 浏览器兼容提示 */ /* 浏览器兼容提示 */
export const CHECK_BROWSER_TIPS = { export const CHECK_BROWSER_TIPS = {
BROWSER_NOT_COMPATIBLE: '您的浏览器不支持直播功能！', BROWSER_NOT_COMPATIBLE: '您的浏览器不支持直播功能！',
BROWSER_NOT_SUPPORT_SCREEN_SHARE: '您的浏览器不支持直播功能!' BROWSER_NOT_SUPPORT_SCREEN_SHARE: '您的浏览器不支持直播功能!',
}; };
export const setLgTenText = time => { export const setLgTenText = (time) => {
return time < 10 ? `0${time}` : time; return time < 10 ? `0${time}` : time;
}; };
...@@ -21,11 +22,13 @@ export const countDown = (endtime) => { ...@@ -21,11 +22,13 @@ export const countDown = (endtime) => {
const nowtime = new Date(); // 获取当前时间 const nowtime = new Date(); // 获取当前时间
const time = endtime - nowtime.getTime(); // 距离结束时间的毫秒数 const time = endtime - nowtime.getTime(); // 距离结束时间的毫秒数
if (time > 0) { if (time > 0) {
const lefth = Math.floor(time / (1000 * 60 * 60) % 24); // 计算小时数 const lefth = Math.floor((time / (1000 * 60 * 60)) % 24); // 计算小时数
const leftm = Math.floor(time / (1000 * 60) % 60); // 计算分钟数 const leftm = Math.floor((time / (1000 * 60)) % 60); // 计算分钟数
const lefts = Math.floor(time / 1000 % 60); // 计算秒数 const lefts = Math.floor((time / 1000) % 60); // 计算秒数
// 返回倒计时的字符串 // 返回倒计时的字符串
return `${setLgTenText(lefth)}:${setLgTenText(leftm)}:${setLgTenText(lefts)}`; return `${setLgTenText(lefth)}:${setLgTenText(leftm)}:${setLgTenText(
lefts
)}`;
} else { } else {
return '时间已到'; return '时间已到';
} }
...@@ -34,20 +37,20 @@ export const countDown = (endtime) => { ...@@ -34,20 +37,20 @@ export const countDown = (endtime) => {
export const laseTime = (endtime) => { export const laseTime = (endtime) => {
const nowtime = new Date(); // 获取当前时间 const nowtime = new Date(); // 获取当前时间
const time = endtime - nowtime.getTime(); // 距离结束时间的毫秒数 const time = endtime - nowtime.getTime(); // 距离结束时间的毫秒数
const lefth = Math.floor(time / (1000 * 60 * 60) % 24); // 计算小时数 const lefth = Math.floor((time / (1000 * 60 * 60)) % 24); // 计算小时数
const leftm = Math.floor(time / (1000 * 60) % 60); // 计算分钟数 const leftm = Math.floor((time / (1000 * 60)) % 60); // 计算分钟数
const lefts = Math.floor(time / 1000 % 60); // 计算秒数 const lefts = Math.floor((time / 1000) % 60); // 计算秒数
return { return {
lefth, lefth,
leftm, leftm,
lefts lefts,
}; };
}; };
export const lastm = (startTime, endTime) => { export const lastm = (startTime, endTime) => {
const time = endTime - startTime; // 距离结束时间的毫秒数 const time = endTime - startTime; // 距离结束时间的毫秒数
const lefth = Math.floor(time / (1000 * 60 * 60) % 24); // 计算小时数 const lefth = Math.floor((time / (1000 * 60 * 60)) % 24); // 计算小时数
const leftm = Math.floor(time / (1000 * 60) % 60); // 计算分钟数 const leftm = Math.floor((time / (1000 * 60)) % 60); // 计算分钟数
return lefth * 60 + leftm; return lefth * 60 + leftm;
}; };
...@@ -69,10 +72,10 @@ export const listSort = (one, two, three, four, arr) => { ...@@ -69,10 +72,10 @@ export const listSort = (one, two, three, four, arr) => {
const a = h.sort(listCompare(three)); const a = h.sort(listCompare(three));
const b = a.sort(listCompare(two)); const b = a.sort(listCompare(two));
newList = b.sort(listCompare(one, 1)); newList = b.sort(listCompare(one, 1));
newList.forEach(item => { newList.forEach((item) => {
if (item.isCalling) { if (item.isCalling) {
callArr.push(item); callArr.push(item);
} }
if (item.inviteCall) { if (item.inviteCall) {
inviteArr.push(item); inviteArr.push(item);
} }
...@@ -80,7 +83,7 @@ export const listSort = (one, two, three, four, arr) => { ...@@ -80,7 +83,7 @@ export const listSort = (one, two, three, four, arr) => {
return { return {
newList, newList,
callArr, callArr,
inviteArr inviteArr,
}; };
}; };
...@@ -93,13 +96,21 @@ export const getBroswer = () => { ...@@ -93,13 +96,21 @@ export const getBroswer = () => {
const sys = {}; const sys = {};
const ua = navigator.userAgent.toLowerCase(); const ua = navigator.userAgent.toLowerCase();
let s; let s;
(s = ua.match(/edge\/([\d.]+)/)) ? sys.edge = s[1] : (s = ua.match(/edge\/([\d.]+)/))
(s = ua.match(/rv:([\d.]+)\) like gecko/)) ? sys.ie = s[1] : ? (sys.edge = s[1])
(s = ua.match(/msie ([\d.]+)/)) ? sys.ie = s[1] : : (s = ua.match(/rv:([\d.]+)\) like gecko/))
(s = ua.match(/firefox\/([\d.]+)/)) ? sys.firefox = s[1] : ? (sys.ie = s[1])
(s = ua.match(/chrome\/([\d.]+)/)) ? sys.chrome = s[1] : : (s = ua.match(/msie ([\d.]+)/))
(s = ua.match(/opera.([\d.]+)/)) ? sys.opera = s[1] : ? (sys.ie = s[1])
(s = ua.match(/version\/([\d.]+).*safari/)) ? sys.safari = s[1] : 0; : (s = ua.match(/firefox\/([\d.]+)/))
? (sys.firefox = s[1])
: (s = ua.match(/chrome\/([\d.]+)/))
? (sys.chrome = s[1])
: (s = ua.match(/opera.([\d.]+)/))
? (sys.opera = s[1])
: (s = ua.match(/version\/([\d.]+).*safari/))
? (sys.safari = s[1])
: 0;
if (sys.edge) return { broswer: 'Edge', version: sys.edge }; if (sys.edge) return { broswer: 'Edge', version: sys.edge };
if (sys.ie) return { broswer: 'IE', version: sys.ie }; if (sys.ie) return { broswer: 'IE', version: sys.ie };
...@@ -109,4 +120,4 @@ export const getBroswer = () => { ...@@ -109,4 +120,4 @@ export const getBroswer = () => {
if (sys.safari) return { broswer: 'Safari', version: sys.safari }; if (sys.safari) return { broswer: 'Safari', version: sys.safari };
return { broswer: '', version: '0' }; return { broswer: '', version: '0' };
}; };
\ No newline at end of file
src/utils/qiniu-util.js
浏览文件 @ 301d389f
此差异已折叠。
src/utils/utils.js
浏览文件 @ 301d389f
此差异已折叠。
src/views/IM/diagnosis-admin/diagnosis-list-new.vue
浏览文件 @ 301d389f
...@@ -31,6 +31,25 @@ ...@@ -31,6 +31,25 @@
/> />
</el-form-item> </el-form-item>
</div> </div>
<div>
<el-form-item
label="问诊类型"
class="t-b"
>
<el-select
v-model="searchParam.type"
placeholder="请选择问诊类型"
style="width: 220px"
>
<el-option
v-for="item of consultationTypeList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</div>
<div> <div>
<el-form-item <el-form-item
label="分诊科室" label="分诊科室"
...@@ -57,6 +76,7 @@ ...@@ -57,6 +76,7 @@
:options="allTilst" :options="allTilst"
placeholder="选择科室" placeholder="选择科室"
:show-all-levels="false" :show-all-levels="false"
style="width: 220px"
@change="changeDepart" @change="changeDepart"
> >
<template slot-scope="{ data }"> <template slot-scope="{ data }">
...@@ -310,6 +330,26 @@ ...@@ -310,6 +330,26 @@
/> />
</el-form-item> </el-form-item>
</div> </div>
<div>
<el-form-item
label="订单业务类型"
class="t-b"
>
<el-select
v-model="searchParam.consultRoad"
placeholder="请选择订单业务类型"
clearable
style="width: 220px"
>
<el-option
v-for="item of orderBusinessList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</div>
</div> </div>
<div class="form-btn"> <div class="form-btn">
<div class="form-btn-li"> <div class="form-btn-li">
...@@ -402,6 +442,7 @@ ...@@ -402,6 +442,7 @@
@cancelRefund="cancelRefund" @cancelRefund="cancelRefund"
@witeGo="witeGo" @witeGo="witeGo"
@waitMatchDot="waitMatchDot" @waitMatchDot="waitMatchDot"
@updateDepartId="updateDepartId"
@applyCancel="applyCancel" @applyCancel="applyCancel"
@sendMessage="sendMessage" @sendMessage="sendMessage"
@joinDiagnose="joinDiagnose" @joinDiagnose="joinDiagnose"
...@@ -486,6 +527,16 @@ ...@@ -486,6 +527,16 @@
:department-id="departmentId" :department-id="departmentId"
@search="search" @search="search"
/> />
<!-- 修改科室 -->
<updateDeparId
v-if="diaUpdateDeIdVisible"
:dia-update-de-id-visible.sync="diaUpdateDeIdVisible"
:user-name="userName"
:user-name-phone="userNamePhone"
:diagnose-log-id="diagnoseLogId"
:triage-department="triageDepartment"
@search="search"
/>
<rematching-doctor <rematching-doctor
:rematching-options="rematchingOptions" :rematching-options="rematchingOptions"
:rematching-visible.sync="rematchingVisible" :rematching-visible.sync="rematchingVisible"
...@@ -547,6 +598,7 @@ ...@@ -547,6 +598,7 @@
import RematchingDoctor from '../../../components/common/rematching-doctor'; import RematchingDoctor from '../../../components/common/rematching-doctor';
import TableSetComponent from '@/components/list/table-set-component'; import TableSetComponent from '@/components/list/table-set-component';
import applyCancelComponent from '../../../components/common/applyCancel'; import applyCancelComponent from '../../../components/common/applyCancel';
import updateDeparId from '../../../components/common/updateDepartId';
export default { export default {
components: { components: {
TableSetComponent, TableSetComponent,
...@@ -561,6 +613,7 @@ ...@@ -561,6 +613,7 @@
DiagnosisTime, DiagnosisTime,
RematchingDoctor, RematchingDoctor,
applyCancelComponent, applyCancelComponent,
updateDeparId,
}, },
data() { data() {
return { return {
...@@ -579,6 +632,7 @@ ...@@ -579,6 +632,7 @@
tabrefresh: true, tabrefresh: true,
searchParam: { searchParam: {
id: '', id: '',
type: '',
operateName: '', operateName: '',
assistantVal: '', assistantVal: '',
receptionVal: '', receptionVal: '',
...@@ -602,6 +656,7 @@ ...@@ -602,6 +656,7 @@
price: '', price: '',
refundRemark: '', refundRemark: '',
matchingWay: null, matchingWay: null,
consultRoad: null,
}, },
noteList: [], noteList: [],
alltabslist: [], alltabslist: [],
...@@ -610,6 +665,16 @@ ...@@ -610,6 +665,16 @@
sourceList: SOURCE_LIST, sourceList: SOURCE_LIST,
priceList: ORDER_PRICE, priceList: ORDER_PRICE,
matchingWayList: MATCHING_LIST, matchingWayList: MATCHING_LIST,
orderBusinessList: [
{
label: '中医实践',
value: 1,
},
{
label: '向上问诊',
value: 0,
},
],
tabpaneList: [], tabpaneList: [],
rematchingOptions: [], // 备注信息 rematchingOptions: [], // 备注信息
Raw_tabpaneList: [], Raw_tabpaneList: [],
...@@ -624,6 +689,7 @@ ...@@ -624,6 +689,7 @@
followupVisible: false, followupVisible: false,
doctorVisible: false, doctorVisible: false,
diagnosisVisible: false, diagnosisVisible: false,
diaUpdateDeIdVisible: false,
coordinatingVisible: false, coordinatingVisible: false,
diagnosisDoctorVisible: false, diagnosisDoctorVisible: false,
diagnoseFlag: false, diagnoseFlag: false,
...@@ -659,6 +725,24 @@ ...@@ -659,6 +725,24 @@
departmentId: '', departmentId: '',
allTilst: [], allTilst: [],
allList: {}, allList: {},
consultationTypeList: [
{
label: '全部',
value: '',
},
{
label: '名医问诊',
value: 2,
},
{
label: '极速问诊',
value: 1,
},
{
label: '-',
value: 0,
},
],
}; };
}, },
watch: { watch: {
...@@ -690,7 +774,6 @@ ...@@ -690,7 +774,6 @@
departmentAll() { departmentAll() {
departmentAll().then((res) => { departmentAll().then((res) => {
if (res.code == '000000') { if (res.code == '000000') {
console.log(res, 'res111');
this.allList = res.data || {}; this.allList = res.data || {};
this.showListALL(); this.showListALL();
} }
...@@ -727,7 +810,6 @@ ...@@ -727,7 +810,6 @@
arr.push(obj); arr.push(obj);
}); });
console.log(arr);
this.allTilst = arr; this.allTilst = arr;
}, },
changeDepart() { changeDepart() {
...@@ -737,10 +819,6 @@ ...@@ -737,10 +819,6 @@
} else { } else {
this.searchParam.triageDepartmentId = ''; this.searchParam.triageDepartmentId = '';
} }
console.log(
this.searchParam.triageDepartmentId,
'this.searchParam.triageDepartmentId'
);
}, },
changeStartTime(time) { changeStartTime(time) {
this.rangeTimeData = time this.rangeTimeData = time
...@@ -748,7 +826,6 @@ ...@@ -748,7 +826,6 @@
? new Date(time.time).format('yyyy-MM-dd hh:mm:ss') ? new Date(time.time).format('yyyy-MM-dd hh:mm:ss')
: '' : ''
: ''; : '';
console.log(this.rangeTimeData, 'this.rangeTimeData');
}, },
getTableData(val) { getTableData(val) {
this.saveTableData = val || []; this.saveTableData = val || [];
...@@ -1038,6 +1115,7 @@ ...@@ -1038,6 +1115,7 @@
this.assistantTime = ''; this.assistantTime = '';
this.searchParam = Object.assign(this.searchParam, { this.searchParam = Object.assign(this.searchParam, {
id: '', id: '',
type: '',
operateName: '', operateName: '',
assistantVal: '', assistantVal: '',
receptionVal: '', receptionVal: '',
...@@ -1058,6 +1136,7 @@ ...@@ -1058,6 +1136,7 @@
assistantBeginTime: '', assistantBeginTime: '',
assistantEndTime: '', assistantEndTime: '',
inNewTimeObj: {}, inNewTimeObj: {},
consultRoad: null,
}); });
}, },
// 导出 // 导出
...@@ -1118,21 +1197,28 @@ ...@@ -1118,21 +1197,28 @@
applyCancel(row) { applyCancel(row) {
this.diagnoseLogId = row.diagnoseLogId; this.diagnoseLogId = row.diagnoseLogId;
this.dialogFormVisible = true; this.dialogFormVisible = true;
console.log(row);
}, },
// 设为待匹配医生 // 设为待匹配医生
waitMatchDot(row) { waitMatchDot(row) {
console.log(row, 'doctorData111');
this.doctorData = row; this.doctorData = row;
this.diagnoseLogId = row.diagnoseLogId; this.diagnoseLogId = row.diagnoseLogId;
this.userName = row.userName; this.userName = row.userName;
this.userNamePhone = row.userMobile; this.userNamePhone = row.userMobile;
this.triageDepartment = row.triageDepartment; this.triageDepartment = row.triageDepartment;
this.departmentId = row.departmentId; this.departmentId = row.triageDepartmentId;
this.diagnosisTimeVisible = true; this.diagnosisTimeVisible = true;
this.bizType = 5; this.bizType = 5;
// } // }
}, },
// 修改科室
updateDepartId(row) {
console.log(row);
this.diagnoseLogId = row.diagnoseLogId;
this.userName = row.userName;
this.userNamePhone = row.userMobile;
this.triageDepartment = row.triageDepartment;
this.diaUpdateDeIdVisible = true;
},
// 发送消息 // 发送消息
sendMessage(row) { sendMessage(row) {
this.$router.push({ this.$router.push({
...@@ -1199,7 +1285,6 @@ ...@@ -1199,7 +1285,6 @@
}, },
// 设为待确认时间 // 设为待确认时间
waitMatchTime(row) { waitMatchTime(row) {
console.log(row, 'row');
this.doctorInfo = row; this.doctorInfo = row;
this.rangeTimeData = row.assistantBeginTime; this.rangeTimeData = row.assistantBeginTime;
this.diagnoseFlag = true; this.diagnoseFlag = true;
......
src/views/IM/diagnosis-admin/modal/index.scss
浏览文件 @ 301d389f
...@@ -124,6 +124,12 @@ ...@@ -124,6 +124,12 @@
.show-work-set { .show-work-set {
margin-top: 100px; margin-top: 100px;
} }
.maxNum-first-show {
margin-top: 20px;
.show-sep-num {
color: red;
}
}
.agment-left-con { .agment-left-con {
padding: 15px; padding: 15px;
text-align: center; text-align: center;
......
src/views/IM/diagnosis-admin/orderStatusUpdate.vue 0 → 100644
浏览文件 @ 301d389f
<template>
<div class="diagnosis-list-content">
<div class="select-content screenSet">
<div class="title">
咨询订单管理后台
</div>
</div>
<div class="component-content screenSet">
<el-form
ref="form"
:inline="true"
:model="form"
label-width="180px"
>
<el-form-item label="订单变化(待问诊>问诊中)">
<el-input v-model="form.orderName" />
</el-form-item>
<el-form-item>
<el-button
type="primary"
@click="submitConfirm"
>
刷新
</el-button>
</el-form-item>
</el-form>
</div>
</div>
</template>
<script>
// 这个页面只是暂时的，等自动排班版本修改
import { getOrderNoFresh } from '@/api/serviceSchedule';
export default {
name: 'OrderStatusUpdate',
data() {
return {
form: {
orderName: '',
},
submitFlag: true,
};
},
mounted() {},
methods: {
submitConfirm() {
this.$confirm('是否要跟新订单状态?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
this.onSubmit();
});
},
onSubmit() {
if (this.form.orderName && this.submitFlag) {
this.submitFlag = false;
getOrderNoFresh(this.form.orderName).then((res) => {
let tipText = '';
if (res.code === '000000') {
tipText = '更新订单成功';
} else {
tipText = res.message;
}
this.form.orderName = '';
this.submitFlag = true;
this.$message({
message: tipText,
type: 'warning',
duration: 1000,
});
});
} else {
this.$message({
message: '请先输入订单id',
type: 'warning',
duration: 1000,
});
}
console.log(this.form);
},
init() {
console.log(11);
},
},
};
</script>
<style lang="scss" scoped>
.diagnosis-list-content {
.select-content {
margin-bottom: 10px;
padding: 10px;
background: #fff;
overflow: hidden !important;
.title {
height: 50px;
display: flex;
justify-content: flex-start;
align-items: center;
}
.form-container {
display: flex;
justify-content: space-between;
.form-li {
display: flex;
flex-direction: column;
// justify-content: space-between;
}
.form-btn {
display: flex;
flex-direction: column;
justify-content: flex-start;
.form-btn-li {
display: flex;
justify-content: flex-end;
margin-bottom: 20px;
}
}
}
.select-bottom {
height: 50px;
cursor: pointer;
display: flex;
justify-content: center;
align-items: center;
color: #0d9078;
}
.btn-wrap {
text-align: right;
}
.t-b {
margin-bottom: 10px;
}
}
.component-content {
height: 400px;
padding: 10px;
background: #fff;
overflow: hidden !important;
}
}
</style>
src/views/IM/diagnosis-admin/overviewScheduling.vue
浏览文件 @ 301d389f
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="header"> <div class="header">
<el-breadcrumb separator="/"> <el-breadcrumb separator="/">
<el-breadcrumb-item>首页</el-breadcrumb-item> <el-breadcrumb-item>首页</el-breadcrumb-item>
<el-breadcrumb-item> 服务排班表 </el-breadcrumb-item> <el-breadcrumb-item> 医生排班总览 </el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
</div> </div>
<div class="agment-box"> <div class="agment-box">
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
查询 查询
</el-button> </el-button>
</div> </div>
<div class="agmentSelect-select-right"> <!-- <div class="agmentSelect-select-right">
设置系统每小时接诊上限 设置系统每小时接诊上限
<el-input-number <el-input-number
v-model="maxDiaNum" v-model="maxDiaNum"
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
> >
保存 保存
</el-button> </el-button>
</div> </div> -->
</div> </div>
<div <div
class="fullCalendar-show" class="fullCalendar-show"
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
watch: {}, watch: {},
created() { created() {
this.departmentAll(); this.departmentAll();
this.getPlatformUpper(); // this.getPlatformUpper();
}, },
mounted() {}, mounted() {},
methods: { methods: {
......
src/views/IM/diagnosis-admin/schedReminder.vue 0 → 100644
浏览文件 @ 301d389f
此差异已折叠。
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或