DESKTOP-SVI9JE1\muzen 1 gadu atpakaļ
vecāks
revīzija
bc6621e8f0

+ 9 - 0
src/api/content/scene.js

@@ -61,3 +61,12 @@ export function removeScene(query) {
     params: query,
   });
 }
+
+// 场景预设详情
+export function timeDetail(query) {
+  return request({
+    url: `/radio/tPresetContent/queryDetailById`,
+    method: 'get',
+    params: query
+  })
+}

+ 9 - 1
src/components/GanttChart/index.vue

@@ -134,6 +134,10 @@ function getTime() {
       if (i === 23) {
         end = start + 3600000
       }
+    }else{
+      if(i === 23) {
+        end = start + 3600
+      }
     }
     data.timeList[i].timer[0] = start
     data.timeList[i].timer[1] = end
@@ -176,7 +180,11 @@ const modal = (res) => {
         let st = e.timer[0]
         let en = e.timer[1]
         if (index !== 24) {
-          return start >= st && end <= en || start <= st && end >= en
+          if(props. type === 'scene'){
+           return start >= st && start <= en || end >= st && end <= en
+          }else{
+            return start >= st && end <= en || start <= st && end >= en
+          }
         }
       })
       list.map(e => {

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

@@ -26,7 +26,7 @@
                 :rules="{ required: true, trigger: 'change' }">
                 <el-select v-model="scope.row.tenantId" placeholder="请选择企业" style="width: 200px" filterable remote
                   :remote-method="businessRemote" remote-show-suffix @change="handleChangeTenant">
-                  <el-option v-for="item in businessData.options" :key="item.id" :value="item.id" :label="item.name" />
+                  <el-option v-for="item in businessData.options" :key="item.id" :value="item.id.toString()" :label="item.name" />
                 </el-select>
               </el-form-item>
             </template>
@@ -37,7 +37,7 @@
                 :rules="{ required: true, trigger: 'change' }">
                 <el-select v-model="scope.row.storeId" placeholder="请选择门店" style="width: 200px" filterable remote
                   :remote-method="storeRemote" remote-show-suffix>
-                  <el-option v-for="item in storeData.options" :key="item.id" :value="item.id" :label="item.name" />
+                  <el-option v-for="item in storeData.options" :key="item.id" :value="item.id.toString()" :label="item.name" />
                 </el-select>
               </el-form-item>
             </template>
@@ -83,7 +83,7 @@
 </template>
 
 <script setup>
-import { list, timeSubmit } from '@/api/content/scene.js'
+import { list, timeDetail, timeSubmit } from '@/api/content/scene.js'
 import { useBusinessSelect, useStoreSelect, useDeviceList } from '@/hooks/index.js'
 
 // 公共方法
@@ -127,6 +127,23 @@ const getAudioList = () => {
 }
 getAudioList()
 
+// 详情
+const getDetail = (id) => {
+  let e = proxy.$route.query
+  if(e.id) {
+    timeDetail({ id: e.id, storeId: e.storeId}).then(res => {
+    if(res.code === 0){
+      data.form = res.data
+      data.dateList = []
+        res.data.listDate.map(i => {
+          data.dateList.push([i.startTime, i.endTime])
+        })
+    }
+  })
+  }
+}
+getDetail()
+
 // 列表
 function getList() {
   loading.value = true