4.12更新

# Conflicts:
#	src/api/business/records.js
#	src/views/business/faultLogs/index.vue
#	src/views/business/fence/map.vue
#	src/views/business/records/history.vue

README.md

@@ -17,6 +17,16 @@ npm install --registry=https://registry.npmmirror.com
 npm run dev
 ```
 
+```bash
+# 建议不要直接使用 cnpm 安装依赖，会有各种诡异的 bug。可以通过如下操作解决 npm 下载速度慢的问题
+npm install --registry=https://registry.npmmirror.com
+```
+
+```bash
+# 安装高德地图依赖
+npm i @amap/amap-jsapi-loader--save
+```
+
 浏览器访问 http://localhost:80
 
 ## 发布

package.json

@@ -41,7 +41,7 @@
     "axios": "0.24.0",
     "clipboard": "2.0.8",
     "core-js": "3.25.3",
-    "echarts": "5.4.0",
+    "echarts": "^5.5.0",
     "element-ui": "2.15.13",
     "file-saver": "2.0.5",
     "fuse.js": "6.4.3",

src/api/business/marking.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询标识列表列表
+export function listMarking(query) {
+  return request({
+    url: '/business/marking/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询标识列表详细
+export function getMarking(markingId) {
+  return request({
+    url: '/business/marking/findById/' + markingId,
+    method: 'get'
+  })
+}
+
+// 新增标识列表
+export function addMarking(data) {
+  return request({
+    url: '/business/marking/insert',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改标识列表
+export function updateMarking(data) {
+  return request({
+    url: '/business/marking/update',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除标识列表
+export function delMarking(markingId) {
+  return request({
+    url: '/business/marking/delete/' + markingId,
+    method: 'post'
+  })
+}
+
+export function findFence(data) {
+  return request({
+    url: '/business/fence/findFence',
+    method: 'get',
+    data
+  })
+}

src/api/business/records.js

@@ -0,0 +1,34 @@
+import request from '@/utils/request'
+
+// 查询车辆历史轨迹列表
+export function listRecords(query) {
+  return request({
+    url: '/business/records/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除车辆历史轨迹
+export function delRecords(recordsId) {
+  return request({
+    url: '/business/records/delete/' + recordsId,
+    method: 'delete'
+  })
+}
+
+// 根据ID获取历史车辆数据
+export function vehicleData(recordsId) {
+  return request({
+    url: '/business/vehicleData/findVDByRecordsId/' + recordsId,
+    method: 'get'
+  })
+}
+
+// 获取历史经纬度
+export function getPosition(recordsId) {
+  return request({
+    url: '/business/vehicleData/getPosition/' + recordsId,
+    method: 'get'
+  })
+}

src/api/system/car.js

@@ -63,7 +63,13 @@ export function open(carVin) {
   });
 }
 
-
+export function selectMarking(data) {
+  return request({
+    url: '/system/car/selectMarking',
+    method: 'get',
+    data
+  })
+}
 
 export function findById(carId) {
   return request({

src/main.js

@@ -83,6 +83,11 @@ window._AMapSecurityConfig = {
   securityJsCode: 'bb3924cc27a38c7bf8caaab8300a76a9' //*  安全密钥
 }
 
+// 引入 echarts
+import * as echarts from 'echarts'
+Vue.prototype.$echarts = echarts
+
+
 new Vue({
   el: '#app',
   router,

src/router/index.js

@@ -102,6 +102,20 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '/vehicleData',
+    component: Layout,
+    hidden: true,
+    redirect: 'vehicleData',
+    children: [
+      {
+        path: 'data',
+        component: () => import('@/views/business/records/history'),
+        name: 'vehicleData',
+        meta: { title: '历史轨迹' }
+      }
+    ]
+  }
 ]
 
 // 动态路由，基于用户权限动态去加载

src/views/business/marking/index.vue

@@ -0,0 +1,307 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="标识名称" prop="markingName">
+        <el-input
+          v-model="queryParams.markingName"
+          placeholder="请输入标识名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['business:marking:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['business:marking:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['business:marking:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['business:marking:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="markingList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="标识表主键" align="center" prop="markingId" />
+      <el-table-column label="标识名称" align="center" prop="markingName" />
+      <el-table-column label="电子围栏" align="center" prop="markingFenceIds" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['business:marking:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['business:marking:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改标识列表对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="标识名称" prop="markingName">
+          <el-input v-model="form.markingName" placeholder="请输入标识名称" />
+        </el-form-item>
+        <el-divider content-position="center">电子围栏信息</el-divider>
+        <el-form-item label="围栏名称" prop="markingFenceIds">
+        <el-checkbox-group v-model="markingFenceIds">
+          <el-checkbox v-for="item in fence"
+                       :key="item.fenceId"
+                       :label="item.fenceId"
+          >
+            {{ item.fenceName }}
+        </el-checkbox>
+        </el-checkbox-group>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {listMarking, getMarking, delMarking, addMarking, updateMarking, findFence} from "@/api/business/marking";
+
+export default {
+  name: "Marking",
+  dicts: ['sys_normal_disable'],
+  data() {
+    return {
+      markingFenceIds:[],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 子表选中数据
+      checkedFenceInfo: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 标识列表表格数据
+      markingList: [],
+      // 电子围栏表格数据
+      fenceInfoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        markingName: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      fence: []
+    };
+  },
+  created() {
+    this.getList();
+    this.findFence()
+  },
+  methods: {
+    findFence() {
+      findFence().then(res => {
+        this.fence = res
+      })
+    },
+    /** 查询标识列表列表 */
+    getList() {
+      this.loading = true;
+      listMarking(this.queryParams).then(res => {
+        this.markingList = res.data.list;
+        this.total = res.data.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        markingId: null,
+        markingName: null,
+        markingFenceIds: null
+      };
+      this.fenceInfoList = [];
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.markingId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.markingFenceIds = []
+      this.reset();
+      this.open = true;
+      // this.findFence()
+      this.title = "添加标识列表";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const markingId = row.markingId || this.ids
+      getMarking(markingId).then(res => {
+        this.findFence()
+        this.form = res;
+        this.form.markingFenceIds = res.markingFenceIds.split(',')
+        // this.markingFenceIds = res.markingFenceIds != null ? res.markingFenceIds.split(',') : []
+        this.open = true;
+        this.title = "修改标识列表";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.form.markingFenceIds=this.markingFenceIds.join(",")
+          if (this.form.markingId != null) {
+            updateMarking(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addMarking(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const markingIds = row.markingId || this.ids;
+      this.$modal.confirm('是否确认删除标识列表编号为"' + markingIds + '"的数据项？').then(function() {
+        return delMarking(markingIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+	/** 电子围栏序号 */
+    rowFenceInfoIndex({ row, rowIndex }) {
+      row.index = rowIndex + 1;
+    },
+    /** 电子围栏添加按钮操作 */
+    handleAddFenceInfo() {
+      let obj = {};
+      obj.fenceName = "";
+      obj.fenceType = "";
+      obj.fenceState = "";
+      obj.fenceRadius = "";
+      this.fenceInfoList.push(obj);
+    },
+    /** 电子围栏删除按钮操作 */
+    handleDeleteFenceInfo() {
+      if (this.checkedFenceInfo.length == 0) {
+        this.$modal.msgError("请先选择要删除的电子围栏数据");
+      } else {
+        const fenceInfoList = this.fenceInfoList;
+        const checkedFenceInfo = this.checkedFenceInfo;
+        this.fenceInfoList = fenceInfoList.filter(function(item) {
+          return checkedFenceInfo.indexOf(item.index) == -1
+        });
+      }
+    },
+    /** 复选框选中数据 */
+    handleFenceInfoSelectionChange(selection) {
+      this.checkedFenceInfo = selection.map(item => item.index)
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('business/marking/export', {
+        ...this.queryParams
+      }, `marking_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/business/records/history.vue

