Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory_ys

shuishen

2021-12-01 7a0ed5f804b389a963befc1c9f65722ce2f8fd13

Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory_ys

 src/views/home/index.scss

@@ -259,6 +259,7 @@
    /deep/ .el-table td,
    .el-table th.is-leaf {
      border-bottom-color: transparent;
      background: rgb(3, 34, 91) !important;
    }
    /deep/ .el-table__header th {
      border-bottom: 1px solid #031a38 !important;

 src/views/home/index.vue

@@ -132,34 +132,34 @@
              ></el-table-column>
              <el-table-column
                :key="curTableType"
                prop="carNum"
                label="押运车辆车牌号"
                prop="mode"
                label="车辆型号"
                width="180"
              ></el-table-column>
              <el-table-column
                :key="curTableType"
                show-overflow-tooltip
                prop="location"
                label="实时位置"
                prop="personInCharge"
                label="责任人"
              ></el-table-column>
              <el-table-column
                :key="curTableType"
                show-overflow-tooltip
                prop="company"
                label="所属公司"
                prop="dateForProduction"
                label="出厂日期"
              ></el-table-column>
              <el-table-column
                :key="curTableType"
                show-overflow-tooltip
                prop="linkman"
                label="联系人"
                prop="detailObj"
                label="厂商"
              ></el-table-column>
              <el-table-column
              <!-- <el-table-column
                :key="curTableType"
                show-overflow-tooltip
                prop="tel"
                label="联系电话"
              ></el-table-column>
              ></el-table-column> -->
            </template>
            <template v-if="curTableType === 1">
              <el-table-column
@@ -171,30 +171,30 @@
              <el-table-column
                :key="curTableType"
                show-overflow-tooltip
                prop="name"
                prop="realName"
                label="押运人员名称"
                width="180"
              ></el-table-column>
              <el-table-column
                :key="curTableType"
                show-overflow-tooltip
                prop="location"
                label="实时位置"
                prop="address"
                label="联系地址"
              ></el-table-column>
              <el-table-column
                :key="curTableType"
                show-overflow-tooltip
                prop="company"
                prop="deptName"
                label="所属公司"
              ></el-table-column>
              <el-table-column
                :key="curTableType"
                show-overflow-tooltip
                prop="tel"
                prop="phone"
                label="联系电话"
              ></el-table-column>
              <!-- <el-table-column :key="curTableType" prop="bz" label="备注">
              </el-table-column>-->
              </el-table-column> -->
            </template>
            <template v-if="curTableType === 3">
              <el-table-column
@@ -206,34 +206,40 @@
              <el-table-column
                :key="curTableType"
                show-overflow-tooltip
                prop="number"
                label="枪支编号"
                prop="gunMode"
                label="枪支类型"
                width="180"
              ></el-table-column>
              <el-table-column
                :key="curTableType"
                show-overflow-tooltip
                prop="location"
                label="实时位置"
                prop="personInCharge"
                label="责任人"
              ></el-table-column>
              <el-table-column
                :key="curTableType"
                show-overflow-tooltip
                prop="company"
                label="所属公司"
                prop="issueTime"
                label="发证日期"
              ></el-table-column>
              <el-table-column
                :key="curTableType"
                show-overflow-tooltip
                prop="linkman"
                label="负责人"
                prop="validTime"
                label="有效日期"
              ></el-table-column>
              <el-table-column
                :key="curTableType"
                prop="tel"
                label="联系电话"
              ></el-table-column> </template
            ><template v-if="curTableType === 4">
                prop="issueUnit"
                label="发证单位"
              ></el-table-column>
              <el-table-column
                :key="curTableType"
                prop="cardNumber"
                label="用枪编号"
              ></el-table-column>
            </template>
            <template v-if="curTableType === 4">
              <el-table-column
                :key="curTableType"
                type="index"
@@ -714,8 +720,9 @@
  getSubstationWarnInfoPage
} from "../../api/index/index";

import { getPosition, getNewPeople } from "@/api/map/people";
import { getNewPosition } from "@/api/map/car";
import { getPeopleList, getPosition, getNewPeople } from "@/api/map/people";
import { getCarList, getNewPosition } from "@/api/map/car";
import { getGunList } from "@/api/map/gun";

