From 0bfdaad01fdcdeef567b59a49f7715a7ac7f0d51 Mon Sep 17 00:00:00 2001
From: zhengpz <1838927346@qq.com>
Date: Fri, 17 Sep 2021 00:57:21 +0800
Subject: [PATCH] 对接口
---
src/views/home/indexEchart.js | 157 +++++++++++++++++++++++++++------------------------
1 files changed, 83 insertions(+), 74 deletions(-)
diff --git a/src/views/home/indexEchart.js b/src/views/home/indexEchart.js
index 697e0c4..f6b3b0c 100644
--- a/src/views/home/indexEchart.js
+++ b/src/views/home/indexEchart.js
@@ -137,7 +137,7 @@
focus: "series"
},
// data: data5
- data: [10, 20, 13, 14]
+ data: data5
}
]
};
@@ -227,8 +227,7 @@
emphasis: {
focus: "series"
},
- // data: data1
- data: [12, 10, 24]
+ data: data1
},
{
name: "未持证人数",
@@ -237,8 +236,7 @@
emphasis: {
focus: "series"
},
- // data: data2
- data: [12, 10, 24]
+ data: data2
}
]
};
@@ -558,80 +556,91 @@
return option;
}
function middleData(allData, type) {
+ debugger;
var ncMap = nc;
- // var convertData = function (allData) {
- // var res = [];
- // for (var i = 0; i < data.length; i++) {
- // var geoCoord = geoCoordMap[data[i].name];
- // if (geoCoord) {
- // res.push({
- // name: data[i].name,
- // value: geoCoord.concat(data[i].value)
- // });
- // }
- // }
- // return res;
- // };
let name = "";
let label = "";
let symbolUrl = "";
let geoData = [];
- allData["table"].forEach((item, i) => {
- let obj = {};
- if (type === 1) {
- name = "保安员名称";
- label =
- "押运人员：" +
- item.name +
- "<br />当前位置：" +
- item.location +
- "<br />所属公司：" +
- item.linkman +
- "<br />联系电话：" +
- item.tel;
- symbolUrl = require("@/assets/img/people.png");
- obj = {
- name: label,
- value: allData["geoData"][i]
- };
- } else if (type === 2) {
- name = "押运车辆";
- label =
- "押运车辆车牌号：" +
- item.carNum +
- "<br />当前位置：" +
- item.location +
- "<br />所属公司：" +
- item.company +
- "<br />联系人：" +
- item.linkman +
- "<br />联系电话：" +
- item.tel;
- symbolUrl = require("@/assets/img/car.png");
- obj = {
- name: label,
- value: allData["geoData"][i]
- };
- } else if (type === 3) {
- name = "枪支";
- label =
- "枪支编号：" +
- item.number +
- "<br />当前位置：" +
- item.location +
- "<br />所属公司：" +
- item.company +
- "<br />负责人：" +
- item.linkman +
- "<br />联系电话：" +
- item.tel;
- symbolUrl = require("@/assets/img/gun.png");
- obj = {
- name: label,
- value: allData["geoData"][i]
- };
- }
- geoData.push(obj);
+ allData["table"].forEach(item => {
+ allData["geoData"].forEach(items => {
+ let obj = {};
+ if (item.id === items[0] && type === 1) {
+ name = "保安员名称";
+ label =
+ "押运人员：" +
+ item.name +
+ "<br />当前位置：" +
+ item.location +
+ "<br />所属公司：" +
+ item.linkman +
+ "<br />联系电话：" +
+ item.tel;
+ symbolUrl = require("@/assets/img/people.png");
+ obj = {
+ name: label,
+ value: [items[1], items[2]]
+ };
+ geoData.push(obj);
+ } else if (item.id === items[0] && type === 2) {
+ name = "押运车辆";
+ label =
+ "押运车辆车牌号：" +
+ item.carNum +
+ "<br />当前位置：" +
+ item.location +
+ "<br />所属公司：" +
+ item.company +
+ "<br />联系人：" +
+ item.linkman +
+ "<br />联系电话：" +
+ item.tel;
+ symbolUrl = require("@/assets/img/car.png");
+ obj = {
+ name: label,
+ value: [items[1], items[2]]
+ };
+ geoData.push(obj);
+ } else if (item.id === items[0] && type === 3) {
+ name = "枪支";
+ label =
+ "枪支编号：" +
+ item.number +
+ "<br />当前位置：" +
+ item.location +
+ "<br />所属公司：" +
+ item.company +
+ "<br />负责人：" +
+ item.linkman +
+ "<br />联系电话：" +
+ item.tel;
+ symbolUrl = require("@/assets/img/gun.png");
+ obj = {
+ name: label,
+ value: [items[1], items[2]]
+ };
+ geoData.push(obj);
+ } else if (item.id === items[0] && type === 4) {
+ name = "保安公司：";
+ label =
+ "保安公司名称" +
+ item.enterprisename +
+ "<br />所属辖区：" +
+ item.location +
+ "<br />注册地址：" +
+ item.address +
+ "<br />负责人：" +
+ item.contacts +
+ "<br />联系电话：" +
+ item.contactscell;
+ symbolUrl = require("@/assets/img/company.png");
+ obj = {
+ name: label,
+ value: [items[1], items[2]]
+ };
+ geoData.push(obj);
+ }
+ });
});
echarts.registerMap("ncMap", ncMap);
--
Gitblit v1.9.3