Merge branch 'feature/jq_1' into 'release'

Feature/jq 1

See merge request !181

package.json

@@ -19,8 +19,10 @@
     "tinypng": "pica-cli-service tinypng"
   },
   "dependencies": {
+    "@fullcalendar/core": "^5.10.0",
     "@fullcalendar/daygrid": "^5.10.0",
     "@fullcalendar/interaction": "^5.10.0",
+    "@fullcalendar/resource-timegrid": "^5.10.0",
     "@fullcalendar/timegrid": "^5.10.0",
     "@fullcalendar/vue": "^5.10.0",
     "axios": "^0.19.2",

src/api/serviceSchedule.js

@@ -58,3 +58,10 @@ export const getDoctorInfo = async (data) => {
     method: 'post',
   });
 };
+export const previewWork = async (data) => {
+  return request({
+    url: '/diagnose/doctor/work/previewWork',
+    method: 'post',
+    data: data,
+  });
+};

src/router/index.js

@@ -74,6 +74,12 @@ const serviceSchedule = (r) =>
     () => r(require('@/views/IM/diagnosis-admin/addEditSchedule.vue')),
     'addEditSchedule'
   );
+  const overviewScheduling = (r) =>
+  require.ensure(
+    [],
+    () => r(require('@/views/IM/diagnosis-admin/overviewScheduling.vue')),
+    'overviewScheduling'
+  );
 const administrators = (r) =>
   require.ensure(
     [],
@@ -144,6 +150,10 @@ const routerConfig = [
         path: '/addEditSchedule',
         component: addEditSchedule,
       },
+      {
+        path: '/overviewScheduling',
+        component: overviewScheduling,
+      },
       {
         path: '/administrators',
         component: administrators,

yarn.lock

@@ -1046,7 +1046,7 @@
   dependencies:
     tslib "^2.1.0"
 
-"@fullcalendar/core@~5.10.0":
+"@fullcalendar/core@^5.10.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=
@@ -1071,7 +1071,47 @@
     "@fullcalendar/common" "~5.10.0"
     tslib "^2.1.0"
 
-"@fullcalendar/timegrid@^5.10.0":
+"@fullcalendar/premium-common@~5.10.0":
+  version "5.10.0"
+  resolved "http://192.168.110.93:4873/@fullcalendar%2fpremium-common/-/premium-common-5.10.0.tgz#1abd26483243482eda26ffcf3d65e63d9e1cc64f"
+  integrity sha1-Gr0mSDJDSC7aJv/PPWXmPZ4cxk8=
+  dependencies:
+    "@fullcalendar/common" "~5.10.0"
+    tslib "^2.1.0"
+
+"@fullcalendar/resource-common@~5.10.0":
+  version "5.10.0"
+  resolved "http://192.168.110.93:4873/@fullcalendar%2fresource-common/-/resource-common-5.10.0.tgz#fd40974d1b8540673617c6ac4a0df56eea17a6b6"
+  integrity sha1-/UCXTRuFQGc2F8asSg31buoXprY=
+  dependencies:
+    "@fullcalendar/common" "~5.10.0"
+    "@fullcalendar/premium-common" "~5.10.0"
+    tslib "^2.1.0"
+
+"@fullcalendar/resource-daygrid@~5.10.0":
+  version "5.10.0"
+  resolved "http://192.168.110.93:4873/@fullcalendar%2fresource-daygrid/-/resource-daygrid-5.10.0.tgz#0ee59679e735f924164c1d208e5459bbaf3af920"
+  integrity sha1-DuWWeec1+SQWTB0gjlRZu686+SA=
+  dependencies:
+    "@fullcalendar/common" "~5.10.0"
+    "@fullcalendar/daygrid" "~5.10.0"
+    "@fullcalendar/premium-common" "~5.10.0"
+    "@fullcalendar/resource-common" "~5.10.0"
+    tslib "^2.1.0"
+
+"@fullcalendar/resource-timegrid@^5.10.0":
+  version "5.10.0"
+  resolved "http://192.168.110.93:4873/@fullcalendar%2fresource-timegrid/-/resource-timegrid-5.10.0.tgz#bdf276bf163670097fbfd0664821822a8d4986f4"
+  integrity sha1-vfJ2vxY2cAl/v9BmSCGCKo1JhvQ=
+  dependencies:
+    "@fullcalendar/common" "~5.10.0"
+    "@fullcalendar/premium-common" "~5.10.0"
+    "@fullcalendar/resource-common" "~5.10.0"
+    "@fullcalendar/resource-daygrid" "~5.10.0"
+    "@fullcalendar/timegrid" "~5.10.0"
+    tslib "^2.1.0"
+
+"@fullcalendar/timegrid@^5.10.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=