Pārlūkot izejas kodu

Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_adminUI

caoliqin 20 stundas atpakaļ
vecāks
revīzija
83399314af
2 mainītis faili ar 10 papildinājumiem un 35 dzēšanām
  1. 6 2
      .env.prod-shdn
  2. 4 33
      src/views/live/order/index.vue

+ 6 - 2
.env.prod-shdn

@@ -17,15 +17,19 @@ VUE_APP_OBS_SECRET_ACCESS_KEY = sbyeNJLbcYmH6copxeFP9pAoksM4NIT9Zw4x0SRX
 # 存储桶配置
 VUE_APP_OBS_SERVER = https://obs.cn-north-4.myhuaweicloud.com
 # 存储桶配置
-VUE_APP_OBS_BUCKET = shdn-1323137866
+VUE_APP_OBS_BUCKET = shdn-20251226
 # 存储桶配置
-VUE_APP_COS_BUCKET = shdn-20251226
+VUE_APP_COS_BUCKET = shdn-1323137866
 # 存储桶配置
 VUE_APP_COS_REGION = ap-chongqing
 # 线路一地址
 VUE_APP_VIDEO_LINE_1 = https://shdn.ylrzcloud.com
 # 线路二地址
 VUE_APP_VIDEO_LINE_2 = https://shdnjbvolcengine.ylrztop.com
+#火山云视频地址域名
+VUE_APP_VIDEO_URL = https://shdnjbvolcengine.ylrztop.com
+#火山云视频点播空间名
+VUE_APP_HSY_SPACE = shdn-20251226
 
 # 开发环境配置
 ENV = 'development'

+ 4 - 33
src/views/live/order/index.vue

@@ -306,6 +306,7 @@
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']"
           @change="handleOrderTimeChange"
         />
       </el-form-item>
@@ -321,6 +322,7 @@
           format="yyyy-MM-dd HH:mm:ss"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']"
           @change="handlePayTimeChange"
         />
       </el-form-item>
@@ -929,41 +931,10 @@ export default {
       this.getList()
     },
     handleOrderTimeChange(value) {
-      if (value && value.length === 2) {
-        // 如果结束时间不是当天的23:59:59,则自动设置为当天的23:59:59
-        const endDate = new Date(value[1])
-        const endDateStr = value[1]
-        const datePart = endDateStr.split(' ')[0] // 获取日期部分
-        const timePart = endDateStr.split(' ')[1] // 获取时间部分
-        
-        // 如果时间部分不是23:59:59,则设置为23:59:59
-        if (timePart !== '23:59:59') {
-          const newEndTime = datePart + ' 23:59:59'
-          this.createTimeRange = [value[0], newEndTime]
-          this.queryParams.createTimeStart = value[0]
-          this.queryParams.createTimeEnd = newEndTime
-        } else {
-          this.queryParams.createTimeStart = value[0]
-          this.queryParams.createTimeEnd = value[1]
-        }
-      } else {
-        this.queryParams.createTimeStart = null
-        this.queryParams.createTimeEnd = null
-      }
+
     },
     handlePayTimeChange(value) {
-      if (value && value.length === 2) {
-        // 如果结束时间不是当天的23:59:59,则自动设置为当天的23:59:59
-        const endDateStr = value[1]
-        const datePart = endDateStr.split(' ')[0] // 获取日期部分
-        const timePart = endDateStr.split(' ')[1] // 获取时间部分
-        
-        // 如果时间部分不是23:59:59,则设置为23:59:59
-        if (timePart !== '23:59:59') {
-          const newEndTime = datePart + ' 23:59:59'
-          this.payTimeRange = [value[0], newEndTime]
-        }
-      }
+
     },
     /** 导出订单 */
     handleExport() {