肖凡4.11

package.json

@@ -41,7 +41,7 @@
     "axios": "0.24.0",
     "clipboard": "2.0.8",
     "core-js": "3.25.3",
-    "echarts": "^5.5.0",
+    "echarts": "5.4.0",
     "element-ui": "2.15.13",
     "file-saver": "2.0.5",
     "fuse.js": "6.4.3",
@@ -52,9 +52,7 @@
     "nprogress": "0.2.0",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
-    "sockjs-client": "^1.6.1",
     "sortablejs": "1.10.2",
-    "stompjs": "^2.3.3",
     "vue": "2.6.12",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",

public/index.html

@@ -6,15 +6,6 @@
   <meta content="webkit" name="renderer">
   <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
   <link href="<%= BASE_URL %>favicon.ico" rel="icon">
-<!--  <script type="text/javascript">-->
-<!--    window._AMapSecurityConfig = {-->
-<!--      securityJsCode: "「bb3924cc27a38c7bf8caaab8300a76a9」",-->
-<!--    }-->
-<!--  </script>-->
-<!--  <script src="https://webapi.amap.com/loader.js"></script>-->
-<!--  <script type="text/javascript"-->
-<!--          src="https://webapi.amap.com/maps?v=2.0&key=「ce38a6b072b603934f6270bd9e97ed49」">-->
-<!--  </script>-->
   <title><%= webpackConfig.name %></title>
   <!--[if lt IE 11]>
   <script>window.location.href = '/html/ie.html';</script><![endif]-->

src/api/business/marking.js

@@ -1,52 +0,0 @@
-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

@@ -13,7 +13,7 @@ export function listRecords(query) {
 export function delRecords(recordsId) {
   return request({
     url: '/business/records/delete/' + recordsId,
-    method: 'delete'
+    method: 'post'
   })
 }
 

src/api/system/car.js

@@ -17,6 +17,14 @@ export function selectFence(data) {
   })
 }
 
+export function selectMarking(data) {
+  return request({
+    url: '/system/car/selectMarking',
+    method: 'get',
+    data
+  })
+}
+
 export function exportA(data){
   return request({
     url: '/system/car/exportA',
@@ -63,13 +71,7 @@ export function open(carVin) {
   });
 }
 
-export function selectMarking(data) {
-  return request({
-    url: '/system/car/selectMarking',
-    method: 'get',
-    data
-  })
-}
+
 
 export function findById(carId) {
   return request({
@@ -79,12 +81,6 @@ export function findById(carId) {
 }
 
 
-export function getRealTimeData() {
-  return request({
-    url: '/analyze/realTimeData',
-    method: 'get'
-  })
-}
 
 export function getRealTimeDataTwo(vin) {
   return request({

src/views/business/marking/index.vue

@@ -1,307 +0,0 @@
-<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

@@ -17,7 +17,7 @@ export default {
   name: "map-view",
   data() {
     return {
-      carPosition: ["116.6871620", "39.5228750"], // 初始化小汽车位置
+      carPosition: ["116.397428", "39.90923"], // 初始化小汽车位置
       carMarker: null, // 存储小汽车Marker
       animationInterval: null,//存储动画定时器
       lineArr: [],
@@ -86,7 +86,6 @@ export default {
           this.carPosition = [this.vehicle.longitude, this.vehicle.latitude];
           //更新小汽车Marker的位置
           this.carMarker.setPosition(this.carPosition);
-          // this.center.setPosition(this.carPosition);
         })
     },
 

src/views/system/dict/index.vue

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

src/views/system/track/index.vue

@@ -1,109 +0,0 @@
-<template>
-  <div>
-    <div id="container" style="width: 25%; height: 250px;"></div>
-    <div>
-      {{carData}}
-    </div>
-
-  </div>
-
-
-</template>
-<script>
-import AMapLoader from "@amap/amap-jsapi-loader";
-import {getRealTimeDataTwo} from "@/api/system/car";
-
-
-export default {
-  name: "map-view",
-  data() {
-    return {
-      carPosition: ["116.397428", "39.90923"], // 初始化小汽车位置
-      carMarker: null, // 存储小汽车Marker
-      animationInterval:null,//存储动画定时器
-      lastUpdateTime:0,//上次更新时间
-      animationFramId:null,//存储动画帧的ID
-      carData:[],//小汽车经纬度
-    };
-  },
-
-  mounted() {
-    this.initAMap()
-    // this.getRealTimeDataAndUpdatePosition(this.$route.query.carVin); // 添加此行
-  },
-  beforeDestroy() {
-    clearInterval(this.animationInterval);//清除定时器
-    this.map?.destroy();
-    cancelAnimationFrame(this.animationFramId);//取消动画帧请求
-  },
-  methods: {
-    initAMap() {
-      AMapLoader.load({
-        key: "e7398786b61ee782417e1749de1f2b39", // 申请好的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(() => {
-      //   let vin = this.$route.query.carVin;
-      //   this.getRealTimeDataAndUpdatePosition(vin);
-      // }, 1000);
-        const animate = () => {
-          const currentTime = Date.now();
-          const deltaTime = currentTime - this.lastUpdateTime;
-
-          if (deltaTime > 1000) {
-            //每秒更新一次位置
-            this.lastUpdateTime = currentTime;
-            let vin = this.$route.query.carVin;
-            this.getRealTimeDataAndUpdatePosition(vin);
-          }
-          this.animationFramId = requestAnimationFrame(animate);
-        };
-        this.animationFramId = requestAnimationFrame(animate);
-
-
-    },
-    getRealTimeDataAndUpdatePosition(vin) {
-      getRealTimeDataTwo(vin)
-        .then(response => {
-          console.log('Response from getRealTimeDataTwo:', response);
-          // this.$message.success('Real-time data:',response);
-          this.carData = response
-          //更新小汽车位置
-          this.carPosition = [this.carData.longitude, this.carData.latitude];
-          //更新小汽车Marker的位置
-          this.carMarker.setPosition(this.carPosition);
-          //显示实时数据
-
-        })
-    },
-
-
-  },
-};
-</script>
-<style scoped>
-</style>