Merge branch 'V0.0.3' of http://10.87.10.227:4000/jzyd_yyds/soc_app into V0.0.3

src/api/cockpit.js

@@ -10,10 +10,10 @@ export function getOverview() {
     
   })
 }
-// 获取任务列表
-export function gettrainingList(query) {
+// 获取基础信息
+export function getAllbaseInfo(query) {
   return request({
-    url: '/core/eduTask/list',
+    url: '/core/cockpit/app/baseInfo',
 
     method: 'get',
     params: query

src/components/Calendar/index.vue

@@ -6,7 +6,6 @@
       v-model="date"
       :disabled-dates='disabledDates'
       @transition-start="queryMoth"
-      :first-day-of-week="1"
       :attributes='attrs'
       @dayclick="onDayClick"></vc-date-picker>
     <ul>
@@ -82,11 +81,6 @@ export default {
         v.customData.workTime = formDate.workTime;
         v.customData.workOffTime = formDate.workOffTime;
         v.customData.isDuty = formDate.isDuty;
-        console.log()
-        v.highlight = {
-            color: v.customData.isEnable == 1 ? 'green' : v.customData.isEnable == 0 ? 'yellow' : v.customData.isEnable == null ? 'red' : 'indigo',
-                fillMode: 'outline',
-        };
         arr.push(v.customData);
       });
       this.$toast.success('复制成功，请点击提交');