Browse Source

no message

DESKTOP-SVI9JE1\muzen 1 year ago
parent
commit
07b40b409a
2 changed files with 5 additions and 7 deletions
  1. 2 6
      src/components/GanttChart/index.vue
  2. 3 1
      src/views/content/scene/detail.vue

+ 2 - 6
src/components/GanttChart/index.vue

@@ -111,7 +111,7 @@ const data = reactive({
     { time: ['22:00:00', '23:00:00'], list: [] },
     { time: ['23:00:00', '00:00:00'], list: [] },
     { time: ['00:00:00', '01:00:00'], list: [] }
-  ],
+  ]
 })
 
 // 时间轴表单
@@ -180,11 +180,7 @@ const modal = (res) => {
         let st = e.timer[0]
         let en = e.timer[1]
         if (index !== 24) {
-          if(props. type === 'scene'){
-           return start >= st && start <= en || end >= st && end <= en
-          }else{
-            return start >= st && end <= en || start <= st && end >= en
-          }
+          return start >= st && end <= en || start <= st && end >= en || start > st && start < en || end > st && end < en
         }
       })
       list.map(e => {

+ 3 - 1
src/views/content/scene/detail.vue

@@ -113,7 +113,9 @@ const data = reactive({
   },
   // 播放时间数组
   dateList: [[]],
-  tableData: []
+  tableData: [],
+  // 企业—门店
+  business_store: []
 })
 
 const total = ref(0)