From fbde521b53ed8fc5bdb9c4bbb6cf8f6871378ec2 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 26 Nov 2021 10:09:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory
---
src/views/home/index.vue | 925 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 505 insertions(+), 420 deletions(-)
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index f6e0e4e..70bdd3e 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -115,119 +115,121 @@
<div class="leftbottom"></div>
<div class="righttop"></div>
<div class="rightbottom"></div>
- <el-table :data="tableData" stripe ref="indexTable">
- <template v-if="curTableType === 2">
- <el-table-column
- :key="curTableType"
- type="index"
- label="序号"
- width="50"
- ></el-table-column>
- <el-table-column
- :key="curTableType"
- prop="carNum"
- label="押运车辆车牌号"
- width="180"
- ></el-table-column>
- <el-table-column
- :key="curTableType"
- show-overflow-tooltip
- prop="location"
- label="实时位置"
- ></el-table-column>
- <el-table-column
- :key="curTableType"
- show-overflow-tooltip
- prop="company"
- label="所属公司"
- ></el-table-column>
- <el-table-column
- :key="curTableType"
- show-overflow-tooltip
- prop="linkman"
- label="联系人"
- ></el-table-column>
- <el-table-column
- :key="curTableType"
- show-overflow-tooltip
- prop="tel"
- label="联系电话"
- ></el-table-column>
- </template>
- <template v-if="curTableType === 1">
- <el-table-column
- :key="curTableType"
- type="index"
- label="序号"
- width="50"
- ></el-table-column>
- <el-table-column
- :key="curTableType"
- show-overflow-tooltip
- prop="name"
- label="押运人员名称"
- width="180"
- ></el-table-column>
- <el-table-column
- :key="curTableType"
- show-overflow-tooltip
- prop="location"
- label="实时位置"
- ></el-table-column>
- <el-table-column
- :key="curTableType"
- show-overflow-tooltip
- prop="company"
- label="所属公司"
- ></el-table-column>
- <el-table-column
- :key="curTableType"
- show-overflow-tooltip
- prop="tel"
- label="联系电话"
- ></el-table-column>
- <!-- <el-table-column :key="curTableType" prop="bz" label="备注">
+ <div class="bottom-table">
+ <el-table :data="tableData" stripe ref="indexTable">
+ <template v-if="curTableType === 2">
+ <el-table-column
+ :key="curTableType"
+ type="index"
+ label="序号"
+ width="50"
+ ></el-table-column>
+ <el-table-column
+ :key="curTableType"
+ prop="carNum"
+ label="押运车辆车牌号"
+ width="180"
+ ></el-table-column>
+ <el-table-column
+ :key="curTableType"
+ show-overflow-tooltip
+ prop="location"
+ label="实时位置"
+ ></el-table-column>
+ <el-table-column
+ :key="curTableType"
+ show-overflow-tooltip
+ prop="company"
+ label="所属公司"
+ ></el-table-column>
+ <el-table-column
+ :key="curTableType"
+ show-overflow-tooltip
+ prop="linkman"
+ label="联系人"
+ ></el-table-column>
+ <el-table-column
+ :key="curTableType"
+ show-overflow-tooltip
+ prop="tel"
+ label="联系电话"
+ ></el-table-column>
+ </template>
+ <template v-if="curTableType === 1">
+ <el-table-column
+ :key="curTableType"
+ type="index"
+ label="序号"
+ width="50"
+ ></el-table-column>
+ <el-table-column
+ :key="curTableType"
+ show-overflow-tooltip
+ prop="name"
+ label="押运人员名称"
+ width="180"
+ ></el-table-column>
+ <el-table-column
+ :key="curTableType"
+ show-overflow-tooltip
+ prop="location"
+ label="实时位置"
+ ></el-table-column>
+ <el-table-column
+ :key="curTableType"
+ show-overflow-tooltip
+ prop="company"
+ label="所属公司"
+ ></el-table-column>
+ <el-table-column
+ :key="curTableType"
+ show-overflow-tooltip
+ prop="tel"
+ label="联系电话"
+ ></el-table-column>
+ <!-- <el-table-column :key="curTableType" prop="bz" label="备注">
</el-table-column>-->
- </template>
- <template v-if="curTableType === 3">
- <el-table-column
- :key="curTableType"
- type="index"
- label="序号"
- width="50"
- ></el-table-column>
- <el-table-column
- :key="curTableType"
- show-overflow-tooltip
- prop="number"
- label="枪支编号"
- width="180"
- ></el-table-column>
- <el-table-column
- :key="curTableType"
- show-overflow-tooltip
- prop="location"
- label="实时位置"
- ></el-table-column>
- <el-table-column
- :key="curTableType"
- show-overflow-tooltip
- prop="company"
- label="所属公司"
- ></el-table-column>
- <el-table-column
- :key="curTableType"
- show-overflow-tooltip
- prop="linkman"
- label="负责人"
- ></el-table-column>
- <el-table-column
- :key="curTableType"
- prop="tel"
- label="联系电话"
- ></el-table-column>
- </template>
- </el-table>
+ </template>
+ <template v-if="curTableType === 3">
+ <el-table-column
+ :key="curTableType"
+ type="index"
+ label="序号"
+ width="50"
+ ></el-table-column>
+ <el-table-column
+ :key="curTableType"
+ show-overflow-tooltip
+ prop="number"
+ label="枪支编号"
+ width="180"
+ ></el-table-column>
+ <el-table-column
+ :key="curTableType"
+ show-overflow-tooltip
+ prop="location"
+ label="实时位置"
+ ></el-table-column>
+ <el-table-column
+ :key="curTableType"
+ show-overflow-tooltip
+ prop="company"
+ label="所属公司"
+ ></el-table-column>
+ <el-table-column
+ :key="curTableType"
+ show-overflow-tooltip
+ prop="linkman"
+ label="负责人"
+ ></el-table-column>
+ <el-table-column
+ :key="curTableType"
+ prop="tel"
+ label="联系电话"
+ ></el-table-column>
+ </template>
+ </el-table>
+ </div>
</div>
</div>
<div class="right">
@@ -269,8 +271,12 @@
<img src="../../../public/img/bajgxt/u4.png" />
<img src="../../../public/img/bajgxt/u256.png" />
<img src="../../../public/img/bajgxt/u1.png" />
- <span>{{ rightData.poorPerformance }}</span>
- <span>现实表现差</span>
+ <span class="showDialog" @click="shoeDialog('xs')">{{
+ rightData.poorPerformance
+ }}</span>
+ <span class="showDialog" @click="shoeDialog('xs')"
+ >现实表现差</span
+ >
</div>
<div class="card-list">
<img src="../../../public/img/bajgxt/u4.png" />
@@ -389,307 +395,321 @@
element-loading-text="数据加载中"
:visible.sync="dialogTableVisible"
>
- <el-table :data="gridData.data">
- <template v-if="gridData.type === 'zg'">
- <el-table-column
- label="序号"
- width="50"
- :key="gridData.type"
- type="index"
- >
- </el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="realName"
- label="保安姓名"
- :show-overflow-tooltip="true"
- width="100"
- ></el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="deptName"
- label="保安公司"
- :show-overflow-tooltip="true"
- ></el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="sex"
- label="性别"
- :formatter="sexFormatter"
- :show-overflow-tooltip="true"
- width="100"
- ></el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="cardid"
- label="身份证号"
- :show-overflow-tooltip="true"
- width="180"
- ></el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="age"
- label="年龄"
- :show-overflow-tooltip="true"
- width="100"
- ></el-table-column>
- <!-- <el-table-column
+ <div class="dialog-table">
+ <el-table :data="gridData.data">
+ <template v-if="gridData.type === 'zg' || gridData.type === 'xs'">
+ <el-table-column
+ label="序号"
+ width="50"
+ :key="gridData.type"
+ type="index"
+ >
+ </el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="realName"
+ label="保安姓名"
+ :show-overflow-tooltip="true"
+ width="100"
+ ></el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="deptName"
+ label="保安公司"
+ :show-overflow-tooltip="true"
+ ></el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="sex"
+ label="性别"
+ :formatter="sexFormatter"
+ :show-overflow-tooltip="true"
+ width="100"
+ ></el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="cardid"
+ label="身份证号"
+ :show-overflow-tooltip="true"
+ width="180"
+ ></el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="age"
+ label="年龄"
+ :show-overflow-tooltip="true"
+ width="100"
+ ></el-table-column>
+ <!-- <el-table-column
prop="birthday"
label="出生日期"
:show-overflow-tooltip="true"
></el-table-column> -->
- <el-table-column
- :key="gridData.type"
- prop="securitynumber"
- label="保安员证编号"
- :show-overflow-tooltip="true"
- width="150"
- ></el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="phone"
- label="联系方式"
- :show-overflow-tooltip="true"
- width="150"
- ></el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="examinationType"
- label="审查状态"
- :formatter="examinationFormatter"
- :show-overflow-tooltip="true"
- width="100"
- ></el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="examinationMx"
- label="审查明细"
- :show-overflow-tooltip="true"
- width="150"
- ></el-table-column>
- </template>
- <template v-if="gridData.type === 'wg'">
- <el-table-column
- label="序号"
- width="50"
- :key="gridData.type"
- type="index"
- >
- </el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="enterpriseName"
- label="公司名称"
- :show-overflow-tooltip="true"
- ></el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="znum"
- label="保安员数量"
- :show-overflow-tooltip="true"
- width="150"
- ></el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="cznum"
- label="持证保安"
- :show-overflow-tooltip="true"
- width="150"
- ></el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="czl"
- label="持证率"
- :show-overflow-tooltip="true"
- width="150"
- >
- </el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="sbnum"
- label="缴纳社保人数"
- :show-overflow-tooltip="true"
- width="150"
- ></el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="sbl"
- label="缴纳社保比例"
- :show-overflow-tooltip="true"
- width="150"
- ></el-table-column>
- </template>
- <template v-if="gridData.type === 'jy'">
- <el-table-column
- label="序号"
- width="50"
- :key="gridData.type"
- type="index"
- >
- </el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="enterpriseName"
- label="公司名称"
- :show-overflow-tooltip="true"
- ></el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="znum"
- label="保安员数量"
- :show-overflow-tooltip="true"
- width="150"
- ></el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="cznum"
- label="持证保安"
- :show-overflow-tooltip="true"
- width="150"
- ></el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="painum"
- label="派遣人数"
- :show-overflow-tooltip="true"
- width="150"
- ></el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="fwnum"
- label="服务对象数量"
- :show-overflow-tooltip="true"
- width="150"
- ></el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="pql"
- label="派遣率"
- :show-overflow-tooltip="true"
- width="150"
- ></el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="pjpqrs"
- label="平均派遣人数"
- :show-overflow-tooltip="true"
- width="150"
- ></el-table-column>
- </template>
- <template v-if="gridData.type === 'ym'">
- <el-table-column
- label="序号"
- width="50"
- :key="gridData.type"
- type="index"
- >
- </el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="enterpriseName"
- label="公司名称"
- :show-overflow-tooltip="true"
- width="450"
- ></el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="znum"
- label="保安员数量"
- :show-overflow-tooltip="true"
- ></el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="cznum"
- label="持证保安"
- :show-overflow-tooltip="true"
- ></el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="painum"
- label="派遣人数"
- :show-overflow-tooltip="true"
- ></el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="fwnum"
- label="服务对象数量"
- :show-overflow-tooltip="true"
- ></el-table-column
- >gridData
- </template>
- <template v-if="gridData.type === 'jg'">
- <el-table-column
- label="序号"
- width="50"
- :key="gridData.type"
- type="index"
- >
- </el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="enterpriseName"
- label="公司名称"
- :show-overflow-tooltip="true"
- ></el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="punishtype"
- label="处罚类别"
- :formatter="punishType"
- :show-overflow-tooltip="true"
- width="150"
- ></el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="punishreason"
- label="处罚原因"
- :show-overflow-tooltip="true"
- width="200"
- ></el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="penalty"
- label="处罚单位"
- :show-overflow-tooltip="true"
- width="200"
- ></el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="punishtime"
- label="处罚时间"
- :show-overflow-tooltip="true"
- width="100"
- ></el-table-column>
- </template>
- <template v-if="gridData.type === 'ywdx_gs'">
- <el-table-column
- label="序号"
- width="50"
- :key="gridData.type"
- type="index"
- >
- </el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="enterprisename"
- label="保安公司名称"
- :show-overflow-tooltip="true"
- ></el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="stats"
- label="保安公司类型"
- :formatter="companyFormatter"
- :show-overflow-tooltip="true"
- ></el-table-column>
- <el-table-column
- :key="gridData.type"
- prop="jurisdictionName"
- label="所属辖区"
- :show-overflow-tooltip="true"
- ></el-table-column>
- </template>
- </el-table>
+ <el-table-column
+ :key="gridData.type"
+ prop="securitynumber"
+ label="保安员证编号"
+ :show-overflow-tooltip="true"
+ width="150"
+ ></el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="phone"
+ label="联系方式"
+ :show-overflow-tooltip="true"
+ width="150"
+ ></el-table-column>
+ <el-table-column
+ v-if="gridData.type === 'zg'"
+ :key="gridData.type"
+ prop="examinationType"
+ label="审查状态"
+ :formatter="examinationFormatter"
+ :show-overflow-tooltip="true"
+ width="100"
+ ></el-table-column>
+ <el-table-column
+ v-if="gridData.type === 'zg'"
+ :key="gridData.type"
+ prop="examinationMx"
+ label="审查明细"
+ :show-overflow-tooltip="true"
+ width="150"
+ ></el-table-column>
+ <el-table-column
+ v-if="gridData.type === 'xs'"
+ :key="gridData.type"
+ prop="score"
+ label="现实表现情况"
+ :show-overflow-tooltip="true"
+ width="150"
+ :formatter="scoreFormatter"
+ ></el-table-column>
+ </template>
+ <template v-if="gridData.type === 'wg'">
+ <el-table-column
+ label="序号"
+ width="50"
+ :key="gridData.type"
+ type="index"
+ >
+ </el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="enterpriseName"
+ label="公司名称"
+ :show-overflow-tooltip="true"
+ ></el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="znum"
+ label="保安员数量"
+ :show-overflow-tooltip="true"
+ width="150"
+ ></el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="cznum"
+ label="持证保安"
+ :show-overflow-tooltip="true"
+ width="150"
+ ></el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="czl"
+ label="持证率"
+ :show-overflow-tooltip="true"
+ width="150"
+ >
+ </el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="sbnum"
+ label="缴纳社保人数"
+ :show-overflow-tooltip="true"
+ width="150"
+ ></el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="sbl"
+ label="缴纳社保比例"
+ :show-overflow-tooltip="true"
+ width="150"
+ ></el-table-column>
+ </template>
+ <template v-if="gridData.type === 'jy'">
+ <el-table-column
+ label="序号"
+ width="50"
+ :key="gridData.type"
+ type="index"
+ >
+ </el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="enterpriseName"
+ label="公司名称"
+ :show-overflow-tooltip="true"
+ ></el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="znum"
+ label="保安员数量"
+ :show-overflow-tooltip="true"
+ width="150"
+ ></el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="cznum"
+ label="持证保安"
+ :show-overflow-tooltip="true"
+ width="150"
+ ></el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="painum"
+ label="派遣人数"
+ :show-overflow-tooltip="true"
+ width="150"
+ ></el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="fwnum"
+ label="服务对象数量"
+ :show-overflow-tooltip="true"
+ width="150"
+ ></el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="pql"
+ label="派遣率"
+ :show-overflow-tooltip="true"
+ width="150"
+ ></el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="pjpqrs"
+ label="平均派遣人数"
+ :show-overflow-tooltip="true"
+ width="150"
+ ></el-table-column>
+ </template>
+ <template v-if="gridData.type === 'ym'">
+ <el-table-column
+ label="序号"
+ width="50"
+ :key="gridData.type"
+ type="index"
+ >
+ </el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="enterpriseName"
+ label="公司名称"
+ :show-overflow-tooltip="true"
+ width="450"
+ ></el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="znum"
+ label="保安员数量"
+ :show-overflow-tooltip="true"
+ ></el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="cznum"
+ label="持证保安"
+ :show-overflow-tooltip="true"
+ ></el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="painum"
+ label="派遣人数"
+ :show-overflow-tooltip="true"
+ ></el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="fwnum"
+ label="服务对象数量"
+ :show-overflow-tooltip="true"
+ ></el-table-column
+ >gridData
+ </template>
+ <template v-if="gridData.type === 'jg'">
+ <el-table-column
+ label="序号"
+ width="50"
+ :key="gridData.type"
+ type="index"
+ >
+ </el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="enterpriseName"
+ label="公司名称"
+ :show-overflow-tooltip="true"
+ ></el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="punishtype"
+ label="处罚类别"
+ :formatter="punishType"
+ :show-overflow-tooltip="true"
+ width="150"
+ ></el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="punishreason"
+ label="处罚原因"
+ :show-overflow-tooltip="true"
+ width="200"
+ ></el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="penalty"
+ label="处罚单位"
+ :show-overflow-tooltip="true"
+ width="200"
+ ></el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="punishtime"
+ label="处罚时间"
+ :show-overflow-tooltip="true"
+ width="100"
+ ></el-table-column>
+ </template>
+ <template v-if="gridData.type === 'ywdx_gs'">
+ <el-table-column
+ label="序号"
+ width="50"
+ :key="gridData.type"
+ type="index"
+ >
+ </el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="enterprisename"
+ label="保安公司名称"
+ :show-overflow-tooltip="true"
+ ></el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="stats"
+ label="保安公司类型"
+ :formatter="companyFormatter"
+ :show-overflow-tooltip="true"
+ ></el-table-column>
+ <el-table-column
+ :key="gridData.type"
+ prop="jurisdictionName"
+ label="所属辖区"
+ :show-overflow-tooltip="true"
+ ></el-table-column>
+ </template>
+ </el-table>
+ </div>
+
<el-pagination
@current-change="changePage"
@size-change="changePage"
@@ -745,6 +765,8 @@
lazyTrees,
getSecurityUnitInfoPage
} from "../../api/index/index";
+import { getPosition, getNewPeople } from "@/api/map/people";
+import { getNewPosition } from "@/api/map/car";
import car from "@/assets/img/car.png";
import peo from "@/assets/img/people.png";
@@ -828,7 +850,9 @@
// },
node1: {}, //选中的记录
node2: {},
- params: null
+ params: null,
+ peopleGps: {},
+ carGps: {}
};
},
computed: {
@@ -840,6 +864,34 @@
}
},
methods: {
+ getPeoplePosition() {
+ getPosition({ type: 1, workerId: "1432897970143014913" }).then(result => {
+ getNewPeople().then(res => {
+ if (JSON.stringify(res.data) != "{}") {
+ var arr = res.data.sort(function(a, b) {
+ return a["date"] < b["date"] ? 1 : -1;
+ });
+ this.peopleGps = {
+ LGTD: arr[0].gis_jd,
+ LTTD: arr[0].gis_wd
+ };
+ }
+ this.getTableData(0);
+ });
+ });
+ },
+ getCarPosition() {
+ getNewPosition({ imei: "861636056082414" }).then(result => {
+ var res = result.data.data;
+ if (JSON.stringify(res) != "{}") {
+ this.carGps = {
+ LGTD: res.x,
+ LTTD: res.y
+ };
+ }
+ this.getTableData(0);
+ });
+ },
//点击节点
handleNodeClick1(data) {
this.value1 = data;
@@ -863,6 +915,11 @@
return "异常";
} else if (row.examinationType === "0") {
return "正常";
+ }
+ },
+ scoreFormatter(row) {
+ if (row.score === "3") {
+ return "差";
}
},
punishType(row) {
@@ -1111,11 +1168,30 @@
// name: type,
// value: [Number(m.longitude), Number(m.latitude)],
// };
- middleData[m.type]["geoData"].push([
- Number(m.longitude),
- Number(m.latitude)
- ]);
- middleData[m.type]["table"].push(obj);
+ if (m.type === 1) {
+ middleData[m.type]["geoData"].push([
+ Number(this.peopleGps.LGTD),
+ Number(this.peopleGps.LTTD)
+ ]);
+ middleData[m.type]["table"].push(obj);
+ } else if (m.type === 2) {
+ middleData[m.type]["geoData"].push([
+ Number(this.carGps.LGTD),
+ Number(this.carGps.LTTD)
+ ]);
+ middleData[m.type]["table"].push(obj);
+ } else {
+ middleData[m.type]["geoData"].push([
+ Number(m.longitude),
+ Number(m.latitude)
+ ]);
+ middleData[m.type]["table"].push(obj);
+ }
+ // middleData[m.type]["geoData"].push([
+ // Number(m.longitude),
+ // Number(m.latitude)
+ // ]);
+ // middleData[m.type]["table"].push(obj);
});
this.carNum = middleData[2]["table"].length;
this.peoNum = middleData[1]["table"].length;
@@ -1170,6 +1246,9 @@
} else if (type === "jg") {
this.gridData.title = "受监管处罚公司清单（保安公司存在被处罚记录）";
this.getPunishList(1);
+ } else if (type === "xs") {
+ this.gridData.title = "现实表现差人员清单";
+ this.getQualificationPages(1);
}
},
getWgTable() {
@@ -1230,7 +1309,7 @@
});
},
changePage(page) {
- if (this.gridData.type === "zg") {
+ if (this.gridData.type === "zg" || this.gridData.type === "xs") {
this.getQualificationPages(page);
} else if (this.gridData.type === "wg") {
this.gridData.data = this.dialogTable.wgTable.slice(
@@ -1260,9 +1339,13 @@
let params = {
current: this.gridData.current,
size: 10,
- examinationType: 1,
jurisdiction: this.value1
};
+ if (this.gridData.type === "zg") {
+ Object.assign(params, { examinationType: 1 });
+ } else if (this.gridData.type === "xs") {
+ Object.assign(params, { score: 3 });
+ }
qualificationPages(params).then(res => {
if (res.data.code === 200) {
this.gridData.data = res.data.data.records;
@@ -1405,12 +1488,14 @@
}
},
mounted() {
+ this.getPeoplePosition();
+ this.getCarPosition();
this.initEchart();
this.getHolderNum(0);
// this.getPoorPerformance(3);
// this.getTableData("car");
// this.initMap();
- this.getTableData(0);
+ // this.getTableData(0);
// this.initMapEchart();
this.getOfficeData();
}
--
Gitblit v1.9.3