|
|
@@ -47,8 +47,8 @@
|
|
|
<el-form ref="carInfoFormRef" :model="dateObj" :rules="rules" label-width="80px">
|
|
|
<el-form-item label="出发时间">
|
|
|
<el-time-picker v-model="startTime" :picker-options="{
|
|
|
- selectableRange: '00:00:00 - 23:59:59'
|
|
|
- }" placeholder="选择出发时间">
|
|
|
+ selectableRange: '00:00:00 - 23:59:59'
|
|
|
+ }" placeholder="选择出发时间">
|
|
|
</el-time-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="车辆">
|
|
|
@@ -146,7 +146,7 @@ const formParams = ref({
|
|
|
});
|
|
|
|
|
|
const data = reactive<PageData<CarScheduleForm, CarScheduleQuery>>({
|
|
|
- form: { ...initFormData,carId:undefined },
|
|
|
+ form: { ...initFormData, carId: undefined },
|
|
|
queryParams: {
|
|
|
pageNum: 1,
|
|
|
pageSize: 10,
|
|
|
@@ -176,6 +176,7 @@ const { queryParams, form, rules } = toRefs(data);
|
|
|
|
|
|
const columns = ref([
|
|
|
// {label: '上层位置', prop: 'v', visible: true},
|
|
|
+ { label: '线路名称', prop: 'lineID', pprop: "pathInfo", visible: true, isTemplateJsonFormat: true, func: "getPathName" },
|
|
|
{ label: '车牌号', prop: 'carNum', visible: true, isTemplate: false },
|
|
|
{ label: '作业时间', prop: 'scheduleDate', visible: true, isTemplate: false, },
|
|
|
{ label: '跟车人员', prop: 'attendantInfo', pprop: "pathInfo", visible: true, isTemplateJsonFormat: true, func: "getattend" },
|
|
|
@@ -188,24 +189,24 @@ const addSchedule = () => {
|
|
|
}
|
|
|
|
|
|
const getcarInfoList = async () => {
|
|
|
- const carList = await listCarInfo({pageSize:10000});
|
|
|
+ const carList = await listCarInfo({ pageSize: 10000 });
|
|
|
carInfoList.value = carList.rows
|
|
|
}
|
|
|
|
|
|
-const getCarNum = (value) =>{
|
|
|
- for(var index in carInfoList.value){
|
|
|
- if(carInfoList.value[index].id == value){
|
|
|
- return carInfoList.value[index].carNum
|
|
|
- }
|
|
|
- }
|
|
|
+const getCarNum = (value) => {
|
|
|
+ for (var index in carInfoList.value) {
|
|
|
+ if (carInfoList.value[index].id == value) {
|
|
|
+ return carInfoList.value[index].carNum
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
-const getCarId = (value) =>{
|
|
|
- for(var index in carInfoList.value){
|
|
|
- if(carInfoList.value[index].carNum == value){
|
|
|
- return carInfoList.value[index].id
|
|
|
- }
|
|
|
- }
|
|
|
+const getCarId = (value) => {
|
|
|
+ for (var index in carInfoList.value) {
|
|
|
+ if (carInfoList.value[index].carNum == value) {
|
|
|
+ return carInfoList.value[index].id
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
const getUserList = async () => {
|
|
|
@@ -225,6 +226,14 @@ const getattend = (value) => {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+const getPathName = (value) =>{
|
|
|
+ for (var index in carPathList.value) {
|
|
|
+ if (carPathList.value[index].id == value) {
|
|
|
+ return carPathList.value[index].name
|
|
|
+ }
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
|
|
|
|
|
|
const getDriverTable = (value) => {
|
|
|
@@ -244,6 +253,8 @@ const childrenClick = (data) => {
|
|
|
}
|
|
|
|
|
|
const childFormat = ({ data, fn }) => {
|
|
|
+ console.log(data);
|
|
|
+ console.log(fn)
|
|
|
if (data.pprop != null) {
|
|
|
var ext = data.data[data.prop]
|
|
|
if (ext != null) {
|
|
|
@@ -255,6 +266,8 @@ const childFormat = ({ data, fn }) => {
|
|
|
res = getattend(value)
|
|
|
} else if (data.func == "getDriverTable") {
|
|
|
res = getDriverTable(value)
|
|
|
+ } else if (data.func == "getPathName") {
|
|
|
+ res = getPathName(value)
|
|
|
}
|
|
|
fn(res)
|
|
|
}
|
|
|
@@ -386,10 +399,10 @@ const handleExport = () => {
|
|
|
|
|
|
const submitSchedule = async () => {
|
|
|
var dataList = [];
|
|
|
- for(var index in carPathList.value){
|
|
|
- if(carPathList.value[index].id == line.value){
|
|
|
- carPathObj.value = carPathList.value[index]
|
|
|
- }
|
|
|
+ for (var index in carPathList.value) {
|
|
|
+ if (carPathList.value[index].id == line.value) {
|
|
|
+ carPathObj.value = carPathList.value[index]
|
|
|
+ }
|
|
|
}
|
|
|
if (carPathObj.value != null) {
|
|
|
var stationList = JSON.parse(carPathObj.value.stationList)
|
|
|
@@ -398,7 +411,7 @@ const submitSchedule = async () => {
|
|
|
obj.order = Number(index) + 1
|
|
|
obj.location = stationList[index].data.dictValue
|
|
|
if (stationList[index].timeObj) {
|
|
|
- obj.planInTime = timeDateFormat(stationList[index].timeObj.startTime + ":00")
|
|
|
+ obj.planInTime = timeDateFormat(stationList[index].timeObj.startTime + ":00")
|
|
|
// obj.planOutTime = timeDateFormat(stationList[index].timeObj.endTime + ":00")
|
|
|
} else {
|
|
|
obj.planInTime = ''
|
|
|
@@ -408,7 +421,7 @@ const submitSchedule = async () => {
|
|
|
dataList.push(obj)
|
|
|
if (index == 0) {
|
|
|
// var date = moment(selectDate.value).format('YYYY-MM-DD') + ' ' + stationList[index].timeObj.startTime + ":00";
|
|
|
- form.value.scheduleDate = moment(selectDate.value).format('YYYY-MM-DD') + ' '+moment(startTime.value).format('HH:mm:ss');
|
|
|
+ form.value.scheduleDate = moment(selectDate.value).format('YYYY-MM-DD') + ' ' + moment(startTime.value).format('HH:mm:ss');
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -446,21 +459,21 @@ const initList = (val) => {
|
|
|
}
|
|
|
|
|
|
const getTimeData = (date) => {
|
|
|
- var startDate = moment(new Date()).format("YYYY-MM-DD HH:mm:ss")+" "+date
|
|
|
- var time = startTime.value.getTime() - new Date(2016, 9, 10, 0, 0).getTime()
|
|
|
- var siteTime = new Date(date).getTime() + time
|
|
|
- // var str = moment(siteTime).format("YYYY-MM-DD HH:mm:ss")
|
|
|
- var str = moment(siteTime).format("YYYY-MM-DD HH:mm:ss")
|
|
|
- return str
|
|
|
+ var startDate = moment(new Date()).format("YYYY-MM-DD HH:mm:ss") + " " + date
|
|
|
+ var time = startTime.value.getTime() - new Date(2016, 9, 10, 0, 0).getTime()
|
|
|
+ var siteTime = new Date(date).getTime() + time
|
|
|
+ // var str = moment(siteTime).format("YYYY-MM-DD HH:mm:ss")
|
|
|
+ var str = moment(siteTime).format("YYYY-MM-DD HH:mm:ss")
|
|
|
+ return str
|
|
|
}
|
|
|
|
|
|
-const timeDateFormat = (date) =>{
|
|
|
- var startDate = moment(startTime.value).format("YYYY-MM-DD")+" "+date
|
|
|
- console.log(startTime.value)
|
|
|
- var time = startTime.value.getTime() - new Date(2016, 9, 10, 0, 0).getTime()
|
|
|
- var siteTime = new Date(startDate).getTime() + time
|
|
|
- var str = moment(siteTime).format("HH:mm:ss")
|
|
|
- return str
|
|
|
+const timeDateFormat = (date) => {
|
|
|
+ var startDate = moment(startTime.value).format("YYYY-MM-DD") + " " + date
|
|
|
+ console.log(startTime.value)
|
|
|
+ var time = startTime.value.getTime() - new Date(2016, 9, 10, 0, 0).getTime()
|
|
|
+ var siteTime = new Date(startDate).getTime() + time
|
|
|
+ var str = moment(siteTime).format("HH:mm:ss")
|
|
|
+ return str
|
|
|
}
|
|
|
|
|
|
// const initList = (data) =>{
|