shuishen
2021-12-01 2c2ba6e9f7d5b5e0c7ebbb958f67cdbc2da24990
枪支
2 files modified
151 ■■■■■ changed files
src/api/map/gun.js 2 ●●● patch | view | raw | blame | history
src/views/map/gunGps.vue 149 ●●●●● patch | view | raw | blame | history
src/api/map/gun.js
@@ -18,7 +18,7 @@
export const getTrack = (param) => {
  return request({
    url: '/api/liveLocation/getLocusInfoList',
    url: '/api/liveLocation/Gun',
    method: 'get',
    params: param
  })
src/views/map/gunGps.vue
@@ -2,7 +2,7 @@
 * @Author: Morpheus
 * @Date: 2021-07-05 16:31:54
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-11-30 16:47:29
 * @Last Modified time: 2021-12-01 14:19:01
 * menu-name 押运人员定位
 */
<template>
@@ -14,51 +14,43 @@
            <Map ref="modalForm" />
          </div>
          <div>
            <div class="data-table map-people-table" v-show="!detailFlag">
              <el-table
                :data="tableData"
                        <div class="data-table map-people-table"
                             v-show="!detailFlag">
                            <el-table :data="tableData"
                style="width: 100%"
                v-loading="loading"
              >
                <el-table-column
                  align="center"
                                      v-loading="loading">
                                <el-table-column align="center"
                  prop="gunMode"
                  label="枪支类型"
                  width="136"
                >
                                                 width="136">
                </el-table-column>
                <el-table-column
                  align="center"
                                <el-table-column align="center"
                  prop="personInCharge"
                  label="责任人"
                >
                                                 label="责任人">
                </el-table-column>
                <el-table-column label="操作" width="136" align="center">
                                <el-table-column label="操作"
                                                 width="136"
                                                 align="center">
                  <template slot-scope="scope">
                    <el-button
                      @click="positionClick(scope.row)"
                                        <el-button @click="positionClick(scope.row)"
                      type="text"
                      size="small"
                      title="定位"
                    >
                                                   title="定位">
                      <i class="el-icon-location"></i>
                    </el-button>
                    <el-button
                      @click="detailsClick(scope.row)"
                                        <el-button @click="detailsClick(scope.row)"
                      type="text"
                      size="small"
                      title="轨迹"
                    >
                                                   title="轨迹">
                      <i class="el-icon-position"></i>
                    </el-button>
                  </template>
                </el-table-column>
              </el-table>
              <div ref="tablePagination">
                <el-pagination
                  @size-change="handleSizeChange"
                                <el-pagination @size-change="handleSizeChange"
                  @current-change="handleCurrentChange"
                  background
                  :page-sizes="[10, 30, 50, 100]"
@@ -66,14 +58,17 @@
                  :current-page="page.currentPage"
                  :page-size="page.pageSize"
                  :pager-count="3"
                  :total="page.total"
                >
                                               :total="page.total">
                </el-pagination>
              </div>
            </div>
            <div class="track-box" v-show="detailFlag">
                        <div class="track-box"
                             v-show="detailFlag">
              <div>
                <el-button @click="goOut" type="text" size="small" title="轨迹">
                                <el-button @click="goOut"
                                           type="text"
                                           size="small"
                                           title="轨迹">
                  <i class="el-icon-back"></i>
                </el-button>
@@ -113,21 +108,20 @@
                <li>
                  <div>选择时间:</div>
                  <div class="datetime">
                    <el-date-picker
                      v-model="trackTime"
                                        <el-date-picker v-model="trackTime"
                      type="datetimerange"
                      range-separator="至"
                      start-placeholder="开始日期"
                      size="mini"
                      :editable="false"
                      end-placeholder="结束日期"
                    >
                                                        end-placeholder="结束日期">
                    </el-date-picker>
                  </div>
                </li>
                <li>
                  <el-button type="text" @click="lookTrack">
                                    <el-button type="text"
                                               @click="lookTrack">
                    查看轨迹
                  </el-button>
                </li>
@@ -141,7 +135,7 @@
</template>
<script>
import { getGunList, getPosition, getTrack, getNewTrack } from "@/api/map/gun";
import { getGunList, getTrack } from "@/api/map/gun";
import gunPng from "@/assets/img/gun.png";
@@ -188,13 +182,54 @@
    },
    positionClick(val) {
      getPosition({ type: 3, workerId: val.id }).then((result) => {
        var res = result.data.data;
            var timestamp = Date.parse(new Date());
            var serverDate = new Date(timestamp);
            const start =
                (serverDate.getFullYear() - 5) +
                "-" +
                this.disposeTime(serverDate.getMonth() + 1) +
                "-" +
                this.disposeTime(serverDate.getDate()) +
                " " +
                this.disposeTime(serverDate.getHours()) +
                ":" +
                this.disposeTime(serverDate.getMinutes()) +
                ":" +
                this.disposeTime(serverDate.getSeconds());
            const end =
                serverDate.getFullYear() +
                "-" +
                this.disposeTime(serverDate.getMonth() + 1) +
                "-" +
                this.disposeTime(serverDate.getDate()) +
                " " +
                this.disposeTime(serverDate.getHours()) +
                ":" +
                this.disposeTime(serverDate.getMinutes()) +
                ":" +
                this.disposeTime(serverDate.getSeconds());
            getTrack({
                hwysfzh: "",
                szdw: "",
                kssj: start,
                jssj: end,
            }).then((res) => {
                var result = res.data.data;
        if (JSON.stringify(res) != "{}") {
                    var array = result.sort(function (a, b) {
                        return a['dwsj'] < b['dwsj'] ? 1 : -1
                    })
          this.$refs.modalForm.addEntitys(
            {
              LGTD: 115.86,
              LTTD: 28.71,
                            LGTD: Number(array[0].dwjd),
                            LTTD: Number(array[0].dwwd),
              name: "枪支位置",
            },
            gunPng,
@@ -242,42 +277,28 @@
        this.disposeTime(endTime.getMonth() + 1) +
        "-" +
        this.disposeTime(endTime.getDate());
      // getTrack({
      //   workerId: this.detailObj.id,
      //   type: 3,
      //   startTime: start,
      //   endTime: end,
      // }).then((res) => {
      //   var result = res.data.data;
      //   if (result.length > 1) {
      //     let arr = [];
      //     result.forEach((item) => {
      //       arr.push([Number(item.longitude), Number(item.latitude)]);
      //     });
      //     this.$refs.modalForm.addLines(arr);
      //   }
      // });
      getNewTrack({
        startTime: start,
        endTime: end,
            // this.detailObj.cardNo
            getTrack({
                hwysfzh: "",
                szdw: "",
                kssj: start,
                jssj: end,
      }).then((res) => {
        console.log(res, "车辆轨迹");
        var result = res.data.data;
        if (result.length > 1) {
          let arr = [];
          result.res.forEach((item) => {
                    var array = result.sort(function (a, b) {
                        return a['dwsj'] > b['dwsj'] ? 1 : -1
                    })
                    array.forEach((item) => {
            arr.push([Number(item.dwjd), Number(item.dwwd)]);
          });
          this.$refs.modalForm.addLines(arr);
        }
      });
    },
    // 处理时间补零操作