@@ -0,0 +1,190 @@
+<template>
+  <div>
+
+    <div class="dashboard-container">
+      <div id="container"></div>
+    </div>
+
+    {{ this.vehicle }}
+
+  </div>
+</template>
+<script>
+import AMapLoader from "@amap/amap-jsapi-loader";
+import {getPosition, vehicleData} from "@/api/business/records";
+
+export default {
+  name: "map-view",
+  data() {
+    return {
+      carPosition: ["116.6871620", "39.5228750"], // 初始化小汽车位置
+      carMarker: null, // 存储小汽车Marker
+      animationInterval: null,//存储动画定时器
+      lineArr: [],
+      recordsId: 0,
+      vehicle: {}
+    };
+  },
+  created() {
+    this.recordsId = this.$route.query.recordsId;
+    this.getFindVD()
+  },
+  mounted() {
+    this.initAMap();
+    // 初始化 echarts
+    this.initBarChart();
+  },
+  beforeDestroy() {
+    clearInterval(this.animationInterval);//清除定时器
+    this.map?.destroy();
+  },
+  methods: {
+    getFindVD() {
+      vehicleData(this.recordsId)
+    },
+
+    initAMap() {
+      AMapLoader.load({
+        key: "ce38a6b072b603934f6270bd9e97ed49", // 申请好的Web端开发者Key，首次调用 load 时必填
+        version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+        plugins: ["AMap.Scale"], //需要使用的的插件列表，如比例尺'AMap.Scale'，支持添加多个如：['...','...']
+      })
+        .then((AMap) => {
+          this.map = new AMap.Map("container", {
+            // 设置地图容器id
+            viewMode: "3D", // 是否为3D地图模式
+            zoom: 11, // 初始化地图级别
+            center: [116.397428, 39.90923], // 初始化地图中心点位置
+          });
+
+          // 车辆初始化
+          this.carMarker = new AMap.Marker({
+            position: this.carPosition,
+            icon: 'https://webapi.amap.com/images/car.png',
+            map: this.map, // 将Marker添加到地图上
+          });
+
+          // 在地图初始化完成后启动小车动画
+          this.startCarAnimation();
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+
+    startCarAnimation() {
+      this.animationInterval = setInterval(() => {
+        this.getRealTimeDataAndUpdatePosition();
+      }, 1000);
+    },
+
+    getRealTimeDataAndUpdatePosition() {
+      getPosition(this.recordsId)
+        .then(response => {
+          this.vehicle = response.data
+          //更新小汽车位置
+          this.carPosition = [this.vehicle.longitude, this.vehicle.latitude];
+          //更新小汽车Marker的位置
+          this.carMarker.setPosition(this.carPosition);
+          // this.center.setPosition(this.carPosition);
+        })
+    },
+
+    // initBarChart() {
+    //   // 通过 $ref 进行挂载
+    //   let myChart = this.$echarts.init(this.$refs.barChart);
+    //   let option = {
+    //     series: [
+    //       {
+    //         type: 'gauge',
+    //         axisLine: {
+    //           lineStyle: {
+    //             width: 30,
+    //             color: [
+    //               [0.3, '#67e0e3'],
+    //               [0.7, '#37a2da'],
+    //               [1, '#fd666d']
+    //             ]
+    //           }
+    //         },
+    //         pointer: {
+    //           itemStyle: {
+    //             color: 'auto'
+    //           }
+    //         },
+    //         axisTick: {
+    //           distance: -30,
+    //           length: 8,
+    //           lineStyle: {
+    //             color: '#fff',
+    //             width: 2
+    //           }
+    //         },
+    //         splitLine: {
+    //           distance: -30,
+    //           length: 30,
+    //           lineStyle: {
+    //             color: '#fff',
+    //             width: 4
+    //           }
+    //         },
+    //         axisLabel: {
+    //           color: 'inherit',
+    //           distance: 40,
+    //           fontSize: 20
+    //         },
+    //         detail: {
+    //           valueAnimation: true,
+    //           formatter: '{value} km/h',
+    //           color: 'inherit'
+    //         },
+    //         data: [
+    //           {
+    //             value: 70
+    //           }
+    //         ]
+    //       }
+    //     ]
+    //   };
+    //   setInterval(function () {
+    //     myChart.setOption({
+    //       series: [
+    //         {
+    //           data: [
+    //             {
+    //               value: +(Math.random() * 100).toFixed(2)
+    //             }
+    //           ]
+    //         }
+    //       ]
+    //     });
+    //   }, 2000);
+    //   myChart.setOption(option);
+    // },
+  },
+}
+</script>
+<style  scoped>
+#container{
+  padding:0px;
+  margin: 0px;
+  width: 25%;
+  height: 200px;
+}
+.amap-marker-icon {
+  border: none !important; /* 移除Marker的边框 */
+  box-shadow: none !important; /* 移除Marker的阴影 */
+}
+.home {
+  width: 500px;
+  height: 400px;
+  margin: auto;
+  border: 3px solid lightcoral;
+
+  //  宽高是必须给的，可以给百分比、具体的像素等....
+  .barChart {
+    width: 100%;
+    height: 100%;
+  }
+}
+</style>

src/views/business/records/index.vue

@@ -0,0 +1,278 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="VIN" prop="vin">
+        <el-input
+          v-model="queryParams.vin"
+          placeholder="请输入VIN"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="开始时间" prop="startTime">
+        <el-date-picker clearable
+          v-model="queryParams.startTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择开始时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="结束时间" prop="overTime">
+        <el-date-picker clearable
+          v-model="queryParams.overTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择结束时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['business:records:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['business:records:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['business:records:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['business:records:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="recordsList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="VIN" align="center" prop="vin" />
+      <el-table-column label="开始时间" align="center" prop="startTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="结束时间" align="center" prop="overTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.overTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-map-location"
+            @click="$router.push({
+          path:'/vehicleData/data',
+          query:{
+            recordsId:scope.row.recordsId
+          }})"
+          >历史轨迹</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['business:records:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改车辆历史轨迹对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listRecords, getRecords, delRecords, addRecords, updateRecords } from "@/api/business/records";
+
+export default {
+  name: "Records",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 车辆历史轨迹表格数据
+      recordsList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        vin: null,
+        startTime: null,
+        overTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询车辆历史轨迹列表 */
+    getList() {
+      this.loading = true;
+      listRecords(this.queryParams).then(response => {
+        this.recordsList = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        recordsId: null,
+        vin: null,
+        startTime: null,
+        overTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.recordsId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加车辆历史轨迹";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const recordsId = row.recordsId || this.ids
+      getRecords(recordsId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改车辆历史轨迹";
+      });
+    },
+    getTrajectory(row) {
+      this.reset();
+      const recordsId = row.recordsId || this.ids
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.recordsId != null) {
+            updateRecords(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addRecords(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const recordsIds = row.recordsId || this.ids;
+      this.$modal.confirm('是否确认删除车辆历史轨迹编号为"' + recordsIds + '"的数据项？').then(function() {
+        return delRecords(recordsIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('business/records/export', {
+        ...this.queryParams
+      }, `records_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/system/car/index.vue

@@ -117,7 +117,8 @@
       <el-table-column label="id" align="center" prop="carId" />
       <el-table-column label="车辆vin" align="center" prop="carVin" />
       <el-table-column label="车辆类型" align="center" prop="carType" />
-      <el-table-column label="电子围栏" align="center" prop="carFenceId" />
+      <!--      <el-table-column label="电子围栏" align="center" prop="carFenceId" />-->
+      <el-table-column label="车辆标识" align="center" prop="carMarking" />
       <el-table-column label="车辆状态" align="center" prop="state">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.car_state" :value="scope.row.state"/>
@@ -189,15 +190,16 @@
           <el-input v-model="form.carType" placeholder="请输入车辆类型" />
         </el-form-item>
 
-        <el-form-item label="电子围栏" prop="carFenceId">
+        <!--        <el-form-item label="电子围栏" prop="carFenceId">-->
-          <el-checkbox-group v-model="selectedFenceIds">
+        <el-form-item label="车辆标识" prop="carMarking">
+          <el-checkbox-group v-model="selectedMarkingIds">
             <el-checkbox
-              v-for="fence in selectFence"
+              v-for="marking in selectMarking"
-              :key="fence.fenceId"
+              :key="marking.markingId"
-              :label="fence.fenceId"
+              :label="marking.markingId"
-              :value="fence.fenceId"
+              :value="marking.markingId"
             >
-              {{ fence.fenceName }}
+              {{ marking.markingName }}
             </el-checkbox>
           </el-checkbox-group>
         </el-form-item>
@@ -226,15 +228,17 @@
 </template>
 
 <script>
-import {list, add, update, findById, del, exportA, selectFence,open,close} from "@/api/system/car";
+import {list, add, update, findById, del, exportA, selectFence,open,close,selectMarking} from "@/api/system/car";
-import {getRealTimeDataTwo} from "@/api/system/car";
 
 export default {
   name: "Car",
   dicts: ['car_state'],
   data() {
     return {
-      selectFence:[],
+      //电子围栏表循环查询
+      // selectFence:[],
+      //标识表循环查询
+      selectMarking:[],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -247,10 +251,10 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      //电子围栏空数组
-      // fenceIds:[],
       //电子围栏选中的数组
-      selectedFenceIds: [],
+      // selectedFenceIds: [],
+      //标识表选中的数组
+      selectedMarkingIds:[],
       // 车辆管理表格数据
       carList: [],
       // 弹出层标题
@@ -271,6 +275,7 @@ export default {
       },
       // 表单参数
       form: {
+        carMarking:[]
       },
       // 表单校验
       rules: {
@@ -279,13 +284,19 @@ export default {
   },
   created() {
     this.getList();
-    this.selectFenceList()
+    // this.selectFenceList()
+    this.selectMarkingList()
   },
   methods: {
-    selectFenceList(){
+    // selectFenceList(){
-      selectFence().then(res=>{
+    //   selectFence().then(res=>{
-        this.selectFence=res.data
+    //     this.selectFence=res.data
-        console.log(this.selectFence)
+    //     console.log(this.selectFence)
+    //   })
+    // },
+    selectMarkingList(){
+      selectMarking().then(res=>{
+        this.selectMarking=res.data
       })
     },
     /** 查询车辆管理列表 */
@@ -304,11 +315,13 @@ export default {
     },
     // 表单重置
     reset() {
+      this.selectedMarkingIds=[]
       this.form = {
         carId: null,
         carVin: null,
         carType: null,
-        carFenceId: null,
+        // carFenceId: null,
+        carMarking: null,
         state: null,
         carElectricalmachiney: null,
         carBattery: null,
@@ -340,9 +353,11 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.selectedMarkingIds=[]
       this.reset();
       this.open = true;
-      this.selectFenceList()
+      // this.selectFenceList()
+      // this.selectMarkingList()
       this.title = "添加车辆管理";
     },
     /** 修改按钮操作 */
@@ -350,11 +365,11 @@ export default {
       this.reset();
       const carId = row.carId || this.ids
       findById(carId).then(response => {
-        console.log("Response Data:",response.data);
         this.form = response.data;
-        console.log("Car Fence IDs:",this.form.carFenceId)
+        // this.selectedFenceIds = this.form.carFenceId.split(",");
-        this.selectedFenceIds = this.form.carFenceId.split(",");
+        // this.selectMarking=response.data.carMarking.split(",")
-        console.log("selectedFenceIds:"+this.selectedFenceIds)
+        // this.selectedMarkingIds=this.form.carMarking.split(",")
+
         this.open = true;
         this.title = "修改车辆管理";
       });
@@ -378,13 +393,13 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           //判断是否为数组，如果不正确转为数组
-          if (!Array.isArray(this.form.carFenceId)){
+          if (!Array.isArray(this.form.carMarking)){
-            this.form.carFenceId=[this.form.carFenceId]
+            this.form.carMarking=[this.form.carMarking]
           }
           //将每个元素转换为字符串
-          this.form.carFenceId = this.form.carFenceId.map(item => String(item)); //
+          this.form.carMarking = this.form.carMarking.map(item => String(item)); //
           //拼接获取到数据的数组，切割
-          this.form.carFenceId = this.selectedFenceIds.join(",");
+          this.form.carMarking = this.selectedMarkingIds.join(",");
           if (this.form.carId != null) {
             update(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");

src/views/system/dict/index.vue

@@ -218,7 +218,7 @@ export default {
       // 查询参数
       voEnterpriseInfo: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 30,
         dictName: undefined,
         dictType: undefined,
         status: undefined