故障模块、历史轨迹、电子围栏更新

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

@@ -36,6 +36,7 @@
     "url": "https://gitee.com/y_project/MuYu-Cloud.git"
   },
   "dependencies": {
+    "@amap/amap-jsapi-loader": "^1.0.1",
     "@riophae/vue-treeselect": "0.4.0",
     "axios": "0.24.0",
     "clipboard": "2.0.8",

src/api/business/fence.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询电子围栏列表
+export function listFence(query) {
+  return request({
+    url: '/business/fence/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询电子围栏详细
+export function getFence(fenceId) {
+  return request({
+    url: '/business/fence/findById/' + fenceId,
+    method: 'get'
+  })
+}
+
+// 新增电子围栏
+export function addFence(data) {
+  return request({
+    url: '/business/fence/insert',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改电子围栏
+export function updateFence(data) {
+  return request({
+    url: '/business/fence/update',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除电子围栏
+export function delFence(fenceId) {
+  return request({
+    url: '/business/fence/delete/' + fenceId,
+    method: 'delete'
+  })
+}
+
+// 保存电子围栏
+export function savePolygon(data) {
+  return request({
+    url: '/business/fence/savePolygon',
+    method: 'post',
+    data: data
+  })
+}

src/api/business/records.js

@@ -0,0 +1,18 @@
+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'
+  })
+}

src/router/index.js

@@ -87,6 +87,34 @@ export const constantRoutes = [
         meta: { title: '个人中心', icon: 'user' }
       }
     ]
+  },
+  {
+    path: '/fence',
+    component: Layout,
+    hidden: true,
+    redirect: 'fence',
+    children: [
+      {
+        path: 'map',
+        component: () => import('@/views/business/fence/map'),
+        name: 'fenMap',
+        meta: { title: '地图' }
+      }
+    ]
+  },
+  {
+    path: '/vehicleData',
+    component: Layout,
+    hidden: true,
+    redirect: 'vehicleData',
+    children: [
+      {
+        path: 'data',
+        component: () => import('@/views/business/records/history'),
+        name: 'vehicleData',
+        meta: { title: '历史轨迹' }
+      }
+    ]
   }
 ]
 
@@ -162,7 +190,7 @@ export const dynamicRoutes = [
         meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
       }
     ]
-  }
+  },
 ]
 
 // 防止连续点击多次路由报错

src/views/business/faultLogs/index.vue

@@ -44,8 +44,6 @@
     </el-row>
 
     <el-table v-loading="loading" :data="faultLogsList" border stripe>
-<!--      <el-table-column type="selection" width="55" align="center" />@selection-change="handleSelectionChange"-->
-<!--      <el-table-column label="故障码主键" align="center" prop="logId" />-->
       <el-table-column label="车辆VIN" align="center" prop="carVin" />
       <el-table-column label="故障码" align="center" prop="faultCode" />
       <el-table-column label="故障名称" align="center" prop="faultName" />
@@ -74,8 +72,8 @@
       </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-refresh-right" @click="handleUpdate(scope.row)" v-hasPermi="['business:faultLogs:edit']">忽略</el-button>
+          <el-button size="mini" type="text" icon="el-icon-refresh-right" @click="handleUpdateDisposeStatus(scope.row)" v-hasPermi="['business:faultLogs:edit']">忽略</el-button>
-          <el-button size="mini" type="text" icon="el-icon-check" @click="handleUpdate(scope.row)" v-hasPermi="['business:faultLogs:edit']">解决</el-button>
+          <el-button size="mini" type="text" icon="el-icon-check" @click="handleUpdateDisposeStatus(scope.row)" v-hasPermi="['business:faultLogs:edit']">解决</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -175,6 +173,26 @@ export default {
       this.resetForm("queryForm")
       this.handleQuery()
     },
