From 4b751514a49f44e69128fe5a048024fb80ad4d15 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 01 Dec 2021 16:31:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory_ys
---
src/views/home/index.vue | 48 ++++++++++++------------
src/api/index/index.js | 27 +++++++++++++
src/views/home/indexEchart.js | 1
3 files changed, 51 insertions(+), 25 deletions(-)
diff --git a/src/api/index/index.js b/src/api/index/index.js
index ac53e9d..c111f15 100644
--- a/src/api/index/index.js
+++ b/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
+ })
+}
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 4f60433..5cccd05 100644
--- a/src/views/home/index.vue
+++ b/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([
diff --git a/src/views/home/indexEchart.js b/src/views/home/indexEchart.js
index 82f7b9a..fb9a822 100644
--- a/src/views/home/indexEchart.js
+++ b/src/views/home/indexEchart.js
@@ -556,7 +556,6 @@
return option;
}
function middleData(allData, type) {
- debugger;
var ncMap = nc;
let name = "";
let label = "";
--
Gitblit v1.9.3