From 2c562e0c277ffe2bc90a39081a2b456e9d23c948 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 01 Dec 2021 09:15:57 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory_ys
---
src/views/home/indexEchart.js | 51 ++++++++++++++++++++++++++-------------------------
1 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/src/views/home/indexEchart.js b/src/views/home/indexEchart.js
index 029f456..82f7b9a 100644
--- a/src/views/home/indexEchart.js
+++ b/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,
--
Gitblit v1.9.3