+    /**忽略/解决*/
+    handleUpdateDisposeStatus(row, vehicle_dispose_status){
+      this.$confirm('确认要'+ vehicle_dispose_status +'故障吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const newRow = {...row, alarmFlag: 'N', disposeStatus: 0,}
+        console.log(newRow)
+        addFaultLogs(row).then(res => {
+          if (res.code === 200) {
+            this.$message.success("操作成功")
+            this.getList()
+          } else {
+            this.msgError(res.msg)
+          }
+        })
+      }).catch(() => {
+      })
+    }
   },
   //声明周期 - 创建完成（可以访问当前this实例）,
   created() {

src/views/business/fence/index.vue

@@ -0,0 +1,300 @@
+<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="fenceName">
+        <el-input
+          v-model="queryParams.fenceName"
+          placeholder="请输入围栏名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="围栏类型" prop="fenceType">
+        <el-input
+          v-model="queryParams.fenceType"
+          placeholder="请输入围栏类型"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="围栏状态" prop="fenceState">
+        <el-select v-model="queryParams.fenceState" placeholder="请选择围栏状态" clearable>
+          <el-option
+            v-for="dict in dict.type.sys_normal_disable"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </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:fence: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:fence: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:fence: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:fence:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="fenceList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="围栏名称" align="center" prop="fenceName" />
+      <el-table-column label="围栏类型" align="center" prop="fenceType" />
+      <el-table-column label="围栏状态" align="center" prop="fenceState">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.fenceState"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="经纬度信息" align="center" prop="fenceRadius" />
+      <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:'/fence/map',
+          query:{
+            fenceId:scope.row.fenceId,
+          }})"
+          >编辑围栏</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['business:fence:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['business:fence: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="fenceName">
+          <el-input v-model="form.fenceName" placeholder="请输入围栏名称" />
+        </el-form-item>
+        <el-form-item label="围栏类型" prop="fenceType">
+          <el-radio v-model="form.fenceType" label="驶出">驶出</el-radio>
+          <el-radio v-model="form.fenceType" label="驶入">驶入</el-radio>
+        </el-form-item>
+        <el-form-item label="围栏状态" prop="fenceState">
+          <el-select v-model="form.fenceState" placeholder="请选择围栏状态">
+            <el-option
+              v-for="dict in dict.type.sys_normal_disable"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </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 { listFence, getFence, delFence, addFence, updateFence } from "@/api/business/fence";
+
+export default {
+  name: "Fence",
+  dicts: ['sys_normal_disable'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 电子围栏表格数据
+      fenceList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        fenceName: null,
+        fenceType: null,
+        fenceState: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询电子围栏列表 */
+    getList() {
+      this.loading = true;
+      listFence(this.queryParams).then(res => {
+        this.fenceList = res.data.list;
+        this.total = res.data.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        fenceId: null,
+        fenceEncoding: null,
+        fenceName: null,
+        fenceType: null,
+        fenceState: null,
+        fenceRadius: 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.fenceId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加电子围栏";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const fenceId = row.fenceId || this.ids
+      getFence(fenceId).then(response => {
+        this.form = response;
+        this.open = true;
+        this.title = "修改电子围栏";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.fenceId != null) {
+            updateFence(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addFence(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const fenceIds = row.fenceId || this.ids;
+      this.$modal.confirm('是否确认删除电子围栏编号为"' + fenceIds + '"的数据项？').then(function() {
+        return delFence(fenceIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('business/fence/export', {
+        ...this.queryParams
+      }, `fence_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/business/fence/map.vue

@@ -0,0 +1,101 @@
+<template>
+  <div class="dashboard-container">
+    <el-button @click="drawPolygon()">绘制围栏</el-button>
+    <el-button @click="cleanPolygon()">清除围栏</el-button>
+    <el-button @click="savePolygon()">保存围栏</el-button>
+    <div id="container"></div>
+  </div>
+</template>
+<script>
+import AMapLoader from "@amap/amap-jsapi-loader";
+import { savePolygon } from "@/api/business/fence";
+
+export default {
+  name: "map-view",
+  created() {
+    this.mapRequest.fenceId = this.$route.query.fenceId;
+  },
+  data() {
+    return {
+      map: null,
+      _Amap: null,
+      mouseTool: null,
+      mapRequest: {
+        fenceId: 0,
+        jwd: {}
+      }
+    }
+  },
+  mounted() {
+    this.initAMap();
+  },
+  unmounted() {
+    this.map?.destroy();
+  },
+  methods: {
+    initAMap() {
+      AMapLoader.load({
+        key: "ce38a6b072b603934f6270bd9e97ed49", // 申请好的Web端开发者Key，首次调用 load 时必填
+        version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+        plugins: ["AMap.Scale","AMap.MouseTool"], //需要使用的的插件列表，如比例尺'AMap.Scale'，支持添加多个如：['...','...']
+      })
+        .then((AMap) => {
+          this._Amap = AMap;
+          this.map = new AMap.Map("container", {
+            // 设置地图容器id
+            viewMode: "3D", // 是否为3D地图模式
+            zoom: 11, // 初始化地图级别
+            center: [116.397428, 39.90923], // 初始化地图中心点位置
+          });
+          this.mouseTool = new AMap.MouseTool(this.map)
+          this.mouseTool.on('draw',this.drawReady)
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+
+    drawPolygon () {
+      this.mouseTool.polygon({
+        strokeColor: "#FF33FF",
+        strokeOpacity: 1,
+        strokeWeight: 6,
+        // strokeOpacity: 0.2,
+        fillColor: '#1791fc',
+        fillOpacity: 0.4,
+        // 线样式还支持 'dashed'
+        strokeStyle: "solid",
+        // strokeStyle是dashed时有效
+        // strokeDasharray: [30,10],
+      })
+    },
+
+    cleanPolygon () {
+      this.mouseTool.close(true)
+    },
+
+    drawReady(event) {
+
+      this.mapRequest.jwd=event.obj.getPath();
+
+      console.info('覆盖物对象绘制完成')
+    },
+
+    savePolygon() {
+      console.log(this.mapRequest.jwd)
+      savePolygon(this.mapRequest).then(response => {
+        this.$modal.msgSuccess("保存成功");
+        this.$router.push({path: '/etcfence/fence'})
+      });
+    }
+  },
+};
+</script>
+<style scoped>
+#container{
+  padding:0px;
+  margin: 0px;
+  width: 100%;
+  height: 800px;
+}
+</style>

src/views/business/records/history.vue

@@ -0,0 +1,75 @@
+<template>
+  <div>
+
+    <div class="dashboard-container">
+      <div id="container"></div>
+    </div>
+
+  </div>
+</template>
+<script>
+import AMapLoader from "@amap/amap-jsapi-loader";
+
+export default {
+  name: "map-view",
+  data() {
+    return {
+      carPosition: ["116.397428", "39.90923"], // 初始化小汽车位置
+      carMarker: null, // 存储小汽车Marker
+      animationInterval:null//存储动画定时器
+    };
+  },
+  mounted() {
+    this.initAMap();
+  },
+  beforeDestroy() {
+    clearInterval(this.animationInterval);//清除定时器
+    this.map?.destroy();
+  },
+  methods: {
+    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(() => {
+
+      }, 1000);
+    },
+  },
+};
+</script>
+<style  scoped>
+#container{
+  padding:0px;
+  margin: 0px;
+  width: 25%;
+  height: 200px;
+}
+.amap-marker-icon {
+  border: none !important; /* 移除Marker的边框 */
+  box-shadow: none !important; /* 移除Marker的阴影 */
+}
+</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/dict/index.vue

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