Skip to content

卡
卡车调度系统
Commit e70097de authored by caicaicai's avatar caicaicai
Browse files
Options

修改

parent 6f25f3bf
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 239 deletions
.env.development
View file @ e70097de
...@@ -2,10 +2,10 @@ ENV = 'development' ...@@ -2,10 +2,10 @@ ENV = 'development'
# 接口地址 # 接口地址
#VUE_APP_BASE_API = 'http://localhost:8000' #VUE_APP_BASE_API = 'http://localhost:8000'
VUE_APP_BASE_API = 'http://192.168.0.110:8001' VUE_APP_BASE_API = 'http://8.143.203.103:9090'
VUE_APP_WS_API = 'ws://192.168.0.111:8001/webSocket' VUE_APP_WS_API = 'ws://192.168.0.111:8001/webSocket'
VUE_APP_LOCAL_API = 'http://192.168.0.110:8001' VUE_APP_LOCAL_API = 'http://8.143.203.103:9090'
VUE_APP_LOCAL_API2 = 'http://192.168.0.110:8001' VUE_APP_LOCAL_API2 = 'http://8.143.203.103:9090'
# 是否启用 babel-plugin-dynamic-import-node插件 # 是否启用 babel-plugin-dynamic-import-node插件
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true
src/components/mars3d/Map.vue
View file @ e70097de
This diff is collapsed.
src/views/system/shift/index.vue
View file @ e70097de
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
<div class="content"> <div class="content">
<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName"> <el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName">
<el-table-column prop="banci" label="班次" align="center"></el-table-column> <el-table-column prop="banci" label="班次" align="center"></el-table-column>
<el-table-column prop="startTime" label="开始时间" align="center"></el-table-column> <el-table-column prop="startTime" label="开始时间" align="center" :formatter="currentTime1"></el-table-column>
<el-table-column prop="endTime" label="结束时间" align="center"></el-table-column> <el-table-column prop="endTime" label="结束时间" align="center" :formatter="currentTime2"></el-table-column>
<el-table-column label="操作" align="center" fixed="right"> <el-table-column label="操作" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="primary" icon="el-icon-edit" @click="toEdit(scope.row)"></el-button> <el-button size="mini" type="primary" icon="el-icon-edit" @click="toEdit(scope.row)"></el-button>
...@@ -45,10 +45,10 @@ ...@@ -45,10 +45,10 @@
<el-input v-model="form.item.banci" style="width:220px;" placeholder="请输入班次"/> <el-input v-model="form.item.banci" style="width:220px;" placeholder="请输入班次"/>
</el-form-item> </el-form-item>
<el-form-item label="开始时间" prop="startTime"> <el-form-item label="开始时间" prop="startTime">
<el-time-picker v-model="form.item.startTime" placeholder="任意时间点"></el-time-picker> <el-date-picker type="datetime" v-model="form.item.startTime" placeholder="任意时间点"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="结束时间" prop="endTime"> <el-form-item label="结束时间" prop="endTime">
<el-time-picker v-model="form.item.endTime" placeholder="任意时间点"></el-time-picker> <el-date-picker type="datetime" v-model="form.item.endTime" placeholder="任意时间点"></el-date-picker>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -77,8 +77,8 @@ export default { ...@@ -77,8 +77,8 @@ export default {
tableData: [], tableData: [],
form: { form: {
title:'新增班次', title:'新增班次',
visible:false, visible:false,
reqType:'add', reqType:'add',
status:{cu:0}, status:{cu:0},
item:{}, item:{},
}, },
...@@ -158,8 +158,8 @@ export default { ...@@ -158,8 +158,8 @@ export default {
this.form.status.cu = 0; this.form.status.cu = 0;
this.form.visible = true; this.form.visible = true;
this.form.item = {...item}; this.form.item = {...item};
this.form.item.startTime = ''; this.form.item.startTime = '';
this.form.item.endTime = ''; this.form.item.endTime = '';
this.form.reqType = 'edit'; this.form.reqType = 'edit';
this.ShiftId = this.form.item.id; this.ShiftId = this.form.item.id;
}, },
...@@ -202,8 +202,8 @@ export default { ...@@ -202,8 +202,8 @@ export default {
//新增班次 //新增班次
reqAddItem(form, item){ reqAddItem(form, item){
let lastData = {...item}; let lastData = {...item};
lastData.startTime = this.currentTime(lastData.startTime); lastData.startTime = lastData.startTime;
lastData.endTime = this.currentTime(lastData.endTime); lastData.endTime = lastData.endTime;
HttpReq.truckDispatching.shiftAdd(lastData).then((res) => { HttpReq.truckDispatching.shiftAdd(lastData).then((res) => {
form.visible = false; form.visible = false;
if(res.code == 200){ if(res.code == 200){
...@@ -227,8 +227,8 @@ export default { ...@@ -227,8 +227,8 @@ export default {
//修改班次 //修改班次
reqUpdateItem(form, item){ reqUpdateItem(form, item){
let lastData = {...item}; let lastData = {...item};
lastData.startTime = this.currentTime(lastData.startTime); lastData.startTime = lastData.startTime;
lastData.endTime = this.currentTime(lastData.endTime); lastData.endTime = lastData.endTime;
lastData.id = this.ShiftId; lastData.id = this.ShiftId;
HttpReq.truckDispatching.shiftUpdate(lastData).then((res) => { HttpReq.truckDispatching.shiftUpdate(lastData).then((res) => {
form.visible = false; form.visible = false;
...@@ -269,27 +269,73 @@ export default { ...@@ -269,27 +269,73 @@ export default {
this.loadData(); this.loadData();
}) })
}, },
//转换时间 //转换时间
currentTime(time){ currentTime1(row){
var date = new Date(time); var date = new Date(row.startTime);
var hours = date.getHours(); //小时 ,返回 Date 对象的小时 (0 ~ 23) var year = date.getFullYear(); //年 ,从 Date 对象以四位数字返回年份
var minutes = date.getMinutes(); //分钟 ,返回 Date 对象的分钟 (0 ~ 59) var month = date.getMonth() + 1; //月 ,从 Date 对象返回月份 (0 ~ 11) ,date.getMonth()比实际月份少 1 个月
var seconds = date.getSeconds(); //秒 ,返回 Date 对象的秒数 (0 ~ 59) var day = date.getDate(); //日 ,从 Date 对象返回一个月中的某一天 (1 ~ 31)
//修改小时格式 var hours = date.getHours(); //小时 ,返回 Date 对象的小时 (0 ~ 23)
if (hours >= 0 && hours <= 9) { var minutes = date.getMinutes(); //分钟 ,返回 Date 对象的分钟 (0 ~ 59)
hours = "0" + hours; var seconds = date.getSeconds(); //秒 ,返回 Date 对象的秒数 (0 ~ 59)
} //修改月份格式
//修改分钟格式 if (month >= 1 && month <= 9) {
if (minutes >= 0 && minutes <= 9) { month = "0" + month;
minutes = "0" + minutes; }
} //修改日期格式
//修改秒格式 if (day >= 0 && day <= 9) {
if (seconds >= 0 && seconds <= 9) { day = "0" + day;
seconds = "0" + seconds; }
} //修改小时格式
let currentFormatDate = hours + ":" + minutes + ":" + seconds; if (hours >= 0 && hours <= 9) {
return currentFormatDate; hours = "0" + hours;
}, }
//修改分钟格式
if (minutes >= 0 && minutes <= 9) {
minutes = "0" + minutes;
}
//修改秒格式
if (seconds >= 0 && seconds <= 9) {
seconds = "0" + seconds;
}
//获取当前系统时间 格式(yyyy-mm-dd hh:mm:ss)
let currentFormatDate = year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds;
//console.log(currentFormatDate);
return currentFormatDate;
},
currentTime2(row){
var date = new Date(row.endTime);
var year = date.getFullYear(); //年 ,从 Date 对象以四位数字返回年份
var month = date.getMonth() + 1; //月 ,从 Date 对象返回月份 (0 ~ 11) ,date.getMonth()比实际月份少 1 个月
var day = date.getDate(); //日 ,从 Date 对象返回一个月中的某一天 (1 ~ 31)
var hours = date.getHours(); //小时 ,返回 Date 对象的小时 (0 ~ 23)
var minutes = date.getMinutes(); //分钟 ,返回 Date 对象的分钟 (0 ~ 59)
var seconds = date.getSeconds(); //秒 ,返回 Date 对象的秒数 (0 ~ 59)
//修改月份格式
if (month >= 1 && month <= 9) {
month = "0" + month;
}
//修改日期格式
if (day >= 0 && day <= 9) {
day = "0" + day;
}
//修改小时格式
if (hours >= 0 && hours <= 9) {
hours = "0" + hours;
}
//修改分钟格式
if (minutes >= 0 && minutes <= 9) {
minutes = "0" + minutes;
}
//修改秒格式
if (seconds >= 0 && seconds <= 9) {
seconds = "0" + seconds;
}
//获取当前系统时间 格式(yyyy-mm-dd hh:mm:ss)
let currentFormatDate = year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds;
//console.log(currentFormatDate);
return currentFormatDate;
},
} }
} }
</script> </script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment