优化

public/tui-calendar/js/app.js

@@ -340,8 +340,6 @@
       // 处理日期Tue Sep 14 2021 00:00:00， Tue Sep 14 2021 23:59:59
       const startTime = moment(new Date(changes.start)).format("YYYY-MM-DD")
       const endTime = moment(new Date(changes.end)).format("YYYY-MM-DD")
-      console.log(startTime)
-      console.log(endTime)
       $.ajax({
         type: "put",
         url: '/api/check/jobs/' + schedule.id,
@@ -351,6 +349,16 @@
         headers: getHeader(),
         success: function (response) {
           alert("执行日期更新成功")
+          // 更新localStorage的数据
+          ScheduleList.forEach((item) => {
+            if(item.id == schedule.id){
+              alert("找：" + new Date(changes.start) + "到：" + new Date(changes.end))
+              item.start = new Date(changes.start);
+              item.end = new Date(changes.end);
+              return;
+            }
+          })
+          localStorage.setItem('scheduleList', JSON.stringify(ScheduleList))
         },
         error: function (xhr,textStatus,errorThrown) {
           ajaxError(xhr);

public/tui-calendar/js/data/calendars.js

@@ -41,11 +41,95 @@ function hexToRGBA (hex) {
   return rgba
 }
 
+/*(function () {
+  var calendar
+  var id = 0
+
+  calendar = new CalendarInfo()
+  id += 1
+  calendar.id = String(id)
+  calendar.name = 'My Calendar'
+  calendar.color = '#ffffff'
+  calendar.bgColor = '#9e5fff'
+  calendar.dragBgColor = '#9e5fff'
+  calendar.borderColor = '#9e5fff'
+  addCalendar(calendar)
+
+  calendar = new CalendarInfo()
+  id += 1
+  calendar.id = String(id)
+  calendar.name = 'Company'
+  calendar.color = '#ffffff'
+  calendar.bgColor = '#00a9ff'
+  calendar.dragBgColor = '#00a9ff'
+  calendar.borderColor = '#00a9ff'
+  addCalendar(calendar)
+
+  calendar = new CalendarInfo()
+  id += 1
+  calendar.id = String(id)
+  calendar.name = 'Family'
+  calendar.color = '#ffffff'
+  calendar.bgColor = '#ff5583'
+  calendar.dragBgColor = '#ff5583'
+  calendar.borderColor = '#ff5583'
+  addCalendar(calendar)
+
+  calendar = new CalendarInfo()
+  id += 1
+  calendar.id = String(id)
+  calendar.name = 'Friend'
+  calendar.color = '#ffffff'
+  calendar.bgColor = '#03bd9e'
+  calendar.dragBgColor = '#03bd9e'
+  calendar.borderColor = '#03bd9e'
+  addCalendar(calendar)
+
+  calendar = new CalendarInfo()
+  id += 1
+  calendar.id = String(id)
+  calendar.name = 'Travel'
+  calendar.color = '#ffffff'
+  calendar.bgColor = '#bbdc00'
+  calendar.dragBgColor = '#bbdc00'
+  calendar.borderColor = '#bbdc00'
+  addCalendar(calendar)
+
+  calendar = new CalendarInfo()
+  id += 1
+  calendar.id = String(id)
+  calendar.name = 'etc'
+  calendar.color = '#ffffff'
+  calendar.bgColor = '#9d9d9d'
+  calendar.dragBgColor = '#9d9d9d'
+  calendar.borderColor = '#9d9d9d'
+  addCalendar(calendar)
+
+  calendar = new CalendarInfo()
+  id += 1
+  calendar.id = String(id)
+  calendar.name = 'Birthdays'
+  calendar.color = '#ffffff'
+  calendar.bgColor = '#ffbb3b'
+  calendar.dragBgColor = '#ffbb3b'
+  calendar.borderColor = '#ffbb3b'
+  addCalendar(calendar)
+
+  calendar = new CalendarInfo()
+  id += 1
+  calendar.id = String(id)
+  calendar.name = 'National Holidays'
+  calendar.color = '#ffffff'
+  calendar.bgColor = '#ff4040'
+  calendar.dragBgColor = '#ff4040'
+  calendar.borderColor = '#ff4040'
+  addCalendar(calendar)
+})()*/
+
 (function () {
   if (CalendarList.length === 0) {
     var cList = JSON.parse(localStorage.getItem('calendarList'))
     for (var i = 0; i < cList.length; i++) {
-      console.log(cList[i].id)
       var calendar = new CalendarInfo()
       calendar.id = cList[i].id
       calendar.name = cList[i].name

public/tui-calendar/js/data/schedules.js

@@ -76,11 +76,11 @@ function generateTime(schedule, renderStart, renderEnd) {
 
     endDate = moment(startDate);
     if (schedule.isAllday) {
-        endDate.add(chance.integer({min: 0, max: 3}), 'days');
+        endDate.add(chance.integer({min: 0, max: 0}), 'days');
     }
 
     schedule.end = endDate
-        .add(chance.integer({min: 1, max: 4}), 'hour')
+        .add(chance.integer({min: 0, max: 0}), 'hour')
         .toDate();
 
     if (!schedule.isAllday && chance.bool({likelihood: 20})) {
@@ -145,7 +145,7 @@ function generateRandomSchedule(calendar, renderStart, renderEnd) {
         schedule.goingDuration = travelTime;
         schedule.comingDuration = travelTime;
     }
-
+    console.log(schedule);
     ScheduleList.push(schedule);
 }
 
@@ -165,15 +165,19 @@ function generateSchedule(viewName, renderStart, renderEnd) {
     });*/
 }
 
+function getDate(strDate) {
+  var date = eval('new Date(' + strDate.replace(/\d+(?=-[^-]+$)/,
+    function (a) { return parseInt(a, 10) - 1; }).match(/\d+/g) + ')');
+  return date;
+}
+
 function generateScheduleFromLocal() {
   var sList = JSON.parse(localStorage.getItem('scheduleList'))
 
   for (var i = 0; i < sList.length; i++) {
     var schedule = new ScheduleInfo();
-    console.log(sList[i].id)
     schedule.id = sList[i].id;
     schedule.calendarId = sList[i].calendarId;
-
     schedule.title = sList[i].title;
     schedule.body = sList[i].body;
     schedule.isReadOnly = sList[i].isReadOnly;
@@ -189,13 +193,16 @@ function generateScheduleFromLocal() {
     schedule.bgColor = sList[i].bgColor;
     schedule.dragBgColor = sList[i].dragBgColor;
     schedule.borderColor = sList[i].borderColor;
-    console.log(sList[i].raw)
+    schedule.start = sList[i].start;
+    schedule.end = sList[i].start;
     schedule.raw.memo = sList[i].raw.memo;
     schedule.raw.creator.name = sList[i].raw.creator.name;
     schedule.raw.creator.avatar = sList[i].raw.creator.avatar;
     schedule.raw.creator.company = sList[i].raw.creator.company;
     schedule.raw.creator.email = sList[i].raw.creator.email;
     schedule.raw.creator.phone = sList[i].raw.creator.phone;
+    console.log(sList[i].start);
+    console.log(schedule.start);
     ScheduleList.push(schedule);
   }
 }

src/views/check/checkjob/CheckJob.vue

@@ -581,12 +581,18 @@ export default {
       })
     },
     handleTuiCalendar () {
+      const that = this
       queryTuiCalendarIgnores({ type: 2 }).then(res => {
         const a = document.createElement('a')
         a.target = '_blank'
         a.href = '/tui-calendar/checkJobCalendar.html?'
         localStorage.setItem('calendarList', JSON.stringify(res.data.calendarList))
-        localStorage.setItem('scheduleList', JSON.stringify(res.data.scheduleList))
+        var scheduleList = res.data.scheduleList
+        scheduleList.forEach((item) => {
+          item.start = that.BaseTool.Moment(item.start, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
+          item.end = that.BaseTool.Moment(item.end, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
+        })
+        localStorage.setItem('scheduleList', JSON.stringify(scheduleList))
         a.click()
       })
     },

src/views/sb/info/modules/Detail.vue

@@ -20,8 +20,7 @@
               <a-button style="margin-left: 8px" type="default" @click="handleViewCheckJob()">保养任务</a-button>
             </a-badge>
             <a-button v-show="model.useType==4" style="margin-left: 8px" type="default" @click="handleMeasure()">检定记录</a-button>
-            <a-button v-if="$auth('check-polling-jobs-tui-calendar-first')" style="margin-left: 8px" type="error" @click="handleTuiCalendar(1)">一级保养日历</a-button>
-            <a-button v-if="$auth('check-polling-jobs-tui-calendar-second')" style="margin-left: 8px" type="error" @click="handleTuiCalendar(2)">二级保养日历</a-button>
+            <a-button v-if="$auth('check-polling-jobs-tui-calendar-first')" style="margin-left: 8px" type="error" @click="handleTuiCalendar(1)">保养日历</a-button>
             <a-button style="margin-left: 8px" type="primary" @click="handleCancel()">返回</a-button>
           </span>
         </a-col>
@@ -454,18 +453,18 @@ export default {
       modal.base({ sbId: this.model.id }, { sbId: this.model.id, status: 1 })
     },
     handleTuiCalendar (level) {
+      const that = this
       queryTuiCalendarIgnores({ sbId: this.model.id, type: 2, standardLevel: level }).then(res => {
         const a = document.createElement('a')
         a.target = '_blank'
-        if (level === 1) {
-          a.href = '/tui-calendar/checkJobCalendar.html?'
-          localStorage.setItem('calendarList', JSON.stringify(res.data.calendarList))
-          localStorage.setItem('scheduleList', JSON.stringify(res.data.scheduleList))
-        } else {
-          a.href = '/tui-calendar/checkJobCalendar2.html?'
-          localStorage.setItem('calendarList2', JSON.stringify(res.data.calendarList))
-          localStorage.setItem('scheduleList2', JSON.stringify(res.data.scheduleList))
-        }
+        a.href = '/tui-calendar/checkJobCalendar.html?'
+        localStorage.setItem('calendarList', JSON.stringify(res.data.calendarList))
+        var scheduleList = res.data.scheduleList
+        scheduleList.forEach((item) => {
+          item.start = that.BaseTool.Moment(item.start, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
+          item.end = that.BaseTool.Moment(item.end, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
+        })
+        localStorage.setItem('scheduleList', JSON.stringify(scheduleList))
         a.click()
       })
     }