From 7fbe838496148877bc5fe055e3098b3bc00a113d Mon Sep 17 00:00:00 2001
From: zhengpz <1838927346@qq.com>
Date: Fri, 20 Aug 2021 08:55:35 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory
---
src/views/securityUnitOperation/securityEchart.js | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/views/securityUnitOperation/securityEchart.js b/src/views/securityUnitOperation/securityEchart.js
index afa8ed7..f88d5c9 100644
--- a/src/views/securityUnitOperation/securityEchart.js
+++ b/src/views/securityUnitOperation/securityEchart.js
@@ -414,10 +414,14 @@
return option;
}
-function economicMiddle(data) {
- let data1 = [];
- for (var a in data) {
- data1.push(data[a]);
+function economicMiddle(data1,data2) {
+ let sbData = [];
+ let pqData = [];
+ for (var a in data1) {
+ sbData.push(data1[a]);
+ }
+ for (var b in data2) {
+ pqData.push(data2[b]);
}
let option = {
tooltip: {
@@ -491,13 +495,13 @@
name: "缴纳社保人数",
type: "line",
stack: "总量",
- data: data1
+ data: sbData
},
{
name: "公司派遣人数",
type: "line",
stack: "总量",
- data: [220, 182, 191, 234, 290, 330, 310, 111, 222, 132, 143, 123]
+ data: pqData
}
]
};
--
Gitblit v1.9.3