冲突

liuyg

2021-12-01 675704af3a6842280e9ea9afbb4064a732e73a05

冲突

 src/api/index/index.js

@@ -224,3 +224,30 @@
    params: params
  });
};

// 获取押运人员列表
export const getSelectPeo = params => {
  return request({
    url: "/api/blade-user/selectPeo",
    method: "get",
    params: params
  });
};

// 获取车辆列表
export const getSelectCar = (param) => {
  return request({
    url: '/api/car/selectCar',
    method: 'get',
    params: param
  })
}

// 获取枪支列表
export const getSelectGun = (param) => {
  return request({
    url: '/api/equipage/selectGun',
    method: 'get',
    params: param
  })
}

 src/views/home/index.vue

@@ -717,7 +717,10 @@
  getSecurityUnitHoldLessPage,
  getSecurityUnitSoilLessPage,
  getSecurityUnitDispatcherLessPage,
  getSubstationWarnInfoPage
  getSubstationWarnInfoPage,
  getSelectPeo,
  getSelectCar,
  getSelectGun
} from "../../api/index/index";

import { getPeopleList, getPosition, getNewPeople } from "@/api/map/people";
@@ -1192,15 +1195,12 @@

      this.getCompanyMap();
      // 获取人员列表
      getPeopleList({
        current: 1,
        size: 100000
      }).then(res => {
        var records = res.data.data.records;
      getSelectPeo({ type: 1, deptId: "1460129345988239362" }).then(res => {
        var records = res.data.data;
        records.forEach(m => {
          let obj = {
            address: m.address,
            realName: m.realName,
            realName: m.real_name,
            deptName: m.deptName,
            phone: m.phone,
            id: m.id
@@ -1216,17 +1216,17 @@
      });

      //获取车辆列表
      getCarList({
        current: 1,
        size: 100000
      getSelectCar({
        type: 1,
        deptId: "1460129345988239362"
      }).then(res => {
        var records = res.data.data.records;
        var records = res.data.data;
        records.forEach(m => {
          let obj = {
            mode: m.mode,
            personInCharge: m.personInCharge,
            dateForProduction: m.dateForProduction,
            detailObj: m.detailObj,
            personInCharge: m.person_in_charge,
            dateForProduction: m.date_for_production,
            detailObj: m.brand,
            // location: m.address,
            // name: m.name,
            // company: m.deptName,
@@ -1245,19 +1245,19 @@
      });

      // 获取枪支列表
      getGunList({
        current: 1,
        size: 100000
      getSelectGun({
        type: 1,
        deptId: "1460129345988239362"
      }).then(res => {
        var records = res.data.data.records;
        var records = res.data.data;
        records.forEach(m => {
          let obj = {
            gunMode: m.gunMode,
            personInCharge: m.personInCharge,
            issueTime: m.issueTime,
            validTime: m.validTime,
            issueUnit: m.issueUnit,
            cardNumber: m.cardNumber,
            gunMode: m.gun_mode,
            personInCharge: m.person_in_charge,
            issueTime: m.issue_time,
            validTime: m.valid_time,
            issueUnit: m.issue_unit,
            cardNumber: m.card_number,
            id: m.id
          };
          this.mapData[3]["geoData"].push([

 src/views/home/indexEchart.js

@@ -556,7 +556,6 @@
  return option;
}
function middleData(allData, type) {
  // debugger;
  var ncMap = nc;
  let name = "";
  let label = "";

 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-17 09:21:20
 * @Last Modified time: 2021-12-01 10:52:09
 * 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 } from "@/api/map/gun";
import { getGunList, getTrack } from "@/api/map/gun";

import gunPng from "@/assets/img/gun.png";

@@ -188,13 +182,49 @@
    },

    positionClick(val) {
      getPosition({ type: 3, workerId: val.id }).then((result) => {
            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({
                workerId: val.id,
                type: 3,
                startTime: start,
                endTime: end,
            }).then((result) => {
        var res = result.data.data;
        if (JSON.stringify(res) != "{}") {
          this.$refs.modalForm.addEntitys(
            {
              LGTD: 115.86,
              LTTD: 28.71,
                            LGTD: Number(res[0].longitude),
                            LTTD: Number(res[0].latitude),
              name: "枪支位置",
            },
            gunPng,
@@ -204,6 +234,7 @@
          );
        }
      });

    },

    detailsClick(row) {