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
{"04094c981e19b077458ac5d414185112":"/Users/pica/workperson/pica-admin-consultation/src/assets/logo.png","1211365adaf1b4ec771bd88c833a880b":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/default.png","ce61da2f6bf1eb6459e85af50b359bc4":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/footer-icon.png","739c4ef79f68611bf4e43c7b981620b2":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/mm.jpg","8c330ac70b9272095e71ee97bf5afd4b":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/index_logoicon.png","523e94358197546c40edadc921593dfb":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/menu1.png","865c6c5fbbbf7050048aeccb3017e911":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/menu2.png","527810387384d793b6ab6eef46156ffb":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/no-content.png","209cb91fc2fd3cd3ed3ee0a8dbcf9c1d":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/no-content1.png","6599b1e484f5af49bf4cebca0e799812":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/noData.png","c854111e04d168e522281c3fbfe72df5":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/small.png","f94996a13b960effe94989c5957e4b42":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/live/close-call.png","44ccf56a79c8edb3a5ce8fef6a26a231":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/live/no-camera.png","04c83af49218fafe8d8c6089c2ea217a":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/live/voice-close.png","fe7ab70abde84f7ac1ae6313f9645b0b":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/live/voice-small.png","25a8e68f45ec649c79248db1fe31e8c9":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/live/voice.png","1faf0833ebbedfda6d17955f8e28594c":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/live/waiting-call.png","f98a82b4194f76eab457b06e3d2e7c66":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/live/warning.png","6ec04aa3b33066f2c68569ba58bc4ca6":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/Icon-calendar.png","ccce5124739cb6198824c9540d3fadef":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/Icon-search.png","8e3527f62dcd15391482e9b73bfeeba2":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/Icon-sel-no.png","a91444748c06325ea33d001995782e5e":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/check-no.png","7d962f5e778d83fdaa29996b166bfc37":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/check-yes.png","2eb4cd4f705b890049038538332dfe6b":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/down-2.png","8509ab20474be1d2b45a2307e879335a":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/down.png","69460ac3712a98af9673b0b729f722e7":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/file-text-2.png","13a22959d620da58bf617c2158fea27c":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/folder-open-2.png","9f7e069aa42684d54ce62240135e5e7a":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/icon-comment.png","f2a3ffe7ba3ec3df2db7f14bbf7f4815":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/icon-contacts.png","c6ddf67990cac1414a14e1a98e9722fa":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/icon-download.png","cc58a2a3f8868ca13d567fbe117de2f1":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/icon-exit.png","0efa6485aacd1cac491c3f1313f348ad":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/icon-file-search.png","67c06d425d6db623e264c3ac2f08da49":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/icon-folder-open.png","ff1499485988321abbf2657a9e18b4cf":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/icon-fresh-2.png","17ec7d4e0499ff61d4ef9939a5e6428f":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/icon-home.png","698d2d257867569ec399c08468ed5303":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/icon-id-card.png","f2f90f4dcd14190d1f2bd86f54b2cf13":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/icon-link.png","065b545d1d83e0456f0e1daa53597a83":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/icon-minus.png","a4cc9df6601a1c5090cf2168dcc7dbde":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/icon-no-send.png","fb3677a52cceb986a3f3343e07a3e2db":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/icon-org.png","8b6e74338243db8bcdea35be8e5a5e38":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/icon-pdf.png","17d834654243c38a199635a00dd7446c":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/icon-phone-no.png","a6b6cc69354232c8d3050cc620e76198":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/icon-plus.png","5f8600eefac5efecdcdf54826b2ef241":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/icon-right-gray.png","89aa7e4d0f1e366395f55e9970ad3cbf":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/icon-sel-checked.png","c645c2246f82d6d03a2fc3bc3f0784f4":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/icon-team.png","6397dbfdf90559f8a4bd8232ae07de75":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/icon-time-circle.png","293003bc154df60b8246a2b1a9d7c37d":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/icon-warning-circle.png","952c520ede22bc3b7acfcdadcf275616":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/im_close.png","b52e26837623d200333631f103d98b3d":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/im_close2.png","fa72624d8fc22600303284d811b2eba1":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/im_man1.png","1ee9e967594f2431cc2d5b488fdef1a2":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/im_man2.png","2cf21b4a08769bce649212cd664c7aec":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/im_sendfile.png","46c7f58b6ecc1b9131cdaeb16e8fdb46":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/im_sendvedio.png","3fc6108bdbb192a275c93c81b68df045":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/im_small.png","d6a21a2a70672a21e71f4f9a012017ea":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/im_text.png","c524f8dc61fb177e2c0ec6ba583e16cb":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/im_time.png","34a79d4b3e08fa1975c4d6907564228c":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/im_video.png","fa9d7d646a9a69b71fae713831df6a66":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/kf-avatar.png","bfc960810928cdee01b2ed84a7c06e2b":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/link-2.png","b980d3476ef41c82308f8c5cdad88531":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/loading-icon-new.png","32925e323462fe90f4882878e0e06557":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/loading-icon.png","d73985857b58cabaec3d78a75306b65c":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/logo-small.png","66e2b7f6f6afdb328dfe2fb0fe271fb5":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/no-search-list.png","f961abf468fe062cc8c6cb5af0a8695d":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/plus-task.png","c23e76ce2fa154090c58e27cd95e83f4":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/right-no.png","aee074558d02e3f5abea690b75337be3":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/right-yes.png","729084b7e8114c57146907d1cd1885df":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/send-no.png","cb4afae3d4197d8991c3d210ce6b86b4":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/send-yes.png","131b8e5595a9eae4b152d0aff5de1185":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/upload-2.png","4107110c540e0357837f881d536548b7":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/upload.png","ce46719d7b61c94af00a5fbe9e7d2e9f":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/voice.png","5c402aef9047604682ddf89f6800f587":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/IM/wenzhenicon.png","46138f4da71d22ea9f52b96381d2b488":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/workbench/appointment.png","700baa3be1ed6ed0d15aed0a567ffcc9":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/workbench/calling.png","2b73b262d39408258813f8a9799a1d9f":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/workbench/callout.png","529313b564b3c06e4cdcf5fda56b62b3":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/workbench/callouting.png","4f11e4aa938f3f7e6d3e5ee1c2e6ca22":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/workbench/consulting hours.png","250afe058cb804b2c1a9d14dbf5f76fd":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/workbench/doctorCallcustomer.gif","4dd8e00757b8abe9b0d82ddac09f30a8":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/workbench/no_data_wz.png","2dc933e1793141de0879ee694f7b2901":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/workbench/offline.png","203dd7fbdb3c43eb3a0fe48946321f64":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/workbench/photo.png","3cb41883c5525e3ff1e48f2636de8de8":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/workbench/video.png","cc6f11704c4393870abe9065d85f7244":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/workbench/voice.png","98c7acf55e9461c81eb07e45bf3f2a20":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/workbench/appointment.png","fc598ce09986ef5f62a8fa85de983a8b":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/workbench/appremind.png","b203989c64a47cd0e458b56f0d4c3a50":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/workbench/calling.gif","fa4c423d7c6ce61c4975121178eb44b9":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/workbench/calling.png","794014f45e4a6562dcc940864bcff51d":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/workbench/callout.png","7e5d36444fff2dbe0a0a1a16527d01cd":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/workbench/callouting.png","6d575af9a66da1c3b79619a6de71045c":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/workbench/consulting hours.png","70ec78c674225960473b6d7daa8eca4c":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/workbench/maulcall.png","2b346851e90bb70ec49c19a86e210d16":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/workbench/no_data_wz.png","98972e5acf45243bb66a8bc6e7233b1a":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/workbench/photo.png","cda4965eb5590c25e18b8c6ce49f3be6":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/workbench/remindalready.png","8642cdee63ae862673db59fc3c24569a":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/workbench/video.png","f322c185a56910cd48942a7b02c0af29":"/Users/pica/workperson/pica-admin-consultation/src/assets/image/workbench/voice.png"}
\ No newline at end of file
{"04094c981e19b077458ac5d414185112":"/Users/pica/workcode/pica-admin-consultation/src/assets/logo.png","1211365adaf1b4ec771bd88c833a880b":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/default.png","ce61da2f6bf1eb6459e85af50b359bc4":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/footer-icon.png","739c4ef79f68611bf4e43c7b981620b2":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/mm.jpg","8c330ac70b9272095e71ee97bf5afd4b":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/index_logoicon.png","523e94358197546c40edadc921593dfb":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/menu1.png","865c6c5fbbbf7050048aeccb3017e911":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/menu2.png","527810387384d793b6ab6eef46156ffb":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/no-content.png","209cb91fc2fd3cd3ed3ee0a8dbcf9c1d":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/no-content1.png","6599b1e484f5af49bf4cebca0e799812":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/noData.png","c854111e04d168e522281c3fbfe72df5":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/small.png","f94996a13b960effe94989c5957e4b42":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/live/close-call.png","44ccf56a79c8edb3a5ce8fef6a26a231":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/live/no-camera.png","04c83af49218fafe8d8c6089c2ea217a":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/live/voice-close.png","fe7ab70abde84f7ac1ae6313f9645b0b":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/live/voice-small.png","25a8e68f45ec649c79248db1fe31e8c9":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/live/voice.png","1faf0833ebbedfda6d17955f8e28594c":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/live/waiting-call.png","f98a82b4194f76eab457b06e3d2e7c66":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/live/warning.png","6ec04aa3b33066f2c68569ba58bc4ca6":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/Icon-calendar.png","ccce5124739cb6198824c9540d3fadef":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/Icon-search.png","8e3527f62dcd15391482e9b73bfeeba2":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/Icon-sel-no.png","a91444748c06325ea33d001995782e5e":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/check-no.png","7d962f5e778d83fdaa29996b166bfc37":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/check-yes.png","2eb4cd4f705b890049038538332dfe6b":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/down-2.png","8509ab20474be1d2b45a2307e879335a":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/down.png","69460ac3712a98af9673b0b729f722e7":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/file-text-2.png","13a22959d620da58bf617c2158fea27c":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/folder-open-2.png","9f7e069aa42684d54ce62240135e5e7a":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/icon-comment.png","f2a3ffe7ba3ec3df2db7f14bbf7f4815":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/icon-contacts.png","c6ddf67990cac1414a14e1a98e9722fa":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/icon-download.png","cc58a2a3f8868ca13d567fbe117de2f1":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/icon-exit.png","0efa6485aacd1cac491c3f1313f348ad":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/icon-file-search.png","67c06d425d6db623e264c3ac2f08da49":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/icon-folder-open.png","ff1499485988321abbf2657a9e18b4cf":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/icon-fresh-2.png","17ec7d4e0499ff61d4ef9939a5e6428f":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/icon-home.png","698d2d257867569ec399c08468ed5303":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/icon-id-card.png","f2f90f4dcd14190d1f2bd86f54b2cf13":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/icon-link.png","065b545d1d83e0456f0e1daa53597a83":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/icon-minus.png","a4cc9df6601a1c5090cf2168dcc7dbde":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/icon-no-send.png","fb3677a52cceb986a3f3343e07a3e2db":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/icon-org.png","8b6e74338243db8bcdea35be8e5a5e38":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/icon-pdf.png","17d834654243c38a199635a00dd7446c":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/icon-phone-no.png","a6b6cc69354232c8d3050cc620e76198":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/icon-plus.png","5f8600eefac5efecdcdf54826b2ef241":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/icon-right-gray.png","89aa7e4d0f1e366395f55e9970ad3cbf":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/icon-sel-checked.png","c645c2246f82d6d03a2fc3bc3f0784f4":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/icon-team.png","6397dbfdf90559f8a4bd8232ae07de75":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/icon-time-circle.png","293003bc154df60b8246a2b1a9d7c37d":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/icon-warning-circle.png","952c520ede22bc3b7acfcdadcf275616":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/im_close.png","b52e26837623d200333631f103d98b3d":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/im_close2.png","fa72624d8fc22600303284d811b2eba1":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/im_man1.png","1ee9e967594f2431cc2d5b488fdef1a2":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/im_man2.png","2cf21b4a08769bce649212cd664c7aec":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/im_sendfile.png","46c7f58b6ecc1b9131cdaeb16e8fdb46":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/im_sendvedio.png","3fc6108bdbb192a275c93c81b68df045":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/im_small.png","d6a21a2a70672a21e71f4f9a012017ea":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/im_text.png","c524f8dc61fb177e2c0ec6ba583e16cb":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/im_time.png","34a79d4b3e08fa1975c4d6907564228c":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/im_video.png","fa9d7d646a9a69b71fae713831df6a66":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/kf-avatar.png","bfc960810928cdee01b2ed84a7c06e2b":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/link-2.png","b980d3476ef41c82308f8c5cdad88531":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/loading-icon-new.png","32925e323462fe90f4882878e0e06557":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/loading-icon.png","d73985857b58cabaec3d78a75306b65c":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/logo-small.png","66e2b7f6f6afdb328dfe2fb0fe271fb5":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/no-search-list.png","f961abf468fe062cc8c6cb5af0a8695d":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/plus-task.png","c23e76ce2fa154090c58e27cd95e83f4":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/right-no.png","aee074558d02e3f5abea690b75337be3":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/right-yes.png","729084b7e8114c57146907d1cd1885df":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/send-no.png","cb4afae3d4197d8991c3d210ce6b86b4":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/send-yes.png","131b8e5595a9eae4b152d0aff5de1185":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/upload-2.png","4107110c540e0357837f881d536548b7":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/upload.png","ce46719d7b61c94af00a5fbe9e7d2e9f":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/voice.png","5c402aef9047604682ddf89f6800f587":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/IM/wenzhenicon.png","46138f4da71d22ea9f52b96381d2b488":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/workbench/appointment.png","700baa3be1ed6ed0d15aed0a567ffcc9":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/workbench/calling.png","2b73b262d39408258813f8a9799a1d9f":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/workbench/callout.png","529313b564b3c06e4cdcf5fda56b62b3":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/workbench/callouting.png","4f11e4aa938f3f7e6d3e5ee1c2e6ca22":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/workbench/consulting hours.png","250afe058cb804b2c1a9d14dbf5f76fd":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/workbench/doctorCallcustomer.gif","4dd8e00757b8abe9b0d82ddac09f30a8":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/workbench/no_data_wz.png","2dc933e1793141de0879ee694f7b2901":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/workbench/offline.png","203dd7fbdb3c43eb3a0fe48946321f64":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/workbench/photo.png","3cb41883c5525e3ff1e48f2636de8de8":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/workbench/video.png","cc6f11704c4393870abe9065d85f7244":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/workbench/voice.png","98c7acf55e9461c81eb07e45bf3f2a20":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/workbench/appointment.png","fc598ce09986ef5f62a8fa85de983a8b":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/workbench/appremind.png","b203989c64a47cd0e458b56f0d4c3a50":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/workbench/calling.gif","fa4c423d7c6ce61c4975121178eb44b9":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/workbench/calling.png","794014f45e4a6562dcc940864bcff51d":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/workbench/callout.png","7e5d36444fff2dbe0a0a1a16527d01cd":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/workbench/callouting.png","6d575af9a66da1c3b79619a6de71045c":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/workbench/consulting hours.png","70ec78c674225960473b6d7daa8eca4c":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/workbench/maulcall.png","2b346851e90bb70ec49c19a86e210d16":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/workbench/no_data_wz.png","98972e5acf45243bb66a8bc6e7233b1a":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/workbench/photo.png","cda4965eb5590c25e18b8c6ce49f3be6":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/workbench/remindalready.png","8642cdee63ae862673db59fc3c24569a":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/workbench/video.png","f322c185a56910cd48942a7b02c0af29":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/workbench/voice.png","c51c54bf7bbb9151a725e0c808ab50b0":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/question.png"}
\ No newline at end of file
package.json
浏览文件 @ 42aea01b
......@@ -19,6 +19,10 @@
"tinypng": "pica-cli-service tinypng"
},
"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",
"clipboard": "^2.0.6",
"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 @@
created() {
// this.startTimeValue = 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;
this.getDoctorList();
},
......@@ -470,8 +477,8 @@
this.doctorId = '';
this.formData.outsideDoctor = '';
// this.startTimeValue = this.rangeTimeData;
this.endTimeValue = '';
this.timeRange = '';
// this.endTimeValue = '';
// this.timeRange = Number(20);
this.$emit('update:diagnosisDoctorVisible', false);
},
opendialog() {
......@@ -526,6 +533,15 @@
},
openDiagnosisStartTimeDialog() {
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;
},
startTimeConfirm(isCancle) {
......@@ -534,6 +550,15 @@
// this.startTimeValue = '';
this.endTimeValue = '';
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 (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) =>
() => r(require('@/views/IM/diagnosis-admin/workbench.vue')),
'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) =>
require.ensure(
[],
......@@ -124,6 +136,14 @@ const routerConfig = [
path: '/workbench',
component: workbench,
},
{
path: '/serviceSchedule',
component: serviceSchedule,
},
{
path: '/addEditSchedule',
component: addEditSchedule,
},
{
path: '/administrators',
component: administrators,
......
src/utils/GeneralData/diagnosis-list-new.js
浏览文件 @ 42aea01b
......@@ -35,6 +35,11 @@ export const DIAGNOS_LIST_NEW = [
label: '状态备注',
showtooltip: true,
},
{
prop: 'matchingWay',
label: '匹配方式',
showtooltip: true,
},
{
prop: 'toFollowReason',
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 = [
value: 9999,
},
];
// 匹配方式
export const MATCHING_LIST = [
{
label: '自动匹配',
value: 1,
},
{
label: '人工匹配',
value: 2,
},
];
// 订单状态
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 @@
/>
</el-form-item>
</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 class="form-li">
<div>
......@@ -475,6 +495,7 @@
RUN_TAB_LIST,
MATCH_TAB_LIST,
ORDER_PRICE,
MATCHING_LIST,
} from '@/utils/constants';
import {
getCountQuery,
......@@ -549,6 +570,7 @@
status: '',
price: '',
refundRemark: '',
matchingWay: null,
},
noteList: [],
alltabslist: [],
......@@ -556,6 +578,7 @@
fllowList: IS_FLLOW,
sourceList: SOURCE_LIST,
priceList: ORDER_PRICE,
matchingWayList: MATCHING_LIST,
tabpaneList: [],
rematchingOptions: [], // 备注信息
Raw_tabpaneList: [],
......@@ -626,10 +649,12 @@
},
methods: {
changeStartTime(time) {
console.log(time, '1233212321`');
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) {
this.saveTableData = val || [];
......@@ -925,6 +950,7 @@
triageDepartmentId: '',
price: '',
refundRemark: '',
matchingWay: null,
diagnoseType: '', // 预约问诊类型：1、音频 2、视频 3、图文
createdTimeBegin: '',
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
<template>
<div
v-loading="loading"
style="
width: 100%;
height: auto;
position: relative;
display: flex;
justifycontent: space-between;
"
>
<div
ref="agment"
class="agment-box"
:class="{'w2':week==2,'w3':week==3}"
>
<FullCalendar :options="calendarOptions" />
</div>
<div
class="agment-box-left"
:style="{ height: scrollerHeight }"
>
<div class="ag-left-change">
<div
v-if="week == 2"
class="ag-left1"
/>
<!-- v-if="week == 2" -->
<div
v-if="week == 3"
class="ag-left2"
/>
<!-- -->
</div>
<div class="agment-left-con">
<div class="agment-head">
<div class="agment-head-name">
{{ this.schedulingTypeValue.doctorName }}
</div>
<div class="agment-head-phone">
{{ this.schedulingTypeValue.mobilePhone }}
</div>
</div>
<div class="agment-hospital">
{{ this.schedulingTypeValue.hospital }}
</div>
<div class="agment-hospital agment-hospital-ks">
{{ this.schedulingTypeValue.departmentName }}
</div>
</div>
<div
style="margin-top: 24px"
>
<p class="agment-head-title">
选择匹配优先级
</p>
<div :class="this.schedulingType == 3 ? 'agment-head-none' : '' ">
<div class="agment-head-priority">
<p
v-for="(item, index) in createList"
:key="index"
class="item"
:class="{ active: item == currentIndex }"
@click="handlePriority(item)"
>
{{ item }}
</p>
</div>
</div>
</div>
<div
v-if="this.schedulingType != 3"
class="agment-left-button"
>
<el-button
round
class="reset-submit"
style="width: 110px"
@click="resetDoctoreScheduling"
>
重置
</el-button>
<el-button
type="primary"
round
style="width: 110px"
@click="saveDoctoreScheduling"
>
保存
</el-button>
</div>
</div>
</div>
</template>
<script>
// import '@fullcalendar/core/vdom'
// import moment from 'moment';
import FullCalendar from '@fullcalendar/vue';
import dayGridPlugin from '@fullcalendar/daygrid';
import timeGridPlugin from '@fullcalendar/timegrid';
import interactionPlugin from '@fullcalendar/interaction';
import {
dutyRosterQuery,
saveDutyRoster,
getLevel,
getDoctorInfo,
} from '@/api/serviceSchedule';
export default {
name: 'Index',
components: {
FullCalendar,
},
data() {
return {
id:'',
doctorId:'',
schedulingTypeValue:{},
schedulingType: 1, // 1 新增 2 编辑 3 查看
createList: [],
listDate: [],
week: 1, // 1:当前周 2:上一周 3:下一周
currentIndex: 3,
haveWeek: [1],
calendarOptions: {
// 引入的插件，比如fullcalendar/daygrid，fullcalendar/timegrid引入后才可显示月，周，日
plugins: [dayGridPlugin, interactionPlugin, timeGridPlugin],
initialView: 'timeGridWeek', // 默认为那个视图（月：dayGridMonth，周：timeGridWeek，日：timeGridDay）
selectable: true,
selectMirror: true,
selectAllow: this.selectAllow,
selectOverlap: false,
select: this.selectInfo,
selectMinDistance: 0,
eventResize: this.eventResize,
eventDrop: this.eventDrop,
editable: true,
overlap: false,
defaultDate: new Date(),
datesSet: this.handleDatesSet,
events: [],
slotEventOverlap: true,
header: {
center: 'month,agendaFourDay', // buttons for switching between views
},
firstDay: 1, // 设置一周中显示的第一天是哪天，周日是0，周一是1，类推
locale: 'zh-cn', // 切换语言，当前为中文
eventColor: '#fff', // 全部日历日程背景色3BB2E3
eventBackgroundColor: '#E7F4F5',
// themeSystem: 'bootstrap', // 主题色(本地测试未能生效)
// initialDate: moment().format('YYYY-MM-DD'), // 自定义设置背景颜色时一定要初始化日期时间
timeGridEventMinHeight: '40', // 设置事件的最小高度
aspectRatio: 1.35, // 设置日历单元格宽度与高度的比例。
// displayEventTime: false, // 是否显示时间
allDaySlot: false, // 周，日视图时，all-day 不显示
eventLimit: true, // 设置月日程，与all-day slot的最大显示数量，超过的通过弹窗显示
customButtons: {
myCustomButton: {
text: '本周',
},
},
headerToolbar: {
// 日历头部按钮位置
left: '',
center: 'prev myCustomButton next',
right: '',
},
expandRows: true,
slotMinWidth: 50,
slotDuration: '00:30:00',
slotMinTime: '09:00',
slotMaxTime: '21:00',
slotLabelInterval: '',
scrollTime: false,
slotLabelFormat: {
hour: 'numeric',
minute: '2-digit',
meridiem: 'short',
hour12: false, // 设置时间为24小时
},
eventLimitNum: {
// 事件显示数量限制(本地测试未能生效)
dayGrid: {
eventLimit: 5,
},
timeGrid: {
eventLimit: 4, // adjust to 6 only for timeGridWeek/timeGridDay
},
},
eventClick: this.handleEventClick,
},
workingTicketVisible: false, // 工作表票详情页面
scrollerHeight: 0,
loading: false,
};
},
watch: {
week(newV) {
if (this.haveWeek.indexOf(newV) == -1) {
this.haveWeek.push(newV);
this.handleInitSearch();
}
},
},
created() {
this.schedulingType = this.$route.query.type || 1;
this.id = this.$route.query.id;
this.doctorId = this.$route.query.doctorId,
getDoctorInfo({ id: this.id }).then((res) => {
if (res.code == '000000') {
this.schedulingTypeValue = res.data;
this.currentIndex = res.data.level;
}else{
this.$toast(res.message);
}
});
getLevel().then((res) => {
if (res.code == '000000') {
this.createList = res.data;
}
});
},
mounted() {
this.scrollerHeight = this.$refs.agment.clientHeight + 'px';
// console.log(this.$refs.agment.clientHeight, 'this.$refs.agment.offsetHeight;');
this.init();
},
methods: {
/**
* 点击日历日程事件
*
* info: 事件信息
* event是日程（事件）对象
* jsEvent是个javascript事件
* view是当前视图对象。
*/
init() {
if (this.schedulingType == 1 || this.schedulingType == 2) {
this.calendarOptions.editable = true;
} else {
// 查看
this.calendarOptions.slotDuration = '00:05:00';
this.calendarOptions.selectable = false;
this.calendarOptions.editable = false;
}
this.handleInitSearch();
},
handleInitSearch(isReset) {
if (isReset) {
this.calendarOptions.events = [];
}
const objParms = {};
objParms.doctorId = this.doctorId;
objParms.week = this.week;
objParms.workId = this.id;
// this.currentIndex = this.schedulingTypeValue.level;
dutyRosterQuery(objParms).then((res) => {
if (res.code == '000000') {
this.handleInitData(res.data);
} else {
this.$toast(res.message);
}
});
},
handleInitData(data) {
var newDate = null;
if (this.schedulingType != 3) {
newDate = [].concat(data.noAcceptList);
} else {
var acceptList = [];
data.acceptList.forEach((item) => {
item.type = 88;
acceptList.push(item);
});
newDate = [].concat(acceptList, data.noAcceptList);
}
// const keyAll = ['end', 'endStr', 'id', 'start', 'startStr'];
newDate.forEach((item) => {
const dataObj = {};
const id = (this.calendarOptions.events.length + 1) * 10;
dataObj['week'] = this.week;
dataObj['id'] = id;
dataObj['end'] = item.endTime;
dataObj['start'] = item.startTime;
console.log(item.type);
dataObj['type'] = item.type;
if (item.type == 88) {
dataObj['color'] = '#FFEDE9';
}
this.calendarOptions.events.push(dataObj);
});
},
handleDatesSet(dataInfo) {
const currentTime = new Date().getTime();
const getTime = new Date(dataInfo.startStr).getTime();
const cz = currentTime - getTime;
const oneHour = 1 * 60 * 60 * 1000 * 24;
const timeDifference = (cz / oneHour) | 0;
const headObj = this.calendarOptions.customButtons.myCustomButton;
if (timeDifference > 0 && timeDifference < 7) {
// 过去
this.week = 1;
headObj.text = '本周';
} else if (timeDifference < 0) {
// 未来
this.week = 3;
headObj.text = '下周';
} else {
// 现在
headObj.text = '上周';
this.week = 2;
}
},
eventResize(event) {
const index = this.getIdDeleteData(event.event.id);
const oldData = this.calendarOptions.events;
const keyAll = Object.keys(oldData[index]);
const dataObj = {};
keyAll.forEach((item) => {
if (item === 'week' || item === 'type') {
dataObj[item] = oldData[index][item];
} else {
dataObj[item] = event.event[item];
}
});
oldData.splice(index, 1, dataObj);
this.getHandleTime(dataObj);
},
handleEventClick(event) {
if (!this.calendarOptions.selectable) {
return;
}
this.$confirm('你要取消日期吗？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then((_) => {
console.log(_);
const index = this.getIdDeleteData(event.event.id);
return this.calendarOptions.events.splice(index, 1);
})
.catch((_) => {
console.log(_);
});
// alert("你要取消日期吗");
},
eventDrop(event) {
event.revert();
return;
},
selectInfo(info) {
const startDay = new Date(info.start).getDay();
const endDay = new Date(info.end).getDay();
if (startDay != endDay) {
return this.$toast('不能夸天选择排班');
}
const id = (this.calendarOptions.events.length + 1) * 10;
info.id = id;
const keyAll = ['end', 'endStr', 'id', 'start', 'startStr', 'week'];
const dataObj = {};
keyAll.forEach((item) => {
if (item == 'week') {
dataObj[item] = this.week;
} else {
dataObj[item] = info[item];
}
});
this.calendarOptions.events.push(dataObj);
},
selectAllow(info) {
const startDay = new Date(info.start).getDay();
const endDay = new Date(info.end).getDay();
if (startDay != endDay) {
return false;
}
const currentDate = new Date();
const start = info.start;
const end = info.end;
return start <= end && start >= currentDate;
},
getIdDeleteData(eventId) {
// 删除现有排班
const data = this.calendarOptions.events;
const index = data.findIndex((event) => event.id == eventId);
return index;
},
getHandleTime(info) {
// 对于排班交叉部分处理
const infoStart = new Date(info.start).getTime();
const infoEnd = new Date(info.end).getTime();
const data = this.calendarOptions.events;
const newDate = [];
let indexObj = false;
data.forEach((item) => {
const d = new Date(item.end).getTime();
const s = new Date(item.start).getTime();
if (s > infoStart && infoEnd >= d) {
indexObj = true;
} else if (s > infoStart && infoEnd >= s) {
indexObj = true;
} else {
const id = (newDate.length + 1) * 10;
item.id = id;
newDate.push(item);
}
});
this.calendarOptions.events = newDate;
return indexObj;
},
handlePriority(index) {
this.currentIndex = index;
},
resetDoctoreScheduling() {
this.handleInitSearch(true);
},
saveDoctoreScheduling() {
this.loading = true;
const objParms = {};
objParms.week = this.week;
objParms.workId = this.schedulingTypeValue.id;
objParms.level = this.currentIndex;
objParms.list = [];
const data = this.calendarOptions.events;
data.forEach((item) => {
if (item.week == this.week) {
const obj = {};
obj.startTime = this.dateFormat('YYYY-mm-dd HH:MM:SS', item.start);
obj.endTime = this.dateFormat('YYYY-mm-dd HH:MM:SS', item.end);
objParms.list.push(obj);
}
});
saveDutyRoster(objParms).then((res) => {
if (res.code === '000000') {
// this.$toast(res.message);
// this.handleInitSearch(true);
// this.$router.go(0);
this.loading = false;
this.$message({
message: '排班保存成功',
type: 'success'
});
} else {
// this.$toast(res.message);
this.$message.error(res.message || '排班保存失败');
}
});
},
dateFormat(fmt, date2) {
const date = new Date(date2);
let ret;
const opt = {
'Y+': date.getFullYear().toString(), // 年
'm+': (date.getMonth() + 1).toString(), // 月
'd+': date.getDate().toString(), // 日
'H+': date.getHours().toString(), // 时
'M+': date.getMinutes().toString(), // 分
'S+': date.getSeconds().toString() || '00', // 秒
// 有其他格式化字符需求可以继续添加，必须转化成字符串
};
for (const k in opt) {
ret = new RegExp('(' + k + ')').exec(fmt);
if (ret) {
fmt = fmt.replace(
ret[1],
ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
);
}
}
return fmt;
},
},
};
</script>
<style lang="scss" scoped>
@import 'index';
</style>
src/views/IM/diagnosis-admin/serviceSchedule.vue 0 → 100644
浏览文件 @ 42aea01b
<template>
<div class="serviceScheduleNew">
<div
v-if="ScheduleListShow"
class="serviceSchedule"
>
<div class="header">
<el-breadcrumb separator="/">
<el-breadcrumb-item>首页</el-breadcrumb-item>
<el-breadcrumb-item> 服务排班表 </el-breadcrumb-item>
</el-breadcrumb>
</div>
<div class="serviceSchedule-container">
<div class="serviceSchedule-containerInfo">
<div class="serviceSchedule-containerInfo-left">
<el-cascader
v-model="innerform"
class="serviceSchedule-cascader"
filterable
clearable
:options="interfaceOptions"
:props="props"
placeholder="选择科室"
:show-all-levels="false"
@expand-change="handleItemChange"
@change="selectApi($event, innerform)"
/>
<el-select
v-model="searchParam.createType"
class="select-first"
placeholder="选择优先级"
clearable
@change="getCreateType"
>
<el-option
v-for="(item, index) of createList"
:key="index"
:label="item"
:value="item"
/>
</el-select>
<el-select
v-model="searchParam.serviceOpen"
class="select-first"
placeholder="选择开通状态"
clearable
@change="getService"
>
<el-option
v-for="item of serviceOpenList"
:key="item.id"
:label="item.value"
:value="item.id"
/>
</el-select>
<el-select
v-model="searchParam.ScheduleStatus"
class="serviceSchedule-status"
placeholder="选择排班状态"
clearable="true"
@change="getScheduleStatus"
>
<el-option
v-for="item of ScheduleStatusList"
:key="item.id"
:label="item.value"
:value="item.id"
/>
</el-select>
<el-date-picker
v-model="searchParam.createRangeTime"
class="serviceSchedule-time"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="→"
size="large"
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="pickerOptions"
@change="getCreateRangeTime"
/>
<el-input
v-model="searchParam.idNamePhone"
clearable
class="serviceSchedule-idNamePhone"
placeholder="医生姓名/手机号"
style="width: 250px"
@change="getIdNamePhone"
/>
<el-button
type="primary"
class="submit-btn"
@click="search"
>
查询
</el-button>
</div>
<div class="synchro-btn-icon">
<el-button
class="synchro-btn"
@click="searchInStep"
>
同步信息
</el-button>
<el-tooltip
class="serviceSchedule-tooltip"
effect="light"
content="点击按钮可同步最新的专家入驻信息"
placement="top-start"
>
<img
class="el-icon-s-question"
src="../../../assets/image/question.png"
alt
>
</el-tooltip>
</div>
</div>
<div class="serviceSchedule-table">
<TableServiceSchedule
:table-data="tableData"
:page-no="searchParam.pageNo"
:page-size="searchParam.pageSize"
:total-rows="searchParam.totalRows"
:loading="loading"
:create-list="newCreateList"
@sortfunc="sortfunc"
@getServiceOpen="getServiceOpen"
@getWorkStatus="getWorkStatus"
@changeSwitch="changeSwitch"
@handleSizeChange="handleSizeChange"
@handleCurrentChange="handleCurrentChange"
@addSchedule="addSchedule"
/>
</div>
</div>
</div>
<a
ref="target"
class="target"
href=""
target="_blank"
/>
</div>
</template>
<script>
import {
getFirstLevelLable,
childLabelList,
workQuery,
switchOpen,
workInStep,
getLevel,
} from '@/api/serviceSchedule';
import TableServiceSchedule from '@/components/list/table-serviceSchedule';
export default {
components: {
TableServiceSchedule,
},
data() {
return {
innerform: [],
props: {
// props定义的值根据接口返回的数据定的
label: 'value',
value: 'no',
children: 'interface',
},
searchParam: {
departmentId: '',
createType: '',
idNamePhone: '',
ScheduleStatus: '',
startRangeTime: '',
endRangeTime: '',
serviceOpen: '',
pageSize: 15,
pageNo: 0,
sort: '',
createRangeTime: [],
},
ScheduleStatusList: [
{
value: '已排班',
id: 1,
},
{
value: '未排班',
id: 2,
},
],
serviceOpenList: [
{
value: '开通',
id: 1,
},
{
value: '未开通',
id: 2,
},
],
createList: [],
interfaceOptions: [],
createRangeTime: [],
pickerOptions: {
disabledDate: (time) => {
return time.getTime() > new Date().getTime(); // 减去一天的时间代表可以选择同一天;
},
},
ScheduleListShow: true,
tableData: [],
loading: false,
newCreateList: [],
};
},
watch: {},
created() {
this.getFirstLevelLable();
this.getLevel();
this.search();
},
methods: {
// 通过监听expand-change事件（当展开节点发生变化时触发）获取第二层数据，组装interfaceOptions数据
handleItemChange(val) {
const value = val[0];
childLabelList(value).then((res) => {
if (res.code === '000000') {
const interfaceArr = (res.data || []).map((item) => {
return {
value: item.name,
no: item.id,
};
});
this.interfaceOptions.filter((item) => {
if (item.no === value) {
this.$set(item, 'interface', interfaceArr);
}
return;
});
}
});
},
getFirstLevelLable() {
getFirstLevelLable().then((res) => {
if (res.code === '000000') {
this.interfaceOptions = res.data || [];
this.interfaceOptions.forEach((item, index) => {
// 添加属性
this.$set(this.interfaceOptions[index], 'interface', []);
});
} else {
this.$message({
message: res.msg,
type: 'warning',
});
}
});
},
// 获取选择的值
selectApi(e, value) {
this.searchParam.departmentId = value[1];
this.searchParam.pageNo = 1;
},
getCreateType(value) {
this.searchParam.createType = value;
this.searchParam.pageNo = 1;
},
getService(value) {
this.searchParam.serviceOpen = value;
this.searchParam.pageNo = 1;
},
getScheduleStatus(value) {
this.searchParam.ScheduleStatus = value;
this.searchParam.pageNo = 1;
},
getIdNamePhone(value) {
this.searchParam.idNamePhone = value;
this.searchParam.pageNo = 1;
},
getCreateRangeTime() {
this.searchParam.pageNo = 1;
},
search() {
this.loading = true;
const params = {
departmentId: this.searchParam.departmentId || null,
workStatus: String(this.searchParam.ScheduleStatus) || null,
startTime: this.searchParam.createRangeTime
? this.searchParam.createRangeTime[0]
: null,
endTime: this.searchParam.createRangeTime
? this.searchParam.createRangeTime[1]
: null,
condition: this.searchParam.idNamePhone || null,
level: this.searchParam.createType || null,
sort: this.searchParam.sort || null,
serviceOpen: String(this.searchParam.serviceOpen) || null,
pageNo: this.searchParam.pageNo,
pageSize: this.searchParam.pageSize,
};
workQuery(params).then((res) => {
this.loading = false;
if (res.code === '000000') {
this.tableData = (res.data.list || []).map((item) => {
if (item.switchStatus === '1') {
return {
...item,
switchStatus: true,
};
} else {
return {
...item,
switchStatus: false,
};
}
});
this.searchParam.totalRows = res.data.count;
}
});
},
getServiceOpen(value) {
this.searchParam.serviceOpen = value;
},
getWorkStatus(value) {
this.searchParam.ScheduleStatus = value;
},
changeSwitch(value, val) {
switchOpen({
id: val.id,
switchOpen: val.switchStatus ? '1' : '2',
}).then((res) => {
if (res.code === '000000') {
// this.search();
}
});
},
searchInStep() {
this.loading = true;
workInStep().then((res) => {
if (res.code === '000000') {
this.loading = false;
this.search();
}
});
},
handleSizeChange(value) {
this.searchParam.pageSize = value;
this.search();
},
handleCurrentChange(value) {
this.searchParam.pageNo = value;
this.search();
},
getLevel() {
getLevel().then((res) => {
if (res.code === '000000') {
this.createList = res.data || [];
this.createList.forEach((item) => {
const newCreateObj = {
value: '',
text: '',
};
newCreateObj.value = item;
newCreateObj.text = item;
this.newCreateList.push(newCreateObj);
});
}
});
},
sortfunc(data) {
if (data.prop === '"modifiedTime"' && data.order === 'descending') {
this.searchParam.sort = '1';
} else {
this.searchParam.sort = '2';
}
this.search();
},
addSchedule(value, val) {
// this.ScheduleListShow = false;
// this.schedulingType = val;
const target = this.$refs.target;
const { origin } = window.location;
const u = `${origin}/consultation/pica-admin-consultation/addEditSchedule?type=${val}&doctorId=${value.doctorId}&id=${value.id}`;
target.setAttribute('href', u);
target.click();
},
// goBack(flag) {
// this.ScheduleListShow = true;
// if (flag) {
// this.search();
// }
// },
},
};
</script>
<style lang="scss" scoped>
.serviceScheduleNew {
.serviceSchedule {
height: calc(100% - 76px);
.header {
padding: 30px;
width: 100%;
}
.serviceSchedule-container {
width: 100%;
padding: 0 14px;
.serviceSchedule-containerInfo {
background: #ffffff;
position: relative;
border-radius: 8px;
display: flex;
align-items: center;
justify-content: space-between;
padding: 21px 18px 10px 18px;
.serviceSchedule-containerInfo-left {
display: flex;
align-items: center;
flex-wrap: wrap;
.serviceSchedule-cascader {
margin-right: 15px;
margin-bottom: 10px;
}
.select-first {
margin-right: 15px;
margin-bottom: 10px;
}
.serviceSchedule-status {
margin-right: 15px;
margin-bottom: 10px;
}
.serviceSchedule-time {
max-width: 270px;
height: 32px;
background: #ffffff;
border-radius: 16px;
border: 1px solid rgba(0, 0, 0, 0.15);
margin-right: 15px;
margin-bottom: 10px;
}
.serviceSchedule-idNamePhone {
width: 320px;
margin-right: 15px;
margin-bottom: 10px;
}
.submit-btn {
height: 32px;
background: #0d9078;
border-radius: 16px;
display: flex;
align-items: center;
margin-bottom: 10px;
}
}
.synchro-btn-icon {
display: flex;
align-items: center;
justify-content: center;
margin-bottom: 10px;
.synchro-btn {
width: 110px;
height: 32px;
border-radius: 18px;
border: 1px solid #0d9078;
display: flex;
align-items: center;
justify-content: center;
background: #ffffff;
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #0d9078;
}
.el-icon-s-question {
margin-left: 10px;
width: 16px;
height: 16px;
}
}
}
.serviceSchedule-table {
// min-width: 1200px;
padding-top: 15px;
}
}
}
.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>
<style lang="scss">
.serviceSchedule-cascader {
.el-input {
.el-input__inner {
width: 150px;
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;
}
}
.select-first {
.el-input {
.el-input__inner {
width: 150px;
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;
}
}
.serviceSchedule-status {
.el-input {
.el-input__inner {
width: 150px;
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;
}
}
.serviceSchedule-idNamePhone {
.el-input__inner {
// width: 150px;
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;
}
}
.serviceSchedule-time {
.el-input__icon {
display: flex;
align-items: center;
margin-left: 10px !important;
}
.el-range-input {
width: 30% !important;
}
.el-range-separator {
width: 10%;
display: flex;
align-items: center;
}
input::-webkit-input-placeholder {
color: #89888b;
}
}
</style>
vue.config.js
浏览文件 @ 42aea01b
......@@ -71,7 +71,7 @@ module.exports = {
port: 8080,
proxy: {
'/proxy': {
target: 'https://dev-sc.yunqueyi.com/',
target: 'https://test1-sc.yunqueyi.com/',
ws: false,
changeOrigin: true,
secure: true,
......
yarn.lock
浏览文件 @ 42aea01b
......@@ -1039,6 +1039,55 @@
dependencies:
"@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":
version "1.1.2"
resolved "http://192.168.110.93:4873/@gar%2fpromisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210"
......@@ -10439,6 +10488,11 @@ pre-commit@^1.2.2:
spawn-sync "^1.0.15"
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:
version "1.1.2"
resolved "http://192.168.110.93:4873/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或