import car from "@/assets/img/car.png";
import peo from "@/assets/img/people.png";
@@ -816,13 +823,15 @@
            var arr = res.data.sort(function(a, b) {
              return a["date"] < b["date"] ? 1 : -1;
            });

            var csGps = [Number(arr[0].gis_jd), Number(arr[0].gis_wd)];

            this.peopleGps = {
              LGTD: arr[0].gis_jd,
              LTTD: arr[0].gis_wd
              LGTD: csGps[0],
              LTTD: csGps[1]
            };
          }
          this.getCarPosition();

        });
      });
    },
@@ -831,12 +840,11 @@
        var res = result.data.data;
        if (JSON.stringify(res) != "{}") {
          this.carGps = {
            LGTD: res.x,
            LTTD: res.y
            LGTD: Number(res.x),
            LTTD: Number(res.y)
          };
        }
        this.getTableData(0);
        
        this.getTableData();
      });
    },
    //点击节点
@@ -1118,51 +1126,52 @@
      if (type === 2) {
        this.tableData.forEach(item => {
          let obj =
            "押运车辆车牌号" +
            item.carNum +
            ",当前位置" +
            item.location +
            ",所属公司" +
            item.company +
            ",联系人" +
            item.linkman +
            ",联系电话" +
            item.tel;
            "押运车辆型号" +
            item.mode +
            ",责任人" +
            item.personInCharge +
            ",出厂日期" +
            item.dateForProduction +
            ",厂商" +
            item.detailObj;
          this.textArr.push(obj);
        });
      } else if (type === 1) {
        this.tableData.forEach(item => {
          let obj =
            "押运人员" +
            item.name +
            ",当前位置" +
            item.location +
            item.realName +
            ",联系地址" +
            item.address +
            ",所属公司" +
            item.linkman +
            item.deptName +
            ",联系电话" +
            item.tel;
            item.phone;
          this.textArr.push(obj);
        });
      } else if (type === 3) {
        this.tableData.forEach(item => {
          let obj =
            "枪支编号" +
            item.number +
            ",当前位置" +
            item.location +
            ",所属公司" +
            item.company +
            ",负责人" +
            item.linkman +
            ",联系电话" +
            item.tel;
            "枪支类型" +
            item.gunMode +
            ",责任人" +
            item.personInCharge +
            ",发证日期" +
            item.issueTime +
            ",有效日期" +
            item.validTime +
            ",发证单位" +
            item.issueUnit +
            ",用枪编号" +
            item.cardNumber;
          this.textArr.push(obj);
        });
      }
    },
    // 获取表格及地图上的数据
    getTableData(type) {
      let middleData = {
    getTableData() {
      // this.mapData = middleData;
      this.mapData = {
        1: {
          table: [],
          geoData: []
@@ -1180,74 +1189,152 @@
          geoData: []
        }
      };
      getLiveLocationVoList({ type: type }).then(res => {
        if (res.data.code === 200) {
          let allData = res.data.data;
          allData.forEach(m => {
            let obj = {
              location: m.location,
              name: m.name,
              number: m.number,
              linkman: m.linkman,
              company: m.company,
              tel: m.tel,
              carNum: m.carNum,
              id: m.id
            };
            // if (
            //   m.longitude &&
            //   m.latitude &&
            //   m.longitude !== "0" &&
            //   m.latitude !== "0"
            // ) {
              if (m.type === 1) {
                middleData[m.type]["geoData"].push([
                  m.id,
                  Number(this.peopleGps.LGTD),
                  Number(this.peopleGps.LTTD)
                ]);
                middleData[m.type]["table"].push(obj);
              } else if (m.type === 2) {
                middleData[m.type]["geoData"].push([
                  m.id,
                  Number(this.carGps.LGTD),
                  Number(this.carGps.LTTD)
                ]);
                middleData[m.type]["table"].push(obj);
              } else {
                middleData[m.type]["geoData"].push([
                  m.id,
                  Number(m.longitude),
                  Number(m.latitude)
                ]);
                middleData[m.type]["table"].push(obj);
              }
            // }
            
            // if (
            //   m.longitude &&
            //   m.latitude &&
            //   m.longitude !== "0" &&
            //   m.latitude !== "0"
            // ) {
            //   middleData[m.type]["geoData"].push([
            //     m.id,
            //     Number(m.longitude),
            //     Number(m.latitude)
            //   ]);
            // }
            // middleData[m.type]["table"].push(obj);
          });
          this.carNum = middleData[2]["table"].length;
          this.peoNum = middleData[1]["table"].length;
          this.gunNum = middleData[3]["table"].length;
          this.mapData = middleData;
          this.setMapData(2);
          this.getCompanyMap();
        } else {
          this.$message.error(res.msg);
        }

      this.getCompanyMap();
      // 获取人员列表
      getPeopleList({
        current: 1,
        size: 100000
      }).then(res => {
        var records = res.data.data.records;
        records.forEach(m => {
          let obj = {
            address: m.address,
            realName: m.realName,
            deptName: m.deptName,
            phone: m.phone,
            id: m.id
          };
          this.mapData[1]["geoData"].push([
            m.id,
            Number(this.peopleGps.LGTD),
            Number(this.peopleGps.LTTD)
          ]);
          this.mapData[1]["table"].push(obj);
        });
        this.peoNum = this.mapData[1]["table"].length;
      });

      //获取车辆列表
      getCarList({
        current: 1,
        size: 100000
      }).then(res => {
        var records = res.data.data.records;
        records.forEach(m => {
          let obj = {
            mode: m.mode,
            personInCharge: m.personInCharge,
            dateForProduction: m.dateForProduction,
            detailObj: m.detailObj,
            // location: m.address,
            // name: m.name,
            // company: m.deptName,
            // tel: m.phone,
            id: m.id
          };
          this.mapData[2]["geoData"].push([
            m.id,
            Number(this.carGps.LGTD),
            Number(this.carGps.LTTD)
          ]);
          this.mapData[2]["table"].push(obj);
        });
        this.carNum = this.mapData[2]["table"].length;
        this.setMapData(2);
      });

      // 获取枪支列表
      getGunList({
        current: 1,
        size: 100000
      }).then(res => {
        var records = res.data.data.records;
        records.forEach(m => {
          let obj = {
            gunMode: m.gunMode,
            personInCharge: m.personInCharge,
            issueTime: m.issueTime,
            validTime: m.validTime,
            issueUnit: m.issueUnit,
            cardNumber: m.cardNumber,
            id: m.id
          };
          this.mapData[3]["geoData"].push([
            m.id,
            Number(this.carGps.LGTD),
            Number(this.carGps.LTTD)
          ]);
          this.mapData[3]["table"].push(obj);
        });
        this.gunNum = this.mapData[3]["table"].length;
      });
      // getLiveLocationVoList({ type: type }).then(res => {
      //   if (res.data.code === 200) {
      //     let allData = res.data.data;
      //     allData.forEach(m => {
      //       let obj = {
      //         location: m.location,
      //         name: m.name,
      //         number: m.number,
      //         linkman: m.linkman,
      //         company: m.company,
      //         tel: m.tel,
      //         carNum: m.carNum,
      //         id: m.id
      //       };
      //       // if (
      //       //   m.longitude &&
      //       //   m.latitude &&
      //       //   m.longitude !== "0" &&
      //       //   m.latitude !== "0"
      //       // ) {
      //       // if (m.type === 1) {
      //       //   middleData[m.type]["geoData"].push([
      //       //     m.id,
      //       //     Number(this.peopleGps.LGTD),
      //       //     Number(this.peopleGps.LTTD)
      //       //   ]);
      //       //   middleData[m.type]["table"].push(obj);
      //       // } else
      //       if (m.type === 2) {
      //         middleData[m.type]["geoData"].push([
      //           m.id,
      //           Number(this.carGps.LGTD),
      //           Number(this.carGps.LTTD)
      //         ]);
      //         middleData[m.type]["table"].push(obj);
      //       } else {
      //         middleData[m.type]["geoData"].push([
      //           m.id,
      //           Number(m.longitude),
      //           Number(m.latitude)
      //         ]);
      //         middleData[m.type]["table"].push(obj);
      //       }
      //       // }

      //       // if (
      //       //   m.longitude &&
      //       //   m.latitude &&
      //       //   m.longitude !== "0" &&
      //       //   m.latitude !== "0"
      //       // ) {
      //       //   middleData[m.type]["geoData"].push([
      //       //     m.id,
      //       //     Number(m.longitude),
      //       //     Number(m.latitude)
      //       //   ]);
      //       // }
      //       // middleData[m.type]["table"].push(obj);
      //     });
      //     this.carNum = middleData[2]["table"].length;
      //     this.peoNum = middleData[1]["table"].length;
      //     this.gunNum = middleData[3]["table"].length;
      //   } else {
      //     this.$message.error(res.msg);
      //   }
      // });
    },
    // 获取保安公司地图数据
    getCompanyMap() {

 src/views/home/indexEchart.js

@@ -556,6 +556,7 @@
  return option;
}
function middleData(allData, type) {
  debugger;
  var ncMap = nc;
  let name = "";
  let label = "";
@@ -568,13 +569,13 @@
        name = "保安员名称";
        label =
          "押运人员：" +
          item.name +
          "<br />当前位置：" +
          item.location +
          item.realName +
          "<br />联系地址：" +
          item.address +
          "<br />所属公司：" +
          item.linkman +
          item.deptName +
          "<br />联系电话：" +
          item.tel;
          item.phone;
        symbolUrl = require("@/assets/img/people.png");
        obj = {
          name: label,
@@ -584,16 +585,14 @@
      } else if (item.id === items[0] && type === 2) {
        name = "押运车辆";
        label =
          "押运车辆车牌号：" +
          item.carNum +
          "<br />当前位置：" +
          item.location +
          "<br />所属公司：" +
          item.company +
          "<br />联系人：" +
          item.linkman +
          "<br />联系电话：" +
          item.tel;
          "押运车辆型号：" +
          item.mode +
          "<br />责任人：" +
          item.personInCharge +
          "<br />出厂日期：" +
          item.dateForProduction +
          "<br />厂商：" +
          item.detailObj;
        symbolUrl = require("@/assets/img/car.png");
        obj = {
          name: label,
@@ -603,16 +602,18 @@
      } else if (item.id === items[0] && type === 3) {
        name = "枪支";
        label =
          "枪支编号：" +
          item.number +
          "<br />当前位置：" +
          item.location +
          "<br />所属公司：" +
          item.company +
          "<br />负责人：" +
          item.linkman +
          "<br />联系电话：" +
          item.tel;
          "枪支类型：" +
          item.gunMode +
          "<br />责任人：" +
          item.personInCharge +
          "<br />发证日期：" +
          item.issueTime +
          "<br />有效日期：" +
          item.validTime +
          "<br />发证单位：" +
          item.issueUnit +
          "<br />用枪编号：" +
          item.cardNumber;
        symbolUrl = require("@/assets/img/gun.png");
        obj = {
          name: label,

 src/views/securityGuardManagement/register.vue

@@ -2,7 +2,7 @@
 * @Author: Morpheus
 * @Date: 2021-07-05 16:31:54
 * @Last Modified by: liu
 * @Last Modified time: 2021-11-25 09:42:36
 * @Last Modified time: 2021-11-30 15:01:25
 * menu-name 保安员注册查询
 */
<template>
@@ -103,6 +103,7 @@
                :size="size"
                :type="type"
                class="zhengJian-icon"
                v-if="row.hold == 1"
                :disabled="row.hold != 1"
                :title="row.hold != 1 ? '暂无证件或已吊销' : ''"
                @click.stop="handleViewCredentials(row)"
@@ -114,7 +115,7 @@
                :size="size"
                :type="type"
                class="zhengJian-icon"
                v-if="row.hold != 3"
                v-if="row.hold != 3 && row.hold != 2"
                @click.stop="handleCredentials(row)"
                :title="row.hold == 2 ? '暂无证件' : ''"
                :disabled="row.hold == 2"