Compare commits

..

No commits in common. "master" and "dev.breakdown" have entirely different histories.

7 changed files with 40 additions and 24 deletions

View File

@ -9,8 +9,6 @@
<title><%= webpackConfig.name %></title>
<!--[if lt IE 11]>
<script>window.location.href = '/html/ie.html';</script><![endif]-->
<script type="text/javascript"
src="https://webapi.amap.com/maps?v=1.4.15&key=bec0cf8516dae626fd99eb46944e3843"></script>
<style>
html,
body,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 78 KiB

View File

@ -31,13 +31,6 @@
</el-table-column>
<el-table-column width="150" align="center" label="操作">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-takeaway-box"
@click="cs(scope.row)"
>自己測試用*
</el-button>
<el-button
size="mini"
type="text"
@ -199,14 +192,6 @@ import {listManager , getManagerId , addManager,updateManager,delManager} from "
};
},
methods: {
cs(row){
const carVin = row.carVin;
alert(carVin);
this.$router.push({
path: `/vehicleManagement/record`,
query: { carVin }
});
},
//
findStrategy(row){
findStrategyList(3).then(res=>{

View File

@ -69,21 +69,20 @@ export default {
map: null,
polyline: null,
carMarker: null,
carVin: this.$route.query.carVin || null,
carVin: this.$route.query.carVin || null ,
intervalId: null,
data: {}, //
};
},
created() {
// fetchData
this.intervalId = setInterval(this.fetchData, 10000); // 1000010
this.intervalId = setInterval(this.fetchData, 1000); // 1000010
},
methods: {
async fetchData() {
try {
const res = await getDataByRedis(this.carVin);
this.data = res.data;
alert(res.data.longitude);
//
this.updateCarMarker();
@ -129,6 +128,40 @@ export default {
}
},
},
// methods: {
// fetchData() {
// getDataByRedis(this.carVin).then(res=>{
// this.data = res.data
// })
// },
// initMap() {
// this.map = new AMap.Map('map', {
// center: [116.397428, 39.90923], //
// zoom: 13, //
// });
//
// // 线
// this.polyline = new AMap.Polyline({
// map: this.map,
// path: [], //
// strokeColor: "#FF0000", // 线
// strokeWeight: 5, // 线
// });
//
// //
// setInterval(this.updateTrajectory, 1100);
// },
// updateTrajectory() {
// //
// const newPoint = [this.data.longitude, this.data.latitude];
// // 线
// const path = this.polyline.getPath();
// path.push(newPoint);
// this.polyline.setPath(path);
// //
// this.map.setCenter(newPoint);
// },
// },
mounted() {
this.initMap();
},

View File

@ -1,7 +1,7 @@
<template>
<div class="login">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
<h3 class="title">智慧车辆系统</h3>
<h3 class="title">若依后台管理系统</h3>
<el-form-item prop="username">
<el-input
v-model="loginForm.username"
@ -162,7 +162,7 @@ export default {
justify-content: center;
align-items: center;
height: 100%;
background-image: url("../assets/images/car.jpg");
background-image: url("../assets/images/login-background.jpg");
background-size: cover;
}

View File

@ -1,7 +1,7 @@
<template>
<div class="register">
<el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
<h3 class="title">智慧车辆系统</h3>
<h3 class="title">若依后台管理系统</h3>
<el-form-item prop="deptId">
<el-select v-model="registerForm.deptId" placeholder="企业" type="deptId">
<el-option v-for="i in firm" :label="i.deptName" :value="i.deptId" :key="i.deptId"></el-option>
@ -160,7 +160,7 @@ export default {
justify-content: center;
align-items: center;
height: 100%;
background-image: url("../assets/images/car.jpg");
background-image: url("../assets/images/login-background.jpg");
background-size: cover;
}