|
|
@@ -128,8 +128,7 @@
|
|
|
<div style="display: flex;flex-direction: column;" v-show="!activity.isadd">
|
|
|
<div v-if="activity.rank == 1 || activity.rank == 999">{{ activity.content }}</div>
|
|
|
<div v-if="activity.data != null">{{ activity.data.dictLabel }}</div>
|
|
|
- <div v-if="activity.timeObj != null">{{ activity.timeObj.startTime }}-{{
|
|
|
- activity.timeObj.endTime }}</div>
|
|
|
+ <div v-if="activity.timeObj != null">{{ activity.timeObj.startTime }}</div>
|
|
|
<div style="display: flex;flex-direction: row;">
|
|
|
<el-button style="width: 80px;" @click="selectSite(index)">选择地点</el-button>
|
|
|
<el-button style="width: 80px;" @click="selectTime(index)">选择时间</el-button>
|
|
|
@@ -156,14 +155,14 @@
|
|
|
|
|
|
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
|
|
|
<el-form ref="carInfoFormRef" :model="dateObj" :rules="rules" label-width="80px">
|
|
|
- <el-form-item label="进站时间">
|
|
|
+ <el-form-item label="时间">
|
|
|
<el-time-select v-model="dateObj.startTime" style="width: 240px" start="00:00" step="00:15"
|
|
|
- end="23:59" placeholder="进站时间" />
|
|
|
+ end="23:59" placeholder="时间" />
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="出站时间">
|
|
|
+ <!-- <el-form-item label="出站时间">
|
|
|
<el-time-select v-model="dateObj.endTime" style="width: 240px" start="00:00" step="00:15"
|
|
|
end="23:59" placeholder="出站时间" />
|
|
|
- </el-form-item>
|
|
|
+ </el-form-item> -->
|
|
|
</el-form>
|
|
|
|
|
|
<template #footer>
|
|
|
@@ -229,7 +228,7 @@ const dialog = reactive<DialogOption>({
|
|
|
title: ''
|
|
|
});
|
|
|
|
|
|
-const dateObj = ref({ startTime: '', endTime: "" })
|
|
|
+const dateObj = ref({ startTime: '' })
|
|
|
|
|
|
const carObj = ref(null)
|
|
|
|
|
|
@@ -322,6 +321,9 @@ const activities = ref([
|
|
|
size: 'large',
|
|
|
color: '#0bbd87',
|
|
|
rank: 1,
|
|
|
+ timeObj:{
|
|
|
+ startTime:'00:00'
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
content: '1',
|
|
|
@@ -438,7 +440,7 @@ const clickSite = (data) => {
|
|
|
|
|
|
const selectTime = (index) => {
|
|
|
timeId.value = index;
|
|
|
- dateObj.value = { startTime: '', endTime: "" }
|
|
|
+ dateObj.value = { startTime: '' }
|
|
|
dialog.visible = true;
|
|
|
}
|
|
|
|