liwei19941102 2 lat temu
rodzic
commit
bbdf788bd3

+ 2 - 2
src/components/Public/timeLine.vue

@@ -26,14 +26,14 @@
             <div class="activitieyContent" v-if="index == 0" style="background: #06D903;">
               起
               <div style="position: absolute;top:-26px;color:#C0C4CC;font-weight: bold;">{{
-        formatDate(item.planOutTime) }}</div>
+        formatDate(item.planInTime) }}</div>
             </div>
             <div class="activitieyContent" v-if="index > 0 && index < list.length - 1" style="">
               {{ index }}
               <div
                 style="position: absolute;top:-26px;left:-35px;color:#C0C4CC;font-weight:bold;width:100px;display:flex;justify-content: space-evenly;">
                 <div>{{ formatDate(item.planInTime) }}</div>
-                <div>{{ formatDate(item.planOutTime) }}</div>
+                <!-- <div>{{ formatDate(item.planOutTime) }}</div> -->
               </div>
             </div>
             <div class="activitieyContent" v-if="index == list.length - 1" style="background: #ad012f;">

+ 10 - 8
src/views/car/work/addCarWork.vue

@@ -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;
 }
 

+ 2 - 2
src/views/car/work/schedule.vue

@@ -399,10 +399,10 @@ const submitSchedule = async () => {
       obj.location = stationList[index].data.dictValue
       if (stationList[index].timeObj) {
         obj.planInTime =  timeDateFormat(stationList[index].timeObj.startTime + ":00")
-        obj.planOutTime = timeDateFormat(stationList[index].timeObj.endTime + ":00")
+        // obj.planOutTime = timeDateFormat(stationList[index].timeObj.endTime + ":00")
       } else {
         obj.planInTime = ''
-        obj.planOutTime = ''
+        // obj.planOutTime = ''
       }
       obj.stationName = stationList[index].data.dictLabel
       dataList.push(obj)

+ 4 - 4
src/views/yunying/scheduling/index.vue

@@ -269,8 +269,8 @@ const getTimeFormat = (data) => {
     var value = JSON.parse(data).pathLine
     console.log(JSON.parse(data))
     if (value.length > 0) {
-        if (value[0].planInTime && value[value.length - 1].planOutTime) {
-            return value[0].planInTime + '-' + value[value.length - 1].planOutTime
+        if (value[0].planInTime) {
+            return value[0].planInTime
         } else {
             return "请填写路线时间"
         }
@@ -344,12 +344,12 @@ const openMapDiv = (data) => {
     }
     var value = JSON.parse(data.pathInfo).pathLine
     var date = moment(new Date()).format('YYYY-MM-DD')
-    if (value[0].planInTime && value[value.length - 1].planOutTime) {
+    if (value[0].planInTime && value[value.length - 1].planInTime) {
         var param = {
             devicecode: code,
             params: {
                 starttime: date + ' ' + value[0].planInTime,
-                endtime: date + ' ' + value[value.length - 1].planOutTime,
+                endtime: date + ' ' + value[value.length - 1].planInTime,
             }
         }
         // console.log(mapElm.value);