Skip to content

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

Merge branch 'develop' into 'release' 

Develop

See merge request !178
上级 a72bd830 0811904b
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 1906 行增加 和 107 行删除
.vscode/settings.json 已删除 100644 → 0
浏览文件 @ a72bd830
{
// 是否允许自定义的snippet片段提示
"editor.snippetSuggestions": "top",
// vscode默认启用了根据文件类型自动设置tabsize的选项
"editor.detectIndentation": false,
// 重新设定tabsize
"editor.tabSize": 2,
// #每次保存的时候自动格式化
"editor.formatOnSave": false,
// #每次保存的时候将代码按eslint格式进行修复
"eslint.autoFixOnSave": true,
"editor.fontWeight": "300",
"editor.formatOnType": false,
"workbench.iconTheme": "material-icon-theme",
"git.confirmSync": false,
"team.showWelcomeMessage": false,
"window.zoomLevel": 0,
// "editor.renderWhitespace": "boundary",
"editor.cursorBlinking": "smooth",
"editor.minimap.enabled": true,
// "editor.minimap.renderCharacters": false,
"window.title": "${dirty}${activeEditorMedium}${separator}${rootName}",
"editor.codeLens": true,
//eslint 代码自动检查相关配置
"eslint.enable": true,
"eslint.run": "onType",
"eslint.options": {
"extensions": [
".js",
".vue"
]
},
// 添加 vue 支持
"eslint.validate": [
"javascriptreact",
"vue",
"javascript",
{
"language": "vue",
"autoFix": true
},
"html",
{
"language": "html",
"autoFix": true
}
],
// #让prettier使用eslint的代码格式进行校验
"prettier.eslintIntegration": true,
// #去掉代码结尾的分号
"prettier.semi": false,
// #使用带引号替代双引号
"prettier.singleQuote": true,
// #让函数(名)和后面的括号之间加个空格
"javascript.format.insertSpaceBeforeFunctionParenthesis": true,
// #这个按用户自身习惯选择
"vetur.format.defaultFormatter.html": "js-beautify-html",
// #让vue中的js按编辑器自带的ts格式进行格式化
"vetur.format.defaultFormatter.js": "vscode-typescript",
"explorer.confirmDelete": false,
"vetur.format.defaultFormatterOptions": {
"js-beautify-html": {
"wrap_attributes": "force-aligned"
// #vue组件中html代码格式化样式
}
},
"files.associations": {
"*.cjson": "jsonc",
"*.wxss": "css",
"*.wxs": "javascript"
},
"emmet.includeLanguages": {
"wxml": "html"
},
"minapp-vscode.disableAutoConfig": true,
"window.menuBarVisibility": "visible",
"git.enableSmartCommit": true,
"git.autofetch": true,
"liveServer.settings.donotShowInfoMsg": true,
"[html]": {
"editor.defaultFormatter": "vscode.html-language-features"
},
"javascript.updateImportsOnFileMove.enabled": "always",
"workbench.colorTheme": "SynthWave '84",
"editor.fontSize": 16,
"search.followSymlinks": false,
"workbench.sideBar.location": "left",
// 是否开启保存自动格式化
"zenMode.restore": true,
"breadcrumbs.enabled": true,
"gitlens.advanced.messages": {
"suppressLineUncommittedWarning": true
},
"javascript.format.placeOpenBraceOnNewLineForControlBlocks": true,
"editor.formatOnPaste": false,
"editor.cursorStyle": "line-thin",
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
}
}
1 0 → 100644
浏览文件 @ 42aea01b
Merge branch 'develop' of 192.168.110.53:com.pica.cloud.education.frontend/pica-admin-consultation into feature/jq
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
imgMd5List.json
浏览文件 @ 42aea01b
此差异已折叠。
package.json
浏览文件 @ 42aea01b
...@@ -19,6 +19,10 @@ ...@@ -19,6 +19,10 @@
"tinypng": "pica-cli-service tinypng" "tinypng": "pica-cli-service tinypng"
}, },
"dependencies": { "dependencies": {
"@fullcalendar/daygrid": "^5.10.0",
"@fullcalendar/interaction": "^5.10.0",
"@fullcalendar/timegrid": "^5.10.0",
"@fullcalendar/vue": "^5.10.0",
"axios": "^0.19.2", "axios": "^0.19.2",
"clipboard": "^2.0.6", "clipboard": "^2.0.6",
"core-js": "^3.6.5", "core-js": "^3.6.5",
......
src/api/serviceSchedule.js 0 → 100644
浏览文件 @ 42aea01b
import request from 'mn-template/plugins/http';
export const getFirstLevelLable = async () => {
return request({
url: '/basic-data/constants/lvOne/P128',
method: 'get',
});
};
export const childLabelList = async (data) => {
return request({
url: `/basic-data/constants/subordinate/${data}`,
params: data,
method: 'get',
});
};
export const workQuery = async (data) => {
return request({
url: '/diagnose/doctor/work/workQuery',
data: data,
method: 'post',
});
};
export const switchOpen = async (data) => {
return request({
url: '/diagnose/doctor/work/switchOpen',
data: data,
method: 'post',
});
};
export const workInStep = async () => {
return request({
url: '/diagnose/doctor/work/inStep',
method: 'post',
});
};
export const getLevel = async () => {
return request({
url: '/diagnose/doctor/work/getLevel',
method: 'post',
});
};
export const dutyRosterQuery = async (data) => {
return request({
url: '/diagnose/doctor/work/dutyRosterQuery',
data: data,
method: 'post',
});
};
export const saveDutyRoster = async (data) => {
return request({
url: '/diagnose/doctor/work/saveDutyRoster',
data: data,
method: 'post',
});
};
export const getDoctorInfo = async (data) => {
return request({
url: `/diagnose/doctor/work/selectById/${data.id}`,
method: 'post',
});
};
src/components/common/diagnosis-doctor.vue
浏览文件 @ 42aea01b
...@@ -394,6 +394,13 @@ ...@@ -394,6 +394,13 @@
created() { created() {
// this.startTimeValue = this.rangeTimeData; // this.startTimeValue = this.rangeTimeData;
console.log('``````', this.rangeTimeData); console.log('``````', this.rangeTimeData);
// if (this.rangeTimeData) {
// this.timeRange = Number(20);
// this.endTimeValue = dayjs(this.rangeTimeData)
// .add(this.timeRange, 'minute')
// .format('YYYY-MM-DD HH:mm:ss');
// }
console.log('``````', this.rangeTimeData, this.endTimeValue);
vm = this; vm = this;
this.getDoctorList(); this.getDoctorList();
}, },
...@@ -470,8 +477,8 @@ ...@@ -470,8 +477,8 @@
this.doctorId = ''; this.doctorId = '';
this.formData.outsideDoctor = ''; this.formData.outsideDoctor = '';
// this.startTimeValue = this.rangeTimeData; // this.startTimeValue = this.rangeTimeData;
this.endTimeValue = ''; // this.endTimeValue = '';
this.timeRange = ''; // this.timeRange = Number(20);
this.$emit('update:diagnosisDoctorVisible', false); this.$emit('update:diagnosisDoctorVisible', false);
}, },
opendialog() { opendialog() {
...@@ -526,6 +533,15 @@ ...@@ -526,6 +533,15 @@
}, },
openDiagnosisStartTimeDialog() { openDiagnosisStartTimeDialog() {
this.startTimeValue = this.rangeTimeData; this.startTimeValue = this.rangeTimeData;
if (!this.startTimeValue) {
this.timeRange = '';
this.endTimeValue = '';
}else{
this.timeRange = Number(20);
this.endTimeValue = dayjs(this.rangeTimeData)
.add(this.timeRange, 'minute')
.format('YYYY-MM-DD HH:mm:ss');
}
this.diagnosisStartTimeDialog = true; this.diagnosisStartTimeDialog = true;
}, },
startTimeConfirm(isCancle) { startTimeConfirm(isCancle) {
...@@ -534,6 +550,15 @@ ...@@ -534,6 +550,15 @@
// this.startTimeValue = ''; // this.startTimeValue = '';
this.endTimeValue = ''; this.endTimeValue = '';
this.timeRange = ''; this.timeRange = '';
// if (!this.startTimeValue) {
// this.timeRange = '';
// this.endTimeValue = '';
// }else{
// this.timeRange = Number(20);
// this.endTimeValue = dayjs(this.rangeTimeData)
// .add(this.timeRange, 'minute')
// .format('YYYY-MM-DD HH:mm:ss');
// }
} }
if (isCancle == 'submit') { if (isCancle == 'submit') {
if (String(this.startTimeValue).trim() === '' || !this.startTimeValue) { if (String(this.startTimeValue).trim() === '' || !this.startTimeValue) {
......
src/components/list/table-serviceSchedule.vue 0 → 100644
浏览文件 @ 42aea01b
<template>
<div class="table-serviceSchedule">
<el-table
v-loading="loading"
class="search-table"
style="width: 100%"
:data="tableData"
@sort-change="sortfunc"
>
<template slot="empty">
<div class="nothing-data">
<img src="../../assets/image/nothingData.png" alt="" >
<span class="nothing-data-title">暂未找到符合条件的医生</span>
</div>
</template>
<el-table-column
prop="doctorId"
label="医生ID"
width="170"
align="center"
/>
<el-table-column
prop="doctorName"
label="医生姓名"
width="170"
align="center"
/>
<el-table-column
prop="serviceOpen"
label="服务开通"
width="150"
align="center"
column-key="serviceOpen"
:filter-multiple="false"
:filters="serviceOpenList"
:filter-method="getServiceOpen"
>
<template slot-scope="scope">
<span style="margin-left: 10px">{{
scope.row.serviceOpen === '1' ? '开通' : '未开通'
}}</span>
</template>
</el-table-column>
<el-table-column
prop="hospital"
label="所属机构"
width="200"
align="center"
show-overflow-tooltip
/>
<el-table-column
prop="departmentName"
label="科室"
width="170"
align="center"
/>
<el-table-column
prop="level"
label="匹配优先级"
align="center"
width="150"
column-key="level"
:filter-multiple="false"
:filters="createList"
:filter-method="getLevel"
/>
<el-table-column
prop="workStatus"
label="排班状态"
width="170"
align="center"
column-key="workStatus"
:filter-multiple="false"
:filters="workStatusList"
:filter-method="getWorkStatus"
>
<template slot-scope="scope">
<span style="margin-left: 10px">{{
scope.row.workStatus === '2' ? '未排班' : '已排班'
}}</span>
</template>
</el-table-column>
<el-table-column
prop="modifiedTime"
label="修改时间"
width="170"
align="center"
sortable
/>
<el-table-column
prop="mobilePhone"
label="联系电话"
width="170"
align="center"
/>
<el-table-column
prop="switchStatus"
align="center"
label="接单开关"
>
<template slot-scope="scope">
<el-switch
v-model="scope.row.switchStatus"
active-color="#0D9078"
@change="changeSwitch(scope.$index, scope.row)"
/>
</template>
</el-table-column>
<el-table-column
label="操作"
fixed="right"
align="center"
min-width="200"
>
<template slot-scope="scope">
<div
class="scope-work"
style="display: flex"
>
<div
v-if="scope.row.workStatus === '2'"
class="download-btn"
@click="addSchedule(scope.row, 1)"
>
新增排班
</div>
<div
v-else
class="download-btn"
@click="addSchedule(scope.row, 2)"
>
编辑排班
</div>
<div
class="download-btn"
@click="addSchedule(scope.row, 3)"
>
查看
</div>
</div>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<div class="pagination">
<el-pagination
background
:current-page="pageNo"
:page-sizes="[15, 30, 50, 100, 150, 200]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="totalRows"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
/>
</div>
</div>
</template>
<script>
export default {
components: {
// NewScheduling,
},
props: {
tableData: {
type: Array,
default() {
return [];
},
},
createList: {
type: Array,
default() {
return [];
},
},
pageNo: {
type: Number,
default: 1,
},
pageSize: {
type: Number,
default: 20,
},
totalRows: {
type: Number,
default: 0,
},
loading: {
type: Boolean,
default: false,
},
},
data() {
return {
workStatusList: [
{
text: '已排班',
value: '已排班',
},
{
text: '未排班',
value: '未排班',
},
],
serviceOpenList: [
{
value: 1,
text: '开通',
},
{
value: 2,
text: '未开通',
},
],
};
},
computed: {},
mounted() {},
methods: {
changeSwitch(value, val) {
this.$emit('changeSwitch', value, val);
},
getServiceOpen(value, row) {
return row.serviceOpen === String(value);
},
getLevel(value, row) {
return row.level === String(value);
},
getWorkStatus(value, row) {
let newValue = '';
if (value === '未排班') {
newValue = '2';
} else {
newValue = '1';
}
return row.workStatus === String(newValue);
},
showworkStatus() {
this.isworkStatus = !this.isworkStatus;
},
addSchedule(value, val) {
this.$emit('addSchedule', value, val);
},
// 分页
handleSizeChange(value) {
this.$emit('handleSizeChange', value);
},
handleCurrentChange(value) {
this.$emit('handleCurrentChange', value);
},
sortfunc(data) {
this.$emit('sortfunc', data);
},
},
};
</script>
<style lang="scss" scoped>
.table-serviceSchedule {
.el-table {
.nothing-data{
display: inline-grid;
padding-top: 100px;
img{
width: 338px;
height: 159px;
}
.nothing-data-title{
padding-top: 40px;
padding-bottom: 150px;
font-size: 16px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #89888B;
line-height: 22px;
}
}
border-radius: 8px;
// 深度选择器
/deep/ .highlight {
color: #0d9078 !important;
}
.scope-work {
display: flex;
justify-content: center;
.download-btn {
color: #0d9078;
cursor: pointer;
margin-right: 10px;
}
}
}
}
</style>
src/router/index.js
浏览文件 @ 42aea01b
...@@ -62,6 +62,18 @@ const workbench = (r) => ...@@ -62,6 +62,18 @@ const workbench = (r) =>
() => r(require('@/views/IM/diagnosis-admin/workbench.vue')), () => r(require('@/views/IM/diagnosis-admin/workbench.vue')),
'workbench' 'workbench'
); );
const serviceSchedule = (r) =>
require.ensure(
[],
() => r(require('@/views/IM/diagnosis-admin/serviceSchedule.vue')),
'serviceSchedule'
);
const addEditSchedule = (r) =>
require.ensure(
[],
() => r(require('@/views/IM/diagnosis-admin/addEditSchedule.vue')),
'addEditSchedule'
);
const administrators = (r) => const administrators = (r) =>
require.ensure( require.ensure(
[], [],
...@@ -124,6 +136,14 @@ const routerConfig = [ ...@@ -124,6 +136,14 @@ const routerConfig = [
path: '/workbench', path: '/workbench',
component: workbench, component: workbench,
}, },
{
path: '/serviceSchedule',
component: serviceSchedule,
},
{
path: '/addEditSchedule',
component: addEditSchedule,
},
{ {
path: '/administrators', path: '/administrators',
component: administrators, component: administrators,
......
src/utils/GeneralData/diagnosis-list-new.js
浏览文件 @ 42aea01b
...@@ -35,6 +35,11 @@ export const DIAGNOS_LIST_NEW = [ ...@@ -35,6 +35,11 @@ export const DIAGNOS_LIST_NEW = [
label: '状态备注', label: '状态备注',
showtooltip: true, showtooltip: true,
}, },
{
prop: 'matchingWay',
label: '匹配方式',
showtooltip: true,
},
{ {
prop: 'toFollowReason', prop: 'toFollowReason',
label: '稍后跟进状态', label: '稍后跟进状态',
......
src/utils/GeneralData/serviceSchedule-table.js 0 → 100644
浏览文件 @ 42aea01b
// serviceSchedule-table
export const SERVICESCHEDUle_TABLE = [
{
prop: 'doctorId',
label: '医生ID',
showtooltip: false,
},
{
prop: 'doctorName',
label: '医生姓名',
showtooltip: false,
},
{
prop: 'hospital',
label: '所属机构',
showtooltip: false,
},
{
prop: 'departmentName',
label: '科室',
showtooltip: false,
},
{
prop: 'level',
label: '匹配优先级',
showtooltip: false,
},
{
prop: 'workStatus',
label: '排班状态',
showtooltip: false,
},
{
prop: 'modifiedTime',
label: '修改时间',
showtooltip: false,
},
{
prop: 'mobilePhone',
label: '联系电话',
showtooltip: false,
}
// {
// prop: 'switchStatus',
// label: '接单开关',
// showtooltip: false,
// },
];
src/utils/constants.js
浏览文件 @ 42aea01b
...@@ -81,7 +81,17 @@ export const ORDER_PRICE = [ ...@@ -81,7 +81,17 @@ export const ORDER_PRICE = [
value: 9999, value: 9999,
}, },
]; ];
// 匹配方式
export const MATCHING_LIST = [
{
label: '自动匹配',
value: 1,
},
{
label: '人工匹配',
value: 2,
},
];
// 订单状态 // 订单状态
export const STATUS_LIST = [ export const STATUS_LIST = [
{ {
......
src/views/IM/diagnosis-admin/addEditSchedule.vue 0 → 100644
浏览文件 @ 42aea01b
<template>
<div class="newScheduling">
<div class="header">
<el-breadcrumb separator="/">
<el-breadcrumb-item>首页</el-breadcrumb-item>
<el-breadcrumb-item class="breadcrumb-serviceSchedule">
服务排班表
</el-breadcrumb-item>
<el-breadcrumb-item>新增排班</el-breadcrumb-item>
</el-breadcrumb>
</div>
<div class="serviceSchedule-container">
<div class="serviceSchedule-containerInfo">
<NewScheduling />
</div>
</div>
</div>
</template>
<script>
import NewScheduling from '../diagnosis-admin/modal/newScheduling.vue';
export default {
components: {
NewScheduling,
},
data() {
return {
name: 111,
};
},
};
</script>
<style lang="scss" scoped>
.newScheduling {
height: calc(100% - 76px);
.header {
padding: 30px;
width: 100%;
.el-breadcrumb {
.breadcrumb-serviceSchedule {
/deep/ .breadcrumb-back {
font-weight: 400 !important;
color: #606266;
cursor: text;
cursor: pointer;
}
}
}
}
.serviceSchedule-container {
// height: 100%;
width: 100%;
padding: 0 14px;
.serviceSchedule-containerInfo {
border-radius: 8px;
height: 100%;
display: flex;
align-items: center;
//padding: 21px 18px 20px 18px;
}
}
}
</style>
\ No newline at end of file
src/views/IM/diagnosis-admin/diagnosis-list-new.vue
浏览文件 @ 42aea01b
...@@ -208,6 +208,26 @@ ...@@ -208,6 +208,26 @@
/> />
</el-form-item> </el-form-item>
</div> </div>
<div>
<el-form-item
label="匹配方式"
class="t-b"
>
<el-select
v-model="searchParam.matchingWay"
placeholder="请选择匹配方式"
clearable
style="width: 220px"
>
<el-option
v-for="item of matchingWayList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</div>
</div> </div>
<div class="form-li"> <div class="form-li">
<div> <div>
...@@ -475,6 +495,7 @@ ...@@ -475,6 +495,7 @@
RUN_TAB_LIST, RUN_TAB_LIST,
MATCH_TAB_LIST, MATCH_TAB_LIST,
ORDER_PRICE, ORDER_PRICE,
MATCHING_LIST,
} from '@/utils/constants'; } from '@/utils/constants';
import { import {
getCountQuery, getCountQuery,
...@@ -549,6 +570,7 @@ ...@@ -549,6 +570,7 @@
status: '', status: '',
price: '', price: '',
refundRemark: '', refundRemark: '',
matchingWay: null,
}, },
noteList: [], noteList: [],
alltabslist: [], alltabslist: [],
...@@ -556,6 +578,7 @@ ...@@ -556,6 +578,7 @@
fllowList: IS_FLLOW, fllowList: IS_FLLOW,
sourceList: SOURCE_LIST, sourceList: SOURCE_LIST,
priceList: ORDER_PRICE, priceList: ORDER_PRICE,
matchingWayList: MATCHING_LIST,
tabpaneList: [], tabpaneList: [],
rematchingOptions: [], // 备注信息 rematchingOptions: [], // 备注信息
Raw_tabpaneList: [], Raw_tabpaneList: [],
...@@ -626,10 +649,12 @@ ...@@ -626,10 +649,12 @@
}, },
methods: { methods: {
changeStartTime(time) { changeStartTime(time) {
console.log(time, '1233212321`');
this.rangeTimeData = time this.rangeTimeData = time
? new Date(time.time).format('yyyy-MM-dd hh:mm:ss') ? time.time
? 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 || [];
...@@ -925,6 +950,7 @@ ...@@ -925,6 +950,7 @@
triageDepartmentId: '', triageDepartmentId: '',
price: '', price: '',
refundRemark: '', refundRemark: '',
matchingWay: null,
diagnoseType: '', // 预约问诊类型：1、音频 2、视频 3、图文 diagnoseType: '', // 预约问诊类型：1、音频 2、视频 3、图文
createdTimeBegin: '', createdTimeBegin: '',
createdTimeEnd: '', createdTimeEnd: '',
......
src/views/IM/diagnosis-admin/modal/index.scss 0 → 100644
浏览文件 @ 42aea01b
.agment-box {
height: 100%;
background: #fff;
overflow: hidden;
padding: 20px;
border-radius: 6px;
flex: 3.8;
}
.w2{
/deep/.fc-prev-button{
background:#f4f4f5;
cursor: not-allowed;
border:1px solid #d9d9d9;
}
}
.w3{
/deep/.fc-next-button{
background:#f4f4f5;
border:1px solid #d9d9d9;
cursor: not-allowed;
}
}
/deep/.fc-timegrid-event-harness{
// position: absolute !important;
left: 0 !important;
}
.agment-box-left {
flex: 1;
height: 100%;
padding: 20px;
margin-left: 12px;
background: #fff;
border-radius: 6px;
}
.ag-left-change {
// position: relative;
// border:1px solid #ccc;
// height:40px;
// width:100%;
// display:flex;
// z-index:1;
div {
width: 9%;
height: 55px;
}
.ag-left1 {
position: absolute;
right: 12%;
top: 18px;
}
.ag-left2 {
position: absolute;
right: 1%;
top: 18px;
}
}
.agment-left-con {
margin-top: 70px;
background: #f0f2f5;
height: auto;
padding: 20px;
overflow: hidden;
border-radius: 8px;
}
.agment-head {
border-radius: 5px;
display: flex;
justify-content: flex-start;
align-items: flex-end;
}
.agment-head-name {
font-size: 20px;
color: #02120f;
font-weight: 600;
}
.agment-head-phone {
font-size: 18px;
margin-left: 16px;
}
.agment-hospital {
color: #89888b;
font-size: 16px;
margin-top: 14px;
line-height: 24px;
}
.agment-hospital-ks {
margin-top: 8px;
}
.agment-head-title {
font-size: 14px;
color: #02120f;
margin-top: 19px;
}
.agment-head-none{
background: #fff;
pointer-events: none;
}
.agment-head-priority {
padding-top: 20px;
display: flex;
justify-content:center;
align-items: center;
.item {
width: 42px;
height: 32px;
margin-right:10px;
border: 1px solid #d9d9d9;
border-radius: 8px;
text-align: center;
line-height: 32px;
cursor: pointer;
}
.active {
color: #fff;
background: #0d9078;
border: none;
}
}
.agment-left-button {
margin-top: 34px;
display: flex;
justify-content: center;
}
.reset-submit{
background: #fff;
border: 1px solid #0D9078;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #0D9078;
}
/deep/.fc-timegrid-event {
border-radius: 1px !important;
}
/deep/thead .fc-scroller-harness {
background: #fcfbff;
}
/deep/.fc-col-header-cell-cushion {
color: #333;
height: 45px;
line-height: 45px;
}
/deep/.fc .fc-highlight {
background: transparent;
}
/deep/.fc-header-toolbar {
position: absolute;
right:1%;
top: 25px;
width: 20%;
}
/deep/.fc-toolbar-title {
font-size: 6px;
}
/deep/.fc-toolbar-chunk{
display:flex;
}
/deep/.fc-button-primary {
background: #fff;
color: #02120f;
border-color: #d9d9d9;
border-radius: 20px;
padding: 6px 16px;
flex-shrink: 0;
}
@media screen and (min-width: 1000px) and (max-width: 1300px){
/deep/.fc-header-toolbar {
right: 6%;
}
.ag-left1 {
width:12% !important;
right: 18% !important;
border:1px solid red !important;
}
.ag-left2 {
width:12% !important;
right: 1% !important;
}
}
/deep/.fc-myCustomButton-button {
padding: 6px 24px;
}
/deep/.fc-button-primary:hover {
background: #fff;
color: #02120f;
border: 1px solid #0d9078;
}
/deep/.fc-event-time {
font-size: 14px;
color: #0d9078;
word-wrap: break-word;
white-space: normal;
}
src/views/IM/diagnosis-admin/modal/newScheduling.vue 0 → 100644
浏览文件 @ 42aea01b
此差异已折叠。
src/views/IM/diagnosis-admin/serviceSchedule.vue 0 → 100644
浏览文件 @ 42aea01b
此差异已折叠。
vue.config.js
浏览文件 @ 42aea01b
...@@ -71,7 +71,7 @@ module.exports = { ...@@ -71,7 +71,7 @@ module.exports = {
port: 8080, port: 8080,
proxy: { proxy: {
'/proxy': { '/proxy': {
target: 'https://dev-sc.yunqueyi.com/', target: 'https://test1-sc.yunqueyi.com/',
ws: false, ws: false,
changeOrigin: true, changeOrigin: true,
secure: true, secure: true,
......
yarn.lock
浏览文件 @ 42aea01b
...@@ -1039,6 +1039,55 @@ ...@@ -1039,6 +1039,55 @@
dependencies: dependencies:
"@fortawesome/fontawesome-common-types" "^0.2.36" "@fortawesome/fontawesome-common-types" "^0.2.36"
"@fullcalendar/common@~5.10.0":
version "5.10.0"
resolved "http://192.168.110.93:4873/@fullcalendar%2fcommon/-/common-5.10.0.tgz#8b30f3e77691eb70befb25a0edf3d9abec3a853e"
integrity sha1-izDz53aR63C++yWg7fPZq+w6hT4=
dependencies:
tslib "^2.1.0"
"@fullcalendar/core@~5.10.0":
version "5.10.0"
resolved "http://192.168.110.93:4873/@fullcalendar%2fcore/-/core-5.10.0.tgz#5e8f46618bf45ddfb16827e68fe11dbd655d529f"
integrity sha1-Xo9GYYv0Xd+xaCfmj+EdvWVdUp8=
dependencies:
"@fullcalendar/common" "~5.10.0"
preact "^10.0.5"
tslib "^2.1.0"
"@fullcalendar/daygrid@^5.10.0", "@fullcalendar/daygrid@~5.10.0":
version "5.10.0"
resolved "http://192.168.110.93:4873/@fullcalendar%2fdaygrid/-/daygrid-5.10.0.tgz#1dffcb6884859f0048755a428ff911906150a1af"
integrity sha1-Hf/LaISFnwBIdVpCj/kRkGFQoa8=
dependencies:
"@fullcalendar/common" "~5.10.0"
tslib "^2.1.0"
"@fullcalendar/interaction@^5.10.0":
version "5.10.0"
resolved "http://192.168.110.93:4873/@fullcalendar%2finteraction/-/interaction-5.10.0.tgz#047622f903f13a89fd146878137d66eecf1acc62"
integrity sha1-BHYi+QPxOon9FGh4E31m7s8azGI=
dependencies:
"@fullcalendar/common" "~5.10.0"
tslib "^2.1.0"
"@fullcalendar/timegrid@^5.10.0":
version "5.10.0"
resolved "http://192.168.110.93:4873/@fullcalendar%2ftimegrid/-/timegrid-5.10.0.tgz#7177914bdc5a6c58ec4af851520b12eb8c480141"
integrity sha1-cXeRS9xabFjsSvhRUgsS64xIAUE=
dependencies:
"@fullcalendar/common" "~5.10.0"
"@fullcalendar/daygrid" "~5.10.0"
tslib "^2.1.0"
"@fullcalendar/vue@^5.10.0":
version "5.10.0"
resolved "http://192.168.110.93:4873/@fullcalendar%2fvue/-/vue-5.10.0.tgz#e0b8ddce92b06457f05410c0e18fa1b1745f22ab"
integrity sha1-4LjdzpKwZFfwVBDA4Y+hsXRfIqs=
dependencies:
"@fullcalendar/core" "~5.10.0"
tslib "^2.1.0"
"@gar/promisify@^1.0.1": "@gar/promisify@^1.0.1":
version "1.1.2" version "1.1.2"
resolved "http://192.168.110.93:4873/@gar%2fpromisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210" resolved "http://192.168.110.93:4873/@gar%2fpromisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210"
...@@ -10439,6 +10488,11 @@ pre-commit@^1.2.2: ...@@ -10439,6 +10488,11 @@ pre-commit@^1.2.2:
spawn-sync "^1.0.15" spawn-sync "^1.0.15"
which "1.2.x" which "1.2.x"
preact@^10.0.5:
version "10.5.15"
resolved "http://192.168.110.93:4873/preact/-/preact-10.5.15.tgz#6df94d8afecf3f9e10a742fd8c362ddab464225f"
integrity sha1-bflNiv7PP54Qp0L9jDYt2rRkIl8=
prelude-ls@~1.1.2: prelude-ls@~1.1.2:
version "1.1.2" version "1.1.2"
resolved "http://192.168.110.93:4873/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" resolved "http://192.168.110.93:4873/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或