修改首页数量显示，修改全天时间展示格式

src/views/platform/bpmn/my-schedule/index.vue

@@ -89,8 +89,8 @@
               <div class="timeLine">
                 <div v-for="(m,n) in item.config.dateRange" :key="'time'+n">
                   <!-- {{ item.state && item.state.data }} -->
-                  <p v-if="m.type === 'range'">{{m.startTime}} — {{m.isSecondDay==='Y'?'第二天':''}}{{ m.endTime }}</p>
-                  <p v-else-if="m.type === 'allday'">全天</p>
+                  <p>{{m.startTime}} — {{m.isSecondDay==='Y'?'第二天':''}}{{ m.endTime }}</p>
+                  <!-- <p v-else-if="m.type === 'allday'">全天</p> -->
                 </div>
               </div>
             </div>
@@ -444,6 +444,8 @@ export default {
     // 日历备注赋值
     formatter(day) {
       const formatterDate = this.$common.getFormatDate('string', 10, day.date)
+      const formatterDateT = new Date(day.date).getTime()
+      const nowDateT = new Date().getTime()
       // const formatterDateYM = this.$common.getFormatDate('string', 7, day.date)
       // const year = day.date.getFullYear()
       // const month = day.date.getMonth() + 1
@@ -458,11 +460,10 @@ export default {
             }
           })
         }
-
-        if (indFT) {
+        if (indFT && formatterDateT <= nowDateT) {
           day.className = 'circleRed'
           day.topInfo = ' '
-        } else if (!indFT && this.showDateArr && this.showDateArr[formatterDate] && this.showDateArr[formatterDate].name !== '') {
+        } else if ((!indFT || formatterDateT > nowDateT) && this.showDateArr && this.showDateArr[formatterDate] && this.showDateArr[formatterDate].name !== '') {
           day.className = 'circle'
           day.topInfo = ' '
         }

src/views/system/dashboard/index.vue

@@ -394,7 +394,8 @@ export default {
                   if (objArr1.hasOwnProperty(t)) {
                     // const strArr = objArr1[t].name.split(',')
                     // if (strArr.findIndex(e => e === (item['d' + (n + 1) + '_'] ? item['d' + (n + 1) + '_'] : '')) === -1) {
-                    objArr1[t].name = objArr1[t].name + ',' + (item['d' + (n + 1) + '_'] ? item['d' + (n + 1) + '_'] : '')
+                    const mid = item['d' + (n + 1) + '_'] ? item['d' + (n + 1) + '_'] : ''
+                    objArr1[t].name = objArr1[t].name + (item['d' + (n + 1) + '_'] !== '' && objArr1[t].name !== '' ? ',' : '') + mid
                     objArr1[t].num = objArr1[t].name === '' ? 0 : objArr1[t].name.split(',').length
                     // }
                   } else {
@@ -405,6 +406,7 @@ export default {
                 })
               })
             }
+            console.log(objArr1)
             resolve(mid.length + objArr1[time].num)
           }).catch(e => {
           })