提交 5c95a25e 编写于 作者: xiaoping.di's avatar xiaoping.di

Merge branch 'feature/dxp' into 'develop'

Feature/dxp

See merge request !242
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.
{"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","48dba5b39176c4d5985578467949d29c":"/Users/pica/workcode/pica-admin-consultation/src/assets/image/nothingData.png"} {"04094c981e19b077458ac5d414185112":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/logo.png","1211365adaf1b4ec771bd88c833a880b":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/default.png","ce61da2f6bf1eb6459e85af50b359bc4":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/footer-icon.png","739c4ef79f68611bf4e43c7b981620b2":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/mm.jpg","8c330ac70b9272095e71ee97bf5afd4b":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/index_logoicon.png","523e94358197546c40edadc921593dfb":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/menu1.png","865c6c5fbbbf7050048aeccb3017e911":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/menu2.png","527810387384d793b6ab6eef46156ffb":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/no-content.png","209cb91fc2fd3cd3ed3ee0a8dbcf9c1d":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/no-content1.png","6599b1e484f5af49bf4cebca0e799812":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/noData.png","c854111e04d168e522281c3fbfe72df5":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/small.png","f94996a13b960effe94989c5957e4b42":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/live/close-call.png","44ccf56a79c8edb3a5ce8fef6a26a231":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/live/no-camera.png","04c83af49218fafe8d8c6089c2ea217a":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/live/voice-close.png","fe7ab70abde84f7ac1ae6313f9645b0b":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/live/voice-small.png","25a8e68f45ec649c79248db1fe31e8c9":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/live/voice.png","1faf0833ebbedfda6d17955f8e28594c":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/live/waiting-call.png","f98a82b4194f76eab457b06e3d2e7c66":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/live/warning.png","6ec04aa3b33066f2c68569ba58bc4ca6":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/Icon-calendar.png","ccce5124739cb6198824c9540d3fadef":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/Icon-search.png","8e3527f62dcd15391482e9b73bfeeba2":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/Icon-sel-no.png","a91444748c06325ea33d001995782e5e":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/check-no.png","7d962f5e778d83fdaa29996b166bfc37":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/check-yes.png","2eb4cd4f705b890049038538332dfe6b":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/down-2.png","8509ab20474be1d2b45a2307e879335a":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/down.png","69460ac3712a98af9673b0b729f722e7":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/file-text-2.png","13a22959d620da58bf617c2158fea27c":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/folder-open-2.png","9f7e069aa42684d54ce62240135e5e7a":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/icon-comment.png","f2a3ffe7ba3ec3df2db7f14bbf7f4815":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/icon-contacts.png","c6ddf67990cac1414a14e1a98e9722fa":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/icon-download.png","cc58a2a3f8868ca13d567fbe117de2f1":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/icon-exit.png","0efa6485aacd1cac491c3f1313f348ad":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/icon-file-search.png","67c06d425d6db623e264c3ac2f08da49":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/icon-folder-open.png","ff1499485988321abbf2657a9e18b4cf":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/icon-fresh-2.png","17ec7d4e0499ff61d4ef9939a5e6428f":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/icon-home.png","698d2d257867569ec399c08468ed5303":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/icon-id-card.png","f2f90f4dcd14190d1f2bd86f54b2cf13":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/icon-link.png","065b545d1d83e0456f0e1daa53597a83":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/icon-minus.png","a4cc9df6601a1c5090cf2168dcc7dbde":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/icon-no-send.png","fb3677a52cceb986a3f3343e07a3e2db":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/icon-org.png","8b6e74338243db8bcdea35be8e5a5e38":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/icon-pdf.png","17d834654243c38a199635a00dd7446c":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/icon-phone-no.png","a6b6cc69354232c8d3050cc620e76198":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/icon-plus.png","5f8600eefac5efecdcdf54826b2ef241":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/icon-right-gray.png","89aa7e4d0f1e366395f55e9970ad3cbf":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/icon-sel-checked.png","c645c2246f82d6d03a2fc3bc3f0784f4":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/icon-team.png","6397dbfdf90559f8a4bd8232ae07de75":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/icon-time-circle.png","293003bc154df60b8246a2b1a9d7c37d":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/icon-warning-circle.png","952c520ede22bc3b7acfcdadcf275616":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/im_close.png","b52e26837623d200333631f103d98b3d":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/im_close2.png","fa72624d8fc22600303284d811b2eba1":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/im_man1.png","1ee9e967594f2431cc2d5b488fdef1a2":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/im_man2.png","2cf21b4a08769bce649212cd664c7aec":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/im_sendfile.png","46c7f58b6ecc1b9131cdaeb16e8fdb46":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/im_sendvedio.png","3fc6108bdbb192a275c93c81b68df045":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/im_small.png","d6a21a2a70672a21e71f4f9a012017ea":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/im_text.png","c524f8dc61fb177e2c0ec6ba583e16cb":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/im_time.png","34a79d4b3e08fa1975c4d6907564228c":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/im_video.png","fa9d7d646a9a69b71fae713831df6a66":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/kf-avatar.png","bfc960810928cdee01b2ed84a7c06e2b":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/link-2.png","b980d3476ef41c82308f8c5cdad88531":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/loading-icon-new.png","32925e323462fe90f4882878e0e06557":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/loading-icon.png","d73985857b58cabaec3d78a75306b65c":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/logo-small.png","66e2b7f6f6afdb328dfe2fb0fe271fb5":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/no-search-list.png","f961abf468fe062cc8c6cb5af0a8695d":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/plus-task.png","c23e76ce2fa154090c58e27cd95e83f4":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/right-no.png","aee074558d02e3f5abea690b75337be3":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/right-yes.png","729084b7e8114c57146907d1cd1885df":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/send-no.png","cb4afae3d4197d8991c3d210ce6b86b4":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/send-yes.png","131b8e5595a9eae4b152d0aff5de1185":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/upload-2.png","4107110c540e0357837f881d536548b7":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/upload.png","ce46719d7b61c94af00a5fbe9e7d2e9f":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/IM/voice.png","5c402aef9047604682ddf89f6800f587":"/Users/dixiaoping/Desktop/dxp/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/dixiaoping/Desktop/dxp/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/dixiaoping/Desktop/dxp/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/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/workbench/appointment.png","fc598ce09986ef5f62a8fa85de983a8b":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/workbench/appremind.png","b203989c64a47cd0e458b56f0d4c3a50":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/workbench/calling.gif","fa4c423d7c6ce61c4975121178eb44b9":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/workbench/calling.png","794014f45e4a6562dcc940864bcff51d":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/workbench/callout.png","7e5d36444fff2dbe0a0a1a16527d01cd":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/workbench/callouting.png","6d575af9a66da1c3b79619a6de71045c":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/workbench/consulting hours.png","70ec78c674225960473b6d7daa8eca4c":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/workbench/maulcall.png","2b346851e90bb70ec49c19a86e210d16":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/workbench/no_data_wz.png","98972e5acf45243bb66a8bc6e7233b1a":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/workbench/photo.png","cda4965eb5590c25e18b8c6ce49f3be6":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/workbench/remindalready.png","8642cdee63ae862673db59fc3c24569a":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/workbench/video.png","f322c185a56910cd48942a7b02c0af29":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/workbench/voice.png","c51c54bf7bbb9151a725e0c808ab50b0":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/question.png","48dba5b39176c4d5985578467949d29c":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/nothingData.png","074d26e2cef176f71ffbf0dcc8957869":"/Users/dixiaoping/Desktop/dxp/pica-admin-consultation/src/assets/image/workbench/call.png"}
\ No newline at end of file \ No newline at end of file
import request from 'mn-template/plugins/http'; import request from 'mn-template/plugins/http';
export const conditionUpdate = async(data) => { export const conditionUpdate = async (data) => {
return request({ return request({
url: '/diagnose/socket/condition/update', url: '/diagnose/socket/condition/update',
data: data, data: data,
method: 'post', method: 'post',
}); });
}; };
// 轮循 获取卡边正常信息和异常信息
export const conditionNewList = async (data) => {
return request({
url: '/diagnose/admin/diagnose/operator/newList',
data: data,
method: 'post',
});
};
// 诊断建议
export const doctorAdviceList = async (data) => {
return request({
url: `/diagnose/admin/diagnose/doctorAdvice/list/${data.diagnoseLogId}`,
method: 'get',
});
};
// 手动呼叫
export const manualCall = async (data) => {
return request({
url: '/diagnose/admin/diagnose/manual/call',
data: data,
method: 'post',
});
};
// 查询当前上级医生下排队的信息
export const waitPersonNum = async (doctorId) => {
return request({
url: `/admin/diagnose/queueList/${doctorId}`,
method: 'post',
});
};
import { teamDetail, callDirect } from '@/api/diagnosis';
import {
waitPersonNum,
doctorAdviceList,
manualCall,
} from '@/api/workbench.js';
import { createNamespacedHelpers } from 'vuex';
const { mapState } = createNamespacedHelpers('main');
export default {
props: {
item: {
type: Object,
default: () => {
return {};
},
},
orderType: {
// 订单类型
type: String,
default: '',
},
key: {
// 订单类型
type: String,
default: '',
},
},
data() {
return {
callImg: require('@/assets/image/workbench/call.png'),
infocallImg: require('@/assets/image/workbench/calling.png'),
callouting: require('@/assets/image/workbench/remindalready.png'),
offline: require('@/assets/image/workbench/offline.png'),
manuacall: require('@/assets/image/workbench/maulcall.png'),
manuacallIng: require('@/assets/image/workbench/calling.gif'),
timer: null,
isChat: false,
isUserChat: false,
isDoctorChat: false,
isCall: false,
isManuacall: false,
isManuacallType: false,
accId: '',
waitPersonList: [],
isShowWait: false,
};
},
computed: {
...mapState({
showChat: (state) => state.showChat,
showAdvice: (state) => state.showAdvice,
}),
doctorCallStatus() {
switch (this.item.doctorCallStatus) {
case 1:
return '未拨打';
case 2:
return '已拨打未接听';
case 3:
return '被挂断';
case 4:
return '已拨打完成';
default:
return '';
}
},
userCallStatus() {
switch (this.item.userCallStatus) {
case 1:
return '未拨打';
case 2:
return '已拨打未接听';
case 3:
return '被挂断';
case 4:
return '已拨打完成';
default:
return '';
}
},
diagnoseType() {
switch (this.item.diagnoseType) {
case 1:
return '语音问诊';
case 2:
return '视频问诊';
case 3:
return '图文问诊';
default:
return '';
}
},
diagnoseTypeIcon() {
switch (this.item.diagnoseType) {
case 1:
return 'voice';
case 2:
return 'voice';
case 3:
return 'photo';
default:
return 'photo';
}
},
appointBeginTime() {
if (this.item.appointBeginTime) {
return new Date(this.item.appointBeginTime).format('hh:mm');
} else {
return '';
}
},
appointEndTime() {
if (this.item.appointEndTime) {
return new Date(this.item.appointEndTime).format('hh:mm');
} else {
return '';
}
},
userCallTime() {
return new Date(this.item.userCallTime).format('hh:mm');
},
// 助诊呼叫状态
userCallKfStatus() {
return this.item.userCallKfStatus;
},
// 接诊呼叫状态
doctorCallKfStatus() {
return this.item.doctorCallKfStatus;
},
// 接诊 在线状态
doctorTrtcEntryStatus() {
return this.item.doctorTrtcEntryStatus;
},
// 助诊 在线状态
userTrtcEntryStatus() {
return this.item.userTrtcEntryStatus;
},
pastUserCallTime() {
if (this.item.userCallTime) {
return this.formatDateData(this.item.userCallTime);
} else {
return null;
}
},
doctorCallTime() {
return new Date(this.item.doctorCallTime).format('hh:mm');
},
pastDoctorCallTime() {
if (this.item.doctorCallTime) {
return this.formatDateData(this.item.doctorCallTime);
} else {
return null;
}
},
nowtime() {
return new Date().getTime() - this.item.appointBeginTime;
},
},
watch: {
item(newVal, oldVal) {
console.log(newVal, 'newValnewValnewVal');
console.log(newVal, oldVal, 'newVal, oldVal');
if (newVal !== oldVal) {
if (newVal.doctorTrtcEntryStatus == 2) {
this.isDoctorChat = false;
}
if (newVal.userTrtcEntryStatus == 2) {
this.isUserChat = false;
}
if (newVal.doctorCallStatus !== oldVal.doctorCallStatus) {
this.isManuacall = false;
}
if (newVal.userCallStatus !== oldVal.userCallStatus) {
this.isManuacallType = false;
}
}
},
key(newVal, oldVal) {
console.log(newVal, oldVal);
},
},
created() {},
mounted() {
if (this.item.returnStatus == 1 || this.item.returnStatus == 3) {
const nowData = new Date().getTime();
const timeleft = this.item.appointBeginTime - nowData;
if (timeleft < 120000 && nowData < this.item.appointEndTime) {
clearInterval(this.timer);
this.down();
} else {
this.isCall = true;
}
}
},
methods: {
manualDialing(type) {
if (this.doctorCallKfStatus === 1) {
return;
}
this.$confirm('确认要电话通知该医生吗?', '提示', {
confirmButtonText: '电话通知',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
let userMobilePhone = '';
let userId = '';
let doctorId = '';
let doctorMobilePhone = '';
if (type === 1) {
userMobilePhone = null;
userId = null;
doctorId = this.item.doctorId;
doctorMobilePhone = this.item.doctorMobile;
} else {
userMobilePhone = this.item.userMobile;
userId = this.item.userId;
doctorId = null;
doctorMobilePhone = null;
}
const params = {
diagnoseId: this.item.diagnoseLogId,
doctorId: doctorId,
doctorMobilePhone: doctorMobilePhone,
userId: userId,
userMobilePhone: userMobilePhone,
};
manualCall(params).then((res) => {
if (res.code === '000000') {
if (type === 1) {
this.isManuacall = true;
} else {
this.isManuacallType = true;
}
}
});
})
.catch(() => {
this.$message({
type: 'info',
message: '取消拨打电话',
});
});
},
formatDateData(time) {
const now_data = new Date().getTime();
const my_time = now_data - time;
const hours = my_time / 1000 / 60 / 60;
const hoursRound = Math.floor(hours);
const minutes = my_time / 1000 / 60 - 60 * hoursRound;
const minutesRound = Math.floor(minutes);
const seconds = (
my_time / 1000 -
60 * 60 * hoursRound -
60 * minutesRound
).toFixed(0);
if (hoursRound > 0 && minutesRound > 0) {
return hoursRound + '小时' + minutesRound + '分' + seconds + '秒';
}
if (hoursRound == 0 && minutesRound > 0) {
return minutesRound + '分';
}
if (hoursRound == 0 && minutesRound == 0) {
return seconds + '秒';
}
},
down() {
this.timer = setInterval(() => {
const nowData = new Date().getTime();
const timeleft = this.item.appointBeginTime - nowData;
if (timeleft < 120000 && nowData < this.item.appointEndTime) {
this.isCall = true;
clearInterval(this.timer);
}
}, 1000);
},
getInfo(id) {
return teamDetail({
tid: this.item.imTeamId,
})
.then((res) => {
if (res.code == '000000') {
const { memberList } = res.data;
console.log('---memberList', memberList);
if (memberList) {
const accId = memberList.filter((val) => {
return val.id == id;
});
return accId[0].accId;
}
}
})
.catch(() => {});
},
// 主动呼叫 roletype 1:助诊医生 2:接诊医生
drivingCall(id, roletype) {
if (roletype == 1 && this.isUserChat) {
return false;
}
if (roletype == 2 && this.isDoctorChat) {
return false;
}
this.getInfo(id).then((res) => {
const params = {
imAccId: res,
imTeamId: this.item.imTeamId,
liveRoomId: this.item.roomId,
};
callDirect(params).then((res) => {
if (res.code === '000000') {
if (roletype == 1) {
this.isUserChat = true;
} else {
this.isDoctorChat = true;
}
} else {
this.$message({
message: res.message,
type: 'warning',
});
}
});
});
},
openChat() {
if (this.showChat) {
this.$message({
message: '不可同时进入多个诊室,请先退出已进入的诊室,再试。',
type: 'warning',
duration: 1000,
});
return false;
}
const i = this.item;
this.$store.dispatch('main/gotoInquiry', i);
},
openAdvice() {
if (this.showAdvice) {
this.$message({
message: '不可同时打开多个诊断建议,请先退出已打开的诊断建议,再试。',
type: 'warning',
duration: 1000,
});
return false;
}
// const i = 11;
doctorAdviceList({
diagnoseLogId: this.item.diagnoseLogId,
})
.then((res) => {
if (res.code == '000000') {
this.$store.commit('main/updateShowAdvice', true);
this.$store.commit('main/updateCurrentAdvice', res.data);
} else {
this.$message({
message: res.message,
type: 'warning',
duration: 1000,
});
}
})
.catch((err) => {
console.log(err);
});
},
waitPersonFun() {
if (!this.isShowWait) {
console.log(this.item.doctorId, 'this.item.doctorId');
waitPersonNum(this.item.doctorId)
.then((res) => {
if (res.code === '000000') {
this.waitPersonList = res.data || [];
} else {
this.$message({
message: res.message,
type: 'warning',
duration: 1000,
});
}
this.isShowWait = !this.isShowWait;
})
.catch((err) => {
console.log(err);
this.isShowWait = !this.isShowWait;
this.$message({
message: '服务查询失败',
type: 'warning',
duration: 1000,
});
});
}
},
},
};
.inquiry-wrap {
box-sizing: border-box;
margin-bottom: 10px;
padding: 20px;
background: #ffffff;
border-radius: 18px;
user-select: none;
position: relative;
.line {
display: flex;
justify-content: space-between;
font-size: 14px;
color: #999999;
.left {
.time {
color: #ff5e57;
font-size: 18px;
margin-top: 3px;
}
}
.right {
margin-left: 23px;
.orderno {
display: flex;
align-items: center;
margin-top: 3px;
.num {
font-size: 18px;
color: #02120f;
}
.copy {
font-size: 12px;
margin-left: 16px;
padding: 0 5px;
border: 1px solid #d9d9d9;
border-radius: 15px;
color: #212121;
}
}
.grey {
color: #6a7990;
}
.org {
color: #ff5e57;
}
}
.superior-doctor {
width: 49%;
display: flex;
justify-content: flex-start;
align-items: flex-start;
.inquiry-user-img {
display: flex;
flex-direction: column;
justify-content: center;
position: relative;
width: 40px;
height: 40px;
.offline {
position: absolute;
left: -4px;
top: -4px;
z-index: 10;
}
.avatar {
position: absolute;
left: 0;
top: 0;
background: #dddddd;
border-radius: 36px;
display: flex;
flex-direction: column;
justify-content: center;
}
}
.inquiry-user-info {
font-size: 14px;
margin-left: 6px;
.info-name-wrap {
display: flex;
align-items: center;
}
.info-name {
display: inline-block;
max-width: 85px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-size: 18px;
color: #02120f;
font-weight: bold;
}
.info-container {
align-items: center;
flex-direction: row;
height: auto;
line-height: 30px;
line-height: 25px;
.info-phone {
color: #6a7990;
font-size: 16px;
}
.info-call-time {
color: #ff5e57;
}
.info-calling {
width: 15px;
height: 25px;
display: flex;
justify-content: center;
align-items: center;
img {
width: 15px;
height: 15px;
}
}
}
}
.manual-call-status {
display: flex;
.manual-dialing {
margin-right: 5px;
cursor: pointer;
img {
width: 27px;
height: 48px;
}
}
.call-status {
// width: 45px;
// height: 46px;
img {
cursor: pointer;
width: 27px;
height: 48px;
}
}
}
}
.basic-doctor {
width: 49%;
display: flex;
justify-content: flex-start;
.basic-user-img,
.basic-user-info {
padding-right: 6px;
.info-name-wrap {
display: flex;
align-items: center;
justify-content: space-between;
.info-name {
max-width: 85px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-size: 18px;
color: #02120f;
font-weight: bold;
}
}
.info-container {
align-items: center;
flex-direction: row;
height: auto;
line-height: 30px;
line-height: 25px;
.info-phone {
color: #666;
font-size: 16px;
}
.info-call-time {
color: #ff5e57;
}
.info-calling {
width: 15px;
height: 25px;
display: flex;
justify-content: center;
align-items: center;
img {
width: 15px;
height: 15px;
}
}
}
}
}
.no-info {
width: 100%;
height: auto;
color: #ff5e57;
}
.inquiry-user-status {
width: 100%;
padding: 4px 0;
height: auto;
overflow: hidden;
.status-cll-user-answer {
background: rgba(255, 94, 87, 0.07);
border-radius: 10px;
border: 1px solid rgba(255, 94, 87, 0.15);
padding: 0 4px;
height: 20px;
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #ff5e57;
line-height: 20px;
margin-right: 6px;
}
.status-cll-user-finish {
background: rgba(0, 189, 165, 0.07);
border-radius: 10px;
border: 1px solid rgba(0, 189, 165, 0.17);
padding: 0 4px;
height: 20px;
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #0d9078;
line-height: 20px;
margin-right: 6px;
}
}
.line-btn {
cursor: pointer;
position: relative;
width: 45%;
height: 35px;
background: rgba(68, 146, 132, 0.09);
border-radius: 23px;
text-align: center;
line-height: 35px;
color: #0d9078;
font-size: 14px;
font-weight: bold;
.line-btn-tap {
position: absolute;
top: -10px;
right: 20px;
width: 48px;
height: 20px;
background: #0d9078;
border-radius: 7px 7px 7px 0px;
font-size: 14px;
color: #ffffff;
line-height: 20px;
}
span {
font-weight: bold;
}
}
.line-btn-enter {
background: #0d9078;
color: #fff;
.call-box {
display: flex;
align-items: center;
justify-content: center;
text-align: center;
img {
margin-right: 14px;
}
}
}
.isManuacall {
background: #ff5e57;
}
.noIsCall {
background: #0d9078;
}
}
.mt30 {
margin-top: 30px;
}
.line-second {
margin-top: 13px;
justify-content: flex-start;
align-items: center;
}
.mt20 {
margin-top: 20px;
}
.line-position {
position: absolute;
top: 96%;
left: 0;
width: 100%;
height: auto;
background: #fff;
.wait {
display: flex;
margin: 0px 20px;
font-size: 14px;
justify-content: space-between;
border-bottom: 1px solid #e9e9e9;
.wait-info {
display: flex;
height: 40px;
align-items: center;
.header {
width: 20px;
height: 20px;
img {
width: 100%;
height: auto;
}
}
.name {
color: #02120f;
padding-left: 5px;
line-height: 16px;
}
.connect {
color: #ff5e57;
margin-left: 5px;
}
.order {
color: #999999;
span {
color: #212121;
}
}
}
&:last-of-type {
border-bottom: none;
}
}
}
.wait-person {
width: 300px;
height: auto;
display: flex;
}
}
<template>
<div class="inquiry-wrap">
<div class="line">
<!--上级医生头信息 -->
<div class="superior-doctor">
<div class="inquiry-user-img">
<div
v-if="
diagnoseTypeIcon == 'voice' &&
(item.returnStatus == 1 || item.returnStatus == 3) &&
doctorTrtcEntryStatus != 1
"
class="offline"
>
<img
:src="offline"
alt=""
>
</div>
<div class="avatar">
<el-avatar :src="item.doctorImageUrl" />
</div>
</div>
<div class="inquiry-user-info">
<div class="info-name-wrap">
<span class="info-name">
{{ item.doctorName }}
</span>
<span>&nbsp;&nbsp; {{ item.department }}</span>
</div>
<ul class="info-container">
<li class="info-phone">
{{ item.doctorMobile }}
</li>
<li class="inquiry-user-status">
<!-- 只有-->
<span
:class="
doctorCallStatus === '已拨打完成'
? 'status-cll-user-finish'
: 'status-cll-user-answer'
"
>{{ doctorCallStatus }}</span>
<span
v-if="doctorCallKfStatus == 1"
class="status-cll-user-answer"
>正在呼叫</span>
<span
v-else
class="status-cll-user-answer"
> 未呼叫</span>
</li>
</ul>
</div>
</div>
<!-- 助诊医生头信息 -->
<div
v-if="item.userId"
class="basic-doctor"
>
<ul class="basic-user-img">
<li
v-if="
diagnoseTypeIcon == 'voice' &&
(item.returnStatus == 1 || item.returnStatus == 3) &&
userTrtcEntryStatus != 1
"
class="offline"
>
<img
:src="offline"
alt=""
>
</li>
<li class="avatar">
<el-avatar :src="item.userImageUrl" />
</li>
</ul>
<ul class="basic-user-info">
<li class="info-name-wrap">
<span class="info-name">
{{ item.userName }}
</span>
<span> &nbsp;助诊医生</span>
</li>
<li class="info-container">
<div class="info-phone">
{{ item.userMobile }}
</div>
<div
v-if="userCallKfStatus == 1"
class="info-calling"
>
呼叫中
</div>
</li>
<li class="inquiry-user-status">
<span
:class="
userCallStatus === '已拨打完成'
? 'status-cll-user-finish'
: 'status-cll-user-answer'
"
>{{ userCallStatus }}</span>
</li>
</ul>
</div>
<!-- 未开始接诊 或停止接诊-->
<div
v-else
class="no-info"
>
<div
v-if="item.acceptStatus == 4"
class="doctor-late"
>
未开始接诊
</div>
<div
v-if="item.acceptStatus == 1"
class="doctor-stop"
>
暂停接诊
</div>
</div>
</div>
<!-- 预约时间,复制单号 -->
<div class="line line-second">
<div class="left">
<div>预约时间</div>
<div
v-if="appointBeginTime && appointEndTime"
class="time"
>
<span>{{ appointBeginTime }}</span> -
<span>{{ appointEndTime }}</span>
</div>
<div
v-else
class="time"
>
</div>
</div>
<div class="right">
<div>问诊单号</div>
<ul class="orderno">
<li class="num">
{{ item.diagnoseLogId || '空' }}
</li>
<li
v-if="item.diagnoseLogId"
class="copy"
@click="copyDiagnoseLogId"
>
复制
</li>
</ul>
</div>
</div>
<!-- 当前排队 -->
<div class="line mt30 line-last">
<div
class="line-btn"
@click="waitPersonFun"
>
<div>
当前排队{{ item.queueCount || '0' }}<i
class="el-icon-arrow-down el-icon--right"
/>
</div>
</div>
<div
class="line-btn line-btn-enter"
:class="{ isManuacall: isManuacall, noIsCall: !isManuacall }"
@click="openChat"
>
<div
v-if="doctorCallKfStatus == 1"
class="call-box"
>
<img
:src="callImg"
alt="call"
>
电话呼叫中
<!-- manuacallIng 正在拨打 isManuacall ? manuacallIng : manuacall-->
</div>
<div
v-else
class="call-box"
@click="manualDialing(1)"
>
<img
:src="callImg"
alt="call"
>
电话呼叫
</div>
</div>
</div>
<!-- 排队详细 -->
<div
v-if="isShowWait"
class="line-position"
>
<ul
v-for="(item, index) in waitPersonList"
:key="index"
class="wait"
>
<li class="wait-info">
<div class="header">
<img
:src="item.userImageUrl"
alt="headImg"
>
</div>
<div class="name">
{{ item.userName }}
</div>
<div
v-if="item.failCount"
class="connect"
>
连接失败 {{ item.failCount }}
</div>
</li>
<li class="wait-info">
<div class="order">
问诊单号 <span>{{ item.diagnoseLogId || '空' }}</span>
</div>
</li>
</ul>
</div>
</div>
</template>
<script>
import index from './index';
export default index;
</script>
<style lang="scss" scoped>
@import 'index';
</style>
<template>
<div>
<div
ref="agmentSelect"
class="serviceSchedule_select"
>
<el-cascader
ref="cascader"
v-model="departmentId"
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>
</template>
<script>
import { departmentAll } from '@/api/diagnosis';
import {
previewWork,
} from '@/api/serviceSchedule';
export default {
name: 'Index',
components: {
},
data() {
return {
maxDiaNum: 10,
dateTime: '',
interfaceOptions: [],
innerform: [],
props: {
// props定义的值根据接口返回的数据定的
label: 'value',
value: 'no',
children: 'interface',
},
departmentId: '',
allTilst: [],
allList: {},
};
},
watch: {},
created() {
this.departmentAll();
},
mounted() {},
methods: {
getInputNumber(value) {
console.log(value, 'getInputNumbergetInputNumber');
},
departmentAll() {
departmentAll().then((res) => {
if (res.code == '000000') {
console.log(res, 'res111');
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;
},
// 获取选择的值
changeDepartment() {
const checkedNodes = this.$refs['cascader'].getCheckedNodes();
if (checkedNodes.length > 0) {
this.departmentId = checkedNodes[0].value;
this.$emit('select-department', this.departmentId);
console.log(this.departmentId);
} else {
this.departmentId = '';
}
},
getNowDate(value) {
this.dateTime = value;
},
search() {
if (!this.dateTime || !this.departmentId) {
return this.$message({
message: '科室和时间都需要选择哦!',
type: 'warning',
});
}
const params = {
dateTime: this.dateTime,
departmentId: this.departmentId,
};
previewWork({ ...params }).then((res) => {
if (res.code === '000000' && res.data) {
this.calendarOptions.resources = (res.data.doctorList || []).map(
(item) => {
return {
id: item.doctorId,
title: item.doctorName,
};
}
);
const dutyRosterPreList = (res.data.dutyRosterPreList || []).map(
(item, index) => {
return {
id: index,
resourceId: item.doctorId,
end: item.endTime,
start: item.startTime,
color: '#FFEDE9',
};
}
);
const dutyWorkList = (res.data.dutyWorkList || []).map(
(item, index) => {
return {
id: index,
resourceId: item.doctorId,
end: item.endTime,
start: item.startTime,
color: '#E7F4F5',
};
}
);
if (res.data) {
this.calendarOptions.events = [].concat(
dutyRosterPreList,
dutyWorkList
);
}
const calendarApi = this.$refs.fullCalendar.getApi();
this.getWidth = `${
(this.calendarOptions.resources.length + 1) * 150
}px`;
this.getMaxWidth = `${
this.calendarOptions.resources.length * 150 + 100
}px`;
calendarApi.gotoDate(this.dateTime);
console.log(this.calendarOptions.resources);
console.log(this.calendarOptions.events);
} else {
this.calendarOptions.events = [];
this.calendarOptions.resources = [];
}
});
},
},
};
</script>
<style lang="scss">
.serviceSchedule-cascader {
.el-input {
.el-input__inner {
width: 183px;
height: 41px;
background: #ffffff;
border-radius: 7px;
border: 1px solid #D9D9D9;
}
.el-input__suffix {
display: flex;
align-items: center;
}
}
input::-webkit-input-placeholder {
color: #89888b;
}
}
.serviceSchedule_dateTime {
.el-input__inner {
// width: 150px;
height: 32px;
background: #ffffff;
border-radius: 16px;
border: 1px solid rgba(0, 0, 0, 0.15);
}
.el-input__icon {
display: flex;
align-items: center;
}
input::-webkit-input-placeholder {
color: #89888b;
}
}
</style>
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
font-weight: 400; font-weight: 400;
color: #666666; color: #666666;
border-radius: 9px; border-radius: 9px;
border: 1px solid #D9D9D9; border: 1px solid #d9d9d9;
margin-right: 8px; margin-right: 8px;
} }
.info-phone { .info-phone {
......
...@@ -391,7 +391,6 @@ ...@@ -391,7 +391,6 @@
} }
}, },
}, },
created() {}, created() {},
mounted() { mounted() {
if (this.item.returnStatus == 1 || this.item.returnStatus == 3) { if (this.item.returnStatus == 1 || this.item.returnStatus == 3) {
...@@ -405,7 +404,6 @@ ...@@ -405,7 +404,6 @@
} }
} }
}, },
methods: { methods: {
manualDialing(type) { manualDialing(type) {
this.$confirm('确认要电话通知该医生吗?', '提示', { this.$confirm('确认要电话通知该医生吗?', '提示', {
...@@ -579,7 +577,6 @@ ...@@ -579,7 +577,6 @@
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.inquiry-wrap { .inquiry-wrap {
box-sizing: border-box; box-sizing: border-box;
......
const roundCard = {
namespaced: true,
state: {
socketClient: null,
},
actions: {
initCard(context, payload) {
const { rootState } = context;
console.log(context, payload, 'context, payload111', rootState);
// const { list, allSize, countRespList } = socket;
// console.log('-rootState', rootState, socket);
// const { currentTabStatus } = rootState.main;
// context.commit('main/updateCurrentCalList', countRespList, {
// root: true,
// });
// context.commit('main/updateAllSize', allSize, { root: true });
// if (list) {
// const l = list[0] || [];
// if (currentTabStatus == 99) {
// context.commit('main/updateCurrentDiagList', list, { root: true });
// } else {
// if (currentTabStatus == l.returnStatus) {
// context.commit('main/updateCurrentDiagList', list, {
// root: true,
// });
// }
// if (l.length == 0) {
// context.commit('main/updateCurrentDiagList', list, {
// root: true,
// });
// }
// }
// } else {
// context.commit('main/updateCurrentDiagList', [], { root: true });
// }
},
},
mutations: {
},
};
export default roundCard;
...@@ -7,6 +7,7 @@ const socket = { ...@@ -7,6 +7,7 @@ const socket = {
actions: { actions: {
initSocket(context, payload) { initSocket(context, payload) {
const { rootState } = context; const { rootState } = context;
console.log(context, payload, 'context, payload111');
const socketClient = io.connect(payload.url, { const socketClient = io.connect(payload.url, {
query: { query: {
loginUserNum: `diagnose_list_socket_${payload.userId}`, loginUserNum: `diagnose_list_socket_${payload.userId}`,
...@@ -54,6 +55,11 @@ const socket = { ...@@ -54,6 +55,11 @@ const socket = {
} }
}); });
socketClient.on('diagnose_call_push_event', (socket) => { socketClient.on('diagnose_call_push_event', (socket) => {
console.log(
socket,
'socketsocket',
window._VM.$store.state.main.soketQuest
);
const l = window._VM.$store.state.main.noticeList; const l = window._VM.$store.state.main.noticeList;
if (l.length >= 5) { if (l.length >= 5) {
l.shift(); l.shift();
......
...@@ -124,9 +124,9 @@ ...@@ -124,9 +124,9 @@
.show-work-set { .show-work-set {
margin-top: 100px; margin-top: 100px;
} }
.maxNum-first-show{ .maxNum-first-show {
margin-top: 20px; margin-top: 20px;
.show-sep-num{ .show-sep-num {
color: red; color: red;
} }
} }
......
...@@ -5,34 +5,6 @@ ...@@ -5,34 +5,6 @@
我的工作台 我的工作台
</div> </div>
<!-- 时间 --> <!-- 时间 -->
<div class="search-box">
<div class="search-item">
<el-date-picker
v-model="searchParam.dateTime"
type="date"
size="small"
clear-icon="el-input-icon"
:clearable="false"
@change="changeDatetime"
/>
</div>
<div class="searh-input">
<el-input
v-model="searchValue"
placeholder="输入问诊单号/医生姓名"
class="input-with-select"
@change="getSerachValue"
>
<el-button
slot="append"
class="search-botton"
@click="getSerValue"
>
搜索
</el-button>
</el-input>
</div>
</div>
<!-- tab栏 --> <!-- tab栏 -->
<el-radio-group <el-radio-group
v-model="tabPositionValue" v-model="tabPositionValue"
...@@ -41,8 +13,8 @@ ...@@ -41,8 +13,8 @@
> >
<el-radio-button <el-radio-button
v-for="(item, index) in currentCalListNew" v-for="(item, index) in currentCalListNew"
:key="'for' + index" :key="'tab' + index"
:label="item.name" :label="item.id"
> >
{{ item.name }} {{ item.name }}
</el-radio-button> </el-radio-button>
...@@ -50,11 +22,11 @@ ...@@ -50,11 +22,11 @@
</div> </div>
<div class="workbench-content"> <div class="workbench-content">
<div <div
v-if="currentDiagList" v-if="currentDiagList.length"
class="workbench-li-c" class="workbench-li-c"
> >
<div <div
v-if="tabPositionValue == '全部订单'" v-if="tabPositionValue == '3'"
class="grid-c" class="grid-c"
> >
<el-checkbox-group <el-checkbox-group
...@@ -73,8 +45,52 @@ ...@@ -73,8 +45,52 @@
<el-button>确定</el-button> <el-button>确定</el-button>
</div> </div>
</div> </div>
<div v-else> <div
111111 v-else
class="workbench-content"
>
<div
v-if="currentDiagList"
class="workbench-li-c"
>
<div class="workbench-title">
<div class="searh-input">
<el-input
v-model="orderOrName"
placeholder="输入问诊单号/医生姓名"
class="input-with-select"
@change="getSerachValue"
>
<el-button
slot="append"
class="search-botton"
@click="getSearchValue"
>
搜索
</el-button>
</el-input>
</div>
</div>
<!-- 问诊状态内容 -->
<div
v-if="isShowCardData"
class="grid-c"
>
<div
v-for="(item, index) in currentDiagList"
:key="index"
class="workbench-li"
>
{{ item.diagnoseLogId }}
<!-- key 动态随机无意义 促发组件数据更新 -->
<consultation-card
:key="item.definitionRandom"
:item="item"
:order-type="tabPositionValue"
/>
</div>
</div>
</div>
</div> </div>
</div> </div>
...@@ -90,63 +106,37 @@ ...@@ -90,63 +106,37 @@
暂时没有问诊 暂时没有问诊
</div> </div>
</div> </div>
<!-- <div
v-if="allSize > 0"
class="pagination-container"
>
<el-pagination
background
:current-page="searchParam.pageNo"
:page-sizes="[6, 12, 18, 24]"
:page-size="searchParam.pageSize"
layout="prev, pager, next, sizes, jumper"
:total="allSize"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
/>
</div> -->
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { createNamespacedHelpers } from 'vuex'; import { createNamespacedHelpers } from 'vuex';
const { mapState } = createNamespacedHelpers('main'); const { mapState } = createNamespacedHelpers('main');
import storejs from 'storejs'; import storejs from 'storejs';
// import InquiryListComponent from '../../../components/common/inquirylist.vue'; import consultationCard from '@/components/common/consultationCard/index.vue';
import { conditionUpdate } from '@/api/workbench'; import { conditionNewList } from '@/api/workbench';
export default { export default {
components: { components: {
// InquiryListComponent, consultationCard,
}, },
data() { data() {
const s = storejs.get('soketQuest');
const t = s ? s.returnStatus : 1;
const d = s ? s.dateTime : new Date().format('yyyy-MM-dd');
const id =
s && s.operateUserId ? s.operateUserId : this.isSuperAdmin.userID;
return { return {
tabPosition: t,
showChat: true, showChat: true,
totalRows: 0, isShowCardData: false,
loading: false, loading: false,
searchParam: {
dateTime: d,
checkvalue: '', // 模拟值后去
operateUserId: id,
returnStatus: 1,
pageSize: 6,
pageNo: 1,
},
currentCalListNew: [ currentCalListNew: [
{ {
id: 1, id: 3,
name: '全部订单', name: '全部订单',
}, },
{ {
id: 1, id: 1,
name: '我的待处理', name: '我的待处理',
}, },
{
id: 2,
name: '无需处理',
},
], ],
cityOptions: [ cityOptions: [
{ {
...@@ -183,122 +173,182 @@ ...@@ -183,122 +173,182 @@
}, },
], ],
checkedValues: [], checkedValues: [],
tabPositionValue: '全部订单', tabPositionValue: '3',
searchValue: '', orderOrName: '',
userInfo: null,
timer: null,
currentDiagList: [], // 卡片列表数据
mockData: [
{
adviceStatus: 2,
appointBeginTime: '2021-12-02 18:00:00',
appointEndTime: '2021-12-02 19:00:00',
department: '心血管内科',
departmentId: 16,
diagnoseLogId: 3825,
diagnoseType: 2,
doctorCallKfStatus: 2,
doctorCallStatus: 1,
doctorCallTime: null,
doctorId: 1006276891,
doctorImageUrl:
'https://test-file.yunqueyi.com//image/png/2019/04/08/20190408101124702-0db0bcea.png',
doctorMobile: '13817741320',
doctorName: '金晖',
doctorTrtcEntryStatus: 2,
imStatus: 1,
imTeamId: '3942064849',
operateUserId: 221,
returnStatus: 2,
roomId: '520001199',
sort: null,
status: null,
userCallKfStatus: 2,
userCallStatus: 1,
userCallTime: null,
userId: 1006276934,
userImageUrl:
'https://test-file.yunqueyi.com//image/png/2019/04/08/20190408101124702-0db0bcea.png',
userMobile: '13817741327',
userName: '郑志猛',
userTrtcEntryStatus: 2,
},
{
adviceStatus: 2,
appointBeginTime: '2021-12-02 20:00:00',
appointEndTime: '2021-12-02 21:00:00',
department: '呼吸内科',
departmentId: 12,
diagnoseLogId: 3824,
diagnoseType: 1,
doctorCallKfStatus: 2,
doctorCallStatus: 1,
doctorCallTime: null,
doctorId: 1006276946,
doctorImageUrl:
'https://test-file.yunqueyi.com//image/png/2019/04/08/20190408101124702-0db0bcea.png',
doctorMobile: '15821297620',
doctorName: '朱建波',
doctorTrtcEntryStatus: 2,
imStatus: 1,
imTeamId: '3942066774',
operateUserId: 221,
returnStatus: 2,
roomId: '520001207',
sort: null,
status: null,
userCallKfStatus: 2,
userCallStatus: 1,
userCallTime: null,
userId: 1006276934,
userImageUrl:
'https://test-file.yunqueyi.com//image/png/2019/04/08/20190408101124702-0db0bcea.png',
userMobile: '13817741327',
userName: '郑志猛',
userTrtcEntryStatus: 2,
},
],
}; };
}, },
computed: { computed: {
...mapState({ ...mapState({
allSize: (state) => state.allSize, // currentDiagList: (state) => state.currentDiagList,
currentDiagList: (state) => state.currentDiagList,
// currentCalList: (state) => state.currentCalList,
soketQuest: (state) => state.soketQuest, soketQuest: (state) => state.soketQuest,
isSuperAdmin: (state) => state.isSuperAdmin, isSuperAdmin: (state) => state.isSuperAdmin,
}), }),
}, },
watch: { watch: {},
isSuperAdmin(newdata, olddata) {
if (newdata !== olddata && newdata.userID) {
console.log('-isSuperAdminisSuperAdmin', newdata);
const s = storejs.get('soketQuest');
const d = s ? s.dateTime : new Date().format('yyyy-MM-dd');
const id =
s && s.operateUserId ? s.operateUserId : this.isSuperAdmin.userID;
const p = {
dateTime: d,
operateUserId: id,
pageNo: s ? s.pageNo : 1,
pageSize: s ? s.pageSize : 6,
returnStatus: s ? s.returnStatus : 1,
};
this.searchParam = p;
const r = s ? s.returnStatus : 1;
this.tabPosition = r;
this.$store.commit('main/updateCurrentTabStatus', r);
this.inquirySearch('clear');
}
},
},
created() { created() {
console.log('currentCalList---------------------', this.currentCalList); console.log('currentDiagList---------------------', this.currentDiagList);
}, },
mounted() { mounted() {
const s = storejs.get('soketQuest'); const s = storejs.get('soketQuest');
const t = s ? s.returnStatus : 1;
this.tabPosition = t;
this.$store.commit('main/updateCurrentTabStatus', t);
const d = s ? s.dateTime : new Date().format('yyyy-MM-dd');
this.searchParam.dateTime = d;
const id = const id =
s && s.operateUserId ? s.operateUserId : this.isSuperAdmin.userID; s && s.operateUserId ? s.operateUserId : this.isSuperAdmin.userID;
this.operateUserId = id; this.operateUserId = id;
this.userInfo = storejs.get('initSocketInfo');
console.log(
this.userInfo.userId,
'userInfouserInfo',
this.tabPositionValue
);
this.initCard();
const that = this;
// if(this.tabPositionValue != 3) {
// 轮循
this.timer = window.setInterval(() => {
setTimeout(() => {
// that.isShowCardData = false;
that.initCard();
}, 0);
}, 4000);
// }
},
destroyed() {
window.clearInterval(this.timer);
}, },
methods: { methods: {
initCard() {
console.log(this.isShowCardData);
const parms = {
bizType: this.tabPositionValue, // 1,异常的列表 2,不需要处理的列表
userId: this.userInfo.userId || this.operateUserId, // userId
condition: this.orderOrName || '',
};
// this.currentDiagList = this.mockData;
conditionNewList(parms)
.then((res) => {
if (res.code === '000000') {
this.handleData(res.data);
} else {
this.$message({
message: res.message,
type: 'warning',
duration: 1000,
});
}
})
.catch((err) => {
console.log(err);
// mock 数据
this.handleData(this.mockData);
});
},
handleData(data) {
this.currentDiagList = [];
data.forEach((item, index) => {
item.diagnoseLogId = '--' + Math.random() * 10;
item['definitionRandom'] = Math.random() * 10;
this.$set(this.currentDiagList, index, item);
});
this.isShowCardData = true;
// this.$nextTick(() => {
// });
},
getSerachValue(value) { getSerachValue(value) {
this.searchValue = value; this.orderOrName = value;
}, },
handleCheckedCitiesChange(value) { handleCheckedCitiesChange(value) {
console.log(value, 'value11'); console.log(value, 'value11');
}, },
getSerValue() { getSearchValue() {
console.log(this.searchValue, 'this.searchValue'); if (!this.orderOrName) {
console.log(789, this.departmentId);
return this.$message({
message: '医生名字或订单号不能为空',
type: 'warning',
duration: 1000,
});
} else {
this.initCard();
}
}, },
tabChange(val) { tabChange(val) {
console.log(val, 'val1111===='); console.log(val, 'val1111====');
this.tabPositionValue = val; this.tabPositionValue = val;
// const s = this.searchParam; if (val != 3) {
// s.returnStatus = val; this.initCard();
// this.searchParam = s;
// s.pageNo = 1;
// this.$store.commit('main/updateCurrentTabStatus', val);
// this.inquirySearch('tab');
},
changeDatetime(val) {
const s = this.searchParam;
s.dateTime = val.format('yyyy-MM-dd');
this.searchParam = s;
s.pageNo = 1;
this.inquirySearch('clear');
},
handleSizeChange(val) {
const s = this.searchParam;
s.pageSize = val;
this.searchParam = s;
this.inquirySearch();
},
handleCurrentChange(val) {
const s = this.searchParam;
s.pageNo = val;
this.searchParam = s;
this.inquirySearch();
},
inquirySearch(type) {
console.log(type);
const p = this.searchParam;
if (type == 'clear') {
// this.$store.commit('main/clearRawCurrentCalList');
}
conditionUpdate(p).then((res) => {
if (res.code == '000000') {
this.$store.commit('main/updateSoketQuest', p);
if (type == 'tab') {
// const returnStatus = p.returnStatus;
// const RespList = res.data.list[0].recordResp.countRespList.filter(
// (val) => {
// return val.status == returnStatus;
// }
// );
// this.$store.commit('main/changeRawCurrentCalList', RespList[0]);
}
} else {
this.$message({
message: res.message,
type: 'warning',
duration: 1000,
});
} }
});
}, },
}, },
}; };
...@@ -374,15 +424,6 @@ ...@@ -374,15 +424,6 @@
height: 40px; height: 40px;
} }
} }
.searh-input {
.el-input {
width: 440px;
.search-botton {
background: #0d9078;
color: #fff;
}
}
}
} }
.title { .title {
...@@ -399,15 +440,36 @@ ...@@ -399,15 +440,36 @@
} }
} }
.workbench-content { .workbench-content {
padding: 20px 10px; padding: 0 2px;
.workbench-title {
border-top: 1px solid #f0f2f5;
height: 75px;
display: flex;
justify-content: flex-end;
line-height: 75px;
background: #fff;
margin-bottom: 10px;
.searh-input {
margin-left: 8px;
.el-input {
width: 364px;
.search-botton {
background: #0d9078;
color: #fff;
}
}
}
}
.workbench-li-c { .workbench-li-c {
width: 100%; width: 100%;
.grid-c { .grid-c {
display: grid; display: grid;
grid-row-gap: 20px; grid-template-columns: auto auto auto;
grid-column-gap: 20px; grid-template-rows: auto auto auto;
padding: 25px 50px; //grid-template-columns: 32% 32% 32%;
background: #fff; //grid-row-gap: 2%;
grid-column-gap: 10px;
padding: 0px 7px;
.el-checkbox-group { .el-checkbox-group {
.el-checkbox { .el-checkbox {
width: 20%; width: 20%;
......
...@@ -51,7 +51,6 @@ ...@@ -51,7 +51,6 @@
</div> </div>
</div> </div>
</div> </div>
<div <div
v-else v-else
class="nodata-container" class="nodata-container"
...@@ -82,7 +81,6 @@ ...@@ -82,7 +81,6 @@
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { createNamespacedHelpers } from 'vuex'; import { createNamespacedHelpers } from 'vuex';
const { mapState } = createNamespacedHelpers('main'); const { mapState } = createNamespacedHelpers('main');
......
...@@ -81,7 +81,9 @@ ...@@ -81,7 +81,9 @@
isSuper: false, isSuper: false,
userID: userId, userID: userId,
}; };
const u = this.getSocketUrl(BUILD_ENV); const u = this.getSocketUrl('test');
console.log(BUILD_ENV);
// u.url = 'https://test1-sockets.yunqueyi.com';
storejs.set('initSocketInfo', { url: u, userId: userId }); storejs.set('initSocketInfo', { url: u, userId: userId });
this.$store.dispatch('socket/initSocket', { url: u, userId: userId }); this.$store.dispatch('socket/initSocket', { url: u, userId: userId });
vueMenuDtos.map((item) => { vueMenuDtos.map((item) => {
......
...@@ -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,
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册