diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..30ac79b 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
// 模板下载
export function downloadTemplate(fileName) {
return request({
- url: 'template/download',
+ url: 'car/template/download',
method: 'get',
params: {
filename: fileName
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..30ac79b 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
// 模板下载
export function downloadTemplate(fileName) {
return request({
- url: 'template/download',
+ url: 'car/template/download',
method: 'get',
params: {
filename: fileName
diff --git a/src/views/mile/listCar.vue b/src/views/mile/listCar.vue
index e51915c..91bed41 100644
--- a/src/views/mile/listCar.vue
+++ b/src/views/mile/listCar.vue
@@ -95,17 +95,17 @@
align: 'center'
},
{
- text: '当日里程',
+ text: '当日里程(km)',
value: 'dayMile',
align: 'center'
},
{
- text: '当月里程',
+ text: '当月里程(km)',
value: 'monthMile',
align: 'center'
},
{
- text: '当年里程',
+ text: '当年里程(km)',
value: 'yearMile',
align: 'center'
}
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..30ac79b 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
// 模板下载
export function downloadTemplate(fileName) {
return request({
- url: 'template/download',
+ url: 'car/template/download',
method: 'get',
params: {
filename: fileName
diff --git a/src/views/mile/listCar.vue b/src/views/mile/listCar.vue
index e51915c..91bed41 100644
--- a/src/views/mile/listCar.vue
+++ b/src/views/mile/listCar.vue
@@ -95,17 +95,17 @@
align: 'center'
},
{
- text: '当日里程',
+ text: '当日里程(km)',
value: 'dayMile',
align: 'center'
},
{
- text: '当月里程',
+ text: '当月里程(km)',
value: 'monthMile',
align: 'center'
},
{
- text: '当年里程',
+ text: '当年里程(km)',
value: 'yearMile',
align: 'center'
}
diff --git a/src/views/overview/trail.vue b/src/views/overview/trail.vue
index ddbd191..39f418e 100644
--- a/src/views/overview/trail.vue
+++ b/src/views/overview/trail.vue
@@ -220,6 +220,7 @@
'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
{ subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
).addTo(map))
+ this.search()
},
search() {
this.fetchData(false)
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..30ac79b 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
// 模板下载
export function downloadTemplate(fileName) {
return request({
- url: 'template/download',
+ url: 'car/template/download',
method: 'get',
params: {
filename: fileName
diff --git a/src/views/mile/listCar.vue b/src/views/mile/listCar.vue
index e51915c..91bed41 100644
--- a/src/views/mile/listCar.vue
+++ b/src/views/mile/listCar.vue
@@ -95,17 +95,17 @@
align: 'center'
},
{
- text: '当日里程',
+ text: '当日里程(km)',
value: 'dayMile',
align: 'center'
},
{
- text: '当月里程',
+ text: '当月里程(km)',
value: 'monthMile',
align: 'center'
},
{
- text: '当年里程',
+ text: '当年里程(km)',
value: 'yearMile',
align: 'center'
}
diff --git a/src/views/overview/trail.vue b/src/views/overview/trail.vue
index ddbd191..39f418e 100644
--- a/src/views/overview/trail.vue
+++ b/src/views/overview/trail.vue
@@ -220,6 +220,7 @@
'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
{ subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
).addTo(map))
+ this.search()
},
search() {
this.fetchData(false)
diff --git a/src/views/route/addRoute.vue b/src/views/route/addRoute.vue
index 4997de5..cac6da8 100644
--- a/src/views/route/addRoute.vue
+++ b/src/views/route/addRoute.vue
@@ -96,7 +96,7 @@
- >> 下一步,关联车辆
+ >> 下一步,关联车辆
@@ -129,7 +129,7 @@
- >> 下一步,规划路线
+ >> 下一步,规划路线
@@ -137,7 +137,7 @@
- 提交规划路线
+ 提交规划路线
@@ -163,6 +163,9 @@
canclick2: true,
canclick3: true,
timechoose: false,
+ click1: true,
+ click2: true,
+ click3: true,
accessTime: [],
carlist: [],
baselayer: [],
@@ -331,7 +334,9 @@
this.fetchData(false)
},
saveRoute() {
+ this.click3 = false
if (this.pointForm.pointlist.length === 0) {
+ this.click3 = true
this.$message.warning('请规划路线')
} else {
addPath(this.pointForm).then(response => {
@@ -343,8 +348,10 @@
}
},
saveCar() {
+ this.click2 = false
if (this.carlist.length === 0) {
this.$message.warning('请至少选择一辆车')
+ this.click2 = true
} else {
for (var i = 0; i < this.carlist.length; i++) {
this.carForm.carIds.push(Number(this.carlist[i]))
@@ -360,12 +367,15 @@
}
},
saveData() {
+ this.click1 = false
this.$refs['dataForm'].validate((valid) => {
if (valid) {
if (this.routeForm.startDate > this.routeForm.endDate) {
this.$message.warning('请确认输入正确起止时间')
+ this.click1 = true
} else if (this.routeForm.accessTime === '-1' && this.accessTime.length === 0) {
this.$message.warning('请选择时间段')
+ this.click1 = true
} else {
var timeselect = false
if (this.routeForm.accessTime === '-1') {
@@ -390,6 +400,8 @@
}
})
}
+ } else {
+ this.click1 = true
}
})
},
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..30ac79b 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -5,7 +5,7 @@
// 模板下载
export function downloadTemplate(fileName) {
return request({
- url: 'template/download',
+ url: 'car/template/download',
method: 'get',
params: {
filename: fileName
diff --git a/src/views/mile/listCar.vue b/src/views/mile/listCar.vue
index e51915c..91bed41 100644
--- a/src/views/mile/listCar.vue
+++ b/src/views/mile/listCar.vue
@@ -95,17 +95,17 @@
align: 'center'
},
{
- text: '当日里程',
+ text: '当日里程(km)',
value: 'dayMile',
align: 'center'
},
{
- text: '当月里程',
+ text: '当月里程(km)',
value: 'monthMile',
align: 'center'
},
{
- text: '当年里程',
+ text: '当年里程(km)',
value: 'yearMile',
align: 'center'
}
diff --git a/src/views/overview/trail.vue b/src/views/overview/trail.vue
index ddbd191..39f418e 100644
--- a/src/views/overview/trail.vue
+++ b/src/views/overview/trail.vue
@@ -220,6 +220,7 @@
'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
{ subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
).addTo(map))
+ this.search()
},
search() {
this.fetchData(false)
diff --git a/src/views/route/addRoute.vue b/src/views/route/addRoute.vue
index 4997de5..cac6da8 100644
--- a/src/views/route/addRoute.vue
+++ b/src/views/route/addRoute.vue
@@ -96,7 +96,7 @@
- >> 下一步,关联车辆
+ >> 下一步,关联车辆
@@ -129,7 +129,7 @@
- >> 下一步,规划路线
+ >> 下一步,规划路线
@@ -137,7 +137,7 @@
- 提交规划路线
+ 提交规划路线
@@ -163,6 +163,9 @@
canclick2: true,
canclick3: true,
timechoose: false,
+ click1: true,
+ click2: true,
+ click3: true,
accessTime: [],
carlist: [],
baselayer: [],
@@ -331,7 +334,9 @@
this.fetchData(false)
},
saveRoute() {
+ this.click3 = false
if (this.pointForm.pointlist.length === 0) {
+ this.click3 = true
this.$message.warning('请规划路线')
} else {
addPath(this.pointForm).then(response => {
@@ -343,8 +348,10 @@
}
},
saveCar() {
+ this.click2 = false
if (this.carlist.length === 0) {
this.$message.warning('请至少选择一辆车')
+ this.click2 = true
} else {
for (var i = 0; i < this.carlist.length; i++) {
this.carForm.carIds.push(Number(this.carlist[i]))
@@ -360,12 +367,15 @@
}
},
saveData() {
+ this.click1 = false
this.$refs['dataForm'].validate((valid) => {
if (valid) {
if (this.routeForm.startDate > this.routeForm.endDate) {
this.$message.warning('请确认输入正确起止时间')
+ this.click1 = true
} else if (this.routeForm.accessTime === '-1' && this.accessTime.length === 0) {
this.$message.warning('请选择时间段')
+ this.click1 = true
} else {
var timeselect = false
if (this.routeForm.accessTime === '-1') {
@@ -390,6 +400,8 @@
}
})
}
+ } else {
+ this.click1 = true
}
})
},
diff --git a/src/views/route/editRoute.vue b/src/views/route/editRoute.vue
index 6ce4730..702ef7f 100644
--- a/src/views/route/editRoute.vue
+++ b/src/views/route/editRoute.vue
@@ -85,7 +85,7 @@
- 修改路线基本信息
+ 修改路线基本信息
@@ -97,7 +97,7 @@
- 解绑车辆
+ 解绑车辆
@@ -129,7 +129,7 @@
- 增加绑定车辆
+ 增加绑定车辆
@@ -159,6 +159,9 @@
routeId: '',
map: null,
list: [],
+ click1: true,
+ click2: true,
+ click3: true,
alarmlist: [],
cartypelist: [],
accessTime: [],
@@ -409,7 +412,9 @@
this.fetchData(false)
},
addCar() {
+ this.click3 = false
if (this.addlist.length === 0) {
+ this.click3 = true
this.$message.warning('请至少选择一辆车')
} else {
this.addCarForm.routeId = this.routeId
@@ -425,7 +430,9 @@
}
},
removeCar() {
+ this.click2 = false
if (this.removelist.length === 0) {
+ this.click2 = true
this.$message.warning('请至少选择一辆车解绑')
} else {
this.removeCarForm.routeId = this.routeId
@@ -443,9 +450,11 @@
}
},
saveData() {
+ this.click1 = false
this.$refs['dataForm'].validate((valid) => {
if (valid) {
if (this.routeForm.startDate > this.routeForm.endDate) {
+ this.click1 = true
this.$message.warning('请确认输入正确起止时间')
} else {
this.routeForm.accessTime = this.accessTime[0]
@@ -458,6 +467,8 @@
}
})
}
+ } else {
+ this.click1 = true
}
})
}